fix(wallet_event): fix issues from merge conflicts

Greenstand · Oct 1, 2023 · 89eaa15 · 89eaa15
1 parent 7351e1f
commit 89eaa15
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/server/handlers/transferHandler/index.js b/server/handlers/transferHandler/index.js
@@ -8,7 +8,7 @@ const {
 } = require('./schemas');
 
 const transferPost = async (req, res) => {
-  const validatedData = await transferPostSchema.validateAsync(req.body, {
+  const validatedBody = await transferPostSchema.validateAsync(req.body, {
     abortEarly: false,
   });
   const transferService = new TransferService();

diff --git a/server/repositories/TransferRepository.js b/server/repositories/TransferRepository.js
@@ -128,19 +128,6 @@ class TransferRepository extends BaseRepository {
         'destination_wallet.id',
       )
       .where((builder) => this.whereBuilder(filter, builder));
-
-    let order = 'desc';
-    let column = 'transfer.created_at';
-
-    if (limitOptions) {
-      if (limitOptions.order) {
-        order = limitOptions.order;
-      }
-      if (limitOptions.sort_by) {
-        column = limitOptions.sort_by;
-      }
-    }
-    promise = promise.orderBy(column, order);
 
     let order = 'desc';
     let column = 'transfer.created_at';

diff --git a/server/services/TransferService.js b/server/services/TransferService.js
@@ -16,16 +16,7 @@ class TransferService {
   }
 
   async getByFilter(query, walletLoginId) {
-    const {
-      state,
-      wallet,
-      limit,
-      offset,
-      before,
-      after,
-      sort_by,
-      order,
-    } = query;
+    const { state, wallet, limit, offset, before, after } = query;
 
     let walletId;