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

 import com.spice.profitmandi.common.model.CustomRetailer;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.cs.*;
+import com.spice.profitmandi.dao.entity.cs.Position;
 import com.spice.profitmandi.dao.entity.dtr.Document;
+import com.spice.profitmandi.dao.entity.cs.TicketReadStatus.UserType;
 import com.spice.profitmandi.dao.entity.fofo.ActivityType;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.enumuration.cs.TicketStatus;
 import com.spice.profitmandi.dao.model.CreatePositionModel;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
                 ticketCategories = ticketCategories.stream()
                         .filter(tc -> tc.getId() != ProfitMandiConstants.TICKET_CATEGORY_SALES
                                 && tc.getId() != ProfitMandiConstants.TICKET_CATEGORY_RBM)
                         .collect(Collectors.toList());
+            }
+        } else {
+            // For partners/customers: hide categories where ALL subcategories are invisible
+            ticketCategories = ticketCategories.stream()
+                    .filter(category -> {
+                        List<TicketSubCategory> subs = ticketSubCategoryRepository.selectAll(category.getId());
+                        // Keep category if at least one subcategory is visible
+                        return subs.stream().anyMatch(TicketSubCategory::isVisibility);
+                    })
+                    .collect(Collectors.toList());
+        }
         model.addAttribute("roleType", isAdmin);
         model.addAttribute("ticketCategories", ticketCategories);
         model.addAttribute("isCrmUser", isCrmUser);
+        }
         return "response";
+    }
     @GetMapping(value = "/cs/myticket")
+    public String getTicket(HttpServletRequest request,
+                            @RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
+                            @RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
+                            @RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
+                            @RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
+                            @RequestParam(name = "page", defaultValue = "0") int page,
+                            @RequestParam(name = "pageSize", defaultValue = "25") int pageSize,
+                            @RequestParam(name = "search", required = false) String searchText,
+                            Model model) throws ProfitMandiBusinessException {
+        populateMyTicketModel(request, sortOrder, ticketStatus, ticketSearchType, searchTerm, page, pageSize, searchText, model);
+        return "ticket";
+    }
+    @GetMapping(value = "/cs/myticket-content")
+    public String getTicketContent(HttpServletRequest request,
+                                   @RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
+                                   @RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
+                                   @RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
+                                   @RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
+                                   @RequestParam(name = "page", defaultValue = "0") int page,
+                                   @RequestParam(name = "pageSize", defaultValue = "25") int pageSize,
+                                   @RequestParam(name = "search", required = false) String searchText,
+                                   Model model) throws ProfitMandiBusinessException {
+        populateMyTicketModel(request, sortOrder, ticketStatus, ticketSearchType, searchTerm, page, pageSize, searchText, model);
+        return "ticket-content";
+    }
-    public String getTicket(HttpServletRequest request, @RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder, @RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus, @RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType, @RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm, Model model) throws ProfitMandiBusinessException {
+    private void populateMyTicketModel(HttpServletRequest request, SortOrder sortOrder, TicketStatus ticketStatus,
+                                       TicketSearchType ticketSearchType, int searchTerm, int page, int pageSize,
+                                       String searchText, Model model) throws ProfitMandiBusinessException {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         List<Ticket> tickets = null;
         List<TicketAssigned> ticketAssigneds = null;
-        long size = 0;
+        long totalRecords = 0;
         Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
         boolean isAdmin = roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()));
         AuthUser currentAuthUser = isAdmin ? authRepository.selectByEmailOrMobile(loginDetails.getEmailId()) : null;
-        // Check if user is CRM category - CRM users see ALL tickets to handle partner communications
         boolean isCrmUser = isAdmin && currentAuthUser != null && positionRepository.hasCategory(currentAuthUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
-        // Check if user is Sales category - Sales users can resolve their own Sales tickets
         boolean isSalesUser = isAdmin && currentAuthUser != null && positionRepository.hasCategory(currentAuthUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_SALES);
-        // Check if user is RBM category - RBM users can resolve their own RBM tickets
         boolean isRbmUser = isAdmin && currentAuthUser != null && positionRepository.hasCategory(currentAuthUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_RBM);
+        List<Integer> userCategoryIds = isAdmin && currentAuthUser != null
+                ? positionRepository.selectCategoryIdsByAuthUserId(currentAuthUser.getId())
+                : Collections.emptyList();
+        int offset = page * pageSize;
         if (isAdmin) {
             int authUserId = currentAuthUser.getId();
             if (isCrmUser) {
-                // CRM users see ALL tickets EXCEPT Sales Escalation and RBM Escalation subcategories
+                Optional<Boolean> resolvedOpt = ticketStatus.equals(TicketStatus.RESOLVED) ? Optional.empty() : Optional.of(TicketStatus.CLOSED.equals(ticketStatus));
-                if (ticketStatus.equals(TicketStatus.RESOLVED)) {
+                tickets = ticketRepository.selectAllTicketsPaginated(
-                    tickets = ticketRepository.selectAllTickets(Optional.empty(), sortOrder, ticketSearchType, searchTerm);
+                        resolvedOpt, sortOrder, ticketSearchType, searchTerm, searchText,
-                } else {
-                    tickets = ticketRepository.selectAllTickets(Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, ticketSearchType, searchTerm);
-                }
-                // Filter out invisible subcategory tickets for CRM users
+                        userCategoryIds, offset, pageSize);
-                Map<Integer, TicketSubCategory> subCategoryMap = ticketSubCategoryRepository.getTicketSubCategoryMap();
-                tickets = tickets.stream()
+                totalRecords = ticketRepository.selectAllTicketsPaginatedCount(
-                        .filter(t -> {
-                            TicketSubCategory subCategory = subCategoryMap.get(t.getSubCategoryId());
+                        resolvedOpt, ticketSearchType, searchTerm, searchText, userCategoryIds);
-                            return subCategory != null && subCategory.isVisibility();
-                        })
-                        .collect(Collectors.toList());
-                size = tickets.size();
             } else {
-                // Non-CRM admins see only tickets assigned to them
-                if (ticketSearchType == null) {
-                    if (ticketStatus.equals(TicketStatus.RESOLVED)) {
-                        tickets = ticketRepository.selectAllByAssignee(authUserId, Optional.empty(), sortOrder, null, searchTerm);
-                        size = ticketRepository.selectAllCountByAssignee(authUserId, Optional.empty(), null, searchTerm);
-                    } else {
-                        tickets = ticketRepository.selectAllByAssignee(authUserId, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, null, searchTerm);
-                        size = ticketRepository.selectAllCountByAssignee(authUserId, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm);
+                Optional<Boolean> resolvedOpt = ticketStatus.equals(TicketStatus.RESOLVED) ? Optional.empty() : Optional.of(TicketStatus.CLOSED.equals(ticketStatus));
-                    }
-                } else {
-                    if (ticketStatus.equals(TicketStatus.RESOLVED)) {
+                tickets = ticketRepository.selectAllByAssigneePaginated(
-                        tickets = ticketRepository.selectAllByAssignee(authUserId, Optional.empty(), sortOrder, ticketSearchType, searchTerm);
+                        authUserId, resolvedOpt, sortOrder, ticketSearchType, searchTerm, searchText,
-                        size = ticketRepository.selectAllCountByAssignee(authUserId, Optional.empty(), ticketSearchType, searchTerm);
-                    } else {
+                        offset, pageSize);
-                        tickets = ticketRepository.selectAllByAssignee(authUserId, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, ticketSearchType, searchTerm);
+                totalRecords = ticketRepository.selectAllByAssigneePaginatedCount(
-                        size = ticketRepository.selectAllCountByAssignee(authUserId, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
+                        authUserId, resolvedOpt, ticketSearchType, searchTerm, searchText);
-                    }
-                }
+            }
-            // LOGGER.info(size + "size");
             if (tickets.size() > 0) {
                 ticketAssigneds = ticketAssignedRepository.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
                 authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
                 Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
                 model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+            }
         } else {
             tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder);
-            size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(), Optional.of(TicketStatus.OPENED.equals(ticketStatus)));
+            totalRecords = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(), Optional.of(TicketStatus.OPENED.equals(ticketStatus)));
+        }
         authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
         if (authUserIdAndAuthUserMap == null) {
             authUserIdAndAuthUserMap = new HashMap<>();
+        }
+        int totalPages = (int) Math.ceil((double) totalRecords / pageSize);
+        if (totalPages == 0) totalPages = 1;
+        int startRecord = totalRecords > 0 ? offset + 1 : 0;
+        int endRecord = (int) Math.min(offset + pageSize, totalRecords);
+        model.addAttribute("size", totalRecords);
+        model.addAttribute("totalRecords", totalRecords);
+        model.addAttribute("currentPage", page);
-        model.addAttribute("size", size);
+        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("totalPages", totalPages);
+        model.addAttribute("startRecord", startRecord);
+        model.addAttribute("endRecord", endRecord);
+        model.addAttribute("searchText", searchText != null ? searchText : "");
+        model.addAttribute("currentPageDisplay", page + 1);
+        model.addAttribute("prevPage", page - 1);
+        model.addAttribute("nextPage", page + 1);
+        model.addAttribute("lastPage", totalPages - 1);
         model.addAttribute("roleType", isAdmin);
-        // isCrmUser already calculated at start of method
         model.addAttribute("isCrmUser", isCrmUser);
         model.addAttribute("isSalesUser", isSalesUser);
         model.addAttribute("salesCategoryId", ProfitMandiConstants.TICKET_CATEGORY_SALES);
         model.addAttribute("isRbmUser", isRbmUser);
         model.addAttribute("rbmCategoryId", ProfitMandiConstants.TICKET_CATEGORY_RBM);
+        model.addAttribute("userCategoryIds", userCategoryIds);
         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, 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 = allActivities.stream().collect(Collectors.groupingBy(Activity::getTicketId));
             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));
+            }
+        }
+        int currentUserId;
+        UserType currentUserType;
+        if (isAdmin) {
+            currentUserId = currentAuthUser.getId();
+            currentUserType = UserType.AUTH_USER;
+        } else {
+            currentUserId = loginDetails.getFofoId();
+            currentUserType = UserType.PARTNER;
+        }
+        Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, currentUserId, currentUserType);
+        Map<Integer, Activity> lastActivityMap = csService.getLastActivitiesForTickets(ticketIds);
+        model.addAttribute("unreadMap", unreadMap);
+        model.addAttribute("lastActivityMap", lastActivityMap);
         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);
         model.addAttribute("selectedticketStatus", ticketStatus);
         model.addAttribute("selectedorderby", sortOrder);
         model.addAttribute("ticketSearchTypes", TicketSearchType.values());
         model.addAttribute("ticketSearchType", ticketSearchType);
         model.addAttribute("searchTerm", searchTerm);
-        return "ticket";
+    }
     @GetMapping(value = "/cs/getActivities")
     public String getActivity(HttpServletRequest request, @RequestParam(name = "ticketId", defaultValue = "0") int ticketId, Model model) throws Exception {
         return "response";
+    }
     @GetMapping(value = "/cs/myPartyTicketTicket")
     public String getMyPartyTicketTicket(HttpServletRequest request, @RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder, @RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus, @RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType, @RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm, Model model) throws ProfitMandiBusinessException {
+        populateMyPartnerTicketModel(request, sortOrder, ticketStatus, ticketSearchType, searchTerm, model);
+        return "my-partner-tickets";
+    }
+    @GetMapping(value = "/cs/myPartyTicket-content")
+    public String getMyPartyTicketContent(HttpServletRequest request,
+                                          @RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
+                                          @RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
+                                          @RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
+                                          @RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
+                                          Model model) throws ProfitMandiBusinessException {
+        populateMyPartnerTicketModel(request, sortOrder, ticketStatus, ticketSearchType, searchTerm, model);
+        return "my-partner-tickets-content";
+    }
+    private void populateMyPartnerTicketModel(HttpServletRequest request, SortOrder sortOrder, TicketStatus ticketStatus,
+                                              TicketSearchType ticketSearchType, int searchTerm, Model model) throws ProfitMandiBusinessException {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-        long size = 0;
         AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
         List<Ticket> tickets = new ArrayList<>();
         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()) {
-            // Batch fetch all open tickets for all fofoIds (fix N+1 query)
             List<Ticket> allPartnerTickets = ticketRepository.selectAllOpenTickets(new ArrayList<>(fofoIds));
             if (allPartnerTickets != null && !allPartnerTickets.isEmpty()) {
-                // Filter tickets where last_activity is not "RESOLVED"
                 tickets = allPartnerTickets.stream()
                         .filter(ticket -> ticket.getLastActivity() == null ||
                                 ticket.getLastActivity() != ActivityType.RESOLVED)
                         .collect(Collectors.toList());
+            }
+        }
         authUserListMap = csService.getAssignedAuthList(tickets);
         if (tickets.size() > 0) {
             Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
             model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+        }
+        // Pagination for partner tickets (in-memory since selectAllOpenTickets doesn't support DB-level pagination)
+        long totalRecords = tickets.size();
+        int totalPages = totalRecords > 0 ? (int) Math.ceil((double) totalRecords / 25) : 1;
+        model.addAttribute("totalRecords", totalRecords);
+        model.addAttribute("currentPage", 0);
+        model.addAttribute("pageSize", 25);
+        model.addAttribute("totalPages", totalPages);
+        model.addAttribute("startRecord", totalRecords > 0 ? 1 : 0);
+        model.addAttribute("endRecord", totalRecords);
+        model.addAttribute("currentPageDisplay", 1);
+        model.addAttribute("prevPage", 0);
+        model.addAttribute("nextPage", 1);
+        model.addAttribute("lastPage", totalPages - 1);
         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);
         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 = allActivities.stream().collect(Collectors.groupingBy(Activity::getTicketId));
             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));
+            }
+        }
+        Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, authUser.getId(), UserType.AUTH_USER);
+        Map<Integer, Activity> lastActivityMap = csService.getLastActivitiesForTickets(
+                tickets.stream().map(Ticket::getId).collect(Collectors.toList()));
+        model.addAttribute("unreadMap", unreadMap);
+        model.addAttribute("lastActivityMap", lastActivityMap);
         model.addAttribute("ticketStatusValues", TicketStatus.values());
         model.addAttribute("orderByValues", SortOrder.values());
         model.addAttribute("selectedticketStatus", ticketStatus);
         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 != null ? authUserListMap : new HashMap<>());
         model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
         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")
+    public String getManagerTickets(HttpServletRequest request,
+                                    @RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
+                                    @RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
+                                    @RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
+                                    @RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
+                                    @RequestParam(name = "page", defaultValue = "0") int page,
+                                    @RequestParam(name = "pageSize", defaultValue = "25") int pageSize,
+                                    @RequestParam(name = "search", required = false) String searchText,
+                                    Model model) throws ProfitMandiBusinessException {
+        populateManagerTicketModel(request, sortOrder, ticketStatus, ticketSearchType, searchTerm, page, pageSize, searchText, model);
+        return "managerTicket";
+    }
+    @GetMapping(value = "/cs/managerTicket-content")
+    public String getManagerTicketContent(HttpServletRequest request,
+                                          @RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder,
+                                          @RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus,
+                                          @RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType,
+                                          @RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm,
+                                          @RequestParam(name = "page", defaultValue = "0") int page,
+                                          @RequestParam(name = "pageSize", defaultValue = "25") int pageSize,
+                                          @RequestParam(name = "search", required = false) String searchText,
+                                          Model model) throws ProfitMandiBusinessException {
+        populateManagerTicketModel(request, sortOrder, ticketStatus, ticketSearchType, searchTerm, page, pageSize, searchText, model);
+        return "managerTicket-content";
+    }
-    public String getManagerTickets(HttpServletRequest request, @RequestParam(name = "orderby", defaultValue = "DESCENDING") SortOrder sortOrder, @RequestParam(name = "ticketStatus", defaultValue = "OPENED") TicketStatus ticketStatus, @RequestParam(name = "ticketSearchType", defaultValue = "") TicketSearchType ticketSearchType, @RequestParam(name = "searchTerm", defaultValue = "0") int searchTerm, Model model) throws ProfitMandiBusinessException {
+    private void populateManagerTicketModel(HttpServletRequest request, SortOrder sortOrder, TicketStatus ticketStatus,
+                                            TicketSearchType ticketSearchType, int searchTerm, int page, int pageSize,
+                                            String searchText, Model model) throws ProfitMandiBusinessException {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-        long size = 0;
+        long totalRecords = 0;
         AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+        // Block L1-only users from accessing manager tickets
+        List<Position> positions = positionRepository.selectAllByAuthUserId(authUser.getId());
+        boolean isAboveL1 = positions.stream().anyMatch(pos -> pos.getEscalationType() != EscalationType.L1);
+        if (!isAboveL1) {
+            throw new ProfitMandiBusinessException("ManagerTicket", 0, "Access denied: requires at least L2 position");
+        }
         boolean isCrmUser = positionRepository.hasCategory(authUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
+        List<Integer> userCategoryIds = positionRepository.selectCategoryIdsByAuthUserId(authUser.getId());
         List<Ticket> tickets = null;
         Map<Integer, List<AuthUser>> authUserListMap = null;
-        // CRM users can see all tickets to assign them (like managers)
+        int offset = page * pageSize;
+        Optional<Boolean> resolvedOpt = ticketStatus.equals(TicketStatus.RESOLVED) ? Optional.empty() : Optional.of(TicketStatus.CLOSED.equals(ticketStatus));
         if (isCrmUser) {
-            if (ticketStatus.equals(TicketStatus.RESOLVED)) {
-                tickets = ticketRepository.selectAllTickets(Optional.empty(), sortOrder, ticketSearchType, searchTerm);
+            tickets = ticketRepository.selectAllTicketsPaginated(
-                size = ticketRepository.selectAllTicketsCount(Optional.empty(), ticketSearchType, searchTerm);
+                    resolvedOpt, sortOrder, ticketSearchType, searchTerm, searchText,
-            } else {
-                tickets = ticketRepository.selectAllTickets(Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, ticketSearchType, searchTerm);
-                size = ticketRepository.selectAllTicketsCount(Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
-            }
-        } else if (ticketSearchType == null) {
-            if (ticketStatus.equals(TicketStatus.RESOLVED)) {
+                    userCategoryIds, offset, pageSize);
-                tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.empty(), null, searchTerm);
+            totalRecords = ticketRepository.selectAllTicketsPaginatedCount(
-                size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(), Optional.empty(), null, 0);
+                    resolvedOpt, ticketSearchType, searchTerm, searchText, userCategoryIds);
-            } else {
-                tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, searchTerm);
-                size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), null, 0);
-            }
         } else {
-            if (ticketStatus.equals(TicketStatus.RESOLVED)) {
+            tickets = ticketRepository.selectAllManagerTicketPaginated(
-                tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.empty(), ticketSearchType, searchTerm);
+                    authUser.getId(), sortOrder, resolvedOpt, ticketSearchType, searchTerm, searchText,
-                size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(), Optional.empty(), ticketSearchType, searchTerm);
-            } else {
+                    offset, pageSize);
-                tickets = ticketRepository.selectAllManagerTicket(authUser.getId(), sortOrder, Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
+            totalRecords = ticketRepository.selectAllCountByManagerTicketPaginated(
-                size = ticketRepository.selectAllCountByManagerTicket(authUser.getId(), Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), ticketSearchType, searchTerm);
+                    authUser.getId(), resolvedOpt, ticketSearchType, searchTerm, searchText);
-            }
+        }
         authUserListMap = csService.getAssignedAuthList(tickets);
         if (tickets.size() > 0) {
             Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
             model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+        }
+        int totalPages = (int) Math.ceil((double) totalRecords / pageSize);
+        if (totalPages == 0) totalPages = 1;
+        int startRecord = totalRecords > 0 ? offset + 1 : 0;
+        int endRecord = (int) Math.min(offset + pageSize, totalRecords);
+        model.addAttribute("size", totalRecords);
+        model.addAttribute("totalRecords", totalRecords);
+        model.addAttribute("currentPage", page);
-        model.addAttribute("size", size);
+        model.addAttribute("pageSize", pageSize);
+        model.addAttribute("totalPages", totalPages);
+        model.addAttribute("startRecord", startRecord);
+        model.addAttribute("endRecord", endRecord);
+        model.addAttribute("searchText", searchText != null ? searchText : "");
+        model.addAttribute("currentPageDisplay", page + 1);
+        model.addAttribute("prevPage", page - 1);
+        model.addAttribute("nextPage", page + 1);
+        model.addAttribute("lastPage", totalPages - 1);
         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) {
         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 = allActivities.stream().collect(Collectors.groupingBy(Activity::getTicketId));
             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));
+            }
+        }
+        Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, authUser.getId(), UserType.AUTH_USER);
+        Map<Integer, Activity> lastActivityMap = csService.getLastActivitiesForTickets(
+                tickets.stream().map(Ticket::getId).collect(Collectors.toList()));
+        model.addAttribute("unreadMap", unreadMap);
+        model.addAttribute("lastActivityMap", lastActivityMap);
         model.addAttribute("ticketStatusValues", TicketStatus.values());
         model.addAttribute("orderByValues", SortOrder.values());
         model.addAttribute("selectedticketStatus", ticketStatus);
         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("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
         model.addAttribute("activityMap", activityMap);
         model.addAttribute("authUserMap", authUserMap);
         model.addAttribute("activityMapWithActivityId", activityMapWithActivityId);
         model.addAttribute("isCrmUser", isCrmUser);
-        return "managerTicket";
+    }
     @GetMapping(value = "/cs/edit-ticket")
     public String getEditTicket(HttpServletRequest request, @RequestParam(name = "ticketId", defaultValue = "0") int ticketId, Model model) throws ProfitMandiBusinessException {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         AuthUser currentAuthUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
         boolean isCrmUser = positionRepository.hasCategory(currentAuthUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
         Ticket ticket = ticketRepository.selectById(ticketId);
+        if (ticket == null) {
-        List<TicketCategory> ticketCategories = csService.getAllTicketCategotyFromSubCategory();
+            throw new ProfitMandiBusinessException("Ticket", ticketId, "Ticket not found");
+        }
         TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.selectById(ticket.getSubCategoryId());
+        int ticketCategoryId = ticketSubCategory.getCategoryId();
+        boolean isVisibleSubCategory = ticketSubCategory.isVisibility();
+        // Check permissions
+        boolean hasPositionInCategory = positionRepository.hasCategory(currentAuthUser.getId(), ticketCategoryId);
+        List<TicketAssigned> assignments = ticketAssignedRepository.selectByTicketIds(Arrays.asList(ticketId));
+        boolean isAssigned = assignments.stream().anyMatch(ta -> ta.getAssineeId() == currentAuthUser.getId() || ta.getManagerId() == currentAuthUser.getId());
+        boolean isInEscalationChain = ticket.getL1AuthUser() == currentAuthUser.getId() ||
+                ticket.getL2AuthUser() == currentAuthUser.getId() ||
+                ticket.getL3AuthUser() == currentAuthUser.getId() ||
+                ticket.getL4AuthUser() == currentAuthUser.getId() ||
+                ticket.getL5AuthUser() == currentAuthUser.getId();
+        boolean canEdit = (isCrmUser && isVisibleSubCategory)
+                || hasPositionInCategory
+                || isAssigned
+                || isInEscalationChain;
+        if (!canEdit) {
+            throw new ProfitMandiBusinessException("Ticket", ticketId, "You do not have permission to edit this ticket");
+        }
+        List<TicketCategory> ticketCategories = csService.getAllTicketCategotyFromSubCategory();
         List<TicketSubCategory> ticketSubCategories = ticketSubCategoryRepository.selectAll(ticketSubCategory.getCategoryId());
         List<AuthUser> authUsers = authRepository.selectAllActiveUser();
         // CRM users should not see invisible subcategories
         if (isCrmUser) {
         Ticket ticket = ticketRepository.selectById(ticketId);
         if (ticket == null) {
             throw new ProfitMandiBusinessException("Ticket", ticketId, "Ticket not found");
+        }
-        // Verify admin has access to this ticket (assigned, manager, escalation chain, or CRM)
+        // Verify admin has access to this ticket
         AuthUser currentAuthUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
         boolean isCrmUser = positionRepository.hasCategory(currentAuthUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
-        if (!isCrmUser) {
-            List<TicketAssigned> assignments = ticketAssignedRepository.selectByTicketIds(Arrays.asList(ticketId));
-            boolean isAssigned = assignments.stream().anyMatch(ta -> ta.getAssineeId() == currentAuthUser.getId() || ta.getManagerId() == currentAuthUser.getId());
-            boolean isInEscalationChain = ticket.getL1AuthUser() == currentAuthUser.getId() ||
-                    ticket.getL2AuthUser() == currentAuthUser.getId() ||
+        // Get ticket's subcategory to check visibility
-                    ticket.getL3AuthUser() == currentAuthUser.getId() ||
+        TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.selectById(ticket.getSubCategoryId());
-                    ticket.getL4AuthUser() == currentAuthUser.getId() ||
+        int ticketCategoryId = ticketSubCategory.getCategoryId();
-                    ticket.getL5AuthUser() == currentAuthUser.getId();
+        boolean isVisibleSubCategory = ticketSubCategory.isVisibility();
+        // Check if user has position in ticket's category
+        boolean hasPositionInCategory = positionRepository.hasCategory(currentAuthUser.getId(), ticketCategoryId);
-            if (!isAssigned && !isInEscalationChain) {
+        // Check if assigned or in escalation chain
-                throw new ProfitMandiBusinessException("Ticket", ticketId, "You do not have permission to edit this ticket");
+        List<TicketAssigned> assignments = ticketAssignedRepository.selectByTicketIds(Arrays.asList(ticketId));
+        boolean isAssigned = assignments.stream().anyMatch(ta -> ta.getAssineeId() == currentAuthUser.getId() || ta.getManagerId() == currentAuthUser.getId());
+        boolean isInEscalationChain = ticket.getL1AuthUser() == currentAuthUser.getId() ||
+                ticket.getL2AuthUser() == currentAuthUser.getId() ||
+                ticket.getL3AuthUser() == currentAuthUser.getId() ||
+                ticket.getL4AuthUser() == currentAuthUser.getId() ||
+                ticket.getL5AuthUser() == currentAuthUser.getId();
+        // Permission rules:
+        // 1. CRM user AND ticket has visible subcategory, OR
+        // 2. Has position in ticket's category (can edit even invisible), OR
+        // 3. Is assigned to ticket, OR
+        // 4. Is in escalation chain
+        boolean canEdit = (isCrmUser && isVisibleSubCategory)
+                || hasPositionInCategory
+                || isAssigned
+                || isInEscalationChain;
-            }
+        if (!canEdit) {
+            throw new ProfitMandiBusinessException("Ticket", ticketId, "You do not have permission to edit this ticket");
+        }
         csService.updateTicket(categoryId, subCategoryId, ticket, authUserId, escalationType);
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
+    }
+    @PostMapping(value = "/cs/markTicketRead")
+    @ResponseBody
+    public Map<String, Object> markTicketRead(HttpServletRequest request,
+                                              @RequestParam(name = "ticketId") int ticketId,
+                                              Model model) throws ProfitMandiBusinessException {
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
+        Map<String, Object> response = new HashMap<>();
+        if (isAdmin) {
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            csService.markTicketAsRead(ticketId, authUser.getId(), UserType.AUTH_USER);
+        } else {
+            csService.markTicketAsRead(ticketId, loginDetails.getFofoId(), UserType.PARTNER);
+        }
+        response.put("success", true);
+        return response;
+    }
+    @GetMapping(value = "/cs/unreadCount")
+    @ResponseBody
+    public Map<String, Object> getUnreadCount(HttpServletRequest request) throws ProfitMandiBusinessException {
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
+        Map<String, Object> response = new HashMap<>();
+        List<Ticket> tickets;
+        int userId;
+        UserType userType;
+        if (isAdmin) {
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            userId = authUser.getId();
+            userType = UserType.AUTH_USER;
+            boolean isCrmUser = positionRepository.hasCategory(authUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
+            List<Integer> userCategoryIds = positionRepository.selectCategoryIdsByAuthUserId(authUser.getId());
+            if (isCrmUser) {
+                tickets = ticketRepository.selectAllTicketsPaginated(
+                        Optional.of(false), null, null, 0, null,
+                        userCategoryIds, 0, 1000);
+            } else {
+                tickets = ticketRepository.selectAllByAssigneePaginated(
+                        authUser.getId(), Optional.of(false), null, null, 0, null,
+, 1000);
+            }
+        } else {
+            userId = loginDetails.getFofoId();
+            userType = UserType.PARTNER;
+            tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(), Optional.of(true), null);
+        }
+        Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, userId, userType);
+        long unreadCount = unreadMap.values().stream().filter(v -> v).count();
+        response.put("success", true);
+        response.put("unreadCount", unreadCount);
+        return response;
+    }
+}

Subversion Repositories SmartDukaan

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