From 28346cbfb2229eb2824cc20bacc6cf08fc5a8ae0 Mon Sep 17 00:00:00 2001
From: harish <harish.bagora1@gmail.com>
Date: Fri, 24 Jan 2025 18:14:05 +0530
Subject: [PATCH] Updated code for assigned application dashboard API

---
 .../gepafin/tendermanagement/dao/DashboardDao.java |  4 ++--
 .../AssignedApplicationWidgetResponseBean.java     |  4 ++--
 .../AssignedApplicationsRepository.java            | 14 ++++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
index 1d0bc307..d88319e1 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
@@ -397,8 +397,8 @@ public class DashboardDao {
 
 		response.setNumberOfAssignedApplication(data[0] instanceof Number ? ((Number) data[0]).longValue() : 0L);
 		response.setNumberOfApplicationInAmendmentState(data[1] instanceof Number ? ((Number) data[1]).longValue() : 0L);
-		response.setNumberOfApplicationInEvaluationState(data[2] instanceof Number ? ((Number) data[2]).longValue() : 0L);
-		response.setNumberOfAcceptedApplication(data[3] instanceof Number ? ((Number) data[3]).longValue() : 0L);
+		response.setNumberOfApplicationInOpenState(data[2] instanceof Number ? ((Number) data[2]).longValue() : 0L);
+		response.setNumberOfApplicationInCloseState(data[3] instanceof Number ? ((Number) data[3]).longValue() : 0L);
 
 		return response;
 	}
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationWidgetResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationWidgetResponseBean.java
index 186ff323..c6e2ac0f 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationWidgetResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationWidgetResponseBean.java
@@ -8,8 +8,8 @@ import java.math.BigDecimal;
 public class AssignedApplicationWidgetResponseBean {
     private Long numberOfAssignedApplication;
     private Long numberOfApplicationInAmendmentState;
-    private Long numberOfAcceptedApplication;
-    private Long numberOfApplicationInEvaluationState;
+    private Long numberOfApplicationInCloseState;
+    private Long numberOfApplicationInOpenState;
     private Long numberOfApplicationExpiringIn48Hours;
     private BigDecimal averageEvaluationDays;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java
index 16fa4928..f48833aa 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java
@@ -29,13 +29,14 @@ public interface AssignedApplicationsRepository extends JpaRepository<AssignedAp
     @Query("""
     SELECT
         COALESCE(COUNT(a.id), 0) AS totalAssigned,
-        COALESCE(SUM(CASE WHEN app.status = 'SOCCORSO' THEN 1 ELSE 0 END), 0) AS amendmentCount,
-        COALESCE(SUM(CASE WHEN app.status = 'EVALUATION' THEN 1 ELSE 0 END), 0) AS evaluationCount,
-        COALESCE(SUM(CASE WHEN app.status = 'APPROVED' THEN 1 ELSE 0 END), 0) AS approvedCount
+        COALESCE(SUM(CASE WHEN a.status = 'SOCCORSO' THEN 1 ELSE 0 END), 0) AS amendmentCount,
+        COALESCE(SUM(CASE WHEN a.status = 'OPEN' THEN 1 ELSE 0 END), 0) AS openCount,
+        COALESCE(SUM(CASE WHEN a.status = 'CLOSE' THEN 1 ELSE 0 END), 0) AS closeCount
     FROM AssignedApplicationsEntity a
     JOIN a.application app
     WHERE a.isDeleted = false
     AND a.userId = :userId
+    AND app.isDeleted = false
     AND app.hubId = :hubId
 """)
     Object[] countAssignedApplicationsWithStatus(
@@ -46,12 +47,13 @@ public interface AssignedApplicationsRepository extends JpaRepository<AssignedAp
     @Query("""
     SELECT
         COALESCE(COUNT(a.id), 0) AS totalAssigned,
-        COALESCE(SUM(CASE WHEN app.status = 'SOCCORSO' THEN 1 ELSE 0 END), 0) AS amendmentCount,
-        COALESCE(SUM(CASE WHEN app.status = 'EVALUATION' THEN 1 ELSE 0 END), 0) AS evaluationCount,
-        COALESCE(SUM(CASE WHEN app.status = 'APPROVED' THEN 1 ELSE 0 END), 0) AS approvedCount
+        COALESCE(SUM(CASE WHEN a.status = 'SOCCORSO' THEN 1 ELSE 0 END), 0) AS amendmentCount,
+        COALESCE(SUM(CASE WHEN a.status = 'OPEN' THEN 1 ELSE 0 END), 0) AS openCount,
+        COALESCE(SUM(CASE WHEN a.status = 'CLOSE' THEN 1 ELSE 0 END), 0) AS closeCount
     FROM AssignedApplicationsEntity a
     JOIN a.application app
     WHERE a.isDeleted = false
+    AND app.isDeleted = false
       AND app.hubId = :hubId
 """)
     Object[] countAssignedApplicationsForHub(@Param("hubId") Long hubId);