fix(datatrakWeb): Fix report survey filtering

beyondessential · Sep 20, 2024 · abfda67 · abfda67
1 parent 4a737f4
commit abfda67
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/packages/datatrak-web-server/src/routes/SurveysRoute.ts b/packages/datatrak-web-server/src/routes/SurveysRoute.ts
@@ -25,11 +25,17 @@ export class SurveysRoute extends Route<SurveysRequest> {
     const { fields = [], projectId, countryCode } = query;
     const country = await models.country.findOne({ code: countryCode });
 
-    const surveys = await ctx.services.central.fetchResources(`countries/${country.id}/surveys`, {
+    const queryUrl = countryCode ? `countries/${country.id}/surveys` : 'surveys';
+
+    const filter: Record<string, string> = {};
+
+    if (projectId) {
+      filter.project_id = projectId;
+    }
+
+    const surveys = await ctx.services.central.fetchResources(queryUrl, {
       ...query,
-      filter: {
-        project_id: projectId,
-      },
+      filter,
       columns: fields,
       pageSize: 'ALL', // Override default page size of 100
     });