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

 import com.spice.profitmandi.dao.repository.inventory.StateRepository;
 import com.spice.profitmandi.dao.repository.trialOnboarding.TrialFormRepository;
 import com.spice.profitmandi.dao.repository.user.*;
 import com.spice.profitmandi.service.PostOfficeService;
 import com.spice.profitmandi.service.catalog.BrandsService;
+import com.spice.profitmandi.dao.entity.catalog.BrandCatalog;
+import com.spice.profitmandi.dao.entity.dtr.Brand;
 import in.shop2020.model.v1.user.CartStatus;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
             } catch (ProfitMandiBusinessException profitMandiBusinessException) {
+            }
+        }
         Map<String, Object> map = new HashMap<>();
-        map.put("stateNames", stateRepository.selectAll().stream().map(x -> x.getName()).collect(Collectors.toList()));
+        map.put("stateNames", stateRepository.selectAll().stream().map(State::getName).collect(Collectors.toList()));
         LOGGER.info("user - {}", user);
         if (user != null) {
             List<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
                 map.put("retailer", retailer);
                 List<String> retailerBlockBrands = null;
                 Set<String> brands = null;
                 if (retailer.getId() != fofoId) {
-                    brands = brandsService.getBrands(retailer.getId(), null, 3).stream().map(x -> x.getName()).collect(Collectors.toSet());
+                    brands = brandsService.getBrands(retailer.getId(), null, 3).stream().map(BrandCatalog::getName).collect(Collectors.toSet());
                     retailerBlockBrands = brandsService.partnerIneligibleBrands(fofoId);
                 } else {
                     LOGGER.info("fofoId" + fofoId);
-                    brands = brandsService.getBrands(fofoId, null, 3).stream().map(x -> x.getName()).collect(Collectors.toSet());
+                    brands = brandsService.getBrands(fofoId, null, 3).stream().map(BrandCatalog::getName).collect(Collectors.toSet());
+                }
                 map.put("brands", brands);
                 map.put("retailerBlockBrands", retailerBlockBrands);
                 try {
         return map;
+    }
     private boolean containsRoleType(List<UserRole> userRoles, int roleId) {
-        for (UserRole userRole : userRoles) {
-            if (userRole.getRoleId() == roleId) {
+        return userRoles != null && userRoles.stream().anyMatch(ur -> ur.getRoleId() == roleId);
-                return true;
-            }
-        }
-        return false;
+    }
     private List<UserRole> addRole(List<UserRole> userRoles, int userId, int roleId) {
         if (userRoles == null) {
             userRoles = new ArrayList<>();
+        }
         return addressIdAddressMap;
+    }
     private List<Integer> toAddressIds(List<ShopAddress> shopAddresses) {
-        Function<ShopAddress, Integer> shopAddressToAddressIdFunction = new Function<ShopAddress, Integer>() {
-            @Override
-            public Integer apply(ShopAddress shopAddress) {
+        return shopAddresses.stream()
-                return shopAddress.getAddressId();
+                .map(ShopAddress::getAddressId)
-            }
-        };
-        return shopAddresses.stream().map(shopAddressToAddressIdFunction).collect(Collectors.toList());
+                .collect(Collectors.toList());
+    }
     private Set<Integer> toShopIds(List<Shop> shops) {
-        Function<Shop, Integer> shopToAddressIdFunction = new Function<Shop, Integer>() {
-            @Override
+        return shops.stream()
-            public Integer apply(Shop shop) {
-                return shop.getId();
+                .map(Shop::getId)
-            }
-        };
-        return shops.stream().map(shopToAddressIdFunction).collect(Collectors.toSet());
+                .collect(Collectors.toSet());
+    }
     private String toString(List<UserRole> userRoles) throws ProfitMandiBusinessException {
         Set<Integer> roleIds = new HashSet<>();
         for (UserRole userRole : userRoles) {
+    }
     @Override
     @Cacheable(value = "getFofoRetailer", cacheManager = "thirtyMinsTimeOutCacheManager")
     public Map<Integer, CustomRetailer> getFofoRetailers(List<Integer> fofoIds) throws ProfitMandiBusinessException {
+        if (fofoIds == null || fofoIds.isEmpty()) {
+            return new HashMap<>();
+        }
         List<com.spice.profitmandi.dao.entity.user.User> saholicUsers = userUserRepository.selectByIds(fofoIds);
-        Map<Integer, com.spice.profitmandi.dao.entity.user.User> userAddressMap = saholicUsers.stream().filter(x -> x.getAddressId() != null).collect(Collectors.toMap(x -> x.getAddressId(), x -> x));
+        Map<Integer, com.spice.profitmandi.dao.entity.user.User> userAddressMap = saholicUsers.stream()
+                .filter(x -> x.getAddressId() != null)
+                .collect(Collectors.toMap(com.spice.profitmandi.dao.entity.user.User::getAddressId, x -> x));
         List<Address> addresses = addressRepository.selectByIds(new ArrayList<>(userAddressMap.keySet()));
+        // Batch fetch all FofoStores to avoid N+1 queries
+        Set<Integer> retailerIds = addresses.stream().map(Address::getRetaierId).collect(Collectors.toSet());
+        Map<Integer, FofoStore> fofoStoreMap = fofoStoreRepository.selectByRetailerIds(new ArrayList<>(retailerIds))
+                .stream().collect(Collectors.toMap(FofoStore::getId, fs -> fs));
+        // Batch fetch all PrivateDealUsers to avoid N+1 queries
+        Map<Integer, PrivateDealUser> privateDealUserMap = privateDealUserRepository.selectByIds(new ArrayList<>(retailerIds))
+                .stream().collect(Collectors.toMap(PrivateDealUser::getId, pdu -> pdu));
+        // Batch fetch all Counters to avoid N+1 queries
+        Set<Integer> counterIds = privateDealUserMap.values().stream()
+                .filter(pdu -> pdu.getCounterId() != null)
+                .map(PrivateDealUser::getCounterId)
+                .collect(Collectors.toSet());
+        Map<Integer, Counter> counterMap = counterIds.isEmpty() ? Collections.emptyMap()
+                : counterRepository.selectByIds(new ArrayList<>(counterIds))
+                        .stream().collect(Collectors.toMap(Counter::getId, c -> c));
         Map<Integer, CustomRetailer> customRetailersMap = new HashMap<>();
         for (Address address : addresses) {
             com.spice.profitmandi.dao.entity.user.User user = userAddressMap.get(address.getId());
-            CustomRetailer customRetailer = new CustomRetailer();
-            customRetailer.setEmail(user.getEmailId());
-            customRetailer.setBusinessName(address.getName());
-            customRetailer.setMobileNumber(address.getPhoneNumber());
-            try {
-                FofoStore fs = fofoStoreRepository.selectByRetailerId(address.getRetaierId());
+            FofoStore fs = fofoStoreMap.get(address.getRetaierId());
-                customRetailer.setCode(fs.getCode());
-                customRetailer.setAstId(fs.getAstId());
-                customRetailer.setActivationType(fs.getActivationType());
-                customRetailer.setCounterSize(fs.getCounterSize());
-                customRetailer.setCounterPotential(fs.getCounterPotential());
-                customRetailer.setWarehouseId(fs.getWarehouseId());
-                customRetailer.setPartnerId(fs.getId());
-                customRetailer.setFofoType(fs.getFofoType());
-            } catch (Exception e) {
+            if (fs == null) {
                 continue;
+            }
-            try {
-                customRetailer.setCartId(user.getActiveCartId());
-                PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
-                Counter counter = counterRepository.selectById(pdu.getCounterId());
-                customRetailer.setGstNumber(counter.getGstin());
-            } catch (Exception e) {
-                customRetailer.setGstNumber(null);
-            }
-            CustomAddress address1 = new CustomAddress();
-            address1.setCity(address.getCity());
-            address1.setState(address.getState());
-            address1.setLine1(address.getLine1());
-            address1.setLine2(address.getLine2());
-            address1.setPinCode(address.getPinCode());
-            address1.setName(address.getName());
-            customRetailer.setAddress(address1);
-            customRetailer.setDisplayName(
-                    customRetailer.getBusinessName() + "-" + customRetailer.getCode() + "- " + address1.getCity());
+            CustomRetailer customRetailer = buildCustomRetailer(user, address, fs, privateDealUserMap, counterMap);
             customRetailersMap.put(customRetailer.getPartnerId(), customRetailer);
+        }
         return customRetailersMap;
+    }
+    /**
+     * Helper method to build CustomRetailer from fetched entities
+     */
+    private CustomRetailer buildCustomRetailer(com.spice.profitmandi.dao.entity.user.User user, Address address,
+                                                FofoStore fs, Map<Integer, PrivateDealUser> privateDealUserMap,
+                                                Map<Integer, Counter> counterMap) {
+        CustomRetailer customRetailer = new CustomRetailer();
+        customRetailer.setEmail(user.getEmailId());
+        customRetailer.setBusinessName(address.getName());
+        customRetailer.setMobileNumber(address.getPhoneNumber());
+        customRetailer.setCode(fs.getCode());
+        customRetailer.setAstId(fs.getAstId());
+        customRetailer.setActivationType(fs.getActivationType());
+        customRetailer.setCounterSize(fs.getCounterSize());
+        customRetailer.setCounterPotential(fs.getCounterPotential());
+        customRetailer.setWarehouseId(fs.getWarehouseId());
+        customRetailer.setPartnerId(fs.getId());
+        customRetailer.setFofoType(fs.getFofoType());
+        customRetailer.setCartId(user.getActiveCartId());
+        // Get GST number from pre-fetched maps
+        PrivateDealUser pdu = privateDealUserMap.get(address.getRetaierId());
+        if (pdu != null && pdu.getCounterId() != null) {
+            Counter counter = counterMap.get(pdu.getCounterId());
+            customRetailer.setGstNumber(counter != null ? counter.getGstin() : null);
+        }
+        CustomAddress customAddress = buildCustomAddress(address);
+        customRetailer.setAddress(customAddress);
+        customRetailer.setDisplayName(customRetailer.getBusinessName() + "-" + customRetailer.getCode() + "- " + customAddress.getCity());
+        return customRetailer;
+    }
+    /**
+     * Helper method to build CustomAddress from Address entity
+     */
+    private CustomAddress buildCustomAddress(Address address) {
+        CustomAddress customAddress = new CustomAddress();
+        customAddress.setCity(address.getCity());
+        customAddress.setState(address.getState());
+        customAddress.setLine1(address.getLine1());
+        customAddress.setLine2(address.getLine2());
+        customAddress.setPinCode(address.getPinCode());
+        customAddress.setName(address.getName());
+        customAddress.setPhoneNumber(address.getPhoneNumber());
+        return customAddress;
+    }
     @Override
     @Cacheable(value = "getFofoRetailer", cacheManager = "thirtyMinsTimeOutCacheManager")
     public CustomRetailer getFofoRetailer(int fofoId) throws ProfitMandiBusinessException {
         com.spice.profitmandi.dao.entity.user.User saholicUser = userUserRepository.selectById(fofoId);
         User dtrUser = userRepository.selectByEmailId(saholicUser.getEmailId());
         FofoStore store = fofoStoreRepository.selectByRetailerId(fofoId);
-        Address address = null;
-        try {
-            address = addressRepository.selectById(saholicUser.getAddressId());
+        Address address = addressRepository.selectById(saholicUser.getAddressId());
-        } catch (ProfitMandiBusinessException e1) {
-            // TODO Auto-generated catch block
-            e1.printStackTrace();
-        }
-        Map<Integer, CustomRetailer> customRetailersMap = new HashMap<>();
         CustomRetailer customRetailer = new CustomRetailer();
         customRetailer.setEmail(saholicUser.getEmailId());
         customRetailer.setBusinessName(address.getName());
         customRetailer.setMobileNumber(address.getPhoneNumber());
         customRetailer.setFirstName(dtrUser.getFirstName());
         customRetailer.setLastName(dtrUser.getLastName());
+        customRetailer.setCartId(saholicUser.getActiveCartId());
+        customRetailer.setPartnerId(address.getRetaierId());
+        customRetailer.setCode(store.getCode());
+        customRetailer.setAstId(store.getAstId());
+        customRetailer.setActivationType(store.getActivationType());
+        customRetailer.setWarehouseId(store.getWarehouseId());
+        // Get GST number
         try {
-            customRetailer.setCartId(saholicUser.getActiveCartId());
             PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
+            if (pdu != null && pdu.getCounterId() != null) {
-            Counter counter = counterRepository.selectById(pdu.getCounterId());
+                Counter counter = counterRepository.selectById(pdu.getCounterId());
-            customRetailer.setGstNumber(counter.getGstin());
+                customRetailer.setGstNumber(counter != null ? counter.getGstin() : null);
+            }
         } catch (Exception e) {
             customRetailer.setGstNumber(null);
+        }
-        CustomAddress address1 = new CustomAddress();
+        // Reuse helper method for CustomAddress
-        address1.setCity(address.getCity());
+        CustomAddress customAddress = buildCustomAddress(address);
-        address1.setState(address.getState());
-        address1.setLine1(address.getLine1());
-        address1.setLine2(address.getLine2());
-        address1.setPinCode(address.getPinCode());
+        customRetailer.setAddress(customAddress);
-        address1.setPhoneNumber(address.getPhoneNumber());
-        address1.setName(address.getName());
         customRetailer.setDisplayName(address.getName() + " - " + address.getCity());
-        customRetailer.setAddress(address1);
-        customRetailer.setPartnerId(address.getRetaierId());
-        customRetailer.setCode(store.getCode());
-        customRetailer.setAstId(store.getAstId());
-        customRetailer.setActivationType(store.getActivationType());
-        customRetailer.setWarehouseId(store.getWarehouseId());
-        customRetailersMap.put(address.getRetaierId(), customRetailer);
-        return customRetailer;
+        return customRetailer;
+    }
     @Override
     public Map<Integer, CustomRetailer> getFofoRetailerUserId(List<Integer> fofoIds) throws ProfitMandiBusinessException {
+        if (fofoIds == null || fofoIds.isEmpty()) {
+            return new HashMap<>();
+        }
         List<com.spice.profitmandi.dao.entity.user.User> saholicUsers = userUserRepository.selectByIds(fofoIds);
-        Map<Integer, com.spice.profitmandi.dao.entity.user.User> userAddressMap = saholicUsers.stream().filter(x -> x.getAddressId() != null).collect(Collectors.toMap(x -> x.getAddressId(), x -> x));
+        Map<Integer, com.spice.profitmandi.dao.entity.user.User> userAddressMap = saholicUsers.stream()
+                .filter(x -> x.getAddressId() != null)
+                .collect(Collectors.toMap(com.spice.profitmandi.dao.entity.user.User::getAddressId, x -> x));
         List<Address> addresses = addressRepository.selectByIds(new ArrayList<>(userAddressMap.keySet()));
+        // Batch fetch all retailerIds to userIds mapping to avoid N+1
+        Set<Integer> retailerIds = addresses.stream().map(Address::getRetaierId).collect(Collectors.toSet());
+        Map<Integer, Integer> retailerIdToUserIdMap = getUserIdRetailerIdMapReverse(retailerIds);
+        // Batch fetch all PrivateDealUsers to avoid N+1 queries
+        Map<Integer, PrivateDealUser> privateDealUserMap = privateDealUserRepository.selectByIds(new ArrayList<>(retailerIds))
+                .stream().collect(Collectors.toMap(PrivateDealUser::getId, pdu -> pdu));
+        // Batch fetch all Counters to avoid N+1 queries
+        Set<Integer> counterIds = privateDealUserMap.values().stream()
+                .filter(pdu -> pdu.getCounterId() != null)
+                .map(PrivateDealUser::getCounterId)
+                .collect(Collectors.toSet());
+        Map<Integer, Counter> counterMap = counterIds.isEmpty() ? Collections.emptyMap()
+                : counterRepository.selectByIds(new ArrayList<>(counterIds))
+                        .stream().collect(Collectors.toMap(Counter::getId, c -> c));
         Map<Integer, CustomRetailer> customRetailersMap = new HashMap<>();
         for (Address address : addresses) {
             com.spice.profitmandi.dao.entity.user.User user = userAddressMap.get(address.getId());
+            Integer userId = retailerIdToUserIdMap.get(user.getId());
+            if (userId == null) {
+                continue;
+            }
             CustomRetailer customRetailer = new CustomRetailer();
             customRetailer.setEmail(user.getEmailId());
             customRetailer.setBusinessName(address.getName());
             customRetailer.setMobileNumber(address.getPhoneNumber());
-            int userId = 0;
-            try {
-                userId = userAccountRepository.selectUserIdByRetailerId(user.getId());
-            } catch (ProfitMandiBusinessException e) {
-                continue;
-            }
-            try {
-                customRetailer.setCartId(user.getActiveCartId());
+            customRetailer.setCartId(user.getActiveCartId());
-                PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
-                Counter counter = counterRepository.selectById(pdu.getCounterId());
-                customRetailer.setGstNumber(counter.getGstin());
-            } catch (Exception e) {
-                customRetailer.setGstNumber(null);
-            }
-            CustomAddress address1 = new CustomAddress();
-            address1.setCity(address.getCity());
-            address1.setState(address.getState());
-            address1.setLine1(address.getLine1());
-            address1.setLine2(address.getLine2());
-            address1.setPinCode(address.getPinCode());
-            address1.setName(address.getName());
-            customRetailer.setAddress(address1);
             customRetailer.setPartnerId(address.getRetaierId());
+            // Get GST number from pre-fetched maps
+            PrivateDealUser pdu = privateDealUserMap.get(address.getRetaierId());
+            if (pdu != null && pdu.getCounterId() != null) {
+                Counter counter = counterMap.get(pdu.getCounterId());
+                customRetailer.setGstNumber(counter != null ? counter.getGstin() : null);
+            }
+            CustomAddress customAddress = buildCustomAddress(address);
+            customRetailer.setAddress(customAddress);
-            customRetailer.setDisplayName(customRetailer.getBusinessName() + "-" + address1.getCity());
+            customRetailer.setDisplayName(customRetailer.getBusinessName() + "-" + customAddress.getCity());
             customRetailersMap.put(userId, customRetailer);
+        }
         return customRetailersMap;
+    }
+    /**
+     * Helper method to get retailerId to userId mapping
+     */
+    private Map<Integer, Integer> getUserIdRetailerIdMapReverse(Set<Integer> retailerIds) {
+        List<UserAccount> userAccounts = userAccountRepository.selectAllSaholicByRetailerIds(retailerIds);
+        return userAccounts.stream().collect(Collectors.toMap(UserAccount::getAccountKey, UserAccount::getUserId));
+    }
     @Override
     public Map<Integer, String> getAllFofoRetailerIdEmailIdMap() throws ProfitMandiBusinessException {
         Role roleFofo = null;
         try {
             roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
+    }
     @Override
     @Cacheable(value = "retailerNames", cacheManager = "thirtyMinsTimeOutCacheManager")
     public Map<Integer, CustomRetailer> getFofoRetailers(boolean activeOnly) throws ProfitMandiBusinessException {
-        // TODO Auto-generated method stub
+        Stream<FofoStore> storeStream = fofoStoreRepository.selectAll().stream()
-        Stream<FofoStore> storeStream = fofoStoreRepository.selectAll().stream().filter(x -> x.getFofoType().equals(FofoType.FRANCHISE));
+                .filter(fs -> fs.getFofoType().equals(FofoType.FRANCHISE));
         if (activeOnly) {
-            storeStream = storeStream.filter(x -> x.isActive());
+            storeStream = storeStream.filter(FofoStore::isActive);
+        }
-        List<Integer> storeIds = storeStream.map(x -> x.getId()).collect(Collectors.toList());
+        List<Integer> storeIds = storeStream.map(FofoStore::getId).collect(Collectors.toList());
         return this.getFofoRetailers(storeIds);
+    }
     @Override
     @Cacheable(value = "retailerNames", cacheManager = "thirtyMinsTimeOutCacheManager")
     public Map<Integer, CustomRetailer> getFofoRetailers(boolean activeOnly, String pinCode) throws ProfitMandiBusinessException {
         List<PincodePartner> pincodePartners = pincodePartnerRepository.selectPartnersByPincode(pinCode);
         List<Integer> storeIds = new ArrayList<>();
-        if (pincodePartners.size() > 0) {
+        if (!pincodePartners.isEmpty()) {
-            List<Integer> fofoIds = pincodePartners.stream().map(x -> x.getFofoId()).collect(Collectors.toList());
+            List<Integer> fofoIds = pincodePartners.stream().map(PincodePartner::getFofoId).collect(Collectors.toList());
             List<FofoStore> fofoStores = fofoStoreRepository.selectActivePartnersByRetailerIds(fofoIds);
-            storeIds = fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList());
+            storeIds = fofoStores.stream().map(FofoStore::getId).collect(Collectors.toList());
+        }
         return this.getFofoRetailers(storeIds);
+    }
     @Override
     @Cacheable(value = "allFofoRetailers", cacheManager = "thirtyMinsTimeOutCacheManager")
     public Map<Integer, CustomRetailer> getAllFofoRetailers() throws ProfitMandiBusinessException {
+        List<Integer> storeIds = fofoStoreRepository.selectAll().stream()
-        // TODO Auto-generated method stub
+                .map(FofoStore::getId)
-        List<Integer> storeIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId()).collect(Collectors.toList());
+                .collect(Collectors.toList());
         return this.getFofoRetailers(storeIds);
+    }
     @Override
     @Cacheable(value = "allFofoRetailersInternalFalse", cacheManager = "thirtyMinsTimeOutCacheManager")
     public Map<Integer, CustomRetailer> getAllFofoRetailersInternalFalse() throws ProfitMandiBusinessException {
-        // TODO Auto-generated method stub
+        List<Integer> storeIds = fofoStoreRepository.selectAll().stream()
-        List<Integer> storeIds = fofoStoreRepository.selectAll().stream().filter(x -> x.getFofoType().equals(FofoType.FRANCHISE)).map(x -> x.getId()).collect(Collectors.toList());
+                .filter(fs -> fs.getFofoType().equals(FofoType.FRANCHISE))
+                .map(FofoStore::getId)
+                .collect(Collectors.toList());
         return this.getFofoRetailers(storeIds);
+    }
     @Override
     public LoginRequestResponseModel registerWebUser(LoginRequestResponseModel loginRequestModel) throws
     @Override
     @Cacheable(value = "fofoIdUrl", cacheManager = "thirtyMinsTimeOutCacheManager")
     public Map<Integer, String> getAllFofoRetailerIdUrlMap() {
         Map<Integer, String> fofoRetailerUrlMap = new HashMap<>();
-        List<FofoStore> stores = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive()).collect(Collectors.toList());
+        List<FofoStore> stores = fofoStoreRepository.selectAll().stream()
+                .filter(FofoStore::isActive)
+                .collect(Collectors.toList());
+        // Batch fetch all district masters to avoid N+1 queries
+        List<DistrictMaster> allDistrictMasters = districtMasterRepository.selectAll();
-        Map<Integer, com.spice.profitmandi.dao.entity.user.User> userMap = userUserRepository.selectByIds(stores.stream().map(x -> x.getId()).collect(Collectors.toList())).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
+        Map<String, DistrictMaster> districtMasterMap = allDistrictMasters.stream()
+                .collect(Collectors.toMap(
+                        dm -> dm.getStateShortName() + "_" + dm.getShortName(),
+                        dm -> dm,
+                        (existing, replacement) -> existing));
+        // Get fallback district master
+        DistrictMaster fallbackDistrict = districtMasterMap.get("HR_FB");
         for (FofoStore store : stores) {
+            String codeWithoutDigits = store.getCode().replaceAll("\\d+", "");
+            if (codeWithoutDigits.length() < 3) {
-            LOGGER.info("Store is {}", store);
+                LOGGER.warn("Invalid store code format: {}", store.getCode());
+                continue;
+            }
-            String districtShortName = store.getCode().replaceAll("\\d+", "").substring(2);
+            String stateShortName = codeWithoutDigits.substring(0, 2);
-            String stateShortName = store.getCode().replaceAll("\\d+", "").substring(0, 2);
+            String districtShortName = codeWithoutDigits.substring(2);
-            DistrictMaster districtMaster = null;
+            // Use pre-fetched map instead of N+1 query
-            LOGGER.info("Store shortname is {}", districtShortName);
+            String key = stateShortName + "_" + districtShortName;
-            districtMaster = districtMasterRepository.selectByShortnameNameAndStateShortName(districtShortName, stateShortName);
+            DistrictMaster districtMaster = districtMasterMap.getOrDefault(key, fallbackDistrict);
             if (districtMaster == null) {
-                districtMaster = districtMasterRepository.selectByShortnameNameAndStateShortName("FB", "HR");
+                LOGGER.warn("No district master found for key: {} and no fallback available", key);
+                continue;
+            }
-            LOGGER.info("Store id - {}", store.getId());
-            // com.spice.profitmandi.dao.entity.user.User user = userMap.get(store.getId());
-            String urlString = districtMaster.getStateShortName() + "/" + Utils.getHyphenatedString(districtMaster.getName()) + "/" + store.getCode();
-            fofoRetailerUrlMap.put(store.getId(), urlString.toLowerCase());
-            LOGGER.info("Store is {} end", store);
+            String urlString = districtMaster.getStateShortName() + "/" +
+                    Utils.getHyphenatedString(districtMaster.getName()) + "/" + store.getCode();
+            fofoRetailerUrlMap.put(store.getId(), urlString.toLowerCase());
+        }
         return fofoRetailerUrlMap;
+    }
     @Override

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java – Rev 35372 → 35394