Merge pull request #37 from pagopa/feature/1.6.0-SNAPSHOT

Pull request Feature/1.6.0 snapshot

Author: mbrachi

VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0-SNAPSHOT

functions/MergeDeclaredCapacityDB/lambda_function.py

@@ -42,7 +42,11 @@ def lambda_handler(event, context):
         '''
             MERGE INTO public."DECLARED_CAPACITY"
             USING public."DECLARED_CAPACITY_DELTA"
-            ON (public."DECLARED_CAPACITY"."PK" = public."DECLARED_CAPACITY_DELTA"."PK" AND
+            ON (public."DECLARED_CAPACITY"."GEOKEY" = public."DECLARED_CAPACITY_DELTA"."GEOKEY" AND
+                public."DECLARED_CAPACITY"."UNIFIED_DELIVERY_DRIVER" = public."DECLARED_CAPACITY_DELTA"."UNIFIED_DELIVERY_DRIVER" AND
+                public."DECLARED_CAPACITY"."PRODUCT_890" = public."DECLARED_CAPACITY_DELTA"."PRODUCT_890" AND
+                public."DECLARED_CAPACITY"."PRODUCT_AR" = public."DECLARED_CAPACITY_DELTA"."PRODUCT_AR" AND
+                public."DECLARED_CAPACITY"."PRODUCT_RS" = public."DECLARED_CAPACITY_DELTA"."PRODUCT_RS" AND
                 public."DECLARED_CAPACITY"."ACTIVATION_DATE_FROM" = public."DECLARED_CAPACITY_DELTA"."ACTIVATION_DATE_FROM") 
             --When records are matched, update the records if there is any change
             WHEN MATCHED AND public."DECLARED_CAPACITY"."LAST_UPDATE_TIMESTAMP" < public."DECLARED_CAPACITY_DELTA"."LAST_UPDATE_TIMESTAMP" 
@@ -76,3 +80,4 @@ def lambda_handler(event, context):
     conn.close()
 
     return {'statusCode': 200}
+ 

functions/RimozioneDuplicatiDeclaredCapacity/lambda_function.py

@@ -0,0 +1,56 @@
+import json
+import boto3
+import pg8000
+import os
+
+def get_db_credentials(secretsManager_SecretId):
+    client = boto3.client("secretsmanager")
+    response = client.get_secret_value(SecretId=secretsManager_SecretId)
+    response_SecretString = json.loads(response['SecretString'])
+    return response_SecretString
+
+
+def get_connection(db_host, db_name, db_port, creds):
+    conn = pg8000.connect(
+        host=db_host,
+        database=db_name,
+        user=creds["username"],
+        password=creds["password"],
+        port=db_port
+    )
+    return conn
+
+def lambda_handler(event, context):
+    
+    # recupero variabili d'ambiente
+    secretsManager_SecretId = os.environ['secretsManager_SecretId']
+    db_host = os.environ['DB_HOST']
+    db_name = os.environ['DB_NAME']
+    db_port = os.environ['DB_PORT']
+    # recupero credenziali da SecretsManager
+    creds = get_db_credentials(secretsManager_SecretId)
+    # connessione db
+    conn = get_connection(db_host, db_name, db_port, creds)
+    # query
+    cur = conn.cursor()
+    cur.execute(
+        '''
+            WITH CTE AS (
+                SELECT *,
+                    ROW_NUMBER() OVER (
+                    PARTITION BY public."DECLARED_CAPACITY"."GEOKEY",  public."DECLARED_CAPACITY"."UNIFIED_DELIVERY_DRIVER",  public."DECLARED_CAPACITY"."PRODUCT_890",
+                public."DECLARED_CAPACITY"."PRODUCT_AR" ,  public."DECLARED_CAPACITY"."PRODUCT_RS",  public."DECLARED_CAPACITY"."ACTIVATION_DATE_FROM"
+                                    ORDER BY  public."DECLARED_CAPACITY"."LAST_UPDATE_TIMESTAMP" DESC
+                                    ) AS "rn"
+            FROM public."DECLARED_CAPACITY"
+            )
+            DELETE FROM public."DECLARED_CAPACITY"
+            WHERE public."DECLARED_CAPACITY"."PK" IN (SELECT "PK" FROM CTE WHERE "rn" > 1);
+        '''
+    )
+    conn.commit()
+    cur.close()
+    conn.close()
+
+    return {'statusCode': 200}
+ 

functions/RimozioneDuplicatiDeclaredCapacity/requirements.txt

@@ -0,0 +1 @@
+pg8000==1.31.5

scripts/aws/cfn/microservice.yml

@@ -1005,6 +1005,62 @@ Resources:
                   - secretsmanager:GetSecretValue
                 Resource: !Ref SvcSimulatorUserSecretArn
 
+  # Lambda RimozioneDuplicatiDeclaredCapacity
+  RimozioneDuplicatiDeclaredCapacityLambda:
+    Type: AWS::Lambda::Function
+    Properties:
+      FunctionName: !Sub "${ProjectName}-${MicroServiceUniqueName}-Lambda-RimozioneDuplicatiDeclaredCapacity"
+      Runtime: python3.13
+      Handler: lambda_function.lambda_handler
+      Role: !GetAtt RimozioneDuplicatiDeclaredCapacityLambdaRole.Arn
+      Code:
+        S3Bucket: !Ref MicroserviceBucketName
+        S3Key: !Sub "${MicroserviceBucketBaseKey}/functions_zip/RimozioneDuplicatiDeclaredCapacity.zip"
+      Timeout: 300
+      MemorySize: 128
+      VpcConfig:
+        SecurityGroupIds:
+          - !Ref RdsSimulatorSecurityGroupId
+        SubnetIds: !Split [',', !Ref VPNServicesSubnetsIds]
+      Environment:
+        Variables:
+          DB_HOST: !Ref RdsSimulatorEndpointAddress
+          DB_PORT: !Ref RdsSimulatorPort
+          DB_NAME: !Ref RdsSimulatorDbName
+          secretsManager_SecretId: !Ref SvcSimulatorUserSecretArn
+
+  RimozioneDuplicatiDeclaredCapacityLambdaRole:
+    Type: AWS::IAM::Role
+    Properties:
+      RoleName: !Sub "${ProjectName}-${MicroServiceUniqueName}-lambda-rimozioneduplicatidc-role"
+      AssumeRolePolicyDocument:
+        Version: '2012-10-17'
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service: lambda.amazonaws.com
+            Action: sts:AssumeRole
+      ManagedPolicyArns:
+        - arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole
+        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
+      Policies:
+        - PolicyName: SecretsManagerAccess
+          PolicyDocument:
+            Version: '2012-10-17'
+            Statement:
+              - Effect: Allow
+                Action:
+                  - secretsmanager:GetSecretValue
+                Resource: !Ref SvcSimulatorUserSecretArn
+
+  RimozioneDuplicatiDeclaredCapacityLambdaAlarms:
+    Type: AWS::CloudFormation::Stack
+    Properties:
+      TemplateURL: !Sub "${TemplateBucketBaseUrl}/fragments/lambda-alarms.yaml"
+      Parameters:
+        FunctionName: !Ref RimozioneDuplicatiDeclaredCapacityLambda
+        AlarmSNSTopicArn: !Ref AlarmSNSTopicArn
+
   # Glue Connection
   GlueNetworkConnection:
     Type: AWS::Glue::Connection

scripts/aws/cfn/storage.yml

@@ -268,6 +268,18 @@ Resources:
         LogGroupRetention: !Ref LogRetention
         LogGroupPrefix: '/aws/lambda'
         LogsKinesisSourceStreamArn: !Ref LogsKinesisSourceStreamArn
+  
+  RimozioneDuplicatiDeclaredCapacityLambdaLogGroup:
+    Type: AWS::CloudFormation::Stack
+    UpdateReplacePolicy: Retain
+    DeletionPolicy: Retain
+    Properties:
+      TemplateURL: !Sub "${TemplateBucketBaseUrl}/fragments/log-group.yaml"
+      Parameters:
+        LogGroupName: !Sub "${ProjectName}-simulatore-recapiti-Lambda-RimozioneDuplicatiDeclaredCapacity"
+        LogGroupRetention: !Ref LogRetention
+        LogGroupPrefix: '/aws/lambda'
+        LogsKinesisSourceStreamArn: !Ref LogsKinesisSourceStreamArn
 
   SimulatorAuroraDbCluster:
     Type: AWS::CloudFormation::Stack