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

             // Admins must be assigned to the ticket OR be CRM user OR be in the escalation chain
             AuthUser currentAuthUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
             boolean isCrmUser = positionRepository.hasCategory(currentAuthUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_CRM);
             if (!isCrmUser) {
+                // Assigned = user was ever the assignee or manager on this ticket (any level).
+                // The old l1..l5AuthUser fallback check was fully subsumed by this since it
-                // Check if user is assigned or in escalation chain
+                // includes every past TicketAssigned row.
                 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();
                 // Check if user is related to this partner (RBM, ASM, BM etc.)
                 boolean isRelatedToPartner = false;
-                if (!isAssigned && !isInEscalationChain) {
+                if (!isAssigned) {
                     List<AuthUser> relatedUsers = csService.getAuthUserIdByPartnerId(ticket.getFofoId());
                     isRelatedToPartner = relatedUsers.stream()
                             .anyMatch(au -> au.getId() == currentAuthUser.getId());
                     if (!isRelatedToPartner) {
                         throw new ProfitMandiBusinessException("Ticket", ticketId, "You do not have permission to view this ticket");
+                    }
+                }
-                // User can view but cannot take action if only related to partner (not assigned/escalation)
+                // User can view but cannot take action if only related to partner (not assigned)
-                model.addAttribute("canTakeAction", isAssigned || isInEscalationChain);
+                model.addAttribute("canTakeAction", isAssigned);
+            }
+        }
         List<Activity> allactivities = activityRepository.selectAll(ticketId);
             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() ||
-                        ticket.getL3AuthUser() == currentAuthUser.getId() ||
-                        ticket.getL4AuthUser() == currentAuthUser.getId() ||
-                        ticket.getL5AuthUser() == currentAuthUser.getId();
-                if (!isAssigned && !isInEscalationChain) {
+                if (!isAssigned) {
                     throw new ProfitMandiBusinessException("Ticket", ticketId, "You do not have permission to add activity to this ticket");
+                }
+            }
+        }
         List<TicketAssigned> ticketAssignedList = ticketAssignedRepository.selectByTicketIds(Arrays.asList(ticketId));
+            }
+        }
         authUserListMap = csService.getAssignedAuthList(tickets);
-        // Find which tickets are assigned to or escalated to this user (can take action)
+        // Find which tickets are assigned to or escalated to this user (can take action).
+        // TicketAssigned history covers every past assignee + manager pair, which fully
+        // subsumes the previous l1..l5AuthUser fallback loop.
         Set<Integer> actionableTicketIds = new HashSet<>();
         if (tickets.size() > 0) {
             List<TicketAssigned> allAssignments = ticketAssignedRepository.selectByTicketIds(
                     tickets.stream().map(Ticket::getId).collect(Collectors.toList()));
             for (TicketAssigned ta : allAssignments) {
                 if (ta.getAssineeId() == authUser.getId() || ta.getManagerId() == authUser.getId()) {
                     actionableTicketIds.add(ta.getTicketId());
+                }
+            }
-            // Also check escalation chain
-            for (Ticket t : tickets) {
-                if (t.getL1AuthUser() == authUser.getId() || t.getL2AuthUser() == authUser.getId()
-                        || t.getL3AuthUser() == authUser.getId() || t.getL4AuthUser() == authUser.getId()
-                        || t.getL5AuthUser() == authUser.getId()) {
-                    actionableTicketIds.add(t.getId());
-                }
-            }
             Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
             model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
+        }
         model.addAttribute("actionableTicketIds", actionableTicketIds);
         // 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
+                || isAssigned;
-                || isInEscalationChain;
         if (!canEdit) {
             throw new ProfitMandiBusinessException("Ticket", ticketId, "You do not have permission to edit this ticket");
+        }
         boolean isVisibleSubCategory = ticketSubCategory.isVisibility();
         // Check if user has position in ticket's category
         boolean hasPositionInCategory = positionRepository.hasCategory(currentAuthUser.getId(), ticketCategoryId);
-        // Check if assigned or in escalation chain
+        // Check if assigned (assignee or manager at any level in history)
         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
+        // 3. Is assigned to ticket at any past level (assignee or manager)
-        // 4. Is in escalation chain
         boolean canEdit = (isCrmUser && isVisibleSubCategory)
                 || hasPositionInCategory
-                || isAssigned
+                || isAssigned;
-                || isInEscalationChain;
         if (!canEdit) {
             throw new ProfitMandiBusinessException("Ticket", ticketId, "You do not have permission to edit this ticket");
+        }
                 activity.setTicketId(ticketId);
                 activity.setType(ActivityType.COMMUNICATION_IN);
                 activity.setCreateTimestamp(LocalDateTime.now());
             } else {
                 String message = String.format(INTERNAL_REOPEN_MAIL, ticketId, retailerService.getFofoRetailer(loginDetails.getFofoId()).getBusinessName());
+                // Reopen mail goes to the current assignee with the current manager on CC.
+                // Previously fanned out to all l1..l5 slots which were pre-populated at creation.
+                String to = ticket.getCurrentAssigneeId() > 0
-                String to = authRepository.selectById(ticket.getL1AuthUser()).getEmailId();
+                        ? authRepository.selectById(ticket.getCurrentAssigneeId()).getEmailId()
+                        : null;
+                String[] ccTo = ticket.getCurrentManagerId() > 0
-                String[] ccTo = authRepository.selectByIds(Arrays.asList(ticket.getL2AuthUser(), ticket.getL3AuthUser(), ticket.getL4AuthUser(), ticket.getL5AuthUser())).stream().map(x -> x.getEmailId()).toArray(String[]::new);
+                        ? new String[]{authRepository.selectById(ticket.getCurrentManagerId()).getEmailId()}
+                        : new String[0];
                 ticket.setLastActivity(lastActivity);
                 ticket.setUpdateTimestamp(LocalDateTime.now());
                 ticketAssignedRepository.deleteByTicketId(ticketId);
                 TicketAssigned ticketAssigned = new TicketAssigned();
-                ticketAssigned.setAssineeId(ticket.getL1AuthUser());
+                ticketAssigned.setAssineeId(ticket.getCurrentAssigneeId());
                 ticketAssigned.setTicketId(ticketId);
                 ticketAssignedRepository.persist(ticketAssigned);
                 activity.setMessage(INTERNAL_REOPEN_ACTIVITY_MESSAGE);
                 activity.setCreatedBy(0);
                 activity.setTicketId(ticketId);

Subversion Repositories SmartDukaan

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