Merge branch 'QAT-6307' into dev

Author: dolly-chhabriya-altius

src/main/java/cc/altius/FASP/dao/impl/ErpLinkingDaoImpl.java

@@ -1787,8 +1787,11 @@ public int getNotificationCount(CustomUserDetails curUser) {
 //        System.out.println("ids%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" + programIds);
         sql = "SELECT COUNT(*) FROM ( "
                 + "SELECT n.`NOTIFICATION_ID` FROM rm_erp_notification n "
-                + " LEFT JOIN rm_shipment_linking s ON s.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_ID "
-                + " WHERE n.`ACTIVE` AND s.ACTIVE AND n.`ADDRESSED`=0 AND s.`PROGRAM_ID` IN (" + programIds + ") GROUP BY n.`NOTIFICATION_ID` ) AS a;";
+                + " LEFT JOIN rm_shipment_linking sl ON sl.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_ID "
+                + " left join rm_shipment s on s.SHIPMENT_ID=sl.CHILD_SHIPMENT_ID "
+                + " left join rm_shipment_trans st on st.SHIPMENT_ID=s.SHIPMENT_ID and st.VERSION_ID=s.MAX_VERSION_ID "
+                + " left join rm_program_planning_unit ppu on ppu.PROGRAM_ID = sl.PROGRAM_ID AND ppu.PLANNING_UNIT_ID=st.PLANNING_UNIT_ID "
+                + " WHERE n.`ACTIVE` AND sl.ACTIVE AND n.`ADDRESSED`=0 AND sl.`PROGRAM_ID` IN (" + programIds + ") and ppu.PROGRAM_PLANNING_UNIT_ID IS NOT NULL and ppu.ACTIVE GROUP BY n.`NOTIFICATION_ID` ) AS a;";
         return this.jdbcTemplate.queryForObject(sql, Integer.class);
     }
 
@@ -1813,14 +1816,17 @@ public List<NotificationSummaryDTO> getNotificationSummary(CustomUserDetails cur
         }
         programIds = programIds.substring(0, programIds.lastIndexOf(","));
 //        System.out.println("ids 1%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" + programIds);
-        sql = "SELECT s.`PROGRAM_ID`,p.`LABEL_ID`,p.`LABEL_EN`,p.`LABEL_FR`,p.`LABEL_SP`,p.`LABEL_PR`, "
+        sql = "SELECT sl.`PROGRAM_ID`,p.`LABEL_ID`,p.`LABEL_EN`,p.`LABEL_FR`,p.`LABEL_SP`,p.`LABEL_PR`, "
                 + " COUNT(DISTINCT(n.`NOTIFICATION_ID`)) as NOTIFICATION_COUNT "
                 + " FROM rm_erp_notification n "
-                + " LEFT JOIN rm_shipment_linking s ON s.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_ID "
+                + " LEFT JOIN rm_shipment_linking sl ON sl.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_ID "
                 + " LEFT JOIN vw_program p ON p.`PROGRAM_ID`=s.`PROGRAM_ID` "
-                + " WHERE n.`ACTIVE` AND s.ACTIVE AND n.`ADDRESSED`=0 "
-                + " AND s.`PROGRAM_ID` IN (" + programIds + ") "
-                + " GROUP BY s.`PROGRAM_ID` ;";
+                + " left join rm_shipment s on s.SHIPMENT_ID=sl.CHILD_SHIPMENT_ID "
+                + " left join rm_shipment_trans st on st.SHIPMENT_ID=s.SHIPMENT_ID and st.VERSION_ID=s.MAX_VERSION_ID "
+                + " left join rm_program_planning_unit ppu on ppu.PROGRAM_ID = sl.PROGRAM_ID AND ppu.PLANNING_UNIT_ID=st.PLANNING_UNIT_ID "
+                + " WHERE n.`ACTIVE` AND sl.ACTIVE AND n.`ADDRESSED`=0 and ppu.PROGRAM_PLANNING_UNIT_ID IS NOT NULL and ppu.ACTIVE "
+                + " AND sl.`PROGRAM_ID` IN (" + programIds + ") "
+                + " GROUP BY sl.`PROGRAM_ID` ;";
         return this.jdbcTemplate.query(sql, new NotificationSummaryDTORowMapper());
     }
 

src/main/resources/incrementalSqlScripts/20260326-QAT-6307.sql

@@ -0,0 +1,37 @@
+
+USE `fasp`;
+DROP procedure IF EXISTS `getShipmentLinkingNotifications`;
+
+USE `fasp`;
+DROP procedure IF EXISTS `fasp`.`getShipmentLinkingNotifications`;
+;
+
+DELIMITER $$
+USE `fasp`$$
+CREATE DEFINER=`faspUser`@`%` PROCEDURE `getShipmentLinkingNotifications`(PROGRAM_ID INT(10), VERSION_ID INT (10))
+BEGIN
+    SET @programId = PROGRAM_ID;
+    SET @procurementAgentId = 1;
+    SET @versionId = VERSION_ID;
+    IF @versionId = -1 THEN
+        SELECT MAX(pv.VERSION_ID) INTO @versionId FROM rm_program_version pv WHERE pv.PROGRAM_ID=@programId;
+    END IF;
+
+SELECT 
+	n.`NOTIFICATION_ID`, n.`ADDRESSED`,n.`SHIPMENT_LINKING_ID`,n.NOTIFICATION_TYPE_ID,nt.LABEL_ID,nt.LABEL_EN,nt.LABEL_FR,nt.LABEL_SP,nt.LABEL_PR
+FROM rm_erp_notification n 
+LEFT JOIN vw_notification_type nt ON n.NOTIFICATION_TYPE_ID=nt.NOTIFICATION_TYPE_ID
+left join rm_shipment_linking sl on sl.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_ID
+left join rm_shipment_linking_trans slt on slt.SHIPMENT_LINKING_ID=sl.SHIPMENT_LINKING_ID and slt.VERSION_ID<=@versionId
+left join rm_shipment s on s.SHIPMENT_ID=sl.CHILD_SHIPMENT_ID
+left join rm_shipment_trans st on st.SHIPMENT_ID=s.SHIPMENT_ID and st.VERSION_ID=s.MAX_VERSION_ID
+left join rm_program_planning_unit ppu on ppu.PROGRAM_ID = sl.PROGRAM_ID AND ppu.PLANNING_UNIT_ID=st.PLANNING_UNIT_ID
+WHERE 
+	n.ACTIVE AND sl.ACTIVE  and sl.PROGRAM_ID=@programId and slt.VERSION_ID<=@versionId and ppu.PROGRAM_PLANNING_UNIT_ID IS NOT NULL and ppu.ACTIVE
+GROUP BY n.NOTIFICATION_ID
+ORDER BY n.ADDRESSED DESC, n.NOTIFICATION_ID;
+END$$
+
+DELIMITER ;
+;
+

src/main/resources/scriptsToBeRun/QAT-6307.txt

@@ -0,0 +1 @@
+20260326-QAT-6307.sql

src/main/resources/storedProcedures/getShipmentLinkingNotifications.sql

@@ -1,4 +1,4 @@
-CREATE DEFINER=`faspUser`@`localhost` PROCEDURE `getShipmentLinkingNotifications`(PROGRAM_ID INT(10), PLANNING_UNIT_ID TEXT, VERSION_ID INT (10))
+CREATE DEFINER=`faspUser`@`localhost` PROCEDURE `getShipmentLinkingNotifications`(PROGRAM_ID INT(10), VERSION_ID INT (10))
 BEGIN
     SET @programId = PROGRAM_ID;
     SET @procurementAgentId = 1;
@@ -13,8 +13,11 @@ FROM rm_erp_notification n
 LEFT JOIN vw_notification_type nt ON n.NOTIFICATION_TYPE_ID=nt.NOTIFICATION_TYPE_ID
 left join rm_shipment_linking sl on sl.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_ID
 left join rm_shipment_linking_trans slt on slt.SHIPMENT_LINKING_ID=sl.SHIPMENT_LINKING_ID and slt.VERSION_ID<=@versionId
+left join rm_shipment s on s.SHIPMENT_ID=sl.CHILD_SHIPMENT_ID
+left join rm_shipment_trans st on st.SHIPMENT_ID=s.SHIPMENT_ID and st.VERSION_ID=s.MAX_VERSION_ID
+left join rm_program_planning_unit ppu on ppu.PROGRAM_ID = sl.PROGRAM_ID AND ppu.PLANNING_UNIT_ID=st.PLANNING_UNIT_ID
 WHERE 
-	n.ACTIVE  AND sl.ACTIVE and sl.PROGRAM_ID=@programId and slt.VERSION_ID<=@versionId
+	n.ACTIVE AND sl.ACTIVE  and sl.PROGRAM_ID=@programId and slt.VERSION_ID<=@versionId and ppu.PROGRAM_PLANNING_UNIT_ID IS NOT NULL and ppu.ACTIVE
 GROUP BY n.NOTIFICATION_ID
 ORDER BY n.ADDRESSED DESC, n.NOTIFICATION_ID;
-END
+END