WebSVN – SmartDukaan – Diff – /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
+import com.spice.profitmandi.common.enumuration.ActivationType;
 import org.apache.commons.csv.CSVRecord;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import io.swagger.annotations.ApiImplicitParams;
 @Controller
 @Transactional(rollbackFor = Throwable.class)
 public class LeadController {
-	private static final Logger LOGGER = LogManager.getLogger(LeadController.class);
+    private static final Logger LOGGER = LogManager.getLogger(LeadController.class);
-	@Autowired
+    @Autowired
-	private ResponseSender<?> responseSender;
+    private ResponseSender<?> responseSender;
-	@Autowired
+    @Autowired
-	private AuthRepository authRepository;
+    private AuthRepository authRepository;
-	@Autowired
+    @Autowired
-	private LeadRepository leadRepository;
+    private LeadRepository leadRepository;
-	@Autowired
+    @Autowired
-	private CsService csService;
+    private CsService csService;
-	@Autowired
+    @Autowired
-	private UserRepository userRepository;
+    private UserRepository userRepository;
-	@Autowired
+    @Autowired
-	private UserAccountRepository userAccountRepository;
+    private UserAccountRepository userAccountRepository;
-	@Autowired
+    @Autowired
-	private com.spice.profitmandi.dao.repository.user.UserRepository userUserRepository;
+    private com.spice.profitmandi.dao.repository.user.UserRepository userUserRepository;
-	@Autowired
+    @Autowired
-	private RetailerService retailerService;
+    private RetailerService retailerService;
-	@Autowired
+    @Autowired
-	private LeadActivityRepository leadActivityRepository;
+    private LeadActivityRepository leadActivityRepository;
-	@Autowired
+    @Autowired
-	private FranchiseeVisitRepository franchiseeVisitRepository;
+    private FranchiseeVisitRepository franchiseeVisitRepository;
-	@Autowired
+    @Autowired
-	private FranchiseeActivityRepository franchiseeActivityRepository;
+    private FranchiseeActivityRepository franchiseeActivityRepository;
-	@Autowired
+    @Autowired
-	private PartnerOnBoardingPanelRepository partnerOnBoardingPanelRepository;
+    private PartnerOnBoardingPanelRepository partnerOnBoardingPanelRepository;
-	@Autowired
+    @Autowired
-	private FofoStoreRepository fofoStoreRepository;
+    private FofoStoreRepository fofoStoreRepository;
-	@Autowired
+    @Autowired
-	private StoreTimelineTatService storeTimelineTatService;
+    private StoreTimelineTatService storeTimelineTatService;
-	@Autowired
+    @Autowired
-	private PartnerCollectionService partnerCollectionService;
+    private PartnerCollectionService partnerCollectionService;
-	@Autowired
+    @Autowired
-	private TicketRepository ticketRepository;
+    private TicketRepository ticketRepository;
-	@Autowired
+    @Autowired
-	private TicketCategoryRepository ticketCategoryRepository;
+    private TicketCategoryRepository ticketCategoryRepository;
-	@Autowired
+    @Autowired
-	private TicketSubCategoryRepository ticketSubCategoryRepository;
+    private TicketSubCategoryRepository ticketSubCategoryRepository;
-	@Autowired
+    @Autowired
-	private PartnerCollectionRemarkRepository partnerCollectionRemarkRepository;
+    private PartnerCollectionRemarkRepository partnerCollectionRemarkRepository;
-	@Autowired
+    @Autowired
-	private Mongo mongoClient;
+    private Mongo mongoClient;
-	@Autowired
+    @Autowired
-	private OrderRepository orderRepository;
+    private OrderRepository orderRepository;
-	@Autowired
+    @Autowired
-	private PartnerCollectionPlanRepository partnerCollectionPlanRepository;
+    private PartnerCollectionPlanRepository partnerCollectionPlanRepository;
-	@Autowired
+    @Autowired
-	private PartnerSecondaryPlanRepository partnerSecondaryPlanRepository;
+    private PartnerSecondaryPlanRepository partnerSecondaryPlanRepository;
-	@Autowired
+    @Autowired
-	private PartnerDailyInvestmentRepository partnerDailyInvestmentRepository;
+    private PartnerDailyInvestmentRepository partnerDailyInvestmentRepository;
-	@Autowired
+    @Autowired
-	private AuthUserPartnerMappingRepository authUserPartnerMappingRepository;
+    private AuthUserPartnerMappingRepository authUserPartnerMappingRepository;
-	@Autowired
+    @Autowired
-	private VisitRequestRepository visitRequestRepository;
+    private VisitRequestRepository visitRequestRepository;
-	@Autowired
+    @Autowired
-	private AuthService authService;
+    private AuthService authService;
-	@Autowired
+    @Autowired
-	private NotificationService notificationService;
+    private NotificationService notificationService;
-	@RequestMapping(value = "/lead", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/lead", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> LeadUser(HttpServletRequest request,
+    public ResponseEntity<?> LeadUser(HttpServletRequest request,
-			@RequestBody CreateRefferalRequest createRefferalRequest) throws Exception {
+                                      @RequestBody CreateRefferalRequest createRefferalRequest) throws Exception {
-		Lead lead = new Lead();
+        Lead lead = new Lead();
-		lead.setFirstName(createRefferalRequest.getFirstName());
+        lead.setFirstName(createRefferalRequest.getFirstName());
-		lead.setLastName(createRefferalRequest.getLastName());
+        lead.setLastName(createRefferalRequest.getLastName());
-		lead.setLeadMobile(createRefferalRequest.getMobile());
+        lead.setLeadMobile(createRefferalRequest.getMobile());
-		lead.setState(createRefferalRequest.getState());
+        lead.setState(createRefferalRequest.getState());
-		lead.setCity(createRefferalRequest.getCity());
+        lead.setCity(createRefferalRequest.getCity());
-		lead.setAddress(createRefferalRequest.getAddress());
+        lead.setAddress(createRefferalRequest.getAddress());
-		lead.setCreatedTimestamp(LocalDateTime.now());
+        lead.setCreatedTimestamp(LocalDateTime.now());
-		lead.setUpdatedTimestamp(LocalDateTime.now());
+        lead.setUpdatedTimestamp(LocalDateTime.now());
-		lead.setStatus(createRefferalRequest.getStatus());
+        lead.setStatus(createRefferalRequest.getStatus());
-		lead.setSource(createRefferalRequest.getSource());
+        lead.setSource(createRefferalRequest.getSource());
-		lead.setNotinterestedReason(createRefferalRequest.getReason());
+        lead.setNotinterestedReason(createRefferalRequest.getReason());
-		if (createRefferalRequest.getColorCheck() == true) {
+        if (createRefferalRequest.getColorCheck() == true) {
-			lead.setColor("Green");
+            lead.setColor("Green");
-		} else {
+        } else {
-			lead.setColor("Yellow");
+            lead.setColor("Yellow");
-		}
+        }
-		AuthUser authUser = authRepository.selectByGmailId(createRefferalRequest.getReffereeEmail());
+        AuthUser authUser = authRepository.selectByGmailId(createRefferalRequest.getReffereeEmail());
-		String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
+        String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
-		lead.setCreatedBy(authUserName);
+        lead.setCreatedBy(authUserName);
-		lead.setAuthId(authUser.getId());
+        lead.setAuthId(authUser.getId());
-		lead.setAssignTo(authUser.getId());
+        lead.setAssignTo(authUser.getId());
-		leadRepository.persist(lead);
+        leadRepository.persist(lead);
-		LeadActivity leadActivity = new LeadActivity();
+        LeadActivity leadActivity = new LeadActivity();
-		leadActivity.setLeadId(lead.getId());
+        leadActivity.setLeadId(lead.getId());
-		leadActivity.setRemark(createRefferalRequest.getRemark());
+        leadActivity.setRemark(createRefferalRequest.getRemark());
-		leadActivity.setAuthId(authUser.getId());
+        leadActivity.setAuthId(authUser.getId());
-		if (createRefferalRequest.getStatus().equals(LeadStatus.followUp)) {
+        if (createRefferalRequest.getStatus().equals(LeadStatus.followUp)) {
-			leadActivity.setSchelduleTimestamp(createRefferalRequest.getSchelduleTimestamp());
+            leadActivity.setSchelduleTimestamp(createRefferalRequest.getSchelduleTimestamp());
-			leadActivity.setCommunicationType(createRefferalRequest.getCommunicationType());
+            leadActivity.setCommunicationType(createRefferalRequest.getCommunicationType());
-			if (leadActivity.getCommunicationType().equals(CommunicationType.VISIT)) {
+            if (leadActivity.getCommunicationType().equals(CommunicationType.VISIT)) {
-				visitRequestRepository.createVisitRequest(lead.getId(), "lead", lead.getAssignTo(),
+                visitRequestRepository.createVisitRequest(lead.getId(), "lead", lead.getAssignTo(),
-						createRefferalRequest.getSchelduleTimestamp());
+                        createRefferalRequest.getSchelduleTimestamp());
-			}
+            }
-			//
+            //
-			leadActivity.setClosureTimestamp(createRefferalRequest.getClosureTimestamp());
+            leadActivity.setClosureTimestamp(createRefferalRequest.getClosureTimestamp());
-			lead.setClosureTimestamp(createRefferalRequest.getClosureTimestamp());
+            lead.setClosureTimestamp(createRefferalRequest.getClosureTimestamp());
-		} else {
+        } else {
-			leadActivity.setSchelduleTimestamp(null);
+            leadActivity.setSchelduleTimestamp(null);
-			leadActivity.setClosureTimestamp(null);
+            leadActivity.setClosureTimestamp(null);
-			lead.setClosureTimestamp(null);
+            lead.setClosureTimestamp(null);
-		}
+        }
-		leadActivity.setCreatedTimestamp(LocalDateTime.now());
+        leadActivity.setCreatedTimestamp(LocalDateTime.now());
-		leadActivityRepository.persist(leadActivity);
+        leadActivityRepository.persist(leadActivity);
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = "/lead-description", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/lead-description", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> leadDescription(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId,
+    public ResponseEntity<?> leadDescription(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId,
-			@RequestParam(name = "status") LeadStatus status) throws ProfitMandiBusinessException {
+                                             @RequestParam(name = "status") LeadStatus status) throws ProfitMandiBusinessException {
-		AuthUser authUser = authRepository.selectByGmailId(gmailId);
+        AuthUser authUser = authRepository.selectByGmailId(gmailId);
-		List<Lead> leads = null;
+        List<Lead> leads = null;
-		LOGGER.info("emails" + status);
+        LOGGER.info("emails" + status);
-		List<VisitRequest> visitRequests = visitRequestRepository.selectByAuthIdAndDate(authUser.getId(),
+        List<VisitRequest> visitRequests = visitRequestRepository.selectByAuthIdAndDate(authUser.getId(),
-				LocalDate.now());
+                LocalDate.now());
-		Map<Integer, List<VisitRequest>> visitRequestMap = null;
+        Map<Integer, List<VisitRequest>> visitRequestMap = null;
-		if (!visitRequests.isEmpty()) {
+        if (!visitRequests.isEmpty()) {
-			visitRequestMap = visitRequests.stream().collect(Collectors.groupingBy(x -> x.getVisitId()));
+            visitRequestMap = visitRequests.stream().collect(Collectors.groupingBy(x -> x.getVisitId()));
-		}
+        }
-		if (status.equals(LeadStatus.followUp)) {
+        if (status.equals(LeadStatus.followUp)) {
-			leads = leadRepository.selectLeadsScheduledBetweenDate(Arrays.asList(authUser.getId()), null, null);
+            leads = leadRepository.selectLeadsScheduledBetweenDate(Arrays.asList(authUser.getId()), null, null);
-			if (visitRequestMap != null) {
+            if (visitRequestMap != null) {
-				for (Lead lead : leads) {
+                for (Lead lead : leads) {
-					List<VisitRequest> visitRequest = visitRequestMap.get(lead.getId());
+                    List<VisitRequest> visitRequest = visitRequestMap.get(lead.getId());
-					if (visitRequest != null) {
+                    if (visitRequest != null) {
-						if (visitRequest.size() > 1) {
+                        if (visitRequest.size() > 1) {
-							Comparator<VisitRequest> visitComparato = Comparator
+                            Comparator<VisitRequest> visitComparato = Comparator
-									.comparing(VisitRequest::getCreatedTimestamp);
+                                    .comparing(VisitRequest::getCreatedTimestamp);
-							VisitRequest youngestVisit = visitRequest.stream().max(visitComparato).get();
+                            VisitRequest youngestVisit = visitRequest.stream().max(visitComparato).get();
-							lead.setVisitStatus(youngestVisit.getStatus());
+                            lead.setVisitStatus(youngestVisit.getStatus());
-						} else {
+                        } else {
-							lead.setVisitStatus(visitRequest.get(0).getStatus());
+                            lead.setVisitStatus(visitRequest.get(0).getStatus());
-						}
+                        }
-					}
+                    }
-				}
+                }
-			}
+            }
-			leads = leads.stream()
+            leads = leads.stream()
-					.sorted(Comparator.comparing(Lead::getScheduledTimestamp,
+                    .sorted(Comparator.comparing(Lead::getScheduledTimestamp,
-							Comparator.nullsFirst(Comparator.reverseOrder())))
+                            Comparator.nullsFirst(Comparator.reverseOrder())))
-					.collect(Collectors
+                    .collect(Collectors
-							.toList());/*
+                            .toList());/*
-										 * Collections.sort(leads, (o1, o2) -> { if (o1.getScheduledTimestamp() != null
+             * Collections.sort(leads, (o1, o2) -> { if (o1.getScheduledTimestamp() != null
-										 * && o2.getScheduledTimestamp() != null) { return
+             * && o2.getScheduledTimestamp() != null) { return
-										 * o1.getScheduledTimestamp().isBefore(o2.getScheduledTimestamp()) ? -1 : 1; }
+             * o1.getScheduledTimestamp().isBefore(o2.getScheduledTimestamp()) ? -1 : 1; }
-										 * else if (o1.getScheduledTimestamp() != null) { return 1; } else { return -1;
+             * else if (o1.getScheduledTimestamp() != null) { return 1; } else { return -1;
-										 * } });
+             * } });
-										 */
+             */
-		} else {
+        } else {
-			leads = leadRepository.selectByAssignAuthIdAndStatus(authUser.getId(), status);
+            leads = leadRepository.selectByAssignAuthIdAndStatus(authUser.getId(), status);
-		}
+        }
-		return responseSender.ok(leads);
+        return responseSender.ok(leads);
-	}
+    }
-	@RequestMapping(value = "/getlead", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/getlead", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> getLead(HttpServletRequest request, @RequestParam(name = "id") int id)
+    public ResponseEntity<?> getLead(HttpServletRequest request, @RequestParam(name = "id") int id)
-			throws ProfitMandiBusinessException {
+            throws ProfitMandiBusinessException {
-		List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(id);
+        List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(id);
-		Lead lead = leadRepository.selectById(id);
+        Lead lead = leadRepository.selectById(id);
-		lead.setLeadActivities(leadActivities);
+        lead.setLeadActivities(leadActivities);
-		return responseSender.ok(lead);
+        return responseSender.ok(lead);
-	}
+    }
-	@RequestMapping(value = "/leadUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/leadUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> leadUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
+    public ResponseEntity<?> leadUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
-			@RequestParam(name = "status") LeadStatus status, @RequestParam(name = "colorCheck") Boolean colorCheck,
+                                        @RequestParam(name = "status") LeadStatus status, @RequestParam(name = "colorCheck") Boolean colorCheck,
-			@RequestParam(name = "remark") String remark, @RequestParam(name = "reason") String reason,
+                                        @RequestParam(name = "remark") String remark, @RequestParam(name = "reason") String reason,
-			@RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp,
+                                        @RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp,
-			@RequestParam(name = "closureTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime closureTimestamp,
+                                        @RequestParam(name = "closureTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime closureTimestamp,
-			@RequestParam(name = "communicationType") CommunicationType communicationType)
+                                        @RequestParam(name = "communicationType") CommunicationType communicationType)
-			throws ProfitMandiBusinessException {
+            throws ProfitMandiBusinessException {
-		Lead lead = leadRepository.selectById(id);
+        Lead lead = leadRepository.selectById(id);
-		LeadActivity leadActivity = new LeadActivity();
+        LeadActivity leadActivity = new LeadActivity();
-		lead.setStatus(status);
+        lead.setStatus(status);
-		lead.setNotinterestedReason(reason);
+        lead.setNotinterestedReason(reason);
-		leadActivity.setRemark(remark);
+        leadActivity.setRemark(remark);
-		leadActivity.setLeadId(id);
+        leadActivity.setLeadId(id);
-		leadActivity.setCreatedTimestamp(LocalDateTime.now());
+        leadActivity.setCreatedTimestamp(LocalDateTime.now());
-		leadActivity.setSchelduleTimestamp(null);
+        leadActivity.setSchelduleTimestamp(null);
-		leadActivity.setClosureTimestamp(null);
+        leadActivity.setClosureTimestamp(null);
-		leadActivity.setAuthId(lead.getAssignTo());
+        leadActivity.setAuthId(lead.getAssignTo());
-		lead.setUpdatedTimestamp(LocalDateTime.now());
+        lead.setUpdatedTimestamp(LocalDateTime.now());
-		if (colorCheck == true) {
+        if (colorCheck == true) {
-			lead.setColor("Green");
+            lead.setColor("Green");
-		} else {
+        } else {
-			lead.setColor("Yellow");
+            lead.setColor("Yellow");
-		}
+        }
-		if (status == LeadStatus.followUp) {
+        if (status == LeadStatus.followUp) {
-			if (schelduleTimestamp != null) {
+            if (schelduleTimestamp != null) {
-				leadActivity.setCommunicationType(communicationType);
+                leadActivity.setCommunicationType(communicationType);
-				if (leadActivity.getCommunicationType().equals(CommunicationType.VISIT)) {
+                if (leadActivity.getCommunicationType().equals(CommunicationType.VISIT)) {
-					visitRequestRepository.createVisitRequest(lead.getId(), "lead", lead.getAssignTo(),
+                    visitRequestRepository.createVisitRequest(lead.getId(), "lead", lead.getAssignTo(),
-							schelduleTimestamp);
+                            schelduleTimestamp);
-				}
+                }
-			}
+            }
-			leadActivity.setSchelduleTimestamp(schelduleTimestamp);
+            leadActivity.setSchelduleTimestamp(schelduleTimestamp);
-			leadActivity.setClosureTimestamp(closureTimestamp);
+            leadActivity.setClosureTimestamp(closureTimestamp);
-			lead.setClosureTimestamp(closureTimestamp);
+            lead.setClosureTimestamp(closureTimestamp);
-		} else {
+        } else {
-			leadActivity.setSchelduleTimestamp(null);
+            leadActivity.setSchelduleTimestamp(null);
-			leadActivity.setClosureTimestamp(null);
+            leadActivity.setClosureTimestamp(null);
-			lead.setClosureTimestamp(null);
+            lead.setClosureTimestamp(null);
-		}
+        }
-		leadActivityRepository.persist(leadActivity);
+        leadActivityRepository.persist(leadActivity);
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = ProfitMandiConstants.URL_NEW_LEAD, method = RequestMethod.POST)
+    @RequestMapping(value = ProfitMandiConstants.URL_NEW_LEAD, method = RequestMethod.POST)
-	public ResponseEntity<?> newLead(HttpServletRequest request,
+    public ResponseEntity<?> newLead(HttpServletRequest request,
-			@RequestBody CreateRefferalRequest createRefferalRequest) throws ProfitMandiBusinessException {
+                                     @RequestBody CreateRefferalRequest createRefferalRequest) throws ProfitMandiBusinessException {
-		LOGGER.info("requested url : " + request.getRequestURL().toString());
+        LOGGER.info("requested url : " + request.getRequestURL().toString());
-		Lead lead = new Lead();
+        Lead lead = new Lead();
-		lead.setAddress(createRefferalRequest.getCity());
+        lead.setAddress(createRefferalRequest.getCity());
-		Long.parseLong(createRefferalRequest.getMobile());
+        Long.parseLong(createRefferalRequest.getMobile());
-		if (createRefferalRequest.getMobile().length() != 10) {
+        if (createRefferalRequest.getMobile().length() != 10) {
-			throw new ProfitMandiBusinessException("Mobile Number", createRefferalRequest.getMobile(),
+            throw new ProfitMandiBusinessException("Mobile Number", createRefferalRequest.getMobile(),
-					"Number should be of 10 digits");
+                    "Number should be of 10 digits");
-		}
+        }
-		lead.setLeadMobile(createRefferalRequest.getMobile());
+        lead.setLeadMobile(createRefferalRequest.getMobile());
-		lead.setCity(createRefferalRequest.getCity());
+        lead.setCity(createRefferalRequest.getCity());
-		lead.setState(createRefferalRequest.getState());
+        lead.setState(createRefferalRequest.getState());
-		lead.setLastName(createRefferalRequest.getLastName());
+        lead.setLastName(createRefferalRequest.getLastName());
-		if (lead.getState().equals("Uttar Pradesh")) {
+        if (lead.getState().equals("Uttar Pradesh")) {
-			lead.setAssignTo(53);
+            lead.setAssignTo(53);
-		} else if (lead.getState().equals("Haryana")) {
+        } else if (lead.getState().equals("Haryana")) {
-			lead.setAssignTo(53);
+            lead.setAssignTo(53);
-		} else if (lead.getState().equals("Delhi")) {
+        } else if (lead.getState().equals("Delhi")) {
-			lead.setAssignTo(53);
+            lead.setAssignTo(53);
-		} else {
+        } else {
-			// Assign to sm
+            // Assign to sm
-			lead.setAssignTo(53);
+            lead.setAssignTo(53);
-			// Assign to neha
+            // Assign to neha
-			// lead.setAssignTo(1);
+            // lead.setAssignTo(1);
-		}
+        }
-		lead.setAuthId(lead.getAssignTo());
+        lead.setAuthId(lead.getAssignTo());
-		lead.setCreatedBy("daily-sync");
+        lead.setCreatedBy("daily-sync");
-		lead.setSource("SD-WEB");
+        lead.setSource("SD-WEB");
-		lead.setFirstName(createRefferalRequest.getFirstName());
+        lead.setFirstName(createRefferalRequest.getFirstName());
-		lead.setStatus(LeadStatus.followUp);
+        lead.setStatus(LeadStatus.followUp);
-		lead.setColor("yellow");
+        lead.setColor("yellow");
-		lead.setCreatedTimestamp(LocalDateTime.now());
+        lead.setCreatedTimestamp(LocalDateTime.now());
-		lead.setUpdatedTimestamp(LocalDateTime.now());
+        lead.setUpdatedTimestamp(LocalDateTime.now());
-		leadRepository.persist(lead);
+        leadRepository.persist(lead);
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = "/getPartnersList", method = RequestMethod.GET)
+    @RequestMapping(value = "/getPartnersList", method = RequestMethod.GET)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> getPartners(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId)
+    public ResponseEntity<?> getPartners(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId)
-			throws ProfitMandiBusinessException {
+            throws ProfitMandiBusinessException {
-		AuthUser authUser = authRepository.selectByGmailId(gmailId);
+        AuthUser authUser = authRepository.selectByGmailId(gmailId);
-		Map<String, Set<String>> storeGuyMap = csService.getAuthUserPartnerEmailMapping();
+        Map<String, Set<String>> storeGuyMap = csService.getAuthUserPartnerEmailMapping();
-		Set<String> emails = storeGuyMap.get(authUser.getEmailId());
+        Set<String> emails = storeGuyMap.get(authUser.getEmailId());
-		LOGGER.info("emails" + emails);
+        LOGGER.info("emails" + emails);
-		List<User> users = userRepository.selectAllByEmailIds(new ArrayList<>(emails));
+        List<User> users = userRepository.selectAllByEmailIds(new ArrayList<>(emails));
-		List<Partner> partners = new ArrayList<>();
+        List<Partner> partners = new ArrayList<>();
-		for (User user : users) {
+        for (User user : users) {
-			UserAccount uc = userAccountRepository.selectSaholicByUserId(user.getId());
+            UserAccount uc = userAccountRepository.selectSaholicByUserId(user.getId());
-			com.spice.profitmandi.dao.entity.user.User userInfo = userUserRepository.selectById(uc.getAccountKey());
+            com.spice.profitmandi.dao.entity.user.User userInfo = userUserRepository.selectById(uc.getAccountKey());
-			CustomRetailer customRetailer = retailerService.getFofoRetailer(userInfo.getId());
+            CustomRetailer customRetailer = retailerService.getFofoRetailer(userInfo.getId());
-			Partner partner = new Partner();
+            Partner partner = new Partner();
-			partner.setBusinessName(customRetailer.getBusinessName());
+            partner.setBusinessName(customRetailer.getBusinessName());
-			partner.setPartnerId(customRetailer.getPartnerId());
+            partner.setPartnerId(customRetailer.getPartnerId());
-			partner.setCartId(customRetailer.getCartId());
+            partner.setCartId(customRetailer.getCartId());
-			partner.setEmail(customRetailer.getEmail());
+            partner.setEmail(customRetailer.getEmail());
-			partner.setGstNumber(customRetailer.getGstNumber());
+            partner.setGstNumber(customRetailer.getGstNumber());
-			partner.setDisplayName(customRetailer.getDisplayName());
+            partner.setDisplayName(customRetailer.getDisplayName());
-			partner.setCity(customRetailer.getAddress().getCity());
+            partner.setCity(customRetailer.getAddress().getCity());
-			partner.setUserId(user.getId());
+            partner.setUserId(user.getId());
-			partners.add(partner);
+            partners.add(partner);
-		}
+        }
-		LOGGER.info("partners" + partners);
+        LOGGER.info("partners" + partners);
-		return responseSender.ok(partners);
+        return responseSender.ok(partners);
-	}
+    }
-	@RequestMapping(value = "/franchise-first-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/franchise-first-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> FranchiseFirstVisit(HttpServletRequest request,
+    public ResponseEntity<?> FranchiseFirstVisit(HttpServletRequest request,
-			@RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
+                                                 @RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
-		FranchiseeVisit franchiseeVisit = new FranchiseeVisit();
+        FranchiseeVisit franchiseeVisit = new FranchiseeVisit();
-		franchiseeVisit.setFofoId(createFranchiseeRequest.getFofoId());
+        franchiseeVisit.setFofoId(createFranchiseeRequest.getFofoId());
-		CustomRetailer customRetailer = retailerService.getFofoRetailer(createFranchiseeRequest.getFofoId());
+        CustomRetailer customRetailer = retailerService.getFofoRetailer(createFranchiseeRequest.getFofoId());
-		franchiseeVisit.setPartnerName(customRetailer.getBusinessName());
+        franchiseeVisit.setPartnerName(customRetailer.getBusinessName());
-		franchiseeVisit.setAgenda(createFranchiseeRequest.getAgenda());
+        franchiseeVisit.setAgenda(createFranchiseeRequest.getAgenda());
-		franchiseeVisit.setCreatedTimestamp(LocalDateTime.now());
+        franchiseeVisit.setCreatedTimestamp(LocalDateTime.now());
-		franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
+        franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
-		franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
+        franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
-		franchiseeVisit.setScheduleTimestamp(createFranchiseeRequest.getFirstSchelduleTimestamp());
+        franchiseeVisit.setScheduleTimestamp(createFranchiseeRequest.getFirstSchelduleTimestamp());
-		// change
+        // change
-		AuthUser authUser = authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
+        AuthUser authUser = authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
-		String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
+        String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
-		franchiseeVisit.setCreatedBy(authUserName);
+        franchiseeVisit.setCreatedBy(authUserName);
-		franchiseeVisit.setAuthId(authUser.getId());
+        franchiseeVisit.setAuthId(authUser.getId());
-		franchiseeVisitRepository.persist(franchiseeVisit);
+        franchiseeVisitRepository.persist(franchiseeVisit);
-		FranchiseeActivity franchiseeActivity = new FranchiseeActivity();
+        FranchiseeActivity franchiseeActivity = new FranchiseeActivity();
-		franchiseeActivity.setAction(FranchiseeActivityStatus.FOLLOWUP);
+        franchiseeActivity.setAction(FranchiseeActivityStatus.FOLLOWUP);
-		franchiseeActivity.setFranchiseeVisitd(franchiseeVisit.getId());
+        franchiseeActivity.setFranchiseeVisitd(franchiseeVisit.getId());
-		franchiseeActivity.setResolution(createFranchiseeRequest.getResolution());
+        franchiseeActivity.setResolution(createFranchiseeRequest.getResolution());
-		franchiseeActivity.setSchelduleTimestamp(createFranchiseeRequest.getFirstSchelduleTimestamp());
+        franchiseeActivity.setSchelduleTimestamp(createFranchiseeRequest.getFirstSchelduleTimestamp());
-		franchiseeActivity.setCreatedTimestamp(LocalDateTime.now());
+        franchiseeActivity.setCreatedTimestamp(LocalDateTime.now());
-		franchiseeActivityRepository.persist(franchiseeActivity);
+        franchiseeActivityRepository.persist(franchiseeActivity);
-		franchiseeVisit.setFranchiseActivityId(franchiseeActivity.getId());
+        franchiseeVisit.setFranchiseActivityId(franchiseeActivity.getId());
-		visitRequestRepository.createVisitRequest(franchiseeVisit.getId(), "franchiseeVisit", authUser.getId(),
+        visitRequestRepository.createVisitRequest(franchiseeVisit.getId(), "franchiseeVisit", authUser.getId(),
-				createFranchiseeRequest.getFirstSchelduleTimestamp());
+                createFranchiseeRequest.getFirstSchelduleTimestamp());
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = "/franchise-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/franchise-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> FranchiseVisit(HttpServletRequest request,
+    public ResponseEntity<?> FranchiseVisit(HttpServletRequest request,
-			@RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
+                                            @RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
-		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(createFranchiseeRequest.getId());
+        FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(createFranchiseeRequest.getId());
-		franchiseeVisit.setFofoId(createFranchiseeRequest.getFofoId());
+        franchiseeVisit.setFofoId(createFranchiseeRequest.getFofoId());
-		CustomRetailer customRetailer = retailerService.getFofoRetailer(createFranchiseeRequest.getFofoId());
+        CustomRetailer customRetailer = retailerService.getFofoRetailer(createFranchiseeRequest.getFofoId());
-		franchiseeVisit.setPartnerName(customRetailer.getBusinessName());
+        franchiseeVisit.setPartnerName(customRetailer.getBusinessName());
-		franchiseeVisit.setAgenda(createFranchiseeRequest.getAgenda());
+        franchiseeVisit.setAgenda(createFranchiseeRequest.getAgenda());
-		franchiseeVisit.setPartnerRemark(createFranchiseeRequest.getPartnerRemark());
+        franchiseeVisit.setPartnerRemark(createFranchiseeRequest.getPartnerRemark());
-		franchiseeVisit.setOutsideVisibity(createFranchiseeRequest.getOutsideVisibity());
+        franchiseeVisit.setOutsideVisibity(createFranchiseeRequest.getOutsideVisibity());
-		franchiseeVisit.setInstoreVisibility(createFranchiseeRequest.getInstoreVisibility());
+        franchiseeVisit.setInstoreVisibility(createFranchiseeRequest.getInstoreVisibility());
-		franchiseeVisit.setOutsideStock(createFranchiseeRequest.getOutsideStock());
+        franchiseeVisit.setOutsideStock(createFranchiseeRequest.getOutsideStock());
-		franchiseeVisit.setSystemKnowledge(createFranchiseeRequest.getSystemKnowledge());
+        franchiseeVisit.setSystemKnowledge(createFranchiseeRequest.getSystemKnowledge());
-		franchiseeVisit.setWorkingDevice(createFranchiseeRequest.getWorkingDevice());
+        franchiseeVisit.setWorkingDevice(createFranchiseeRequest.getWorkingDevice());
-		franchiseeVisit.setWorkingPrinter(createFranchiseeRequest.getWorkingPrinter());
+        franchiseeVisit.setWorkingPrinter(createFranchiseeRequest.getWorkingPrinter());
-		franchiseeVisit.setCarryBags(createFranchiseeRequest.getCarryBags());
+        franchiseeVisit.setCarryBags(createFranchiseeRequest.getCarryBags());
-		franchiseeVisit.setSmartdukaanTshirt(createFranchiseeRequest.getSmartdukaanTshirt());
+        franchiseeVisit.setSmartdukaanTshirt(createFranchiseeRequest.getSmartdukaanTshirt());
-		franchiseeVisit.setLatestDummies(createFranchiseeRequest.getLatestDummies());
+        franchiseeVisit.setLatestDummies(createFranchiseeRequest.getLatestDummies());
-		franchiseeVisit.setInvestment(createFranchiseeRequest.getInvestment());
+        franchiseeVisit.setInvestment(createFranchiseeRequest.getInvestment());
-		franchiseeVisit.setMtd(createFranchiseeRequest.getMtd());
+        franchiseeVisit.setMtd(createFranchiseeRequest.getMtd());
-		franchiseeVisit.setHygiene(createFranchiseeRequest.getHygiene());
+        franchiseeVisit.setHygiene(createFranchiseeRequest.getHygiene());
-		franchiseeVisit.setCreatedTimestamp(LocalDateTime.now());
+        franchiseeVisit.setCreatedTimestamp(LocalDateTime.now());
-		franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
+        franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
-		franchiseeVisit.setInformedAboutOnline(createFranchiseeRequest.getOnline());
+        franchiseeVisit.setInformedAboutOnline(createFranchiseeRequest.getOnline());
-		franchiseeVisit.setPendingBilling(createFranchiseeRequest.getPendingBilling());
+        franchiseeVisit.setPendingBilling(createFranchiseeRequest.getPendingBilling());
-		if (createFranchiseeRequest.getAction().equals(FranchiseeActivityStatus.FOLLOWUP)) {
+        if (createFranchiseeRequest.getAction().equals(FranchiseeActivityStatus.FOLLOWUP)) {
-			franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
+            franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
-		} else {
+        } else {
-			franchiseeVisit.setStatus(FranchiseeVisitStatus.CLOSE);
+            franchiseeVisit.setStatus(FranchiseeVisitStatus.CLOSE);
-		}
+        }
-		// AuthUser authUser =
+        // AuthUser authUser =
-		// authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
+        // authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
-		// change
+        // change
-		AuthUser authUser = authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
+        AuthUser authUser = authRepository.selectByGmailId(createFranchiseeRequest.getCreatedBy());
-		String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
+        String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
-		franchiseeVisit.setCreatedBy(authUserName);
+        franchiseeVisit.setCreatedBy(authUserName);
-		franchiseeVisit.setAuthId(authUser.getId());
+        franchiseeVisit.setAuthId(authUser.getId());
-		franchiseeVisitRepository.persist(franchiseeVisit);
+        franchiseeVisitRepository.persist(franchiseeVisit);
-		FranchiseeActivity franchiseeActivity = new FranchiseeActivity();
+        FranchiseeActivity franchiseeActivity = new FranchiseeActivity();
-		franchiseeActivity.setAction(createFranchiseeRequest.getAction());
+        franchiseeActivity.setAction(createFranchiseeRequest.getAction());
-		franchiseeActivity.setFranchiseeVisitd(franchiseeVisit.getId());
+        franchiseeActivity.setFranchiseeVisitd(franchiseeVisit.getId());
-		franchiseeActivity.setResolution(createFranchiseeRequest.getResolution());
+        franchiseeActivity.setResolution(createFranchiseeRequest.getResolution());
-		if (createFranchiseeRequest.getAction().equals(FranchiseeActivityStatus.FOLLOWUP)) {
+        if (createFranchiseeRequest.getAction().equals(FranchiseeActivityStatus.FOLLOWUP)) {
-			franchiseeActivity.setSchelduleTimestamp(createFranchiseeRequest.getSchelduleTimestamp());
+            franchiseeActivity.setSchelduleTimestamp(createFranchiseeRequest.getSchelduleTimestamp());
-			visitRequestRepository.createVisitRequest(franchiseeVisit.getId(), "franchiseeVisit",
+            visitRequestRepository.createVisitRequest(franchiseeVisit.getId(), "franchiseeVisit",
-					franchiseeVisit.getAuthId(), createFranchiseeRequest.getSchelduleTimestamp());
+                    franchiseeVisit.getAuthId(), createFranchiseeRequest.getSchelduleTimestamp());
-		} else {
+        } else {
-			franchiseeActivity.setSchelduleTimestamp(null);
+            franchiseeActivity.setSchelduleTimestamp(null);
-		}
+        }
-		franchiseeActivity.setCreatedTimestamp(LocalDateTime.now());
+        franchiseeActivity.setCreatedTimestamp(LocalDateTime.now());
-		franchiseeActivityRepository.persist(franchiseeActivity);
+        franchiseeActivityRepository.persist(franchiseeActivity);
-		franchiseeVisit.setFranchiseActivityId(franchiseeActivity.getId());
+        franchiseeVisit.setFranchiseActivityId(franchiseeActivity.getId());
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = "/getFranchiseVisit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/getFranchiseVisit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> getFranchiseVisit(HttpServletRequest request,
+    public ResponseEntity<?> getFranchiseVisit(HttpServletRequest request,
-			@RequestParam(name = "gmailId") String gmailId, @RequestParam(name = "status") FranchiseeVisitStatus status,
+                                               @RequestParam(name = "gmailId") String gmailId, @RequestParam(name = "status") FranchiseeVisitStatus status,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+                                               @RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit) throws ProfitMandiBusinessException {
+                                               @RequestParam(name = "limit", defaultValue = "10") int limit) throws ProfitMandiBusinessException {
-		AuthUser authUser = authRepository.selectByGmailId(gmailId);
+        AuthUser authUser = authRepository.selectByGmailId(gmailId);
-		List<VisitRequest> visitRequests = visitRequestRepository.selectByAuthIdAndDate(authUser.getId(),
+        List<VisitRequest> visitRequests = visitRequestRepository.selectByAuthIdAndDate(authUser.getId(),
-				LocalDate.now());
+                LocalDate.now());
-		Map<Integer, List<VisitRequest>> visitRequestMap = null;
+        Map<Integer, List<VisitRequest>> visitRequestMap = null;
-		if (!visitRequests.isEmpty()) {
+        if (!visitRequests.isEmpty()) {
-			visitRequestMap = visitRequests.stream().collect(Collectors.groupingBy(x -> x.getVisitId()));
+            visitRequestMap = visitRequests.stream().collect(Collectors.groupingBy(x -> x.getVisitId()));
-		}
+        }
-		List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectByAuthIdAndStatus(authUser.getId(),
+        List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectByAuthIdAndStatus(authUser.getId(),
-				status, offset, limit);
+                status, offset, limit);
-		for (FranchiseeVisit fv : franchiseeVisits) {
+        for (FranchiseeVisit fv : franchiseeVisits) {
-			if (visitRequestMap != null) {
+            if (visitRequestMap != null) {
-				List<VisitRequest> visitRequest = visitRequestMap.get(fv.getId());
+                List<VisitRequest> visitRequest = visitRequestMap.get(fv.getId());
-				if (visitRequest != null) {
+                if (visitRequest != null) {
-					if (visitRequest.size() > 1) {
+                    if (visitRequest.size() > 1) {
-						Comparator<VisitRequest> visitComparato = Comparator
+                        Comparator<VisitRequest> visitComparato = Comparator
-								.comparing(VisitRequest::getCreatedTimestamp);
+                                .comparing(VisitRequest::getCreatedTimestamp);
-						VisitRequest youngestVisit = visitRequest.stream().max(visitComparato).get();
+                        VisitRequest youngestVisit = visitRequest.stream().max(visitComparato).get();
-						fv.setVisitStatus(youngestVisit.getStatus());
+                        fv.setVisitStatus(youngestVisit.getStatus());
-					} else {
+                    } else {
-						fv.setVisitStatus(visitRequest.get(0).getStatus());
+                        fv.setVisitStatus(visitRequest.get(0).getStatus());
-					}
+                    }
-				}
+                }
-			}
+            }
-			if (fv.getFranchiseActivityId() != 0) {
+            if (fv.getFranchiseActivityId() != 0) {
-				FranchiseeActivity fA = franchiseeActivityRepository.selectById(fv.getFranchiseActivityId());
+                FranchiseeActivity fA = franchiseeActivityRepository.selectById(fv.getFranchiseActivityId());
-				fv.setFranchiseeActivity(fA);
+                fv.setFranchiseeActivity(fA);
-			}
+            }
-		}
+        }
-		return responseSender.ok(franchiseeVisits);
+        return responseSender.ok(franchiseeVisits);
-	}
+    }
-	@RequestMapping(value = "/getFranchiseActivity", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/getFranchiseActivity", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> getFranchiseActivity(HttpServletRequest request, @RequestParam(name = "id") int id)
+    public ResponseEntity<?> getFranchiseActivity(HttpServletRequest request, @RequestParam(name = "id") int id)
-			throws ProfitMandiBusinessException {
+            throws ProfitMandiBusinessException {
-		List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository.selectByFranchiseeVisitId(id);
+        List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository.selectByFranchiseeVisitId(id);
-		return responseSender.ok(franchiseeActivities);
+        return responseSender.ok(franchiseeActivities);
-	}
+    }
-	@RequestMapping(value = "/getFranchiseeInfo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/getFranchiseeInfo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> getFranchiseeInfo(HttpServletRequest request, @RequestParam(name = "id") int id)
+    public ResponseEntity<?> getFranchiseeInfo(HttpServletRequest request, @RequestParam(name = "id") int id)
-			throws ProfitMandiBusinessException {
+            throws ProfitMandiBusinessException {
-		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
+        FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
-		List<DBObject> mobileBrands = mongoClient.getAllBrandsToDisplay(3);
+        List<DBObject> mobileBrands = mongoClient.getAllBrandsToDisplay(3);
-		List<String> brands = mobileBrands.stream().filter(x -> (boolean) x.get("active"))
+        List<String> brands = mobileBrands.stream().filter(x -> (boolean) x.get("active"))
-				.map(x -> (String) x.get("name")).collect(Collectors.toList());
+                .map(x -> (String) x.get("name")).collect(Collectors.toList());
-		franchiseeVisit.setBrands(brands);
+        franchiseeVisit.setBrands(brands);
-		return responseSender.ok(franchiseeVisit);
+        return responseSender.ok(franchiseeVisit);
-	}
+    }
-	@RequestMapping(value = "/franchise-visit-update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/franchise-visit-update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> franchiseVisitUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
+    public ResponseEntity<?> franchiseVisitUpdate(HttpServletRequest request, @RequestParam(name = "id") int id,
-			@RequestParam(name = "action") FranchiseeActivityStatus action,
+                                                  @RequestParam(name = "action") FranchiseeActivityStatus action,
-			@RequestParam(name = "resolution") String resolution,
+                                                  @RequestParam(name = "resolution") String resolution,
-			@RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp)
+                                                  @RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp)
-			throws ProfitMandiBusinessException {
+            throws ProfitMandiBusinessException {
-		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
+        FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
-		FranchiseeActivity franchiseeActivity = new FranchiseeActivity();
+        FranchiseeActivity franchiseeActivity = new FranchiseeActivity();
-		if (action == FranchiseeActivityStatus.FOLLOWUP) {
+        if (action == FranchiseeActivityStatus.FOLLOWUP) {
-			if (schelduleTimestamp != null) {
+            if (schelduleTimestamp != null) {
-				visitRequestRepository.createVisitRequest(franchiseeVisit.getId(), "franchiseeVisit",
+                visitRequestRepository.createVisitRequest(franchiseeVisit.getId(), "franchiseeVisit",
-						franchiseeVisit.getAuthId(), schelduleTimestamp);
+                        franchiseeVisit.getAuthId(), schelduleTimestamp);
-			}
+            }
-			franchiseeActivity.setSchelduleTimestamp(schelduleTimestamp);
+            franchiseeActivity.setSchelduleTimestamp(schelduleTimestamp);
-			franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
+            franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
-			franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
+            franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
-			franchiseeVisitRepository.persist(franchiseeVisit);
+            franchiseeVisitRepository.persist(franchiseeVisit);
-		} else {
+        } else {
-			franchiseeActivity.setSchelduleTimestamp(null);
+            franchiseeActivity.setSchelduleTimestamp(null);
-			franchiseeVisit.setFranchiseActivityId(franchiseeActivity.getId());
+            franchiseeVisit.setFranchiseActivityId(franchiseeActivity.getId());
-			franchiseeVisit.setStatus(FranchiseeVisitStatus.CLOSE);
+            franchiseeVisit.setStatus(FranchiseeVisitStatus.CLOSE);
-			franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
+            franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
-			franchiseeVisitRepository.persist(franchiseeVisit);
+            franchiseeVisitRepository.persist(franchiseeVisit);
-		}
+        }
-		franchiseeActivity.setResolution(resolution);
+        franchiseeActivity.setResolution(resolution);
-		franchiseeActivity.setFranchiseeVisitd(franchiseeVisit.getId());
+        franchiseeActivity.setFranchiseeVisitd(franchiseeVisit.getId());
-		franchiseeActivity.setAction(action);
+        franchiseeActivity.setAction(action);
-		franchiseeActivity.setCreatedTimestamp(LocalDateTime.now());
+        franchiseeActivity.setCreatedTimestamp(LocalDateTime.now());
-		franchiseeActivityRepository.persist(franchiseeActivity);
+        franchiseeActivityRepository.persist(franchiseeActivity);
-		franchiseeVisit.setFranchiseActivityId(franchiseeActivity.getId());
+        franchiseeVisit.setFranchiseActivityId(franchiseeActivity.getId());
-		franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
+        franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
-		franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
+        franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
-		franchiseeVisitRepository.persist(franchiseeVisit);
+        franchiseeVisitRepository.persist(franchiseeVisit);
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = "/onBoardingTimelineStatus", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/onBoardingTimelineStatus", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> onBoardingTimelineStatus(HttpServletRequest request, Model model)
+    public ResponseEntity<?> onBoardingTimelineStatus(HttpServletRequest request, Model model)
-			throws ProfitMandiBusinessException {
+            throws ProfitMandiBusinessException {
-		int userId = (int) request.getAttribute("userId");
+        int userId = (int) request.getAttribute("userId");
-		UserCart uc = userAccountRepository.getUserCart(userId);
+        UserCart uc = userAccountRepository.getUserCart(userId);
-		FofoStore fs = fofoStoreRepository.selectByRetailerId(uc.getUserId());
+        FofoStore fs = fofoStoreRepository.selectByRetailerId(uc.getUserId());
-		PartnerOnBoardingPanel partnerOnBoardingPanel = partnerOnBoardingPanelRepository.selectByCode(fs.getCode());
+        PartnerOnBoardingPanel partnerOnBoardingPanel = partnerOnBoardingPanelRepository.selectByCode(fs.getCode());
-		Map<StoreTimeline, OnBoardingTimelineModel> timelineStatus = null;
+        Map<StoreTimeline, OnBoardingTimelineModel> timelineStatus = null;
-		LOGGER.info("partnerOnBoardingPanel" + partnerOnBoardingPanel);
+        LOGGER.info("partnerOnBoardingPanel" + partnerOnBoardingPanel);
-		if (partnerOnBoardingPanel != null) {
+        if (partnerOnBoardingPanel != null) {
-			timelineStatus = storeTimelineTatService.getTimeline(partnerOnBoardingPanel.getId());
+            timelineStatus = storeTimelineTatService.getTimeline(partnerOnBoardingPanel.getId());
-		}
+        }
-		List<OnBoardingTimelineModel> onBoardingModel = new ArrayList<>();
+        List<OnBoardingTimelineModel> onBoardingModel = new ArrayList<>();
-		if (timelineStatus != null) {
+        if (timelineStatus != null) {
-			onBoardingModel = timelineStatus.values().stream().skip(2).map(x -> x).collect(Collectors.toList());
+            onBoardingModel = timelineStatus.values().stream().skip(2).map(x -> x).collect(Collectors.toList());
-		}
+        }
-		return responseSender.ok(onBoardingModel);
+        return responseSender.ok(onBoardingModel);
-	}
+    }
-	@RequestMapping(value = "/onBoardingTimelineVisibility", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/onBoardingTimelineVisibility", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> onBoardingTimelineVisibility(HttpServletRequest request, Model model)
+    public ResponseEntity<?> onBoardingTimelineVisibility(HttpServletRequest request, Model model)
-			throws ProfitMandiBusinessException {
+            throws ProfitMandiBusinessException {
-		int userId = (int) request.getAttribute("userId");
+        int userId = (int) request.getAttribute("userId");
-		UserCart uc = userAccountRepository.getUserCart(userId);
+        UserCart uc = userAccountRepository.getUserCart(userId);
-		FofoStore fs = fofoStoreRepository.selectByRetailerId(uc.getUserId());
+        FofoStore fs = fofoStoreRepository.selectByRetailerId(uc.getUserId());
-		PartnerOnBoardingPanel partnerOnBoardingPanel = partnerOnBoardingPanelRepository.selectByCode(fs.getCode());
+        PartnerOnBoardingPanel partnerOnBoardingPanel = partnerOnBoardingPanelRepository.selectByCode(fs.getCode());
-		boolean status = true;
+        boolean status = true;
-		if (partnerOnBoardingPanel != null) {
+        if (partnerOnBoardingPanel != null) {
-			status = storeTimelineTatService.getTimelineCompleted(partnerOnBoardingPanel.getId());
+            status = storeTimelineTatService.getTimelineCompleted(partnerOnBoardingPanel.getId());
-		}
+        }
-		LOGGER.info("status" + status);
+        LOGGER.info("status" + status);
-		return responseSender.ok(status);
+        return responseSender.ok(status);
-	}
+    }
-	@RequestMapping(value = "/getPartnerTarget", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/getPartnerTarget", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> getPartnerTarget(HttpServletRequest request,
+    public ResponseEntity<?> getPartnerTarget(HttpServletRequest request,
-			@RequestParam(name = "gmailId") String gmailId, @RequestParam String dayValue)
+                                              @RequestParam String gmailId, @RequestParam String dayValue, @RequestParam ActivationType activationType)
-			throws ProfitMandiBusinessException {
+            throws ProfitMandiBusinessException {
-		AuthUser authUser = authRepository.selectByGmailId(gmailId);
+        AuthUser authUser = authRepository.selectByGmailId(gmailId);
-		Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
+        Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
-		Set<Integer> fofoIds = storeGuyMap.get(authUser.getEmailId());
+        Set<Integer> fofoIds = storeGuyMap.get(authUser.getEmailId());
-		List<String> brands = Arrays.asList("Vivo", "Samsung", "Oppo", "Itel", "Almost New", "Others");
+        List<String> brands = Arrays.asList("Vivo", "Samsung", "Oppo", "Itel", "Almost New", "Others");
-		float totalPartnerTargetSecondary = 0;
+        float totalPartnerTargetSecondary = 0;
-		float totalPartnerTargetCollection = 0;
+        float totalPartnerTargetCollection = 0;
-		float totalPartnerAchievementSecondary = 0;
+        float totalPartnerAchievementSecondary = 0;
-		float totalPartnerAchievementCollection = 0;
+        float totalPartnerAchievementCollection = 0;
-		TargetModel tm = new TargetModel();
+        TargetModel tm = new TargetModel();
-		Map<Integer, PartnerDailyInvestment> partnerDailyInvestmentMap = new HashMap<>();
+        Map<Integer, PartnerDailyInvestment> partnerDailyInvestmentMap = new HashMap<>();
-		Map<Integer, Long> partnerTicketCount = ticketRepository.selectAllOpenTicketsGroupByRetailer();
+        Map<Integer, Long> partnerTicketCount = ticketRepository.selectAllOpenTicketsGroupByRetailer();
-		LOGGER.info("partnerTicketCount {}", partnerTicketCount);
+        LOGGER.info("partnerTicketCount {}", partnerTicketCount);
-		List<PartnerTargetAchievementModel> ptams = new ArrayList<>();
+        List<PartnerTargetAchievementModel> ptams = new ArrayList<>();
-		if (fofoIds != null && fofoIds.size() > 0) {
+        if (fofoIds != null && fofoIds.size() > 0) {
-			List<Integer> fofoIdl = new ArrayList<>(fofoIds);
+            List<Integer> fofoIdl = new ArrayList<>(fofoIds);
-			List<Integer> fofoIdList = fofoStoreRepository.selectByRetailerIds(fofoIdl).stream()
+            List<Integer> fofoIdList = fofoStoreRepository.selectByRetailerIds(fofoIdl).stream()
-					.filter(x -> !x.isInternal()).map(x -> x.getId()).collect(Collectors.toList());
+                    .filter(x -> (!x.isInternal() && (activationType == null || x.getActivationType().equals(activationType))))
+                    .map(x -> x.getId()).collect(Collectors.toList());
-			LocalDateTime startDate = LocalDate.now().atStartOfDay();
+            LocalDateTime startDate = LocalDate.now().atStartOfDay();
-			if (dayValue.equals("previous")) {
-				startDate = LocalDate.now().minusDays(1).atStartOfDay();
+            if (dayValue.equals("previous")) {
+                startDate = LocalDate.now().minusDays(1).atStartOfDay();
-			}
+            }
-			List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository
-					.selectAll(fofoIdList, startDate.toLocalDate().minusDays(1));
+            List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository
+                    .selectAll(fofoIdList, startDate.toLocalDate().minusDays(1));
-			if (!partnerDailyInvestments.isEmpty()) {
-				partnerDailyInvestmentMap = partnerDailyInvestments.stream()
+            if (!partnerDailyInvestments.isEmpty()) {
-						.collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+                partnerDailyInvestmentMap = partnerDailyInvestments.stream()
-			}
+                        .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+            }
-			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
+            Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-			Map<Integer, CustomRetailer> customRetailers = fofoIdList.stream().map(x -> customRetailerMap.get(x))
-					.filter(x -> x != null).collect(Collectors.toList()).stream()
+            Map<Integer, CustomRetailer> customRetailers = fofoIdList.stream().map(x -> customRetailerMap.get(x))
-					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                    .filter(x -> x != null).collect(Collectors.toList()).stream()
+                    .collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-			List<Integer> remarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIdList);
+            List<Integer> remarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIdList);
-			LOGGER.info("remarkIds {}", remarkIds);
+            LOGGER.info("remarkIds {}", remarkIds);
-			long todayCollectionCount = 0;
-			if (!remarkIds.isEmpty()) {
+            long todayCollectionCount = 0;
-				todayCollectionCount = partnerCollectionRemarkRepository
+            if (!remarkIds.isEmpty()) {
-						.selectByAuthIdAndIds(authUser.getId(), remarkIds).stream()
+                todayCollectionCount = partnerCollectionRemarkRepository
-						.filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
+                        .selectByAuthIdAndIds(authUser.getId(), remarkIds).stream()
-						.collect(Collectors.counting());
+                        .filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
+                        .collect(Collectors.counting());
-			}
+            }
-			Map<Integer, PartnerCollectionPlanModel> CollectionMap = partnerCollectionService
-					.getCollectionMap(fofoIdList, startDate);
+            Map<Integer, PartnerCollectionPlanModel> CollectionMap = partnerCollectionService
+                    .getCollectionMap(fofoIdList, startDate);
-			Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondayPlans = orderRepository
-					.selectPartnerSecondaryGroupByBrand(fofoIdList, startDate.toLocalDate()).stream()
+            Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondayPlans = orderRepository
-					.collect(Collectors.groupingBy(x -> x.getFofoId()));
+                    .selectPartnerSecondaryGroupByBrand(fofoIdList, startDate.toLocalDate()).stream()
+                    .collect(Collectors.groupingBy(x -> x.getFofoId()));
-			LOGGER.info("partnerSecondayPlans {}", partnerSecondayPlans);
-			for (Entry<Integer, CustomRetailer> customRetailerEntry : customRetailers.entrySet()) {
+            LOGGER.info("partnerSecondayPlans {}", partnerSecondayPlans);
-				int fofoId = customRetailerEntry.getKey();
+            for (Entry<Integer, CustomRetailer> customRetailerEntry : customRetailers.entrySet()) {
-				CustomRetailer customRetailer = customRetailerEntry.getValue();
+                int fofoId = customRetailerEntry.getKey();
-				float totalSecondaryPlan = 0;
+                CustomRetailer customRetailer = customRetailerEntry.getValue();
-				float totalSecondaryAchivement = 0;
+                float totalSecondaryPlan = 0;
+                float totalSecondaryAchivement = 0;
-				PartnerTargetAchievementModel ptam = new PartnerTargetAchievementModel();
-				ptam.setFofoId(fofoId);
+                PartnerTargetAchievementModel ptam = new PartnerTargetAchievementModel();
-				ptam.setBusinessName(customRetailer.getBusinessName());
+                ptam.setFofoId(fofoId);
-				ptam.setMobile(customRetailer.getMobileNumber());
+                ptam.setBusinessName(customRetailer.getBusinessName());
+                ptam.setMobile(customRetailer.getMobileNumber());
-				if (partnerDailyInvestmentMap.get(fofoId) != null) {
-					ptam.setWalletAmount(partnerDailyInvestmentMap.get(fofoId).getWalletAmount());
+                if (partnerDailyInvestmentMap.get(fofoId) != null) {
-					ptam.setShortInvestment(partnerDailyInvestmentMap.get(fofoId).getShortInvestment());
+                    ptam.setWalletAmount(partnerDailyInvestmentMap.get(fofoId).getWalletAmount());
-				}
+                    ptam.setShortInvestment(partnerDailyInvestmentMap.get(fofoId).getShortInvestment());
+                }
-				if (CollectionMap.get(fofoId) != null) {
-					PartnerCollectionPlanModel collectionPlan = CollectionMap.get(fofoId);
+                if (CollectionMap.get(fofoId) != null) {
+                    PartnerCollectionPlanModel collectionPlan = CollectionMap.get(fofoId);
-					ptam.setRemark(collectionPlan.getRemark());
-					ptam.setMessage(collectionPlan.getMessage());
+                    ptam.setRemark(collectionPlan.getRemark());
-					ptam.setRemarkTimestamp(collectionPlan.getRemarkTimestamp());
+                    ptam.setMessage(collectionPlan.getMessage());
-					ptam.setRank(collectionPlan.getRank());
+                    ptam.setRemarkTimestamp(collectionPlan.getRemarkTimestamp());
-					Integer authId = collectionPlan.getAuthId();
+                    ptam.setRank(collectionPlan.getRank());
+                    Integer authId = collectionPlan.getAuthId();
-					Map<Integer, String> rankColorMap = ProfitMandiConstants.Rank_Color_Map;
+                    Map<Integer, String> rankColorMap = ProfitMandiConstants.Rank_Color_Map;
-					ptam.setCollectionColor(rankColorMap.get(collectionPlan.getRank()));
+                    ptam.setCollectionColor(rankColorMap.get(collectionPlan.getRank()));
-					LOGGER.info("authId" + authId);
+                    LOGGER.info("authId" + authId);
-					if (collectionPlan.getTargetPlan() != null && collectionPlan.getCommittedDate() != null) {
-						float targetCollection = 0;
+                    if (collectionPlan.getTargetPlan() != null && collectionPlan.getCommittedDate() != null) {
+                        float targetCollection = 0;
-						if (collectionPlan.getRank() == 2 && collectionPlan.getAchievementPlan() != null) {
-							targetCollection = collectionPlan.getTargetPlan() - collectionPlan.getAchievementPlan();
+                        if (collectionPlan.getRank() == 2 && collectionPlan.getAchievementPlan() != null) {
-						} else {
+                            targetCollection = collectionPlan.getTargetPlan() - collectionPlan.getAchievementPlan();
-							targetCollection = collectionPlan.getTargetPlan();
+                        } else {
-						}
+                            targetCollection = collectionPlan.getTargetPlan();
+                        }
-						if (authId != null && authId == authUser.getId()) {
+                        if (authId != null && authId == authUser.getId()) {
-							if (!collectionPlan.getCommittedDate().isAfter(startDate)) {
-								totalPartnerTargetCollection += targetCollection;
+                            if (!collectionPlan.getCommittedDate().isAfter(startDate)) {
-							}
+                                totalPartnerTargetCollection += targetCollection;
-						}
+                            }
+                        }
-						ptam.setCollectionTarget(targetCollection);
+                        ptam.setCollectionTarget(targetCollection);
-						if (collectionPlan.getRank() == 2 && collectionPlan.getAchievementPlan() != null
-								&& collectionPlan.getWalletTimestamp() != null
+                        if (collectionPlan.getRank() == 2 && collectionPlan.getAchievementPlan() != null
-								&& collectionPlan.getWalletTimestamp().toLocalDate().equals(startDate.toLocalDate())) {
+                                && collectionPlan.getWalletTimestamp() != null
-							if (authId != null && authId == authUser.getId()) {
+                                && collectionPlan.getWalletTimestamp().toLocalDate().equals(startDate.toLocalDate())) {
+                            if (authId != null && authId == authUser.getId()) {
-								totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
-							}
+                                totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
-							ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
+                            }
-						} else if (collectionPlan.getCommittedDate().toLocalDate().isEqual(startDate.toLocalDate())
+                            ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
-								&& collectionPlan.getAchievementPlan() != null) {
+                        } else if (collectionPlan.getCommittedDate().toLocalDate().isEqual(startDate.toLocalDate())
-							if (authId != null && authId == authUser.getId()) {
+                                && collectionPlan.getAchievementPlan() != null) {
+                            if (authId != null && authId == authUser.getId()) {
-								totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
-							}
+                                totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
-							ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
+                            }
+                            ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
-						}
-					}
+                        }
+                    }
-					if (authId != null && authId != authUser.getId()) {
-						ptam.setAuthUser(authRepository.selectById(authId));
+                    if (authId != null && authId != authUser.getId()) {
+                        ptam.setAuthUser(authRepository.selectById(authId));
-					}
+                    }
-					if (collectionPlan.getCommittedDate() != null) {
+                    if (collectionPlan.getCommittedDate() != null) {
-						ptam.setCollectionCommitmentDate(collectionPlan.getCommittedDate().toLocalDate());
-					}
+                        ptam.setCollectionCommitmentDate(collectionPlan.getCommittedDate().toLocalDate());
+                    }
-				}
+                }
-				// Secondary
+                // Secondary
-				PartnerSecondaryPlanModel otherPartnerSecondaryPlanModel = null;
-				Map<String, PartnerSecondaryPlanModel> secondaryModelMap = new HashMap<>();
+                PartnerSecondaryPlanModel otherPartnerSecondaryPlanModel = null;
-				if (partnerSecondayPlans.get(fofoId) != null) {
+                Map<String, PartnerSecondaryPlanModel> secondaryModelMap = new HashMap<>();
-					long otherBrandSecondary = 0;
+                if (partnerSecondayPlans.get(fofoId) != null) {
-					for (PartnerSecondaryPlanModel pspm : partnerSecondayPlans.get(fofoId)) {
+                    long otherBrandSecondary = 0;
-						Integer authId = pspm.getAuthId();
+                    for (PartnerSecondaryPlanModel pspm : partnerSecondayPlans.get(fofoId)) {
-						if (!brands.contains(pspm.getBrand())) {
+                        Integer authId = pspm.getAuthId();
-							if (pspm.getAchievementPlan() != null) {
+                        if (!brands.contains(pspm.getBrand())) {
-								otherBrandSecondary += pspm.getAchievementPlan();
+                            if (pspm.getAchievementPlan() != null) {
-							}
+                                otherBrandSecondary += pspm.getAchievementPlan();
-						} else {
+                            }
-							otherPartnerSecondaryPlanModel = pspm;
+                        } else {
-						}
+                            otherPartnerSecondaryPlanModel = pspm;
-						if (pspm.getTargetPlan() != null) {
+                        }
-							totalSecondaryPlan += pspm.getTargetPlan();
+                        if (pspm.getTargetPlan() != null) {
-						}
+                            totalSecondaryPlan += pspm.getTargetPlan();
+                        }
-						if (pspm.getAchievementPlan() != null) {
-							totalSecondaryAchivement += pspm.getAchievementPlan();
+                        if (pspm.getAchievementPlan() != null) {
-						}
+                            totalSecondaryAchivement += pspm.getAchievementPlan();
+                        }
-						if (pspm.getCommittedDate() != null) {
+                        if (pspm.getCommittedDate() != null) {
-							ptam.setSecondaryCommitmentDate(pspm.getCommittedDate().toLocalDate());
-						}
+                            ptam.setSecondaryCommitmentDate(pspm.getCommittedDate().toLocalDate());
-						if (authId != null && authId == authUser.getId()) {
+                        }
+                        if (authId != null && authId == authUser.getId()) {
-							if (pspm.getTargetPlan() != null && pspm.getCommittedDate() != null) {
+                            if (pspm.getTargetPlan() != null && pspm.getCommittedDate() != null) {
-								if (pspm.getCommittedDate().isEqual(startDate)) {
-									totalPartnerTargetSecondary += pspm.getTargetPlan();
+                                if (pspm.getCommittedDate().isEqual(startDate)) {
-								}
+                                    totalPartnerTargetSecondary += pspm.getTargetPlan();
-							}
+                                }
+                            }
-							if (pspm.getAchievementPlan() != null) {
-								totalPartnerAchievementSecondary += pspm.getAchievementPlan();
+                            if (pspm.getAchievementPlan() != null) {
-							}
+                                totalPartnerAchievementSecondary += pspm.getAchievementPlan();
+                            }
-						}
-					}
+                        }
-					if (otherPartnerSecondaryPlanModel != null) {
+                    }
-						otherPartnerSecondaryPlanModel.setAchievementPlan(otherBrandSecondary);
+                    if (otherPartnerSecondaryPlanModel != null) {
-					}
+                        otherPartnerSecondaryPlanModel.setAchievementPlan(otherBrandSecondary);
-					secondaryModelMap = partnerSecondayPlans.get(fofoId).stream()
+                    }
-							.filter(x -> brands.contains(x.getBrand()))
+                    secondaryModelMap = partnerSecondayPlans.get(fofoId).stream()
-							.collect(Collectors.toMap(x -> x.getBrand(), x -> x));
+                            .filter(x -> brands.contains(x.getBrand()))
+                            .collect(Collectors.toMap(x -> x.getBrand(), x -> x));
-					if (secondaryModelMap.containsKey("Others")) {
-						PartnerSecondaryPlanModel psp = secondaryModelMap.get("Others");
+                    if (secondaryModelMap.containsKey("Others")) {
-						psp.setAchievementPlan(otherBrandSecondary);
+                        PartnerSecondaryPlanModel psp = secondaryModelMap.get("Others");
-					} else {
+                        psp.setAchievementPlan(otherBrandSecondary);
-						secondaryModelMap.put("Others", new PartnerSecondaryPlanModel(fofoId, "Others", (long) 0,
+                    } else {
-								otherBrandSecondary, authUser.getId(), null));
+                        secondaryModelMap.put("Others", new PartnerSecondaryPlanModel(fofoId, "Others", (long) 0,
-					}
+                                otherBrandSecondary, authUser.getId(), null));
-					for (String brand : brands) {
+                    }
-						if (!secondaryModelMap.containsKey(brand)) {
+                    for (String brand : brands) {
-							secondaryModelMap.put(brand, new PartnerSecondaryPlanModel(fofoId, brand, (long) 0,
+                        if (!secondaryModelMap.containsKey(brand)) {
-									(long) 0, authUser.getId(), null));
+                            secondaryModelMap.put(brand, new PartnerSecondaryPlanModel(fofoId, brand, (long) 0,
-						}
+                                    (long) 0, authUser.getId(), null));
-					}
+                        }
+                    }
-					for (Entry<String, PartnerSecondaryPlanModel> secondaryModelEntry : secondaryModelMap.entrySet()) {
-						Integer authId = secondaryModelEntry.getValue().getAuthId();
+                    for (Entry<String, PartnerSecondaryPlanModel> secondaryModelEntry : secondaryModelMap.entrySet()) {
-						if (authId != null && authId != authUser.getId()) {
+                        Integer authId = secondaryModelEntry.getValue().getAuthId();
-							secondaryModelEntry.getValue().setAuthUser(authRepository.selectById(authId));
+                        if (authId != null && authId != authUser.getId()) {
-							ptam.setSecondaryColor("red");
+                            secondaryModelEntry.getValue().setAuthUser(authRepository.selectById(authId));
-						}
+                            ptam.setSecondaryColor("red");
+                        }
-					}
+                    }
-					ptam.setPartnerSecondaryModel(secondaryModelMap);
-					ptam.setTotalSecondaryPlan(totalSecondaryPlan);
+                    ptam.setPartnerSecondaryModel(secondaryModelMap);
-					ptam.setTotalSecondaryAchievement(totalSecondaryAchivement);
+                    ptam.setTotalSecondaryPlan(totalSecondaryPlan);
-					// Secondary
+                    ptam.setTotalSecondaryAchievement(totalSecondaryAchivement);
+                    // Secondary
-				} else {
-					for (String brand : brands) {
+                } else {
-						PartnerSecondaryPlanModel pspm = new PartnerSecondaryPlanModel();
+                    for (String brand : brands) {
-						pspm.setAchievementPlan((long) 0);
+                        PartnerSecondaryPlanModel pspm = new PartnerSecondaryPlanModel();
-						pspm.setTargetPlan((long) 0);
+                        pspm.setAchievementPlan((long) 0);
-						pspm.setBrand(brand);
+                        pspm.setTargetPlan((long) 0);
-						pspm.setFofoId(fofoId);
+                        pspm.setBrand(brand);
-						secondaryModelMap.put(brand, pspm);
+                        pspm.setFofoId(fofoId);
-					}
+                        secondaryModelMap.put(brand, pspm);
-					ptam.setPartnerSecondaryModel(secondaryModelMap);
+                    }
-				}
+                    ptam.setPartnerSecondaryModel(secondaryModelMap);
+                }
-				if (!partnerTicketCount.isEmpty()) {
-					if (partnerTicketCount.get(fofoId) != null) {
+                if (!partnerTicketCount.isEmpty()) {
-						ptam.setTicketCount(partnerTicketCount.get(fofoId));
+                    if (partnerTicketCount.get(fofoId) != null) {
-					} else {
+                        ptam.setTicketCount(partnerTicketCount.get(fofoId));
-						ptam.setTicketCount(0);
+                    } else {
+                        ptam.setTicketCount(0);
-					}
-				}
+                    }
+                }
-				ptams.add(ptam);
+                ptams.add(ptam);
-			}
+            }
-			tm.setTotalPartnerTargetCollection(totalPartnerTargetCollection);
-			tm.setTotalPartnerTargetSecondary(totalPartnerTargetSecondary);
+            tm.setTotalPartnerTargetCollection(totalPartnerTargetCollection);
-			tm.setTotalPartnerSecondary(totalPartnerAchievementSecondary);
+            tm.setTotalPartnerTargetSecondary(totalPartnerTargetSecondary);
-			tm.setTotalPartnerCollection(totalPartnerAchievementCollection);
+            tm.setTotalPartnerSecondary(totalPartnerAchievementSecondary);
-			tm.setTodayCollectionCount((int) todayCollectionCount);
+            tm.setTotalPartnerCollection(totalPartnerAchievementCollection);
+            tm.setTodayCollectionCount((int) todayCollectionCount);
-			tm.setTargetAchievement(ptams.stream().sorted(Comparator.comparing(PartnerTargetAchievementModel::getRank))
-					.collect(Collectors.toList()));
+            tm.setTargetAchievement(ptams.stream().sorted(Comparator.comparing(PartnerTargetAchievementModel::getRank))
+                    .collect(Collectors.toList()));
-		}
+        }
-		return responseSender.ok(tm);
+        return responseSender.ok(tm);
-	}
+    }
-	@RequestMapping(value = "/target", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @RequestMapping(value = "/target", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+    @ApiImplicitParams({
-	public ResponseEntity<?> createPartnerTarget(HttpServletRequest request,
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-			@RequestBody PartnerTargetAchievementModel ptam) throws ProfitMandiBusinessException {
+    public ResponseEntity<?> createPartnerTarget(HttpServletRequest request,
+                                                 @RequestBody PartnerTargetAchievementModel ptam) throws ProfitMandiBusinessException {
-		LOGGER.info("ptam" + ptam);
+        LOGGER.info("ptam" + ptam);
-		AuthUser authUser = authRepository.selectByGmailId(ptam.getCreatedBy());
+        AuthUser authUser = authRepository.selectByGmailId(ptam.getCreatedBy());
-		if (ptam.getCollectionCommitmentDate().isAfter(LocalDate.now())
-				|| ptam.getCollectionCommitmentDate().isEqual(LocalDate.now())) {
+        if (ptam.getCollectionCommitmentDate().isAfter(LocalDate.now())
-			PartnerCollectionPlan partnerCollectionPlan = partnerCollectionPlanRepository
+                || ptam.getCollectionCommitmentDate().isEqual(LocalDate.now())) {
-					.selectByLocalDate(LocalDate.now(), ptam.getFofoId(), true);
+            PartnerCollectionPlan partnerCollectionPlan = partnerCollectionPlanRepository
-			LOGGER.info("pcp" + partnerCollectionPlan);
+                    .selectByLocalDate(LocalDate.now(), ptam.getFofoId(), true);
+            LOGGER.info("pcp" + partnerCollectionPlan);
-			if (partnerCollectionPlan == null) {
-				if (ptam.getCollectionTarget() > 0) {
+            if (partnerCollectionPlan == null) {
+                if (ptam.getCollectionTarget() > 0) {
-					partnerCollectionPlan = new PartnerCollectionPlan();
-					partnerCollectionPlan.setCreateTimestamp(LocalDateTime.now());
+                    partnerCollectionPlan = new PartnerCollectionPlan();
-					partnerCollectionPlan.setAuthId(authUser.getId());
+                    partnerCollectionPlan.setCreateTimestamp(LocalDateTime.now());
-					partnerCollectionPlan.setFofoId(ptam.getFofoId());
+                    partnerCollectionPlan.setAuthId(authUser.getId());
-					partnerCollectionPlan.setActive(true);
+                    partnerCollectionPlan.setFofoId(ptam.getFofoId());
-					partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
+                    partnerCollectionPlan.setActive(true);
-					partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+                    partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
-					partnerCollectionPlan.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
+                    partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
-					partnerCollectionPlanRepository.persist(partnerCollectionPlan);
+                    partnerCollectionPlan.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
+                    partnerCollectionPlanRepository.persist(partnerCollectionPlan);
-				}
+                }
-			} else {
+            } else {
-				if (partnerCollectionPlan.getCollectionPlan() != ptam.getCollectionTarget()) {
-					float totalCollectionPlan = partnerCollectionPlan.getCollectionPlan() + 10000;
+                if (partnerCollectionPlan.getCollectionPlan() != ptam.getCollectionTarget()) {
-					if (authUser.getId() == partnerCollectionPlan.getAuthId()) {
+                    float totalCollectionPlan = partnerCollectionPlan.getCollectionPlan() + 10000;
+                    if (authUser.getId() == partnerCollectionPlan.getAuthId()) {
-						if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
-								|| authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")
+                        if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
-								|| ptam.getCollectionTarget() >= totalCollectionPlan) {
+                                || authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")
-							partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
+                                || ptam.getCollectionTarget() >= totalCollectionPlan) {
-							partnerCollectionPlan.setActive(true);
+                            partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
-							partnerCollectionPlan
+                            partnerCollectionPlan.setActive(true);
-									.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
+                            partnerCollectionPlan
-							partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+                                    .setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
-						} else {
+                            partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
-							throw new ProfitMandiBusinessException("collection target", "",
+                        } else {
-									"collection target should be more than " + totalCollectionPlan);
+                            throw new ProfitMandiBusinessException("collection target", "",
-						}
+                                    "collection target should be more than " + totalCollectionPlan);
+                        }
-					} else {
+                    } else {
-						if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
-								|| authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")
+                        if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
-								|| ptam.getCollectionTarget() >= totalCollectionPlan) {
+                                || authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")
+                                || ptam.getCollectionTarget() >= totalCollectionPlan) {
-							partnerCollectionPlan.setActive(false);
-							partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+                            partnerCollectionPlan.setActive(false);
-							partnerCollectionPlan = new PartnerCollectionPlan();
+                            partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
-							partnerCollectionPlan.setCreateTimestamp(LocalDateTime.now());
+                            partnerCollectionPlan = new PartnerCollectionPlan();
-							partnerCollectionPlan.setAuthId(authUser.getId());
+                            partnerCollectionPlan.setCreateTimestamp(LocalDateTime.now());
-							partnerCollectionPlan.setFofoId(ptam.getFofoId());
+                            partnerCollectionPlan.setAuthId(authUser.getId());
-							partnerCollectionPlan.setActive(true);
+                            partnerCollectionPlan.setFofoId(ptam.getFofoId());
-							partnerCollectionPlan
+                            partnerCollectionPlan.setActive(true);
-									.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
+                            partnerCollectionPlan
-							partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
+                                    .setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
-							partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+                            partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
-							partnerCollectionPlanRepository.persist(partnerCollectionPlan);
+                            partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
-						} else {
+                            partnerCollectionPlanRepository.persist(partnerCollectionPlan);
-							throw new ProfitMandiBusinessException("collection target", "",
+                        } else {
-									"collection target should be more than " + totalCollectionPlan);
+                            throw new ProfitMandiBusinessException("collection target", "",
-						}
+                                    "collection target should be more than " + totalCollectionPlan);
-					}
+                        }
-				}
+                    }
+                }
-				if ((LocalDate.now().atStartOfDay().equals(ptam.getCollectionCommitmentDate().atStartOfDay())
-						|| ptam.getCollectionCommitmentDate().atStartOfDay().isAfter(LocalDate.now().atStartOfDay()))
+                if ((LocalDate.now().atStartOfDay().equals(ptam.getCollectionCommitmentDate().atStartOfDay())
-						&& partnerCollectionPlan.getCollectionPlan() == ptam.getCollectionTarget()) {
+                        || ptam.getCollectionCommitmentDate().atStartOfDay().isAfter(LocalDate.now().atStartOfDay()))
-					partnerCollectionPlan.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
+                        && partnerCollectionPlan.getCollectionPlan() == ptam.getCollectionTarget()) {
-					partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+                    partnerCollectionPlan.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
-				}
+                    partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+                }
-			}
+            }
-			PartnerCollectionRemark pcr = new PartnerCollectionRemark();
-			pcr.setFofoId(ptam.getFofoId());
+            PartnerCollectionRemark pcr = new PartnerCollectionRemark();
-			pcr.setAuthId(authUser.getId());
+            pcr.setFofoId(ptam.getFofoId());
-			pcr.setMessage("Collection plan for" + ptam.getCollectionCommitmentDate());
+            pcr.setAuthId(authUser.getId());
-			pcr.setRemark(CollectionRemark.COLLECTION_PLAN);
+            pcr.setMessage("Collection plan for" + ptam.getCollectionCommitmentDate());
-			pcr.setCreateTimestamp(LocalDateTime.now());
+            pcr.setRemark(CollectionRemark.COLLECTION_PLAN);
-			partnerCollectionRemarkRepository.persist(pcr);
+            pcr.setCreateTimestamp(LocalDateTime.now());
-		} else {
+            partnerCollectionRemarkRepository.persist(pcr);
-			throw new ProfitMandiBusinessException("Date", "",
+        } else {
-					"you can't select the back date " + ptam.getCollectionCommitmentDate());
+            throw new ProfitMandiBusinessException("Date", "",
-		}
+                    "you can't select the back date " + ptam.getCollectionCommitmentDate());
+        }
-		for (Entry<String, PartnerSecondaryPlanModel> pspm : ptam.getPartnerSecondaryModel().entrySet()) {
+        for (Entry<String, PartnerSecondaryPlanModel> pspm : ptam.getPartnerSecondaryModel().entrySet()) {
-			if (ptam.getCollectionCommitmentDate().isAfter(LocalDate.now())
-					|| ptam.getCollectionCommitmentDate().isEqual(LocalDate.now())) {
+            if (ptam.getCollectionCommitmentDate().isAfter(LocalDate.now())
-				PartnerSecondaryPlanModel plan = pspm.getValue();
+                    || ptam.getCollectionCommitmentDate().isEqual(LocalDate.now())) {
-				PartnerSecondaryPlan psp = partnerSecondaryPlanRepository.selectByLocalDateBrand(plan.getBrand(),
+                PartnerSecondaryPlanModel plan = pspm.getValue();
-						LocalDate.now(), ptam.getFofoId(), true);
+                PartnerSecondaryPlan psp = partnerSecondaryPlanRepository.selectByLocalDateBrand(plan.getBrand(),
-				LOGGER.info("psp" + psp);
+                        LocalDate.now(), ptam.getFofoId(), true);
+                LOGGER.info("psp" + psp);
-				if (psp == null) {
-					if (plan.getTargetPlan() != null && plan.getTargetPlan() > 0) {
+                if (psp == null) {
+                    if (plan.getTargetPlan() != null && plan.getTargetPlan() > 0) {
-						psp = new PartnerSecondaryPlan();
-						psp.setAuthId(authUser.getId());
+                        psp = new PartnerSecondaryPlan();
-						psp.setBrand(pspm.getKey());
+                        psp.setAuthId(authUser.getId());
-						psp.setFofoId(pspm.getValue().getFofoId());
+                        psp.setBrand(pspm.getKey());
-						psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
+                        psp.setFofoId(pspm.getValue().getFofoId());
-						psp.setCreateTimestamp(LocalDateTime.now());
+                        psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
-						psp.setUpdatedTimestamp(LocalDateTime.now());
+                        psp.setCreateTimestamp(LocalDateTime.now());
-						psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
+                        psp.setUpdatedTimestamp(LocalDateTime.now());
-						psp.setActive(true);
+                        psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
-						partnerSecondaryPlanRepository.persist(psp);
+                        psp.setActive(true);
-					}
+                        partnerSecondaryPlanRepository.persist(psp);
+                    }
-				} else {
-					if (plan.getTargetPlan() != psp.getSecondaryPlan()) {
+                } else {
-						float totalSecondaryPlan = psp.getSecondaryPlan() + 10000;
+                    if (plan.getTargetPlan() != psp.getSecondaryPlan()) {
-						if (authUser.getId() == plan.getAuthId()) {
+                        float totalSecondaryPlan = psp.getSecondaryPlan() + 10000;
-							if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
+                        if (authUser.getId() == plan.getAuthId()) {
-									|| authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")
+                            if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
-									|| plan.getTargetPlan() >= totalSecondaryPlan) {
+                                    || authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")
-								psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
+                                    || plan.getTargetPlan() >= totalSecondaryPlan) {
-								psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
+                                psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
-								psp.setUpdatedTimestamp(LocalDateTime.now());
+                                psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
-								psp.setActive(true);
+                                psp.setUpdatedTimestamp(LocalDateTime.now());
-							} else {
+                                psp.setActive(true);
-								throw new ProfitMandiBusinessException("secondary target", "",
+                            } else {
-										"secondary target should be more than " + totalSecondaryPlan);
+                                throw new ProfitMandiBusinessException("secondary target", "",
-							}
+                                        "secondary target should be more than " + totalSecondaryPlan);
+                            }
-						} else {
+                        } else {
-							if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
-									|| authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")
+                            if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
-									|| plan.getTargetPlan() >= totalSecondaryPlan) {
+                                    || authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")
+                                    || plan.getTargetPlan() >= totalSecondaryPlan) {
-								psp.setUpdatedTimestamp(LocalDateTime.now());
-								psp.setActive(false);
+                                psp.setUpdatedTimestamp(LocalDateTime.now());
-								psp = new PartnerSecondaryPlan();
+                                psp.setActive(false);
-								psp.setAuthId(authUser.getId());
+                                psp = new PartnerSecondaryPlan();
-								psp.setBrand(pspm.getKey());
+                                psp.setAuthId(authUser.getId());
-								psp.setFofoId(pspm.getValue().getFofoId());
+                                psp.setBrand(pspm.getKey());
-								psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
+                                psp.setFofoId(pspm.getValue().getFofoId());
-								psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
+                                psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
-								psp.setCreateTimestamp(LocalDateTime.now());
+                                psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
-								psp.setUpdatedTimestamp(LocalDateTime.now());
+                                psp.setCreateTimestamp(LocalDateTime.now());
-								psp.setActive(true);
+                                psp.setUpdatedTimestamp(LocalDateTime.now());
-								partnerSecondaryPlanRepository.persist(psp);
+                                psp.setActive(true);
-							} else {
+                                partnerSecondaryPlanRepository.persist(psp);
-								throw new ProfitMandiBusinessException("secondary target", "",
+                            } else {
-										"secondary target should be more than " + totalSecondaryPlan);
+                                throw new ProfitMandiBusinessException("secondary target", "",
-							}
+                                        "secondary target should be more than " + totalSecondaryPlan);
-						}
+                            }
-					}
+                        }
+                    }
-					if ((LocalDate.now().atStartOfDay().equals(ptam.getSecondaryCommitmentDate().atStartOfDay())
-							|| ptam.getSecondaryCommitmentDate().atStartOfDay().isAfter(LocalDate.now().atStartOfDay()))
+                    if ((LocalDate.now().atStartOfDay().equals(ptam.getSecondaryCommitmentDate().atStartOfDay())
-							&& plan.getTargetPlan() == psp.getSecondaryPlan()) {
+                            || ptam.getSecondaryCommitmentDate().atStartOfDay().isAfter(LocalDate.now().atStartOfDay()))
-						psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
+                            && plan.getTargetPlan() == psp.getSecondaryPlan()) {
-						psp.setUpdatedTimestamp(LocalDateTime.now());
+                        psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
-					}
+                        psp.setUpdatedTimestamp(LocalDateTime.now());
+                    }
-				}
-			} else {
+                }
-				throw new ProfitMandiBusinessException("Date", "",
+            } else {
-						"you can't select the back date " + ptam.getSecondaryCommitmentDate());
+                throw new ProfitMandiBusinessException("Date", "",
-			}
+                        "you can't select the back date " + ptam.getSecondaryCommitmentDate());
+            }
-		}
+        }
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = "/viewTickets", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @RequestMapping(value = "/viewTickets", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
-	public ResponseEntity<?> viewTickets(HttpServletRequest request, @RequestParam int fofoId)
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-			throws ProfitMandiBusinessException {
+    public ResponseEntity<?> viewTickets(HttpServletRequest request, @RequestParam int fofoId)
-		List<Ticket> tickets = ticketRepository.selectAllOpenTicketByRetailer(fofoId);
+            throws ProfitMandiBusinessException {
+        List<Ticket> tickets = ticketRepository.selectAllOpenTicketByRetailer(fofoId);
-		List<TicketViewModel> viewList = new ArrayList<>();
-		for (Ticket ticket : tickets) {
+        List<TicketViewModel> viewList = new ArrayList<>();
+        for (Ticket ticket : tickets) {
-			TicketViewModel ticketViewModel = new TicketViewModel();
-			ticketViewModel.setId(ticket.getId());
+            TicketViewModel ticketViewModel = new TicketViewModel();
-			TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.selectById(ticket.getSubCategoryId());
+            ticketViewModel.setId(ticket.getId());
-			TicketCategory ticketCategory = ticketCategoryRepository.selectById(ticketSubCategory.getCategoryId());
+            TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.selectById(ticket.getSubCategoryId());
+            TicketCategory ticketCategory = ticketCategoryRepository.selectById(ticketSubCategory.getCategoryId());
-			ticketViewModel.setCategoryName(ticketCategory.getName());
-			ticketViewModel.setSubCategoryName(ticketSubCategory.getName());
+            ticketViewModel.setCategoryName(ticketCategory.getName());
-			ticketViewModel.setCreatedTimestamp(ticket.getCreateTimestamp());
+            ticketViewModel.setSubCategoryName(ticketSubCategory.getName());
+            ticketViewModel.setCreatedTimestamp(ticket.getCreateTimestamp());
-			viewList.add(ticketViewModel);
-		}
+            viewList.add(ticketViewModel);
-		return responseSender.ok(viewList);
+        }
+        return responseSender.ok(viewList);
-	}
+    }
-	@RequestMapping(value = "/viewRecentTickets", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @RequestMapping(value = "/viewRecentTickets", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
-	public ResponseEntity<?> viewRecentTickets(HttpServletRequest request, @RequestParam int fofoId)
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-			throws ProfitMandiBusinessException {
+    public ResponseEntity<?> viewRecentTickets(HttpServletRequest request, @RequestParam int fofoId)
-		List<TicketViewModel> viewList = ticketRepository.selectRecentClosedTicket(fofoId,
+            throws ProfitMandiBusinessException {
-				LocalDateTime.now().minusDays(20));
+        List<TicketViewModel> viewList = ticketRepository.selectRecentClosedTicket(fofoId,
+                LocalDateTime.now().minusDays(20));
-		return responseSender.ok(viewList);
+        return responseSender.ok(viewList);
-	}
+    }
-	@RequestMapping(value = "/createTicket", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @RequestMapping(value = "/createTicket", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
-	public ResponseEntity<?> createTicket(HttpServletRequest request) throws ProfitMandiBusinessException {
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-		List<TicketCategory> ticketCategories = csService.getAllTicketCategotyFromSubCategory();
+    public ResponseEntity<?> createTicket(HttpServletRequest request) throws ProfitMandiBusinessException {
+        List<TicketCategory> ticketCategories = csService.getAllTicketCategotyFromSubCategory();
-		return responseSender.ok(ticketCategories);
-	}
+        return responseSender.ok(ticketCategories);
+    }
-	@RequestMapping(value = "/getSubCategoriesByCategoryId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @RequestMapping(value = "/getSubCategoriesByCategoryId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-	public ResponseEntity<?> getSubCategoriesByCategoryId(HttpServletRequest request,
-			@RequestParam(name = "categoryId", defaultValue = "0") int categoryId, Model model) {
+    public ResponseEntity<?> getSubCategoriesByCategoryId(HttpServletRequest request,
-		List<TicketSubCategory> ticketSubCategories = ticketSubCategoryRepository.selectAll(categoryId);
+                                                          @RequestParam(name = "categoryId", defaultValue = "0") int categoryId, Model model) {
-		LOGGER.info(ticketSubCategories);
+        List<TicketSubCategory> ticketSubCategories = ticketSubCategoryRepository.selectAll(categoryId);
-		return responseSender.ok(ticketSubCategories);
+        LOGGER.info(ticketSubCategories);
-	}
+        return responseSender.ok(ticketSubCategories);
+    }
-	@RequestMapping(value = "/createTicket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @RequestMapping(value = "/createTicket", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
-	public ResponseEntity<?> createTicket(HttpServletRequest request, @RequestParam(name = "categoryId") int categoryId,
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-			@RequestParam(name = "subCategoryId") int subCategoryId, @RequestParam(name = "message") String message,
+    public ResponseEntity<?> createTicket(HttpServletRequest request, @RequestParam(name = "categoryId") int categoryId,
-			@RequestParam(name = "fofoId") int fofoId) throws Exception {
+                                          @RequestParam(name = "subCategoryId") int subCategoryId, @RequestParam(name = "message") String message,
+                                          @RequestParam(name = "fofoId") int fofoId) throws Exception {
-		int id = (int) request.getAttribute("userId");
+        int id = (int) request.getAttribute("userId");
-		LOGGER.info("id" + id);
+        LOGGER.info("id" + id);
-		User user = userRepository.selectById(id);
+        User user = userRepository.selectById(id);
-		AuthUser authUser = authRepository.selectByEmailOrMobile(user.getEmailId());
+        AuthUser authUser = authRepository.selectByEmailOrMobile(user.getEmailId());
-		List<Ticket> tickets = ticketRepository.selectAllResolvedMarkedTicketByCreator(fofoId);
-		if (tickets.size() > 3 || tickets.size() == 3) {
+        List<Ticket> tickets = ticketRepository.selectAllResolvedMarkedTicketByCreator(fofoId);
-			return responseSender.ok(false);
+        if (tickets.size() > 3 || tickets.size() == 3) {
-		} else {
+            return responseSender.ok(false);
-			csService.createTicket(fofoId, categoryId, subCategoryId, message);
+        } else {
+            csService.createTicket(fofoId, categoryId, subCategoryId, message);
-			PartnerCollectionRemark pcr = new PartnerCollectionRemark();
-			pcr.setFofoId(fofoId);
+            PartnerCollectionRemark pcr = new PartnerCollectionRemark();
-			pcr.setAuthId(authUser.getId());
+            pcr.setFofoId(fofoId);
-			pcr.setMessage("Ticket Created");
+            pcr.setAuthId(authUser.getId());
-			pcr.setRemark(CollectionRemark.TICKET_CREATED);
+            pcr.setMessage("Ticket Created");
-			pcr.setCreateTimestamp(LocalDateTime.now());
+            pcr.setRemark(CollectionRemark.TICKET_CREATED);
-			partnerCollectionRemarkRepository.persist(pcr);
+            pcr.setCreateTimestamp(LocalDateTime.now());
+            partnerCollectionRemarkRepository.persist(pcr);
-		}
-		return responseSender.ok(true);
+        }
-	}
+        return responseSender.ok(true);
+    }
-	@RequestMapping(value = "/getCollectionRemark", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @RequestMapping(value = "/getCollectionRemark", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
-	public ResponseEntity<?> getCollectionRemark(HttpServletRequest request) throws ProfitMandiBusinessException {
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-		List<CollectionRemark> remarks = Arrays.asList(CollectionRemark.values()).stream()
+    public ResponseEntity<?> getCollectionRemark(HttpServletRequest request) throws ProfitMandiBusinessException {
-				.filter(x -> !x.equals(CollectionRemark.COLLECTION_PLAN)).collect(Collectors.toList());
+        List<CollectionRemark> remarks = Arrays.asList(CollectionRemark.values()).stream()
-		return responseSender.ok(remarks);
+                .filter(x -> !x.equals(CollectionRemark.COLLECTION_PLAN)).collect(Collectors.toList());
-	}
+        return responseSender.ok(remarks);
+    }
-	@RequestMapping(value = "/createPartnerColectionRemark", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({
+    @RequestMapping(value = "/createPartnerColectionRemark", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
-	public ResponseEntity<?> createPartnerColectionRemark(HttpServletRequest request,
+            @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
-			@RequestBody PartnerCollectionRemarkModel partnerCollectionRemarkModel)
+    public ResponseEntity<?> createPartnerColectionRemark(HttpServletRequest request,
-			throws ProfitMandiBusinessException {
+                                                          @RequestBody PartnerCollectionRemarkModel partnerCollectionRemarkModel)
-		AuthUser authUser = authRepository.selectByGmailId(partnerCollectionRemarkModel.getGmailId());
+            throws ProfitMandiBusinessException {
+        AuthUser authUser = authRepository.selectByGmailId(partnerCollectionRemarkModel.getGmailId());
-		PartnerCollectionRemark pcr = new PartnerCollectionRemark();
-		pcr.setFofoId(partnerCollectionRemarkModel.getFofoId());
+        PartnerCollectionRemark pcr = new PartnerCollectionRemark();
-		pcr.setAuthId(authUser.getId());
+        pcr.setFofoId(partnerCollectionRemarkModel.getFofoId());
-		pcr.setMessage(partnerCollectionRemarkModel.getMessage());
+        pcr.setAuthId(authUser.getId());
-		pcr.setRemark(partnerCollectionRemarkModel.getRemark());
+        pcr.setMessage(partnerCollectionRemarkModel.getMessage());
-		pcr.setCreateTimestamp(LocalDateTime.now());
+        pcr.setRemark(partnerCollectionRemarkModel.getRemark());
-		partnerCollectionRemarkRepository.persist(pcr);
+        pcr.setCreateTimestamp(LocalDateTime.now());
-		return responseSender.ok(true);
+        partnerCollectionRemarkRepository.persist(pcr);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = "/uploadFranchiseeVisit", method = RequestMethod.POST)
-	public ResponseEntity<?> readCsvFileAndSetLead(HttpServletRequest request, @RequestPart MultipartFile multipartFile)
+    @RequestMapping(value = "/uploadFranchiseeVisit", method = RequestMethod.POST)
-			throws Throwable {
+    public ResponseEntity<?> readCsvFileAndSetLead(HttpServletRequest request, @RequestPart MultipartFile multipartFile)
+            throws Throwable {
-		int id = (int) request.getAttribute("userId");
+        int id = (int) request.getAttribute("userId");
-		LOGGER.info("id" + id);
+        LOGGER.info("id" + id);
-		User user = userRepository.selectById(id);
+        User user = userRepository.selectById(id);
-		AuthUser authUser = authRepository.selectByEmailOrMobile(user.getEmailId());
+        AuthUser authUser = authRepository.selectByEmailOrMobile(user.getEmailId());
-		String fileName = multipartFile.getName();
-		String fileNames = multipartFile.getOriginalFilename();
+        String fileName = multipartFile.getName();
+        String fileNames = multipartFile.getOriginalFilename();
-		LOGGER.info("fileName" + fileName);
-		LOGGER.info("fileNames" + fileNames);
+        LOGGER.info("fileName" + fileName);
+        LOGGER.info("fileNames" + fileNames);
-		List<CSVRecord> records = FileUtil.readFile(multipartFile);
+        List<CSVRecord> records = FileUtil.readFile(multipartFile);
-		for (CSVRecord record : records) {
-			FranchiseeVisit franchiseeVisit = new FranchiseeVisit();
+        for (CSVRecord record : records) {
-			franchiseeVisit.setFofoId(Integer.parseInt(record.get(0)));
+            FranchiseeVisit franchiseeVisit = new FranchiseeVisit();
-			CustomRetailer customRetailer = retailerService.getFofoRetailer(Integer.parseInt(record.get(0)));
+            franchiseeVisit.setFofoId(Integer.parseInt(record.get(0)));
+            CustomRetailer customRetailer = retailerService.getFofoRetailer(Integer.parseInt(record.get(0)));
-			franchiseeVisit.setPartnerName(customRetailer.getBusinessName());
-			franchiseeVisit.setAgenda(record.get(1));
+            franchiseeVisit.setPartnerName(customRetailer.getBusinessName());
-			franchiseeVisit.setCreatedTimestamp(LocalDateTime.now());
+            franchiseeVisit.setAgenda(record.get(1));
-			franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
+            franchiseeVisit.setCreatedTimestamp(LocalDateTime.now());
-			franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
+            franchiseeVisit.setUpdatedTimestamp(LocalDateTime.now());
+            franchiseeVisit.setStatus(FranchiseeVisitStatus.OPEN);
-			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
-			LOGGER.info(record.get(1));
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
-			LocalDate dateTime = LocalDate.parse(record.get(2), formatter);
+            LOGGER.info(record.get(1));
+            LocalDate dateTime = LocalDate.parse(record.get(2), formatter);
-			franchiseeVisit.setScheduleTimestamp(dateTime.atStartOfDay());
-			// change
+            franchiseeVisit.setScheduleTimestamp(dateTime.atStartOfDay());
+            // change
-			String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
-			franchiseeVisit.setCreatedBy(authUserName);
+            String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
-			franchiseeVisit.setAuthId(authUser.getId());
+            franchiseeVisit.setCreatedBy(authUserName);
+            franchiseeVisit.setAuthId(authUser.getId());
-			franchiseeVisitRepository.persist(franchiseeVisit);
+            franchiseeVisitRepository.persist(franchiseeVisit);
-			return responseSender.ok(true);
-		}
+            return responseSender.ok(true);
+        }
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = "/downloadFranchiseeVisitTemplate", method = RequestMethod.GET)
-	public ResponseEntity<?> downloadFranchiseeVisitTemplate(HttpServletRequest request) throws Exception {
+    @RequestMapping(value = "/downloadFranchiseeVisitTemplate", method = RequestMethod.GET)
+    public ResponseEntity<?> downloadFranchiseeVisitTemplate(HttpServletRequest request) throws Exception {
-		// ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        // ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-		List<List<?>> rows = new ArrayList<>();
+        List<List<?>> rows = new ArrayList<>();
-		org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream = FileUtil
-				.getCSVByteStream(Arrays.asList("Partner Id", "Agenda", "Schedule Timestamp"), rows);
+        org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream = FileUtil
+                .getCSVByteStream(Arrays.asList("Partner Id", "Agenda", "Schedule Timestamp"), rows);
-		try {
-			byteArrayOutputStream.close();
+        try {
-		} catch (IOException e) {
+            byteArrayOutputStream.close();
-			// TODO Auto-generated catch block
+        } catch (IOException e) {
-			e.printStackTrace();
+            // TODO Auto-generated catch block
-		}
+            e.printStackTrace();
+        }
-		String filename = "template.csv";
-		HttpHeaders headers = new HttpHeaders();
+        String filename = "template.csv";
-		headers.add("Content-Type", "application/csv");
+        HttpHeaders headers = new HttpHeaders();
-		headers.setContentDispositionFormData(filename, filename);
+        headers.add("Content-Type", "application/csv");
+        headers.setContentDispositionFormData(filename, filename);
-		headers.setCacheControl("must-revalidate, post-check=0, pre-check=0");
+        headers.setCacheControl("must-revalidate, post-check=0, pre-check=0");
-		ResponseEntity<byte[]> response = new ResponseEntity<byte[]>(byteArrayOutputStream.toByteArray(), headers,
-				HttpStatus.OK);
+        ResponseEntity<byte[]> response = new ResponseEntity<byte[]>(byteArrayOutputStream.toByteArray(), headers,
-		return response;
+                HttpStatus.OK);
+        return response;
-	}
+    }
-	@RequestMapping(value = "/markVisitAttendance", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> markVisitAttendance(HttpServletRequest request, @RequestParam(name = "id") int id)
+    @RequestMapping(value = "/markVisitAttendance", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-			throws ProfitMandiBusinessException {
+    public ResponseEntity<?> markVisitAttendance(HttpServletRequest request, @RequestParam(name = "id") int id)
-		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
+            throws ProfitMandiBusinessException {
+        FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
-		franchiseeVisit.setVisitTimestamp(LocalDateTime.now());
+        franchiseeVisit.setVisitTimestamp(LocalDateTime.now());
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
-	@RequestMapping(value = "/getVisitRequests", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> getVisitRequests(HttpServletRequest request,
+    @RequestMapping(value = "/getVisitRequests", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-			@RequestParam(name = "gmailId") String gmailId, Model model) throws Exception {
+    public ResponseEntity<?> getVisitRequests(HttpServletRequest request,
+                                              @RequestParam(name = "gmailId") String gmailId, Model model) throws Exception {
-		AuthUser authUser = authRepository.selectByGmailId(gmailId);
+        AuthUser authUser = authRepository.selectByGmailId(gmailId);
-		List<Integer> authUserIds = authService.getAllReportees(authUser.getId());
-		List<VisitSummaryModel> visitSummary = new ArrayList<>();
+        List<Integer> authUserIds = authService.getAllReportees(authUser.getId());
+        List<VisitSummaryModel> visitSummary = new ArrayList<>();
-		if (!authUserIds.isEmpty()) {
-			List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(authUserIds);
+        if (!authUserIds.isEmpty()) {
+            List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(authUserIds);
-			List<VisitRequest> allVisitRequests = visitRequestRepository.selectByAuthIdsAndDate(authUserIds,
-					LocalDate.now().minusDays(7), Arrays.asList(VisitStatus.approved, VisitStatus.pending));
+            List<VisitRequest> allVisitRequests = visitRequestRepository.selectByAuthIdsAndDate(authUserIds,
-			LOGGER.info("allVisitRequests {}", allVisitRequests);
+                    LocalDate.now().minusDays(7), Arrays.asList(VisitStatus.approved, VisitStatus.pending));
+            LOGGER.info("allVisitRequests {}", allVisitRequests);
-			if (!allVisitRequests.isEmpty()) {
+            if (!allVisitRequests.isEmpty()) {
-				List<Integer> leadIds = allVisitRequests.stream().filter(x -> x.getVisitType().equals("lead"))
-						.map(x -> x.getVisitId()).collect(Collectors.toList());
+                List<Integer> leadIds = allVisitRequests.stream().filter(x -> x.getVisitType().equals("lead"))
-				List<Lead> leads = new ArrayList<>();
+                        .map(x -> x.getVisitId()).collect(Collectors.toList());
-				if (!leadIds.isEmpty()) {
+                List<Lead> leads = new ArrayList<>();
-					leads = leadRepository.selectAllByIds(leadIds);
+                if (!leadIds.isEmpty()) {
+                    leads = leadRepository.selectAllByIds(leadIds);
-					for (Lead lead : leads) {
-						List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(lead.getId());
+                    for (Lead lead : leads) {
-						lead.setScheduledTimestamp(leadActivities.get(0).getSchelduleTimestamp());
+                        List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(lead.getId());
-						lead.setLeadActivity(leadActivities.get(0));
+                        lead.setScheduledTimestamp(leadActivities.get(0).getSchelduleTimestamp());
-					}
+                        lead.setLeadActivity(leadActivities.get(0));
-				}
+                    }
-				List<Integer> franchiseeIds = allVisitRequests.stream()
+                }
-						.filter(x -> x.getVisitType().equals("franchiseeVisit")).map(x -> x.getVisitId())
+                List<Integer> franchiseeIds = allVisitRequests.stream()
-						.collect(Collectors.toList());
+                        .filter(x -> x.getVisitType().equals("franchiseeVisit")).map(x -> x.getVisitId())
-				List<FranchiseeVisit> franchiseeVisits = new ArrayList<>();
+                        .collect(Collectors.toList());
-				if (!franchiseeIds.isEmpty()) {
+                List<FranchiseeVisit> franchiseeVisits = new ArrayList<>();
-					franchiseeVisits = franchiseeVisitRepository.selectAllByIds(franchiseeIds);
+                if (!franchiseeIds.isEmpty()) {
-					LOGGER.info("franchiseeVisits {}", franchiseeVisits);
+                    franchiseeVisits = franchiseeVisitRepository.selectAllByIds(franchiseeIds);
+                    LOGGER.info("franchiseeVisits {}", franchiseeVisits);
-					for (FranchiseeVisit franchiseeVisit : franchiseeVisits) {
-						List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository
+                    for (FranchiseeVisit franchiseeVisit : franchiseeVisits) {
-								.selectByFranchiseeVisitId(franchiseeVisit.getId());
+                        List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository
-						LOGGER.info("franchiseeActivities {}", franchiseeActivities);
+                                .selectByFranchiseeVisitId(franchiseeVisit.getId());
+                        LOGGER.info("franchiseeActivities {}", franchiseeActivities);
-						franchiseeVisit.setScheduleTimestamp(franchiseeActivities.get(0).getSchelduleTimestamp());
-						franchiseeVisit.setFranchiseeActivity(franchiseeActivities.get(0));
+                        franchiseeVisit.setScheduleTimestamp(franchiseeActivities.get(0).getSchelduleTimestamp());
-					}
+                        franchiseeVisit.setFranchiseeActivity(franchiseeActivities.get(0));
+                    }
-				}
+                }
-				Map<LocalDate, List<VisitRequest>> dateWiseVisitRequest = allVisitRequests.stream()
-						.collect(Collectors.groupingBy(x -> x.getScheduleTimestamp().toLocalDate()));
+                Map<LocalDate, List<VisitRequest>> dateWiseVisitRequest = allVisitRequests.stream()
+                        .collect(Collectors.groupingBy(x -> x.getScheduleTimestamp().toLocalDate()));
-				for (Entry<LocalDate, List<VisitRequest>> visitEntry : dateWiseVisitRequest.entrySet()) {
+                for (Entry<LocalDate, List<VisitRequest>> visitEntry : dateWiseVisitRequest.entrySet()) {
-					LocalDate date = visitEntry.getKey();
-					List<VisitRequest> visitRequests = visitEntry.getValue();
+                    LocalDate date = visitEntry.getKey();
+                    List<VisitRequest> visitRequests = visitEntry.getValue();
-					VisitSummaryModel visitSummaryModel = new VisitSummaryModel();
+                    VisitSummaryModel visitSummaryModel = new VisitSummaryModel();
-					visitSummaryModel.setDate(date);
-					List<Integer> dateWiseLeadEntry = visitRequests.stream()
+                    visitSummaryModel.setDate(date);
-							.filter(x -> x.getVisitType().equals("lead")).map(x -> x.getVisitId())
+                    List<Integer> dateWiseLeadEntry = visitRequests.stream()
-							.collect(Collectors.toList());
+                            .filter(x -> x.getVisitType().equals("lead")).map(x -> x.getVisitId())
+                            .collect(Collectors.toList());
-					List<Integer> dateWiseFranchiseeIds = visitRequests.stream()
-							.filter(x -> x.getVisitType().equals("franchiseeVisit")).map(x -> x.getVisitId())
+                    List<Integer> dateWiseFranchiseeIds = visitRequests.stream()
-							.collect(Collectors.toList());
+                            .filter(x -> x.getVisitType().equals("franchiseeVisit")).map(x -> x.getVisitId())
+                            .collect(Collectors.toList());
-					Map<Integer, List<Lead>> filteredLeadsMap = null;
-					if (!leads.isEmpty()) {
+                    Map<Integer, List<Lead>> filteredLeadsMap = null;
-						filteredLeadsMap = leads.stream().filter(x -> dateWiseLeadEntry.contains(x.getId()))
+                    if (!leads.isEmpty()) {
-								.collect(Collectors.groupingBy(x -> x.getAssignTo()));
+                        filteredLeadsMap = leads.stream().filter(x -> dateWiseLeadEntry.contains(x.getId()))
+                                .collect(Collectors.groupingBy(x -> x.getAssignTo()));
-					}
+                    }
-					Map<Integer, List<FranchiseeVisit>> filteredFranchiseeVisitsMap = null;
+                    Map<Integer, List<FranchiseeVisit>> filteredFranchiseeVisitsMap = null;
-					if (!franchiseeVisits.isEmpty()) {
-						filteredFranchiseeVisitsMap = franchiseeVisits.stream()
+                    if (!franchiseeVisits.isEmpty()) {
-								.filter(x -> dateWiseFranchiseeIds.contains(x.getId()))
+                        filteredFranchiseeVisitsMap = franchiseeVisits.stream()
-								.collect(Collectors.groupingBy(x -> x.getAuthId()));
+                                .filter(x -> dateWiseFranchiseeIds.contains(x.getId()))
+                                .collect(Collectors.groupingBy(x -> x.getAuthId()));
-					}
+                    }
-					List<UserVisitModel> userVisits = new ArrayList<>();
+                    List<UserVisitModel> userVisits = new ArrayList<>();
-					for (AuthUser auth : authUsers) {
-						UserVisitModel userVisitModel = new UserVisitModel();
+                    for (AuthUser auth : authUsers) {
-						List<VisitDescriptionModel> visitDescriptions = new ArrayList<>();
+                        UserVisitModel userVisitModel = new UserVisitModel();
+                        List<VisitDescriptionModel> visitDescriptions = new ArrayList<>();
-						List<Lead> authLeads = new ArrayList<>();
-						if (filteredLeadsMap != null) {
+                        List<Lead> authLeads = new ArrayList<>();
-							authLeads = filteredLeadsMap.get(auth.getId());
+                        if (filteredLeadsMap != null) {
+                            authLeads = filteredLeadsMap.get(auth.getId());
-						}
+                        }
-						if (authLeads != null && !authLeads.isEmpty()) {
-							userVisitModel.setAuthUser(auth.getFullName());
+                        if (authLeads != null && !authLeads.isEmpty()) {
+                            userVisitModel.setAuthUser(auth.getFullName());
-							for (Lead lead : authLeads) {
+                            for (Lead lead : authLeads) {
-								VisitRequest visitRequest = visitRequests.stream().filter(
-										x -> x.getVisitId() == lead.getId() && x.getCreatedBy() == lead.getAssignTo())
+                                VisitRequest visitRequest = visitRequests.stream().filter(
-										.findAny().orElse(null);
+                                                x -> x.getVisitId() == lead.getId() && x.getCreatedBy() == lead.getAssignTo())
-								VisitDescriptionModel visitDescriptionModel = new VisitDescriptionModel();
+                                        .findAny().orElse(null);
-								visitDescriptionModel.setVisitId(visitRequest.getId());
+                                VisitDescriptionModel visitDescriptionModel = new VisitDescriptionModel();
-								visitDescriptionModel.setVisitName(lead.getFirstName());
+                                visitDescriptionModel.setVisitId(visitRequest.getId());
-								visitDescriptionModel.setCity(lead.getCity());
+                                visitDescriptionModel.setVisitName(lead.getFirstName());
-								visitDescriptionModel.setState(lead.getState());
+                                visitDescriptionModel.setCity(lead.getCity());
-								visitDescriptionModel.setScheduleTime(lead.getScheduledTimestamp());
+                                visitDescriptionModel.setState(lead.getState());
-								visitDescriptionModel.setStatus(visitRequest.getStatus());
+                                visitDescriptionModel.setScheduleTime(lead.getScheduledTimestamp());
-								visitDescriptionModel.setRemarks(lead.getLeadActivity().getRemark());
+                                visitDescriptionModel.setStatus(visitRequest.getStatus());
-								visitDescriptionModel.setVisitType(visitRequest.getVisitType());
+                                visitDescriptionModel.setRemarks(lead.getLeadActivity().getRemark());
-								visitDescriptions.add(visitDescriptionModel);
+                                visitDescriptionModel.setVisitType(visitRequest.getVisitType());
+                                visitDescriptions.add(visitDescriptionModel);
-							}
-						}
+                            }
+                        }
-						List<FranchiseeVisit> authfranchiseeVisit = new ArrayList<>();
-						if (filteredFranchiseeVisitsMap != null) {
+                        List<FranchiseeVisit> authfranchiseeVisit = new ArrayList<>();
-							authfranchiseeVisit = filteredFranchiseeVisitsMap.get(auth.getId());
+                        if (filteredFranchiseeVisitsMap != null) {
+                            authfranchiseeVisit = filteredFranchiseeVisitsMap.get(auth.getId());
-						}
+                        }
-						if (authfranchiseeVisit != null && !authfranchiseeVisit.isEmpty()) {
-							userVisitModel.setAuthUser(auth.getFullName());
+                        if (authfranchiseeVisit != null && !authfranchiseeVisit.isEmpty()) {
+                            userVisitModel.setAuthUser(auth.getFullName());
-							for (FranchiseeVisit franchiseeVisit : authfranchiseeVisit) {
+                            for (FranchiseeVisit franchiseeVisit : authfranchiseeVisit) {
-								VisitRequest visitRequest = visitRequests.stream()
-										.filter(x -> x.getVisitId() == franchiseeVisit.getId()
+                                VisitRequest visitRequest = visitRequests.stream()
-												&& x.getCreatedBy() == franchiseeVisit.getAuthId())
+                                        .filter(x -> x.getVisitId() == franchiseeVisit.getId()
-										.findAny().orElse(null);
+                                                && x.getCreatedBy() == franchiseeVisit.getAuthId())
+                                        .findAny().orElse(null);
-								CustomRetailer customRetailer = retailerService
-										.getFofoRetailer(franchiseeVisit.getFofoId());
+                                CustomRetailer customRetailer = retailerService
-								VisitDescriptionModel visitDescriptionModel = new VisitDescriptionModel();
+                                        .getFofoRetailer(franchiseeVisit.getFofoId());
-								visitDescriptionModel.setVisitId(visitRequest.getId());
+                                VisitDescriptionModel visitDescriptionModel = new VisitDescriptionModel();
-								visitDescriptionModel.setVisitName(franchiseeVisit.getPartnerName());
+                                visitDescriptionModel.setVisitId(visitRequest.getId());
-								visitDescriptionModel.setCity(customRetailer.getAddress().getCity());
+                                visitDescriptionModel.setVisitName(franchiseeVisit.getPartnerName());
-								visitDescriptionModel.setState(customRetailer.getAddress().getState());
+                                visitDescriptionModel.setCity(customRetailer.getAddress().getCity());
-								visitDescriptionModel.setScheduleTime(
+                                visitDescriptionModel.setState(customRetailer.getAddress().getState());
-										franchiseeVisit.getFranchiseeActivity().getSchelduleTimestamp());
+                                visitDescriptionModel.setScheduleTime(
-								visitDescriptionModel.setStatus(visitRequest.getStatus());
+                                        franchiseeVisit.getFranchiseeActivity().getSchelduleTimestamp());
-								visitDescriptionModel.setRemarks(franchiseeVisit.getAgenda());
+                                visitDescriptionModel.setStatus(visitRequest.getStatus());
-								visitDescriptionModel.setVisitType(visitRequest.getVisitType());
+                                visitDescriptionModel.setRemarks(franchiseeVisit.getAgenda());
+                                visitDescriptionModel.setVisitType(visitRequest.getVisitType());
-								visitDescriptions.add(visitDescriptionModel);
+                                visitDescriptions.add(visitDescriptionModel);
-							}
-						}
+                            }
+                        }
-						userVisitModel.setVisitDescriptions(visitDescriptions);
-						LOGGER.info("userVisit {}", userVisitModel);
+                        userVisitModel.setVisitDescriptions(visitDescriptions);
+                        LOGGER.info("userVisit {}", userVisitModel);
-						if (userVisitModel.getAuthUser() != null) {
-							userVisits.add(userVisitModel);
+                        if (userVisitModel.getAuthUser() != null) {
-						}
+                            userVisits.add(userVisitModel);
+                        }
-					}
+                    }
-					visitSummaryModel.setUserVisits(userVisits);
+                    visitSummaryModel.setUserVisits(userVisits);
-					visitSummary.add(visitSummaryModel);
+                    visitSummary.add(visitSummaryModel);
-				}
+                }
-			}
+            }
-		}
-		return responseSender.ok(visitSummary);
+        }
+        return responseSender.ok(visitSummary);
-	}
+    }
-	@RequestMapping(value = "/visitRequest", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> visitRequest(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId,
+    @RequestMapping(value = "/visitRequest", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-			@RequestParam(name = "visitId") int visitId, @RequestParam(name = "status") VisitStatus status, Model model)
+    public ResponseEntity<?> visitRequest(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId,
-			throws Exception {
+                                          @RequestParam(name = "visitId") int visitId, @RequestParam(name = "status") VisitStatus status, Model model)
-		AuthUser authUser = authRepository.selectByGmailId(gmailId);
+            throws Exception {
+        AuthUser authUser = authRepository.selectByGmailId(gmailId);
-		VisitRequest visitRequest = visitRequestRepository.selectById(visitId);
-		visitRequest.setActionedBy(authUser.getId());
+        VisitRequest visitRequest = visitRequestRepository.selectById(visitId);
-		visitRequest.setStatus(status);
+        visitRequest.setActionedBy(authUser.getId());
-		visitRequest.setUpdatedTimestamp(LocalDateTime.now());
+        visitRequest.setStatus(status);
-		if (status.equals(VisitStatus.approved)) {
+        visitRequest.setUpdatedTimestamp(LocalDateTime.now());
-			visitRequest.setApprovedTimestamp(LocalDateTime.now());
+        if (status.equals(VisitStatus.approved)) {
-		}
+            visitRequest.setApprovedTimestamp(LocalDateTime.now());
+        }
-		SendNotificationModel sendNotificationModel = new SendNotificationModel();
-		sendNotificationModel.setCampaignName("Visit Request");
+        SendNotificationModel sendNotificationModel = new SendNotificationModel();
-		sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(1));
+        sendNotificationModel.setCampaignName("Visit Request");
-		sendNotificationModel.setTitle("Visit Request");
+        sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(1));
-		String message = "Visit Request has been " + status + " for scheduled time on "
+        sendNotificationModel.setTitle("Visit Request");
-				+ visitRequest.getScheduleTimestamp().toLocalDate();
+        String message = "Visit Request has been " + status + " for scheduled time on "
+                + visitRequest.getScheduleTimestamp().toLocalDate();
-		sendNotificationModel.setMessage(message);
-		sendNotificationModel.setMessageType(MessageType.notification);
+        sendNotificationModel.setMessage(message);
-		User user = userRepository.selectByEmailId(gmailId);
+        sendNotificationModel.setMessageType(MessageType.notification);
-		sendNotificationModel.setUserIds(new ArrayList<>(user.getId()));
+        User user = userRepository.selectByEmailId(gmailId);
+        sendNotificationModel.setUserIds(new ArrayList<>(user.getId()));
-		notificationService.sendNotificationToAll(sendNotificationModel);
+        notificationService.sendNotificationToAll(sendNotificationModel);
-		return responseSender.ok(true);
+        return responseSender.ok(true);
-	}
+    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java – Rev 31249 → 31677