For a triggered SMS message, check if notification flag is set. If so…

…, send to GCM service.
swagatikapanda123 · Feb 16, 2018 · e2ae145 · e2ae145
1 parent e3ce5f3
commit e2ae145
Showing 1 changed file with 25 additions and 8 deletions.
diff --git a/...a/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java b/...a/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java
@@ -194,21 +194,38 @@ private void connectAndSendToIntermediateServer(Collection<SmsMessageApiQueueRes
     public void sendTriggeredMessages(Map<SmsCampaign, Collection<SmsMessage>> smsDataMap) {
         try {
             if (!smsDataMap.isEmpty()) {
+                List<SmsMessage> toSaveMessages = new ArrayList<>() ;
+                List<SmsMessage> toSendNotificationMessages = new ArrayList<>() ;
                 for (Entry<SmsCampaign, Collection<SmsMessage>> entry : smsDataMap.entrySet()) {
                     Iterator<SmsMessage> smsMessageIterator = entry.getValue().iterator();
                     Collection<SmsMessageApiQueueResourceData> apiQueueResourceDatas = new ArrayList<>();
                     StringBuilder request = new StringBuilder();
                     while (smsMessageIterator.hasNext()) {
                         SmsMessage smsMessage = smsMessageIterator.next();
-                        SmsMessageApiQueueResourceData apiQueueResourceData = SmsMessageApiQueueResourceData.instance(smsMessage.getId(),
-                                null, null, null, smsMessage.getMobileNo(), smsMessage.getMessage(), entry.getKey().getProviderId());
-                        apiQueueResourceDatas.add(apiQueueResourceData);
-                        smsMessage.setStatusType(SmsMessageStatusType.WAITING_FOR_DELIVERY_REPORT.getValue());
+                        if(smsMessage.isNotification()){
+                            smsMessage.setStatusType(SmsMessageStatusType.WAITING_FOR_DELIVERY_REPORT.getValue());
+                            toSendNotificationMessages.add(smsMessage);
+                        }else {
+                            SmsMessageApiQueueResourceData apiQueueResourceData = SmsMessageApiQueueResourceData.instance(smsMessage.getId(),
+                                    null, null, null, smsMessage.getMobileNo(), smsMessage.getMessage(), entry.getKey().getProviderId());
+                            apiQueueResourceDatas.add(apiQueueResourceData);
+                            smsMessage.setStatusType(SmsMessageStatusType.WAITING_FOR_DELIVERY_REPORT.getValue());
+                            toSaveMessages.add(smsMessage) ;
+                        }
+                    }
+                    if(toSaveMessages.size()>0){
+                        this.smsMessageRepository.save(toSaveMessages);
+                        this.smsMessageRepository.flush();
+                        //this.smsMessageRepository.save(entry.getValue());
+                        //request.append(SmsMessageApiQueueResourceData.toJsonString(apiQueueResourceDatas));
+                        //logger.info("Sending triggered SMS with request - " + request.toString());
+                        this.triggeredExecutorService.execute(new SmsTask(ThreadLocalContextUtil.getTenant(), apiQueueResourceDatas));
                     }
-                    this.smsMessageRepository.save(entry.getValue()) ;
-                    request.append(SmsMessageApiQueueResourceData.toJsonString(apiQueueResourceDatas));
-                    logger.info("Sending triggered SMS with request - " + request.toString());
-                    this.triggeredExecutorService.execute(new SmsTask(ThreadLocalContextUtil.getTenant(), apiQueueResourceDatas));
+                    if(!toSendNotificationMessages.isEmpty()){
+                        this.notificationSenderService.sendNotification(toSendNotificationMessages);
+                    }
+
+
                 }
             }
         } catch (Exception e) {