From 2c9dbce1c09333b4be319ffad62922089b5dfd58 Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Mon, 11 Nov 2024 10:46:05 +0100 Subject: [PATCH 01/11] change eservice process --- packages/api-clients/open-api/catalogApi.yml | 4 ++++ packages/catalog-process/src/services/catalogService.ts | 2 ++ packages/models/proto/v2/eservice/eservice.proto | 1 + packages/models/src/eservice/eservice.ts | 1 + packages/models/src/eservice/protobufConverterToV2.ts | 1 + 5 files changed, 9 insertions(+) diff --git a/packages/api-clients/open-api/catalogApi.yml b/packages/api-clients/open-api/catalogApi.yml index ddd8cbc3a0..e6c78b66ea 100644 --- a/packages/api-clients/open-api/catalogApi.yml +++ b/packages/api-clients/open-api/catalogApi.yml @@ -1128,6 +1128,8 @@ components: $ref: "#/components/schemas/DescriptorSeedForEServiceCreation" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean UpdateEServiceSeed: type: object additionalProperties: false @@ -1151,6 +1153,8 @@ components: $ref: "#/components/schemas/EServiceMode" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean DescriptorSeedForEServiceCreation: required: - audience diff --git a/packages/catalog-process/src/services/catalogService.ts b/packages/catalog-process/src/services/catalogService.ts index e5ecf618e1..8afcb21b34 100644 --- a/packages/catalog-process/src/services/catalogService.ts +++ b/packages/catalog-process/src/services/catalogService.ts @@ -437,6 +437,7 @@ export function catalogServiceBuilder( createdAt: creationDate, riskAnalysis: [], isSignalHubEnabled: seed.isSignalHubEnabled, + isDelegable: seed.isDelegable, }; const eserviceCreationEvent = toCreateEventEServiceAdded( @@ -558,6 +559,7 @@ export function catalogServiceBuilder( })) : eservice.data.descriptors, isSignalHubEnabled: eserviceSeed.isSignalHubEnabled, + isDelegable: eserviceSeed.isDelegable, }; const event = toCreateEventEServiceUpdated( diff --git a/packages/models/proto/v2/eservice/eservice.proto b/packages/models/proto/v2/eservice/eservice.proto index 4ea2a1c389..b8bf626598 100644 --- a/packages/models/proto/v2/eservice/eservice.proto +++ b/packages/models/proto/v2/eservice/eservice.proto @@ -13,6 +13,7 @@ message EServiceV2 { repeated EServiceRiskAnalysisV2 riskAnalysis = 8; EServiceModeV2 mode = 9; optional bool isSignalHubEnabled = 10; + optional bool isDelegable = 11; } diff --git a/packages/models/src/eservice/eservice.ts b/packages/models/src/eservice/eservice.ts index 4d6235171e..059349934a 100644 --- a/packages/models/src/eservice/eservice.ts +++ b/packages/models/src/eservice/eservice.ts @@ -106,5 +106,6 @@ export const EService = z.object({ riskAnalysis: z.array(RiskAnalysis), mode: EServiceMode, isSignalHubEnabled: z.boolean().optional(), + isDelegable: z.boolean().optional(), }); export type EService = z.infer; diff --git a/packages/models/src/eservice/protobufConverterToV2.ts b/packages/models/src/eservice/protobufConverterToV2.ts index 893ac2c4e9..9f0ad32b49 100644 --- a/packages/models/src/eservice/protobufConverterToV2.ts +++ b/packages/models/src/eservice/protobufConverterToV2.ts @@ -120,4 +120,5 @@ export const toEServiceV2 = (eservice: EService): EServiceV2 => ({ createdAt: dateToBigInt(eservice.createdAt), mode: toEServiceModeV2(eservice.mode), riskAnalysis: eservice.riskAnalysis.map(toRiskAnalysisV2), + isDelegable: eservice.isDelegable, }); From cd1c0ee1d4a368487177f38b7b46eb9648291ce9 Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Mon, 11 Nov 2024 11:39:07 +0100 Subject: [PATCH 02/11] return idDelegable field --- packages/api-clients/open-api/bffApi.yml | 2 ++ packages/api-clients/open-api/catalogApi.yml | 2 ++ packages/backend-for-frontend/src/api/catalogApiConverter.ts | 1 + packages/catalog-process/src/model/domain/apiConverter.ts | 1 + 4 files changed, 6 insertions(+) diff --git a/packages/api-clients/open-api/bffApi.yml b/packages/api-clients/open-api/bffApi.yml index 2c9ab3e0e7..9232c16a05 100644 --- a/packages/api-clients/open-api/bffApi.yml +++ b/packages/api-clients/open-api/bffApi.yml @@ -13535,6 +13535,8 @@ components: type: boolean activeDescriptor: $ref: "#/components/schemas/CompactDescriptor" + idDelegable: + type: boolean ClientKind: type: string enum: diff --git a/packages/api-clients/open-api/catalogApi.yml b/packages/api-clients/open-api/catalogApi.yml index e6c78b66ea..98478835d0 100644 --- a/packages/api-clients/open-api/catalogApi.yml +++ b/packages/api-clients/open-api/catalogApi.yml @@ -1463,6 +1463,8 @@ components: $ref: "#/components/schemas/EServiceMode" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean EServiceMode: type: string description: Risk Analysis Mode diff --git a/packages/backend-for-frontend/src/api/catalogApiConverter.ts b/packages/backend-for-frontend/src/api/catalogApiConverter.ts index a04d60189f..572d0bad03 100644 --- a/packages/backend-for-frontend/src/api/catalogApiConverter.ts +++ b/packages/backend-for-frontend/src/api/catalogApiConverter.ts @@ -61,6 +61,7 @@ export function toBffCatalogApiEService( activeDescriptor, requesterTenant ), + isDelegable: eservice.isDelegable, }; return { diff --git a/packages/catalog-process/src/model/domain/apiConverter.ts b/packages/catalog-process/src/model/domain/apiConverter.ts index 70e0d2a969..075efa5734 100644 --- a/packages/catalog-process/src/model/domain/apiConverter.ts +++ b/packages/catalog-process/src/model/domain/apiConverter.ts @@ -196,4 +196,5 @@ export const eServiceToApiEService = ( })), descriptors: eservice.descriptors.map(descriptorToApiDescriptor), isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, }); From fe9117d486a27dd588cdd328579f3c41ea17c4c6 Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Mon, 11 Nov 2024 15:06:30 +0100 Subject: [PATCH 03/11] add minimal test --- packages/catalog-process/test/createEService.test.ts | 4 ++++ packages/catalog-process/test/getEserviceById.test.ts | 1 + packages/catalog-process/test/getEservices.test.ts | 1 + packages/catalog-process/test/updateEservice.test.ts | 1 + 4 files changed, 7 insertions(+) diff --git a/packages/catalog-process/test/createEService.test.ts b/packages/catalog-process/test/createEService.test.ts index 8b16fcfe35..ae3e615056 100644 --- a/packages/catalog-process/test/createEService.test.ts +++ b/packages/catalog-process/test/createEService.test.ts @@ -4,6 +4,7 @@ import { decodeProtobufPayload, getMockDescriptor, randomArrayItem, + randomBoolean, readEventByStreamIdAndVersion, } from "pagopa-interop-commons-test/index.js"; import { @@ -41,6 +42,8 @@ describe("create eservice", () => { }); it("should write on event-store for the creation of an eservice", async () => { const isSignalHubEnabled = randomArrayItem([false, true, undefined]); + const isDelegable = randomBoolean(); + const eservice = await catalogService.createEService( { name: mockEService.name, @@ -49,6 +52,7 @@ describe("create eservice", () => { mode: "DELIVER", descriptor: buildDescriptorSeedForEserviceCreation(mockDescriptor), isSignalHubEnabled, + isDelegable, }, { authData: getMockAuthData(mockEService.producerId), diff --git a/packages/catalog-process/test/getEserviceById.test.ts b/packages/catalog-process/test/getEserviceById.test.ts index af88cf1782..fe5fbc965e 100644 --- a/packages/catalog-process/test/getEserviceById.test.ts +++ b/packages/catalog-process/test/getEserviceById.test.ts @@ -33,6 +33,7 @@ describe("get eservice by id", () => { id: generateId(), name: "eservice 001", descriptors: [descriptor1], + isDelegable: true, }; await addOneEService(eservice1); const authData: AuthData = { diff --git a/packages/catalog-process/test/getEservices.test.ts b/packages/catalog-process/test/getEservices.test.ts index 49dacf79ac..a34895718d 100644 --- a/packages/catalog-process/test/getEservices.test.ts +++ b/packages/catalog-process/test/getEservices.test.ts @@ -60,6 +60,7 @@ describe("get eservices", () => { name: "eservice 001 test", descriptors: [descriptor1], producerId: organizationId1, + isDelegable: true, }; await addOneEService(eservice1); diff --git a/packages/catalog-process/test/updateEservice.test.ts b/packages/catalog-process/test/updateEservice.test.ts index bf454c4542..6640035e99 100644 --- a/packages/catalog-process/test/updateEservice.test.ts +++ b/packages/catalog-process/test/updateEservice.test.ts @@ -72,6 +72,7 @@ describe("update eService", () => { ...eservice, name: updatedName, isSignalHubEnabled, + isDelegable, }; const writtenEvent = await readLastEserviceEvent(mockEService.id); From 0f7ec96bfc598d7a1cc6e88e015f9ee05bd4117b Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Mon, 11 Nov 2024 17:07:20 +0100 Subject: [PATCH 04/11] fix typo --- packages/api-clients/open-api/bffApi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api-clients/open-api/bffApi.yml b/packages/api-clients/open-api/bffApi.yml index 9232c16a05..452fd8baa1 100644 --- a/packages/api-clients/open-api/bffApi.yml +++ b/packages/api-clients/open-api/bffApi.yml @@ -13535,7 +13535,7 @@ components: type: boolean activeDescriptor: $ref: "#/components/schemas/CompactDescriptor" - idDelegable: + isDelegable: type: boolean ClientKind: type: string From a8eff9f4291ff2419d3103a8caec69d940b628f3 Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Tue, 12 Nov 2024 17:03:13 +0100 Subject: [PATCH 05/11] update outbound models --- .../agreement-outbound-writer/package.json | 2 +- packages/catalog-outbound-writer/package.json | 2 +- packages/purpose-outbound-writer/package.json | 2 +- packages/tenant-outbound-writer/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/agreement-outbound-writer/package.json b/packages/agreement-outbound-writer/package.json index c414df4e13..af29cfc9b2 100644 --- a/packages/agreement-outbound-writer/package.json +++ b/packages/agreement-outbound-writer/package.json @@ -29,7 +29,7 @@ "vitest": "1.6.0" }, "dependencies": { - "@pagopa/interop-outbound-models": "1.0.6-b", + "@pagopa/interop-outbound-models": "1.0.6-f", "@protobuf-ts/runtime": "2.9.4", "connection-string": "4.4.0", "dotenv-flow": "4.1.0", diff --git a/packages/catalog-outbound-writer/package.json b/packages/catalog-outbound-writer/package.json index 1cd5b3c363..582b253c3f 100644 --- a/packages/catalog-outbound-writer/package.json +++ b/packages/catalog-outbound-writer/package.json @@ -29,7 +29,7 @@ "vitest": "1.6.0" }, "dependencies": { - "@pagopa/interop-outbound-models": "1.0.6-b", + "@pagopa/interop-outbound-models": "1.0.6-f", "@protobuf-ts/runtime": "2.9.4", "connection-string": "4.4.0", "dotenv-flow": "4.1.0", diff --git a/packages/purpose-outbound-writer/package.json b/packages/purpose-outbound-writer/package.json index 857f575ae2..9577e7eeb8 100644 --- a/packages/purpose-outbound-writer/package.json +++ b/packages/purpose-outbound-writer/package.json @@ -29,7 +29,7 @@ "vitest": "1.6.0" }, "dependencies": { - "@pagopa/interop-outbound-models": "1.0.6-b", + "@pagopa/interop-outbound-models": "1.0.6-f", "@protobuf-ts/runtime": "2.9.4", "connection-string": "4.4.0", "dotenv-flow": "4.1.0", diff --git a/packages/tenant-outbound-writer/package.json b/packages/tenant-outbound-writer/package.json index 7a950f251c..45e003a3c4 100644 --- a/packages/tenant-outbound-writer/package.json +++ b/packages/tenant-outbound-writer/package.json @@ -29,7 +29,7 @@ "vitest": "1.6.0" }, "dependencies": { - "@pagopa/interop-outbound-models": "1.0.6-b", + "@pagopa/interop-outbound-models": "1.0.6-f", "@protobuf-ts/runtime": "2.9.4", "connection-string": "4.4.0", "dotenv-flow": "4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a4d8f45bdd..ea1d4cf573 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -98,8 +98,8 @@ importers: packages/agreement-outbound-writer: dependencies: '@pagopa/interop-outbound-models': - specifier: 1.0.6-b - version: 1.0.6-b + specifier: 1.0.6-f + version: 1.0.6-f '@protobuf-ts/runtime': specifier: 2.9.4 version: 2.9.4 @@ -975,8 +975,8 @@ importers: packages/catalog-outbound-writer: dependencies: '@pagopa/interop-outbound-models': - specifier: 1.0.6-b - version: 1.0.6-b + specifier: 1.0.6-f + version: 1.0.6-f '@protobuf-ts/runtime': specifier: 2.9.4 version: 2.9.4 @@ -2449,8 +2449,8 @@ importers: packages/purpose-outbound-writer: dependencies: '@pagopa/interop-outbound-models': - specifier: 1.0.6-b - version: 1.0.6-b + specifier: 1.0.6-f + version: 1.0.6-f '@protobuf-ts/runtime': specifier: 2.9.4 version: 2.9.4 @@ -2754,8 +2754,8 @@ importers: packages/tenant-outbound-writer: dependencies: '@pagopa/interop-outbound-models': - specifier: 1.0.6-b - version: 1.0.6-b + specifier: 1.0.6-f + version: 1.0.6-f '@protobuf-ts/runtime': specifier: 2.9.4 version: 2.9.4 @@ -4111,8 +4111,8 @@ packages: '@pagopa/eslint-config@3.0.0': resolution: {integrity: sha512-eYIPdiuYRbRPR5k0OuteRNqYb0Z2nfJ/lZohejB7ylfBeSDWwkaV8Z19AXP4RymE6oEesyPDZ6i0yNaE9tQrHw==} - '@pagopa/interop-outbound-models@1.0.6-b': - resolution: {integrity: sha512-yxGueush6nX1XqU4/WHueJwNcZ56XCNDkz44RPPXLWCJSucLrw9gKO9Mc3kUA/ocGd0mIsLYOCnuRpr42Pw7Iw==} + '@pagopa/interop-outbound-models@1.0.6-f': + resolution: {integrity: sha512-5v3AU4qvwxf5jpPN0dz63w05Dq6Hfs1zW0/ETupL/QOzmsBYyDtYQQgxwEzAyUYM5Z9q16lD2BYhtQU+gRIZhw==} '@pdf-lib/standard-fonts@1.0.0': resolution: {integrity: sha512-hU30BK9IUN/su0Mn9VdlVKsWBS6GyhVfqjwl1FjZN4TxP6cCw0jP2w7V3Hf5uX7M0AZJ16vey9yE0ny7Sa59ZA==} @@ -10640,7 +10640,7 @@ snapshots: - tsutils - typescript - '@pagopa/interop-outbound-models@1.0.6-b': + '@pagopa/interop-outbound-models@1.0.6-f': dependencies: '@protobuf-ts/runtime': 2.9.4 ts-pattern: 5.2.0 From 1bf21ef7b3fbc91f94cd333ac31686d0bce2cf0e Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Tue, 12 Nov 2024 17:27:02 +0100 Subject: [PATCH 06/11] fix --- packages/catalog-process/test/createEService.test.ts | 1 + packages/catalog-process/test/updateEservice.test.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/packages/catalog-process/test/createEService.test.ts b/packages/catalog-process/test/createEService.test.ts index ae3e615056..b6a3a71ce6 100644 --- a/packages/catalog-process/test/createEService.test.ts +++ b/packages/catalog-process/test/createEService.test.ts @@ -100,6 +100,7 @@ describe("create eservice", () => { id: eservice.id, descriptors: [], isSignalHubEnabled, + isDelegable, }; const expectedEserviceWithDescriptor: EService = { ...mockEService, diff --git a/packages/catalog-process/test/updateEservice.test.ts b/packages/catalog-process/test/updateEservice.test.ts index 6640035e99..64b005b1ba 100644 --- a/packages/catalog-process/test/updateEservice.test.ts +++ b/packages/catalog-process/test/updateEservice.test.ts @@ -40,6 +40,8 @@ describe("update eService", () => { vi.spyOn(fileManager, "delete"); const isSignalHubEnabled = randomArrayItem([false, true, undefined]); + const isDelegable = randomArrayItem([false, true, undefined]); + const descriptor: Descriptor = { ...getMockDescriptor(), state: descriptorState.draft, @@ -59,6 +61,7 @@ describe("update eService", () => { technology: "REST", mode: "DELIVER", isSignalHubEnabled, + isDelegable, }, { authData: getMockAuthData(mockEService.producerId), From 29abdd0f51d8abd8342b91688cfc124fb29fcb0b Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Wed, 13 Nov 2024 09:29:01 +0100 Subject: [PATCH 07/11] fix test --- packages/catalog-process/test/createEService.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/catalog-process/test/createEService.test.ts b/packages/catalog-process/test/createEService.test.ts index b6a3a71ce6..ce33e21c05 100644 --- a/packages/catalog-process/test/createEService.test.ts +++ b/packages/catalog-process/test/createEService.test.ts @@ -4,7 +4,6 @@ import { decodeProtobufPayload, getMockDescriptor, randomArrayItem, - randomBoolean, readEventByStreamIdAndVersion, } from "pagopa-interop-commons-test/index.js"; import { @@ -42,7 +41,7 @@ describe("create eservice", () => { }); it("should write on event-store for the creation of an eservice", async () => { const isSignalHubEnabled = randomArrayItem([false, true, undefined]); - const isDelegable = randomBoolean(); + const isDelegable = randomArrayItem([false, true, undefined]); const eservice = await catalogService.createEService( { @@ -107,6 +106,7 @@ describe("create eservice", () => { createdAt: new Date(), id: eservice.id, isSignalHubEnabled, + isDelegable, descriptors: [ { ...mockDescriptor, From 38e56fef35cc903e031e1a06fa52ed9c8d26796b Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Mon, 18 Nov 2024 11:40:41 +0100 Subject: [PATCH 08/11] fixes --- packages/api-clients/open-api/bffApi.yml | 2 -- packages/backend-for-frontend/src/api/catalogApiConverter.ts | 1 - packages/catalog-process/test/getEserviceById.test.ts | 1 + packages/models/src/eservice/protobufConverterToV2.ts | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/api-clients/open-api/bffApi.yml b/packages/api-clients/open-api/bffApi.yml index fceb30e246..d7f0e07206 100644 --- a/packages/api-clients/open-api/bffApi.yml +++ b/packages/api-clients/open-api/bffApi.yml @@ -13535,8 +13535,6 @@ components: type: boolean activeDescriptor: $ref: "#/components/schemas/CompactDescriptor" - isDelegable: - type: boolean ClientKind: type: string enum: diff --git a/packages/backend-for-frontend/src/api/catalogApiConverter.ts b/packages/backend-for-frontend/src/api/catalogApiConverter.ts index 572d0bad03..a04d60189f 100644 --- a/packages/backend-for-frontend/src/api/catalogApiConverter.ts +++ b/packages/backend-for-frontend/src/api/catalogApiConverter.ts @@ -61,7 +61,6 @@ export function toBffCatalogApiEService( activeDescriptor, requesterTenant ), - isDelegable: eservice.isDelegable, }; return { diff --git a/packages/catalog-process/test/getEserviceById.test.ts b/packages/catalog-process/test/getEserviceById.test.ts index fe5fbc965e..413fb2573b 100644 --- a/packages/catalog-process/test/getEserviceById.test.ts +++ b/packages/catalog-process/test/getEserviceById.test.ts @@ -33,6 +33,7 @@ describe("get eservice by id", () => { id: generateId(), name: "eservice 001", descriptors: [descriptor1], + isSignalHubEnabled: true, isDelegable: true, }; await addOneEService(eservice1); diff --git a/packages/models/src/eservice/protobufConverterToV2.ts b/packages/models/src/eservice/protobufConverterToV2.ts index 9f0ad32b49..893ac2c4e9 100644 --- a/packages/models/src/eservice/protobufConverterToV2.ts +++ b/packages/models/src/eservice/protobufConverterToV2.ts @@ -120,5 +120,4 @@ export const toEServiceV2 = (eservice: EService): EServiceV2 => ({ createdAt: dateToBigInt(eservice.createdAt), mode: toEServiceModeV2(eservice.mode), riskAnalysis: eservice.riskAnalysis.map(toRiskAnalysisV2), - isDelegable: eservice.isDelegable, }); From dfcfdbbe06145d3c60a7c951deb13ed040beb302 Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Tue, 19 Nov 2024 15:01:02 +0100 Subject: [PATCH 09/11] add missing isDelegable prop --- packages/api-clients/open-api/apiGatewayApi.yml | 2 ++ packages/api-clients/open-api/bffApi.yml | 10 ++++++++++ packages/api-gateway/src/services/catalogService.ts | 1 + .../src/api/catalogApiConverter.ts | 2 ++ packages/backend-for-frontend/src/model/types.ts | 1 + .../src/services/catalogService.ts | 2 ++ .../backend-for-frontend/src/utilities/fileUtils.ts | 1 + 7 files changed, 19 insertions(+) diff --git a/packages/api-clients/open-api/apiGatewayApi.yml b/packages/api-clients/open-api/apiGatewayApi.yml index 299022dad9..414548b461 100644 --- a/packages/api-clients/open-api/apiGatewayApi.yml +++ b/packages/api-clients/open-api/apiGatewayApi.yml @@ -2619,6 +2619,8 @@ components: type: string isSignalHubEnabled: type: boolean + isDelegable: + type: boolean EServiceAttributes: description: the attributes set associated to the EService properties: diff --git a/packages/api-clients/open-api/bffApi.yml b/packages/api-clients/open-api/bffApi.yml index 5b8c78fe63..d2345409d5 100644 --- a/packages/api-clients/open-api/bffApi.yml +++ b/packages/api-clients/open-api/bffApi.yml @@ -12973,6 +12973,8 @@ components: $ref: "#/components/schemas/EServiceMode" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean EServiceSeed: type: object additionalProperties: false @@ -12992,6 +12994,8 @@ components: $ref: "#/components/schemas/EServiceMode" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean UpdateEServiceDescriptorQuotas: required: - voucherLifespan @@ -13239,6 +13243,8 @@ components: $ref: "#/components/schemas/Mail" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean ProducerEServiceDetails: type: object additionalProperties: false @@ -13267,6 +13273,8 @@ components: $ref: "#/components/schemas/EServiceRiskAnalysis" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean EServiceMode: type: string description: Risk Analysis Mode @@ -13394,6 +13402,8 @@ components: $ref: "#/components/schemas/Mail" isSignalHubEnabled: type: boolean + isDelegable: + type: boolean EServiceDoc: type: object additionalProperties: false diff --git a/packages/api-gateway/src/services/catalogService.ts b/packages/api-gateway/src/services/catalogService.ts index 08fd23d14d..8765e5e934 100644 --- a/packages/api-gateway/src/services/catalogService.ts +++ b/packages/api-gateway/src/services/catalogService.ts @@ -255,5 +255,6 @@ export async function enhanceEservice( serverUrls: latestNonDraftDescriptor.serverUrls, producer: producerOrganization, isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, }; } diff --git a/packages/backend-for-frontend/src/api/catalogApiConverter.ts b/packages/backend-for-frontend/src/api/catalogApiConverter.ts index a04d60189f..af0c8f6df3 100644 --- a/packages/backend-for-frontend/src/api/catalogApiConverter.ts +++ b/packages/backend-for-frontend/src/api/catalogApiConverter.ts @@ -119,6 +119,7 @@ export function toBffCatalogDescriptorEService( toBffCatalogApiEserviceRiskAnalysis ), isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, }; } @@ -265,6 +266,7 @@ export function toBffCatalogApiProducerDescriptorEService( ), descriptors: notDraftDecriptors, isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, }; } diff --git a/packages/backend-for-frontend/src/model/types.ts b/packages/backend-for-frontend/src/model/types.ts index ca16209444..5440dcff86 100644 --- a/packages/backend-for-frontend/src/model/types.ts +++ b/packages/backend-for-frontend/src/model/types.ts @@ -208,5 +208,6 @@ export const ConfigurationEservice = z.object({ descriptor: ConfigurationDescriptor, riskAnalysis: z.array(ConfigurationRiskAnalysis), isSignalHubEnabled: z.boolean().optional(), + isDelegable: z.boolean().optional(), }); export type ConfigurationEservice = z.infer; diff --git a/packages/backend-for-frontend/src/services/catalogService.ts b/packages/backend-for-frontend/src/services/catalogService.ts index 468a8d66dd..a33f8a9e24 100644 --- a/packages/backend-for-frontend/src/services/catalogService.ts +++ b/packages/backend-for-frontend/src/services/catalogService.ts @@ -326,6 +326,7 @@ export function catalogServiceBuilder( toBffCatalogApiEserviceRiskAnalysis ), isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, }; }, updateEServiceDescription: async ( @@ -1131,6 +1132,7 @@ export function catalogServiceBuilder( importedEservice.descriptor.agreementApprovalPolicy, }, isSignalHubEnabled: importedEservice.isSignalHubEnabled, + isDelegable: importedEservice.isDelegable, }; const pollEServiceById = createPollingByCondition(() => diff --git a/packages/backend-for-frontend/src/utilities/fileUtils.ts b/packages/backend-for-frontend/src/utilities/fileUtils.ts index a9a3fde57e..c5fe21a36d 100644 --- a/packages/backend-for-frontend/src/utilities/fileUtils.ts +++ b/packages/backend-for-frontend/src/utilities/fileUtils.ts @@ -81,6 +81,7 @@ export function buildJsonConfig( technology: eservice.technology, mode: eservice.mode, isSignalHubEnabled: eservice.isSignalHubEnabled, + isDelegable: eservice.isDelegable, descriptor: { interface: descriptor.interface && { prettyName: descriptor.interface.prettyName, From 633f044a802121c10096f88d425f30f3910f0087 Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Tue, 19 Nov 2024 15:27:08 +0100 Subject: [PATCH 10/11] update bruno files --- collections/bff/catalog/Create a new EService.bru | 3 ++- .../bff/catalog/Update EService general information.bru | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/collections/bff/catalog/Create a new EService.bru b/collections/bff/catalog/Create a new EService.bru index 8408371e64..840278bf98 100644 --- a/collections/bff/catalog/Create a new EService.bru +++ b/collections/bff/catalog/Create a new EService.bru @@ -21,7 +21,8 @@ body:json { "description": "This is a test from BFF", "technology": "SOAP", "mode": "DELIVER", - "isSignalHubEnabled": true + "isSignalHubEnabled": true, + "isDelegable": true } } diff --git a/collections/bff/catalog/Update EService general information.bru b/collections/bff/catalog/Update EService general information.bru index cd157529e0..9122bdc17b 100644 --- a/collections/bff/catalog/Update EService general information.bru +++ b/collections/bff/catalog/Update EService general information.bru @@ -25,7 +25,8 @@ body:json { "description": "test eservice updated from BFF", "technology": "SOAP", "mode": "RECEIVE", - "isSignalHubEnabled": false + "isSignalHubEnabled": false, + "isDelegable": false } } From 68b1dc7db14cd50cbf595ae05dc2373e082e2e52 Mon Sep 17 00:00:00 2001 From: Simone Camito Date: Tue, 19 Nov 2024 17:21:11 +0100 Subject: [PATCH 11/11] add missing isSignalHubEnabled --- packages/catalog-process/test/getEservices.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/catalog-process/test/getEservices.test.ts b/packages/catalog-process/test/getEservices.test.ts index a34895718d..c1c8ae0374 100644 --- a/packages/catalog-process/test/getEservices.test.ts +++ b/packages/catalog-process/test/getEservices.test.ts @@ -60,6 +60,7 @@ describe("get eservices", () => { name: "eservice 001 test", descriptors: [descriptor1], producerId: organizationId1, + isSignalHubEnabled: true, isDelegable: true, }; await addOneEService(eservice1);