Subversion Repositories SmartDukaan

Rev

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

Rev 30281 Rev 30282
Line 104... Line 104...
104
	@Autowired
104
	@Autowired
105
	private StoreTimelineTatService storeTimelineTatService;
105
	private StoreTimelineTatService storeTimelineTatService;
106
 
106
 
107
	@RequestMapping(value = "/lead", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
107
	@RequestMapping(value = "/lead", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
108
	@ApiImplicitParams({
108
	@ApiImplicitParams({
109
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
109
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
110
	public ResponseEntity<?> LeadUser(HttpServletRequest request,
110
	public ResponseEntity<?> LeadUser(HttpServletRequest request,
111
			@RequestBody CreateRefferalRequest createRefferalRequest) throws Exception {
111
									  @RequestBody CreateRefferalRequest createRefferalRequest) throws Exception {
112
		Lead lead = new Lead();
112
		Lead lead = new Lead();
113
		lead.setFirstName(createRefferalRequest.getFirstName());
113
		lead.setFirstName(createRefferalRequest.getFirstName());
114
		lead.setLastName(createRefferalRequest.getLastName());
114
		lead.setLastName(createRefferalRequest.getLastName());
115
		lead.setLeadMobile(createRefferalRequest.getMobile());
115
		lead.setLeadMobile(createRefferalRequest.getMobile());
116
		lead.setState(createRefferalRequest.getState());
116
		lead.setState(createRefferalRequest.getState());
Line 152... Line 152...
152
		return responseSender.ok(true);
152
		return responseSender.ok(true);
153
	}
153
	}
154
 
154
 
155
	@RequestMapping(value = "/lead-description", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
155
	@RequestMapping(value = "/lead-description", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
156
	@ApiImplicitParams({
156
	@ApiImplicitParams({
157
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
157
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
158
	public ResponseEntity<?> leadDescription(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId,
158
	public ResponseEntity<?> leadDescription(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId,
159
			@RequestParam(name = "status") LeadStatus status) throws ProfitMandiBusinessException {
159
											 @RequestParam(name = "status") LeadStatus status) throws ProfitMandiBusinessException {
160
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
160
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
161
		List<Lead> leads = null;
161
		List<Lead> leads = null;
162
		leads = leadRepository.selectByAssignAuthIdAndStatus(authUser.getId(), status);
162
		leads = leadRepository.selectByAssignAuthIdAndStatus(authUser.getId(), status);
163
		if (status.equals(LeadStatus.followUp)) {
163
		if (status.equals(LeadStatus.followUp)) {
164
			/*leads = leadRepository.selectLeadsScheduledBetweenDate(Arrays.asList(authUser.getId()),
164
			/*leads = leadRepository.selectLeadsScheduledBetweenDate(Arrays.asList(authUser.getId()),
165
					LocalDate.now().atStartOfDay().minusDays(30), LocalDate.now().plusDays(30).atTime(LocalTime.MAX));*/
165
					LocalDate.now().atStartOfDay().minusDays(30), LocalDate.now().plusDays(30).atTime(LocalTime.MAX));*/
-
 
166
			Collections.sort(leads, (o1, o2) -> {
-
 
167
				if (o1.getScheduledTimestamp() != null && o2.getScheduledTimestamp() != null) {
166
			Collections.sort(leads, (o1, o2) -> o1.getScheduledTimestamp().isAfter(o2.getScheduledTimestamp()) ? 1 : -1))
168
					return o1.getScheduledTimestamp().isBefore(o2.getScheduledTimestamp()) ? -1 : 1;
-
 
169
				} else if (o1.getScheduledTimestamp() != null) {
-
 
170
					return 1;
-
 
171
				} else {
-
 
172
					return -1;
-
 
173
				}
-
 
174
			});
167
			;
175
			;
168
		}
176
		}
169
 
177
 
170
		return responseSender.ok(leads);
178
		return responseSender.ok(leads);
171
 
179
 
172
	}
180
	}
173
 
181
 
174
	@RequestMapping(value = "/getlead", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
182
	@RequestMapping(value = "/getlead", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
175
	@ApiImplicitParams({
183
	@ApiImplicitParams({
176
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
184
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
177
	public ResponseEntity<?> getLead(HttpServletRequest request, @RequestParam(name = "id") int id)
185
	public ResponseEntity<?> getLead(HttpServletRequest request, @RequestParam(name = "id") int id)
178
			throws ProfitMandiBusinessException {
186
			throws ProfitMandiBusinessException {
179
 
187
 
180
		List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(id);
188
		List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(id);
181
		Lead lead = leadRepository.selectById(id);
189
		Lead lead = leadRepository.selectById(id);
Line 184... Line 192...
184
 
192
 
185
	}
193
	}
186
 
194
 
187
	@RequestMapping(value = "/leadUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
195
	@RequestMapping(value = "/leadUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
188
	@ApiImplicitParams({
196
	@ApiImplicitParams({
189
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
197
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
190
	public ResponseEntity<?> leadUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
198
	public ResponseEntity<?> leadUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
191
			@RequestParam(name = "status") LeadStatus status, @RequestParam(name = "colorCheck") Boolean colorCheck,
199
										@RequestParam(name = "status") LeadStatus status, @RequestParam(name = "colorCheck") Boolean colorCheck,
192
			@RequestParam(name = "remark") String remark, @RequestParam(name = "reason") String reason,
200
										@RequestParam(name = "remark") String remark, @RequestParam(name = "reason") String reason,
193
			@RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp,
201
										@RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp,
194
			@RequestParam(name = "closureTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime closureTimestamp)
202
										@RequestParam(name = "closureTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime closureTimestamp)
195
			throws ProfitMandiBusinessException {
203
			throws ProfitMandiBusinessException {
196
 
204
 
197
		Lead lead = leadRepository.selectById(id);
205
		Lead lead = leadRepository.selectById(id);
198
 
206
 
199
		LeadActivity leadActivity = new LeadActivity();
207
		LeadActivity leadActivity = new LeadActivity();
Line 228... Line 236...
228
 
236
 
229
	}
237
	}
230
 
238
 
231
	@RequestMapping(value = ProfitMandiConstants.URL_NEW_LEAD, method = RequestMethod.POST)
239
	@RequestMapping(value = ProfitMandiConstants.URL_NEW_LEAD, method = RequestMethod.POST)
232
	public ResponseEntity<?> newLead(HttpServletRequest request,
240
	public ResponseEntity<?> newLead(HttpServletRequest request,
233
			@RequestBody CreateRefferalRequest createRefferalRequest) throws ProfitMandiBusinessException {
241
									 @RequestBody CreateRefferalRequest createRefferalRequest) throws ProfitMandiBusinessException {
234
		LOGGER.info("requested url : " + request.getRequestURL().toString());
242
		LOGGER.info("requested url : " + request.getRequestURL().toString());
235
		Lead lead = new Lead();
243
		Lead lead = new Lead();
236
		lead.setAddress(createRefferalRequest.getCity());
244
		lead.setAddress(createRefferalRequest.getCity());
237
		Long.parseLong(createRefferalRequest.getMobile());
245
		Long.parseLong(createRefferalRequest.getMobile());
238
		if (createRefferalRequest.getMobile().length() != 10) {
246
		if (createRefferalRequest.getMobile().length() != 10) {
Line 269... Line 277...
269
 
277
 
270
	}
278
	}
271
 
279
 
272
	@RequestMapping(value = "/getPartnersList", method = RequestMethod.GET)
280
	@RequestMapping(value = "/getPartnersList", method = RequestMethod.GET)
273
	@ApiImplicitParams({
281
	@ApiImplicitParams({
274
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
282
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
275
	public ResponseEntity<?> getPartners(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId)
283
	public ResponseEntity<?> getPartners(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId)
276
			throws ProfitMandiBusinessException {
284
			throws ProfitMandiBusinessException {
277
 
285
 
278
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
286
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
279
 
287
 
Line 304... Line 312...
304
		return responseSender.ok(partners);
312
		return responseSender.ok(partners);
305
	}
313
	}
306
 
314
 
307
	@RequestMapping(value = "/franchise-first-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
315
	@RequestMapping(value = "/franchise-first-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
308
	@ApiImplicitParams({
316
	@ApiImplicitParams({
309
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
317
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
310
	public ResponseEntity<?> FranchiseFirstVisit(HttpServletRequest request,
318
	public ResponseEntity<?> FranchiseFirstVisit(HttpServletRequest request,
311
			@RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
319
												 @RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
312
 
320
 
313
		FranchiseeVisit franchiseeVisit = new FranchiseeVisit();
321
		FranchiseeVisit franchiseeVisit = new FranchiseeVisit();
314
		franchiseeVisit.setFofoId(createFranchiseeRequest.getFofoId());
322
		franchiseeVisit.setFofoId(createFranchiseeRequest.getFofoId());
315
		CustomRetailer customRetailer = retailerService.getFofoRetailer(createFranchiseeRequest.getFofoId());
323
		CustomRetailer customRetailer = retailerService.getFofoRetailer(createFranchiseeRequest.getFofoId());
316
 
324
 
Line 332... Line 340...
332
		return responseSender.ok(true);
340
		return responseSender.ok(true);
333
	}
341
	}
334
 
342
 
335
	@RequestMapping(value = "/franchise-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
343
	@RequestMapping(value = "/franchise-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
336
	@ApiImplicitParams({
344
	@ApiImplicitParams({
337
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
345
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
338
	public ResponseEntity<?> FranchiseVisit(HttpServletRequest request,
346
	public ResponseEntity<?> FranchiseVisit(HttpServletRequest request,
339
			@RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
347
											@RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
340
 
348
 
341
		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(createFranchiseeRequest.getId());
349
		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(createFranchiseeRequest.getId());
342
		franchiseeVisit.setFofoId(createFranchiseeRequest.getFofoId());
350
		franchiseeVisit.setFofoId(createFranchiseeRequest.getFofoId());
343
		CustomRetailer customRetailer = retailerService.getFofoRetailer(createFranchiseeRequest.getFofoId());
351
		CustomRetailer customRetailer = retailerService.getFofoRetailer(createFranchiseeRequest.getFofoId());
344
 
352
 
Line 392... Line 400...
392
		return responseSender.ok(true);
400
		return responseSender.ok(true);
393
	}
401
	}
394
 
402
 
395
	@RequestMapping(value = "/getFranchiseVisit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
403
	@RequestMapping(value = "/getFranchiseVisit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
396
	@ApiImplicitParams({
404
	@ApiImplicitParams({
397
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
405
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
398
	public ResponseEntity<?> getFranchiseVisit(HttpServletRequest request,
406
	public ResponseEntity<?> getFranchiseVisit(HttpServletRequest request,
399
			@RequestParam(name = "gmailId") String gmailId, @RequestParam(name = "status") FranchiseeVisitStatus status,
407
											   @RequestParam(name = "gmailId") String gmailId, @RequestParam(name = "status") FranchiseeVisitStatus status,
400
			@RequestParam(name = "offset", defaultValue = "0") int offset,
408
											   @RequestParam(name = "offset", defaultValue = "0") int offset,
401
			@RequestParam(name = "limit", defaultValue = "10") int limit) throws ProfitMandiBusinessException {
409
											   @RequestParam(name = "limit", defaultValue = "10") int limit) throws ProfitMandiBusinessException {
402
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
410
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
403
 
411
 
404
		List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectByAuthIdAndStatus(authUser.getId(),
412
		List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectByAuthIdAndStatus(authUser.getId(),
405
				status, offset, limit);
413
				status, offset, limit);
406
 
414
 
Line 415... Line 423...
415
 
423
 
416
	}
424
	}
417
 
425
 
418
	@RequestMapping(value = "/getFranchiseActivity", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
426
	@RequestMapping(value = "/getFranchiseActivity", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
419
	@ApiImplicitParams({
427
	@ApiImplicitParams({
420
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
428
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
421
	public ResponseEntity<?> getFranchiseActivity(HttpServletRequest request, @RequestParam(name = "id") int id)
429
	public ResponseEntity<?> getFranchiseActivity(HttpServletRequest request, @RequestParam(name = "id") int id)
422
			throws ProfitMandiBusinessException {
430
			throws ProfitMandiBusinessException {
423
 
431
 
424
		List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository.selectByFranchiseeVisitId(id);
432
		List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository.selectByFranchiseeVisitId(id);
425
 
433
 
Line 427... Line 435...
427
 
435
 
428
	}
436
	}
429
 
437
 
430
	@RequestMapping(value = "/getFranchiseeInfo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
438
	@RequestMapping(value = "/getFranchiseeInfo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
431
	@ApiImplicitParams({
439
	@ApiImplicitParams({
432
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
440
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
433
	public ResponseEntity<?> getFranchiseeInfo(HttpServletRequest request, @RequestParam(name = "id") int id)
441
	public ResponseEntity<?> getFranchiseeInfo(HttpServletRequest request, @RequestParam(name = "id") int id)
434
			throws ProfitMandiBusinessException {
442
			throws ProfitMandiBusinessException {
435
		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
443
		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
436
 
444
 
437
		return responseSender.ok(franchiseeVisit);
445
		return responseSender.ok(franchiseeVisit);
438
 
446
 
439
	}
447
	}
440
 
448
 
441
	@RequestMapping(value = "/franchise-visit-update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
449
	@RequestMapping(value = "/franchise-visit-update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
442
	@ApiImplicitParams({
450
	@ApiImplicitParams({
443
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
451
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
444
	public ResponseEntity<?> franchiseVisitUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
452
	public ResponseEntity<?> franchiseVisitUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
445
			@RequestParam(name = "action") FranchiseeActivityStatus action,
453
												  @RequestParam(name = "action") FranchiseeActivityStatus action,
446
			@RequestParam(name = "resolution") String resolution,
454
												  @RequestParam(name = "resolution") String resolution,
447
			@RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp)
455
												  @RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp)
448
			throws ProfitMandiBusinessException {
456
			throws ProfitMandiBusinessException {
449
		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
457
		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
450
 
458
 
451
		FranchiseeActivity franchiseeActivity = new FranchiseeActivity();
459
		FranchiseeActivity franchiseeActivity = new FranchiseeActivity();
452
 
460
 
Line 480... Line 488...
480
 
488
 
481
	}
489
	}
482
 
490
 
483
	@RequestMapping(value = "/onBoardingTimelineStatus", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
491
	@RequestMapping(value = "/onBoardingTimelineStatus", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
484
	@ApiImplicitParams({
492
	@ApiImplicitParams({
485
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
493
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
486
	public ResponseEntity<?> onBoardingTimelineStatus(HttpServletRequest request, Model model)
494
	public ResponseEntity<?> onBoardingTimelineStatus(HttpServletRequest request, Model model)
487
			throws ProfitMandiBusinessException {
495
			throws ProfitMandiBusinessException {
488
		int userId = (int) request.getAttribute("userId");
496
		int userId = (int) request.getAttribute("userId");
489
		UserCart uc = userAccountRepository.getUserCart(userId);
497
		UserCart uc = userAccountRepository.getUserCart(userId);
490
		FofoStore fs = fofoStoreRepository.selectByRetailerId(uc.getUserId());
498
		FofoStore fs = fofoStoreRepository.selectByRetailerId(uc.getUserId());
Line 503... Line 511...
503
 
511
 
504
	}
512
	}
505
 
513
 
506
	@RequestMapping(value = "/onBoardingTimelineVisibility", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
514
	@RequestMapping(value = "/onBoardingTimelineVisibility", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
507
	@ApiImplicitParams({
515
	@ApiImplicitParams({
508
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
516
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
509
	public ResponseEntity<?> onBoardingTimelineVisibility(HttpServletRequest request, Model model)
517
	public ResponseEntity<?> onBoardingTimelineVisibility(HttpServletRequest request, Model model)
510
			throws ProfitMandiBusinessException {
518
			throws ProfitMandiBusinessException {
511
		int userId = (int) request.getAttribute("userId");
519
		int userId = (int) request.getAttribute("userId");
512
		UserCart uc = userAccountRepository.getUserCart(userId);
520
		UserCart uc = userAccountRepository.getUserCart(userId);
513
 
521
 
Line 546... Line 554...
546
	@Autowired
554
	@Autowired
547
	private AuthUserPartnerMappingRepository authUserPartnerMappingRepository;
555
	private AuthUserPartnerMappingRepository authUserPartnerMappingRepository;
548
 
556
 
549
	@RequestMapping(value = "/getPartnerTarget", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
557
	@RequestMapping(value = "/getPartnerTarget", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
550
	@ApiImplicitParams({
558
	@ApiImplicitParams({
551
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
559
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
552
	public ResponseEntity<?> getPartnerTarget(HttpServletRequest request,
560
	public ResponseEntity<?> getPartnerTarget(HttpServletRequest request,
553
			@RequestParam(name = "gmailId") String gmailId, @RequestParam String dayValue)
561
											  @RequestParam(name = "gmailId") String gmailId, @RequestParam String dayValue)
554
			throws ProfitMandiBusinessException {
562
			throws ProfitMandiBusinessException {
555
 
563
 
556
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
564
		AuthUser authUser = authRepository.selectByGmailId(gmailId);
557
 
565
 
558
		Set<Integer> fofoIds = authUserPartnerMappingRepository.selectByAuthId(authUser.getId()).stream()
566
		Set<Integer> fofoIds = authUserPartnerMappingRepository.selectByAuthId(authUser.getId()).stream()
Line 777... Line 785...
777
 
785
 
778
	}
786
	}
779
 
787
 
780
	@RequestMapping(value = "/target", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
788
	@RequestMapping(value = "/target", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
781
	@ApiImplicitParams({
789
	@ApiImplicitParams({
782
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
790
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
783
	public ResponseEntity<?> createPartnerTarget(HttpServletRequest request,
791
	public ResponseEntity<?> createPartnerTarget(HttpServletRequest request,
784
			@RequestBody PartnerTargetAchievementModel ptam) throws ProfitMandiBusinessException {
792
												 @RequestBody PartnerTargetAchievementModel ptam) throws ProfitMandiBusinessException {
785
 
793
 
786
		LOGGER.info("ptam" + ptam);
794
		LOGGER.info("ptam" + ptam);
787
 
795
 
788
		AuthUser authUser = authRepository.selectByGmailId(ptam.getCreatedBy());
796
		AuthUser authUser = authRepository.selectByGmailId(ptam.getCreatedBy());
789
 
797