Merge pull request #243 from sotatek-dev/feat/add-token

Feat/add token
sotatek-dev · Jan 8, 2025 · 280e9db · 280e9db
2 parents b574e99 + b200aee
commit 280e9db
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/src/database/repositories/common-configuration.repository.ts b/src/database/repositories/common-configuration.repository.ts
@@ -16,14 +16,17 @@ export class CommonConfigRepository extends BaseRepository<CommonConfig> {
     return this.createQueryBuilder(`${this.alias}`).select().getOne();
   }
 
-  public getManyAndPagination(dto: GetTokensReqDto) {
+  public getManyAndPagination(dto: GetTokensReqDto, role: 'user' | 'admin' = 'admin') {
     const qb = this.createQb();
     qb.select();
     if (isArray(dto.statuses)) {
       qb.andWhere({ status: In(dto.statuses) });
     }
     if (isNotEmpty(dto.assetName)) {
-      qb.andWhere({ asset: ILike(`${dto.assetName}%`) });
+      qb.andWhere({ asset: ILike(`%${dto.assetName}%`) });
+    }
+    if (role === 'user') {
+      qb.andWhere({ isHidden: false });
     }
     if (isNotEmpty(dto.tokenAddress)) {
       qb.andWhere(
@@ -33,6 +36,7 @@ export class CommonConfigRepository extends BaseRepository<CommonConfig> {
         }),
       );
     }
+
     qb.orderBy('id', 'DESC');
     this.queryBuilderAddPagination(qb, dto);
     return qb.getManyAndCount();

diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts
@@ -5,7 +5,7 @@ import { ETableName } from '../../constants/entity.constant.js';
 import { GuardPublic } from '../../guards/guard.decorator.js';
 import { EstimateBridgeRequestDto } from './dto/estimate-bridge-request.dto.js';
 import { GetHistoryOfUserDto, GetHistoryOfUserResponseDto } from './dto/history-response.dto.js';
-import { GetProtocolFeeBodyDto } from './dto/user-request.dto.js';
+import { GetProtocolFeeBodyDto, GetTokensReqDto } from './dto/user-request.dto.js';
 import {
   EstimateBridgeResponseDto,
   GetListTokenPairResponseDto,
@@ -36,8 +36,8 @@ export class UsersController {
   @Get('list-supported-pairs')
   @GuardPublic()
   @ApiOkResponse({ type: [GetListTokenPairResponseDto] })
-  getListTokenPair() {
-    return this.userService.getListTokenPair();
+  getListTokenPair(@Query() query: GetTokensReqDto) {
+    return this.userService.getListTokenPair(query);
   }
 
   @Post('bridge/protocol-fee')

diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts
@@ -17,7 +17,7 @@ import { LoggerService } from '../../shared/modules/logger/logger.service.js';
 import { RedisClientService } from '../../shared/modules/redis/redis-client.service.js';
 import { UpdateCommonConfigBodyDto, UpdateTokenPairVisibilityReqDto } from './dto/common-config-request.dto.js';
 import { GetHistoryDto, GetHistoryOfUserDto } from './dto/history-response.dto.js';
-import { GetProtocolFeeBodyDto } from './dto/user-request.dto.js';
+import { GetProtocolFeeBodyDto, GetTokensReqDto } from './dto/user-request.dto.js';
 import { GetProofOfAssetsResponseDto, GetTokensPriceResponseDto } from './dto/user-response.dto.js';
 
 @Injectable()
@@ -72,16 +72,15 @@ export class UsersService {
     return { dailyQuota, totalAmountOfToDay: totalamount?.totalamount || 0 };
   }
 
-  async getListTokenPair() {
-    return this.commonConfigRepository.find({
-      where: {
-        status: ETokenPairStatus.ENABLE,
-        isHidden: false,
+  async getListTokenPair(payload: GetTokensReqDto) {
+    const [data] = await this.commonConfigRepository.getManyAndPagination(
+      {
+        ...payload,
+        statuses: [ETokenPairStatus.ENABLE],
       },
-      order: {
-        id: 'DESC',
-      },
-    });
+      'user',
+    );
+    return data;
   }
 
   async getProtocolFee(dto: GetProtocolFeeBodyDto) {