WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java

         if (sendNotificationModel.getUserIds() != null && sendNotificationModel.getUserIds().size() > 0) {
             userIds.addAll(sendNotificationModel.getUserIds());
+        }
         if (sendNotificationModel.getStateIds() != null && sendNotificationModel.getStateIds().size() > 0) {
-            userIds.addAll(fofoStoreRepository.selectByWarehouseIds(sendNotificationModel.getStateIds()).stream()
+            userIds.addAll(fofoStoreRepository.selectByWarehouseIds(sendNotificationModel.getStateIds()).stream().map(x -> x.getId()).collect(Collectors.toList()));
-                    .map(x -> x.getId()).collect(Collectors.toList()));
+        }
         LOGGER.info("userIds" + userIds);
         for (Integer userId : userIds) {
             uc.setUserId(userId);
             uc.setPushTimestamp(LocalDateTime.now());
             userCampaignRepository.persist(uc);
+        }
-        List<Device> devices = deviceRepository.selectByUserIdAndModifiedTimestamp(new ArrayList<>(userIds),
+        List<Device> devices = deviceRepository.selectByUserIdAndModifiedTimestamp(new ArrayList<>(userIds), LocalDateTime.now().minusMonths(3), LocalDateTime.now());
-                LocalDateTime.now().minusMonths(3), LocalDateTime.now());
         LOGGER.info("devices" + devices);
         pushNotification(nc.getId(), devices);
+    }
         authUsers.addAll(csService.getAuthUserByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY));
         authUsers.addAll(csService.getAuthUserByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_SALES));
         List<String> emailIds = authUsers.stream().map(x -> x.getEmailId()).collect(Collectors.toList());
         emailIds.add("devkinandan.lal@smartdukaan.com");
         List<User> systemUsers = dtrUserRepository.selectAllByEmailIds(emailIds);
-        sendNotificationModel.getUserIds()
-                .addAll(systemUsers.stream().map(x -> x.getId()).collect(Collectors.toList()));
+        sendNotificationModel.getUserIds().addAll(systemUsers.stream().map(x -> x.getId()).collect(Collectors.toList()));
         this.sendNotification(sendNotificationModel);
+    }
     @Override
-    public void sendNotification(int fofoId, String campaignName, MessageType messageType, String title, String message)
+    public void sendNotification(int fofoId, String campaignName, MessageType messageType, String title, String message) throws ProfitMandiBusinessException {
-            throws ProfitMandiBusinessException {
         SendNotificationModel sendNotificationModel = this.getDefaultNotificationModel();
         sendNotificationModel.setCampaignName(campaignName);
         sendNotificationModel.setMessageType(messageType);
         sendNotificationModel.setTitle(title);
         sendNotificationModel.setMessage(message);
+        }
+    }
     @Override
-    public void sendNotification(int fofoId, String campaignName, MessageType messageType, String title, String message,
+    public void sendNotification(int fofoId, String campaignName, MessageType messageType, String title, String message, String url) throws ProfitMandiBusinessException {
-                                 String url) throws ProfitMandiBusinessException {
         SendNotificationModel sendNotificationModel = this.getDefaultNotificationModel();
         sendNotificationModel.setCampaignName(campaignName);
         sendNotificationModel.setMessageType(messageType);
         sendNotificationModel.setTitle(title);
         sendNotificationModel.setMessage(message);
         sendNotificationModel.setUrl(url);
         this.sendNotification(sendNotificationModel);
+    }
     @Override
-    public void sendWhatsappMessage(String message, String title, String mobile)
+    public void sendWhatsappMessage(String message, String title, String mobile) throws Exception {
-            throws Exception {
         this.sendWhatsappMessage(message, title, mobile, null, null);
+    }
     @Override
-    public void sendWhatsappMediaMessage(String message, String mobile, String mediaUrl, String fileName)
+    public void sendWhatsappMediaMessage(String message, String mobile, String mediaUrl, String fileName) throws Exception {
-            throws Exception {
         this.sendWhatsappMessage(message, null, mobile, mediaUrl, fileName);
+    }
     @Override
     public void optIn(String phoneNumber) throws Exception {
         requestParams.put("channel", "WHATSAPP");
         String response = restClient.get("https://media.smsgupshup.com/GatewayAPI/rest", requestParams, requestheaders);
         LOGGER.info("response" + response);
+    }
-    private void sendWhatsappMessage(String message, String title, String mobile, String mediaUrl, String fileName)
+    private void sendWhatsappMessage(String message, String title, String mobile, String mediaUrl, String fileName) throws Exception {
-            throws Exception {
         String sendTo = null;
         if (mobile.length() != 10) {
             return;
         } else {
             sendTo = 91 + mobile;
         requestParams.put("send_to", sendTo);
         requestParams.put("v", "1.1");
         requestParams.put("format", "json");
         requestParams.put("auth_scheme", "plain");
         if (mediaUrl == null) {
-        requestParams.put("method", "SENDMESSAGE");
+            requestParams.put("method", "SENDMESSAGE");
             /*requestParams.put("msg_type", "HSM");
             requestParams.put("msg", message);
             requestParams.put("isTemplate", "true");
             requestParams.put("header", title);*/
             //} else if(isProd && mediaUrl !=null) {
             requestParams.put("msg_type", "DOCUMENT");
             requestParams.put("caption", message);
             //requestParams.put("msg", message);
             requestParams.put("media_url", mediaUrl);
             requestParams.put("filename", fileName);
-            String response =
-                    restClient.post("https://media.smsgupshup.com/GatewayAPI/rest",
+            String response = restClient.post("https://media.smsgupshup.com/GatewayAPI/rest", requestParams, requestheaders);
-                            requestParams,
-                            requestheaders);
             LOGGER.info("response" + response);
-            JSONObject jsonObject = new JSONObject(response);
+            JSONObject jsonObject = new JSONObject(response);
             LOGGER.info("jsonObject" + jsonObject);
+            JSONObject jo = (JSONObject) jsonObject.get("response");
+            LOGGER.info("jo" + jo);
+            String externalId = jo.getString("id");
+            LOGGER.info("externalId" + externalId);
+        }
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java – Rev 32401 → 32403