WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java

+    }
     @PostMapping(value = "/cs/createPosition")
     public String createPosition(HttpServletRequest request, @RequestBody CreatePositionModel createPositionModel, Model model) throws Exception {
         LOGGER.info("partnerPosition" + createPositionModel.isTicketAssigned());
+        // Validate authUserId exists
+        int authUserId = createPositionModel.getAuthUserId();
+        if (authUserId <= 0 || authRepository.selectById(authUserId) == null) {
+            throw new ProfitMandiBusinessException("Position", authUserId, "Invalid authUserId");
+        }
+        // Validate categoryId exists (0 means "All Categories")
+        int categoryId = createPositionModel.getCategoryId();
+        if (categoryId > 0 && ticketCategoryRepository.selectById(categoryId) == null) {
+            throw new ProfitMandiBusinessException("Position", categoryId, "Invalid categoryId");
+        }
+        // Validate regionId exists (0 or 5 typically means "All Partners/Regions")
+        int regionId = createPositionModel.getRegionId();
+        if (regionId > 0 && regionId != 5 && regionRepository.selectById(regionId) == null) {
+            throw new ProfitMandiBusinessException("Position", regionId, "Invalid regionId");
+        }
+        // Validate fofoIds exist
+        List<Integer> fofoIds = createPositionModel.getFofoIds();
+        if (fofoIds != null && !fofoIds.isEmpty()) {
+            Map<Integer, CustomRetailer> validRetailers = retailerService.getFofoRetailers(false);
+            for (int fofoId : fofoIds) {
+                if (!validRetailers.containsKey(fofoId)) {
+                    throw new ProfitMandiBusinessException("Position", fofoId, "Invalid fofoId");
+                }
+            }
+        }
-        Position position = positionRepository.selectPosition(createPositionModel.getAuthUserId(), createPositionModel.getCategoryId(), createPositionModel.getRegionId(), createPositionModel.getEscalationType());
+        Position position = positionRepository.selectPosition(authUserId, categoryId, regionId, createPositionModel.getEscalationType());
         if (position == null) {
             position = new Position();
-            position.setAuthUserId(createPositionModel.getAuthUserId());
+            position.setAuthUserId(authUserId);
-            position.setCategoryId(createPositionModel.getCategoryId());
+            position.setCategoryId(categoryId);
             position.setEscalationType(createPositionModel.getEscalationType());
-            position.setRegionId(createPositionModel.getRegionId());
+            position.setRegionId(regionId);
             position.setCreateTimestamp(LocalDateTime.now());
             position.setTicketAssignee(createPositionModel.isTicketAssigned());
             positionRepository.persist(position);
+            if (fofoIds != null) {
-            for (int fofoId : createPositionModel.getFofoIds()) {
+                for (int fofoId : fofoIds) {
-                PartnerPosition partnerPosition = new PartnerPosition();
+                    PartnerPosition partnerPosition = new PartnerPosition();
-                partnerPosition.setFofoId(fofoId);
+                    partnerPosition.setFofoId(fofoId);
-                partnerPosition.setRegionId(createPositionModel.getRegionId());
+                    partnerPosition.setRegionId(regionId);
-                partnerPosition.setPositionId(position.getId());
+                    partnerPosition.setPositionId(position.getId());
-                partnerPositionRepository.persist(partnerPosition);
+                    partnerPositionRepository.persist(partnerPosition);
-                LOGGER.info("partnerPosition" + partnerPosition);
+                    LOGGER.info("partnerPosition" + partnerPosition);
+                }
+            }
             model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         } else {
-            throw new ProfitMandiBusinessException("Position", createPositionModel.getAuthUserId(), "already exists!");
+            throw new ProfitMandiBusinessException("Position", authUserId, "already exists!");
+        }
         return "response";
+    }
     @PostMapping(value = "/cs/updatePartnerPosition")
     @GetMapping(value = "/cs/getActivities")
     public String getActivity(HttpServletRequest request, @RequestParam(name = "ticketId", defaultValue = "0") int ticketId, Model model) throws Exception {
         List<Activity> allactivities = activityRepository.selectAll(ticketId);
+        // Batch fetch all documents for attachments (fix N+1 query)
-        List<List<ActivityAttachment>> activityAttachments = allactivities.stream().map(x -> x.getActivityAttachment()).collect(Collectors.toList());
+        List<Integer> documentIds = allactivities.stream()
-        for (List<ActivityAttachment> aA : activityAttachments) {
+                .flatMap(a -> a.getActivityAttachment().stream())
-            // List<ActivityAttachment> documentId = aA.stream().map(x ->
+                .map(ActivityAttachment::getDocumentId)
+                .distinct()
-            // x).collect(Collectors.toList());
+                .collect(Collectors.toList());
+        Map<Integer, Document> documentMap = Collections.emptyMap();
+        if (!documentIds.isEmpty()) {
+            documentMap = documentRepository.selectByIds(documentIds).stream()
+                    .collect(Collectors.toMap(Document::getId, d -> d));
+        }
+        // Set document names transiently (do not persist during GET)
+        for (Activity activity : allactivities) {
-            for (ActivityAttachment attachment : aA) {
+            for (ActivityAttachment attachment : activity.getActivityAttachment()) {
-                Document document = documentRepository.selectById(attachment.getDocumentId());
+                Document document = documentMap.get(attachment.getDocumentId());
+                if (document != null) {
-                attachment.setDocumentName(document.getDisplayName());
+                    attachment.setDocumentName(document.getDisplayName());
-                activityAttachmentRepository.persist(attachment);
+                }
+            }
+        }
         List<Activity> activities = null;
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         if (roleManager.isAdmin(loginDetails.getRoleIds())) {
         Map<Integer, TicketCategory> subCategoryIdAndCategoryMap = csService.getSubCategoryIdAndCategoryMap(subCategoryIds);
         List<Integer> ticketIds = tickets.stream().map(x -> x.getId()).collect(Collectors.toList());
         Map<Integer, List<Activity>> activityMap = new HashMap<>();
         Map<Integer, List<Activity>> activityMapWithActivityId = new HashMap<>();
+        Map<Integer, AuthUser> authUserMap = new HashMap<>();
         if (!ticketIds.isEmpty()) {
+            // Fetch activities once and reuse for both maps (fix duplicate query)
+            List<Activity> allActivities = activityRepository.selectAll(ticketIds);
-            activityMap = activityRepository.selectAll(ticketIds).stream().collect(Collectors.groupingBy(x -> x.getTicketId()));
+            activityMap = allActivities.stream().collect(Collectors.groupingBy(Activity::getTicketId));
-            activityMapWithActivityId = activityRepository.selectAll(ticketIds).stream().collect(Collectors.groupingBy(x -> x.getId()));
+            activityMapWithActivityId = allActivities.stream().collect(Collectors.groupingBy(Activity::getId));
+            // Only fetch users who created activities (fix loading ALL users)
+            Set<Integer> activityCreatorIds = allActivities.stream()
+                    .map(Activity::getCreatedBy)
+                    .filter(id -> id > 0)
+                    .collect(Collectors.toSet());
+            if (!activityCreatorIds.isEmpty()) {
+                authUserMap = authRepository.selectByIds(new ArrayList<>(activityCreatorIds))
+                        .stream().collect(Collectors.toMap(AuthUser::getId, x -> x));
+            }
+        }
-        List<AuthUser> authUsersList = authRepository.selectAll();
-        Map<Integer, AuthUser> authUserMap = authUsersList.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
         model.addAttribute("ticketStatusValues", TicketStatus.values());
         model.addAttribute("orderByValues", SortOrder.values());
         model.addAttribute("selectedticketStatus", ticketStatus);
         model.addAttribute("selectedorderby", sortOrder);
         model.addAttribute("tickets", tickets);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java – Rev 35569 → 35570