IMN-657 GET EService descriptor by ID #712
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -109,7 +109,7 @@ export function toBffCatalogApiDescriptorAttribute( | |||||
| }); | ||||||
| } | ||||||
|
|
||||||
| export function toBffCatalogApiDescriptorDoc( | ||||||
| document: catalogApi.EServiceDoc | ||||||
| ): bffApi.EServiceDoc { | ||||||
| return { | ||||||
|
|
@@ -123,24 +123,27 @@ export function toBffCatalogApiDescriptorInterface( | |||||
| export function toBffCatalogApiEserviceRiskAnalysis( | ||||||
| riskAnalysis: catalogApi.EServiceRiskAnalysis | ||||||
| ): bffApi.EServiceRiskAnalysis { | ||||||
| const answers: { [key: string]: string[] } = | ||||||
| riskAnalysis.riskAnalysisForm.singleAnswers | ||||||
| .concat( | ||||||
| riskAnalysis.riskAnalysisForm.multiAnswers.flatMap((multiAnswer) => | ||||||
| multiAnswer.values.map((answerValue) => ({ | ||||||
| id: multiAnswer.id, | ||||||
| value: answerValue, | ||||||
| key: multiAnswer.key, | ||||||
| })) | ||||||
| ) | ||||||
| ) | ||||||
| .reduce((answers: { [key: string]: string[] }, answer) => { | ||||||
| const key = `${answer.key}`; | ||||||
Viktor-K marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| if (answers[key] && answer.value) { | ||||||
| answers[key] = [...answers[key], answer.value]; | ||||||
| } else { | ||||||
| answers[key] = []; | ||||||
AsterITA marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| } | ||||||
|
|
||||||
| return answers; | ||||||
| }, {}); | ||||||
|
|
||||||
| const riskAnalysisForm: bffApi.RiskAnalysisForm = { | ||||||
| riskAnalysisId: riskAnalysis.id, | ||||||
|
|
@@ -164,7 +167,7 @@ export function toBffCatalogApiProducerDescriptorEService( | |||||
| (m) => m.kind === tenantMailKind.ContactEmail | ||||||
|
There was a problem hiding this comment. I know the values are the same and that TS probably helps with this, but here you are comparing enums of different types:
Suggested change
There was a problem hiding this comment. Furthermore this commit move it to separate file |
||||||
| ); | ||||||
|
|
||||||
| const notDraftDecriptors: bffApi.CompactDescriptor[] = | ||||||
| eservice.descriptors.filter((d) => d.state !== descriptorApiState.DRAFT); | ||||||
|
|
||||||
| const draftDescriptor: bffApi.CompactDescriptor | undefined = | ||||||
|
|
@@ -184,7 +187,7 @@ export function toBffCatalogApiProducerDescriptorEService( | |||||
| riskAnalysis: eservice.riskAnalysis.map( | ||||||
| toBffCatalogApiEserviceRiskAnalysis | ||||||
| ), | ||||||
| descriptors: notDraftDecriptors, | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,16 +6,11 @@ import { | |||||
| bffApi, | ||||||
| attributeRegistryApi, | ||||||
| } from "pagopa-interop-api-clients"; | ||||||
| import { DescriptorId, EServiceId, unsafeBrandId } from "pagopa-interop-models"; | ||||||
| import { descriptorApiState } from "../model/api/catalogTypes.js"; | ||||||
| import { | ||||||
| toBffCatalogApiDescriptorAttribute, | ||||||
| toBffCatalogApiDescriptorDoc, | ||||||
| toBffCatalogApiEService, | ||||||
| toBffCatalogApiProducerDescriptorEService, | ||||||
| } from "../model/api/converters/catalogClientApiConverter.js"; | ||||||
|
|
@@ -50,7 +45,7 @@ const enhanceCatalogEService = | |||||
| requesterId: string | ||||||
| ): ((eservice: catalogApi.EService) => Promise<bffApi.CatalogEService>) => | ||||||
| async (eservice: catalogApi.EService): Promise<bffApi.CatalogEService> => { | ||||||
| const producerTenant = await tenantProcessClient.tenant.getTenant({ | ||||||
| headers, | ||||||
| params: { | ||||||
| id: eservice.producerId, | ||||||
|
|
@@ -59,7 +54,7 @@ const enhanceCatalogEService = | |||||
|
|
||||||
| const requesterTenant: tenantApi.Tenant = | ||||||
| requesterId !== eservice.producerId | ||||||
| ? await tenantProcessClient.tenant.getTenant({ | ||||||
| headers, | ||||||
| params: { | ||||||
| id: requesterId, | ||||||
|
|
@@ -129,6 +124,36 @@ const getBulkAttributes = async ( | |||||
| return await attributesBulk(0, []); | ||||||
| }; | ||||||
|
|
||||||
| const getEserviceDesciptor = ( | ||||||
|
There was a problem hiding this comment.
Suggested change
We can align this name with the other retrieves like this and we can fix the typo There was a problem hiding this comment. Done with this commit |
||||||
| eservice: catalogApi.EService, | ||||||
| descriptorId: DescriptorId | ||||||
| ): catalogApi.EServiceDescriptor => { | ||||||
| const descriptor = eservice.descriptors.find((e) => e.id === descriptorId); | ||||||
|
|
||||||
| if (!descriptor) { | ||||||
| throw eserviceDescriptorNotFound( | ||||||
| unsafeBrandId<EServiceId>(eservice.id), // catalogApi.EService type is missing branded types | ||||||
| descriptorId | ||||||
| ); | ||||||
| } | ||||||
|
|
||||||
| return descriptor; | ||||||
| }; | ||||||
|
|
||||||
| const getAttributeIds = ( | ||||||
| descriptor: catalogApi.EServiceDescriptor | ||||||
| ): string[] => [ | ||||||
| ...descriptor.attributes.certified.flatMap((atts) => | ||||||
| atts.map((att) => att.id) | ||||||
| ), | ||||||
| ...descriptor.attributes.declared.flatMap((atts) => | ||||||
| atts.map((att) => att.id) | ||||||
| ), | ||||||
| ...descriptor.attributes.verified.flatMap((atts) => | ||||||
| atts.map((att) => att.id) | ||||||
| ), | ||||||
| ]; | ||||||
|
|
||||||
| export function catalogServiceBuilder( | ||||||
| catalogProcessClient: CatalogProcessClient, | ||||||
| tenantProcessClient: TenantProcessClient, | ||||||
|
|
@@ -176,8 +201,8 @@ export function catalogServiceBuilder( | |||||
| return response; | ||||||
| }, | ||||||
| getProducerEServiceDescriptor: async ( | ||||||
| eserviceId: EServiceId, | ||||||
AsterITA marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| descriptorId: DescriptorId, | ||||||
| context: WithLogger<BffAppContext> | ||||||
| ): Promise<bffApi.ProducerEServiceDescriptor> => { | ||||||
| const requesterId = context.authData.organizationId; | ||||||
|
|
@@ -186,40 +211,18 @@ export function catalogServiceBuilder( | |||||
| const eservice: catalogApi.EService = | ||||||
| await catalogProcessClient.getEServiceById({ | ||||||
| params: { | ||||||
| eServiceId: eserviceId, | ||||||
| }, | ||||||
| headers, | ||||||
| }); | ||||||
|
|
||||||
| if (eservice.producerId !== requesterId) { | ||||||
| throw invalidEServiceRequester(eserviceId, requesterId); | ||||||
| } | ||||||
|
|
||||||
| const descriptor = getEserviceDesciptor(eservice, descriptorId); | ||||||
|
|
||||||
| const descriptorAttributeIds = getAttributeIds(descriptor); | ||||||
|
|
||||||
| const attributes = await getBulkAttributes( | ||||||
| attributeProcessClient, | ||||||
|
|
@@ -248,7 +251,7 @@ export function catalogServiceBuilder( | |||||
| ], | ||||||
| }; | ||||||
|
|
||||||
| const requesterTenant = await tenantProcessClient.tenant.getTenant({ | ||||||
| headers, | ||||||
| params: { | ||||||
| id: requesterId, | ||||||
|
|
@@ -261,8 +264,8 @@ export function catalogServiceBuilder( | |||||
| description: descriptor.description, | ||||||
| interface: | ||||||
| descriptor.interface && | ||||||
| toBffCatalogApiDescriptorDoc(descriptor.interface), | ||||||
| docs: descriptor.docs.map(toBffCatalogApiDescriptorDoc), | ||||||
| state: descriptor.state, | ||||||
| audience: descriptor.audience, | ||||||
| voucherLifespan: descriptor.voucherLifespan, | ||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you reuse type from bffApi.RiskAnalysisForm?