refactor: remove transactional decorators and streamline command handlers

kastov · kastov · commit 02f6f340df8b · 2025-12-01T03:25:09.000+03:00
diff --git a/src/modules/config-profiles/config-profile.service.ts b/src/modules/config-profiles/config-profile.service.ts
@@ -164,7 +164,6 @@ export class ConfigProfileService {
         }
     }
 
-    @Transactional()
     public async createConfigProfile(
         name: string,
         config: object,
@@ -187,12 +186,9 @@ export class ConfigProfileService {
 
             const inbounds = validatedConfig.getAllInbounds();
 
-            const configProfile = await this.configProfileRepository.create(profileEntity);
-
             const inboundsEntities = inbounds.map(
                 (inbound) =>
                     new ConfigProfileInboundEntity({
-                        profileUuid: configProfile.uuid,
                         tag: inbound.tag,
                         type: inbound.type,
                         network: inbound.network,
@@ -202,13 +198,12 @@ export class ConfigProfileService {
                     }),
             );
 
-            if (inboundsEntities.length) {
-                await this.configProfileRepository.createManyConfigProfileInbounds(
-                    inboundsEntities,
-                );
-            }
+            const { uuid } = await this.configProfileRepository.create(
+                profileEntity,
+                inboundsEntities,
+            );
 
-            return this.getConfigProfileByUUID(configProfile.uuid);
+            return await this.getConfigProfileByUUID(uuid);
         } catch (error) {
             if (
                 error instanceof PrismaClientKnownRequestError &&
diff --git a/src/modules/config-profiles/repositories/config-profile.repository.ts b/src/modules/config-profiles/repositories/config-profile.repository.ts
@@ -9,7 +9,6 @@ import { TransactionHost } from '@nestjs-cls/transactional';
 import { Injectable } from '@nestjs/common';
 
 import { TxKyselyService } from '@common/database';
-import { ICrud } from '@common/types/crud-port';
 import { getKyselyUuid } from '@common/helpers';
 
 import { ConfigProfileWithInboundsAndNodesEntity } from '../entities/config-profile-with-inbounds-and-nodes.entity';
@@ -19,23 +18,36 @@ import { ConfigProfileEntity } from '../entities/config-profile.entity';
 import { ConfigProfileInboundWithSquadsEntity } from '../entities';
 
 @Injectable()
-export class ConfigProfileRepository implements ICrud<ConfigProfileEntity> {
+export class ConfigProfileRepository {
     constructor(
         private readonly prisma: TransactionHost<TransactionalAdapterPrisma>,
         private readonly qb: TxKyselyService,
         private readonly configProfileConverter: ConfigProfileConverter,
     ) {}
 
-    public async create(entity: ConfigProfileEntity): Promise<ConfigProfileEntity> {
+    public async create(
+        entity: ConfigProfileEntity,
+        inbounds: ConfigProfileInboundEntity[],
+    ): Promise<{ uuid: string }> {
         const model = this.configProfileConverter.fromEntityToPrismaModel(entity);
         const result = await this.prisma.tx.configProfiles.create({
+            select: {
+                uuid: true,
+            },
             data: {
                 ...model,
                 config: model.config as Prisma.InputJsonValue,
+                configProfileInbounds: {
+                    create: inbounds.map((inbound) => ({
+                        ...inbound,
+                    })),
+                },
             },
         });
 
-        return this.configProfileConverter.fromPrismaModelToEntity(result);
+        return {
+            uuid: result.uuid,
+        };
     }
 
     public async findByUUID(uuid: string): Promise<ConfigProfileEntity | null> {
diff --git a/src/modules/internal-squads/internal-squad.service.ts b/src/modules/internal-squads/internal-squad.service.ts
@@ -71,7 +71,6 @@ export class InternalSquadService {
         }
     }
 
-    @Transactional()
     public async createInternalSquad(
         name: string,
         inbounds: string[],
@@ -84,16 +83,11 @@ export class InternalSquadService {
                 };
             }
 
-            const internalSquad = await this.internalSquadRepository.create(
-                new InternalSquadEntity({
-                    name,
-                }),
+            const internalSquad = await this.internalSquadRepository.createWithInbounds(
+                name,
+                inbounds,
             );
 
-            if (inbounds.length > 0) {
-                await this.internalSquadRepository.createInbounds(inbounds, internalSquad.uuid);
-            }
-
             return await this.getInternalSquadByUuid(internalSquad.uuid);
         } catch (error) {
             if (
diff --git a/src/modules/internal-squads/repositories/internal-squad.repository.ts b/src/modules/internal-squads/repositories/internal-squad.repository.ts
@@ -30,6 +30,22 @@ export class InternalSquadRepository implements ICrud<InternalSquadEntity> {
         return this.internalSquadConverter.fromPrismaModelToEntity(result);
     }
 
+    public async createWithInbounds(
+        name: string,
+        inbounds: string[],
+    ): Promise<InternalSquadEntity> {
+        const result = await this.prisma.tx.internalSquads.create({
+            data: {
+                name,
+                internalSquadInbounds: {
+                    create: inbounds.map((inbound) => ({ inboundUuid: inbound })),
+                },
+            },
+        });
+
+        return this.internalSquadConverter.fromPrismaModelToEntity(result);
+    }
+
     public async findByUUID(uuid: string): Promise<InternalSquadEntity | null> {
         const result = await this.prisma.tx.internalSquads.findUnique({
             where: { uuid },
diff --git a/src/modules/nodes-user-usage-history/commands/clean-old-usage-records/clean-old-usage-records.command.ts b/src/modules/nodes-user-usage-history/commands/clean-old-usage-records/clean-old-usage-records.command.ts
diff --git a/src/modules/nodes-user-usage-history/commands/clean-old-usage-records/clean-old-usage-records.handler.ts b/src/modules/nodes-user-usage-history/commands/clean-old-usage-records/clean-old-usage-records.handler.ts
diff --git a/src/modules/nodes-user-usage-history/commands/clean-old-usage-records/index.ts b/src/modules/nodes-user-usage-history/commands/clean-old-usage-records/index.ts
diff --git a/src/modules/nodes-user-usage-history/commands/index.ts b/src/modules/nodes-user-usage-history/commands/index.ts
@@ -1,11 +1,9 @@
 import { TruncateNodesUserUsageHistoryHandler } from './truncate-nodes-user-usage-history';
 import { VacuumNodesUserUsageHistoryHandler } from './vacuum-nodes-user-usage-history';
 import { BulkUpsertUserHistoryEntryHandler } from './bulk-upsert-user-history-entry';
-import { CleanOldUsageRecordsHandler } from './clean-old-usage-records';
 
 export const COMMANDS = [
     BulkUpsertUserHistoryEntryHandler,
     VacuumNodesUserUsageHistoryHandler,
-    CleanOldUsageRecordsHandler,
     TruncateNodesUserUsageHistoryHandler,
 ];
diff --git a/src/modules/users/commands/batch-reset-limited-users-traffic/batch-reset-limited-users-traffic.handler.ts b/src/modules/users/commands/batch-reset-limited-users-traffic/batch-reset-limited-users-traffic.handler.ts
@@ -1,8 +1,6 @@
 import { ERRORS } from '@contract/constants';
 
-import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { Transactional } from '@nestjs-cls/transactional';
 import { Logger } from '@nestjs/common';
 
 import { BatchResetLimitedUsersTrafficCommand } from './batch-reset-limited-users-traffic.command';
@@ -14,10 +12,6 @@ export class BatchResetLimitedUsersTrafficHandler implements ICommandHandler<Bat
 
     constructor(private readonly usersRepository: UsersRepository) {}
 
-    @Transactional<TransactionalAdapterPrisma>({
-        maxWait: 20_000,
-        timeout: 120_000,
-    })
     async execute(command: BatchResetLimitedUsersTrafficCommand) {
         try {
             const result = await this.usersRepository.resetLimitedUsersTraffic(command.strategy);
diff --git a/src/modules/users/commands/batch-reset-user-traffic/batch-reset-user-traffic.handler.ts b/src/modules/users/commands/batch-reset-user-traffic/batch-reset-user-traffic.handler.ts
@@ -1,8 +1,6 @@
 import { ERRORS } from '@contract/constants';
 
-import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { Transactional } from '@nestjs-cls/transactional';
 import { Logger } from '@nestjs/common';
 
 import { ICommandResponse } from '@common/types/command-response.type';
@@ -19,10 +17,6 @@ export class BatchResetUserTrafficHandler implements ICommandHandler<
 
     constructor(private readonly usersRepository: UsersRepository) {}
 
-    @Transactional<TransactionalAdapterPrisma>({
-        maxWait: 20_000,
-        timeout: 120_000,
-    })
     async execute(command: BatchResetUserTrafficCommand): Promise<ICommandResponse<void>> {
         try {
             await this.usersRepository.resetUserTraffic(command.strategy);
diff --git a/src/modules/users/commands/bulk-delete-by-status/bulk-delete-by-status.handler.ts b/src/modules/users/commands/bulk-delete-by-status/bulk-delete-by-status.handler.ts
@@ -1,8 +1,6 @@
 import { ERRORS } from '@contract/constants';
 
-import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { Transactional } from '@nestjs-cls/transactional';
 import { Logger } from '@nestjs/common';
 
 import { ICommandResponse } from '@common/types/command-response.type';
@@ -19,10 +17,6 @@ export class BulkDeleteByStatusHandler implements ICommandHandler<
 
     constructor(private readonly usersRepository: UsersRepository) {}
 
-    @Transactional<TransactionalAdapterPrisma>({
-        maxWait: 20_000,
-        timeout: 120_000,
-    })
     async execute(
         command: BulkDeleteByStatusCommand,
     ): Promise<ICommandResponse<{ deletedCount: number }>> {
diff --git a/src/modules/users/commands/bulk-increment-used-traffic/bulk-increment-used-traffic.handler.ts b/src/modules/users/commands/bulk-increment-used-traffic/bulk-increment-used-traffic.handler.ts
@@ -1,8 +1,6 @@
 import { ERRORS } from '@contract/constants';
 
-import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { Transactional } from '@nestjs-cls/transactional';
 import { Logger } from '@nestjs/common';
 
 import { ICommandResponse } from '@common/types/command-response.type';
@@ -19,10 +17,6 @@ export class BulkIncrementUsedTrafficHandler implements ICommandHandler<
 
     constructor(private readonly usersRepository: UsersRepository) {}
 
-    @Transactional<TransactionalAdapterPrisma>({
-        maxWait: 20_000,
-        timeout: 120_000,
-    })
     async execute(
         command: BulkIncrementUsedTrafficCommand,
     ): Promise<ICommandResponse<{ tId: bigint }[]>> {
diff --git a/src/modules/users/commands/trigger-threshold-notification/trigger-threshold-notification.handler.ts b/src/modules/users/commands/trigger-threshold-notification/trigger-threshold-notification.handler.ts
@@ -1,8 +1,6 @@
 import { ERRORS } from '@contract/constants';
 
-import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { Transactional } from '@nestjs-cls/transactional';
 import { Logger } from '@nestjs/common';
 
 import { ICommandResponse } from '@common/types/command-response.type';
@@ -19,10 +17,6 @@ export class TriggerThresholdNotificationHandler implements ICommandHandler<
 
     constructor(private readonly usersRepository: UsersRepository) {}
 
-    @Transactional<TransactionalAdapterPrisma>({
-        maxWait: 20_000,
-        timeout: 120_000,
-    })
     async execute(
         command: TriggerThresholdNotificationCommand,
     ): Promise<ICommandResponse<{ tId: bigint }[]>> {
diff --git a/src/modules/users/commands/update-exceeded-users/update-exceeded-users.handler.ts b/src/modules/users/commands/update-exceeded-users/update-exceeded-users.handler.ts
@@ -1,8 +1,6 @@
 import { ERRORS } from '@contract/constants';
 
-import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { Transactional } from '@nestjs-cls/transactional';
 import { Logger } from '@nestjs/common';
 
 import { ICommandResponse } from '@common/types/command-response.type';
@@ -19,10 +17,6 @@ export class UpdateExceededTrafficUsersHandler implements ICommandHandler<
 
     constructor(private readonly usersRepository: UsersRepository) {}
 
-    @Transactional<TransactionalAdapterPrisma>({
-        maxWait: 20_000,
-        timeout: 120_000,
-    })
     async execute(): Promise<ICommandResponse<{ tId: bigint }[]>> {
         try {
             const result = await this.usersRepository.updateExceededTrafficUsers();
diff --git a/src/modules/users/commands/update-expired-users/update-expired-users.handler.ts b/src/modules/users/commands/update-expired-users/update-expired-users.handler.ts
@@ -1,8 +1,6 @@
 import { ERRORS } from '@contract/constants';
 
-import { TransactionalAdapterPrisma } from '@nestjs-cls/transactional-adapter-prisma';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { Transactional } from '@nestjs-cls/transactional';
 import { Logger } from '@nestjs/common';
 
 import { ICommandResponse } from '@common/types/command-response.type';
@@ -19,10 +17,6 @@ export class UpdateExpiredUsersHandler implements ICommandHandler<
 
     constructor(private readonly usersRepository: UsersRepository) {}
 
-    @Transactional<TransactionalAdapterPrisma>({
-        maxWait: 20_000,
-        timeout: 120_000,
-    })
     async execute(): Promise<ICommandResponse<{ tId: bigint }[]>> {
         try {
             const result = await this.usersRepository.updateExpiredUsers();
diff --git a/src/modules/users/repositories/users.repository.ts b/src/modules/users/repositories/users.repository.ts
@@ -46,31 +46,35 @@ export class UsersRepository {
         private readonly userConverter: UserConverter,
     ) {}
 
-    public async create(entity: BaseUserEntity): Promise<{
-        uuid: string;
+    public async create(
+        entity: BaseUserEntity,
+        internalSquadUuids: string[] = [],
+    ): Promise<{
+        tId: bigint;
     }> {
         const model = this.userConverter.fromEntityToPrismaModel(entity);
         const result = await this.prisma.tx.users.create({
             select: {
-                uuid: true,
                 tId: true,
             },
             data: {
                 ...model,
-            },
-        });
-
-        await this.prisma.tx.userTraffic.create({
-            select: {
-                tId: true,
-            },
-            data: {
-                tId: result.tId,
+                traffic: {
+                    create: {
+                        usedTrafficBytes: 0,
+                        lifetimeUsedTrafficBytes: 0,
+                    },
+                },
+                activeInternalSquads: {
+                    create: internalSquadUuids.map((internalSquadUuid) => ({
+                        internalSquadUuid,
+                    })),
+                },
             },
         });
 
         return {
-            uuid: result.uuid,
+            tId: result.tId,
         };
     }
 
diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts
