Merge branch 'PIN-6663_update-client-model' of https://github.com/pagopa/interop-be-monorepo into PIN-6663_update-client-model

Author: AsterITA

.github/workflows/pr.yml

@@ -97,7 +97,7 @@ jobs:
   find_dockerfiles:
     name: Find Dockerfiles
     needs: [formatting, lint, check, test]
-    if: ${{ github.base_ref == 'develop' || github.base_ref == 'main' }}
+    if: ${{ github.base_ref == 'main' }}
     runs-on: ubuntu-latest
     outputs:
       packages: ${{ steps.set_packages_output.outputs.packages }}
@@ -112,7 +112,7 @@ jobs:
   docker_build:
     name: Build
     needs: [find_dockerfiles]
-    if: ${{ github.base_ref == 'develop' || github.base_ref == 'main' }}
+    if: ${{ github.base_ref == 'main' }}
     runs-on: ubuntu-latest
     environment: ecr-ro
     permissions:
@@ -151,7 +151,7 @@ jobs:
   check_build_result:
     name: Build Result
     needs: [docker_build]
-    if: ${{ always() && (github.base_ref == 'develop' || github.base_ref == 'main') }}
+    if: ${{ always() && github.base_ref == 'main' }}
     runs-on: ubuntu-latest
     steps:
       - name: Check build result

collections/delegation/consumer/Consumer delegation creation.bru

@@ -11,7 +11,7 @@ post {
 }
 
 headers {
-  Authorization: {{JWT}}
+  Authorization: {{JWT-M2M-ADMIN}}
   X-Correlation-Id: {{correlation-id}}
 }
 

collections/environments/PagoPA local.bru

@@ -17,4 +17,5 @@ vars {
   JWT2: Bearer {{process.env.JWT2}}
   host-template: http://localhost:3900
   JWT-API-SEC: Bearer {{process.env.JWT-API-SEC}}
+  JWT-M2M-ADMIN: Bearer {{process.env.JWT-M2M-ADMIN}}
 }

collections/m2m gateway/consumerDelegations/Consumer delegation creation.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Consumer delegation creation
+  type: http
+  seq: 1
+}
+
+post {
+  url: {{host-m2m-gw}}/consumerDelegations
+  body: json
+  auth: none
+}
+
+headers {
+  Authorization: {{JWT-M2M-ADMIN}}
+}
+
+body:json {
+  {
+    "eserviceId": "{{eserviceId}}",
+    "delegateId": "{{tenantId2}}"
+  }
+}
+
+vars:post-response {
+  delegationId: res.body.id
+}

collections/m2m gateway/consumerDelegations/folder.bru

@@ -0,0 +1,3 @@
+meta {
+  name: consumerDelegations
+}

docker/docker-compose.yml

@@ -2,6 +2,9 @@
 
 version: "3"
 name: pagopa-interop
+volumes:
+  readmodel-volume:
+
 services:
   # Event Store Postgres DB
   event-store:
@@ -75,7 +78,7 @@ services:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: example
     volumes:
-      - ./mongo-data:/data/db
+      - readmodel-volume:/data/db
 
   # Dynamo DB readmodel for token generation and privacy notices
   dynamodb-local:

packages/api-clients/open-api/delegationApi.yml

@@ -282,6 +282,9 @@ paths:
         - delegation
       operationId: getDelegation
       responses:
+        headers:
+          X-Metadata-Version:
+            $ref: "#/components/headers/MetadataVersionHeader"
         "200":
           description: Delegation retrieved
           content:
@@ -369,6 +372,9 @@ paths:
         description: Payload for delegation creation
         required: true
       responses:
+        headers:
+          X-Metadata-Version:
+            $ref: "#/components/headers/MetadataVersionHeader"
         "200":
           description: Delegation created.
           content:
@@ -570,6 +576,9 @@ paths:
         description: Payload for delegation creation
         required: true
       responses:
+        headers:
+          X-Metadata-Version:
+            $ref: "#/components/headers/MetadataVersionHeader"
         "200":
           description: Delegation created.
           content:
@@ -770,6 +779,11 @@ paths:
               schema:
                 $ref: "#/components/schemas/Problem"
 components:
+  headers:
+    MetadataVersionHeader:
+      description: The version number of the resource in the read model
+      schema:
+        type: integer
   parameters:
     CorrelationIdHeader:
       in: header
@@ -872,9 +886,6 @@ components:
           format: date-time
         rejectionReason:
           type: string
-        revokedAt:
-          type: string
-          format: date-time
         state:
           $ref: "#/components/schemas/DelegationState"
         kind:

packages/api-clients/open-api/m2mGatewayApi.yml

@@ -3817,14 +3817,17 @@ components:
         revokedAt:
           type: string
           format: date-time
+        submittedAt:
+          type: string
+          format: date-time
+        activatedAt:
+          type: string
+          format: date-time
+        rejectedAt:
+          type: string
+          format: date-time
         state:
           $ref: "#/components/schemas/DelegationState"
-        activationContract:
-          $ref: "#/components/schemas/DelegationContractDocument"
-        revocationContract:
-          $ref: "#/components/schemas/DelegationContractDocument"
-        stamps:
-          $ref: "#/components/schemas/DelegationStamps"
       required:
         - id
         - delegatorId
@@ -3833,7 +3836,7 @@ components:
         - createdAt
         - state
         - kind
-        - stamps
+        - submittedAt
     ConsumerDelegations:
       type: object
       additionalProperties: false
@@ -3847,58 +3850,6 @@ components:
       required:
         - results
         - pagination
-    DelegationContractDocument:
-      type: object
-      additionalProperties: false
-      properties:
-        id:
-          type: string
-          format: uuid
-        name:
-          type: string
-        prettyName:
-          type: string
-        contentType:
-          type: string
-        path:
-          type: string
-        createdAt:
-          type: string
-          format: date-time
-      required:
-        - id
-        - name
-        - prettyName
-        - contentType
-        - path
-        - createdAt
-    DelegationStamp:
-      type: object
-      additionalProperties: false
-      properties:
-        who:
-          type: string
-          format: uuid
-        when:
-          type: string
-          format: date-time
-      required:
-        - who
-        - when
-    DelegationStamps:
-      type: object
-      additionalProperties: false
-      properties:
-        submission:
-          $ref: "#/components/schemas/DelegationStamp"
-        activation:
-          $ref: "#/components/schemas/DelegationStamp"
-        rejection:
-          $ref: "#/components/schemas/DelegationStamp"
-        revocation:
-          $ref: "#/components/schemas/DelegationStamp"
-      required:
-        - submission
     DelegationState:
       type: string
       enum:
@@ -4343,8 +4294,6 @@ components:
           type: integer
           format: int32
           minimum: 0
-        riskAnalysisDocument:
-          $ref: "#/components/schemas/PurposeVersionDocument"
         rejectionReason:
           type: string
       required:
@@ -4366,25 +4315,6 @@ components:
       required:
         - results
         - pagination
-    PurposeVersionDocument:
-      type: object
-      additionalProperties: false
-      required:
-        - id
-        - contentType
-        - path
-        - createdAt
-      properties:
-        id:
-          type: string
-          format: uuid
-        contentType:
-          type: string
-        path:
-          type: string
-        createdAt:
-          type: string
-          format: date-time
     PurposeVersionSeed:
       type: object
       additionalProperties: false

packages/attribute-registry-process/package.json

@@ -5,7 +5,8 @@
   "main": "dist",
   "type": "module",
   "scripts": {
-    "test": "vitest",
+    "test:api": "vitest --config vitest.api.config.ts",
+    "test:integration": "vitest --config vitest.integration.config.ts",
     "lint": "eslint . --ext .ts,.tsx",
     "lint:autofix": "eslint . --ext .ts,.tsx --fix",
     "format:check": "prettier --check src",
@@ -24,9 +25,13 @@
     "@protobuf-ts/runtime": "2.9.4",
     "@types/express": "4.17.21",
     "@types/node": "20.14.6",
+    "@types/supertest": "6.0.2",
+    "@types/jsonwebtoken": "^9.0.2",
     "pagopa-interop-commons-test": "workspace:*",
     "prettier": "2.8.8",
+    "supertest": "7.0.0",
     "testcontainers": "10.9.0",
+    "jsonwebtoken": "9.0.2",
     "tsx": "4.19.1",
     "typescript": "5.4.5",
     "vitest": "1.6.0"

packages/attribute-registry-process/src/app.ts

@@ -12,21 +12,34 @@ import { serviceName as modelsServiceName } from "pagopa-interop-models";
 import attributeRouter from "./routers/AttributeRouter.js";
 import healthRouter from "./routers/HealthRouter.js";
 import { config } from "./config/config.js";
+import { AttributeRegistryService } from "./services/attributeRegistryService.js";
 
-const serviceName = modelsServiceName.ATTRIBUTE_REGISTRY_PROCESS;
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+export async function createApp(service?: AttributeRegistryService) {
+  const serviceName = modelsServiceName.ATTRIBUTE_REGISTRY_PROCESS;
 
-const app = zodiosCtx.app();
+  const router =
+    service != null
+      ? attributeRouter(zodiosCtx, service)
+      : attributeRouter(zodiosCtx);
 
-// Disable the "X-Powered-By: Express" HTTP header for security reasons.
-// See https://cheatsheetseries.owasp.org/cheatsheets/HTTP_Headers_Cheat_Sheet.html#recommendation_16
-app.disable("x-powered-by");
+  const app = zodiosCtx.app();
 
-app.use(healthRouter);
-app.use(contextMiddleware(serviceName));
-app.use(await applicationAuditBeginMiddleware(serviceName, config));
-app.use(await applicationAuditEndMiddleware(serviceName, config));
-app.use(authenticationMiddleware(config));
-app.use(loggerMiddleware(serviceName));
-app.use(attributeRouter(zodiosCtx));
+  // Disable the "X-Powered-By: Express" HTTP header for security reasons.
+  // See https://cheatsheetseries.owasp.org/cheatsheets/HTTP_Headers_Cheat_Sheet.html#recommendation_16
+  app.disable("x-powered-by");
+
+  app.use(healthRouter);
+  app.use(contextMiddleware(serviceName));
+  app.use(await applicationAuditBeginMiddleware(serviceName, config));
+  app.use(await applicationAuditEndMiddleware(serviceName, config));
+  app.use(authenticationMiddleware(config));
+  app.use(loggerMiddleware(serviceName));
+  app.use(router);
+
+  return app;
+}
+
+const app = await createApp();
 
 export default app;

packages/attribute-registry-process/src/routers/AttributeRouter.ts

@@ -19,7 +19,10 @@ import {
 } from "../model/domain/apiConverter.js";
 import { config } from "../config/config.js";
 import { makeApiProblem } from "../model/domain/errors.js";
-import { attributeRegistryServiceBuilder } from "../services/attributeRegistryService.js";
+import {
+  AttributeRegistryService,
+  attributeRegistryServiceBuilder,
+} from "../services/attributeRegistryService.js";
 import {
   createCertifiedAttributesErrorMapper,
   createDeclaredAttributesErrorMapper,
@@ -32,7 +35,7 @@ import {
 
 const readModelRepository = ReadModelRepository.init(config);
 const readModelService = readModelServiceBuilder(readModelRepository);
-const attributeRegistryService = attributeRegistryServiceBuilder(
+const defaultAttributeRegistryService = attributeRegistryServiceBuilder(
   initDB({
     username: config.eventStoreDbUsername,
     password: config.eventStoreDbPassword,
@@ -46,7 +49,8 @@ const attributeRegistryService = attributeRegistryServiceBuilder(
 );
 
 const attributeRouter = (
-  ctx: ZodiosContext
+  ctx: ZodiosContext,
+  attributeRegistryService: AttributeRegistryService = defaultAttributeRegistryService
 ): ZodiosRouter<ZodiosEndpointDefinitions, ExpressContext> => {
   const attributeRouter = ctx.router(attributeRegistryApi.attributeApi.api, {
     validationErrorHandler: zodiosValidationErrorToApiProblem,