Subversion Repositories SmartDukaan

Rev

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

Rev 22716 Rev 22770
Line 89... Line 89...
89 
	PrivateDealUserAddressMappingRepository privateDealUserAddressMappingRepository;
 89 
	PrivateDealUserAddressMappingRepository privateDealUserAddressMappingRepository;
90
90
91 
	@Autowired
 91 
	@Autowired
92 
	CounterRepository counterRepository;
 92 
	CounterRepository counterRepository;
93
93
94 
 
 - 
 
95 
	@Autowired
 94 
	@Autowired
96 
	Mongo mongoClient;
 95 
	Mongo mongoClient;
97
96
98
97
99 
	private static final Logger LOGGER = LoggerFactory.getLogger(MigrationUtil.class);
 98 
	private static final Logger LOGGER = LoggerFactory.getLogger(MigrationUtil.class);
Line 174... Line 173...
174 
				retailerRepository.persist(retailer);
 173 
				retailerRepository.persist(retailer);
175 
			} catch (ProfitMandiBusinessException e) {
 174 
			} catch (ProfitMandiBusinessException e) {
176 
				LOGGER.info("Error occured while commiting retailer");
 175 
				LOGGER.info("Error occured while commiting retailer");
177 
				e.printStackTrace();
 176 
				e.printStackTrace();
178 
			}
 177 
			}
- 
 
 178
- 
 
 179 
			if(!userRoleRepository.isExistByUserIdAndType(saholicUserAccount.getUser_id(), RoleType.RETAILER)){
179 
			UserRole userRole1 = new UserRole();
 180 
				UserRole userRole1 = new UserRole();
180 
			userRole1.setRoleType(RoleType.RETAILER);
 181 
				userRole1.setRoleType(RoleType.RETAILER);
181 
			userRole1.setUserId(saholicUserAccount.getUser_id());
 182 
				userRole1.setUserId(saholicUserAccount.getUser_id());
182 
			try {
 183 
				try {
183 
				userRoleRepository.persist(userRole1);
 184 
					userRoleRepository.persist(userRole1);
184 
			} catch (ProfitMandiBusinessException e) {
 185 
				} catch (ProfitMandiBusinessException e) {
185 
				e.printStackTrace();
 186 
					e.printStackTrace();
- 
 
 187 
				}
186 
			}
 188 
			}
187
189
- 
 
 190 
			if(!userRoleRepository.isExistByUserIdAndType(saholicUserAccount.getUser_id(), RoleType.USER)){
- 
 
 191
188 
			UserRole userRole2 = new UserRole();
 192 
				UserRole userRole2 = new UserRole();
189 
			userRole2.setRoleType(RoleType.USER);
 193 
				userRole2.setRoleType(RoleType.USER);
190 
			userRole2.setUserId(saholicUserAccount.getUser_id());
 194 
				userRole2.setUserId(saholicUserAccount.getUser_id());
191 
			try {
 195 
				try {
192 
				userRoleRepository.persist(userRole2);
 196 
					userRoleRepository.persist(userRole2);
193 
			} catch (ProfitMandiBusinessException e) {
 197 
				} catch (ProfitMandiBusinessException e) {
194 
				e.printStackTrace();
 198 
					e.printStackTrace();
- 
 
 199 
				}
195 
			}
 200 
			}
196 
			LOGGER.info("Retailer migrated {}", retailerId);
 201 
			LOGGER.info("Retailer migrated {}", retailerId);
197 
		}
 202 
		}
198 
	}
 203 
	}
199
204
Line 404... Line 409...
404 
		PrivateDealUser privateDealUser = new PrivateDealUser();
 409 
		PrivateDealUser privateDealUser = new PrivateDealUser();
405 
		privateDealUser.setActive(true);
 410 
		privateDealUser.setActive(true);
406 
		privateDealUser.setBulkShipmentAmountLimit(50000);
 411 
		privateDealUser.setBulkShipmentAmountLimit(50000);
407 
		privateDealUser.setId(retailerId);
 412 
		privateDealUser.setId(retailerId);
408 
		privateDealUser.setCounterId(counterId);
 413 
		privateDealUser.setCounterId(counterId);
409 
		privateDealUser.setFofo(true);
 414 
		//privateDealUser.setFofo(true);
410 
		privateDealUserRepository.persist(privateDealUser);
 415 
		privateDealUserRepository.persist(privateDealUser);
411 
	}
 416 
	}
412
417
413 
	private Integer createCounter(String emailId, String gstNumber, String mobileNumber, String name, int addressId){
 418 
	private Integer createCounter(String emailId, String gstNumber, String mobileNumber, String name, int addressId){
414 
		if(gstNumber != null && !gstNumber.isEmpty()){
 419 
		if(gstNumber != null && !gstNumber.isEmpty()){