Merge branch 'dev'

Author: dolly-chhabriya-altius

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>cc.altius.FASP.rest.webservice</groupId>
     <artifactId>FASP</artifactId>
-    <version>2.94[5233]</version>
+    <version>2.95[5545]</version>
     <name>QAT</name>
     <description>Quantification Analytics Tool</description>
     <packaging>jar</packaging>

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

@@ -345,31 +345,8 @@ public DashboardForLoadProgram getDashboardForLoadProgram(int programId, int ver
 
     @Override
     public int getUserCount(CustomUserDetails curUser) {
-        String showInternalUsersString = "SELECT IF(COUNT(*)>0,1,0) `showInternalUsers` FROM us_user_role ur WHERE ur.ROLE_ID IN ('ROLE_INTERNAL_USER', 'ROLE_APPLICATION_ADMIN', 'ROLE_REALM_ADMIN') AND ur.USER_ID=:curUser ";
-        Map<String, Object> params = new HashMap<>();
-        params.put("curUser", curUser.getUserId());
-        boolean showInternalUsers = this.namedParameterJdbcTemplate.queryForObject(showInternalUsersString, params, Boolean.class);
-        params.put("showInternalUsers", showInternalUsers);
-
-        StringBuilder sb1 = new StringBuilder("SELECT COUNT(DISTINCT(ul.USER_ID)) FROM "
-                + "    ("
-                + "        SELECT u.`USER_ID`, u.`REALM_ID`, GROUP_CONCAT(ur.`ROLE_ID`) `ROLE_LIST`"
-                + "        FROM us_user u "
-                + "        LEFT JOIN us_user_role ur ON u.`USER_ID`=ur.`USER_ID` "
-                + "        GROUP BY u.`USER_ID` "
-                + "    ) ul"
-                + "    LEFT JOIN us_user_role ur ON ul.`USER_ID`=ur.`USER_ID` "
-                + "    LEFT JOIN us_user_acl acl ON ul.`USER_ID`=acl.`USER_ID` AND ur.`ROLE_ID`=acl.`ROLE_ID` "
-                + "    WHERE "
-                + "        (("
-                + "            :showInternalUsers = 0"
-                + "            AND NOT FIND_IN_SET('ROLE_INTERNAL_USER', ul.`ROLE_LIST`) "
-                + "            AND NOT FIND_IN_SET('ROLE_APPLICATION_ADMIN', ul.`ROLE_LIST`) "
-                + "        ) OR "
-                + "        (:showInternalUsers)) ");
-        this.aclService.addUserAclForRealm(sb1, params, "ul", curUser);
-        this.aclService.addFullAclAtUserLevel(sb1, params, "acl", curUser);
-        return this.namedParameterJdbcTemplate.queryForObject(sb1.toString(), params, Integer.class);
+        String sql="SELECT COUNT(u.USER_ID) FROM us_user u WHERE u.ACTIVE ";
+        return this.jdbcTemplate.queryForObject(sql, Integer.class);
     }
 
     @Override

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

@@ -2028,6 +2028,12 @@ public List<ShipmentLinkingOutput> getNotLinkedErpShipmentsTab1AndTab3(NotLinked
         if (paramList.size() > 0) {
             this.namedParameterJdbcTemplate.batchUpdate(sqlString, paramList.toArray(new MapSqlParameterSource[paramList.size()]));
         }
+        String setDateQuery = "SET @dt = CURDATE() - INTERVAL 6 MONTH;";
+        String setCountryIdQuery = "SET @realmCountryId = ?;";
+        this.jdbcTemplate.update(setDateQuery);
+        this.jdbcTemplate.update(setCountryIdQuery, input.getRealmCountryId());
+        String getCountryNameQuery = "SELECT c.LABEL_EN INTO @countryName FROM rm_realm_country rc LEFT JOIN vw_country c ON rc.COUNTRY_ID=c.COUNTRY_ID WHERE rc.REALM_COUNTRY_ID=@realmCountryId";
+        this.jdbcTemplate.execute(getCountryNameQuery);
         StringBuilder sqlStringBuilder = new StringBuilder(""
                 + "SELECT   "
                 + "    e.`RO_NO`, e.RO_PRIME_LINE_NO, e.ORDER_NO, e.PRIME_LINE_NO, e.`ACTIVE` `ORDER_ACTIVE`,   "
@@ -2053,19 +2059,16 @@ public List<ShipmentLinkingOutput> getNotLinkedErpShipmentsTab1AndTab3(NotLinked
                 + "LEFT JOIN rm_procurement_agent_planning_unit papu on left(papu.SKU_CODE,12)=e.PLANNING_UNIT_SKU_CODE   "
                 + "LEFT JOIN vw_planning_unit pu ON pu.PLANNING_UNIT_ID=papu.PLANNING_UNIT_ID   "
                 + "LEFT JOIN rm_forecasting_unit fu ON pu.FORECASTING_UNIT_ID=fu.FORECASTING_UNIT_ID   "
-                + "LEFT JOIN rm_program p ON p.PROGRAM_ID=:shipmentProgramId   "
-                + "LEFT JOIN rm_realm_country rc ON (p.REALM_COUNTRY_ID=rc.REALM_COUNTRY_ID OR rc.REALM_COUNTRY_ID=:realmCountryId)  "
-                + "LEFT JOIN vw_country c ON rc.COUNTRY_ID=c.COUNTRY_ID   "
                 + "LEFT JOIN vw_planning_unit spu ON spu.PLANNING_UNIT_ID=:shipmentPlanningUnitId   "
                 + "LEFT JOIN rm_forecasting_unit sfu ON spu.FORECASTING_UNIT_ID=sfu.FORECASTING_UNIT_ID   "
                 + "WHERE   "
                 + "	o1.RO_NO IS NOT NULL  "
-                + "    AND (papu.PLANNING_UNIT_ID = :filterPlanningUnitId OR :filterPlanningUnitId = 0) AND e.RECPIENT_COUNTRY=c.LABEL_EN  "
+                + "    AND (papu.PLANNING_UNIT_ID = :filterPlanningUnitId OR :filterPlanningUnitId = 0) AND e.RECPIENT_COUNTRY=@countryName  "
                 + "    AND e.ACTIVE   "
                 + "    AND ("
-                + "    COALESCE(s.ACTUAL_DELIVERY_DATE, e.`CURRENT_ESTIMATED_DELIVERY_DATE`,e.`AGREED_DELIVERY_DATE`,e.`REQ_DELIVERY_DATE`) < CURDATE() - INTERVAL 6 MONTH AND "
+                + "    COALESCE(s.ACTUAL_DELIVERY_DATE, e.`CURRENT_ESTIMATED_DELIVERY_DATE`,e.`AGREED_DELIVERY_DATE`,e.`REQ_DELIVERY_DATE`) < @dt AND "
                 + "    sm.SHIPMENT_STATUS_MAPPING_ID NOT IN (1,2,3,5,7,9,10,13,15) OR "
-                + "    COALESCE(s.ACTUAL_DELIVERY_DATE, e.`CURRENT_ESTIMATED_DELIVERY_DATE`,e.`AGREED_DELIVERY_DATE`,e.`REQ_DELIVERY_DATE`) >= CURDATE() - INTERVAL 6 MONTH AND "
+                + "    COALESCE(s.ACTUAL_DELIVERY_DATE, e.`CURRENT_ESTIMATED_DELIVERY_DATE`,e.`AGREED_DELIVERY_DATE`,e.`REQ_DELIVERY_DATE`) >= @dt AND "
                 + "    sm.SHIPMENT_STATUS_MAPPING_ID NOT IN (1,3,5,7,9,10,13,15))  "
                 + "    AND (slt.SHIPMENT_LINKING_TRANS_ID IS NULL OR dl.RO_NO IS NOT NULL)  "
                 + "    AND sfu.TRACER_CATEGORY_ID=fu.TRACER_CATEGORY_ID   "

src/main/java/cc/altius/FASP/jwt/JWTWebSecurityConfig.java

@@ -29,7 +29,7 @@
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 @Configuration
-@EnableWebSecurity(debug = true)
+@EnableWebSecurity
 @Order(1000)
 public class JWTWebSecurityConfig {
 

src/main/java/cc/altius/FASP/service/impl/ProgramServiceImpl.java

@@ -163,7 +163,7 @@ public int addProgram(ProgramInitialize p, CustomUserDetails curUser) throws Acc
     public int updateProgram(ProgramInitialize p, CustomUserDetails curUser) throws AccessControlFailedException {
         if (p.getProgramId() != 0) {
             try {
-                this.programCommonDao.getSimpleProgramById(p.getProgramId(), GlobalConstants.PROGRAM_TYPE_SUPPLY_PLAN, curUser);
+                this.programCommonDao.getSimpleProgramById(p.getProgramId(), p.getProgramTypeId(), curUser);
             } catch (EmptyResultDataAccessException e) {
                 throw new AccessControlFailedException();
             }

src/main/resources/application.properties

@@ -26,12 +26,10 @@ jwt.token.expiration.in.seconds=21600
 session.expiry.time=1800
 syncExpiresOn=15
 
-logging.level.org.springframework.security=TRACE
-
 info.app.name=QAT
 info.app.description=Quantification Analytics Tool
-info.app.version=2.94[5233]
-info.app.frontEndVersion=[13304]
+info.app.version=2.95[5545]
+info.app.frontEndVersion=[13327]
 management.endpoints.web.exposure.include=*
 management.info.env.enabled = true
 management.endpoint.sessions.enabled=true

src/main/resources/incrementalSqlScripts/20241202-QAT-4505.sql

@@ -0,0 +1,19 @@
+UPDATE ap_static_label_languages
+LEFT JOIN ap_static_label ON ap_static_label.STATIC_LABEL_ID=ap_static_label_languages.STATIC_LABEL_ID
+SET ap_static_label_languages.LABEL_TEXT='If you delink a shipment, the manual QAT shipment will retain the linked details. If the linked shipment has not been uploaded to the server, it will revert to the original manual shipment`s details.' where ap_static_label.LABEL_CODE='static.mt.reminders4A' 
+and ap_static_label_languages.LANGUAGE_ID=1;
+
+UPDATE ap_static_label_languages
+LEFT JOIN ap_static_label ON ap_static_label.STATIC_LABEL_ID=ap_static_label_languages.STATIC_LABEL_ID
+SET ap_static_label_languages.LABEL_TEXT='Si vous supprimez le lien d`une expédition, l`expédition manuelle QAT conservera les détails liés. Si l`expédition liée n`a pas été téléchargée sur le serveur, elle reviendra aux détails de l`expédition manuelle d`origine.' where ap_static_label.LABEL_CODE='static.mt.reminders4A' 
+and ap_static_label_languages.LANGUAGE_ID=2;
+
+UPDATE ap_static_label_languages
+LEFT JOIN ap_static_label ON ap_static_label.STATIC_LABEL_ID=ap_static_label_languages.STATIC_LABEL_ID
+SET ap_static_label_languages.LABEL_TEXT='Si desvincula un envío, el envío manual de QAT conservará los detalles vinculados. Si el envío vinculado no se ha cargado al servidor, volverá a los detalles del envío manual original.' where ap_static_label.LABEL_CODE='static.mt.reminders4A' 
+and ap_static_label_languages.LANGUAGE_ID=3;
+
+UPDATE ap_static_label_languages
+LEFT JOIN ap_static_label ON ap_static_label.STATIC_LABEL_ID=ap_static_label_languages.STATIC_LABEL_ID
+SET ap_static_label_languages.LABEL_TEXT='Se desvincular uma remessa, a remessa QAT manual manterá os dados vinculados. Se a remessa vinculada não tiver sido carregada no servidor, os detalhes da remessa manual original serão revertidos.' where ap_static_label.LABEL_CODE='static.mt.reminders4A' 
+and ap_static_label_languages.LANGUAGE_ID=4;

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

@@ -0,0 +1 @@
+20241202-QAT-4505.sql

src/main/resources/scriptsToBeRun/scriptsToBeRun.txt

@@ -0,0 +1 @@
+20241202-QAT-4505.sql

src/main/resources/version.properties

@@ -1,5 +1,5 @@
 # To change this license header, choose License Headers in Project Properties.
 # To change this template file, choose Tools | Templates
 # and open the template in the editor.
-version.major=2.94
-version.minor=5233
+version.major=2.95
+version.minor=5545