Adding allow disk use in all Mongo aggregations (#1006)

pagopa · Sep 25, 2024 · 03ebc1a · 03ebc1a
1 parent c478186
commit 03ebc1a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 40 deletions.
diff --git a/packages/agreement-process/src/services/readModelService.ts b/packages/agreement-process/src/services/readModelService.ts
@@ -283,8 +283,7 @@ async function searchTenantsByName(
     results: result.data,
     totalCount: await ReadModelRepository.getTotalCount(
       agreements,
-      aggregationPipeline,
-      true
+      aggregationPipeline
     ),
   };
 }
@@ -402,8 +401,7 @@ export function readModelServiceBuilder(
         results: result.data,
         totalCount: await ReadModelRepository.getTotalCount(
           agreements,
-          aggregationPipeline,
-          true
+          aggregationPipeline
         ),
       };
     },
@@ -560,8 +558,7 @@ export function readModelServiceBuilder(
         results: result.data,
         totalCount: await ReadModelRepository.getTotalCount(
           eservices,
-          aggregationPipeline,
-          true
+          aggregationPipeline
         ),
       };
     },

diff --git a/packages/attribute-registry-process/src/services/readModelService.ts b/packages/attribute-registry-process/src/services/readModelService.ts
@@ -85,7 +85,9 @@ async function getAttributes({
   limit: number;
 }): Promise<ListResult<Attribute>> {
   const data = await attributes
-    .aggregate([...aggregationPipeline, { $skip: offset }, { $limit: limit }])
+    .aggregate([...aggregationPipeline, { $skip: offset }, { $limit: limit }], {
+      allowDiskUse: true,
+    })
     .toArray();
   const result = z.array(Attribute).safeParse(data.map((d) => d.data));
   if (!result.success) {
@@ -99,8 +101,7 @@ async function getAttributes({
     results: result.data,
     totalCount: await ReadModelRepository.getTotalCount(
       attributes,
-      aggregationPipeline,
-      false
+      aggregationPipeline
     ),
   };
 }

diff --git a/packages/authorization-process/src/services/readModelService.ts b/packages/authorization-process/src/services/readModelService.ts
@@ -151,8 +151,7 @@ export function readModelServiceBuilder(
         results: result.data,
         totalCount: await ReadModelRepository.getTotalCount(
           clients,
-          aggregationPipeline,
-          false
+          aggregationPipeline
         ),
       };
     },
@@ -347,8 +346,7 @@ export function readModelServiceBuilder(
         results: result.data,
         totalCount: await ReadModelRepository.getTotalCount(
           producerKeychains,
-          aggregationPipeline,
-          false
+          aggregationPipeline
         ),
       };
     },

diff --git a/packages/catalog-process/src/services/readModelService.ts b/packages/catalog-process/src/services/readModelService.ts
@@ -249,11 +249,10 @@ export function readModelServiceBuilder(
       ];
 
       const data = await eservices
-        .aggregate([
-          ...aggregationPipeline,
-          { $skip: offset },
-          { $limit: limit },
-        ])
+        .aggregate(
+          [...aggregationPipeline, { $skip: offset }, { $limit: limit }],
+          { allowDiskUse: true }
+        )
         .toArray();
 
       const result = z.array(EService).safeParse(data.map((d) => d.data));
@@ -269,8 +268,7 @@ export function readModelServiceBuilder(
         results: result.data,
         totalCount: await ReadModelRepository.getTotalCount(
           eservices,
-          aggregationPipeline,
-          false
+          aggregationPipeline
         ),
       };
     },
@@ -380,11 +378,10 @@ export function readModelServiceBuilder(
       ];
 
       const data = await eservices
-        .aggregate([
-          ...aggregationPipeline,
-          { $skip: offset },
-          { $limit: limit },
-        ])
+        .aggregate(
+          [...aggregationPipeline, { $skip: offset }, { $limit: limit }],
+          { allowDiskUse: true }
+        )
         .toArray();
 
       const result = z.array(consumer).safeParse(data);
@@ -400,8 +397,7 @@ export function readModelServiceBuilder(
         results: result.data,
         totalCount: await ReadModelRepository.getTotalCount(
           eservices,
-          aggregationPipeline,
-          false
+          aggregationPipeline
         ),
       };
     },
@@ -462,7 +458,9 @@ export function readModelServiceBuilder(
       const aggregationWithLimit = limit
         ? [...aggregationPipeline, { $limit: limit }]
         : aggregationPipeline;
-      const data = await agreements.aggregate(aggregationWithLimit).toArray();
+      const data = await agreements
+        .aggregate(aggregationWithLimit, { allowDiskUse: true })
+        .toArray();
       const result = z.array(Agreement).safeParse(data.map((a) => a.data));
 
       if (!result.success) {

diff --git a/packages/commons/src/repositories/ReadModelRepository.ts b/packages/commons/src/repositories/ReadModelRepository.ts
@@ -220,11 +220,10 @@ export class ReadModelRepository {
 
   public static async getTotalCount(
     collection: Collections,
-    aggregation: object[],
-    allowDiskUse: boolean
+    aggregation: object[]
   ): Promise<number> {
     const query = collection.aggregate([...aggregation, { $count: "count" }], {
-      allowDiskUse,
+      allowDiskUse: true,
     });
 
     const data = await query.toArray();

diff --git a/packages/purpose-process/src/services/readModelService.ts b/packages/purpose-process/src/services/readModelService.ts
@@ -286,8 +286,7 @@ export function readModelServiceBuilder(
         results: result.data,
         totalCount: await ReadModelRepository.getTotalCount(
           purposes,
-          aggregationPipeline,
-          false
+          aggregationPipeline
         ),
       };
     },

diff --git a/packages/tenant-process/src/services/readModelService.ts b/packages/tenant-process/src/services/readModelService.ts
@@ -54,7 +54,6 @@ export const getTenants = async ({
   aggregationPipeline,
   offset,
   limit,
-  allowDiskUse = false,
 }: {
   tenants: TenantCollection;
   aggregationPipeline: Array<Filter<TenantReadModel>>;
@@ -67,7 +66,7 @@ export const getTenants = async ({
 }> => {
   const data = await tenants
     .aggregate([...aggregationPipeline, { $skip: offset }, { $limit: limit }], {
-      allowDiskUse,
+      allowDiskUse: true,
     })
     .toArray();
 
@@ -84,8 +83,7 @@ export const getTenants = async ({
     results: result.data,
     totalCount: await ReadModelRepository.getTotalCount(
       tenants,
-      aggregationPipeline,
-      allowDiskUse
+      aggregationPipeline
     ),
   };
 };
@@ -324,7 +322,9 @@ export function readModelServiceBuilder(
 
     async getAttributesById(attributeIds: AttributeId[]): Promise<Attribute[]> {
       const data = await attributes
-        .aggregate([{ $match: { "data.id": { $in: attributeIds } } }])
+        .aggregate([{ $match: { "data.id": { $in: attributeIds } } }], {
+          allowDiskUse: true,
+        })
         .toArray();
       const result = z.array(Attribute).safeParse(data.map((d) => d.data));
       if (!result.success) {
@@ -481,8 +481,7 @@ export function readModelServiceBuilder(
         results: result.data,
         totalCount: await ReadModelRepository.getTotalCount(
           attributes,
-          aggregationPipeline,
-          false
+          aggregationPipeline
         ),
       };
     },