WebSVN – SmartDukaan – Diff – //trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java

             newEscalationType = ticketAssigned.getEscalationType().next();
             if (newEscalationType == null || newEscalationType.equals(EscalationType.Final)) {
                 LOGGER.info("Cant escalate further");
                 return;
+            }
-        } else {
-            ticket.setL1AuthUser(0);
-            ticket.setL2AuthUser(0);
-            ticket.setL3AuthUser(0);
-            ticket.setL4AuthUser(0);
-            ticket.setL5AuthUser(0);
+        }
         ticket.setUpdateTimestamp(LocalDateTime.now());
         TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.selectById(ticket.getSubCategoryId());
         TicketCategory ticketCategory = ticketCategoryRepository.selectById(ticketSubCategory.getCategoryId());
-        Map<Integer, EscalationType> escalationUserMap = new HashedMap<>();
-        Set<Integer> assigneeUserIds = new LinkedHashSet<>();
-        EscalationType escalationTypeNext = newEscalationType;
-        do {
-            int assigneeUserId = this.getAuthUserId(ticketCategory.getId(), escalationTypeNext, ticket.getFofoId());
-            if (assigneeUserId == 0) {
-                escalationTypeNext = escalationTypeNext.next();
-                LOGGER.info("Escalation type next {}", escalationTypeNext);
-                continue;
-            }
-            assigneeUserIds.add(assigneeUserId);
-            escalationUserMap.put(assigneeUserId, escalationTypeNext);
-            switch (escalationTypeNext) {
-                case L1:
-                    ticket.setL1AuthUser(assigneeUserId);
-                    break;
-                case L2:
-                    ticket.setL2AuthUser(assigneeUserId);
-                    break;
-                case L3:
-                    ticket.setL3AuthUser(assigneeUserId);
-                    break;
-                case L4:
-                    ticket.setL4AuthUser(assigneeUserId);
-                    break;
-                case L5:
-                    ticket.setL5AuthUser(assigneeUserId);
-                    break;
-                default:
-                    break;
+        // One-step escalation: pick the current-level assignee (with fallback to next level if
-            }
-            escalationTypeNext = escalationTypeNext.next();
+        // the current level has no one configured), then pick one more level up as the manager.
-            // LOGGER.info("Escalation type next {}", escalationTypeNext);
+        // History is preserved in ticket_assigned; Ticket only carries current state.
-        } while (!escalationTypeNext.equals(EscalationType.Final));
+        EscalationAssignmentResult assigneeResult =
-        int assigneeAuthId = assigneeUserIds.stream().findFirst().orElse(0);
+                this.getAuthUserWithFallback(ticketCategory.getId(), newEscalationType, ticket.getFofoId());
-        int managerAuthId = 0;
+        int assigneeAuthId;
-        EscalationType assigneeEscalationType = null;
+        EscalationType assigneeEscalationType;
+        int managerAuthId;
-        if (assigneeAuthId == 0) {
+        if (assigneeResult.getAuthUserId() == 0) {
             assigneeAuthId = ProfitMandiConstants.FINAL_AUTH_ID;
             assigneeEscalationType = EscalationType.Final;
             managerAuthId = ProfitMandiConstants.FINAL_AUTH_ID;
         } else {
+            assigneeAuthId = assigneeResult.getAuthUserId();
-            assigneeEscalationType = escalationUserMap.get(assigneeAuthId);
+            assigneeEscalationType = assigneeResult.getActualEscalationType();
-            managerAuthId = assigneeUserIds.stream().skip(1).findFirst().orElse(0);
+            EscalationType managerLevel = assigneeEscalationType.next();
-            if (managerAuthId == 0) {
+            if (managerLevel == null || managerLevel.equals(EscalationType.Final)) {
                 managerAuthId = ProfitMandiConstants.FINAL_AUTH_ID;
+            } else {
+                EscalationAssignmentResult managerResult =
+                        this.getAuthUserWithFallback(ticketCategory.getId(), managerLevel, ticket.getFofoId());
+                managerAuthId = managerResult.getAuthUserId() > 0
+                        ? managerResult.getAuthUserId()
+                        : ProfitMandiConstants.FINAL_AUTH_ID;
+            }
+        }
+        ticket.setCurrentAssigneeId(assigneeAuthId);
+        ticket.setCurrentManagerId(managerAuthId);
+        ticket.setCurrentEscalationLevel(assigneeEscalationType);
         TicketAssigned ticketAssignedNew = new TicketAssigned();
         ticketAssignedNew.setTicketId(ticket.getId());
         ticketAssignedNew.setAssineeId(assigneeAuthId);
         ticketAssignedNew.setEscalationType(assigneeEscalationType);
         ticketAssignedNew.setManagerId(managerAuthId);
         } else {
             this.addActivity(ticket, this.createActivity(ActivityType.ASSIGNED, "Ticket assigned to " + authUser.getName(), currentUserId));
+        }
+    }
+    @Override
+    public boolean isInEscalationChain(int ticketId, int authId) {
+        if (ticketId <= 0 || authId <= 0) {
+            return false;
+        }
+        return ticketAssignedRepository.selectByAssigneeIdAndTicketId(authId, ticketId) != null;
+    }
+    @Override
+    public Set<Integer> ticketsInEscalationChain(int authId, List<Integer> ticketIds) {
+        if (authId <= 0 || ticketIds == null || ticketIds.isEmpty()) {
+            return Collections.emptySet();
+        }
+        return ticketAssignedRepository.selectByTicketIds(ticketIds).stream()
+                .filter(ta -> ta.getAssineeId() == authId)
+                .map(TicketAssigned::getTicketId)
+                .collect(Collectors.toSet());
+    }
     public void updateTicket(int categoryId, int subCategoryId, Ticket ticket, int authUserId, EscalationType escalationType) throws ProfitMandiBusinessException {
         this.updateTicket(categoryId, subCategoryId, ticket, authUserId, escalationType, null,0);
+    }
     @Override
         LOGGER.info("authUser {}", authUser);
         int managerAuthId = authUser.getManagerId();
-        TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.selectById(ticket.getSubCategoryId());
-        TicketCategory ticketCategory = ticketCategoryRepository.selectById(ticketSubCategory.getCategoryId());
+        // One-step model: the manual assignment records the current assignee and the
-        int authUserL2 = this.getAuthUserId(ticketCategory.getId(), EscalationType.L2, ticket.getFofoId());
+        // configured next-level manager. Downstream escalations still walk one level per
-        int authUserL3 = this.getAuthUserId(ticketCategory.getId(), EscalationType.L3, ticket.getFofoId());
-        int authUserL4 = this.getAuthUserId(ticketCategory.getId(), EscalationType.L4, ticket.getFofoId());
-        int authUserL5 = this.getAuthUserId(ticketCategory.getId(), EscalationType.L5, ticket.getFofoId());
+        // cron cycle in assignTicket(). History remains in ticket_assigned.
-        if (escalationType.equals(EscalationType.L1)) {
-            ticket.setL1AuthUser(authUserId);
+        int nextLevelManagerId = 0;
-            ticket.setL2AuthUser(authUserL2);
-            ticket.setL3AuthUser(authUserL3);
+        if (escalationType != null) {
-            ticket.setL4AuthUser(authUserL4);
-            ticket.setL5AuthUser(authUserL5);
+            EscalationType nextLevel = escalationType.next();
-        } else if (escalationType.equals(EscalationType.L2)) {
+            if (nextLevel != null && !nextLevel.equals(EscalationType.Final)) {
-            ticket.setL2AuthUser(authUserId);
+                TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.selectById(ticket.getSubCategoryId());
-            ticket.setL3AuthUser(authUserL3);
-            ticket.setL4AuthUser(authUserL4);
+                TicketCategory ticketCategory = ticketCategoryRepository.selectById(ticketSubCategory.getCategoryId());
-            ticket.setL5AuthUser(authUserL5);
+                EscalationAssignmentResult mgr =
-        }
-        if (escalationType.equals(EscalationType.L3)) {
+                        this.getAuthUserWithFallback(ticketCategory.getId(), nextLevel, ticket.getFofoId());
-            ticket.setL3AuthUser(authUserId);
+                nextLevelManagerId = mgr.getAuthUserId();
-            ticket.setL4AuthUser(authUserL4);
-            ticket.setL5AuthUser(authUserL5);
-        }
+            }
-        if (escalationType.equals(EscalationType.L4)) {
-            ticket.setL4AuthUser(authUserId);
-            ticket.setL5AuthUser(authUserL5);
+        }
-        if (escalationType.equals(EscalationType.L5)) {
+        if (nextLevelManagerId <= 0) {
-            ticket.setL5AuthUser(authUserId);
+            nextLevelManagerId = managerAuthId > 0 ? managerAuthId : ProfitMandiConstants.FINAL_AUTH_ID;
+        }
+        ticket.setCurrentAssigneeId(authUserId);
+        ticket.setCurrentManagerId(nextLevelManagerId);
+        ticket.setCurrentEscalationLevel(escalationType);
         TicketAssigned ticketAssignedNew = new TicketAssigned();
         ticketAssignedNew.setTicketId(ticket.getId());
         ticketAssignedNew.setAssineeId(authUserId);
         ticketAssignedNew.setEscalationType(escalationType);
     @Override
     public Map<Integer, AuthUser> getTicketIdAndAuthUserMapUsingTickets(List<Ticket> tickets) {
         if (tickets == null || tickets.isEmpty()) {
             return new HashMap<>();
+        }
-        // OPTIMIZED: Batch fetch all AuthUsers instead of N+1 queries
+        // Batch fetch AuthUsers by current_assignee_id (one owner per ticket in the new model).
         List<Integer> authUserIds = tickets.stream()
-                .map(this::getEffectiveAuthUserId)
+                .map(Ticket::getCurrentAssigneeId)
-                .filter(id -> id != null && id > 0)
+                .filter(id -> id > 0)
                 .distinct()
                 .collect(Collectors.toList());
         Map<Integer, AuthUser> authUserById = authRepository.selectByIds(authUserIds).stream()
                 .collect(Collectors.toMap(AuthUser::getId, au -> au, (a, b) -> a));
         Map<Integer, AuthUser> authUserIdAndAuthUserMap = new HashMap<>();
         for (Ticket ticket : tickets) {
-            authUserIdAndAuthUserMap.put(ticket.getId(), authUserById.get(ticket.getL1AuthUser()));
+            authUserIdAndAuthUserMap.put(ticket.getId(), authUserById.get(ticket.getCurrentAssigneeId()));
+        }
         return authUserIdAndAuthUserMap;
+    }
-    private Integer getEffectiveAuthUserId(Ticket ticket) {
-        if (ticket.getL1AuthUser() > 0) {
-            return ticket.getL1AuthUser();
-        }
-        if (ticket.getL2AuthUser() > 0) {
-            return ticket.getL2AuthUser();
-        }
-        if (ticket.getL3AuthUser() > 0) {
-            return ticket.getL3AuthUser();
-        }
-        if (ticket.getL4AuthUser() > 0) {
-            return ticket.getL4AuthUser();
-        }
-        return null;
-    }
     @Override
     public Map<Integer, TicketSubCategory> getSubCategoryIdAndSubCategoryMap(List<Integer> subCategoryIds) {
         Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = new HashMap<>();
         subCategoryIdAndSubCategoryMap = ticketSubCategoryRepository.selectByIds(subCategoryIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));

Subversion Repositories SmartDukaan

(root)//trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java – Rev 36972 → 37145