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

 	@Autowired
 	private PrivateDealUserAddressMappingRepository privateDealUserAddressMappingRepository;
 	@Autowired
 	private CounterRepository counterRepository;
 	@Autowired
 	private StateRepository stateRepository;
 	@Autowired
 	@Qualifier("userUserRepository")
 			} 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(x -> x.getName()).collect(Collectors.toList()));
 		if (user != null) {
 			List<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
+		}
 		return userRoles;
+	}
+	private List<UserRole> removeRole(List<UserRole> userRoles, int userId, int roleId) {
+		if (userRoles == null) {
+			userRoles = new ArrayList<>();
+			return userRoles;
+		}
+		try {
+			userRoles.remove(userRoleRepository.deleteByRoleUserId(userId, roleId));
+		} catch (Exception e) {
+		}
+		return userRoles;
+	}
 	@SuppressWarnings("unchecked")
 	@Override
 	public Map<String, Object> updateRetailerDetails(UpdateRetailerRequest updateRetailerRequest)
 			throws ProfitMandiBusinessException {
 		Map<String, Object> map = this.getByEmailIdOrMobileNumber(updateRetailerRequest.getEmailIdOrMobileNumber());
 		Role roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
 		if (updateRetailerRequest.isFofo()) {
 			userRoles = this.addRole(userRoles, user.getId(), roleFofo.getId());
+		} else {
-			map.put("fofoRole", this.containsRoleType(userRoles, roleFofo.getId()));
+			userRoles = this.removeRole(userRoles, user.getId(), roleFofo.getId());
+		}
+		map.put("fofoRole", this.containsRoleType(userRoles, roleFofo.getId()));
 		if (this.containsRoleType(userRoles, roleFofo.getId())) {
 			this.createDefaultPaymentOption(retailer.getId());
+		}
+		}
 		if (updateRetailerRequest.getDocumentId() > 0) {
 			if (retailer.getDocumentId() != null && retailer.getDocumentId() != updateRetailerRequest.getDocumentId()) {
 				try {
 					documentRepository.deleteById(retailer.getDocumentId());
-				} catch(Exception e) {
+				} catch (Exception e) {
 					e.printStackTrace();
+				}
+			}
 			retailer.setDocumentId(updateRetailerRequest.getDocumentId());
 			documentRepository.markDocumentAsPersisted(updateRetailerRequest.getDocumentId());
 		shop.setName(customShop.getName());
 		if (customShop.getDocumentId() > 0) {
 			if (shop.getDocumentId() != null && shop.getDocumentId() != customShop.getDocumentId()) {
 				try {
 					documentRepository.deleteById(shop.getDocumentId());
-				} catch(Exception e) {
+				} catch (Exception e) {
 					e.printStackTrace();
+				}
+			}
 			shop.setDocumentId(customShop.getDocumentId());
 			documentRepository.markDocumentAsPersisted(customShop.getDocumentId());
 					shopAddress.setAddressId(address.getId());
 					shopAddressRepository.persist(shopAddress);
 					shop.setAddress(address);
 					shopRepository.persist(shop);
+				}
-			} catch(Exception e) {
+			} catch (Exception e) {
 				if (customShop.isSameAsRetailerAddress()) {
 					address = sameAsRetailerAddressValue;
 				} else {
 					// shop.setDocumentId(customShop.getDocumentId());
 					address = new Address();
 				} catch (ProfitMandiBusinessException profitMandiBusinessException) {
 					shopAddress = new ShopAddress();
 					shopAddress.setAddressId(address.getId());
 					shopAddress.setShopId(shop.getId());
+				}
-				shopAddressRepository.persist(shopAddress);			}
+				shopAddressRepository.persist(shopAddress);
+			}
+		}
+	}
 			throw new ProfitMandiBusinessException(ProfitMandiConstants.USER_ID, user.getId(), "USR_1013");
+		}
 		return this.createFofoStoreCodeByRetailerId(retailer.getId(), districtName, stateName, updateRetailerRequest);
+	}
 	@Override
 	public List<DistrictMaster> getAllDistrictMaster(String stateName) {
 		StateInfo stateInfo = null;
 		try {
+	}
 	@Override
 	public Map<Integer, CustomRetailer> getFofoRetailers(List<Integer> fofoIds) {
 		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(x -> x.getAddressId(), x -> x));
 		List<Address> addresses = addressRepository.selectByIds(new ArrayList<>(userAddressMap.keySet()));
 		Map<Integer, CustomRetailer> customRetailersMap = new HashMap<>();
-		for(Address address: addresses) {
+		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());
 			customRetailer.setDisplayName(customRetailer.getBusinessName() + "-" + address1.getCity());
 			customRetailersMap.put(address.getRetaierId(), customRetailer);
+		}
 		return customRetailersMap;
+	}
 	@Override
-	public  CustomRetailer getFofoRetailer(int fofoId) throws ProfitMandiBusinessException {
+	public CustomRetailer getFofoRetailer(int fofoId) throws ProfitMandiBusinessException {
 		com.spice.profitmandi.dao.entity.user.User saholicUser = userUserRepository.selectById(fofoId);
 		Address address = null;
 		try {
 			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 customRetailer = new CustomRetailer();
-			customRetailer.setEmail(saholicUser.getEmailId());
+		customRetailer.setEmail(saholicUser.getEmailId());
-			customRetailer.setBusinessName(address.getName());
+		customRetailer.setBusinessName(address.getName());
-			customRetailer.setMobileNumber(address.getPhoneNumber());
+		customRetailer.setMobileNumber(address.getPhoneNumber());
-			try {
+		try {
-				customRetailer.setCartId(saholicUser.getActiveCartId());
+			customRetailer.setCartId(saholicUser.getActiveCartId());
-				PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
+			PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
-				Counter counter = counterRepository.selectById(pdu.getCounterId());
+			Counter counter = counterRepository.selectById(pdu.getCounterId());
-				customRetailer.setGstNumber(counter.getGstin());
+			customRetailer.setGstNumber(counter.getGstin());
-			} catch(Exception e) {
+		} catch (Exception e) {
-				customRetailer.setGstNumber(null);
+			customRetailer.setGstNumber(null);
-			}
+		}
-			CustomAddress address1 = new CustomAddress();
+		CustomAddress address1 = new CustomAddress();
-			address1.setCity(address.getCity());
+		address1.setCity(address.getCity());
-			address1.setState(address.getState());
+		address1.setState(address.getState());
-			address1.setLine1(address.getLine1());
+		address1.setLine1(address.getLine1());
-			address1.setLine2(address.getLine2());
+		address1.setLine2(address.getLine2());
-			address1.setPinCode(address.getPinCode());
+		address1.setPinCode(address.getPinCode());
-			address1.setName(address.getName());
+		address1.setName(address.getName());
-			customRetailer.setAddress(address1);
+		customRetailer.setAddress(address1);
-			customRetailer.setPartnerId(address.getRetaierId());
+		customRetailer.setPartnerId(address.getRetaierId());
-			customRetailersMap.put(address.getRetaierId(), customRetailer);
+		customRetailersMap.put(address.getRetaierId(), customRetailer);
 		return customRetailer;
+	}
 	@Override
 	public Map<Integer, String> getAllFofoRetailerIdEmailIdMap() {
 		Role roleFofo = null;
 		try {
 			roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
 		for (UserAccount userAccount : userAccounts) {
 			userIdRetailerIdMap.put(userAccount.getUserId(), userAccount.getAccountKey());
+		}
 		return userIdRetailerIdMap;
+	}
-	private Map<Integer, String> getUserIdEmailIdMap(Set<Integer> userIds){
+	private Map<Integer, String> getUserIdEmailIdMap(Set<Integer> userIds) {
 		List<User> users = userRepository.selectAllByIds(userIds);
 		Map<Integer, String> userIdEmailIdMap = new HashMap<>();
 		for (User user : users) {
 			userIdEmailIdMap.put(user.getId(), user.getEmailId());
+		}
 		for (UserAccount userAccount : userAccounts) {
 			retailerIdEmailIdMap.put(userAccount.getAccountKey(), userIdEmailIdMap.get(userAccount.getUserId()));
+		}
 		return retailerIdEmailIdMap;
+	}
 	@Override
 	public Map<Integer, String> getAllFofoRetailerIdNameMap(List<Integer> storeIds) {
 		Map<Integer, CustomRetailer> retailersMap = this.getFofoRetailers(storeIds);
 		Map<Integer, String> retailerIdNameMap = new HashMap<>();
-		for (Map.Entry<Integer, CustomRetailer> entry: retailersMap.entrySet()) {
+		for (Map.Entry<Integer, CustomRetailer> entry : retailersMap.entrySet()) {
+			retailerIdNameMap.put(entry.getKey(),
-			retailerIdNameMap.put(entry.getKey(), entry.getValue().getBusinessName() + "-" + entry.getValue().getAddress().getCity());
+					entry.getValue().getBusinessName() + "-" + entry.getValue().getAddress().getCity());
+		}
 		return retailerIdNameMap;
+	}
 	@Override
 	public Map<Integer, String> getAllFofoRetailerIdNameMap() {
 		List<FofoStore> stores = fofoStoreRepository.selectAll();
-		List<Integer> storeIds = stores.stream().map(x->x.getId()).collect(Collectors.toList());
+		List<Integer> storeIds = stores.stream().map(x -> x.getId()).collect(Collectors.toList());
 		return this.getAllFofoRetailerIdNameMap(storeIds);
+	}
 	@Override
 	public List<MapWrapper<Integer, String>> getAllFofoRetailerIdNameList() {
 		List<MapWrapper<Integer, String>> mapWrappers = new ArrayList<>();
 		// TODO Auto-generated method stub
 		Map<Integer, String> fofoIdNameMap = this.getAllFofoRetailerIdNameMap();
-		fofoIdNameMap .forEach((fofoId,name)->{
+		fofoIdNameMap.forEach((fofoId, name) -> {
 			MapWrapper<Integer, String> idWrapper = new MapWrapper<>();
 			idWrapper.setKey(fofoId);
 			idWrapper.setValue(name);
 			mapWrappers.add(idWrapper);
 		});
 		return mapWrappers;
+	}
 	@Override
-	@Cacheable(value="retailerNames", cacheManager="cacheManager")
+	@Cacheable(value = "retailerNames", cacheManager = "cacheManager")
 	public Map<Integer, CustomRetailer> getFofoRetailers() {
 		// TODO Auto-generated method stub
 		List<FofoStore> stores = fofoStoreRepository.selectAll();
-		List<Integer> storeIds = stores.stream().map(x->x.getId()).collect(Collectors.toList());
+		List<Integer> storeIds = stores.stream().map(x -> x.getId()).collect(Collectors.toList());
 		return this.getFofoRetailers(storeIds);
+	}
+}

Subversion Repositories SmartDukaan

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