Merge branch 'fix_1035_get_wallets_add_count' into fix_297_total_is_a…

…lways_null
Greenstand · Mar 24, 2023 · 3ebb34a · 3ebb34a
2 parents a1ca59f + 61bf6ac
commit 3ebb34a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/server/infra/database/WalletsRepository.ts b/server/infra/database/WalletsRepository.ts
@@ -9,6 +9,7 @@ type Filter = Partial<{ name: string }>;
 export default class WalletsRepository extends BaseRepository<Wallets> {
   constructor(session: Session) {
     super('wallet.wallet', session);
+    this.tableName = 'wallet.wallet';
   }
 
   async getWalletByIdOrName(walletIdOrName: string) {
@@ -134,4 +135,20 @@ export default class WalletsRepository extends BaseRepository<Wallets> {
     );
     return objectPatched;
   }
+
+  async getCount(filter: Filter) {
+    const knex = this.session.getDB();
+
+    const result = await knex
+      .select(
+        knex.raw(`
+        COUNT(DISTINCT(${this.tableName}.id)) AS count
+        FROM ${this.tableName}
+        ${filter.name ? `WHERE name LIKE '%${filter.name}%'` : ''}
+    `),
+      )
+      .first();
+
+    return result.count;
+  }
 }
diff --git a/server/models/Wallets.ts b/server/models/Wallets.ts
@@ -9,7 +9,7 @@ type Filter = Partial<{ name: string }>;
 function getByFilter(
   WalletRepository: WalletsRepository,
 ): (filter: Filter, options: FilterOptions) => Promise<Wallets[]> {
-  return async function (filter: Filter, options: FilterOptions) {
+  return async (filter: Filter, options: FilterOptions) => {
     if (filter.name) {
       log.warn('using wallet name filter...');
       const wallets = await WalletRepository.getByName(filter.name, options);
@@ -20,6 +20,15 @@ function getByFilter(
   };
 }
 
+function getCount(
+  WalletRepository: WalletsRepository,
+): (filter: Filter) => Promise<Wallets[]> {
+  return async (filter: Filter) => {
+    const count = await WalletRepository.getCount(filter);
+    return count;
+  };
+}
+
 export default {
   getWalletByIdOrName: delegateRepository<WalletsRepository, Wallets>(
     'getWalletByIdOrName',
@@ -28,6 +37,7 @@ export default {
     'getWalletTokenContinentCount',
   ),
   getByFilter,
+  getCount,
   getFeaturedWallet: delegateRepository<WalletsRepository, Wallets>(
     'getFeaturedWallet',
   ),

diff --git a/server/routers/walletsRouter.ts b/server/routers/walletsRouter.ts
@@ -1,5 +1,6 @@
 import express from 'express';
 import Joi from 'joi';
+import FilterOptions from 'interfaces/FilterOptions';
 import { handlerWrapper } from './utils';
 import Session from '../infra/database/Session';
 import WalletsRepository from '../infra/database/WalletsRepository';
@@ -65,12 +66,15 @@ router.get(
       filter.name = name;
     }
 
-    const result = await WalletModel.getByFilter(repo)(filter, {
+    const options: FilterOptions = {
       limit,
       offset,
-    });
+    };
+
+    const result = await WalletModel.getByFilter(repo)(filter, options);
+    const count = await WalletModel.getCount(repo)(filter);
     res.send({
-      total: null,
+      total: Number(count),
       offset,
       limit,
       wallets: result,