Merge branch 'IMN_801_purpose-platformstate-writer-v2' into IMN_800_p…

…urpose-platformstate-writer-v1
pagopa · Oct 1, 2024 · 472ba4a · 472ba4a
2 parents 949687c + 225362e
commit 472ba4a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/packages/purpose-platformstate-writer/src/utils.ts b/packages/purpose-platformstate-writer/src/utils.ts
@@ -140,7 +140,7 @@ export const readTokenEntriesByGSIPKPurposeId = async (
   ): Promise<TokenGenerationStatesClientPurposeEntry[]> => {
     const input: QueryInput = {
       TableName: config.tokenGenerationReadModelTableNameTokenGeneration,
-      IndexName: "GSIPK_purposeId",
+      IndexName: "Purpose",
       KeyConditionExpression: `GSIPK_purposeId = :gsiValue`,
       ExpressionAttributeValues: {
         ":gsiValue": { S: purposeId },
@@ -321,7 +321,9 @@ export const updatePurposeEntriesInTokenGenerationStatesTable = async (
               S: catalogEntry.state,
             },
             ":descriptorAudience": {
-              S: catalogEntry.descriptorAudience,
+              L: catalogEntry.descriptorAudience.map((item) => ({
+                S: item,
+              })),
             },
             ":descriptorVoucherLifespan": {
               N: catalogEntry.descriptorVoucherLifespan.toString(),
@@ -422,7 +424,7 @@ export const readPlatformAgreementEntryByGSIPKConsumerIdEServiceId = async (
 ): Promise<PlatformStatesAgreementEntry | undefined> => {
   const input: QueryInput = {
     TableName: config.tokenGenerationReadModelTableNamePlatform,
-    IndexName: "GSIPK_consumerId_eserviceId",
+    IndexName: "Agreement",
     KeyConditionExpression: `GSIPK_consumerId_eserviceId = :gsiValue`,
     ExpressionAttributeValues: {
       ":gsiValue": { S: gsiPKConsumerIdEServiceId },

diff --git a/packages/purpose-platformstate-writer/test/consumerServiceV2.test.ts b/packages/purpose-platformstate-writer/test/consumerServiceV2.test.ts
@@ -411,7 +411,7 @@ describe("integration tests", () => {
         const previousDescriptorEntry: PlatformStatesCatalogEntry = {
           PK: catalogEntryPK,
           state: itemState.active,
-          descriptorAudience: "pagopa.it",
+          descriptorAudience: ["pagopa.it"],
           descriptorVoucherLifespan: mockDescriptor.voucherLifespan,
           version: 2,
           updatedAt: new Date().toISOString(),
@@ -1796,7 +1796,6 @@ describe("integration tests", () => {
         );
       });
 
-      // FIX: duplicate description
       it("should update the entry if the message version is more recent and the purpose is suspended by the consumer and the producer", async () => {
         const previousEntryVersion = 1;
         const messageVersion = 2;

diff --git a/packages/purpose-platformstate-writer/test/utils.ts b/packages/purpose-platformstate-writer/test/utils.ts
@@ -8,7 +8,6 @@ import {
   PutItemCommand,
   PutItemInput,
 } from "@aws-sdk/client-dynamodb";
-import { setupTestContainersVitest } from "pagopa-interop-commons-test/index.js";
 import {
   genericInternalError,
   PlatformStatesAgreementEntry,
@@ -25,14 +24,11 @@ import {
   PurposeVersionState,
   PurposeVersionV1,
 } from "pagopa-interop-models";
-import { afterEach, inject } from "vitest";
+import { inject } from "vitest";
 import { unmarshall } from "@aws-sdk/util-dynamodb";
 import { match } from "ts-pattern";
 
 export const config = inject("tokenGenerationReadModelConfig");
-export const { cleanup } = setupTestContainersVitest();
-
-afterEach(cleanup);
 
 // TODO: same function as catalog-platformstate-writer
 export const writeTokenStateEntry = async (
@@ -52,7 +48,9 @@ export const writeTokenStateEntry = async (
         S: tokenStateEntry.descriptorState!,
       },
       descriptorAudience: {
-        S: tokenStateEntry.descriptorAudience!,
+        L: tokenStateEntry.descriptorAudience!.map((item) => ({
+          S: item,
+        })),
       },
       // descriptorVoucherLifespan: {
       //   N: tokenStateEntry.descriptorVoucherLifespan!.toString(),
@@ -261,7 +259,9 @@ export const writeCatalogEntry = async (
         S: catalogEntry.state,
       },
       descriptorAudience: {
-        S: catalogEntry.descriptorAudience,
+        L: catalogEntry.descriptorAudience.map((item) => ({
+          S: item,
+        })),
       },
       descriptorVoucherLifespan: {
         N: catalogEntry.descriptorVoucherLifespan.toString(),