Fixing readmodel writing for DELETE & UPDATE Descriptor document

pagopa · Feb 14, 2024 · ed55b35 · ed55b35
1 parent 983b414
commit ed55b35
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/packages/catalog-readmodel-writer/src/consumerService.ts b/packages/catalog-readmodel-writer/src/consumerService.ts
@@ -98,7 +98,6 @@ export async function handleMessage(
         { "data.id": msg.stream_id, "metadata.version": { $lt: msg.version } },
         {
           $set: {
-            "metadata.version": msg.version,
             "data.descriptors.$[descriptor].docs.$[doc]": msg.data
               .updatedDocument
               ? fromDocumentV1(msg.data.updatedDocument)
@@ -109,6 +108,8 @@ export async function handleMessage(
           arrayFilters: [
             {
               "descriptor.id": msg.data.descriptorId,
+            },
+            {
               "doc.id": msg.data.documentId,
             },
           ],
@@ -117,29 +118,35 @@ export async function handleMessage(
       await eservices.updateOne(
         {
           "data.id": msg.stream_id,
-          "metadata.version": { $lt: msg.version },
         },
         {
           $set: {
             "data.descriptors.$[descriptor].interface": msg.data.updatedDocument
               ? fromDocumentV1(msg.data.updatedDocument)
               : undefined,
             "data.descriptors.$[descriptor].serverUrls": msg.data.serverUrls,
-            "metadata.version": msg.version,
           },
         },
         {
           arrayFilters: [
             {
               "descriptor.id": msg.data.descriptorId,
-              $or: [
-                { "descriptor.interface": { $exists: true } },
-                { "descriptor.interface.id": msg.data.documentId },
-              ],
+              "descriptor.interface.id": msg.data.documentId,
             },
           ],
         }
       );
+      await eservices.updateOne(
+        {
+          "data.id": msg.stream_id,
+          "metadata.version": { $lt: msg.version },
+        },
+        {
+          $set: {
+            "metadata.version": msg.version,
+          },
+        }
+      );
     })
     .with(
       { type: "EServiceDeleted" },
@@ -208,9 +215,6 @@ export async function handleMessage(
               id: msg.data.documentId,
             },
           },
-          $set: {
-            "metadata.version": msg.version,
-          },
         },
         {
           arrayFilters: [
@@ -228,7 +232,6 @@ export async function handleMessage(
           },
           $set: {
             "data.descriptors.$[descriptor].serverUrls": [],
-            "metadata.version": msg.version,
           },
         },
         {
@@ -240,6 +243,14 @@ export async function handleMessage(
           ],
         }
       );
+      await eservices.updateOne(
+        { "data.id": msg.stream_id, "metadata.version": { $lt: msg.version } },
+        {
+          $set: {
+            "metadata.version": msg.version,
+          },
+        }
+      );
     })
     .with(
       { type: "EServiceDescriptorAdded" },