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

 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.CustomRetailer;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.SendNotificationModel;
 import com.spice.profitmandi.common.util.FileUtil;
-import com.spice.profitmandi.common.util.FormattingUtils;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.auth.PartnerCollectionPlan;
 import com.spice.profitmandi.dao.entity.auth.PartnerCollectionRemark;
 import com.spice.profitmandi.dao.entity.auth.PartnerSecondaryPlan;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
 import com.spice.profitmandi.dao.repository.user.AddressRepository;
 import com.spice.profitmandi.service.AuthService;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.PartnerCollectionService;
-import com.spice.profitmandi.service.inventory.InventoryService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.service.user.StoreTimelineTatService;
 import com.spice.profitmandi.web.req.CreateFranchiseeRequest;
 import com.spice.profitmandi.web.req.RbmSalesRatingRequest;
 import com.spice.profitmandi.web.res.Partner;
     @RequestMapping(value = "/lead", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     public ResponseEntity<?> LeadUser(@RequestBody CreateRefferalRequest createRefferalRequest) throws Exception {
-        LOGGER.info("CreateRefferalRequest - " + createRefferalRequest);
+        LOGGER.info("CreateReferralRequest - " + createRefferalRequest);
         if (createRefferalRequest.getOutletName() == null || createRefferalRequest.getPotential() == 0) {
-            throw new Exception("Outlet should not be empty and potential shoul be greator > 0");
+            throw new Exception("Outlet should not be empty and potential should be greater > 0");
+        }
-        List<Lead> leadDetail = leadRepository.selectByMobileNumber(createRefferalRequest.getMobile());
+        /*Lead leadDetail = leadRepository.selectByMobileNumber(createRefferalRequest.getMobile());
         LOGGER.info("Lead Details {}", leadDetail);
-        if (!leadDetail.isEmpty() && leadDetail.get(0).getStatus() != LeadStatus.notInterested) {
+        if (leadDetail != null && leadDetail.getStatus() != LeadStatus.notInterested) {
-            AuthUser authUser1 = authRepository.selectById(leadDetail.get(0).getAssignTo());
+            AuthUser authUser1 = authRepository.selectById(leadDetail.getAssignTo());
-            return responseSender.ok(" Duplicate Entry: Lead already exists, created by " + leadDetail.get(0).getCreatedBy() + " on " + FormattingUtils.format(leadDetail.get(0).getCreatedTimestamp()) + "assigned to " + authUser1.getFullName());
+            return responseSender.ok("Duplicate Entry: Lead already exists, created by " + leadDetail.getCreatedBy() + " on " + FormattingUtils.format(leadDetail.getCreatedTimestamp()) + " assigned to " + authUser1.getFullName());
+        }*/
-        }
-        Lead lead = new Lead();
+        Lead lead = (createRefferalRequest.getId() > 0) ? leadRepository.selectById(createRefferalRequest.getId()) : new Lead();
         lead.setFirstName(createRefferalRequest.getFirstName());
         lead.setLastName(createRefferalRequest.getLastName());
         lead.setLeadMobile(createRefferalRequest.getMobile());
         lead.setState(createRefferalRequest.getState());
         lead.setCity(createRefferalRequest.getCity());
         } else {
             lead.setColor("Yellow");
+        }
         AuthUser authUser = authRepository.selectByGmailId(createRefferalRequest.getReffereeEmail());
         String authUserName = authUser.getFullName();
-        lead.setCreatedBy(authUserName);
         lead.setAuthId(authUser.getId());
         lead.setAssignTo(authUser.getId());
+        if(createRefferalRequest.getId() == 0) {
+            lead.setCreatedBy(authUserName);
-        leadRepository.persist(lead);
+            leadRepository.persist(lead);
+        }
 //        int counter = 0;
 //
 //        List<Integer> photos = Arrays.asList(
+                }
+            }
             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
              * && o2.getScheduledTimestamp() != null) { return
              * o1.getScheduledTimestamp().isBefore(o2.getScheduledTimestamp()) ? -1 : 1; }
              * else if (o1.getScheduledTimestamp() != null) { return 1; } else { return -1;
              * } });
         return responseSender.ok(leads);
+    }
     @RequestMapping(value = "/getlead", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> 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);
         Lead lead = leadRepository.selectById(id);
         lead.setLeadActivities(leadActivities);
         return responseSender.ok(lead);
+    }
+    @RequestMapping(value = "/check-existing-lead", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ApiImplicitParams({ @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
+    public ResponseEntity<?> getLeadByMobile(HttpServletRequest request, @RequestParam(name = "mobile") String mobile) throws ProfitMandiBusinessException {
+        int userId = (int) request.getAttribute("userId");
+        LOGGER.info("userId: " + userId);
+        Lead lead = leadRepository.selectByMobileNumber(mobile);
+        return responseSender.ok(lead);
+    }
     @RequestMapping(value = "/leadUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> 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);
         LeadActivity leadActivity = new LeadActivity();
         lead.setStatus(status);
         lead.setNotinterestedReason(reason);
         leadActivity.setRemark(remark);
         leadActivity.setLeadId(id);
                 leadActivity.setCommunicationType(communicationType);
                 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.setClosureTimestamp(closureTimestamp);
         return responseSender.ok(true);
+    }
     @RequestMapping(value = ProfitMandiConstants.URL_NEW_LEAD, method = RequestMethod.POST)
-    public ResponseEntity<?> newLead(HttpServletRequest request,
-                                     @RequestBody CreateRefferalRequest createRefferalRequest) throws ProfitMandiBusinessException {
+    public ResponseEntity<?> newLead(HttpServletRequest request, @RequestBody CreateRefferalRequest createRefferalRequest) throws ProfitMandiBusinessException {
         LOGGER.info("requested url : " + request.getRequestURL().toString());
         Lead lead = new Lead();
         lead.setAddress(createRefferalRequest.getCity());
         Long.parseLong(createRefferalRequest.getMobile());
         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.setCity(createRefferalRequest.getCity());
         lead.setState(createRefferalRequest.getState());
         lead.setLastName(createRefferalRequest.getLastName());
         return responseSender.ok(true);
+    }
     @RequestMapping(value = "/getPartnersList", method = RequestMethod.GET)
-    @ApiImplicitParams({
-            @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<?> getPartners(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId)
             throws ProfitMandiBusinessException {
         AuthUser authUser = authRepository.selectByGmailId(gmailId);
         LOGGER.info("partners" + partners);
         return responseSender.ok(partners);
+    }
     @RequestMapping(value = "/franchise-first-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> FranchiseFirstVisit(HttpServletRequest request,
-                                                 @RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
+    public ResponseEntity<?> FranchiseFirstVisit(HttpServletRequest request, @RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
         FranchiseeVisit franchiseeVisit = new FranchiseeVisit();
         franchiseeVisit.setFofoId(createFranchiseeRequest.getFofoId());
         CustomRetailer customRetailer = retailerService.getFofoRetailer(createFranchiseeRequest.getFofoId());
         franchiseeActivity.setCreatedTimestamp(LocalDateTime.now());
         franchiseeActivityRepository.persist(franchiseeActivity);
         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);
+    }
     @RequestMapping(value = "/franchise-visit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> FranchiseVisit(HttpServletRequest request,
                                             @RequestBody CreateFranchiseeRequest createFranchiseeRequest) throws Exception {
         int rbmL1 = csService.getAuthUserId(ProfitMandiConstants.TICKET_CATEGORY_RBM, EscalationType.L1, createFranchiseeRequest.getFofoId());
         if (!createFranchiseeRequest.getHygieneReason().isEmpty()) {
             csService.createTicket(createFranchiseeRequest.getFofoId(), ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_SALES_LOW_DATA_ACCURACY, createFranchiseeRequest.getHygieneReason(), authUser.getId());
+        }
         return responseSender.ok(true);
+    }
     @RequestMapping(value = "/getFranchiseVisit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> getFranchiseVisit(HttpServletRequest request,
                                                @RequestParam(name = "gmailId") String gmailId, @RequestParam(name = "status") FranchiseeVisitStatus status,
                                                @RequestParam(name = "offset", defaultValue = "0") int offset,
                                                @RequestParam(name = "limit", defaultValue = "10") int limit) throws ProfitMandiBusinessException {
         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;
         if (!visitRequests.isEmpty()) {
             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) {
             if (visitRequestMap != null) {
                 List<VisitRequest> visitRequest = visitRequestMap.get(fv.getId());
                 if (visitRequest != null) {
                     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();
                         fv.setVisitStatus(youngestVisit.getStatus());
                     } else {
         return responseSender.ok(franchiseeVisits);
+    }
     @RequestMapping(value = "/getFranchiseActivity", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> 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);
         return responseSender.ok(franchiseeActivities);
+    }
     @RequestMapping(value = "/getFranchiseeInfo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> 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);
         List<DBObject> mobileBrands = mongoClient.getAllBrandsToDisplay(3);
         List<String> brands = mobileBrands.stream().filter(x -> (boolean) x.get("active"))
         return responseSender.ok(franchiseeVisit);
+    }
     @RequestMapping(value = "/franchise-visit-update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> 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 = "resolution") String resolution, @RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp)
-                                                  @RequestParam(name = "action") FranchiseeActivityStatus action,
-                                                  @RequestParam(name = "resolution") String resolution,
-                                                  @RequestParam(name = "schelduleTimestamp") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime schelduleTimestamp)
             throws ProfitMandiBusinessException {
         FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(id);
         FranchiseeActivity franchiseeActivity = new FranchiseeActivity();
         return responseSender.ok(true);
+    }
     @RequestMapping(value = "/onBoardingTimelineStatus", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> onBoardingTimelineStatus(HttpServletRequest request, Model model)
             throws ProfitMandiBusinessException {
         //This userId is of dtr.users
         int userId = (int) request.getAttribute("userId");
             return responseSender.ok(true);
+        }
         return responseSender.ok(false);
+    }
     @RequestMapping(value = "/onBoardingTimelineVisibility", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> onBoardingTimelineVisibility(HttpServletRequest request, Model model)
             throws ProfitMandiBusinessException {
         int userId = (int) request.getAttribute("userId");
         UserCart uc = userAccountRepository.getUserCart(userId);
         return responseSender.ok(status);
+    }
     @RequestMapping(value = "/getPartnerTarget", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> getPartnerTarget(HttpServletRequest request,
-                                              @RequestParam String gmailId, @RequestParam String dayValue, @RequestParam ActivationType activationType)
+    public ResponseEntity<?> getPartnerTarget(HttpServletRequest request, @RequestParam String gmailId, @RequestParam String dayValue, @RequestParam ActivationType activationType) throws ProfitMandiBusinessException {
-            throws ProfitMandiBusinessException {
         AuthUser authUser = authRepository.selectByGmailId(gmailId);
         Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
         Set<Integer> fofoIds = storeGuyMap.get(authUser.getEmailId());
         List<String> brands = Arrays.asList("Vivo", "Samsung", "Oppo", "Itel", "Almost New", "Others");
+            }
             if (fofoIdList.size() > 0) {
-                List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository
+                List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository.selectAll(fofoIdList, startDate.toLocalDate().minusDays(1));
-                        .selectAll(fofoIdList, startDate.toLocalDate().minusDays(1));
                 if (!partnerDailyInvestments.isEmpty()) {
-                    partnerDailyInvestmentMap = partnerDailyInvestments.stream()
+                    partnerDailyInvestmentMap = partnerDailyInvestments.stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-                            .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+                }
                 Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
                 Map<Integer, CustomRetailer> customRetailers = fofoIdList.stream().map(x -> customRetailerMap.get(x))
                             .filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
                             .collect(Collectors.counting());
+                }
-                Map<Integer, PartnerCollectionPlanModel> collectionMap = partnerCollectionService
+                Map<Integer, PartnerCollectionPlanModel> collectionMap = partnerCollectionService.getCollectionMap(fofoIdList, startDate);
-                        .getCollectionMap(fofoIdList, startDate);
                 Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondaryPlans = orderRepository
                         .selectPartnerSecondaryGroupByBrand(fofoIdList, startDate.toLocalDate()).stream()
                         .collect(Collectors.groupingBy(x -> x.getFofoId()));
                             } else {
                                 targetCollection = collectionPlan.getTargetPlan();
+                            }
                             if (authId != null && authId == authUser.getId()) {
                                 if (!collectionPlan.getCommittedDate().isAfter(startDate)) {
                                     totalPartnerTargetCollection += targetCollection;
+                                }
+                            }
                             ptam.setCollectionTarget(targetCollection);
                             if (collectionPlan.getRank() == 2 && collectionPlan.getAchievementPlan() != null
                                     && collectionPlan.getWalletTimestamp() != null
                                     && collectionPlan.getWalletTimestamp().toLocalDate().equals(startDate.toLocalDate())) {
                                 if (authId != null && authId == authUser.getId()) {
                                     totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
+                                }
                                 ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
                             } else if (collectionPlan.getCommittedDate().toLocalDate().isEqual(startDate.toLocalDate())
                                     && collectionPlan.getAchievementPlan() != null) {
                                 if (authId != null && authId == authUser.getId()) {
                                     totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
+                                }
                                 ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
+                            }
                         if (secondaryModelMap.containsKey("Others")) {
                             PartnerSecondaryPlanModel psp = secondaryModelMap.get("Others");
                             psp.setAchievementPlan(otherBrandSecondary);
                         } else {
-                            secondaryModelMap.put("Others", new PartnerSecondaryPlanModel(fofoId, "Others", (long) 0,
+                            secondaryModelMap.put("Others", new PartnerSecondaryPlanModel(fofoId, "Others", (long) 0, otherBrandSecondary, authUser.getId(), null));
-                                    otherBrandSecondary, authUser.getId(), null));
+                        }
                         for (String brand : brands) {
                             if (!secondaryModelMap.containsKey(brand)) {
-                                secondaryModelMap.put(brand, new PartnerSecondaryPlanModel(fofoId, brand, (long) 0,
+                                secondaryModelMap.put(brand, new PartnerSecondaryPlanModel(fofoId, brand, (long) 0, (long) 0, authUser.getId(), null));
-                                        (long) 0, authUser.getId(), null));
+                            }
+                        }
                         for (Entry<String, PartnerSecondaryPlanModel> secondaryModelEntry : secondaryModelMap.entrySet()) {
                             Integer authId = secondaryModelEntry.getValue().getAuthId();
+                }
                 List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId()).stream().collect(Collectors.toList());
                 LOGGER.info("positions {}", positions);
-                boolean isRBMAndL1 = positions.stream()
-                        .anyMatch(position ->
-                                ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId()
+                boolean isRBMAndL1 = positions.stream().anyMatch(position -> ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId() && EscalationType.L1.equals(position.getEscalationType()));
-                                        && EscalationType.L1.equals(position.getEscalationType()));
-                boolean isRBMAndNotL1 = positions.stream()
-                        .anyMatch(position ->
-                                ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId()
+                boolean isRBMAndNotL1 = positions.stream().anyMatch(position -> ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId() && !EscalationType.L1.equals(position.getEscalationType()));
-                                        && !EscalationType.L1.equals(position.getEscalationType()));
                 LOGGER.info("isRBMAndL1{}", isRBMAndL1);
-                boolean isSales = positions.stream()
-                        .anyMatch(position ->
-                                ProfitMandiConstants.TICKET_CATEGORY_SALES == position.getCategoryId());
+                boolean isSales = positions.stream().anyMatch(position -> ProfitMandiConstants.TICKET_CATEGORY_SALES == position.getCategoryId());
                 tm.setTotalPartnerTargetCollection(totalPartnerTargetCollection);
                 tm.setTotalPartnerTargetSecondary(totalPartnerTargetSecondary);
                 tm.setTotalPartnerSecondary(totalPartnerAchievementSecondary);
                 tm.setTotalPartnerCollection(totalPartnerAchievementCollection);
+    }
     //TODO:Amit
     @RequestMapping(value = "/target", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiImplicitParams({
-            @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<?> createPartnerTarget(HttpServletRequest request,
                                                  @RequestBody PartnerTargetAchievementModel ptam) throws ProfitMandiBusinessException {
         LOGGER.info("ptam" + ptam);
         return responseSender.ok(true);
+    }
     @RequestMapping(value = "/uploadFranchiseeVisit", method = RequestMethod.POST)
-    public ResponseEntity<?> readCsvFileAndSetLead(HttpServletRequest request, @RequestPart MultipartFile multipartFile)
+    public ResponseEntity<?> readCsvFileAndSetLead(HttpServletRequest request, @RequestPart MultipartFile multipartFile) throws Throwable {
-            throws Throwable {
         int id = (int) request.getAttribute("userId");
         LOGGER.info("id" + id);

Subversion Repositories SmartDukaan

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