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

 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import javax.swing.*;
+import javax.swing.SortOrder;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 @Controller
+    }
     @PostMapping(value = "/cs/updatePartnerPosition")
     public String updatePartnerPosition(HttpServletRequest request, @RequestParam(name = "regionId") int regionId, @RequestBody List<Integer> selectedFofoIds, @RequestParam(name = "positionId") int positionId, Model model) throws Exception {
+        // Validate positionId exists
+        Position position = positionRepository.selectById(positionId);
+        if (position == null) {
+            throw new ProfitMandiBusinessException("Position", positionId, "Position not found");
+        }
+        // Validate regionId exists (0 or 5 typically means "All Partners/Regions")
+        if (regionId > 0 && regionId != 5 && regionRepository.selectById(regionId) == null) {
+            throw new ProfitMandiBusinessException("Position", regionId, "Invalid regionId");
+        }
+        // Validate fofoIds exist
+        if (selectedFofoIds != null && !selectedFofoIds.isEmpty()) {
+            Map<Integer, CustomRetailer> validRetailers = retailerService.getFofoRetailers(false);
+            for (int fofoId : selectedFofoIds) {
+                if (!validRetailers.containsKey(fofoId)) {
+                    throw new ProfitMandiBusinessException("Position", fofoId, "Invalid fofoId");
+                }
+            }
+        }
         partnerPositionRepository.delete(positionId);
+        if (selectedFofoIds != null) {
-        for (int fofoId : selectedFofoIds) {
+            for (int fofoId : selectedFofoIds) {
-            PartnerPosition partnerPosition = new PartnerPosition();
+                PartnerPosition partnerPosition = new PartnerPosition();
-            partnerPosition.setFofoId(fofoId);
+                partnerPosition.setFofoId(fofoId);
-            partnerPosition.setRegionId(regionId);
+                partnerPosition.setRegionId(regionId);
-            partnerPosition.setPositionId(positionId);
+                partnerPosition.setPositionId(positionId);
-            partnerPositionRepository.persist(partnerPosition);
+                partnerPositionRepository.persist(partnerPosition);
+            }
+        }
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
         } else {
             tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder);
             size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(), Optional.of(TicketStatus.OPENED.equals(ticketStatus)));
+        }
         authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
+        if (authUserIdAndAuthUserMap == null) {
+            authUserIdAndAuthUserMap = new HashMap<>();
+        }
         model.addAttribute("size", size);
         model.addAttribute("roleType", isAdmin);
         // Check if user is in CRM category (only CRM can send external communications)
-        boolean isCrmUser = isAdmin && positionRepository.hasCategory(currentAuthUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
+        boolean isCrmUser = isAdmin && currentAuthUser != null && positionRepository.hasCategory(currentAuthUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
         model.addAttribute("isCrmUser", isCrmUser);
         List<Integer> subCategoryIds = tickets.stream().map(x -> x.getSubCategoryId()).collect(Collectors.toList());
         Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService.getSubCategoryIdAndSubCategoryMap(subCategoryIds);
+        if (subCategoryIdAndSubCategoryMap == null) {
+            subCategoryIdAndSubCategoryMap = new HashMap<>();
+        }
         Map<Integer, TicketCategory> subCategoryIdAndCategoryMap = csService.getSubCategoryIdAndCategoryMap(subCategoryIds);
+        if (subCategoryIdAndCategoryMap == null) {
+            subCategoryIdAndCategoryMap = new HashMap<>();
+        }
         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<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
         Set<Integer> fofoIds = storeGuyMap.get(authUser.getEmailId());
         Map<Integer, List<AuthUser>> authUserListMap = null;
         if (fofoIds != null && !fofoIds.isEmpty()) {
-            for (Integer fofoId : fofoIds) {
+            // Batch fetch all open tickets for all fofoIds (fix N+1 query)
-                List<Ticket> partnerWiseTickets = ticketRepository.selectAllOpenTicketByRetailer(fofoId);
+            List<Ticket> allPartnerTickets = ticketRepository.selectAllOpenTickets(new ArrayList<>(fofoIds));
-                if (partnerWiseTickets != null && !partnerWiseTickets.isEmpty()) {
+            if (allPartnerTickets != null && !allPartnerTickets.isEmpty()) {
-                    // Filter tickets where last_activity is not "RESOLVED"
+                // Filter tickets where last_activity is not "RESOLVED"
-                    List<Ticket> filteredTickets = partnerWiseTickets.stream()
+                tickets = allPartnerTickets.stream()
-                            .filter(ticket -> ticket.getLastActivity() == null ||
+                        .filter(ticket -> ticket.getLastActivity() == null ||
-                                    ticket.getLastActivity() != ActivityType.RESOLVED)
+                                ticket.getLastActivity() != ActivityType.RESOLVED)
-                            .collect(Collectors.toList());
+                        .collect(Collectors.toList());
-                    tickets.addAll(filteredTickets);
-                }
+            }
+        }
         authUserListMap = csService.getAssignedAuthList(tickets);
         model.addAttribute("size", tickets.size());
         model.addAttribute("tickets", tickets);
         List<Integer> subCategoryIds = tickets.stream().map(x -> x.getSubCategoryId()).collect(Collectors.toList());
         Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService.getSubCategoryIdAndSubCategoryMap(subCategoryIds);
+        if (subCategoryIdAndSubCategoryMap == null) {
+            subCategoryIdAndSubCategoryMap = new HashMap<>();
+        }
         Map<Integer, TicketCategory> subCategoryIdAndCategoryMap = csService.getSubCategoryIdAndCategoryMap(subCategoryIds);
+        if (subCategoryIdAndCategoryMap == null) {
+            subCategoryIdAndCategoryMap = new HashMap<>();
+        }
         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<>();
         model.addAttribute("selectedorderby", sortOrder);
         model.addAttribute("tickets", tickets);
         model.addAttribute("ticketSearchTypes", TicketSearchType.values());
         model.addAttribute("ticketSearchType", ticketSearchType);
         model.addAttribute("searchTerm", searchTerm);
-        model.addAttribute("authUserListMap", authUserListMap);
+        model.addAttribute("authUserListMap", authUserListMap != null ? authUserListMap : new HashMap<>());
         model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
         model.addAttribute("subCategoryIdAndCategoryMap", subCategoryIdAndCategoryMap);
         model.addAttribute("activityMap", activityMap);
         model.addAttribute("size", size);
         model.addAttribute("tickets", tickets);
         List<Integer> subCategoryIds = tickets.stream().map(x -> x.getSubCategoryId()).collect(Collectors.toList());
         Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService.getSubCategoryIdAndSubCategoryMap(subCategoryIds);
+        if (subCategoryIdAndSubCategoryMap == null) {
+            subCategoryIdAndSubCategoryMap = new HashMap<>();
+        }
         Map<Integer, TicketCategory> subCategoryIdAndCategoryMap = csService.getSubCategoryIdAndCategoryMap(subCategoryIds);
+        if (subCategoryIdAndCategoryMap == null) {
+            subCategoryIdAndCategoryMap = new HashMap<>();
+        }
         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<>();

Subversion Repositories SmartDukaan

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