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

         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         List<Ticket> tickets = null;
         List<TicketAssigned> ticketAssigneds = null;
         long size = 0;
         Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
-        if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
+        boolean isAdmin = roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()));
-            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+        AuthUser currentAuthUser = isAdmin ? authRepository.selectByEmailOrMobile(loginDetails.getEmailId()) : null;
+        if (isAdmin) {
+            int authUserId = currentAuthUser.getId();
             if (ticketSearchType == null) {
                 if (ticketStatus.equals(TicketStatus.RESOLVED)) {
-                    tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder, null, searchTerm);
+                    tickets = ticketRepository.selectAllByAssignee(authUserId, Optional.empty(), sortOrder, null, searchTerm);
-                    size = ticketRepository.selectAllCountByAssignee(authUser.getId(), Optional.empty(), null, searchTerm);
+                    size = ticketRepository.selectAllCountByAssignee(authUserId, Optional.empty(), null, searchTerm);
                 } else {
-                    tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, null, searchTerm);
+                    tickets = ticketRepository.selectAllByAssignee(authUserId, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, null, searchTerm);
-                    size = ticketRepository.selectAllCountByAssignee(authUser.getId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm);
+                    size = ticketRepository.selectAllCountByAssignee(authUserId, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm);
+                }
             } else {
                 if (ticketStatus.equals(TicketStatus.RESOLVED)) {
-                    tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder, ticketSearchType, searchTerm);
+                    tickets = ticketRepository.selectAllByAssignee(authUserId, Optional.empty(), sortOrder, ticketSearchType, searchTerm);
-                    size = ticketRepository.selectAllCountByAssignee(authUser.getId(), Optional.empty(), ticketSearchType, searchTerm);
+                    size = ticketRepository.selectAllCountByAssignee(authUserId, Optional.empty(), ticketSearchType, searchTerm);
                 } else {
-                    tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, ticketSearchType, searchTerm);
+                    tickets = ticketRepository.selectAllByAssignee(authUserId, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, ticketSearchType, searchTerm);
-                    size = ticketRepository.selectAllCountByAssignee(authUser.getId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
+                    size = ticketRepository.selectAllCountByAssignee(authUserId, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
+                }
+            }
             // LOGGER.info(size + "size");
             if (tickets.size() > 0) {
                 ticketAssigneds = ticketAssignedRepository.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
             size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(), Optional.of(TicketStatus.OPENED.equals(ticketStatus)));
+        }
         authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
         model.addAttribute("size", size);
-        model.addAttribute("roleType", roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds())));
+        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);
+        model.addAttribute("isCrmUser", isCrmUser);
         List<Integer> subCategoryIds = tickets.stream().map(x -> x.getSubCategoryId()).collect(Collectors.toList());
         Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService.getSubCategoryIdAndSubCategoryMap(subCategoryIds);
         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<Integer, List<Activity>>();
+        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 group by both ticketId and activityId
+            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 AuthUsers who created activities (instead of 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("tickets", tickets);
         model.addAttribute("resolved", ActivityType.RESOLVED);
         model.addAttribute("resolved-accepted", ActivityType.RESOLVED_ACCEPTED);
         model.addAttribute("resolved-rejected", ActivityType.RESOLVED_REJECTED);
         model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
                 AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
                 activity.setCreatedBy(authUser.getId());
                 authUsersMap.remove(authUser.getId());
                 subject = String.format("Ticket Update #%s by %s", ticket.getId(), authUser.getName());
                 mailMessage = String.format("%s's message - %s", authUser.getFirstName(), message);
+                // Only CRM users can send external communications
+                boolean isCrmUser = positionRepository.hasCategory(authUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
-                if (internal) {
+                if (internal || !isCrmUser) {
                     activity.setType(ActivityType.COMMUNICATION_INTERNAL);
-                    // String subject = String.format(ACTIVITY_SUBJECT, ticket.getId());
                 } else {
                     String updatedBy = "SD Team";
                     CustomRetailer customRetailer = retailerService.getFofoRetailers(false).get(ticket.getFofoId());
                     subject = String.format("Ticket Update #%s by %s", ticket.getId(), updatedBy);
                     String partnerMessage = String.format("%s's message - %s", updatedBy, message);
         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 group by both ticketId and activityId
+            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 AuthUsers who created activities (instead of 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);
         model.addAttribute("subCategoryIdAndCategoryMap", subCategoryIdAndCategoryMap);
         model.addAttribute("activityMap", activityMap);
         model.addAttribute("authUserMap", authUserMap);
         model.addAttribute("activityMapWithActivityId", activityMapWithActivityId);
+        // Check if user is in CRM category (only CRM can send external communications)
+        boolean isCrmUser = positionRepository.hasCategory(authUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
+        model.addAttribute("isCrmUser", isCrmUser);
         return "my-partner-tickets";
+    }
     @GetMapping(value = "/cs/managerTicket")

Subversion Repositories SmartDukaan

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