PIN-5572 DescriptorVersion from string to number

docker/readmodel-db/catalog.sql

@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS readmodel_catalog.eservice_descriptor (
   id UUID,
   eservice_id UUID NOT NULL REFERENCES readmodel_catalog.eservice (id) ON DELETE CASCADE,
   metadata_version INTEGER NOT NULL,
-  version VARCHAR NOT NULL,
+  version INTEGER NOT NULL,
   description VARCHAR,
   state VARCHAR NOT NULL,
   audience VARCHAR ARRAY NOT NULL,

packages/agreement-process/src/model/domain/errors.ts

@@ -26,22 +26,21 @@ export const errorCodes = {
   agreementAlreadyExists: "0010",
   noNewerDescriptor: "0011",
   publishedDescriptorNotFound: "0012",
-  unexpectedVersionFormat: "0013",
-  descriptorNotFound: "0014",
-  stampNotFound: "0015",
-  documentNotFound: "0017",
-  documentsChangeNotAllowed: "0018",
-  tenantNotFound: "0020",
-  notLatestEServiceDescriptor: "0021",
-  attributeNotFound: "0022",
-  invalidAttributeStructure: "0023",
-  consumerWithNotValidEmail: "0024",
-  agreementDocumentAlreadyExists: "0025",
-  delegationNotFound: "0026",
-  tenantIsNotTheConsumer: "0027",
-  tenantIsNotTheDelegateConsumer: "0028",
-  tenantIsNotTheProducer: "0029",
-  tenantIsNotTheDelegateProducer: "0030",
+  descriptorNotFound: "0013",
+  stampNotFound: "0014",
+  documentNotFound: "0015",
+  documentsChangeNotAllowed: "0016",
+  tenantNotFound: "0017",
+  notLatestEServiceDescriptor: "0018",
+  attributeNotFound: "0019",
+  invalidAttributeStructure: "0020",
+  consumerWithNotValidEmail: "0021",
+  agreementDocumentAlreadyExists: "0022",
+  delegationNotFound: "0023",
+  tenantIsNotTheConsumer: "0024",
+  tenantIsNotTheDelegateConsumer: "0025",
+  tenantIsNotTheProducer: "0026",
+  tenantIsNotTheDelegateProducer: "0027",
 };
 
 export type ErrorCodes = keyof typeof errorCodes;
@@ -242,17 +241,6 @@ export function publishedDescriptorNotFound(
   });
 }
 
-export function unexpectedVersionFormat(
-  eserviceId: EServiceId,
-  descriptorId: DescriptorId
-): ApiError<ErrorCodes> {
-  return new ApiError({
-    detail: `Version in not an Int for descriptor ${descriptorId} of EService ${eserviceId}`,
-    code: "unexpectedVersionFormat",
-    title: "Unexpected version format",
-  });
-}
-
 export function noNewerDescriptor(
   eserviceId: EServiceId,
   descriptorId: DescriptorId

packages/agreement-process/src/model/domain/models.ts

@@ -72,7 +72,7 @@ export type AgreementContractPDFPayload = {
   eserviceId: EServiceId;
   eserviceName: string;
   descriptorId: DescriptorId;
-  descriptorVersion: string;
+  descriptorVersion: number;
   producerName: string;
   producerIpaCode: string | undefined;
   consumerName: string;

packages/agreement-process/src/services/agreementService.ts

@@ -1,4 +1,3 @@
-import { z } from "zod";
 import {
   AppContext,
   CreateEvent,
@@ -58,7 +57,6 @@ import {
   tenantIsNotTheDelegateConsumer,
   publishedDescriptorNotFound,
   tenantNotFound,
-  unexpectedVersionFormat,
 } from "../model/domain/errors.js";
 import {
   ActiveDelegations,
@@ -716,26 +714,13 @@ export function agreementServiceBuilder(
       if (newDescriptor === undefined) {
         throw publishedDescriptorNotFound(eservice.id);
       }
-      const latestDescriptorVersion = z
-        .preprocess((x) => Number(x), z.number())
-        .safeParse(newDescriptor.version);
-      if (!latestDescriptorVersion.success) {
-        throw unexpectedVersionFormat(eservice.id, newDescriptor.id);
-      }
 
       const currentDescriptor = retrieveDescriptor(
         agreementToBeUpgraded.data.descriptorId,
         eservice
       );
 
-      const currentVersion = z
-        .preprocess((x) => Number(x), z.number())
-        .safeParse(currentDescriptor.version);
-      if (!currentVersion.success) {
-        throw unexpectedVersionFormat(eservice.id, currentDescriptor.id);
-      }
-
-      if (latestDescriptorVersion.data <= currentVersion.data) {
+      if (newDescriptor.version <= currentDescriptor.version) {
         throw noNewerDescriptor(eservice.id, currentDescriptor.id);
       }
 

packages/agreement-process/test/integration/agreementStatesFlows.test.ts

@@ -83,7 +83,7 @@ describe("Agreeement states flows", () => {
         [[validDeclaredEserviceAttribute]]
         // No verified attributes required in V1
       ),
-      version: "1",
+      version: 1,
       agreementApprovalPolicy: "Automatic",
     };
 
@@ -162,7 +162,7 @@ describe("Agreeement states flows", () => {
     const descriptorV2: Descriptor = {
       ...descriptorV1,
       id: generateId(),
-      version: "2",
+      version: 2,
       attributes: {
         certified: descriptorV1.attributes.certified,
         declared: descriptorV1.attributes.declared,
@@ -308,7 +308,7 @@ describe("Agreeement states flows", () => {
         [[validDeclaredEserviceAttribute]]
         // No verified attributes required in V1
       ),
-      version: "1",
+      version: 1,
       agreementApprovalPolicy: "Automatic",
     };
 
@@ -372,7 +372,7 @@ describe("Agreeement states flows", () => {
     const descriptorV2: Descriptor = {
       ...descriptorV1,
       id: generateId(),
-      version: "2",
+      version: 2,
       attributes: {
         certified: descriptorV1.attributes.certified,
         declared: descriptorV1.attributes.declared,

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

@@ -349,13 +349,13 @@ describe("create agreement", () => {
     const descriptor0: Descriptor = getMockDescriptorPublished();
     const descriptor1: Descriptor = {
       ...getMockDescriptorPublished(),
-      version: "1",
+      version: 1,
       state: descriptorState.draft,
     };
 
     const descriptor2: Descriptor = {
       ...getMockDescriptorPublished(),
-      version: "2",
+      version: 2,
       state: descriptorState.draft,
     };
 
@@ -477,12 +477,12 @@ describe("create agreement", () => {
 
     const descriptor0: Descriptor = {
       ...getMockDescriptorPublished(),
-      version: "0",
+      version: 0,
       state: randomArrayItem(notDraftDescriptorStates),
     };
     const descriptor1: Descriptor = {
       ...getMockDescriptorPublished(),
-      version: "1",
+      version: 1,
       state: randomArrayItem(notDraftDescriptorStates),
     };
 
@@ -513,7 +513,7 @@ describe("create agreement", () => {
 
     const descriptor: Descriptor = {
       ...getMockDescriptorPublished(),
-      version: "0",
+      version: 0,
       state: randomArrayItem(
         Object.values(descriptorState).filter(
           (state) =>

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

@@ -38,6 +38,7 @@ import {
   AgreementSubmittedV2,
   AgreementV2,
   Attribute,
+  Descriptor,
   DescriptorId,
   DescriptorState,
   EServiceId,
@@ -589,7 +590,7 @@ describe("submit agreement", () => {
       ],
     };
 
-    const oldDescriptor = {
+    const oldDescriptor: Descriptor = {
       ...getMockDescriptor(),
       id: descriptorId,
       state: randomArrayItem(
@@ -599,10 +600,10 @@ describe("submit agreement", () => {
             state !== descriptorState.waitingForApproval
         )
       ),
-      version: "1",
+      version: 1,
     };
 
-    const newDescriptor = {
+    const newDescriptor: Descriptor = {
       ...getMockDescriptor(),
       state: randomArrayItem(
         Object.values(descriptorState).filter(
@@ -611,7 +612,7 @@ describe("submit agreement", () => {
             state !== descriptorState.waitingForApproval
         )
       ),
-      version: "2",
+      version: 2,
     };
     const eservice = getMockEService(generateId<EServiceId>(), producer.id, [
       oldDescriptor,