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

     @Override
     public Map<Integer, List<CustomRetailer>> getPositionCustomRetailerMap(List<Position> positions) throws ProfitMandiBusinessException {
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
         Map<Integer, List<CustomRetailer>> positionRetailerMap = new HashMap<>();
+        // Batch fetch all PartnerPositions upfront to avoid N+1 queries
+        List<Integer> positionIds = positions.stream().map(Position::getId).collect(Collectors.toList());
+        Map<Integer, List<Integer>> positionIdToFofoIdsMap = partnerPositionRepository.selectByPositionIds(positionIds)
+                .stream()
+                .collect(Collectors.groupingBy(
+                        pp -> pp.getPositionId(),
+                        Collectors.mapping(pp -> pp.getFofoId(), Collectors.toList())
+                ));
+        // Collect all region IDs that might need lookup (positions with fofoId=0)
+        Set<Integer> regionIdsNeedingLookup = new HashSet<>();
         for (Position position : positions) {
+            List<Integer> fofoIds = positionIdToFofoIdsMap.get(position.getId());
+            if (fofoIds != null && fofoIds.contains(0)) {
+                regionIdsNeedingLookup.add(position.getRegionId());
+            }
+        }
+        // Batch fetch all PartnerRegions for regions needing lookup
+        Map<Integer, List<Integer>> regionIdToFofoIdsMap = new HashMap<>();
+        if (!regionIdsNeedingLookup.isEmpty()) {
-            List<Integer> fofoIds = partnerPositionRepository.selectByPositionId(position.getId()).stream().map(x -> x.getFofoId()).collect(Collectors.toList());
+            regionIdToFofoIdsMap = partnerRegionRepository.selectAllByRegionIds(new ArrayList<>(regionIdsNeedingLookup))
+                    .stream()
+                    .collect(Collectors.groupingBy(
+                            pr -> pr.getRegionId(),
+                            Collectors.mapping(pr -> pr.getFofoId(), Collectors.toList())
+                    ));
+        }
-            //LOGGER.info("fofoIds - {}", fofoIds);
+        // Build the result map using pre-fetched data
-            if (!fofoIds.isEmpty()) {
+        for (Position position : positions) {
-                if (fofoIds.contains(0)) {
+            List<Integer> fofoIds = positionIdToFofoIdsMap.get(position.getId());
-                    fofoIds = partnerRegionRepository.selectByRegionId(position.getRegionId()).stream().map(x -> x.getFofoId()).collect(Collectors.toList());
-                    if (fofoIds.contains(0)) {
+            if (fofoIds == null || fofoIds.isEmpty()) {
-                        fofoIds = new ArrayList<>(customRetailerMap.keySet());
+                continue;
-                    }
+            }
+            if (fofoIds.contains(0)) {
+                // Need region-based lookup
+                fofoIds = regionIdToFofoIdsMap.get(position.getRegionId());
+                if (fofoIds == null || fofoIds.contains(0)) {
+                    fofoIds = new ArrayList<>(customRetailerMap.keySet());
+                }
-                //LOGGER.info("fofoIds - {}", fofoIds);
-                positionRetailerMap.put(position.getId(), fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()));
+            }
+            positionRetailerMap.put(position.getId(),
+                    fofoIds.stream()
+                            .map(customRetailerMap::get)
+                            .filter(x -> x != null)
+                            .collect(Collectors.toList()));
+        }
         return positionRetailerMap;
+    }
     @Override
     public Map<Integer, List<CustomRetailer>> getRegionPartners(List<Position> positions) throws ProfitMandiBusinessException {
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
         Map<Integer, List<CustomRetailer>> positionIdAndpartnerRegionMap = new HashedMap<>();
-        for (Position position : positions) {
-            List<Integer> fofoIds = partnerRegionRepository.selectByRegionId(position.getRegionId()).stream().map(x -> x.getFofoId()).collect(Collectors.toList());
+        // Batch fetch all PartnerRegions upfront to avoid N+1 queries
+        List<Integer> regionIds = positions.stream().map(Position::getRegionId).distinct().collect(Collectors.toList());
+        Map<Integer, List<Integer>> regionIdToFofoIdsMap = partnerRegionRepository.selectAllByRegionIds(regionIds)
-            if (!fofoIds.isEmpty()) {
+                .stream()
+                .collect(Collectors.groupingBy(
-                if (fofoIds.contains(0)) {
+                        pr -> pr.getRegionId(),
-                    fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId()).collect(Collectors.toList());
+                        Collectors.mapping(pr -> pr.getFofoId(), Collectors.toList())
+                ));
+        // Fetch all store IDs once in case any region has fofoId=0
+        List<Integer> allStoreIds = null;
+        for (Position position : positions) {
+            List<Integer> fofoIds = regionIdToFofoIdsMap.get(position.getRegionId());
+            if (fofoIds == null || fofoIds.isEmpty()) {
+                continue;
-                }
+            }
+            if (fofoIds.contains(0)) {
+                if (allStoreIds == null) {
-                Map<Integer, CustomRetailer> fofoRetailers = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                    allStoreIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId()).collect(Collectors.toList());
+                }
-                positionIdAndpartnerRegionMap.put(position.getRegionId(), new ArrayList<CustomRetailer>(fofoRetailers.values()));
+                fofoIds = allStoreIds;
+            }
+            Map<Integer, CustomRetailer> fofoRetailers = fofoIds.stream()
+                    .map(customRetailerMap::get)
+                    .filter(x -> x != null)
+                    .collect(Collectors.toMap(x -> x.getPartnerId(), x -> x, (a, b) -> a));
+            positionIdAndpartnerRegionMap.put(position.getRegionId(), new ArrayList<>(fofoRetailers.values()));
+        }
         return positionIdAndpartnerRegionMap;
+    }
     @Override
     @Cacheable(value = "authUserEmailMapping", cacheManager = "thirtyMinsTimeOutCacheManager")
     public Map<String, Set<String>> getAuthUserPartnerEmailMapping() throws ProfitMandiBusinessException {
         Map<String, Set<String>> storeGuyMap = new HashMap<>();
         Set<Integer> activeFofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId()).collect(Collectors.toSet());
+        // Batch fetch positions by category IDs instead of multiple calls
-        List<Position> categoryPositions = positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_SALES);
+        List<Position> categoryPositions = positionRepository.selectPositionByCategoryIds(Arrays.asList(
+                ProfitMandiConstants.TICKET_CATEGORY_SALES,
-        categoryPositions.addAll(positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_RBM));
+                ProfitMandiConstants.TICKET_CATEGORY_RBM,
-        categoryPositions.addAll(positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_ABM));
+                ProfitMandiConstants.TICKET_CATEGORY_ABM));
         Map<Integer, Position> positionsMap = categoryPositions.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
+        // Batch fetch all AuthUsers upfront to avoid N+1 queries
+        Set<Integer> authUserIds = categoryPositions.stream().map(Position::getAuthUserId).collect(Collectors.toSet());
+        Map<Integer, AuthUser> authUserMap = authRepository.selectByIds(new ArrayList<>(authUserIds)).stream()
+                .collect(Collectors.toMap(AuthUser::getId, x -> x));
         Map<Integer, List<CustomRetailer>> positonPartnerMap = this.getPositionCustomRetailerMap(categoryPositions);
         for (Map.Entry<Integer, List<CustomRetailer>> positionPartnerEntry : positonPartnerMap.entrySet()) {
             int authUserId = positionsMap.get(positionPartnerEntry.getKey()).getAuthUserId();
             Set<String> partnerEmails = positionPartnerEntry.getValue().stream().filter(x -> activeFofoIds.contains(x.getPartnerId())).map(x -> x.getEmail()).collect(Collectors.toSet());
-            AuthUser authUser = authRepository.selectById(authUserId);
+            AuthUser authUser = authUserMap.get(authUserId);
-            if (authUser.isActive()) {
+            if (authUser != null && authUser.isActive()) {
                 if (!storeGuyMap.containsKey(authUser.getEmailId())) {
                     storeGuyMap.put(authUser.getEmailId(), partnerEmails);
                 } else {
                     storeGuyMap.get(authUser.getEmailId()).addAll(partnerEmails);
+                }
     @Override
     @Cacheable(value = "authUserEmailPartnerIdMapping", cacheManager = "thirtyMinsTimeOutCacheManager")
     public Map<String, Set<Integer>> getAuthUserPartnerIdMapping() throws ProfitMandiBusinessException {
         Map<String, Set<Integer>> storeGuyMap = new HashMap<>();
         Set<Integer> activeFofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId()).collect(Collectors.toSet());
+        // Batch fetch positions by category IDs instead of multiple calls
-        List<Position> categoryPositions = positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_SALES);
+        List<Position> categoryPositions = positionRepository.selectPositionByCategoryIds(Arrays.asList(
+                ProfitMandiConstants.TICKET_CATEGORY_SALES,
-        categoryPositions.addAll(positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_RBM));
+                ProfitMandiConstants.TICKET_CATEGORY_RBM,
-        categoryPositions.addAll(positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_ABM));
+                ProfitMandiConstants.TICKET_CATEGORY_ABM,
-        categoryPositions.addAll(positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT));
+                ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT,
-        categoryPositions.addAll(positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_TRAINING));
+                ProfitMandiConstants.TICKET_CATEGORY_TRAINING));
         Map<Integer, Position> positionsMap = categoryPositions.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
+        // Batch fetch all AuthUsers upfront to avoid N+1 queries
+        Set<Integer> authUserIds = categoryPositions.stream().map(Position::getAuthUserId).collect(Collectors.toSet());
+        Map<Integer, AuthUser> authUserMap = authRepository.selectByIds(new ArrayList<>(authUserIds)).stream()
+                .collect(Collectors.toMap(AuthUser::getId, x -> x));
         Map<Integer, List<CustomRetailer>> positonPartnerMap = this.getPositionCustomRetailerMap(categoryPositions);
         for (Map.Entry<Integer, List<CustomRetailer>> positionPartnerEntry : positonPartnerMap.entrySet()) {
             int authUserId = positionsMap.get(positionPartnerEntry.getKey()).getAuthUserId();
             Set<Integer> partnerIds = positionPartnerEntry.getValue().stream().filter(x -> activeFofoIds.contains(x.getPartnerId())).map(x -> x.getPartnerId()).collect(Collectors.toSet());
-            AuthUser authUser = authRepository.selectById(authUserId);
+            AuthUser authUser = authUserMap.get(authUserId);
-            if (authUser.isActive()) {
+            if (authUser != null && authUser.isActive()) {
                 if (!storeGuyMap.containsKey(authUser.getEmailId())) {
                     storeGuyMap.put(authUser.getEmailId(), partnerIds);
                 } else {
                     storeGuyMap.get(authUser.getEmailId()).addAll(partnerIds);
+                }

Subversion Repositories SmartDukaan

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