Merge branch 'main' into PIDM-1487-fix-empty-cbill

Author: dylantangredi-jakala

helm/Chart.yaml

@@ -3,7 +3,7 @@ name: pagopa-selfcare-ms-backoffice
 description: Microservice that manage api keys for pagopa product from selfcare
 type: application
 version: 0.512.0
-appVersion: "2.43.1-1-PIDM-1487-fix-empty-cbill"
+appVersion: "2.43.2"
 dependencies:
   - name: microservice-chart
     version: 7.5.0

helm/values-dev.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-selfcare-ms-backoffice-backend
-    tag: "2.43.1-1-PIDM-1487-fix-empty-cbill"
+    tag: "2.43.2"
     pullPolicy: Always
   livenessProbe:
     httpGet:

helm/values-prod.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-selfcare-ms-backoffice-backend
-    tag: "2.43.1-1-PIDM-1487-fix-empty-cbill" #improve
+    tag: "2.43.2" #improve
     pullPolicy: Always
   livenessProbe:
     httpGet:

helm/values-uat.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-selfcare-ms-backoffice-backend
-    tag: "2.43.1-1-PIDM-1487-fix-empty-cbill" #improve
+    tag: "2.43.2" #improve
     pullPolicy: Always
   livenessProbe:
     httpGet:

openapi/openapi.json

@@ -4,7 +4,7 @@
     "description": "Microservice to manage PagoPA Backoffice",
     "termsOfService": "https://www.pagopa.gov.it/",
     "title": "SelfCare Backoffice",
-    "version": "2.43.1-1-PIDM-1487-fix-empty-cbill"
+    "version": "2.43.2"
   },
   "servers": [
     {

pom.xml

@@ -10,7 +10,7 @@
         <version>2.7.10</version>
     </parent>
     <artifactId>pagopa-selfcare-ms-backoffice</artifactId>
-    <version>2.43.1-1-PIDM-1487-fix-empty-cbill</version>
+    <version>2.43.2</version>
     <name>SelfCare Backoffice</name>
     <description>Microservice to manage PagoPA Backoffice</description>
 

src/main/java/it/pagopa/selfcare/pagopa/backoffice/service/InstitutionServicesService.java

@@ -1,33 +1,41 @@
 package it.pagopa.selfcare.pagopa.backoffice.service;
 
+import it.pagopa.selfcare.pagopa.backoffice.audit.AuditLogger;
 import it.pagopa.selfcare.pagopa.backoffice.client.ExternalApiClient;
 import it.pagopa.selfcare.pagopa.backoffice.config.InstitutionServicesConfig;
 import it.pagopa.selfcare.pagopa.backoffice.entity.InstitutionRTPServiceEntity;
 import it.pagopa.selfcare.pagopa.backoffice.exception.AppError;
 import it.pagopa.selfcare.pagopa.backoffice.exception.AppException;
 import it.pagopa.selfcare.pagopa.backoffice.model.institutions.*;
 import it.pagopa.selfcare.pagopa.backoffice.model.institutions.client.Institution;
+import it.pagopa.selfcare.pagopa.backoffice.util.Utility;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
 import java.time.ZoneId;
 import java.util.List;
 
 @Service
+@Slf4j
 public class InstitutionServicesService {
     private final MongoRepository<InstitutionRTPServiceEntity, String> rtpServiceRepository;
     private final ExternalApiClient externalApiClient;
     private final InstitutionServicesConfig servicesConfig;
+    private final AuditLogger auditLogger;
     private static final String ORIGIN_IPA = "IPA";
 
     @Autowired
     public InstitutionServicesService(MongoRepository<InstitutionRTPServiceEntity, String> rtpServiceRepository,
-                                      ExternalApiClient externalApiClient, InstitutionServicesConfig servicesConfig){
+                                      ExternalApiClient externalApiClient, InstitutionServicesConfig servicesConfig,
+                                      AuditLogger auditLogger){
         this.rtpServiceRepository = rtpServiceRepository;
         this.externalApiClient = externalApiClient;
         this.servicesConfig = servicesConfig;
+        this.auditLogger = auditLogger;
     }
 
     public ServiceConsentResponse saveServiceConsent(ServiceConsentRequest serviceConsentRequest,
@@ -55,6 +63,13 @@ public ServiceConsentResponse saveServiceConsent(ServiceConsentRequest serviceCo
                         .consentDate(Instant.now())
                         .build();
                 rtpServiceRepository.save(entity);
+                auditLogger.info(log,
+                        "event=CONSENT_UPDATE institutionId={} serviceId={} userId={} institutionTaxCode={} consent={}",
+                        institutionId,
+                        serviceId,
+                        Utility.extractUserIdFromAuth(SecurityContextHolder.getContext().getAuthentication()),
+                        institution.getTaxCode(),
+                        serviceConsentRequest.getConsent());
                 response = new ServiceConsentResponse(serviceConsentRequest.getConsent(),
                         entity.getConsentDate().atZone(ZoneId.of("Europe/Rome")).toOffsetDateTime());
                 break;

src/test/java/it/pagopa/selfcare/pagopa/backoffice/service/InstitutionServicesServiceTest.java

@@ -1,5 +1,6 @@
 package it.pagopa.selfcare.pagopa.backoffice.service;
 
+import it.pagopa.selfcare.pagopa.backoffice.audit.AuditLogger;
 import it.pagopa.selfcare.pagopa.backoffice.client.ExternalApiClient;
 import it.pagopa.selfcare.pagopa.backoffice.config.InstitutionServicesConfig;
 import it.pagopa.selfcare.pagopa.backoffice.entity.InstitutionRTPServiceEntity;
@@ -38,6 +39,9 @@ class InstitutionServicesServiceTest {
     @Mock
     private InstitutionServicesConfig defaultServicesConfig;
 
+    @Mock
+    private AuditLogger auditLogger;
+
     @InjectMocks
     private InstitutionServicesService sut;