WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java

                             || t.getL5AuthUser() == authId)
                     .map(Ticket::getFofoId)
                     .distinct()
                     .collect(Collectors.toList());
-            // Get today's remarks created by L2
+            // Get today's remarks created by L2 (all remarks, not deduplicated)
             List<PartnerCollectionRemark> todayRemarks = partnerCollectionRemarkRepository
                     .selectAllByAuthIdsOnDate(Collections.singletonList(authId), today);
-            // Deduplicate by fofoId - keep latest remark per partner (list is ordered by id DESC)
-            Map<Integer, PartnerCollectionRemark> uniqueRemarksByFofoId = new LinkedHashMap<>();
-            for (PartnerCollectionRemark remark : todayRemarks) {
-                uniqueRemarksByFofoId.putIfAbsent(remark.getFofoId(), remark);
-            }
-            return buildCalledPartnerResult(uniqueRemarksByFofoId);
+            return buildCalledPartnerResult(todayRemarks);
+        }
         // L1 Logic
         Map<String, Set<Integer>> storeGuyMap;
         try {
                 targetFofoIds.add(fofoId);
+            }
             // rank 4 (FuturePlan) and rank 5 (Normal) are NOT in target
+        }
-        // Get today's remarks created by L1
+        // Get today's remarks created by L1 (all remarks, not deduplicated)
         List<PartnerCollectionRemark> todayRemarks = partnerCollectionRemarkRepository
                 .selectAllByAuthIdsOnDate(Collections.singletonList(authId), today);
-        // Deduplicate by fofoId - keep latest remark per partner (list is ordered by id DESC)
-        Map<Integer, PartnerCollectionRemark> uniqueRemarksByFofoId = new LinkedHashMap<>();
-        for (PartnerCollectionRemark remark : todayRemarks) {
-            uniqueRemarksByFofoId.putIfAbsent(remark.getFofoId(), remark);
-        }
-        return buildCalledPartnerResult(uniqueRemarksByFofoId);
+        return buildCalledPartnerResult(todayRemarks);
+    }
-    private List<CalledPartnerDetailModel> buildCalledPartnerResult(Map<Integer, PartnerCollectionRemark> uniqueRemarksByFofoId) {
+    private List<CalledPartnerDetailModel> buildCalledPartnerResult(List<PartnerCollectionRemark> allRemarks) {
-        if (uniqueRemarksByFofoId.isEmpty()) {
+        if (allRemarks.isEmpty()) {
             return Collections.emptyList();
+        }
+        // Get unique fofoIds for retailer lookup
-        Set<Integer> fofoIds = uniqueRemarksByFofoId.keySet();
+        Set<Integer> fofoIds = allRemarks.stream()
+                .map(PartnerCollectionRemark::getFofoId)
+                .collect(Collectors.toSet());
         Map<Integer, CustomRetailer> retailerMap = Collections.emptyMap();
         try {
             retailerMap = retailerService.getFofoRetailers(new ArrayList<>(fofoIds));
         } catch (ProfitMandiBusinessException e) {
             LOGGER.error("Error fetching fofo stores", e);
+        }
         // Fetch call logs for remarks that have agentCallLogId
         Map<Long, com.spice.profitmandi.dao.entity.cs.AgentCallLog> callLogMap = new HashMap<>();
         try {
-            List<Long> callLogIds = uniqueRemarksByFofoId.values().stream()
+            List<Long> callLogIds = allRemarks.stream()
                     .filter(r -> r.getAgentCallLogId() > 0)
                     .map(PartnerCollectionRemark::getAgentCallLogId)
                     .collect(Collectors.toList());
             if (!callLogIds.isEmpty()) {
         DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("hh:mm a");
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd-MM-yyyy hh:mm a");
         List<CalledPartnerDetailModel> result = new ArrayList<>();
-        for (PartnerCollectionRemark remark : uniqueRemarksByFofoId.values()) {
+        for (PartnerCollectionRemark remark : allRemarks) {
             CustomRetailer retailer = retailerMap.get(remark.getFofoId());
             String partyName = retailer != null
                     ? retailer.getBusinessName()
                     : "Unknown (" + remark.getFofoId() + ")";
             String code = retailer != null
         if (authUsers.isEmpty()) {
             return rows;
+        }
         AuthUser authUser = authUsers.get(0);
-        // Get positions to determine if L1 or L2
+        // Get positions to determine if L2
         List<Position> positions = positionRepository.selectPositionByAuthIds(Collections.singletonList(authId));
-        boolean isL1 = positions.stream()
-                .anyMatch(p -> ProfitMandiConstants.TICKET_CATEGORY_RBM == p.getCategoryId()
-                        && EscalationType.L1.equals(p.getEscalationType()));
         boolean isL2 = positions.stream()
                 .anyMatch(p -> ProfitMandiConstants.TICKET_CATEGORY_RBM == p.getCategoryId()
                         && EscalationType.L2.equals(p.getEscalationType()));
-        // Get fofo IDs for this RBM
+        LocalDateTime startDate = LocalDate.now().atStartOfDay();
-        Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
+        LocalDate firstOfMonth = LocalDate.now().withDayOfMonth(1);
-        List<Integer> fofoIdList = new ArrayList<>();
+        LocalDate endOfMonth = LocalDate.now().withDayOfMonth(LocalDate.now().lengthOfMonth()).plusDays(1);
+        // Get fofo IDs from mtdBillingData (same source as Partner Count in getRbmCallTargetModels)
+        List<RbmWeeklyBillingModel> mtdBillingData = getWeeklyBillingDataForMonth(firstOfMonth, endOfMonth);
+        List<Integer> fofoIdList;
         if (isL2) {
-            // L2: get fofo IDs from escalated tickets
+            // L2: get fofo IDs from escalated tickets (same as getRbmCallTargetModels)
             List<Ticket> escalatedTickets = ticketRepository.selectOpenEscalatedTicketsByAuthIds(Collections.singletonList(authId));
             fofoIdList = escalatedTickets.stream()
                     .filter(t -> t.getL2AuthUser() == authId
                             || t.getL3AuthUser() == authId
                             || t.getL4AuthUser() == authId
                             || t.getL5AuthUser() == authId)
                     .map(Ticket::getFofoId)
                     .distinct()
                     .collect(Collectors.toList());
+        } else {
+            // L1: get fofo IDs from mtdBillingData with isTargetedPartner (same as Partner Count)
+            fofoIdList = mtdBillingData.stream()
-        } else if (storeGuyMap.containsKey(authUser.getEmailId())) {
+                    .filter(RbmWeeklyBillingModel::isTargetedPartner)
-            fofoIdList = new ArrayList<>(storeGuyMap.get(authUser.getEmailId()));
+                    .filter(m -> m.getAuthId() == authId)
+                    .map(RbmWeeklyBillingModel::getFofoId)
+                    .distinct()
+                    .collect(Collectors.toList());
+        }
         if (fofoIdList.isEmpty()) {
             return rows;
+        }
-        LocalDateTime startDate = LocalDate.now().atStartOfDay();
-        LocalDate firstOfMonth = LocalDate.now().withDayOfMonth(1);
-        LocalDate endOfMonth = LocalDate.now().withDayOfMonth(LocalDate.now().lengthOfMonth()).plusDays(1);
-        // Get fofo stores
+        // MTD billed fofoIds for zero billing check
-        Map<Integer, FofoStore> fofoStoresMap = new HashMap<>();
+        Set<Integer> mtdBilledFofoIds = mtdBillingData.stream()
-        try {
-            fofoStoresMap = fofoStoreRepository.selectByRetailerIds(fofoIdList).stream()
-                    .collect(Collectors.toMap(FofoStore::getId, x -> x, (a, b) -> a));
-        } catch (ProfitMandiBusinessException e) {
-            LOGGER.error("Error fetching fofo stores", e);
-        }
-        // For L1 RBMs, filter escalated partners
-        if (isL1) {
-            List<Integer> allRemarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIdList);
-            if (!allRemarkIds.isEmpty()) {
-                Map<Integer, PartnerCollectionRemark> partnerCollectionRemarks = partnerCollectionRemarkRepository.selectByIds(allRemarkIds).stream()
-                        .collect(Collectors.toMap(PartnerCollectionRemark::getFofoId, x -> x, (a, b) -> a));
-                fofoIdList = partnerCollectionRemarks.entrySet().stream()
+                .filter(RbmWeeklyBillingModel::isMtdBilled)
-                        .filter(entry -> {
-                            PartnerCollectionRemark pcrMap = entry.getValue();
-                            return !(CollectionRemark.RBM_L2_ESCALATION.equals(pcrMap.getRemark())
-                                    || CollectionRemark.SALES_ESCALATION.equals(pcrMap.getRemark()));
-                        })
-                        .map(Map.Entry::getKey)
+                .map(RbmWeeklyBillingModel::getFofoId)
-                        .collect(Collectors.toList());
+                .collect(Collectors.toSet());
-            }
-        }
-        // Collection rank map
+        // Collection rank map for status calculation
         Map<Integer, Integer> collectionRankMap = new HashMap<>();
         try {
             collectionRankMap = partnerCollectionService.getCollectionRankMap(fofoIdList, startDate);
         } catch (ProfitMandiBusinessException e) {
             LOGGER.error("Error fetching collection rank map", e);
+        }
-        // MTD billing data
-        List<RbmWeeklyBillingModel> mtdBillingData = getWeeklyBillingDataForMonth(firstOfMonth, endOfMonth);
-        Set<Integer> mtdBilledFofoIds = mtdBillingData.stream()
-                .filter(RbmWeeklyBillingModel::isMtdBilled)
-                .map(RbmWeeklyBillingModel::getFofoId)
-                .collect(Collectors.toSet());
-        // Filter to valid fofo IDs (external, ACTIVE, has collection plan)
-        Map<Integer, Integer> finalCollectionRankMap = collectionRankMap;
-        Map<Integer, FofoStore> finalFofoStoresMap = fofoStoresMap;
-        List<Integer> validFofoIds = fofoIdList.stream()
-                .filter(fofoId -> {
-                    FofoStore store = finalFofoStoresMap.get(fofoId);
-                    if (store == null || store.isInternal()) return false;
-                    if (!ActivationType.ACTIVE.equals(store.getActivationType())) return false;
-                    return finalCollectionRankMap.containsKey(fofoId);
-                })
-                .collect(Collectors.toList());
         // Resolve partner names/codes
         Map<Integer, CustomRetailer> retailerMap = Collections.emptyMap();
-        if (!validFofoIds.isEmpty()) {
+        if (!fofoIdList.isEmpty()) {
             try {
-                retailerMap = retailerService.getFofoRetailers(validFofoIds);
+                retailerMap = retailerService.getFofoRetailers(fofoIdList);
             } catch (ProfitMandiBusinessException e) {
                 LOGGER.error("Error fetching fofo retailers for raw data", e);
+            }
+        }
         String rbmName = authUser.getFullName() + (isL2 ? " (L2)" : "");
-        // Build rows
+        // Build rows for ALL partners (same count as Partner Count)
-        for (Integer fofoId : validFofoIds) {
+        for (Integer fofoId : fofoIdList) {
+            // Default to rank 5 (Normal) for partners without collection plan
             int rank = collectionRankMap.getOrDefault(fofoId, 5);
             boolean hasZeroBilling = !mtdBilledFofoIds.contains(fofoId);
+            // Status assignment with same priority as getRbmCallTargetModels
             String status;
             if (rank == 1) {
                 status = "Plan Today";
             } else if (rank == 2) {
                 status = "Carry Forward";
-            } else if (rank == 3) {
-                status = "Untouched";
             } else if (hasZeroBilling) {
                 status = "Zero Billing";
+            } else if (rank == 3) {
+                status = "Untouched";
             } else if (rank == 4) {
                 status = "Future Plan";
             } else {
                 status = "Normal";
+            }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java – Rev 35730 → 35757