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

     private UserRepository userRepository;
     @Autowired
     ObjectMapper objectMapper;
     @Autowired
     private CartRepository cartRepository;
     @Autowired
     private RetailerRegisteredAddressRepository retailerRegisteredAddressRepository;
         if (fofoIds == null || fofoIds.isEmpty()) {
             return new HashMap<>();
+        }
         List<com.spice.profitmandi.dao.entity.user.User> saholicUsers = userUserRepository.selectByIds(fofoIds);
+        // Check for saholicUsers without corresponding dtrUser
+        List<String> saholicEmails = saholicUsers.stream()
+                .map(com.spice.profitmandi.dao.entity.user.User::getEmailId)
+                .filter(email -> email != null)
+                .collect(Collectors.toList());
+        Set<String> dtrUserEmails = userRepository.selectAllByEmailIds(saholicEmails).stream()
+                .map(User::getEmailId)
+                .collect(Collectors.toSet());
+        for (com.spice.profitmandi.dao.entity.user.User saholicUser : saholicUsers) {
+            if (saholicUser.getEmailId() != null && !dtrUserEmails.contains(saholicUser.getEmailId())) {
+                LOGGER.warn("dtrUser not found for saholicUser - id: {}, email: {}", saholicUser.getId(), saholicUser.getEmailId());
+            }
+        }
         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()));
                 .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));
+                .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());
             FofoStore fs = fofoStoreMap.get(address.getRetaierId());
     /**
      * 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,
+                                               FofoStore fs, Map<Integer, PrivateDealUser> privateDealUserMap,
-                                                Map<Integer, Counter> counterMap) {
+                                               Map<Integer, Counter> counterMap) {
         CustomRetailer customRetailer = new CustomRetailer();
         customRetailer.setEmail(user.getEmailId());
         customRetailer.setBusinessName(address.getName());
         customRetailer.setMobileNumber(address.getPhoneNumber());
         customRetailer.setCode(fs.getCode());
     @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 = null;
+        try {
-        User dtrUser = userRepository.selectByEmailId(saholicUser.getEmailId());
+            dtrUser = userRepository.selectByEmailId(saholicUser.getEmailId());
+        } catch (ProfitMandiBusinessException e) {
+            LOGGER.info("User not found for emailId: {} and id is : {}", saholicUser.getEmailId(), saholicUser.getId());
+        }
         FofoStore store = fofoStoreRepository.selectByRetailerId(fofoId);
         Address address = addressRepository.selectById(saholicUser.getAddressId());
         CustomRetailer customRetailer = new CustomRetailer();
         customRetailer.setEmail(saholicUser.getEmailId());
                 .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));
+                .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());

Subversion Repositories SmartDukaan

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