Skip to content

Commit b8b8edc

Browse files
authored
Merge pull request #368 from boostcampwm2023/BE-refactor/refactor
μ‚¬μš©ν•˜μ§€ μ•ŠλŠ” μ½”λ“œ 정리, import μˆœμ„œ λ³€κ²½
2 parents 6e46d8e + 6b7ccc4 commit b8b8edc

26 files changed

+36
-166
lines changed

β€Žnestjs-BE/server/src/app.module.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { Module } from '@nestjs/common';
2+
import { ConfigModule, ConfigService } from '@nestjs/config';
3+
import { MongooseModule } from '@nestjs/mongoose';
4+
import { ScheduleModule } from '@nestjs/schedule';
25
import { AppController } from './app.controller';
36
import { AppService } from './app.service';
47
import { AuthModule } from './auth/auth.module';
58
import { ProfilesModule } from './profiles/profiles.module';
69
import { SpacesModule } from './spaces/spaces.module';
710
import { BoardsModule } from './boards/boards.module';
8-
import { ScheduleModule } from '@nestjs/schedule';
9-
import { MongooseModule } from '@nestjs/mongoose';
1011
import { InviteCodesModule } from './invite-codes/invite-codes.module';
1112
import { ProfileSpaceModule } from './profile-space/profile-space.module';
1213
import { BoardTreesModule } from './board-trees/board-trees.module';
13-
import { ConfigModule, ConfigService } from '@nestjs/config';
1414

1515
@Module({
1616
imports: [

β€Žnestjs-BE/server/src/board-trees/board-trees.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Module } from '@nestjs/common';
2+
import { MongooseModule } from '@nestjs/mongoose';
23
import { BoardTreesService } from './board-trees.service';
34
import { BoardTreesGateway } from './board-trees.gateway';
4-
import { MongooseModule } from '@nestjs/mongoose';
55
import { BoardTree, BoardTreeSchema } from './schemas/board-tree.schema';
66

77
@Module({

β€Žnestjs-BE/server/src/board-trees/board-trees.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Injectable } from '@nestjs/common';
22
import { InjectModel } from '@nestjs/mongoose';
3-
import { BoardTree } from './schemas/board-tree.schema';
43
import { Model } from 'mongoose';
4+
import { BoardTree } from './schemas/board-tree.schema';
55
import { CrdtTree } from '../crdt/crdt-tree';
66
import { Operation } from '../crdt/operation';
77

β€Žnestjs-BE/server/src/boards/dto/create-board.dto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ApiProperty } from '@nestjs/swagger';
22
import { IsNotEmpty, IsString, MaxLength } from 'class-validator';
3-
import { MAX_NAME_LENGTH } from '../../config/magic-number';
3+
import { MAX_NAME_LENGTH } from '../../config/constants';
44

55
export class CreateBoardDto {
66
@ApiProperty({ description: 'λ³΄λ“œ 이름' })
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export const REFRESH_TOKEN_EXPIRY_WEEKS = 2;
2+
export const INVITE_CODE_LENGTH = 10;
3+
export const INVITE_CODE_EXPIRY_HOURS = 6;
4+
export const MAX_NAME_LENGTH = 20;

β€Žnestjs-BE/server/src/config/magic-number.ts

-13
This file was deleted.

β€Žnestjs-BE/server/src/invite-codes/dto/create-invite-code.dto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { IsNotEmpty, IsString } from 'class-validator';
21
import { ApiProperty } from '@nestjs/swagger';
2+
import { IsNotEmpty, IsString } from 'class-validator';
33

44
export class CreateInviteCodeDto {
55
@ApiProperty({

β€Žnestjs-BE/server/src/invite-codes/invite-codes.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { PrismaService } from '../prisma/prisma.service';
66
import {
77
INVITE_CODE_EXPIRY_HOURS,
88
INVITE_CODE_LENGTH,
9-
} from '../config/magic-number';
9+
} from '../config/constants';
1010
import { checkExpiry, getExpiryDate } from '../utils/date';
1111
import { SpacesService } from '../spaces/spaces.service';
1212

β€Žnestjs-BE/server/src/main.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { ValidationPipe } from '@nestjs/common';
2+
import { ConfigService } from '@nestjs/config';
13
import { NestFactory } from '@nestjs/core';
2-
import { AppModule } from './app.module';
34
import { SwaggerModule } from '@nestjs/swagger';
5+
import { AppModule } from './app.module';
46
import { swaggerConfig } from './config/swagger';
5-
import { ValidationPipe } from '@nestjs/common';
6-
import { ConfigService } from '@nestjs/config';
77

88
async function bootstrap() {
99
const app = await NestFactory.create(AppModule);

β€Žnestjs-BE/server/src/profile-space/profile-space.service.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Test, TestingModule } from '@nestjs/testing';
2+
import { ProfileSpace } from '@prisma/client';
23
import { ProfileSpaceService } from './profile-space.service';
34
import { PrismaService } from '../prisma/prisma.service';
4-
import { ProfileSpace } from '@prisma/client';
55

66
describe('ProfileSpaceService', () => {
77
let profileSpaceService: ProfileSpaceService;

β€Žnestjs-BE/server/src/profile-space/profile-space.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Injectable } from '@nestjs/common';
2-
import { PrismaService } from '../prisma/prisma.service';
32
import { ProfileSpace } from '@prisma/client';
3+
import { PrismaService } from '../prisma/prisma.service';
44

55
@Injectable()
66
export class ProfileSpaceService {

β€Žnestjs-BE/server/src/profiles/dto/create-profile.dto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ApiProperty } from '@nestjs/swagger';
22
import { MaxLength } from 'class-validator';
3-
import { MAX_NAME_LENGTH } from '../../config/magic-number';
3+
import { MAX_NAME_LENGTH } from '../../config/constants';
44

55
export class CreateProfileDto {
66
userUuid: string;

β€Žnestjs-BE/server/src/profiles/dto/update-profile.dto.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { PartialType } from '@nestjs/mapped-types';
2-
import { CreateProfileDto } from './create-profile.dto';
32
import { ApiProperty } from '@nestjs/swagger';
43
import { MaxLength } from 'class-validator';
5-
import { MAX_NAME_LENGTH } from '../../config/magic-number';
4+
import { CreateProfileDto } from './create-profile.dto';
5+
import { MAX_NAME_LENGTH } from '../../config/constants';
66

77
export class UpdateProfileDto extends PartialType(CreateProfileDto) {
88
@MaxLength(MAX_NAME_LENGTH)

β€Žnestjs-BE/server/src/refresh-tokens/refresh-tokens.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Module } from '@nestjs/common';
2-
import { RefreshTokensService } from './refresh-tokens.service';
32
import { JwtModule } from '@nestjs/jwt';
3+
import { RefreshTokensService } from './refresh-tokens.service';
44
import { PrismaModule } from '../prisma/prisma.module';
55

66
@Module({

β€Žnestjs-BE/server/src/refresh-tokens/refresh-tokens.service.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { ConfigModule } from '@nestjs/config';
2+
import { JwtModule } from '@nestjs/jwt';
13
import { Test, TestingModule } from '@nestjs/testing';
4+
import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
5+
import { v4 as uuid } from 'uuid';
26
import { RefreshTokensService } from './refresh-tokens.service';
37
import { PrismaService } from '../prisma/prisma.service';
4-
import { JwtModule } from '@nestjs/jwt';
5-
import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
6-
import { ConfigModule } from '@nestjs/config';
78
import { getExpiryDate } from '../utils/date';
8-
import { v4 as uuid } from 'uuid';
99

1010
jest.useFakeTimers();
1111

β€Žnestjs-BE/server/src/refresh-tokens/refresh-tokens.service.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { Prisma, RefreshToken } from '@prisma/client';
66
import { v4 as uuid } from 'uuid';
77
import { PrismaService } from '../prisma/prisma.service';
88
import { getExpiryDate } from '../utils/date';
9+
import { REFRESH_TOKEN_EXPIRY_WEEKS } from '../config/constants';
910

1011
@Injectable()
1112
export class RefreshTokensService {
@@ -19,7 +20,7 @@ export class RefreshTokensService {
1920
return this.prisma.refreshToken.create({
2021
data: {
2122
token: this.createToken(),
22-
expiryDate: getExpiryDate({ week: 2 }),
23+
expiryDate: getExpiryDate({ week: REFRESH_TOKEN_EXPIRY_WEEKS }),
2324
userUuid,
2425
},
2526
});

β€Žnestjs-BE/server/src/spaces/dto/create-space.dto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ApiProperty } from '@nestjs/swagger';
22
import { IsNotEmpty, IsString, MaxLength } from 'class-validator';
3-
import { MAX_NAME_LENGTH } from '../../config/magic-number';
43
import { Expose } from 'class-transformer';
54
import { v4 as uuid } from 'uuid';
5+
import { MAX_NAME_LENGTH } from '../../config/constants';
66

77
export class CreateSpaceRequestDto {
88
@IsString()

β€Žnestjs-BE/server/src/spaces/dto/update-space.dto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ApiProperty } from '@nestjs/swagger';
22
import { IsNotEmpty, IsOptional, IsString, MaxLength } from 'class-validator';
3-
import { MAX_NAME_LENGTH } from '../../config/magic-number';
3+
import { MAX_NAME_LENGTH } from '../../config/constants';
44

55
export class UpdateSpaceRequestDto {
66
@IsOptional()

β€Žnestjs-BE/server/src/spaces/spaces.controller.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { BadRequestException, HttpStatus } from '@nestjs/common';
2-
import { Profile, Space } from '@prisma/client';
32
import { Test, TestingModule } from '@nestjs/testing';
3+
import { Profile, Space } from '@prisma/client';
44
import { SpacesController } from './spaces.controller';
55
import { SpacesService } from './spaces.service';
66
import { UpdateSpaceRequestDto } from './dto/update-space.dto';

β€Žnestjs-BE/server/src/upload/upload.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Injectable } from '@nestjs/common';
2+
import { ConfigService } from '@nestjs/config';
23
import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
34
import { v4 as uuid } from 'uuid';
4-
import { ConfigService } from '@nestjs/config';
55

66
@Injectable()
77
export class UploadService {

β€Žnestjs-BE/server/src/users/users.controller.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { HttpStatus } from '@nestjs/common';
12
import { Test, TestingModule } from '@nestjs/testing';
23
import { UsersController } from './users.controller';
34
import { UsersService } from './users.service';
4-
import { HttpStatus } from '@nestjs/common';
55

66
describe('UsersController', () => {
77
let controller: UsersController;

β€Žnestjs-BE/server/src/users/users.service.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Test, TestingModule } from '@nestjs/testing';
2+
import { KakaoUser, User } from '@prisma/client';
3+
import { v4 as uuid } from 'uuid';
24
import { UsersService } from './users.service';
35
import { PrismaService } from '../prisma/prisma.service';
4-
import { v4 as uuid } from 'uuid';
5-
import { KakaoUser, User } from '@prisma/client';
66

77
describe('UsersService', () => {
88
let usersService: UsersService;

β€Žnestjs-BE/server/src/users/users.service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Injectable } from '@nestjs/common';
2-
import { PrismaService } from '../prisma/prisma.service';
3-
import { CreateUserPrismaDto } from './dto/create-user.dto';
42
import { Space, User } from '@prisma/client';
53
import { v4 as uuid } from 'uuid';
4+
import { CreateUserPrismaDto } from './dto/create-user.dto';
5+
import { PrismaService } from '../prisma/prisma.service';
66

77
@Injectable()
88
export class UsersService {

β€Žnestjs-BE/server/src/utils/interface.ts

-6
This file was deleted.

β€Žnestjs-BE/server/src/utils/lru-cache.ts

-86
This file was deleted.

β€Žnestjs-BE/server/src/utils/response.ts

-30
This file was deleted.

0 commit comments

Comments
Β (0)