refactor: enhance user update logic

Author: kastov

src/modules/users/interfaces/index.ts

@@ -2,5 +2,6 @@ export * from './get-user-accessible-nodes.interface';
 export * from './get-user-by-unique.interface';
 export * from './get-user-usage-by-range.interface';
 export * from './get-users-by-telegram-id-or-email.interface';
+export * from './update-user-dto';
 export * from './user-stats.interface';
 export * from './user-status-count.interface';

src/modules/users/interfaces/update-user-dto.ts

@@ -0,0 +1,6 @@
+import { BaseUserEntity } from '../entities/base-users.entity';
+
+export interface IUpdateUserDto extends Partial<BaseUserEntity> {
+    tId: bigint;
+    activeInternalSquads?: string[];
+}

src/modules/users/repositories/users.repository.ts

@@ -19,6 +19,7 @@ import { ConfigProfileInboundEntity } from '@modules/config-profiles/entities';
 import {
     IGetUserAccessibleNodes,
     IGetUserAccessibleNodesResponse,
+    IUpdateUserDto,
     IUserOnlineStats,
     IUserStats,
 } from '../interfaces';
@@ -479,14 +480,8 @@ export class UsersRepository {
     }
 
     @Transactional()
-    public async update(
-        dto: {
-            tId: bigint;
-            activeInternalSquads: string[];
-            updateInternalSquads: boolean;
-        } & Partial<BaseUserEntity>,
-    ): Promise<UserEntity | null> {
-        const { tId, activeInternalSquads, updateInternalSquads, ...data } = dto;
+    public async update(dto: IUpdateUserDto): Promise<UserEntity | null> {
+        const { tId, activeInternalSquads, ...data } = dto;
 
         await this.prisma.tx.users.update({
             select: {
@@ -496,7 +491,7 @@ export class UsersRepository {
             data,
         });
 
-        if (updateInternalSquads) {
+        if (activeInternalSquads) {
             await this.removeUserFromInternalSquads(tId);
             await this.addUserToInternalSquads(tId, activeInternalSquads);
         }

src/modules/users/users.service.ts

@@ -41,7 +41,12 @@ import {
     BulkUpdateUsersRequestDto,
     BulkAllUpdateUsersRequestDto,
 } from './dtos';
-import { IGetUserByUnique, IGetUsersByTelegramIdOrEmail, IGetUserUsageByRange } from './interfaces';
+import {
+    IGetUserByUnique,
+    IGetUsersByTelegramIdOrEmail,
+    IGetUserUsageByRange,
+    IUpdateUserDto,
+} from './interfaces';
 import { GetCachedShortUuidRangeQuery } from './queries/get-cached-short-uuid-range';
 import { UsersRepository } from './repositories/users.repository';
 import { BaseUserEntity, UserEntity } from './entities';
@@ -165,7 +170,6 @@ export class UsersService {
 
             let addToNode = false;
             let removeFromNode = false;
-            let updateInternalSquads = false;
 
             if (user.status !== 'ACTIVE' && status === 'ACTIVE') {
                 addToNode = true;
@@ -202,6 +206,10 @@ export class UsersService {
                 }
             }
 
+            const updateDto: IUpdateUserDto = {
+                ...newUserEntity,
+            };
+
             if (newActiveInternalSquadsUuids) {
                 const currentInternalSquadsUuids = user.activeInternalSquads.map(
                     (squad) => squad.uuid,
@@ -214,17 +222,13 @@ export class UsersService {
                     );
 
                 if (hasChanges) {
-                    updateInternalSquads = true;
+                    updateDto.activeInternalSquads = newActiveInternalSquadsUuids;
                     removeFromNode = newActiveInternalSquadsUuids.length === 0;
                     addToNode = newActiveInternalSquadsUuids.length > 0;
                 }
             }
 
-            const updatedUser = await this.userRepository.update({
-                ...newUserEntity,
-                activeInternalSquads: newActiveInternalSquadsUuids || [],
-                updateInternalSquads,
-            });
+            const updatedUser = await this.userRepository.update(updateDto);
 
             if (!updatedUser) {
                 return fail(ERRORS.UPDATE_USER_ERROR);