feat: /wallets query parameters

Greenstand · Oct 3, 2023 · 9ae9487 · 9ae9487
1 parent b8556f2
commit 9ae9487
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/server/models/Wallet.js b/server/models/Wallet.js
@@ -143,20 +143,20 @@ class Wallet {
     id,
     limitOptions,
     name,
-    // sort_by,
-    // order,
-    // created_at_start_date,
-    // created_at_end_date,
+    sort_by,
+    order,
+    created_at_start_date,
+    created_at_end_date,
     getCount,
   ) {
     return this._walletRepository.getAllWallets(
       id,
       limitOptions,
       name,
-      // sort_by,
-      // order,
-      // created_at_start_date,
-      // created_at_end_date,
+      sort_by,
+      order,
+      created_at_start_date,
+      created_at_end_date,
       getCount,
     );
   }

diff --git a/server/repositories/WalletRepository.js b/server/repositories/WalletRepository.js
@@ -58,10 +58,10 @@ class WalletRepository extends BaseRepository {
     id,
     limitOptions,
     name,
-    // sort_by,
-    // order,
-    // created_at_start_date,
-    // created_at_end_date,
+    sort_by,
+    order,
+    created_at_start_date,
+    created_at_end_date,
     getCount,
   ) {
     let query = this._session
@@ -111,7 +111,21 @@ class WalletRepository extends BaseRepository {
       union2 = union2.where('name', 'ilike', `%${name}%`);
     }
 
-    query = query.union(union1, union2);
+    query = query.union(union1, union2).orderBy(sort_by, order);
+
+    query = this._session.getDB().select('*').from(query.as('t'));
+
+    if (created_at_start_date) {
+      query = query.whereRaw(`cast("created_at" as date) >= ?`, [
+        created_at_start_date,
+      ]);
+    }
+
+    if (created_at_end_date) {
+      query = query.whereRaw(`cast("created_at" as date) <= ?`, [
+        created_at_end_date,
+      ]);
+    }
 
     // total count query (before applying limit and offset options)
     const countQuery = this._session

diff --git a/server/services/WalletService.js b/server/services/WalletService.js
@@ -76,6 +76,10 @@ class WalletService {
         id,
         limitOptions,
         name,
+        sort_by,
+        order,
+        created_at_start_date,
+        created_at_end_date,
         getWalletCount,
       );
       return {