Refactor: move db logic to nest, create ApiModule

src/api/api.module.ts

@@ -0,0 +1,19 @@
+import { Module } from '@nestjs/common';
+import { DatabaseModule } from '../database/database.module';
+import { PairLiquidityInfoHistoryController } from './pair-liquidity-info-history/pair-liquidity-info-history.controller';
+import { PairLiquidityInfoHistoryService } from './pair-liquidity-info-history/pair-liquidity-info-history.service';
+import { PairsController } from './pairs/pairs.controller';
+import { TokensController } from './tokens/tokens.controller';
+import { PairsService } from './pairs/pairs.service';
+import { TokensService } from './tokens/tokens.service';
+
+@Module({
+  imports: [DatabaseModule],
+  controllers: [
+    PairLiquidityInfoHistoryController,
+    PairsController,
+    TokensController,
+  ],
+  providers: [PairLiquidityInfoHistoryService, PairsService, TokensService],
+})
+export class ApiModule {}

src/api/pair-liquidity-info-history/pair-liquidity-info-history.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { PairLiquidityInfoHistoryDbService } from '../../database/pair-liquidity-info-history-db.service';
+import { PairLiquidityInfoHistoryDbService } from '../../database/pair-liquidity-info-history/pair-liquidity-info-history-db.service';
 import { Pair, PairLiquidityInfoHistory } from '@prisma/client';
 import { OrderQueryEnum } from '../../dto';
 import { ContractAddress } from '../../lib/utils';

src/api/pairs/pairs.service.ts

@@ -1,30 +1,40 @@
 import { Injectable } from '@nestjs/common';
-import * as dal from '../../dal';
 import { presentInvalidTokens } from '../../lib/utils';
+import { PairDbService } from '../../database/pair/pair-db.service';
 
 @Injectable()
 export class PairsService {
+  constructor(private readonly pairDbService: PairDbService) {}
   async getAllPairs(onlyListed?: boolean) {
-    return dal.pair.getAll(presentInvalidTokens, onlyListed);
+    return this.pairDbService.getAllWithCondition(
+      presentInvalidTokens,
+      onlyListed,
+    );
   }
 
   async getAllPairsWithLiquidityInfo(onlyListed?: boolean) {
-    return dal.pair.getAllWithLiquidityInfo(presentInvalidTokens, onlyListed);
+    return this.pairDbService.getAllWithLiquidityInfo(
+      presentInvalidTokens,
+      onlyListed,
+    );
   }
 
   async getCountStats() {
     return {
-      all: await dal.pair.count(presentInvalidTokens),
-      synced: await dal.pair.count(presentInvalidTokens, 'synchronized'),
-      listed: await dal.pair.count(presentInvalidTokens, 'listed'),
+      all: await this.pairDbService.count(presentInvalidTokens),
+      synced: await this.pairDbService.count(
+        presentInvalidTokens,
+        'synchronized',
+      ),
+      listed: await this.pairDbService.count(presentInvalidTokens, 'listed'),
     };
   }
 
   async getPair(address: string) {
-    return dal.pair.getOne(address);
+    return this.pairDbService.getOne(address);
   }
 
   async getTopHeight() {
-    return dal.pair.getTopHeight();
+    return this.pairDbService.getTopHeight();
   }
 }

src/api/tokens/tokens.service.ts

@@ -1,26 +1,27 @@
 import { Injectable } from '@nestjs/common';
-import * as dal from '../../dal';
-import { Pair, Token, PairLiquidityInfo } from '@prisma/client';
+import { Pair, PairLiquidityInfo, Token } from '@prisma/client';
 import { ContractAddress, presentInvalidTokens } from '../../lib/utils';
+import { TokenDbService } from '../../database/token/token-db.service';
 
 @Injectable()
 export class TokensService {
+  constructor(private readonly tokenDbService: TokenDbService) {}
   async getCount(onlyListed?: boolean) {
-    return dal.token.count(presentInvalidTokens, onlyListed);
+    return this.tokenDbService.count(presentInvalidTokens, onlyListed);
   }
   async getAllTokens(): Promise<Token[]> {
-    return dal.token.getAll(presentInvalidTokens);
+    return this.tokenDbService.getAll(presentInvalidTokens);
   }
   async getListedTokens(): Promise<Token[]> {
-    return dal.token.getListed();
+    return this.tokenDbService.getListed();
   }
 
   async listToken(address: ContractAddress) {
-    return dal.token.updateListedValue(address, true);
+    return this.tokenDbService.updateListedValue(address, true);
   }
 
   async unlistToken(address: ContractAddress) {
-    return dal.token.updateListedValue(address, false);
+    return this.tokenDbService.updateListedValue(address, false);
   }
 
   async getToken(address: ContractAddress): Promise<
@@ -30,7 +31,7 @@ export class TokensService {
       })
     | null
   > {
-    return dal.token.getByAddressWithPairs(address);
+    return this.tokenDbService.getByAddressWithPairs(address);
   }
 
   async getTokenWithPairsInfo(address: ContractAddress): Promise<
@@ -46,6 +47,6 @@ export class TokensService {
       })
     | null
   > {
-    return dal.token.getByAddressWithPairsAndLiquidity(address);
+    return this.tokenDbService.getByAddressWithPairsAndLiquidity(address);
   }
 }

src/app.module.ts

@@ -1,23 +1,13 @@
 import { Module } from '@nestjs/common';
-import { PairsModule } from './api/pairs/pairs.module';
-import { TokensModule } from './api/tokens/tokens.module';
 import { AppController } from './app.controller';
 import { DatabaseModule } from './database/database.module';
-import { TasksModule } from './tasks/tasks.module';
 import { TokensService } from './api/tokens/tokens.service';
 import { PairsService } from './api/pairs/pairs.service';
 import { ClientsModule } from './clients/clients.module';
-import { PairLiquidityInfoHistoryModule } from './api/pair-liquidity-info-history/pair-liquidity-info-history.module';
+import { ApiModule } from './api/api.module';
 
 @Module({
-  imports: [
-    PairsModule,
-    TokensModule,
-    ClientsModule,
-    DatabaseModule,
-    TasksModule,
-    PairLiquidityInfoHistoryModule,
-  ],
+  imports: [ApiModule, ClientsModule, DatabaseModule],
   controllers: [AppController],
   providers: [TokensService, PairsService],
 })

src/database/database.module.ts

@@ -1,20 +1,23 @@
 import { Module } from '@nestjs/common';
 import { PrismaService } from './prisma.service';
-import { PairDbService } from './pair-db.service';
-import { PairLiquidityInfoHistoryDbService } from './pair-liquidity-info-history-db.service';
-import { PairLiquidityInfoHistoryErrorDbService } from './pair-liquidity-info-history-error-db.service';
+import { PairDbService } from './pair/pair-db.service';
+import { PairLiquidityInfoHistoryDbService } from './pair-liquidity-info-history/pair-liquidity-info-history-db.service';
+import { PairLiquidityInfoHistoryErrorDbService } from './pair-liquidity-info-history-error/pair-liquidity-info-history-error-db.service';
+import { TokenDbService } from './token/token-db.service';
 
 @Module({
   providers: [
     PrismaService,
     PairDbService,
     PairLiquidityInfoHistoryDbService,
     PairLiquidityInfoHistoryErrorDbService,
+    TokenDbService,
   ],
   exports: [
     PairDbService,
     PairLiquidityInfoHistoryDbService,
     PairLiquidityInfoHistoryErrorDbService,
+    TokenDbService,
   ],
 })
 export class DatabaseModule {}

src/database/pair-liquidity-info-history-error-db.service.e2e-spec.ts → src/database/pair-liquidity-info-history-error/pair-liquidity-info-history-error-db.service.e2e-spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { PrismaService } from './prisma.service';
+import { PrismaService } from '../prisma.service';
 import { Pair, PairLiquidityInfoHistoryError, Token } from '@prisma/client';
 import { PairLiquidityInfoHistoryErrorDbService } from './pair-liquidity-info-history-error-db.service';
 

src/database/pair-liquidity-info-history-error-db.service.ts → src/database/pair-liquidity-info-history-error/pair-liquidity-info-history-error-db.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { PrismaService } from './prisma.service';
+import { PrismaService } from '../prisma.service';
 import { PairLiquidityInfoHistoryError } from '@prisma/client';
 
 @Injectable()

src/database/pair-liquidity-info-history-db.service.e2e-spec.ts → src/database/pair-liquidity-info-history/pair-liquidity-info-history-db.service.e2e-spec.ts

@@ -1,9 +1,9 @@
 import { PairLiquidityInfoHistoryDbService } from './pair-liquidity-info-history-db.service';
 import { Test, TestingModule } from '@nestjs/testing';
-import { PrismaService } from './prisma.service';
+import { PrismaService } from '../prisma.service';
 import { Pair, PairLiquidityInfoHistory, Token } from '@prisma/client';
-import { OrderQueryEnum } from '../dto';
-import { ContractAddress } from '../lib/utils';
+import { OrderQueryEnum } from '../../dto';
+import { ContractAddress } from '../../lib/utils';
 
 const token1: Token = {
   id: 1,

src/database/pair-liquidity-info-history-db.service.ts → src/database/pair-liquidity-info-history/pair-liquidity-info-history-db.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
-import { PrismaService } from './prisma.service';
+import { PrismaService } from '../prisma.service';
 import { PairLiquidityInfoHistory } from '@prisma/client';
-import { OrderQueryEnum } from '../dto';
-import { ContractAddress } from '../lib/utils';
+import { OrderQueryEnum } from '../../dto';
+import { ContractAddress } from '../../lib/utils';
 
 @Injectable()
 export class PairLiquidityInfoHistoryDbService {