Subversion Repositories SmartDukaan

Rev

Rev 23136 | Rev 23202 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 23136 Rev 23137
Line 175... Line 175...
175
	private Retailer updateRetailer(User user, Retailer retailer, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException{
175
	private Retailer updateRetailer(User user, Retailer retailer, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException{
176
		if(retailer == null){
176
		if(retailer == null){
177
			int saholicUserId = this.createSaholicUser(user, updateRetailerRequest.getName());
177
			int saholicUserId = this.createSaholicUser(user, updateRetailerRequest.getName());
178
			retailer = new Retailer();
178
			retailer = new Retailer();
179
			retailer.setId(saholicUserId);
179
			retailer.setId(saholicUserId);
180
			UserRole userRole = new UserRole();
-
 
181
			userRole.setUserId(user.getId());
-
 
182
			userRole.setRoleType(RoleType.RETAILER);
-
 
183
			userRoleRepository.persist(userRole);
-
 
184
		}
180
		}
-
 
181
		this.createRole(user.getId(), RoleType.RETAILER);
185
		retailer.setName(updateRetailerRequest.getName());
182
		retailer.setName(updateRetailerRequest.getName());
186
		retailer.setNumber(updateRetailerRequest.getNumber());
183
		retailer.setNumber(updateRetailerRequest.getNumber());
187
		if(updateRetailerRequest.getNumber() == null || updateRetailerRequest.getNumber().isEmpty()){
184
		if(updateRetailerRequest.getNumber() == null || updateRetailerRequest.getNumber().isEmpty()){
188
			retailer.setType(RetailerType.UNREGISTERED_SHOP);
185
			retailer.setType(RetailerType.UNREGISTERED_SHOP);
189
		}else{
186
		}else{
Line 194... Line 191...
194
		}
191
		}
195
		retailerRepository.persist(retailer);
192
		retailerRepository.persist(retailer);
196
		return retailer;
193
		return retailer;
197
	}
194
	}
198
	
195
	
-
 
196
	private void createRole(int userId, RoleType roleType){
-
 
197
		if(!userRoleRepository.isExistByUserIdAndType(userId, roleType)){
-
 
198
			UserRole userRole = new UserRole();
-
 
199
			userRole.setUserId(userId);
-
 
200
			userRole.setRoleType(roleType);
-
 
201
			try{
-
 
202
				userRoleRepository.persist(userRole);
-
 
203
			}catch(ProfitMandiBusinessException profitMandiBusinessException){
-
 
204
				LOGGER.error("Retailer role is already exist with userId {}", userId);
-
 
205
			}
-
 
206
		}else{
-
 
207
			LOGGER.error("Retailer role not found with userId {}", userId);
-
 
208
		}
-
 
209
		
-
 
210
	}
-
 
211
	
199
	private Address updateRetailerAddress(Address address, CustomAddress customAddress, int retailerId) throws ProfitMandiBusinessException{
212
	private Address updateRetailerAddress(Address address, CustomAddress customAddress, int retailerId) throws ProfitMandiBusinessException{
200
		if(address == null){
213
		if(address == null){
201
			address = new Address();
214
			address = new Address();
202
			address.setRetaierId(retailerId);
215
			address.setRetaierId(retailerId);
203
			this.updateAddress(address, customAddress);
216
			this.updateAddress(address, customAddress);