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

 import javax.servlet.http.HttpServletRequest;
 import com.spice.profitmandi.common.enumuration.ActivationType;
 import com.spice.profitmandi.common.web.client.RestClient;
+import com.spice.profitmandi.dao.entity.fofo.RetailerContact;
 import com.spice.profitmandi.service.FofoUser;
+import com.spice.profitmandi.service.smartping.SmartPingAgentModel;
+import com.spice.profitmandi.service.smartping.SmartPingService;
 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;
         LOGGER.info("partnerTicketCount {}", partnerTicketCount);
         List<PartnerTargetAchievementModel> ptams = new ArrayList<>();
         if (fofoIds != null && fofoIds.size() > 0) {
-            LOGGER.info("fofoIds {}", fofoIds );
+            LOGGER.info("fofoIds {}", fofoIds);
             List<Integer> fofoIdList = fofoStoreRepository.selectByRetailerIds(new ArrayList<>(fofoIds)).stream()
                     .filter(x -> (!x.isInternal() && (activationType == null || x.getActivationType().equals(activationType))))
                     .map(x -> x.getId()).collect(Collectors.toList());
-            LOGGER.info("fofoIdList {}", fofoIdList );
+            LOGGER.info("fofoIdList {}", fofoIdList);
             LocalDateTime startDate = LocalDate.now().atStartOfDay();
             if (dayValue.equals("previous")) {
                 startDate = LocalDate.now().minusDays(1).atStartOfDay();
+        }
         return responseSender.ok(tm);
+    }
-//TODO:Amit
+    //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")})
     public ResponseEntity<?> createPartnerTarget(HttpServletRequest request,
                                                  @RequestBody PartnerTargetAchievementModel ptam) throws ProfitMandiBusinessException {
+    }
     @Autowired
     RestClient restClient;
+    @Autowired
+    SmartPingService smartPingService;
+    @RequestMapping(value = "/retailer/contacts/{fofoId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<?> getContacts(HttpServletRequest request, @PathVariable int fofoId) throws Exception {
+        return responseSender.ok(retailerService.getContactsByFofoId(fofoId, true));
+    }
-    @RequestMapping(value = "/click2call/{fofoId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/click2call/{toMobile}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<?> createPartnerCollectionRemark(HttpServletRequest request, @PathVariable int fofoId) throws Exception {
+    public ResponseEntity<?> makeCallOnAgentBehalf(HttpServletRequest request, @PathVariable String toMobile) throws Exception {
         int id = (int) request.getAttribute("userId");
         User user = userRepository.selectById(id);
         AuthUser authUser = authRepository.selectByEmailOrMobile(user.getEmailId());
         String fromMobile = authUser.getMobileNumber();
-        com.spice.profitmandi.dao.entity.user.User fofoUser = userUserRepository.selectById(fofoId);
-        String toMobile = retailerService.getAllFofoRetailers().get(fofoId).getMobileNumber();
+        SmartPingAgentModel smartPingAgentModel = smartPingService.getAllAgents().get(toMobile);
-        //https://ccs1.smartpingcc.io/v2/clickToCall/para?&user_id=71287091&token=InCfClzwFUtLUW610faI&from=18086&fromType=Agent&fromCLI=%2B918645310932&to=XXXXXXXXXX&toCLI=%2B918645310932
+        String urlTemplate = "https://ccs1.smartpingcc.io/v2/clickToCall/para?&user_id=71287091&token=InCfClzwFUtLUW610faI&from=%d&fromType=Agent&fromCLI=&to=%s&toCLI=%s";
+        String url  = String.format(urlTemplate, smartPingAgentModel.getAgentId(), smartPingAgentModel.getAllowDid().get(0), toMobile, smartPingAgentModel.getAllowDid().get(0));
-        String url = String.format("https://ccs1.smartpingcc.io/v2/clickToCall/para?&user_id=71287091&token=InCfClzwFUtLUW610faI&from=%s&to=%s", fromMobile, toMobile);
         restClient.get(url, null, null);
         return responseSender.ok(true);
+    }
     @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<?> createPartnerCollectionRemark(HttpServletRequest request,
-                                                          @RequestBody PartnerCollectionRemarkModel partnerCollectionRemarkModel)
+                                                           @RequestBody PartnerCollectionRemarkModel partnerCollectionRemarkModel)
             throws ProfitMandiBusinessException {
         AuthUser authUser = authRepository.selectByGmailId(partnerCollectionRemarkModel.getGmailId());
         PartnerCollectionRemark pcr = new PartnerCollectionRemark();
         pcr.setFofoId(partnerCollectionRemarkModel.getFofoId());

Subversion Repositories SmartDukaan

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