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

 import com.spice.profitmandi.dao.repository.dtr.*;
 import com.spice.profitmandi.dao.repository.fofo.PartnerDailyInvestmentRepository;
 import com.spice.profitmandi.dao.repository.fofo.PurchaseRepository;
 import com.spice.profitmandi.dao.repository.fofo.RbmRatingRepository;
 import com.spice.profitmandi.dao.repository.fofo.SalesRatingRepository;
+import com.spice.profitmandi.dao.repository.transaction.LoanRepository;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
 import com.spice.profitmandi.dao.repository.user.AddressRepository;
 import com.spice.profitmandi.service.AuthService;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.PartnerCollectionService;
     LeadDetailRepository leadDetailRepository;
     @Autowired
     PurchaseRepository purchaseRepository;
+    @Autowired
+    private LoanRepository loanRepository;
     @RequestMapping(value = "/lead", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     public ResponseEntity<?> LeadUser(@RequestBody CreateRefferalRequest createRefferalRequest) throws Exception {
     @ApiImplicitParams({@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     public ResponseEntity<?> getPartnerTarget(HttpServletRequest request, @RequestParam String
             gmailId, @RequestParam String dayValue, @RequestParam ActivationType activationType) throws
             ProfitMandiBusinessException {
+        long startTime = System.currentTimeMillis();
+        long lapTime = startTime;
         AuthUser authUser = authRepository.selectByGmailId(gmailId);
+        LOGGER.info("PERF: selectByGmailId took {} ms", System.currentTimeMillis() - lapTime);
+        lapTime = System.currentTimeMillis();
-        Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
+        // Optimized: get partner IDs only for this specific user instead of ALL users
-        Set<Integer> fofoIds = storeGuyMap.get(authUser.getEmailId());
+        Set<Integer> fofoIds = csService.getPartnerIdsByAuthUserId(authUser.getId());
+        LOGGER.info("PERF: getPartnerIdsByAuthUserId took {} ms", System.currentTimeMillis() - lapTime);
+        lapTime = System.currentTimeMillis();
         List<String> brands = Arrays.asList("Vivo", "Samsung", "Oppo", "Itel", "Almost New", "Others");
         float totalPartnerTargetSecondary = 0;
         float totalPartnerTargetCollection = 0;
         float totalPartnerAchievementSecondary = 0;
         float totalPartnerAchievementCollection = 0;
         TargetModel tm = new TargetModel();
         Map<Integer, PartnerDailyInvestment> partnerDailyInvestmentMap = new HashMap<>();
-        Map<Integer, Long> partnerTicketCount = ticketRepository.selectAllOpenTicketsGroupByRetailer();
+        Map<Integer, Long> partnerTicketCount = new HashMap<>(); // Will be populated after we have fofoIdList
-        LOGGER.info("partnerTicketCount {}", partnerTicketCount);
         List<PartnerTargetAchievementModel> ptams = new ArrayList<>();
         if (fofoIds != null && fofoIds.size() > 0) {
             LOGGER.info("fofoIds {}", fofoIds);
             List<Integer> fofoIdList = fofoStoreRepository.selectByRetailerIds(new ArrayList<>(fofoIds)).stream()
                     .filter(x -> (!x.isInternal() && (activationType == null || x.getActivationType().equals(activationType))))
                     .map(x -> x.getId()).collect(Collectors.toList());
+            LOGGER.info("PERF: selectByRetailerIds took {} ms", System.currentTimeMillis() - lapTime);
+            lapTime = System.currentTimeMillis();
-            LOGGER.info("fofoIdList {}", fofoIdList);
+            LOGGER.info("fofoIdList size: {}", fofoIdList.size());
+            // Optimized: fetch ticket counts only for specific fofoIds instead of all retailers
+            if (!fofoIdList.isEmpty()) {
+                partnerTicketCount = ticketRepository.selectOpenTicketsCountByFofoIds(fofoIdList);
+            }
+            LOGGER.info("PERF: selectOpenTicketsCountByFofoIds took {} ms", System.currentTimeMillis() - lapTime);
+            lapTime = System.currentTimeMillis();
             LocalDateTime startDate = LocalDate.now().atStartOfDay();
             if (dayValue.equals("previous")) {
                 startDate = LocalDate.now().minusDays(1).atStartOfDay();
+            }
             if (fofoIdList.size() > 0) {
+                // Fetch fofoIds with overdue loans (pending amount > 0 and created > 15 days ago)
+                // Optimized: returns only fofoIds, not full Loan objects
+                LocalDateTime fifteenDaysAgo = LocalDate.now().minusDays(15).atStartOfDay();
+                Set<Integer> fofoIdsWithOverdueLoans = loanRepository.selectFofoIdsWithOverdueLoans(fofoIdList, fifteenDaysAgo);
+                LOGGER.info("PERF: selectFofoIdsWithOverdueLoans took {} ms", System.currentTimeMillis() - lapTime);
+                lapTime = System.currentTimeMillis();
+                // Fetch fofoIds with MTD billing above threshold (20000)
+                // Optimized: direct query on orders table instead of complex RBM query
+                LocalDateTime mtdStartDate = LocalDate.now().withDayOfMonth(1).atStartOfDay();
+                LocalDateTime mtdEndDate = LocalDate.now().plusDays(1).atStartOfDay();
+                long billingThreshold = 20000L; // Same as RbmWeeklyBillingModel.BILLING_THRESHOLD
+                Set<Integer> allMtdBilledFofoIds = orderRepository.selectFofoIdsWithMtdBillingAboveThreshold(
+                        fofoIdList, mtdStartDate, mtdEndDate, billingThreshold);
+                LOGGER.info("PERF: selectFofoIdsWithMtdBillingAboveThreshold took {} ms", System.currentTimeMillis() - lapTime);
+                lapTime = System.currentTimeMillis();
                 List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository.selectAll(fofoIdList, startDate.toLocalDate().minusDays(1));
+                LOGGER.info("PERF: partnerDailyInvestmentRepository.selectAll took {} ms", System.currentTimeMillis() - lapTime);
+                lapTime = System.currentTimeMillis();
                 if (!partnerDailyInvestments.isEmpty()) {
                     partnerDailyInvestmentMap = partnerDailyInvestments.stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+                }
-                Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
+                // Optimized: fetch only specific fofoIds instead of all retailers
-                Map<Integer, CustomRetailer> customRetailers = fofoIdList.stream().map(x -> customRetailerMap.get(x))
+                Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(fofoIdList);
-                        .filter(x -> x != null).collect(Collectors.toList()).stream()
+                LOGGER.info("PERF: getFofoRetailers took {} ms", System.currentTimeMillis() - lapTime);
-                        .collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                lapTime = System.currentTimeMillis();
                 List<Integer> remarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIdList);
+                LOGGER.info("PERF: selectMaxRemarkId took {} ms", System.currentTimeMillis() - lapTime);
-                LOGGER.info("remarkIds {}", remarkIds);
+                lapTime = System.currentTimeMillis();
                 long todayCollectionCount = 0;
                 if (!remarkIds.isEmpty()) {
                     todayCollectionCount = partnerCollectionRemarkRepository
                             .selectByAuthIdAndIds(authUser.getId(), remarkIds).stream()
                             .filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
                             .collect(Collectors.counting());
+                }
+                LOGGER.info("PERF: selectByAuthIdAndIds took {} ms", System.currentTimeMillis() - lapTime);
+                lapTime = System.currentTimeMillis();
                 Map<Integer, PartnerCollectionPlanModel> collectionMap = partnerCollectionService.getCollectionMap(fofoIdList, startDate);
+                LOGGER.info("PERF: getCollectionMap took {} ms", System.currentTimeMillis() - lapTime);
+                lapTime = System.currentTimeMillis();
                 Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondaryPlans = orderRepository
                         .selectPartnerSecondaryGroupByBrand(fofoIdList, startDate.toLocalDate()).stream()
                         .collect(Collectors.groupingBy(x -> x.getFofoId()));
+                LOGGER.info("PERF: selectPartnerSecondaryGroupByBrand took {} ms", System.currentTimeMillis() - lapTime);
+                lapTime = System.currentTimeMillis();
                 // Pre-fetch all AuthUsers that might be needed (instead of N+1 queries)
                 Set<Integer> allAuthIds = new HashSet<>();
                 collectionMap.values().stream()
                         .map(PartnerCollectionPlanModel::getAuthId)
                         PartnerCollectionPlanModel collectionPlan = collectionMap.get(fofoId);
                         ptam.setRemark(collectionPlan.getRemark());
                         ptam.setMessage(collectionPlan.getMessage());
                         ptam.setRemarkTimestamp(collectionPlan.getRemarkTimestamp());
+                        ptam.setRecordingUrl(collectionPlan.getRecordingUrl());
                         ptam.setRank(collectionPlan.getRank());
                         Integer authId = collectionPlan.getAuthId();
                         Map<Integer, String> rankColorMap = ProfitMandiConstants.Rank_Color_Map;
                             ptam.setTicketCount(0);
+                        }
+                    }
+                    // Category Assignment Logic (Priority: PLAN_TODAY > CARRY_FORWARD > ZERO_BILLED > UNTOUCHED > NORMAL)
+                    // Check if partner has credit due (loans > 15 days with pending amount) - just a flag, doesn't affect sorting
+                    boolean hasCreditDue = fofoIdsWithOverdueLoans.contains(fofoId);
+                    ptam.setHasOverdue(hasCreditDue);
+                    // Default rank to 5 (Normal) if no collection plan exists
+                    int rank = ptam.getRank() > 0 ? ptam.getRank() : 5;
+                    boolean hasZeroBilling = !allMtdBilledFofoIds.contains(fofoId);
+                    // Assign category based on rank (overdue is just a flag, doesn't affect category)
+                    if (rank == 1) {
+                        ptam.setCategory("PLAN_TODAY");
+                        ptam.setCategoryPriority(1);
+                    } else if (rank == 2) {
+                        ptam.setCategory("CARRY_FORWARD");
+                        ptam.setCategoryPriority(2);
+                    } else if (hasZeroBilling && rank < 5) {
+                        // Zero billed only if NOT in normal category (rank 5+)
+                        // If rank is 1,2,3,4 and has zero billing, include in ZERO_BILLED
+                        ptam.setCategory("ZERO_BILLED");
+                        ptam.setCategoryPriority(3);
+                    } else if (rank == 3) {
+                        ptam.setCategory("UNTOUCHED");
+                        ptam.setCategoryPriority(4);
+                    } else {
+                        // rank 4 (future plan) and rank 5+ (normal) go to NORMAL
+                        // Also, zero billing with rank 5+ goes to NORMAL (not ZERO_BILLED)
+                        ptam.setCategory("NORMAL");
+                        ptam.setCategoryPriority(5);
+                    }
                     ptams.add(ptam);
+                }
                 List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId()).stream().collect(Collectors.toList());
                     filteredPtams = ptams;
+                }
                 tm.setRBMAndL1(isRBMAndL1);
                 tm.setRBMAndNotL1(isRBMAndNotL1);
                 tm.setSales(isSales);
+                // Calculate category counts
+                Map<String, Long> categoryCounts = filteredPtams.stream()
+                        .collect(Collectors.groupingBy(
+                                p -> p.getCategory() != null ? p.getCategory() : "NORMAL",
+                                Collectors.counting()));
+                // Count parties with overdue flag (independent of category)
-                /*tm.setTargetAchievement(filteredPtams.stream().sorted(Comparator.comparing(PartnerTargetAchievementModel::getRank))
+                tm.setOverdueCount((int) filteredPtams.stream().filter(PartnerTargetAchievementModel::isHasOverdue).count());
+                tm.setPlanTodayCount(categoryCounts.getOrDefault("PLAN_TODAY", 0L).intValue());
+                tm.setCarryForwardCount(categoryCounts.getOrDefault("CARRY_FORWARD", 0L).intValue());
+                tm.setZeroBilledCount(categoryCounts.getOrDefault("ZERO_BILLED", 0L).intValue());
+                tm.setUntouchedCount(categoryCounts.getOrDefault("UNTOUCHED", 0L).intValue());
+                tm.setNormalCount(categoryCounts.getOrDefault("NORMAL", 0L).intValue());
+                // Sort by: 1) Partners with today's remark go to bottom of entire list
+                //          EXCEPT: NO_ANSWER remark older than 2 hours comes back to original position
+                //          2) Category Priority (PLAN_TODAY=1, CARRY_FORWARD=2, ZERO_BILLED=3, UNTOUCHED=4, NORMAL=5)
-                        .collect(Collectors.toList()));*/
+                //          3) Then by rank
+                LocalDateTime twoHoursAgo = LocalDateTime.now().minusHours(2);
                 tm.setTargetAchievement(filteredPtams.stream()
                         .sorted(Comparator
-                                .comparing((PartnerTargetAchievementModel ptam) -> {
+                                .comparing((PartnerTargetAchievementModel p) -> {
+                                    if (p.getRemarkTimestamp() == null) {
+                                        return false; // No remark → comes first
+                                    }
-                                    LocalDate remarkDate = ptam.getRemarkTimestamp() != null
+                                    LocalDate remarkDate = p.getRemarkTimestamp().toLocalDate();
+                                    if (!remarkDate.equals(LocalDate.now())) {
+                                        return false; // Not today's remark → comes first
+                                    }
+                                    // Today's remark - check if NO_ANSWER and older than 2 hours
+                                    if (CollectionRemark.NO_ANSWER.equals(p.getRemark())
-                                            ? ptam.getRemarkTimestamp().toLocalDate()
+                                            && p.getRemarkTimestamp().isBefore(twoHoursAgo)) {
+                                        return false; // NO_ANSWER older than 2 hours → comes back up
-                                            : null;
+                                    }
-                                    return remarkDate != null && remarkDate.equals(LocalDate.now());
+                                    return true; // Other today's remarks → goes to bottom
-                                }) // false → comes first, true (today) → goes last
+                                }) // false → comes first, true → goes to bottom
+                                .thenComparing(PartnerTargetAchievementModel::getCategoryPriority)
                                 .thenComparing(PartnerTargetAchievementModel::getRank)
+                        )
                         .collect(Collectors.toList()));
+            }
+        }
+        LOGGER.info("PERF: Total getPartnerTarget took {} ms", System.currentTimeMillis() - startTime);
         return responseSender.ok(tm);
+    }
     //TODO:Amit

Subversion Repositories SmartDukaan

(root)//trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java – Rev 35630 → 35632