Feature/pn 11182

docs/openapi/internal/externalchannel/gestore-repository-v1.yaml

@@ -13,8 +13,29 @@ tags:
     description: Operazioni per la configurazione dei client
   - name: GestoreRequest
     description: Operazione per la gestione delle richieste
+  - name: DiscardedEvents
+    description: Operazioni per la gestione delle richieste scartate
 
 paths:
+  /external-channel/gestoreRepository/discarded-events:
+    post:
+      tags:
+        - DiscardedEvents
+      operationId: insertDiscardedEvents
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: array
+              minItems: 1
+              items:
+                $ref : '#/components/schemas/DiscardedEventDto'
+        required: true
+      responses:
+        200:
+          $ref: '#/components/responses/discardedEventResponseOk'
+
+
   /external-channel/gestoreRepository/clients/{xPagopaExtchCxId}:
     parameters:
       - name: xPagopaExtchCxId
@@ -208,6 +229,15 @@ components:
 
   responses:
 
+    discardedEventResponseOk:
+      description: OK
+      content:
+        application/json:
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/DiscardedEventDto'
+
     clientResponseOk:
       description: OK
       content:
@@ -365,6 +395,31 @@ components:
               come da specifiche di configurazione delle retry policy per la sola parte di interesse del canale
             example: '"SMS":[5,10,20,40],"EMAIL":[5,10,20,40],"PEC":[5,10,20,40],"PAPER":[5,10,20,40]'
 
+    DiscardedEventDto:
+      type: object
+      required:
+        - requestId
+        - timestampRicezione
+        - dataRicezione
+        - codiceScarto
+        - jsonRicevuto
+        - payloadHash
+      properties:
+        requestId:
+          type: string
+        timestampRicezione:
+          type: string
+        dataRicezione:
+          type: string
+        codiceScarto:
+          type: string
+        jsonRicevuto:
+          type: string
+        payloadHash:
+          type: string
+        details:
+          type: string
+
     #Non usati internamente ma ref necessaria per la loro generazione.
     RequestConversionDto:
       $ref: './schemas/internal-schemas-paper-v1.yaml#/components/schemas/RequestConversionDto'

docs/openapi/internal/externalchannel/schemas/internal-schemas-paper-v1.yaml

@@ -197,7 +197,11 @@ components:
           additionalProperties:
             type: string
           description: >-
-            Servizi a valore aggiunto       
+            Servizi a valore aggiunto
+        duplicateCheckPassthrough:
+          type: boolean
+          description: >-
+            Indica se il controllo sui duplicati deve essere bypassato per quella specifica richiesta
 
     PaperProgressStatusDto:
       title: Avanzamento di stato di una richiesta cartacea

scripts/aws/cfn/microservice-dev-cfg.json

@@ -43,6 +43,7 @@
     "PnEcConsAllowedFutureOffsetDuration": "1m",
     "CpuValue": "1024",
     "MemoryAmount": "4GB",
+    "PnEcDuplicatesCheck": "|TEST | AR|890",
     "PnECPaperDocumentTypeToRaster": "PN_NOTIFICATION_ATTACHMENTS",
     "PnECPaperDocumentTypeForRasterized": "PN_PAPER_ATTACHMENT",
     "PnECPaperPAIdToRaster": "NOTHING",

scripts/aws/cfn/microservice.yml

@@ -199,6 +199,14 @@ Parameters:
     Type: String
     Description: 'ARN della Tabella DynamoDB di upporto per la tabella RichiesteConversione'
 
+  PnEcTableNameScartiConsolidatore:
+    Type: String
+    Description: 'Nome della Tabella DynamoDB relativa agli scarti consolidatore'
+
+  PnEcTableArnScartiConsolidatore:
+    Type: String
+    Description: 'ARN della Tabella DynamoDB relativa agli scarti consolidatore'
+
   ### QUEUES  ###
   ### TRACKER : SMS  ###
 
@@ -694,7 +702,7 @@ Parameters:
   PnEcAlarmArnDLQueueTrackerErroriSERCQ:
     Type: String
     Description: "[Alarm DLQ - Tracker] ARN dell'allarme per presenza di messaggi nella DLQ PnEcQueueTrackerErroriSERCQ"
-        
+
   ###### pn-core Event Bus #######
 
 #  PnEcQueueNameEventsDLQueuePnCoreTargetEventBus:
@@ -909,6 +917,9 @@ Parameters:
   PnEcNamirialServerCacheEndpoint:
     Type: String
 
+  PnEcDuplicatesCheck:
+    Type: String
+
   CpuValue:
     Type: Number
     Default: 1024
@@ -1029,18 +1040,21 @@ Resources:
         ContainerEnvEntry67: !Sub 'PnEcNamirialServerCache=${PnEcNamirialServerCache}'
         ContainerEnvEntry68: !Sub 'PnEcNamirialServerCacheEndpoint=${PnEcNamirialServerCacheEndpoint}'
         ContainerEnvEntry69: !Sub 'SpringCodecMaxInMemorySize=${SpringCodecMaxInMemorySize}'
-        ContainerEnvEntry70: !Sub 'PnEcConsAllowedFutureOffsetDuration=${PnEcConsAllowedFutureOffsetDuration}'
-        ContainerEnvEntry71: !Sub 'PnECPaperPAIdToRaster=${PnECPaperPAIdToRaster}'
-        ContainerEnvEntry72: !Sub 'PnECPaperDocumentTypeToRaster=${PnECPaperDocumentTypeToRaster}'
-        ContainerEnvEntry73: !Sub 'PnECPaperDocumentTypeForRasterized=${PnECPaperDocumentTypeForRasterized}'
-        ContainerEnvEntry74: !Sub 'PnECPaperPAIdOverride=${PnECPaperPAIdOverride}'
-        ContainerEnvEntry75: !Sub 'PnEcQueueNameAvailabilityManager=${PnEcQueueNameAvailabilityManager}'
-        ContainerEnvEntry76: !Sub 'PnEcDLQueueNameErroriCARTACEO=${PnEcDLQueueNameErroriCARTACEO}'
-        ContainerEnvEntry77: !Sub 'PnEcTableNameRichiesteConversione=${PnEcTableNameRichiesteConversione}'
-        ContainerEnvEntry78: !Sub 'PnEcTableNameConversionePdf=${PnEcTableNameConversionePdf}'
-        ContainerEnvEntry79: !Sub 'PnEcQueueNameTrackerStatoSERCQ=${PnEcQueueNameTrackerStatoSERCQ}'
-        ContainerEnvEntry80: !Sub 'PnEcQueueNameTrackerErroriSERCQ=${PnEcQueueNameTrackerErroriSERCQ}'
-        ContainerEnvEntry81: !Sub 'SQSMaxBatchSubscribedMsgs=${SQSMaxBatchSubscribedMsgs}'
+        ContainerEnvEntry70: !Sub 'PnEcDuplicatesCheck=${PnEcDuplicatesCheck}'
+        ContainerEnvEntry71: !Sub 'PnEcTableNameScartiConsolidatore=${PnEcTableNameScartiConsolidatore}'
+        ContainerEnvEntry72: !Sub 'PnEcConsAllowedFutureOffsetDuration=${PnEcConsAllowedFutureOffsetDuration}'
+        ContainerEnvEntry73: !Sub 'PnEcConsAllowedFutureOffsetDuration=${PnEcConsAllowedFutureOffsetDuration}'
+        ContainerEnvEntry74: !Sub 'PnECPaperPAIdToRaster=${PnECPaperPAIdToRaster}'
+        ContainerEnvEntry75: !Sub 'PnECPaperDocumentTypeToRaster=${PnECPaperDocumentTypeToRaster}'
+        ContainerEnvEntry76: !Sub 'PnECPaperDocumentTypeForRasterized=${PnECPaperDocumentTypeForRasterized}'
+        ContainerEnvEntry77: !Sub 'PnECPaperPAIdOverride=${PnECPaperPAIdOverride}'
+        ContainerEnvEntry78: !Sub 'PnEcQueueNameAvailabilityManager=${PnEcQueueNameAvailabilityManager}'
+        ContainerEnvEntry79: !Sub 'PnEcDLQueueNameErroriCARTACEO=${PnEcDLQueueNameErroriCARTACEO}'
+        ContainerEnvEntry80: !Sub 'PnEcTableNameRichiesteConversione=${PnEcTableNameRichiesteConversione}'
+        ContainerEnvEntry81: !Sub 'PnEcTableNameConversionePdf=${PnEcTableNameConversionePdf}'
+        ContainerEnvEntry82: !Sub 'PnEcQueueNameTrackerStatoSERCQ=${PnEcQueueNameTrackerStatoSERCQ}'
+        ContainerEnvEntry83: !Sub 'PnEcQueueNameTrackerErroriSERCQ=${PnEcQueueNameTrackerErroriSERCQ}'
+        ContainerEnvEntry84: !Sub 'SQSMaxBatchSubscribedMsgs=${SQSMaxBatchSubscribedMsgs}'
         ContainerSecret1: !Sub 'ConsolidatoreClientApiKey=arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:pn-EC-Secrets:ConsolidatoreClientApiKey:AWSCURRENT:'
         MicroServiceSecretPrefix: pn-EC-Secrets
         MappedPaths: '/external-channels/*,/external-channel/*,/consolidatore-ingress/*'
@@ -1084,6 +1098,7 @@ Resources:
               - !Ref PnEcTableArnAnagrafica
               - !Ref PnEcTableArnRichieste
               - !Ref PnEcTableArnRichiesteMetadati
+              - !Ref PnEcTableArnScartiConsolidatore
               - !Ref PnEcTableArnRichiesteConversione
               - !Ref PnEcTableArnConversionePdf
           - Effect: Allow
@@ -1262,7 +1277,7 @@ Resources:
             Resource: !Ref PnEcQueueArnTrackerStatoCARTACEO
             Principal:
               AWS: !Ref AWS::AccountId
-              
+
   PnEcQueuePolicyTrackerStatoSERCQ:
     Type: AWS::SQS::QueuePolicy
     Properties:
@@ -1456,6 +1471,7 @@ Resources:
           - - !Ref PnEcTableNameAnagrafica
             - !Ref PnEcTableNameRichieste
             - !Ref PnEcTableNameRichiesteMetadati
+            - !Ref PnEcTableNameScartiConsolidatore
         QueueArns:
           !Join
           - ','
@@ -1502,13 +1518,14 @@ Resources:
             - !Ref PnEcAlarmArnDLQueueTrackerStatoSERCQ
             - !Ref PnEcAlarmArnQueueTrackerErroriSERCQ
             - !Ref PnEcAlarmArnDLQueueTrackerErroriSERCQ
-            - !Ref PnEcAlarmArnEventsDLQueuePnCoreTargetEventBus            
+            - !Ref PnEcAlarmArnEventsDLQueuePnCoreTargetEventBus
         DynamoDBTableNames:
           !Join
           - ','
           - - !Ref PnEcTableNameAnagrafica
             - !Ref PnEcTableNameRichieste
             - !Ref PnEcTableNameRichiesteMetadati
+            - !Ref PnEcTableNameScartiConsolidatore
         QueueArns:
           !Join
           - ','

scripts/aws/cfn/storage.yml

@@ -133,7 +133,7 @@ Resources:
         PointInTimeRecoveryEnabled: true
     DeletionPolicy: Retain
     UpdateReplacePolicy: Retain
-    
+
   PnEcTableRichiesteConversione:
     Type: AWS::DynamoDB::Table
     Properties:
@@ -154,6 +154,31 @@ Resources:
     DeletionPolicy: Retain
     UpdateReplacePolicy: Retain
 
+  PnEcTableScartiConsolidatore:
+    Type: AWS::DynamoDB::Table
+    Properties:
+      TableName: 'pn-EcScartiConsolidatore'
+      AttributeDefinitions:
+        - AttributeName: 'requestId'
+          AttributeType: 'S'
+        - AttributeName: 'timestampRicezione'
+          AttributeType: 'S'
+      KeySchema:
+        - AttributeName: 'requestId'
+          KeyType: 'HASH'
+        - AttributeName: 'timestampRicezione'
+          KeyType: 'RANGE'
+      BillingMode: 'PAY_PER_REQUEST'
+      SSESpecification:
+        SSEEnabled: true
+        SSEType: 'KMS'
+        KMSMasterKeyId: !Ref PCKmsEncDecDynamoDataKey
+      TableClass: 'STANDARD'
+      PointInTimeRecoverySpecification:
+        PointInTimeRecoveryEnabled: true
+    DeletionPolicy: Retain
+    UpdateReplacePolicy: Retain
+
   PnEcTableConversionePdf:
     Type: AWS::DynamoDB::Table
     Properties:
@@ -173,7 +198,7 @@ Resources:
         PointInTimeRecoveryEnabled: true
     DeletionPolicy: Retain
     UpdateReplacePolicy: Retain
-    
+
   ######### S3 BUCKET FOR OVERSIZE SQS MESSAGES #########
 
   PnEcSqsMessagesStagingBucket:
@@ -1063,6 +1088,14 @@ Outputs:
     Description: 'ARN della Tabella DynamoDB relativa alle richieste'
     Value: !GetAtt PnEcTableRichiesteMetadati.Arn
 
+  PnEcTableNameScartiConsolidatore:
+    Description: 'Nome della Tabella DynamoDB relativa agli scarti consolidatore'
+    Value: !Ref PnEcTableScartiConsolidatore
+
+  PnEcTableArnScartiConsolidatore:
+    Description: 'ARN della Tabella DynamoDB relativa agli scarti consolidatore'
+    Value: !GetAtt PnEcTableScartiConsolidatore.Arn
+
   PnEcTableNameRichiesteConversione:
     Description: 'Nome della Tabella DynamoDB relativa alle richieste di conversione dei PDF'
     Value: !Ref PnEcTableRichiesteConversione
@@ -1299,7 +1332,7 @@ Outputs:
   PnEcAlarmArnDLQueueTrackerErroriSERCQ:
     Description: "[Alarm DLQ - Tracker] ARN dell'allarme per presenza di messaggi nella DLQ PnEcQueueTrackerErroriSERCQ"
     Value: !GetAtt PnEcQueueTrackerErroriSERCQStack.Outputs.SqsDLQAlarmArn
-  
+
   ###### BATCH : SMS #######
 
   PnEcQueueNameBatchSMS:

src/main/java/it/pagopa/pn/ec/commons/configurationproperties/endpoint/internal/ec/GestoreRepositoryEndpointProperties.java

@@ -9,6 +9,6 @@ public record GestoreRepositoryEndpointProperties(
         String getClientConfiguration, String postClientConfiguration, String putClientConfiguration, String deleteClientConfiguration,
 
 //      <-- REQUEST -->
-        String getRequest, String postRequest, String patchRequest, String deleteRequest, String getRequestByMessageId,
+        String getRequest, String postRequest, String patchRequest, String deleteRequest, String getRequestByMessageId, String postDiscardedEvents,
         String setMessageIdInRequestMetadata) {}
 

src/main/java/it/pagopa/pn/ec/commons/rest/call/ec/gestorerepository/GestoreRepositoryCall.java

@@ -2,6 +2,7 @@
 
 import it.pagopa.pn.ec.commons.rest.call.RestCallException;
 import it.pagopa.pn.ec.rest.v1.dto.*;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @SuppressWarnings("unused")
@@ -22,4 +23,9 @@ public interface GestoreRepositoryCall {
     Mono<Void> deleteRichiesta(String clientId, String requestIdx);
     Mono<RequestDto> getRequestByMessageId(String messageId);
     Mono<RequestDto> setMessageIdInRequestMetadata(String clientId, String requestIdx);
+
+//  <-- DISCARDED EVENTS -->
+    Flux<DiscardedEventDto> insertDiscardedEvents(Flux<DiscardedEventDto> discardedEventsDto);
+
+
 }

src/main/java/it/pagopa/pn/ec/commons/rest/call/ec/gestorerepository/GestoreRepositoryCallImpl.java

@@ -7,6 +7,7 @@
 import lombok.CustomLog;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import static it.pagopa.pn.ec.commons.utils.LogUtils.*;
@@ -149,6 +150,18 @@ public Mono<RequestDto> setMessageIdInRequestMetadata(String clientId, String re
                           .bodyToMono(RequestDto.class);
     }
 
+    @Override
+    public Flux<DiscardedEventDto> insertDiscardedEvents(Flux<DiscardedEventDto> discardedEventsDto) {
+        return ecWebClient.post()
+                .uri(gestoreRepositoryEndpointProperties.postDiscardedEvents())
+                .body(discardedEventsDto, DiscardedEventDto.class)
+                .retrieve()
+                .onStatus(BAD_REQUEST::equals,
+                        clientResponse -> Mono.error(new RepositoryManagerException.RequestMalformedException()))
+                .bodyToFlux(DiscardedEventDto.class);
+
+    }
+
     private static class ISEForMessageIdCreationException extends RestCallException {
 
         public ISEForMessageIdCreationException() {