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

 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 @Controller
 @Transactional(rollbackFor = Throwable.class)
         if (!visitRequests.isEmpty()) {
             visitRequestMap = visitRequests.stream().collect(Collectors.groupingBy(x -> x.getVisitId()));
+        }
         List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectByAuthIdAndStatus(authUser.getId(), status, offset, limit);
+        // Batch fetch all FranchiseeActivity in one query instead of N+1
+        List<Integer> activityIds = franchiseeVisits.stream()
+                .filter(fv -> fv.getFranchiseActivityId() != 0)
+                .map(FranchiseeVisit::getFranchiseActivityId)
+                .collect(Collectors.toList());
+        Map<Integer, FranchiseeActivity> activityMap = new HashMap<>();
+        if (!activityIds.isEmpty()) {
+            activityMap = franchiseeActivityRepository.selectByIds(activityIds).stream()
+                    .collect(Collectors.toMap(FranchiseeActivity::getId, x -> x));
+        }
         for (FranchiseeVisit fv : franchiseeVisits) {
             if (visitRequestMap != null) {
                 List<VisitRequest> visitRequest = visitRequestMap.get(fv.getId());
                 if (visitRequest != null) {
+                    }
+                }
+            }
             if (fv.getFranchiseActivityId() != 0) {
-                FranchiseeActivity fA = franchiseeActivityRepository.selectById(fv.getFranchiseActivityId());
+                FranchiseeActivity fA = activityMap.get(fv.getFranchiseActivityId());
                 fv.setFranchiseeActivity(fA);
+            }
+        }
+    }
     @RequestMapping(value = "/purchaseExist", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-    public ResponseEntity<?> purchaseExist(HttpServletRequest request, Model model)
+    public ResponseEntity<?> purchaseExist(HttpServletRequest request) throws ProfitMandiBusinessException {
-            throws ProfitMandiBusinessException {
         int userId = (int) request.getAttribute("userId");
         UserCart uc = userAccountRepository.getUserCart(userId);
-        boolean purchaseExist = purchaseRepository.hasPurchaseForFofoId(uc.getUserId());
+        return responseSender.ok(purchaseRepository.hasPurchaseForFofoId(uc.getUserId()));
-        if (purchaseExist) {
-            return responseSender.ok(true);
-        }
-        return responseSender.ok(false);
+    }
     @RequestMapping(value = "/onBoardingTimelineVisibility", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiImplicitParams({@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     public ResponseEntity<?> onBoardingTimelineVisibility(HttpServletRequest request, Model model)
                 Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondaryPlans = orderRepository
                         .selectPartnerSecondaryGroupByBrand(fofoIdList, startDate.toLocalDate()).stream()
                         .collect(Collectors.groupingBy(x -> x.getFofoId()));
+                // Pre-fetch all AuthUsers that might be needed (instead of N+1 queries)
+                Set<Integer> allAuthIds = new HashSet<>();
+                collectionMap.values().stream()
+                        .map(PartnerCollectionPlanModel::getAuthId)
+                        .filter(id -> id != null && id != authUser.getId())
+                        .forEach(allAuthIds::add);
+                partnerSecondaryPlans.values().stream()
+                        .flatMap(List::stream)
+                        .map(PartnerSecondaryPlanModel::getAuthId)
+                        .filter(id -> id != null && id != authUser.getId())
+                        .forEach(allAuthIds::add);
+                Map<Integer, AuthUser> authUserMap = new HashMap<>();
+                if (!allAuthIds.isEmpty()) {
+                    authUserMap = authRepository.selectByIds(new ArrayList<>(allAuthIds)).stream()
+                            .collect(Collectors.toMap(AuthUser::getId, x -> x));
+                }
                 LOGGER.info("partnerSecondayPlans {}", partnerSecondaryPlans);
                 for (Entry<Integer, CustomRetailer> customRetailerEntry : customRetailers.entrySet()) {
                     int fofoId = customRetailerEntry.getKey();
                     CustomRetailer customRetailer = customRetailerEntry.getValue();
                     float totalSecondaryPlan = 0;
+                            }
+                        }
                         if (authId != null && authId != authUser.getId()) {
-                            ptam.setAuthUser(authRepository.selectById(authId));
+                            ptam.setAuthUser(authUserMap.get(authId));
+                        }
                         if (collectionPlan.getCommittedDate() != null) {
+                        }
                         for (Entry<String, PartnerSecondaryPlanModel> secondaryModelEntry : secondaryModelMap.entrySet()) {
                             Integer authId = secondaryModelEntry.getValue().getAuthId();
                             if (authId != null && authId != authUser.getId()) {
-                                secondaryModelEntry.getValue().setAuthUser(authRepository.selectById(authId));
+                                secondaryModelEntry.getValue().setAuthUser(authUserMap.get(authId));
                                 ptam.setSecondaryColor("red");
+                            }
+                        }
                         .map(x -> x.getVisitId()).collect(Collectors.toList());
                 List<Lead> leads = new ArrayList<>();
                 if (!leadIds.isEmpty()) {
                     leads = leadRepository.selectAllByIds(leadIds);
+                    // Batch fetch all LeadActivities instead of N+1
+                    List<LeadActivity> allLeadActivities = leadActivityRepository.selectAllByleadIds(leadIds);
+                    Map<Integer, List<LeadActivity>> leadActivityMap = allLeadActivities.stream()
+                            .collect(Collectors.groupingBy(LeadActivity::getLeadId));
                     for (Lead lead : leads) {
-                        List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(lead.getId());
+                        List<LeadActivity> leadActivities = leadActivityMap.get(lead.getId());
+                        if (leadActivities != null && !leadActivities.isEmpty()) {
-                        lead.setScheduledTimestamp(leadActivities.get(0).getSchelduleTimestamp());
+                            lead.setScheduledTimestamp(leadActivities.get(0).getSchelduleTimestamp());
-                        lead.setLeadActivity(leadActivities.get(0));
+                            lead.setLeadActivity(leadActivities.get(0));
+                        }
+                    }
+                }
                 List<Integer> franchiseeIds = allVisitRequests.stream()
                         .filter(x -> x.getVisitType().equals("franchiseeVisit")).map(x -> x.getVisitId())
                         .collect(Collectors.toList());
                 List<FranchiseeVisit> franchiseeVisits = new ArrayList<>();
                 if (!franchiseeIds.isEmpty()) {
                     franchiseeVisits = franchiseeVisitRepository.selectAllByIds(franchiseeIds);
                     LOGGER.info("franchiseeVisits {}", franchiseeVisits);
+                    // Batch fetch all FranchiseeActivities instead of N+1
+                    List<FranchiseeActivity> allFranchiseeActivities = franchiseeActivityRepository
+                            .selectByFranchiseeVisitIds(franchiseeIds);
+                    Map<Integer, List<FranchiseeActivity>> franchiseeActivityMap = allFranchiseeActivities.stream()
+                            .collect(Collectors.groupingBy(FranchiseeActivity::getFranchiseeVisitd));
                     for (FranchiseeVisit franchiseeVisit : franchiseeVisits) {
-                        List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository
+                        List<FranchiseeActivity> franchiseeActivities = franchiseeActivityMap.get(franchiseeVisit.getId());
-                                .selectByFranchiseeVisitId(franchiseeVisit.getId());
                         LOGGER.info("franchiseeActivities {}", franchiseeActivities);
+                        if (franchiseeActivities != null && !franchiseeActivities.isEmpty()) {
-                        franchiseeVisit.setScheduleTimestamp(franchiseeActivities.get(0).getSchelduleTimestamp());
+                            franchiseeVisit.setScheduleTimestamp(franchiseeActivities.get(0).getSchelduleTimestamp());
-                        franchiseeVisit.setFranchiseeActivity(franchiseeActivities.get(0));
+                            franchiseeVisit.setFranchiseeActivity(franchiseeActivities.get(0));
+                        }
+                    }
+                }
+                // Pre-fetch all retailers using cached method (instead of N+1 getFofoRetailer calls)
+                Map<Integer, CustomRetailer> allRetailersMap = retailerService.getAllFofoRetailers();
                 Map<LocalDate, List<VisitRequest>> dateWiseVisitRequest = allVisitRequests.stream()
                         .collect(Collectors.groupingBy(x -> x.getScheduleTimestamp().toLocalDate()));
                 for (Entry<LocalDate, List<VisitRequest>> visitEntry : dateWiseVisitRequest.entrySet()) {
                                 VisitRequest visitRequest = visitRequests.stream()
                                         .filter(x -> x.getVisitId() == franchiseeVisit.getId()
                                                 && x.getCreatedBy() == franchiseeVisit.getAuthId())
                                         .findAny().orElse(null);
-                                CustomRetailer customRetailer = retailerService
+                                CustomRetailer customRetailer = allRetailersMap.get(franchiseeVisit.getFofoId());
-                                        .getFofoRetailer(franchiseeVisit.getFofoId());
                                 VisitDescriptionModel visitDescriptionModel = new VisitDescriptionModel();
                                 visitDescriptionModel.setVisitId(visitRequest.getId());
                                 visitDescriptionModel.setVisitName(franchiseeVisit.getPartnerName());
+                                if (customRetailer != null && customRetailer.getAddress() != null) {
-                                visitDescriptionModel.setCity(customRetailer.getAddress().getCity());
+                                    visitDescriptionModel.setCity(customRetailer.getAddress().getCity());
-                                visitDescriptionModel.setState(customRetailer.getAddress().getState());
+                                    visitDescriptionModel.setState(customRetailer.getAddress().getState());
+                                }
                                 visitDescriptionModel.setScheduleTime(
                                         franchiseeVisit.getFranchiseeActivity().getSchelduleTimestamp());
                                 visitDescriptionModel.setStatus(visitRequest.getStatus());
                                 visitDescriptionModel.setRemarks(franchiseeVisit.getAgenda());
                                 visitDescriptionModel.setVisitType(visitRequest.getVisitType());

Subversion Repositories SmartDukaan

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