feat: NOD-745: code coverage > 80%

helm/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-afm-calculator
 description: Microservice that handles calculation for pagoPA Advanced Fees Management
 type: application
-version: 0.35.0
-appVersion: 0.0.1
+version: 0.36.0
+appVersion: 0.0.1-1-NOD-745-nodo-cfg-sync-coprire-l-80-del-codice-con-gli-unit-test
 dependencies:
   - name: microservice-chart
     version: 2.8.0

helm/values-dev.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-node-cfg-sync
-    tag: "0.0.1"
+    tag: "0.0.1-1-NOD-745-nodo-cfg-sync-coprire-l-80-del-codice-con-gli-unit-test"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -64,12 +64,12 @@ microservice-chart:
   envConfig:
     WEBSITE_SITE_NAME: 'pagopa-node-cfg-sync'
     ENV: 'azure-dev'
-    APP_LOGGING_LEVEL: 'DEBUG'
+    APP_LOGGING_LEVEL: 'INFO'
     DEFAULT_LOGGING_LEVEL: 'INFO'
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
     DB_NEXI_POSTGRES_URL: "jdbc:postgresql://db-postgres-ndp.d.db-nodo-pagamenti.com:5444/ndpspct?prepareThreshold=0&currentSchema=NODO4_CFG"
     DB_NEXI_POSTGRES_USER: "pp_nodo4_cfg"
-    DB_NEXI_POSTGRES_ENABLED: "true"
+    DB_NEXI_POSTGRES_ENABLED: "false"
     DB_NEXI_POSTGRES_SERVICE_IDENTIFIER: "NDP004DEV"
     DB_NEXI_ORACLE_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1522)(HOST=db-nodo-pagamenti.d.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCT_PP_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
     DB_NEXI_ORACLE_USER: "NODO4_CFG"
@@ -79,7 +79,7 @@ microservice-chart:
     DB_PAGOPA_POSTGRES_USER: "cfg"
     DB_PAGOPA_POSTGRES_ENABLED: "true"
     DB_PAGOPA_POSTGRES_SERVICE_IDENTIFIER: "NDP001DEV"
-    API_CONFIG_CACHE_URL: "https://api.dev.platform.pagopa.it/api-config-cache/p/v1/stakeholders/node/cache/schemas/v1"
+    API_CONFIG_CACHE_URL: "https://api.dev.platform.pagopa.it/api-config-cache/o/v1/stakeholders/node/cache/schemas/v1"
     STAND_IN_MANAGER_URL: "https://api.dev.platform.pagopa.it/stand-in-manager/api/v1"
     OTEL_SERVICE_NAME: "pagopanodecfgsync"
     OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=dev"

helm/values-prod.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-node-cfg-sync
-    tag: "0.0.1"
+    tag: "0.0.1-1-NOD-745-nodo-cfg-sync-coprire-l-80-del-codice-con-gli-unit-test"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -47,8 +47,8 @@ microservice-chart:
       memory: "512Mi"
       cpu: "0.25"
     limits:
-      memory: "512Mi"
-      cpu: "0.5"
+      memory: "1G"
+      cpu: "1.0"
   autoscaling:
     enable: true
     minReplica: 1
@@ -64,10 +64,23 @@ microservice-chart:
   envConfig:
     WEBSITE_SITE_NAME: 'pagopa-node-cfg-sync' # required to show cloud role name in application insights
     ENV: 'azure-prod'
-    APP_LOGGING_LEVEL: 'DEBUG'
+    APP_LOGGING_LEVEL: 'INFO'
     DEFAULT_LOGGING_LEVEL: 'INFO'
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
-    CACHET_TX_NAME: "nodo-dei-pagamenti-cache"
+    DB_NEXI_POSTGRES_URL: "jdbc:postgresql://db-postgres-ndp.p.db-nodo-pagamenti.com:5444/ndpspcp?prepareThreshold=0&currentSchema=NODO4_CFG"
+    DB_NEXI_POSTGRES_USER: "pp_nodo4_cfg"
+    DB_NEXI_POSTGRES_ENABLED: "false"
+    DB_NEXI_POSTGRES_SERVICE_IDENTIFIER: "NDP004DEV"
+    DB_CONFIG_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1521)(HOST=db-nodo-pagamenti.p.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCP_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
+    DB_NEXI_ORACLE_USER: "NODO4_CFG"
+    DB_NEXI_ORACLE_ENABLED: "true"
+    DB_NEXI_ORACLE_SERVICE_IDENTIFIER: "NDP003DEV"
+    DB_PAGOPA_POSTGRES_URL: "jdbc:postgresql://ndp.p.db-nodo-pagamenti.com:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
+    DB_PAGOPA_POSTGRES_USER: "cfg"
+    DB_PAGOPA_POSTGRES_ENABLED: "true"
+    DB_PAGOPA_POSTGRES_SERVICE_IDENTIFIER: "NDP001DEV"
+    API_CONFIG_CACHE_URL: "https://api.uat.platform.pagopa.it/api-config-cache/o/v1/stakeholders/node/cache/schemas/v1"
+    STAND_IN_MANAGER_URL: "https://api.uat.platform.pagopa.it/stand-in-manager/api/v1"
     OTEL_SERVICE_NAME: "pagopanodecfgsync"
     OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=prod"
     OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
@@ -78,12 +91,18 @@ microservice-chart:
   envSecret:
     # required
     APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-p-connection-string'
-    CACHE_TX_CONNECTION_STRING: "nodo-dei-pagamenti-cache-tx-connection-string-key"
-    OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
+    DB_PAGOPA_POSTGRES_PASSWORD: "db-cfg-password"
+    DB_NEXI_POSTGRES_PASSWORD: "db-nexi-cfg-password"
+    DB_NEXI_ORACLE_PASSWORD: "oracle-db-cfg-password"
+    API_CONFIG_CACHE_RX_CONNECTION_STRING: "nodo-dei-pagamenti-cache-sync-rx-connection-string-key"
+    API_CONFIG_CACHE_SA_CONNECTION_STRING: "nodo-dei-pagamenti-cache-sync-sa-connection-string-key"
+    STAND_IN_MANAGER_RX_CONNECTION_STRING: "nodo-dei-pagamenti-stand-in-sync-rx-connection-string-key"
+    STAND_IN_MANAGER_SA_CONNECTION_STRING: "nodo-dei-pagamenti-stand-in-sync-sa-connection-string-key"
     API_CONFIG_CACHE_SUBSCRIPTION_KEY: "cfg-for-node-subscription-key"
     STAND_IN_MANAGER_SUBSCRIPTION_KEY: "cfg-for-node-subscription-key"
+    OTEL_EXPORTER_OTLP_HEADERS: "elastic-apm-secret-token"
   keyvault:
-    name: "pagopa-d-nodo-kv"
+    name: "pagopa-p-nodo-kv"
     tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
   nodeSelector: {}
   tolerations: []
@@ -119,7 +138,7 @@ microservice-chart:
     deployment:
       create: true
       image:
-        repository: ghcr.io/pagopa/yourname # TODO
+        repository: ghcr.io/pagopa/pagopa-node-cfg-sync
         tag: "0.0.0"
         pullPolicy: Always
       envConfig: {}

helm/values-uat.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-node-cfg-sync
-    tag: "0.0.1"
+    tag: "0.0.1-1-NOD-745-nodo-cfg-sync-coprire-l-80-del-codice-con-gli-unit-test"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -47,8 +47,8 @@ microservice-chart:
       memory: "512Mi"
       cpu: "0.25"
     limits:
-      memory: "512Mi"
-      cpu: "0.5"
+      memory: "1G"
+      cpu: "1.0"
   autoscaling:
     enable: true
     minReplica: 1
@@ -62,13 +62,24 @@ microservice-chart:
           type: Utilization # Allowed types are 'Utilization' or 'AverageValue'
           value: "75"
   envConfig:
-    WEBSITE_SITE_NAME: 'pagopa-node-cfg-sync' # required to show cloud role name in application insights
+    WEBSITE_SITE_NAME: 'pagopa-node-cfg-sync'
     ENV: 'azure-uat'
-    APP_LOGGING_LEVEL: 'DEBUG'
+    APP_LOGGING_LEVEL: 'INFO'
     DEFAULT_LOGGING_LEVEL: 'INFO'
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
-    CACHET_TX_NAME: "nodo-dei-pagamenti-cache"
-    API_CONFIG_CACHE_URL: "https://api.uat.platform.pagopa.it/api-config-cache/p/v1/stakeholders/node/cache/schemas/v1"
+    DB_NEXI_POSTGRES_URL: "jdbc:postgresql://db-postgres-ndp.u.db-nodo-pagamenti.com:5444/ndpspca?prepareThreshold=0&currentSchema=NODO4_CFG"
+    DB_NEXI_POSTGRES_USER: "pp_nodo4_cfg"
+    DB_NEXI_POSTGRES_ENABLED: "false"
+    DB_NEXI_POSTGRES_SERVICE_IDENTIFIER: "NDP004DEV"
+    DB_CONFIG_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCA_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
+    DB_NEXI_ORACLE_USER: "NODO4_CFG"
+    DB_NEXI_ORACLE_ENABLED: "true"
+    DB_NEXI_ORACLE_SERVICE_IDENTIFIER: "NDP003DEV"
+    DB_PAGOPA_POSTGRES_URL: "jdbc:postgresql://ndp.u.db-nodo-pagamenti.com:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
+    DB_PAGOPA_POSTGRES_USER: "cfg"
+    DB_PAGOPA_POSTGRES_ENABLED: "true"
+    DB_PAGOPA_POSTGRES_SERVICE_IDENTIFIER: "NDP001DEV"
+    API_CONFIG_CACHE_URL: "https://api.uat.platform.pagopa.it/api-config-cache/o/v1/stakeholders/node/cache/schemas/v1"
     STAND_IN_MANAGER_URL: "https://api.uat.platform.pagopa.it/stand-in-manager/api/v1"
     OTEL_SERVICE_NAME: "pagopanodecfgsync"
     OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=uat"
@@ -80,12 +91,18 @@ microservice-chart:
   envSecret:
     # required
     APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-u-connection-string'
-    CACHE_TX_CONNECTION_STRING: "nodo-dei-pagamenti-cache-tx-connection-string-key"
-    OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
+    DB_PAGOPA_POSTGRES_PASSWORD: "db-cfg-password"
+    DB_NEXI_POSTGRES_PASSWORD: "db-nexi-cfg-password"
+    DB_NEXI_ORACLE_PASSWORD: "oracle-db-cfg-password"
+    API_CONFIG_CACHE_RX_CONNECTION_STRING: "nodo-dei-pagamenti-cache-sync-rx-connection-string-key"
+    API_CONFIG_CACHE_SA_CONNECTION_STRING: "nodo-dei-pagamenti-cache-sync-sa-connection-string-key"
+    STAND_IN_MANAGER_RX_CONNECTION_STRING: "nodo-dei-pagamenti-stand-in-sync-rx-connection-string-key"
+    STAND_IN_MANAGER_SA_CONNECTION_STRING: "nodo-dei-pagamenti-stand-in-sync-sa-connection-string-key"
     API_CONFIG_CACHE_SUBSCRIPTION_KEY: "cfg-for-node-subscription-key"
     STAND_IN_MANAGER_SUBSCRIPTION_KEY: "cfg-for-node-subscription-key"
+    OTEL_EXPORTER_OTLP_HEADERS: "elastic-apm-secret-token"
   keyvault:
-    name: "pagopa-d-nodo-kv"
+    name: "pagopa-u-nodo-kv"
     tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
   nodeSelector: {}
   tolerations: []

openapi/openapi.json

@@ -4,7 +4,7 @@
     "title": "cfg-sync",
     "description": "Microservice to update configuration schema of Nodo dei Pagamenti",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.0.1"
+    "version": "0.0.1-1-NOD-745-nodo-cfg-sync-coprire-l-80-del-codice-con-gli-unit-test"
   },
   "servers": [
     {
@@ -265,10 +265,10 @@
             "description": "Database sync status result",
             "example": "done",
             "enum": [
-              "done",
-              "disabled",
-              "rollback",
-              "error"
+              "DONE",
+              "DISABLED",
+              "ROLLBACK",
+              "ERROR"
             ]
           }
         }

pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>it.gov.pagopa.node</groupId>
   <artifactId>cfg-sync</artifactId>
-  <version>0.0.1</version>
+  <version>0.0.1-1-NOD-745-nodo-cfg-sync-coprire-l-80-del-codice-con-gli-unit-test</version>
   <description>Microservice to update configuration schema of Nodo dei Pagamenti</description>
 
   <properties>

src/main/java/it/gov/pagopa/node/cfgsync/config/OpenApiConfig.java

@@ -9,17 +9,17 @@
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.responses.ApiResponses;
 import io.swagger.v3.oas.models.security.SecurityScheme;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
 import it.gov.pagopa.node.cfgsync.util.Constants;
 import org.springdoc.core.customizers.OpenApiCustomiser;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
 @Configuration
 public class OpenApiConfig {
 

src/main/java/it/gov/pagopa/node/cfgsync/config/RequestFilter.java

@@ -1,22 +1,18 @@
 package it.gov.pagopa.node.cfgsync.config;
 
-import java.io.IOException;
-import java.util.UUID;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import it.gov.pagopa.node.cfgsync.util.Constants;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.UUID;
+
 @Component
 @Order(Ordered.HIGHEST_PRECEDENCE)
 @Slf4j

src/main/java/it/gov/pagopa/node/cfgsync/config/ResponseValidator.java

@@ -1,9 +1,6 @@
 package it.gov.pagopa.node.cfgsync.config;
 
 import it.gov.pagopa.node.cfgsync.exception.AppException;
-import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -13,6 +10,10 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
+import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
+import java.util.Set;
+
 @Aspect
 @Component
 public class ResponseValidator {
@@ -28,7 +29,7 @@ public class ResponseValidator {
    * @param result    the response to validate
    */
 
-  @AfterReturning(pointcut = "execution(* it.gov.pagopa.node.cfg_sync.controller.*.*(..))", returning = "result")
+  @AfterReturning(pointcut = "execution(* it.gov.pagopa.node.cfgsync.controller.*.*(..))", returning = "result")
   public void validateResponse(JoinPoint joinPoint, Object result) {
     if (result instanceof ResponseEntity) {
       validateResponse((ResponseEntity<?>) result);

src/main/java/it/gov/pagopa/node/cfgsync/controller/SyncCacheController.java

@@ -10,10 +10,11 @@
 import it.gov.pagopa.node.cfgsync.model.ProblemJson;
 import it.gov.pagopa.node.cfgsync.model.SyncStatusEnum;
 import it.gov.pagopa.node.cfgsync.model.SyncStatusResponse;
+import it.gov.pagopa.node.cfgsync.model.TargetRefreshEnum;
 import it.gov.pagopa.node.cfgsync.service.ApiConfigCacheService;
 import it.gov.pagopa.node.cfgsync.service.StandInManagerService;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -29,14 +30,12 @@
 @RestController
 @RequestMapping("/ndp")
 @Validated
+@AllArgsConstructor
 public class SyncCacheController {
 
-    @Autowired
     private ApiConfigCacheService apiConfigCacheService;
-    @Autowired
     private StandInManagerService standInManagerService;
 
-
     @Operation(
             summary = "Force stand-in configuration to update",
             security = {@SecurityRequirement(name = "ApiKey")},
@@ -81,8 +80,8 @@ public class SyncCacheController {
             produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<List<SyncStatusResponse>> standin() {
 
-        log.debug("Force stand-in configuration to update");
-        Map<String, SyncStatusEnum> syncStatusEnumMap = standInManagerService.forceStandIn();
+        log.debug("[NODE-CFG-SYNC] Force {}, configuration to update", TargetRefreshEnum.standin.label);
+        Map<String, SyncStatusEnum> syncStatusEnumMap = standInManagerService.syncStandIn();
 
         List<SyncStatusResponse> syncStatusResponseList = syncStatusEnumMap.entrySet()
                 .stream()
@@ -136,8 +135,8 @@ public ResponseEntity<List<SyncStatusResponse>> standin() {
             value = "/cache",
             produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<List<SyncStatusResponse>> cache() {
-        log.debug("Force cache configuration to update");
-        Map<String, SyncStatusEnum> syncStatusEnumMap = apiConfigCacheService.forceCacheUpdate();
+        log.debug("[NODE-CFG-SYNC] Force {} configuration to update", TargetRefreshEnum.cache.label);
+        Map<String, SyncStatusEnum> syncStatusEnumMap = apiConfigCacheService.syncCache();
 
         List<SyncStatusResponse> syncStatusResponseList = syncStatusEnumMap.entrySet()
                 .stream()