cumulative beneficiary fix.

Author: Mandar-Beehyv

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/controller/UserController.java

@@ -128,6 +128,9 @@ public class UserController {
     @Autowired
     private DownloadReportActivityService downloadReportActivityService;
 
+    @Autowired
+    private KilkariCallReportDao kilkariCallReportDao;
+
     private final CacheManager cacheManager = CacheManager.create();
     private final Cache etlNotificationCache = cacheManager.getCache("etlNotificationCache");
 
@@ -1440,7 +1443,7 @@ public ResponseEntity<Long> getCumulativeBeneficiaries(){
         }
 
 
-        Long cumulativeJoinedSubscription = aggregateCumulativeBeneficiaryDao.getCumulativeJoinedSubscription(locationId, locationType, toDate);
+        Long cumulativeJoinedSubscription = kilkariCallReportDao.getCumulativeJoinedSubscription(locationId, locationType, toDate);
         return ResponseEntity.ok(cumulativeJoinedSubscription);
 //        Long ashaStarted = 0L;
 //        Long ashaCompleted = 0L;

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/dao/AggregateCumulativeBeneficiaryDao.java

@@ -24,6 +24,4 @@ public interface AggregateCumulativeBeneficiaryDao {
     Map<Integer,Long> getTotalDeactivationSum(List<Integer> locationId, String locationType, Date fromDate, Date toDate, String periodType);
 
     Long getJoinedSubscriptionSumTillDate(Integer locationId, String locationType, Date toDate);
-
-    Long getCumulativeJoinedSubscription(Long locationId, String locationType, Date toDate);
 }

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/dao/KilkariCallReportDao.java

@@ -9,4 +9,7 @@
  */
 public interface KilkariCallReportDao {
     KilkariCalls getKilkariCallreport(Integer locationId, String locationType, Date toDate);
+
+    Long getCumulativeJoinedSubscription(Long locationId, String locationType, Date toDate);
+
 }

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/dao/impl/AggregateCumulativeBeneficiaryDaoImpl.java

@@ -53,28 +53,6 @@ public AggregateCumulativeBeneficiary getCumulativeBeneficiary(Long locationId,
         return aggregateCumulativeBeneficiary;
     }
 
-    public Long getCumulativeJoinedSubscription(Long locationId, String locationType, Date toDate) {
-        String hql;
-        Query query;
-
-        if (locationId == 0 && "State".equalsIgnoreCase(locationType)) {
-            hql = "SELECT COALESCE(SUM(CAST(total_beneficiaries AS SIGNED)), 0) FROM agg_kilkari_call_report WHERE location_type = :locationType AND date = :toDate";
-            query = getSession().createQuery(hql);
-            query.setParameter("locationType", "State");
-        } else {
-            hql = "SELECT COALESCE(SUM(CAST(total_beneficiaries AS SIGNED)), 0) FROM agg_kilkari_call_report WHERE locationId = :locationId AND location_type = :locationType AND date = :toDate";
-            query = getSession().createQuery(hql);
-            query.setParameter("locationId", locationId);
-            query.setParameter("locationType", locationType);
-        }
-
-        query.setParameter("toDate", toDate);
-
-        Long result = (Long) query.uniqueResult();
-        return result != null ? result : 0L;
-    }
-
-
 
 
     @Override

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/dao/impl/KilkariCallReportDaoImpl.java

@@ -5,6 +5,7 @@
 import com.beehyv.nmsreporting.model.KilkariCalls;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Repository;
 
@@ -47,5 +48,23 @@ public  KilkariCalls getKilkariCallreport(Integer locationId, String locationTyp
         kilkariCalls.setUniqueBeneficiaries(kilkariCalls.getUniqueBeneficiaries()== null? 0 : kilkariCalls.getUniqueBeneficiaries());
         return kilkariCalls;
     }
+
+    @Override
+    public Long getCumulativeJoinedSubscription(Long locationId, String locationType, Date toDate) {
+        Criteria criteria = createEntityCriteria();
+
+        if (locationId == 0 && "State".equalsIgnoreCase(locationType)) {
+            criteria.add(Restrictions.eq("locationType", locationType));
+        } else {
+            criteria.add(Restrictions.eq("locationId", locationId));
+            criteria.add(Restrictions.eq("locationType", locationType));
+        }
+        criteria.add(Restrictions.eq("date", toDate));
+
+        criteria.setProjection(Projections.sum("uniqueBeneficiaries"));
+
+        Long result = (Long) criteria.uniqueResult();
+        return result != null ? result : 0L;
+    }
 }