[Release] Version 0.0.5 (#257)

* [Fix] Show applicants even if they do not have an active permit ([Fix] Show applicants even if they do not have an active permit #256)
uwblueprint · Aug 16, 2022 · 6c854d8 · 6c854d8
1 parent af8bd26
commit 6c854d8
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/lib/applicants/resolvers.ts b/lib/applicants/resolvers.ts
@@ -147,25 +147,27 @@ export const applicants: Resolver<
 
     // Permit status and expiry date range filters both look at the permit expiryDate.
     // For this reason we need to filter on expiryDate twice to take both filters in account.
-    const permitFilter = {
-      some: {
-        AND: [
-          {
-            expiryDate: {
-              gte: expiryDateLowerBound?.toISOString(),
-              lte: expiryDateUpperBound?.toISOString(),
+    const permitFilter =
+      expiryDateLowerBound || expiryDateUpperBound || expiryDateRangeFrom || expiryDateRangeTo
+        ? {
+            some: {
+              AND: [
+                {
+                  expiryDate: {
+                    gte: expiryDateLowerBound?.toISOString(),
+                    lte: expiryDateUpperBound?.toISOString(),
+                  },
+                },
+                {
+                  expiryDate: {
+                    gte: expiryDateRangeFrom?.toISOString(),
+                    lte: expiryDateRangeTo?.toISOString(),
+                  },
+                },
+              ],
             },
-          },
-          {
-            expiryDate: {
-              gte: expiryDateRangeFrom?.toISOString(),
-              lte: expiryDateRangeTo?.toISOString(),
-            },
-          },
-          { active: true },
-        ],
-      },
-    };
+          }
+        : undefined;
 
     // Update default filter since there were filter arguments
     where = {