Skip to content

Commit 3328a23

Browse files
authored
Merge pull request #456 from boostcampwm-2024/refactor/convention
🧼 clean: 명칭 컨벤션 일관화 및 Redis Key 상수화
2 parents 5e538ec + ccb5483 commit 3328a23

File tree

156 files changed

+577
-597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+577
-597
lines changed

feed-crawler/src/main.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ import './common/env-load';
33
import logger from './common/logger';
44
import { FeedCrawler } from './feed-crawler';
55
import { container } from './container';
6-
import { RssRepository } from './repository/rss.repository';
7-
import { FeedRepository } from './repository/feed.repository';
86
import { DEPENDENCY_SYMBOLS } from './types/dependency-symbols';
97
import { DatabaseConnection } from './types/database-connection';
108
import { ClaudeService } from './claude.service';
119
import * as schedule from 'node-schedule';
1210
import { RedisConnection } from './common/redis-access';
13-
import { TagMapRepository } from './repository/tag-map.repository';
1411

1512
function initializeDependencies() {
1613
return {

server/src/activity/api-docs/readActivities.api-docs.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import {
33
ApiNotFoundResponse,
44
ApiOkResponse,
55
ApiOperation,
6-
ApiParam,
7-
ApiQuery,
86
} from '@nestjs/swagger';
97

108
export function ApiReadActivities() {

server/src/activity/controller/activity.controller.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import {
99
import { ApiTags } from '@nestjs/swagger';
1010
import { ActivityService } from '../service/activity.service';
1111
import { ApiResponse } from '../../common/response/common.response';
12-
import { ActivityParamRequestDto } from '../dto/request/activity-param.dto';
13-
import { ActivityQueryRequestDto } from '../dto/request/activity-query.dto';
12+
import {
13+
ReadActivityParamRequestDto,
14+
ReadActivityQueryRequestDto,
15+
} from '../dto/request/readActivity.dto';
1416
import { ApiReadActivities } from '../api-docs/readActivities.api-docs';
1517

1618
@ApiTags('Activity')
@@ -22,8 +24,8 @@ export class ActivityController {
2224
@Get(':userId')
2325
@HttpCode(HttpStatus.OK)
2426
async readActivities(
25-
@Param() paramDto: ActivityParamRequestDto,
26-
@Query() queryDto: ActivityQueryRequestDto,
27+
@Param() paramDto: ReadActivityParamRequestDto,
28+
@Query() queryDto: ReadActivityQueryRequestDto,
2729
) {
2830
return ApiResponse.responseWithData(
2931
'요청이 성공적으로 처리되었습니다.',

server/src/activity/dto/request/activity-param.dto.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

server/src/activity/dto/request/activity-query.dto.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { ApiProperty } from '@nestjs/swagger';
2+
import { Type } from 'class-transformer';
3+
import { IsInt, Min, Max } from 'class-validator';
4+
5+
export class ReadActivityParamRequestDto {
6+
@ApiProperty({
7+
example: 1,
8+
description: '조회할 사용자 ID',
9+
})
10+
@IsInt({
11+
message: '정수를 입력해주세요.',
12+
})
13+
@Min(1, { message: '사용자 ID는 1 이상이어야 합니다.' })
14+
@Type(() => Number)
15+
userId: number;
16+
17+
constructor(partial: Partial<ReadActivityParamRequestDto>) {
18+
Object.assign(this, partial);
19+
}
20+
}
21+
22+
export class ReadActivityQueryRequestDto {
23+
@ApiProperty({
24+
example: 2024,
25+
description: '조회할 연도',
26+
})
27+
@IsInt({
28+
message: '정수를 입력해주세요.',
29+
})
30+
@Min(2000, { message: '연도는 2000년 이상이어야 합니다.' })
31+
@Max(3000, { message: '연도는 3000년 이하여야 합니다.' })
32+
@Type(() => Number)
33+
year: number;
34+
35+
constructor(partial: Partial<ReadActivityQueryRequestDto>) {
36+
Object.assign(this, partial);
37+
}
38+
}

server/src/activity/dto/response/activity-read.dto.ts renamed to server/src/activity/dto/response/readActivity.dto.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class DailyActivityDto {
1010
}
1111
}
1212

13-
export class ActivityReadResponseDto {
13+
export class ReadActivityResponseDto {
1414
@ApiProperty({
1515
type: [DailyActivityDto],
1616
description: '연도별 일별 활동 데이터 배열',
@@ -35,12 +35,12 @@ export class ActivityReadResponseDto {
3535
})
3636
totalViews: number;
3737

38-
private constructor(partial: Partial<ActivityReadResponseDto>) {
38+
private constructor(partial: Partial<ReadActivityResponseDto>) {
3939
Object.assign(this, partial);
4040
}
4141

4242
static toResponseDto(dailyActivities: DailyActivityDto[], user: User) {
43-
return new ActivityReadResponseDto({
43+
return new ReadActivityResponseDto({
4444
dailyActivities: dailyActivities,
4545
maxStreak: user.maxStreak,
4646
currentStreak: user.currentStreak,

server/src/activity/service/activity.service.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Injectable } from '@nestjs/common';
22
import { ActivityRepository } from '../repository/activity.repository';
33
import {
4-
ActivityReadResponseDto,
4+
ReadActivityResponseDto,
55
DailyActivityDto,
6-
} from '../dto/response/activity-read.dto';
6+
} from '../dto/response/readActivity.dto';
77
import { UserService } from '../../user/service/user.service';
88

99
@Injectable()
@@ -16,7 +16,7 @@ export class ActivityService {
1616
async readActivities(
1717
userId: number,
1818
year: number,
19-
): Promise<ActivityReadResponseDto> {
19+
): Promise<ReadActivityResponseDto> {
2020
const user = await this.userService.getUser(userId);
2121

2222
const activities =
@@ -30,7 +30,7 @@ export class ActivityService {
3030
}),
3131
);
3232

33-
return ActivityReadResponseDto.toResponseDto(dailyActivities, user);
33+
return ReadActivityResponseDto.toResponseDto(dailyActivities, user);
3434
}
3535

3636
async upsertActivity(userId: number) {

server/src/admin/api-docs/readSessionIdAdmin.api-docs.ts renamed to server/src/admin/api-docs/getSessionIdAdmin.api-docs.ts

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
ApiUnauthorizedResponse,
66
} from '@nestjs/swagger';
77

8-
export function ApiReadSessionIdAdmin() {
8+
export function ApiGetSessionIdAdmin() {
99
return applyDecorators(
1010
ApiOperation({
1111
summary: `관리자 페이지 출력을 위한 sessionId 확인 API`,
@@ -31,30 +31,3 @@ export function ApiReadSessionIdAdmin() {
3131
}),
3232
);
3333
}
34-
35-
export function ApiLogout() {
36-
return applyDecorators(
37-
ApiOperation({
38-
summary: '관리자 로그아웃 API',
39-
}),
40-
ApiOkResponse({
41-
description: 'Ok',
42-
schema: {
43-
properties: {
44-
message: {
45-
type: 'string',
46-
},
47-
},
48-
},
49-
example: {
50-
message: '로그아웃이 성공적으로 처리되었습니다.',
51-
},
52-
}),
53-
ApiUnauthorizedResponse({
54-
description: 'Unauthorized',
55-
example: {
56-
message: '인증되지 않은 요청입니다.',
57-
},
58-
}),
59-
);
60-
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const SESSION_TTL = 60 * 60 * 12;

0 commit comments

Comments
 (0)