Subversion Repositories SmartDukaan

Rev

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

Rev 25952 Rev 25973
Line 186... Line 186...
186
	@ApiImplicitParams({
186
	@ApiImplicitParams({
187
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
187
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
188
	public ResponseEntity<?> getPartners(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId)
188
	public ResponseEntity<?> getPartners(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId)
189
			throws ProfitMandiBusinessException {
189
			throws ProfitMandiBusinessException {
190
 
190
 
191
		AuthUser authUser = authRepository.selectByGmailId("adeelyazdani.pmps@gmail.com");
191
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
192
 
192
 
193
		Map<String, Set<String>> storeGuyMap = csService.getAuthUserPartnerEmailMapping();
193
		Map<String, Set<String>> storeGuyMap = csService.getAuthUserPartnerEmailMapping();
194
 
194
 
195
		Set<String> emails = storeGuyMap.get(authUser.getEmailId());
195
		Set<String> emails = storeGuyMap.get(authUser.getEmailId());
196
		LOGGER.info("emails" + emails);
196
		LOGGER.info("emails" + emails);
Line 232... Line 232...
232
		franchiseeVisit.setCreatedTimestamp(LocalDateTime.now());
232
		franchiseeVisit.setCreatedTimestamp(LocalDateTime.now());
233
		franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
233
		franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
234
		franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
234
		franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
235
		franchiseeVisit.setSchelduleTimestamp(createFranchiseeRequest.getFirstSchelduleTimestamp());
235
		franchiseeVisit.setSchelduleTimestamp(createFranchiseeRequest.getFirstSchelduleTimestamp());
236
		// change
236
		// change
237
		AuthUser authUser = authRepository.selectByGmailId("adeelyazdani.pmps@gmail.com");
237
		AuthUser authUser = authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
238
 
238
 
239
		String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
239
		String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
240
		franchiseeVisit.setCreatedBy(authUserName);
240
		franchiseeVisit.setCreatedBy(authUserName);
241
		franchiseeVisit.setAuthId(authUser.getId());
241
		franchiseeVisit.setAuthId(authUser.getId());
242
 
242
 
Line 279... Line 279...
279
		}
279
		}
280
 
280
 
281
		// AuthUser authUser =
281
		// AuthUser authUser =
282
		// authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
282
		// authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
283
		// change
283
		// change
284
		AuthUser authUser = authRepository.selectByGmailId("adeelyazdani.pmps@gmail.com");
284
		AuthUser authUser = authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
285
 
285
 
286
		String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
286
		String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
287
		franchiseeVisit.setCreatedBy(authUserName);
287
		franchiseeVisit.setCreatedBy(authUserName);
288
		franchiseeVisit.setAuthId(authUser.getId());
288
		franchiseeVisit.setAuthId(authUser.getId());
289
 
289
 
Line 310... Line 310...
310
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
310
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
311
	public ResponseEntity<?> getFranchiseVisit(HttpServletRequest request,
311
	public ResponseEntity<?> getFranchiseVisit(HttpServletRequest request,
312
			@RequestParam(name = "gmailId") String gmailId, @RequestParam(name = "status") FranchiseeVisitStatus status,
312
			@RequestParam(name = "gmailId") String gmailId, @RequestParam(name = "status") FranchiseeVisitStatus status,
313
			@RequestParam(name = "offset", defaultValue = "0") int offset,
313
			@RequestParam(name = "offset", defaultValue = "0") int offset,
314
			@RequestParam(name = "limit", defaultValue = "10") int limit) throws ProfitMandiBusinessException {
314
			@RequestParam(name = "limit", defaultValue = "10") int limit) throws ProfitMandiBusinessException {
315
		AuthUser authUser = authRepository.selectByGmailId("adeelyazdani.pmps@gmail.com");
315
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
316
 
316
 
317
		List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectByAuthIdAndStatus(authUser.getId(),
317
		List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectByAuthIdAndStatus(authUser.getId(),
318
				status, offset, limit);
318
				status, offset, limit);
319
 
319
 
320
		for (FranchiseeVisit fv : franchiseeVisits) {
320
		for (FranchiseeVisit fv : franchiseeVisits) {