refactor(user): separate profile and settings logic / bump bug with imports

Author: soorq

src/modules/auth/controller/recovery.controller.ts

@@ -1,6 +1,6 @@
 import { ApiBaseController } from '../../../shared/decorators';
 import { Body, Post } from '@nestjs/common';
-import { AuthService } from '../services';
+import { AuthRecoveryService } from '../services';
 import {
     PostPasswordResetConfirmSwagger,
     PostPasswordResetSwagger,
@@ -10,7 +10,7 @@ import { PasswordResetConfirmDto, ResetPasswordDto, VerifyResetCodeDto } from '.
 
 @ApiBaseController('auth', 'Auth Recovery')
 export class AuthRecoveryController {
-    constructor(private readonly facade: AuthService) {}
+    constructor(private readonly facade: AuthRecoveryService) {}
 
     @Post('password/reset')
     @PostPasswordResetSwagger()

src/modules/teams/controller/me.controller.ts

@@ -4,7 +4,7 @@ import { Get, Query } from '@nestjs/common';
 import { FindInvitesSwagger, FindTeamsSwagger } from './teams.swagger';
 import type { JwtPayload } from '@core/modules/auth/types';
 
-@ApiBaseController('users/me', 'User Context in Teams', true)
+@ApiBaseController('users/me', 'Account Teams', true)
 export class MeController {
     constructor(private readonly facade: MeService) {}
 

src/modules/user/controller/index.ts

@@ -1 +1,2 @@
 export { UserController } from './user.controller';
+export { UserSettingsController } from './settings.controller';

src/modules/user/controller/settings.controller.ts

@@ -0,0 +1,18 @@
+import { Body, Patch, UseGuards } from '@nestjs/common';
+import { UserSettingsService } from '../services';
+import { PatchMeNotificationsSwagger } from './user.swagger';
+import type { UpdateNotificationsDto } from '../dtos';
+import { ApiBaseController, GetUserId } from '../../../shared/decorators';
+import { BearerAuthGuard } from '@shared/guards';
+
+@ApiBaseController('users/me', 'Account Settings')
+@UseGuards(BearerAuthGuard)
+export class UserSettingsController {
+    constructor(private readonly facade: UserSettingsService) {}
+
+    @Patch('notifications')
+    @PatchMeNotificationsSwagger()
+    async updateNotifications(@Body() settings: UpdateNotificationsDto, @GetUserId() id: string) {
+        return this.facade.updateNotifications(id, settings);
+    }
+}

src/modules/user/controller/user.controller.ts

@@ -1,48 +1,41 @@
 import { Body, Get, Patch, Post, Query, UseGuards } from '@nestjs/common';
-import { UserService } from '../user.service';
+import { UserService } from '../services';
 import {
     GetMeActivitySwagger,
     GetMeSwagger,
-    PatchMeNotificationsSwagger,
     PatchMeSwagger,
     PostMeAvatarSwagger,
 } from './user.swagger';
-import { UpdateNotificationsDto, UpdateProfileDto } from '../dtos';
+import type { UpdateProfileDto } from '../dtos';
 import { ApiBaseController, ExtractFastifyFile, GetUserId } from '../../../shared/decorators';
 import { BearerAuthGuard } from '@shared/guards';
-import { PaginationDto } from '../../../shared/dtos';
-import { FileUploadDto } from '../../media/dtos';
+import type { PaginationDto } from '../../../shared/dtos';
+import type { FileUploadDto } from '../../media/dtos';
 
-@ApiBaseController('users', 'Users')
+@ApiBaseController('users/me', 'Account Profile')
 @UseGuards(BearerAuthGuard)
 export class UserController {
     constructor(private readonly facade: UserService) {}
 
-    @Get('me')
+    @Get()
     @GetMeSwagger()
     async getProfile(@GetUserId() id: string) {
         return this.facade.getProfile(id);
     }
 
-    @Patch('me')
+    @Patch()
     @PatchMeSwagger()
     async updateProfile(@Body() dto: UpdateProfileDto, @GetUserId() id: string) {
         return this.facade.updateProfile(id, dto);
     }
 
-    @Patch('me/notifications')
-    @PatchMeNotificationsSwagger()
-    async updateNotifications(@Body() settings: UpdateNotificationsDto, @GetUserId() id: string) {
-        return this.facade.updateNotifications(id, settings);
-    }
-
-    @Get('me/activity')
+    @Get('activity')
     @GetMeActivitySwagger()
     async getActivity(@Query() query: PaginationDto, @GetUserId() id: string) {
         return this.facade.getActivity(id, query.page, query.limit);
     }
 
-    @Post('me/avatar')
+    @Post('avatar')
     @PostMeAvatarSwagger()
     async uploadAvatar(
         @ExtractFastifyFile() fileDto: FileUploadDto,

src/modules/user/services/index.ts

@@ -0,0 +1,2 @@
+export { UserSettingsService } from './settings.service';
+export { UserService } from './user.service';

src/modules/user/services/settings.service.ts

@@ -0,0 +1,63 @@
+import {
+    Inject,
+    Injectable,
+    InternalServerErrorException,
+    NotFoundException,
+} from '@nestjs/common';
+import { IUserRepository } from '../repository/user.repository.interface';
+import type { UpdateNotificationsDto } from '../dtos';
+import { createId } from '@paralleldrive/cuid2';
+
+@Injectable()
+export class UserSettingsService {
+    constructor(
+        @Inject('IUserRepository')
+        private readonly userRepo: IUserRepository,
+    ) {}
+
+    private throwUserNotFound() {
+        throw new NotFoundException({
+            code: 'USER_NOT_FOUND',
+            message: 'Пользователь не найден в системе',
+        });
+    }
+
+    public updateNotifications = async (id: string, dto: UpdateNotificationsDto) => {
+        const keysToUpdate = Object.keys(dto);
+        if (keysToUpdate.length === 0) {
+            return {
+                success: true,
+                message: 'Изменений не обнаружено',
+            };
+        }
+
+        const user = await this.userRepo.findById(id);
+        if (!user) this.throwUserNotFound();
+
+        try {
+            const isUpdated = await this.userRepo.updateNotifications(id, {
+                email: dto.email,
+                push: dto.push,
+            });
+
+            if (!isUpdated) {
+                throw new InternalServerErrorException(
+                    'Ошибка при сохранении настроек уведомлений',
+                );
+            }
+
+            await this.userRepo.logActivity({
+                id: createId(),
+                userId: id,
+                eventType: 'NOTIFICATIONS_UPDATED',
+            });
+
+            return {
+                success: true,
+                message: 'Настройки уведомлений обновлены',
+            };
+        } catch (error) {
+            throw error;
+        }
+    };
+}

src/modules/user/user.service.ts src/modules/user/services/user.service.tssrc/modules/user/user.service.ts renamed to src/modules/user/services/user.service.ts

@@ -4,11 +4,11 @@ import {
     InternalServerErrorException,
     NotFoundException,
 } from '@nestjs/common';
-import { IUserRepository } from './repository/user.repository.interface';
-import { UpdateNotificationsDto, UpdateProfileDto } from './dtos';
+import { IUserRepository } from '../repository/user.repository.interface';
+import type { UpdateProfileDto } from '../dtos';
 import { createId } from '@paralleldrive/cuid2';
-import { IUserMedia, USER_MEDIA_TOKEN } from '../media/interfaces/user-media.interface';
-import { FileUploadDto } from '../media/dtos';
+import { IUserMedia, USER_MEDIA_TOKEN } from '../../media/interfaces/user-media.interface';
+import type { FileUploadDto } from '../../media/dtos';
 
 @Injectable()
 export class UserService {
@@ -74,45 +74,6 @@ export class UserService {
         }
     };
 
-    public updateNotifications = async (id: string, dto: UpdateNotificationsDto) => {
-        const keysToUpdate = Object.keys(dto);
-        if (keysToUpdate.length === 0) {
-            return {
-                success: true,
-                message: 'Изменений не обнаружено',
-            };
-        }
-
-        const user = await this.userRepo.findById(id);
-        if (!user) this.throwUserNotFound();
-
-        try {
-            const isUpdated = await this.userRepo.updateNotifications(id, {
-                email: dto.email,
-                push: dto.push,
-            });
-
-            if (!isUpdated) {
-                throw new InternalServerErrorException(
-                    'Ошибка при сохранении настроек уведомлений',
-                );
-            }
-
-            await this.userRepo.logActivity({
-                id: createId(),
-                userId: id,
-                eventType: 'NOTIFICATIONS_UPDATED',
-            });
-
-            return {
-                success: true,
-                message: 'Настройки уведомлений обновлены',
-            };
-        } catch (error) {
-            throw error;
-        }
-    };
-
     public getActivity = async (id: string, page: number, limit: number) => {
         const safeLimit = Math.min(limit, 50);
         const offset = (page - 1) * safeLimit;

src/modules/user/user.module.ts

@@ -1,9 +1,10 @@
 import { Module } from '@nestjs/common';
-import { UserController } from './controller';
-import { UserService } from './user.service';
+import { UserController, UserSettingsController } from './controller';
+import { UserService } from './services/user.service';
 import { UserRepository } from './repository/user.repository';
 import { CreateUserCommand, FindOneUserCommand, UpdatePassUserCommand } from './commands';
 import { MediaModule } from '../media/media.module';
+import { UserSettingsService } from './services';
 
 const REPOSITORY = {
     provide: 'IUserRepository',
@@ -14,8 +15,8 @@ const COMMANDS = [CreateUserCommand, FindOneUserCommand, UpdatePassUserCommand];
 
 @Module({
     imports: [MediaModule],
-    controllers: [UserController],
-    providers: [...COMMANDS, REPOSITORY, UserService],
+    controllers: [UserController, UserSettingsController],
+    providers: [...COMMANDS, REPOSITORY, UserService, UserSettingsService],
     exports: [...COMMANDS],
 })
 export class UserModule {}