Added previous code to test new changes in prod

Author: dinesh-beehyv

imi/src/main/java/org/motechproject/nms/imi/service/TargetFileService.java

@@ -16,6 +16,7 @@ public interface TargetFileService {
      */
     HashMap<String, TargetFileNotification> generateTargetFile(boolean split);
 
+    HashMap<String, TargetFileNotification> generateTargetFileApi(boolean split);
 
     TargetFileNotification generateTargetFileWhatsApp();
 

imi/src/main/java/org/motechproject/nms/imi/service/impl/TargetFileServiceImpl.java

@@ -218,7 +218,7 @@ public String generateTargetFile() {
 
         LOGGER.debug("/generateTargetFile (GET)");
         try {
-                HashMap<String, TargetFileNotification> tfn = targetFileService.generateTargetFile(Boolean.parseBoolean(settingsFacade.getProperty(generateJhFile)));
+                HashMap<String, TargetFileNotification> tfn = targetFileService.generateTargetFileApi(Boolean.parseBoolean(settingsFacade.getProperty(generateJhFile)));
                 LOGGER.debug("targetFileService.generateTargetFile() done");
 
                 return tfn == null ? "null" : tfn.values().toString();

imi/src/main/java/org/motechproject/nms/imi/web/ImiController.java

@@ -74,6 +74,21 @@
       "ANY"
     ]
   },
+  {
+    "active": true,
+    "pattern": "/**/generateTargetFileApi/**",
+    "supportedSchemes": [
+      "NO_SECURITY"
+    ],
+    "protocol": "HTTP",
+    "priority": 2,
+    "rest": true,
+    "origin": "SYSTEM_MODULE_IMI",
+    "version": "all",
+    "methodsRequired": [
+      "ANY"
+    ]
+  },
   {
     "active": true,
     "pattern": "/**/generateWhatsAppSMSTargetFile/**",

imi/src/main/resources/securityRules.json

@@ -152,7 +152,9 @@ Subscription createSubscription(Subscriber subscriber, long callingNumber, Langu
      * @param rowCount The maximum number of rows to return
      * @return The list of subscriptions due for a message
      */
-    List<SubscriptionDto> findActiveSubscriptionsForDay(DayOfTheWeek dayOfTheWeek, long offset, int rowCount);
+    List<SubscriptionDto> findActiveSubscriptionsForDayApi(DayOfTheWeek dayOfTheWeek, long offset, int rowCount);
+
+    List<Subscription> findActiveSubscriptionsForDay(DayOfTheWeek dayOfTheWeek, long offset, int rowCount);
 
     List<String> findJhSubscriptionIds();
 

kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriptionService.java

@@ -6,7 +6,7 @@
 
 public interface SubscriptionTimeSlotService {
 
-//    List<SubscriptionTimeSlot> findTimeSlotsForSubscriptionsById(List<String> subscriptionId);
+    List<SubscriptionTimeSlot> findTimeSlotsForSubscriptionsById(List<String> subscriptionId);
 
      List<SubscriptionTimeSlot> findAllTimeSlots();
 

kilkari/src/main/java/org/motechproject/nms/kilkari/service/SubscriptionTimeSlotService.java

@@ -1012,12 +1012,58 @@ public Subscription create(Subscription subscription) {
 //        }
 //    }
 
+    @Override
+    public List<Subscription> findActiveSubscriptionsForDay(final DayOfTheWeek dow, final long offset,
+                                                            final int rowCount) {
+        Timer queryTimer = new Timer();
+
+        @SuppressWarnings("unchecked")
+        SqlQueryExecution<List<Subscription>> queryExecution = new SqlQueryExecution<List<Subscription>>() {
+
+            @Override
+            public String getSqlQuery() {
+                String query =  "SELECT s.id as id, activationDate, deactivationReason, endDate, firstMessageDayOfWeek, " +
+                        "s.needsWelcomeMessageViaObd, s.origin, s.secondMessageDayOfWeek, s.startDate, " +
+                        "s.status, s.subscriber_id_OID, s.subscriptionId, s.subscriptionPack_id_OID, " +
+                        "s.creationDate, s.creator, s.modificationDate, s.modifiedBy, s.owner, s.needsWelcomeOptInForWP " +
+                        "FROM nms_subscriptions AS s " +
+                        "INNER JOIN nms_subscription_packs AS p ON s.subscriptionPack_id_OID = p.id " +
+                        "WHERE s.id > :offset AND " +
+                        "(firstMessageDayOfWeek = :dow OR " +
+                        "(secondMessageDayOfWeek = :dow AND p.messagesPerWeek = 2)) AND " +
+                        "status = 'ACTIVE' AND " +
+                        " (serviceStatus IN ('IVR', 'IVR_AND_WHATSAPP') OR serviceStatus IS NULL) "+
+                        "ORDER BY s.id " +
+                        "LIMIT :max";
+                LOGGER.debug(KilkariConstants.SQL_QUERY_LOG, query);
+                return query;
+            }
+
+            @Override
+            public List<Subscription> execute(Query query) {
+
+                query.setClass(Subscription.class);
+
+                Map params = new HashMap();
+                params.put("offset", offset);
+                params.put("dow", dow.toString());
+                params.put("max", rowCount);
+                ForwardQueryResult fqr = (ForwardQueryResult) query.executeWithMap(params);
+
+                return (List<Subscription>) fqr;
+            }
+        };
+
+        List<Subscription> subscriptions = subscriptionDataService.executeSQLQuery(queryExecution);
+        LOGGER.debug("findActiveSubscriptionsForDay(dow={}, offset={}, rowCount={}) {}", dow, offset, rowCount, queryTimer.time());
+        return subscriptions;
+    }
 
 
 
 
    @Override
-   public List<SubscriptionDto> findActiveSubscriptionsForDay(DayOfTheWeek dow, long offset, int rowCount) {
+   public List<SubscriptionDto> findActiveSubscriptionsForDayApi(DayOfTheWeek dow, long offset, int rowCount) {
        List<SubscriptionDto> subscriptions = new ArrayList<>();
        String query = "SELECT s.id as id, activationDate, deactivationReason, endDate, firstMessageDayOfWeek, " +
                                 "s.needsWelcomeMessageViaObd, s.origin, s.secondMessageDayOfWeek, s.startDate, " +

kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/SubscriptionServiceImpl.java

@@ -26,6 +26,74 @@ public SubscriptionTimeSlotServiceImpl(SubscriptionTimeSlotDataService subscript
         this.subscriptionTimeSlotDataService = subscriptionTimeSlotDataService;
     }
 
+    @Override
+    public List<SubscriptionTimeSlot> findTimeSlotsForSubscriptionsById(final List<String> subscriptionIds) {
+
+        if (subscriptionIds == null || subscriptionIds.isEmpty()) {
+            LOGGER.warn("No subscription IDs provided, returning empty list.");
+            return new ArrayList<>();
+        }
+
+        StringBuilder idsString = new StringBuilder();
+        int i = 0;
+        while (i < subscriptionIds.size()) {
+            idsString.append("'").append(subscriptionIds.get(i)).append("'");
+            if (i < subscriptionIds.size() - 1) {
+                idsString.append(",");
+            }
+            i++;
+        }
+
+        String query = "SELECT ts.subscription_id, ts.subscriptionId, ts.timeStamp1, ts.timeStamp2, ts.timeStamp3 " +
+                "FROM nms_subscriptions_time_slot AS ts " +
+                "WHERE ts.subscriptionId IN (" + idsString + ")";
+
+
+        SqlQueryExecution<List<Object[]>> queryExecution = new SqlQueryExecution<List<Object[]>>() {
+
+            @Override
+            public String getSqlQuery() {
+                return query;
+            }
+
+            @Override
+            public List<Object[]> execute(Query query) {
+                ForwardQueryResult fqr = (ForwardQueryResult) query.execute();
+
+                List<Object[]> results = new ArrayList<>();
+                if (fqr != null && !fqr.isEmpty()) {
+                    for (Object result : fqr) {
+                        results.add((Object[]) result);
+                    }
+                }
+
+                return results;
+            }
+        };
+
+        List<Object[]> rawResults = subscriptionTimeSlotDataService.executeSQLQuery(queryExecution);
+
+        List<SubscriptionTimeSlot> subscriptionTimeSlots = new ArrayList<>();
+        for (Object[] row : rawResults) {
+
+            SubscriptionTimeSlot timeSlot = new SubscriptionTimeSlot();
+
+            timeSlot.setSubscription_id(((Number) row[0]).longValue());
+            timeSlot.setSubscriptionId((String) row[1]);
+            timeSlot.setTimeStamp1((Integer) row[2]);
+            timeSlot.setTimeStamp2((Integer) row[3]);
+            timeSlot.setTimeStamp3((Integer) row[4]);
+            subscriptionTimeSlots.add(timeSlot);
+        }
+        if(subscriptionIds.isEmpty()) {
+            LOGGER.warn("No subscriptionTimeSlots found for fresh calls subscriptionIds:");
+        }
+
+        return subscriptionTimeSlots;
+    }
+
+
+
     @Override
     public List<SubscriptionTimeSlot> findAllTimeSlots() {
         String query = "SELECT ts.subscription_id, ts.subscriptionId, ts.timeStamp1, ts.timeStamp2, ts.timeStamp3 " +