Fix currency filter

mojaloop · Nov 29, 2021 · 197191f · 197191f
1 parent 5571233
commit 197191f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/schema/Transfer/Query.ts b/src/schema/Transfer/Query.ts
@@ -76,13 +76,7 @@ const Query = extendType({
           take: args.limit ?? 100,
           skip: args.offset || undefined,
           orderBy: [{ createdDate: 'desc' }],
-          where: {
-            createdDate: {
-              gte: args.filter?.startDate || undefined,
-              lt: args.filter?.endDate || undefined,
-            },
-            ...transferFilter,
-          },
+          where: transferFilter,
         });
         return transfers.map((tr) => ({
           transferId: tr.transferId,

diff --git a/src/schema/Transfer/helpers/transferFilter.ts b/src/schema/Transfer/helpers/transferFilter.ts
@@ -25,6 +25,11 @@ export const createTransferFilter = (participants?: string[], filter?: NexusGenI
 
   const transferFilter: transferWhereInput = {};
 
+  transferFilter.createdDate = {
+    gte: filter?.startDate || undefined,
+    lt: filter?.endDate || undefined,
+  };
+
   if (filter?.errorCode) {
     transferFilter.transferError = {
       some: {
@@ -65,7 +70,9 @@ export const createTransferFilter = (participants?: string[], filter?: NexusGenI
   }
 
   if (filter?.currency) {
-    transferFilter.currency = filter?.currency;
+    transferFilter.currency = {
+      currencyId: filter?.currency,
+    };
   }
 
   if (filter?.payee?.idType || filter?.payee?.idValue || filter?.payer?.idType || filter?.payer?.idValue) {