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

 import com.google.gson.Gson;
 import com.spice.profitmandi.common.enumuration.MessageType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.SendNotificationModel;
-import com.spice.profitmandi.common.web.client.RestClient;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.dtr.*;
 import com.spice.profitmandi.dao.entity.fofo.Customer;
 import com.spice.profitmandi.dao.entity.user.Device;
 import com.spice.profitmandi.dao.entity.whatsapp.WhatsappMessage;
 import com.spice.profitmandi.dao.repository.cs.PartnerRegionRepository;
 import com.spice.profitmandi.dao.repository.dtr.*;
 import com.spice.profitmandi.dao.repository.fofo.CustomerRepository;
 import com.spice.profitmandi.dao.repository.whatsapp.WhatsappMessageRepository;
 import com.spice.profitmandi.service.user.RetailerService;
-import com.spice.profitmandi.service.whatsapp.CpassWhatsappService;
+import com.spice.profitmandi.service.whatsapp.WhatsappFlow;
 import com.spice.profitmandi.service.whatsapp.WhatsappMessageService;
 import com.spice.profitmandi.service.whatsapp.WhatsappMessageType;
+import com.spice.profitmandi.service.whatsapp.WhatsappNumbers;
+import com.spice.profitmandi.service.whatsapp.WhatsappProviderResolver;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import java.nio.charset.StandardCharsets;
     @Autowired
     FofoStoreRepository fofoStoreRepository;
     @Autowired
     CsService csService;
     @Autowired
-    OptinRepository optinRepository;
-    @Autowired
     RetailerService retailerService;
     @Autowired
     CustomerRepository customerRepository;
     @Autowired
     PushNotificationRepository pushNotificationRepository;
     @Autowired
     private Gson gson;
-    @Autowired
-    private RestClient restClient;
     @Value("${prod}")
     private boolean isProd;
     @Autowired
     private WhatsappMessageRepository whatsappMessageRepository;
     @Autowired
     private WhatsappMessageService whatsappMessageService;
     @Autowired
-    private CpassWhatsappService cpassWhatsappService;
+    private WhatsappProviderResolver whatsappProviders;
-    @Value("${whatsapp.provider:gupshup}")
-    private String whatsappProvider;
-    private boolean isCpass() {
-        return "cpass".equalsIgnoreCase(whatsappProvider);
-    }
     @Override
     public void sendNotification(SendNotificationModel sendNotificationModel) throws ProfitMandiBusinessException {
         SimpleCampaignParams scp = new SimpleCampaignParams();
     @Override
     public boolean sendWhatsappMessage(String message, String title, String mobile) throws Exception {
         boolean isSend=false;
         LOGGER.info("Is Prod - {}", isProd);
         if (isProd) {
-            isSend=this.sendWhatsappMessage(WhatsappMessageType.TEXT, message, title, mobile, null, null);
+            isSend=this.sendWhatsappMessage(WhatsappFlow.GENERIC, WhatsappMessageType.TEXT, message, title, mobile, null, null);
+        }
         return isSend;
+    }
     @Override
                     "Accidental Damage Protection\n" +
                     "अपने फोन को महंगे रिपेयर खर्च से बचाएं।\n" +
                     "अभी जानकारी लें और अपने फोन को सुरक्षित बनाएं!";
             String title = "SmartDukaan से खरीदारी करने के लिए धन्यवाद!";
-            this.sendWhatsappMessage(WhatsappMessageType.TEXT, message, title, mobile, null, null);
+            this.sendWhatsappMessage(WhatsappFlow.ADLD, WhatsappMessageType.TEXT, message, title, mobile, null, null);
+        }
+    }
     @Override
     public boolean sendWhatsappInvoice(int customerId, int fofoId, String invoiceNumber, String whatsAppNo) throws Exception {
         String mediaUrl = "https://partners.smartdukaan.com/wa-invoice-send/"
                 + Base64.getMimeEncoder().encodeToString(invoiceNumber.getBytes(StandardCharsets.UTF_8)) + ".pdf";
         String fileName = "INV-" + invoiceNumber.replace("/", "-") + ".pdf";
         LOGGER.info("sendWhatsappInvoice: mobile={} mediaUrl={}", mobileNumber, mediaUrl);
+        // Goes straight to the provider rather than through sendWhatsappMediaMessage so the INVOICE flow
+        // is named: a template-first provider needs it to pick the approved invoice template.
-        return sendWhatsappMediaMessage(message, mobileNumber, mediaUrl, fileName, WhatsappMessageType.DOCUMENT);
+        return this.sendWhatsappMessage(WhatsappFlow.INVOICE, WhatsappMessageType.DOCUMENT, message, null,
+                mobileNumber, mediaUrl, fileName);
+    }
     @Override
     public boolean sendWhatsappMediaMessage(String message, String mobile, String mediaUrl, String fileName, WhatsappMessageType whatsappMessageType) throws Exception {
         boolean isSend=false;
 //        if (isProd) {
 //            isSend=this.sendWhatsappMessage(whatsappMessageType, message, null, mobile, mediaUrl, fileName);
 //        }
-        isSend = this.sendWhatsappMessage(whatsappMessageType, message, null, mobile, mediaUrl, fileName);
+        isSend = this.sendWhatsappMessage(WhatsappFlow.GENERIC, whatsappMessageType, message, null, mobile, mediaUrl, fileName);
         return isSend;
+    }
+    /**
+     * Kept on this interface because cron calls it directly; it delegates to the active provider and is
+     * a no-op for providers with no opt-in concept.
+     */
     @Override
     public void optIn(String phoneNumber) throws Exception {
-        Map<String, String> requestheaders = new HashMap<>();
-        requestheaders.put("Content-Type", "application/x-www-form-urlencoded");
-        Map<String, String> requestParams = new HashMap<>();
-        requestParams.put("userid", String.valueOf(2000215976));
-        requestParams.put("password", "MFRd!BBL");
-        requestParams.put("phone_number", phoneNumber);
+        whatsappProviders.active().optIn(phoneNumber);
-        requestParams.put("auth_scheme", "plain");
-        requestParams.put("v", "1.1");
-        requestParams.put("format", "json");
-        requestParams.put("method", "OPT_IN");
-        requestParams.put("channel", "WHATSAPP");
-        String response = restClient.get("https://media.smsgupshup.com/GatewayAPI/rest", requestParams, requestheaders);
-        LOGGER.info("response" + response);
+    }
-    private boolean sendWhatsappMessage(WhatsappMessageType whatsappMessageType, String message, String title, String mobile, String mediaUrl, String fileName)
+    private boolean sendWhatsappMessage(WhatsappFlow flow, WhatsappMessageType whatsappMessageType, String message,
+                                        String title, String mobile, String mediaUrl, String fileName)
             throws Exception {
-        if (isCpass()) {
+        return whatsappProviders.active()
-            return cpassWhatsappService.sendBasic(whatsappMessageType, message, title, mobile, mediaUrl, fileName);
+                .sendBasic(flow, whatsappMessageType, message, title, mobile, mediaUrl, fileName);
-        }
-        String sendTo = null;
-        boolean isSend=false;
-        if (mobile.length() != 10) {
-            return isSend;
-        } else {
-            sendTo = 91 + mobile;
-        }
-        Map<String, String> requestheaders = new HashMap<>();
-        requestheaders.put("Content-Type", "application/x-www-form-urlencoded");
-        Map<String, String> requestParams = new HashMap<>();
-        requestParams.put("userid", String.valueOf(2000215976));
-        requestParams.put("password", "MFRd!BBL");
-        requestParams.put("send_to", sendTo);
-        requestParams.put("v", "1.1");
-        requestParams.put("format", "json");
-        requestParams.put("auth_scheme", "plain");
-        Optin optin = optinRepository.selectByMobile(mobile);
-        if (optin == null) {
-            this.optIn(sendTo);
-            optin = new Optin();
-            optin.setCreated(LocalDateTime.now());
-            optin.setMobile(mobile);
-            optinRepository.persist(optin);
-        }
-        if (mediaUrl == null) {
-            requestParams.put("method", "SENDMESSAGE");
-            requestParams.put("msg_type", whatsappMessageType.name());
-            requestParams.put("msg", message);
-            requestParams.put("isTemplate", "true");
-            requestParams.put("header", title);
-        } else if (mediaUrl != null) {
-            requestParams.put("method", "SENDMEDIAMESSAGE");
-            requestParams.put("msg_type", whatsappMessageType.name());
-            requestParams.put("caption", message);
-            requestParams.put("media_url", mediaUrl);
-            requestParams.put("filename", fileName);
-        }
-        String response = restClient.post("https://media.smsgupshup.com/GatewayAPI/rest", requestParams, requestheaders);
-        LOGGER.info("response  - {}", response);
-        JSONObject jsonObject = new JSONObject(response);
-        JSONObject whatsappResponse = (JSONObject) jsonObject.get("response");
-        if (whatsappResponse.getString("status").equals("error")) {
-            LOGGER.error("Invalid Whatsapp message, Reason - {}", whatsappResponse.getString("details"));
-            return isSend;
-        }else{
-            isSend=true;
-        }
-        String externalId = whatsappResponse.getString("id");
-        String phone = whatsappResponse.getString("phone");
-        WhatsappMessage whatsappMessage = new WhatsappMessage();
-        whatsappMessage.setCreatedTimestamp(LocalDateTime.now());
-        whatsappMessage.setExternalId(externalId);
-        whatsappMessage.setDestAddr(phone);
-        whatsappMessageRepository.persist(whatsappMessage);
-        return isSend;
+    }
     @Override
     public boolean shouldSendWhatsappMessage(String mobile) {
+        // Normalised rather than concatenated: cpass and BotPenguin store the normalised MSISDN, so for
+        // anything that is not already a bare ten digits the old "91" + mobile key could never match a
+        // stored row and the throttle quietly never fired. Identical result for clean input.
-        String destAddr = "91" + mobile;
+        String destAddr = WhatsappNumbers.toMsisdn(mobile);
+        if (destAddr == null) {
+            return true;
+        }
         boolean shouldSend = true;
         List<WhatsappMessage> whatsappMessages = whatsappMessageRepository.selectByDestAddr(destAddr, LocalDate.now());
         if (!whatsappMessages.isEmpty()) {
             long failedCount = whatsappMessages.stream().filter(x -> x.getFailed() != null && x.getFailed().equals("FAILED")).collect(Collectors.counting());
             if (failedCount >= 2) {
+    }
     @Override
     public void sendPaymentWhatsappMessage(String mobile, String message) throws Exception {
-        if (isCpass()) {
-            cpassWhatsappService.sendText(mobile, message);
-            return;
-        }
-        String sendTo = "91" + mobile;
-//        String sendTo = "917082253510";
-        Map<String, String> requestHeaders = new HashMap<>();
-        requestHeaders.put("Content-Type", "application/x-www-form-urlencoded");
-        Map<String, String> requestParams = new HashMap<>();
-        requestParams.put("userid", String.valueOf(2000215976));
-        requestParams.put("password", "MFRd!BBL");
-        requestParams.put("send_to", sendTo);
-        requestParams.put("v", "1.1");
-        requestParams.put("format", "json");
-        requestParams.put("auth_scheme", "plain");
-        requestParams.put("method", "SENDMESSAGE");
-        requestParams.put("msg_type", "TEXT");
-        requestParams.put("msg", message);
-        requestParams.put("isTemplate", "true");
-        requestParams.put("header", "Payment Link!");
-        String response = restClient.post("https://media.smsgupshup.com/GatewayAPI/rest", requestParams, requestHeaders);
-        LOGGER.info("response  - {}", response);
-        JSONObject jsonObject = new JSONObject(response);
-        JSONObject whatsappResponse = jsonObject.getJSONObject("response");
-        if (whatsappResponse.getString("status").equals("error")) {
-            LOGGER.error("Invalid Whatsapp message, Reason - {}", whatsappResponse.getString("details"));
-            return;
-        }
-        String externalId = whatsappResponse.getString("id");
-        String phone = whatsappResponse.getString("phone");
-        WhatsappMessage whatsappMessage = new WhatsappMessage();
-        whatsappMessage.setCreatedTimestamp(LocalDateTime.now());
-        whatsappMessage.setExternalId(externalId);
-        whatsappMessage.setDestAddr(phone);
-        whatsappMessageRepository.persist(whatsappMessage);
+        whatsappProviders.active().sendText(WhatsappFlow.PAYMENT_LINK, mobile, message);
+    }
+}

Subversion Repositories SmartDukaan

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