Skip to content

Commit 7e5a782

Browse files
committed
chore: restructure services and use type-only imports
1 parent 77f914d commit 7e5a782

11 files changed

Lines changed: 19 additions & 15 deletions

File tree

src/modules/media/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export { MediaModule } from './media.module';
2+
export * from './interfaces/team-media.interface';
3+
export * from './interfaces/user-media.interface';
4+
export * from './dtos';

src/modules/media/interfaces/team-media.interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FileUploadDto, FileUploadResponse } from '../dtos';
1+
import type { FileUploadDto, FileUploadResponse } from '../dtos';
22

33
export const TEAM_MEDIA_TOKEN = 'ITeamMedia';
44

src/modules/media/interfaces/user-media.interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FileUploadDto, FileUploadResponse } from '../dtos';
1+
import type { FileUploadDto, FileUploadResponse } from '../dtos';
22

33
export const USER_MEDIA_TOKEN = 'IUserMedia';
44

src/modules/media/media.service.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { BadRequestException, Injectable } from '@nestjs/common';
1+
import { BadRequestException, HttpException, Injectable } from '@nestjs/common';
22
import { S3Service } from '@libs/s3';
3-
import { FileUploadDto, FileUploadResponseDto } from './dtos';
3+
import type { FileUploadDto, FileUploadResponseDto } from './dtos';
44
import { IUserMedia } from './interfaces/user-media.interface';
55
import { ITeamMedia } from './interfaces/team-media.interface';
66

@@ -24,9 +24,11 @@ export class MediaService implements IUserMedia, ITeamMedia {
2424

2525
return { success: true, url };
2626
} catch (error) {
27+
const isHttpException = error instanceof HttpException;
28+
2729
await this.s3.deleteFile(url);
2830

29-
if (error.message === 'ENTITY_NOT_FOUND') {
31+
if (isHttpException && error.message === 'ENTITY_NOT_FOUND') {
3032
throw new BadRequestException('Сущность не найдена, обновление отменено');
3133
}
3234

src/modules/teams/controller/settings.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
PatchTeamAvatarSwagger,
77
PatchTeamBannerSwagger,
88
} from './teams.swagger';
9-
import type { FileUploadDto } from '../../media/dtos';
9+
import type { FileUploadDto } from '../../media';
1010
import type { SyncTagsDto } from '../dtos';
1111

1212
@ApiBaseController('teams/:slug', 'Teams Settings', true)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import {
55
NotFoundException,
66
} from '@nestjs/common';
77
import { ITeamsRepository } from '../repository';
8-
import { ITeamMedia, TEAM_MEDIA_TOKEN } from '../../media/interfaces/team-media.interface';
9-
import type { FileUploadDto } from '../../media/dtos';
8+
import { ITeamMedia, TEAM_MEDIA_TOKEN, type FileUploadDto } from '../../media';
109

1110
@Injectable()
1211
export class TeamsSettingsService {

src/modules/teams/teams.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
TeamsController,
77
MeController,
88
} from './controller';
9-
import { MediaModule } from '../media/media.module';
9+
import { MediaModule } from '../media';
1010
import {
1111
MeService,
1212
TeamsService,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type { UpdateProfileDto } from '../dtos';
1010
import { ApiBaseController, ExtractFastifyFile, GetUserId } from '../../../shared/decorators';
1111
import { BearerAuthGuard } from '@shared/guards';
1212
import type { PaginationDto } from '../../../shared/dtos';
13-
import type { FileUploadDto } from '../../media/dtos';
13+
import type { FileUploadDto } from '../../media';
1414

1515
@ApiBaseController('users/me', 'Account Profile')
1616
@UseGuards(BearerAuthGuard)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import {
77
import { IUserRepository } from '../repository/user.repository.interface';
88
import type { UpdateProfileDto } from '../dtos';
99
import { createId } from '@paralleldrive/cuid2';
10-
import { IUserMedia, USER_MEDIA_TOKEN } from '../../media/interfaces/user-media.interface';
11-
import type { FileUploadDto } from '../../media/dtos';
10+
import { IUserMedia, USER_MEDIA_TOKEN, type FileUploadDto } from '../../media';
1211

1312
@Injectable()
1413
export class UserService {

src/modules/user/user.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { UserController, UserSettingsController } from './controller';
33
import { UserService } from './services/user.service';
44
import { UserRepository } from './repository/user.repository';
55
import { CreateUserCommand, FindOneUserCommand, UpdatePassUserCommand } from './commands';
6-
import { MediaModule } from '../media/media.module';
6+
import { MediaModule } from '../media';
77
import { UserSettingsService } from './services';
88

99
const REPOSITORY = {

0 commit comments

Comments
 (0)