IMN-851 - Removing with attributes models and converters (#1041)

pagopa · Oct 3, 2024 · efbf9ac · efbf9ac
1 parent 7eb6d3b
commit efbf9ac
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 86 deletions.
diff --git a/packages/agreement-lifecycle/src/filters/attributesFilter.ts b/packages/agreement-lifecycle/src/filters/attributesFilter.ts
@@ -3,17 +3,17 @@
 import {
   CertifiedTenantAttribute,
   DeclaredTenantAttribute,
+  TenantAttribute,
   TenantId,
   VerifiedTenantAttribute,
   tenantAttributeType,
 } from "pagopa-interop-models";
-import { TenantWithOnlyAttributes } from "../models/models.js";
 
 export const filterVerifiedAttributes = (
   producerId: TenantId,
-  tenant: TenantWithOnlyAttributes
+  tenantAttributes: TenantAttribute[]
 ): VerifiedTenantAttribute[] =>
-  tenant.attributes.filter(
+  tenantAttributes.filter(
     (att) =>
       att.type === tenantAttributeType.VERIFIED &&
       att.verifiedBy.find(
@@ -24,17 +24,17 @@ export const filterVerifiedAttributes = (
   ) as VerifiedTenantAttribute[];
 
 export const filterCertifiedAttributes = (
-  tenant: TenantWithOnlyAttributes
+  tenantAttributes: TenantAttribute[]
 ): CertifiedTenantAttribute[] =>
-  tenant.attributes.filter(
+  tenantAttributes.filter(
     (att) =>
       att.type === tenantAttributeType.CERTIFIED && !att.revocationTimestamp
   ) as CertifiedTenantAttribute[];
 
 export const filterDeclaredAttributes = (
-  tenant: TenantWithOnlyAttributes
+  tenantAttributes: TenantAttribute[]
 ): DeclaredTenantAttribute[] =>
-  tenant.attributes.filter(
+  tenantAttributes.filter(
     (att) =>
       att.type === tenantAttributeType.DECLARED && !att.revocationTimestamp
   ) as DeclaredTenantAttribute[];
diff --git a/packages/agreement-lifecycle/src/index.ts b/packages/agreement-lifecycle/src/index.ts
@@ -1,3 +1,2 @@
 export * from "./validator/attributesValidator.js";
 export * from "./filters/attributesFilter.js";
-export * from "./models/models.js";
diff --git a/packages/agreement-lifecycle/src/models/models.ts b/packages/agreement-lifecycle/src/models/models.ts
diff --git a/packages/agreement-lifecycle/src/validator/attributesValidator.ts b/packages/agreement-lifecycle/src/validator/attributesValidator.ts
@@ -1,7 +1,5 @@
 import {
   Descriptor,
-  CompactTenant,
-  Tenant,
   TenantId,
   EServiceAttribute,
   TenantAttribute,
@@ -11,61 +9,52 @@ import {
   filterDeclaredAttributes,
   filterVerifiedAttributes,
 } from "../filters/attributesFilter.js";
-import {
-  DescriptorWithOnlyAttributes,
-  TenantWithOnlyAttributes,
-} from "../models/models.js";
 
 const attributesSatisfied = (
   descriptorAttributes: EServiceAttribute[][],
-  consumerAttributeIds: Array<TenantAttribute["id"]>
+  tenantAttributes: Array<TenantAttribute["id"]>
 ): boolean =>
   descriptorAttributes
     .filter((attGroup) => attGroup.length > 0)
     .every((attributeList) => {
       const attributes = attributeList.map((a) => a.id);
-      return (
-        attributes.filter((a) => consumerAttributeIds.includes(a)).length > 0
-      );
+      return attributes.filter((a) => tenantAttributes.includes(a)).length > 0;
     });
 
 export const certifiedAttributesSatisfied = (
-  descriptor: DescriptorWithOnlyAttributes,
-  tenant: TenantWithOnlyAttributes
+  descriptorAttributes: Descriptor["attributes"],
+  tenantAttributes: TenantAttribute[]
 ): boolean => {
-  const certifiedAttributes = filterCertifiedAttributes(tenant).map(
+  const certifiedAttributes = filterCertifiedAttributes(tenantAttributes).map(
     (a) => a.id
   );
 
   return attributesSatisfied(
-    descriptor.attributes.certified,
+    descriptorAttributes.certified,
     certifiedAttributes
   );
 };
 
 export const declaredAttributesSatisfied = (
-  descriptor: Descriptor,
-  tenant: Tenant | CompactTenant
+  descriptorAttributes: Descriptor["attributes"],
+  tenantAttributes: TenantAttribute[]
 ): boolean => {
-  const declaredAttributes = filterDeclaredAttributes(tenant).map((a) => a.id);
-
-  return attributesSatisfied(
-    descriptor.attributes.declared,
-    declaredAttributes
+  const declaredAttributes = filterDeclaredAttributes(tenantAttributes).map(
+    (a) => a.id
   );
+
+  return attributesSatisfied(descriptorAttributes.declared, declaredAttributes);
 };
 
 export const verifiedAttributesSatisfied = (
   producerId: TenantId,
-  descriptor: Descriptor,
-  tenant: Tenant | CompactTenant
+  descriptorAttributes: Descriptor["attributes"],
+  tenantAttributes: TenantAttribute[]
 ): boolean => {
-  const verifiedAttributes = filterVerifiedAttributes(producerId, tenant).map(
-    (a) => a.id
-  );
+  const verifiedAttributes = filterVerifiedAttributes(
+    producerId,
+    tenantAttributes
+  ).map((a) => a.id);
 
-  return attributesSatisfied(
-    descriptor.attributes.verified,
-    verifiedAttributes
-  );
+  return attributesSatisfied(descriptorAttributes.verified, verifiedAttributes);
 };
diff --git a/packages/agreement-process/src/model/domain/agreement-validators.ts b/packages/agreement-process/src/model/domain/agreement-validators.ts
@@ -269,7 +269,9 @@ export const validateCertifiedAttributes = ({
   descriptor: Descriptor;
   consumer: Tenant;
 }): void => {
-  if (!certifiedAttributesSatisfied(descriptor, consumer)) {
+  if (
+    !certifiedAttributesSatisfied(descriptor.attributes, consumer.attributes)
+  ) {
     throw missingCertifiedAttributesError(descriptor.id, consumer.id);
   }
 };
@@ -366,9 +368,9 @@ export const matchingCertifiedAttributes = (
   descriptor: Descriptor,
   consumer: Tenant
 ): CertifiedAgreementAttribute[] => {
-  const certifiedAttributes = filterCertifiedAttributes(consumer).map(
-    (a) => a.id
-  );
+  const certifiedAttributes = filterCertifiedAttributes(
+    consumer.attributes
+  ).map((a) => a.id);
 
   return matchingAttributes(
     descriptor.attributes.certified,
@@ -380,7 +382,7 @@ export const matchingDeclaredAttributes = (
   descriptor: Descriptor,
   consumer: Tenant
 ): DeclaredAgreementAttribute[] => {
-  const declaredAttributes = filterDeclaredAttributes(consumer).map(
+  const declaredAttributes = filterDeclaredAttributes(consumer.attributes).map(
     (a) => a.id
   );
 
@@ -397,7 +399,7 @@ export const matchingVerifiedAttributes = (
 ): VerifiedAgreementAttribute[] => {
   const verifiedAttributes = filterVerifiedAttributes(
     eservice.producerId,
-    consumer
+    consumer.attributes
   ).map((a) => a.id);
 
   return matchingAttributes(

diff --git a/packages/agreement-process/src/services/agreementService.ts b/packages/agreement-process/src/services/agreementService.ts
@@ -601,13 +601,13 @@ export function agreementServiceBuilder(
 
       const verifiedValid = verifiedAttributesSatisfied(
         agreementToBeUpgraded.data.producerId,
-        newDescriptor,
-        consumer
+        newDescriptor.attributes,
+        consumer.attributes
       );
 
       const declaredValid = declaredAttributesSatisfied(
-        newDescriptor,
-        consumer
+        newDescriptor.attributes,
+        consumer.attributes
       );
 
       const contractBuilderInstance = contractBuilder(

diff --git a/packages/agreement-process/src/services/agreementStateProcessor.ts b/packages/agreement-process/src/services/agreementStateProcessor.ts
@@ -45,18 +45,22 @@ const nextStateFromDraft = (
   if (agreement.consumerId === agreement.producerId) {
     return active;
   }
-  if (!certifiedAttributesSatisfied(descriptor, tenant)) {
+  if (!certifiedAttributesSatisfied(descriptor.attributes, tenant.attributes)) {
     return missingCertifiedAttributes;
   }
 
   if (
     descriptor.agreementApprovalPolicy === agreementApprovalPolicy.automatic &&
-    declaredAttributesSatisfied(descriptor, tenant) &&
-    verifiedAttributesSatisfied(agreement.producerId, descriptor, tenant)
+    declaredAttributesSatisfied(descriptor.attributes, tenant.attributes) &&
+    verifiedAttributesSatisfied(
+      agreement.producerId,
+      descriptor.attributes,
+      tenant.attributes
+    )
   ) {
     return active;
   }
-  if (declaredAttributesSatisfied(descriptor, tenant)) {
+  if (declaredAttributesSatisfied(descriptor.attributes, tenant.attributes)) {
     return pending;
   }
   return draft;
@@ -67,13 +71,19 @@ const nextStateFromPending = (
   descriptor: Descriptor,
   tenant: Tenant | CompactTenant
 ): AgreementState => {
-  if (!certifiedAttributesSatisfied(descriptor, tenant)) {
+  if (!certifiedAttributesSatisfied(descriptor.attributes, tenant.attributes)) {
     return missingCertifiedAttributes;
   }
-  if (!declaredAttributesSatisfied(descriptor, tenant)) {
+  if (!declaredAttributesSatisfied(descriptor.attributes, tenant.attributes)) {
     return draft;
   }
-  if (!verifiedAttributesSatisfied(agreement.producerId, descriptor, tenant)) {
+  if (
+    !verifiedAttributesSatisfied(
+      agreement.producerId,
+      descriptor.attributes,
+      tenant.attributes
+    )
+  ) {
     return pending;
   }
   return active;
@@ -88,9 +98,13 @@ const nextStateFromActiveOrSuspended = (
     return active;
   }
   if (
-    certifiedAttributesSatisfied(descriptor, tenant) &&
-    declaredAttributesSatisfied(descriptor, tenant) &&
-    verifiedAttributesSatisfied(agreement.producerId, descriptor, tenant)
+    certifiedAttributesSatisfied(descriptor.attributes, tenant.attributes) &&
+    declaredAttributesSatisfied(descriptor.attributes, tenant.attributes) &&
+    verifiedAttributesSatisfied(
+      agreement.producerId,
+      descriptor.attributes,
+      tenant.attributes
+    )
   ) {
     return active;
   }
@@ -101,7 +115,7 @@ const nextStateFromMissingCertifiedAttributes = (
   descriptor: Descriptor,
   tenant: Tenant | CompactTenant
 ): AgreementState => {
-  if (certifiedAttributesSatisfied(descriptor, tenant)) {
+  if (certifiedAttributesSatisfied(descriptor.attributes, tenant.attributes)) {
     return draft;
   }
   return missingCertifiedAttributes;

diff --git a/packages/backend-for-frontend/src/api/catalogApiConverter.ts b/packages/backend-for-frontend/src/api/catalogApiConverter.ts
@@ -1,14 +1,17 @@
 /* eslint-disable functional/immutable-data */
 /* eslint-disable max-params */
-import { DescriptorWithOnlyAttributes } from "pagopa-interop-agreement-lifecycle";
 import {
   agreementApi,
   attributeRegistryApi,
   bffApi,
   catalogApi,
   tenantApi,
 } from "pagopa-interop-api-clients";
-import { EServiceAttribute, unsafeBrandId } from "pagopa-interop-models";
+import {
+  Descriptor,
+  EServiceAttribute,
+  unsafeBrandId,
+} from "pagopa-interop-models";
 import { attributeNotExists } from "../model/errors.js";
 import {
   getLatestActiveDescriptor,
@@ -272,16 +275,14 @@ export function toEserviceAttribute(
   }));
 }
 
-export function toDescriptorWithOnlyAttributes(
-  descriptor: catalogApi.EServiceDescriptor
-): DescriptorWithOnlyAttributes {
+export function descriptorAttributesFromApi(
+  catalogApiDescriptorAttributes: catalogApi.EServiceDescriptor["attributes"]
+): Descriptor["attributes"] {
   return {
-    ...descriptor,
-    attributes: {
-      certified: descriptor.attributes.certified.map(toEserviceAttribute),
-      declared: descriptor.attributes.declared.map(toEserviceAttribute),
-      verified: descriptor.attributes.verified.map(toEserviceAttribute),
-    },
+    certified:
+      catalogApiDescriptorAttributes.certified.map(toEserviceAttribute),
+    declared: catalogApiDescriptorAttributes.declared.map(toEserviceAttribute),
+    verified: catalogApiDescriptorAttributes.verified.map(toEserviceAttribute),
   };
 }
 

diff --git a/packages/backend-for-frontend/src/api/tenantApiConverter.ts b/packages/backend-for-frontend/src/api/tenantApiConverter.ts
@@ -1,4 +1,3 @@
-import { TenantWithOnlyAttributes } from "pagopa-interop-agreement-lifecycle";
 import {
   attributeRegistryApi,
   bffApi,
@@ -8,6 +7,7 @@ import { isDefined } from "pagopa-interop-commons";
 import {
   CertifiedTenantAttribute,
   DeclaredTenantAttribute,
+  Tenant,
   TenantAttribute,
   TenantMail,
   VerifiedTenantAttribute,
@@ -61,13 +61,10 @@ export function toTenantAttribute(
   );
 }
 
-export function toTenantWithOnlyAttributes(
-  tenant: tenantApi.Tenant
-): TenantWithOnlyAttributes {
-  return {
-    ...tenant,
-    attributes: tenant.attributes.map(toTenantAttribute).flat(),
-  };
+export function tenantAttributesFromApi(
+  tenantApiAttributes: tenantApi.Tenant["attributes"]
+): Tenant["attributes"] {
+  return tenantApiAttributes.map(toTenantAttribute).flat();
 }
 
 export const toBffApiRequesterCertifiedAttributes = (

diff --git a/packages/backend-for-frontend/src/services/validators.ts b/packages/backend-for-frontend/src/services/validators.ts
@@ -5,8 +5,8 @@ import {
   tenantApi,
 } from "pagopa-interop-api-clients";
 import { TenantId } from "pagopa-interop-models";
-import { toDescriptorWithOnlyAttributes } from "../api/catalogApiConverter.js";
-import { toTenantWithOnlyAttributes } from "../api/tenantApiConverter.js";
+import { descriptorAttributesFromApi } from "../api/catalogApiConverter.js";
+import { tenantAttributesFromApi } from "../api/tenantApiConverter.js";
 import {
   invalidEServiceRequester,
   notValidDescriptor,
@@ -73,8 +73,8 @@ export function hasCertifiedAttributes(
   return (
     descriptor !== undefined &&
     certifiedAttributesSatisfied(
-      toDescriptorWithOnlyAttributes(descriptor),
-      toTenantWithOnlyAttributes(requesterTenant)
+      descriptorAttributesFromApi(descriptor.attributes),
+      tenantAttributesFromApi(requesterTenant.attributes)
     )
   );
 }