PIN-5443 - Updated publish descriptor and added approve delegated descriptor

packages/agreement-process/test/createAgreement.test.ts

@@ -392,7 +392,9 @@ describe("create agreement", () => {
     const authData = getRandomAuthData();
     const eserviceId = generateId<EServiceId>();
     const notDraftDescriptorStates = Object.values(descriptorState).filter(
-      (state) => state !== descriptorState.draft
+      (state) =>
+        state !== descriptorState.draft &&
+        state !== descriptorState.waitingForApproval
     );
 
     const descriptor0: Descriptor = {
@@ -444,7 +446,8 @@ describe("create agreement", () => {
         Object.values(descriptorState).filter(
           (state) =>
             state !== descriptorState.published &&
-            state !== descriptorState.draft
+            state !== descriptorState.draft &&
+            state !== descriptorState.waitingForApproval
         )
       ),
     };

packages/agreement-process/test/submitAgreement.test.ts

@@ -532,7 +532,9 @@ describe("submit agreement", () => {
       id: descriptorId,
       state: randomArrayItem(
         Object.values(descriptorState).filter(
-          (state: DescriptorState) => state !== descriptorState.draft
+          (state: DescriptorState) =>
+            state !== descriptorState.draft &&
+            state !== descriptorState.waitingForApproval
         )
       ),
       version: "1",
@@ -542,7 +544,9 @@ describe("submit agreement", () => {
       ...getMockDescriptor(),
       state: randomArrayItem(
         Object.values(descriptorState).filter(
-          (state: DescriptorState) => state !== descriptorState.draft
+          (state: DescriptorState) =>
+            state !== descriptorState.draft &&
+            state !== descriptorState.waitingForApproval
         )
       ),
       version: "2",
@@ -602,7 +606,9 @@ describe("submit agreement", () => {
       state: randomArrayItem(
         Object.values(descriptorState).filter(
           (state: DescriptorState) =>
-            !allowedStatus.includes(state) && state !== descriptorState.draft
+            !allowedStatus.includes(state) &&
+            state !== descriptorState.draft &&
+            state !== descriptorState.waitingForApproval
         )
       ),
     };

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

@@ -3885,6 +3885,108 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Problem"
+  /eservices/{eServiceId}/descriptors/{descriptorId}/approve:
+    parameters:
+      - $ref: "#/components/parameters/CorrelationIdHeader"
+    post:
+      security:
+        - bearerAuth: []
+      tags:
+        - eservices
+      summary: approve a delegated new e-service version
+      operationId: approveDelegatedEServiceDescriptor
+      parameters:
+        - name: eServiceId
+          in: path
+          description: the eservice id
+          required: true
+          schema:
+            type: string
+            format: uuid
+        - name: descriptorId
+          in: path
+          description: the descriptor id
+          required: true
+          schema:
+            type: string
+            format: uuid
+      responses:
+        "204":
+          description: New delegated e-service version approved
+          headers:
+            "X-Rate-Limit-Limit":
+              schema:
+                type: integer
+              description: Max allowed requests within time interval
+            "X-Rate-Limit-Remaining":
+              schema:
+                type: integer
+              description: Remaining requests within time interval
+            "X-Rate-Limit-Interval":
+              schema:
+                type: integer
+              description: Time interval in milliseconds. Allowed requests will be constantly replenished during the interval. At the end of the interval the max allowed requests will be available
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/CreatedResource"
+        "403":
+          description: Forbidden
+          headers:
+            "X-Rate-Limit-Limit":
+              schema:
+                type: integer
+              description: Max allowed requests within time interval
+            "X-Rate-Limit-Remaining":
+              schema:
+                type: integer
+              description: Remaining requests within time interval
+            "X-Rate-Limit-Interval":
+              schema:
+                type: integer
+              description: Time interval in milliseconds. Allowed requests will be constantly replenished during the interval. At the end of the interval the max allowed requests will be available
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Problem"
+        "404":
+          description: EService or Descriptor not found
+          headers:
+            "X-Rate-Limit-Limit":
+              schema:
+                type: integer
+              description: Max allowed requests within time interval
+            "X-Rate-Limit-Remaining":
+              schema:
+                type: integer
+              description: Remaining requests within time interval
+            "X-Rate-Limit-Interval":
+              schema:
+                type: integer
+              description: Time interval in milliseconds. Allowed requests will be constantly replenished during the interval. At the end of the interval the max allowed requests will be available
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Problem"
+        "400":
+          description: Bad request
+          headers:
+            "X-Rate-Limit-Limit":
+              schema:
+                type: integer
+              description: Max allowed requests within time interval
+            "X-Rate-Limit-Remaining":
+              schema:
+                type: integer
+              description: Remaining requests within time interval
+            "X-Rate-Limit-Interval":
+              schema:
+                type: integer
+              description: Time interval in milliseconds. Allowed requests will be constantly replenished during the interval. At the end of the interval the max allowed requests will be available
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Problem"
   /export/eservices/{eserviceId}/descriptors/{descriptorId}:
     parameters:
       - $ref: "#/components/parameters/CorrelationIdHeader"

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

@@ -1069,6 +1069,52 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Problem"
+  /eservices/:eServiceId/descriptors/:descriptorId/approve:
+    parameters:
+      - $ref: "#/components/parameters/CorrelationIdHeader"
+    post:
+      security:
+        - bearerAuth: []
+      tags:
+        - process
+      summary: approve a delegated new e-service version
+      operationId: approveDelegatedEServiceDescriptor
+      parameters:
+        - name: eServiceId
+          in: path
+          description: the eservice id
+          required: true
+          schema:
+            type: string
+            format: uuid
+        - name: descriptorId
+          in: path
+          description: the descriptor id
+          required: true
+          schema:
+            type: string
+            format: uuid
+      responses:
+        "204":
+          description: New delegated e-service version approved
+        "403":
+          description: Forbidden
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Problem"
+        "404":
+          description: EService not found
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Problem"
+        "400":
+          description: Bad request
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Problem"
   /status:
     get:
       security: []

packages/backend-for-frontend/src/routers/catalogRouter.ts

@@ -714,7 +714,29 @@ const catalogRouter = (
         );
         return res.status(errorRes.status).send(errorRes);
       }
-    });
+    })
+    .post(
+      "/eservices/:eServiceId/descriptors/:descriptorId/approve",
+      async (req, res) => {
+        const ctx = fromBffAppContext(req.ctx, req.headers);
+        try {
+          await catalogService.approveDelegatedEServiceDescriptor(
+            unsafeBrandId(req.params.eServiceId),
+            unsafeBrandId(req.params.descriptorId),
+            ctx
+          );
+          return res.status(204).send();
+        } catch (error) {
+          const errorRes = makeApiProblem(
+            error,
+            emptyErrorMapper,
+            ctx.logger,
+            `Error approving eService ${req.params.eServiceId} version ${req.params.descriptorId}`
+          );
+          return res.status(errorRes.status).send(errorRes);
+        }
+      }
+    );
 
   return catalogRouter;
 };

packages/backend-for-frontend/src/services/catalogService.ts

@@ -1200,5 +1200,19 @@ export function catalogServiceBuilder(
         descriptorId: eservice.descriptors[0].id,
       };
     },
+    approveDelegatedEServiceDescriptor: async (
+      eServiceId: EServiceId,
+      descriptorId: EServiceId,
+      { headers, logger }: WithLogger<BffAppContext>
+    ): Promise<void> => {
+      logger.info(`Approving e-service ${eServiceId} version ${descriptorId}`);
+      await catalogProcessClient.approveDelegatedEServiceDescriptor(undefined, {
+        headers,
+        params: {
+          eServiceId,
+          descriptorId,
+        },
+      });
+    },
   };
 }

packages/catalog-process/src/model/domain/toEvent.ts

@@ -478,3 +478,41 @@ export const toCreateEventEServiceDescriptionUpdated = (
   },
   correlationId,
 });
+
+export const toCreateEventEServiceDescriptorDelegateSubmitted = (
+  version: number,
+  descriptorId: DescriptorId,
+  eservice: EService,
+  correlationId: string
+): CreateEvent<EServiceEvent> => ({
+  streamId: eservice.id,
+  version,
+  event: {
+    type: "EServiceDescriptorDelegateSubmitted",
+    event_version: 2,
+    data: {
+      descriptorId,
+      eservice: toEServiceV2(eservice),
+    },
+  },
+  correlationId,
+});
+
+export const toCreateEventEServiceDescriptorDelegatorApproved = (
+  version: number,
+  descriptorId: DescriptorId,
+  eservice: EService,
+  correlationId: string
+): CreateEvent<EServiceEvent> => ({
+  streamId: eservice.id,
+  version,
+  event: {
+    type: "EServiceDescriptorDelegatorApproved",
+    event_version: 2,
+    data: {
+      descriptorId,
+      eservice: toEServiceV2(eservice),
+    },
+  },
+  correlationId,
+});

packages/catalog-process/src/routers/EServiceRouter.ts

@@ -54,6 +54,7 @@ import {
   updateEServiceDescriptionErrorMapper,
   updateEServiceErrorMapper,
   updateRiskAnalysisErrorMapper,
+  approveDelegatedEServiceDescriptorErrorMapper,
 } from "../utilities/errorMappers.js";
 
 const readModelService = readModelServiceBuilder(
@@ -687,6 +688,29 @@ const eservicesRouter = (
           return res.status(errorRes.status).send(errorRes);
         }
       }
+    )
+    .post(
+      "/eservices/:eServiceId/descriptors/:descriptorId/approve",
+      authorizationMiddleware([ADMIN_ROLE]),
+      async (req, res) => {
+        const ctx = fromAppContext(req.ctx);
+
+        try {
+          await catalogService.approveDelegatedEServiceDescriptor(
+            unsafeBrandId(req.params.eServiceId),
+            unsafeBrandId(req.params.descriptorId),
+            ctx
+          );
+          return res.status(204).send();
+        } catch (error) {
+          const errorRes = makeApiProblem(
+            error,
+            approveDelegatedEServiceDescriptorErrorMapper,
+            ctx.logger
+          );
+          return res.status(errorRes.status).send(errorRes);
+        }
+      }
     );
   return eservicesRouter;
 };