Skip to content

Commit e15be82

Browse files
committed
modify: 관련 타입 index.ts에 넣고 import 부분 수정
1 parent d99696e commit e15be82

File tree

7 files changed

+29
-17
lines changed

7 files changed

+29
-17
lines changed

src/controllers/leaderboard.controller.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import logger from '@/configs/logger.config';
2-
import { LeaderboardService } from '@/services/leaderboard.service';
3-
import { GetLeaderboardQuery } from '@/types/dto/requests/getLeaderboardQuery.type';
4-
import { LeaderboardResponseDto } from '@/types/dto/responses/leaderboardResponse.type';
52
import { NextFunction, RequestHandler, Request, Response } from 'express';
3+
import { LeaderboardService } from '@/services/leaderboard.service';
4+
import { GetLeaderboardQuery, LeaderboardResponseDto } from '@/types/index';
65

76
export class LeaderboardController {
87
constructor(private leaderboardService: LeaderboardService) {}

src/repositories/__test__/leaderboard.repo.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { Pool, QueryResult } from 'pg';
12
import { DBError } from '@/exception';
23
import { LeaderboardRepository } from '@/repositories/leaderboard.repository';
3-
import { Pool, QueryResult } from 'pg';
44

55
jest.mock('pg');
66

src/repositories/leaderboard.repository.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Pool } from 'pg';
21
import logger from '@/configs/logger.config';
2+
import { Pool } from 'pg';
33
import { DBError } from '@/exception';
4-
import { LeaderboardSortType, LeaderboardType } from '@/types/dto/requests/getLeaderboardQuery.type';
4+
import { LeaderboardSortType, LeaderboardType } from '@/types/index';
55

66
export class LeaderboardRepository {
77
constructor(private pool: Pool) {}

src/services/__test__/leaderboard.service.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { Pool } from 'pg';
12
import { DBError } from '@/exception';
23
import { LeaderboardRepository } from '@/repositories/leaderboard.repository';
34
import { LeaderboardService } from '@/services/leaderboard.service';
4-
import { Pool } from 'pg';
55

66
jest.mock('@/repositories/leaderboard.repository');
77

src/services/leaderboard.service.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import logger from '@/configs/logger.config';
22
import { LeaderboardRepository } from '@/repositories/leaderboard.repository';
3-
import { LeaderboardSortType, LeaderboardType } from '@/types/dto/requests/getLeaderboardQuery.type';
43
import {
5-
LeaderboardPostType,
64
LeaderboardResponseData,
7-
LeaderboardUserType,
8-
} from '@/types/dto/responses/leaderboardResponse.type';
5+
LeaderboardType,
6+
LeaderboardSortType,
7+
LeaderboardUserTypeData,
8+
LeaderboardPostTypeData,
9+
} from '@/types/index';
910

1011
export class LeaderboardService {
1112
constructor(private leaderboardRepo: LeaderboardRepository) {}
@@ -35,7 +36,7 @@ export class LeaderboardService {
3536

3637
if (type === 'post') {
3738
result.posts = (rawResult as RawPostResult[]).map(
38-
(post): LeaderboardPostType => ({
39+
(post): LeaderboardPostTypeData => ({
3940
id: post.id,
4041
title: post.title,
4142
slug: post.slug,
@@ -48,7 +49,7 @@ export class LeaderboardService {
4849
);
4950
} else {
5051
result.users = (rawResult as RawUserResult[]).map(
51-
(user): LeaderboardUserType => ({
52+
(user): LeaderboardUserTypeData => ({
5253
id: user.id,
5354
email: user.email,
5455
totalViews: user.total_views,

src/types/dto/responses/leaderboardResponse.type.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { BaseResponseDto } from '@/types/dto/responses/baseResponse.type';
3232
* type: integer
3333
* description: 구간 게시물 수 상승값
3434
*/
35-
export interface LeaderboardUserType {
35+
export interface LeaderboardUserTypeData {
3636
id: number;
3737
email: string;
3838
totalViews: number;
@@ -76,7 +76,7 @@ export interface LeaderboardUserType {
7676
* format: date-time
7777
* description: 게시물 업로드 일시
7878
*/
79-
export interface LeaderboardPostType {
79+
export interface LeaderboardPostTypeData {
8080
id: number;
8181
title: string;
8282
slug: string;
@@ -106,8 +106,8 @@ export interface LeaderboardPostType {
106106
* $ref: '#/components/schemas/LeaderboardUserType'
107107
*/
108108
export interface LeaderboardResponseData {
109-
users: LeaderboardUserType[] | null;
110-
posts: LeaderboardPostType[] | null;
109+
users: LeaderboardUserTypeData[] | null;
110+
posts: LeaderboardPostTypeData[] | null;
111111
}
112112

113113
/**

src/types/index.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ export type { GetPostQuery, PostParam } from '@/types/dto/requests/getPostQuery.
88

99
export { GetAllPostsQueryDto } from '@/types/dto/requests/getAllPostsQuery.type';
1010
export { GetPostQueryDto } from '@/types/dto/requests/getPostQuery.type';
11+
export {
12+
GetLeaderboardQueryDto,
13+
LeaderboardType,
14+
LeaderboardSortType,
15+
GetLeaderboardQuery,
16+
} from '@/types/dto/requests/getLeaderboardQuery.type';
1117
export { LoginResponseDto } from '@/types/dto/responses/loginResponse.type';
1218
export { EmptyResponseDto } from '@/types/dto/responses/emptyReponse.type';
1319
export {
@@ -16,5 +22,11 @@ export {
1622
PostStatisticsResponseDto,
1723
RawPostType,
1824
} from '@/types/dto/responses/postResponse.type';
25+
export {
26+
LeaderboardResponseDto,
27+
LeaderboardUserTypeData,
28+
LeaderboardPostTypeData,
29+
LeaderboardResponseData,
30+
} from '@/types/dto/responses/leaderboardResponse.type';
1931
export { UserWithTokenDto } from '@/types/dto/userWithToken.type';
2032
export { VelogUserLoginDto } from '@/types/dto/velogUser.type';

0 commit comments

Comments
 (0)