Merge pull request #205 from boostcampwm-2024/dev-back

sjy2335 · web-flow · commit ea3800cf3eab · 2024-11-28T16:06:44.000+09:00
[BE] Merge to main
diff --git a/backend/console-server/nginx.conf b/backend/console-server/nginx.conf
@@ -1,7 +1,7 @@
 http {
   upstream console_server {
     server server-blue:3001 weight=1;
-    server server-green:3002 backup;
+    server server-green:3002 weight=1;
   }
 
   # http를 https로 리디렉션
diff --git a/backend/console-server/src/log/rank/dto/get-dau-rank-response.dto.ts b/backend/console-server/src/log/rank/dto/get-dau-rank-response.dto.ts
@@ -8,7 +8,7 @@ export class DAURank {
 
     @Type(() => Number)
     @IsNumber()
-    dau: number;
+    value: number;
 }
 
 export class GetDAURankResponseDto {
@@ -24,15 +24,15 @@ export class GetDAURankResponseDto {
         example: [
             {
                 projectName: 'test059',
-                dau: 12345,
+                value: 12345,
             },
             {
                 projectName: 'test007',
-                dau: 234234,
+                value: 234234,
             },
             {
                 projectName: 'test079',
-                dau: 21212,
+                value: 21212,
             },
         ],
     })
diff --git a/backend/console-server/src/log/rank/dto/get-elapsed-time-rank-response.dto.ts b/backend/console-server/src/log/rank/dto/get-elapsed-time-rank-response.dto.ts
@@ -9,7 +9,7 @@ export class ElapsedTimeRank {
 
     @IsNumber()
     @Expose()
-    elapsedTime: number;
+    value: number;
 }
 
 export class GetElapsedTimeRankResponseDto {
diff --git a/backend/console-server/src/log/rank/dto/get-success-rate-rank-response.dto.ts b/backend/console-server/src/log/rank/dto/get-success-rate-rank-response.dto.ts
@@ -8,7 +8,7 @@ export class SuccessRateRank {
 
     @Type(() => Number)
     @IsNumber()
-    successRate: number;
+    value: number;
 }
 
 export class GetSuccessRateRankResponseDto {
@@ -24,15 +24,15 @@ export class GetSuccessRateRankResponseDto {
         example: [
             {
                 projectName: 'test059',
-                successRate: 98.23100936524453,
+                value: 98.23100936524453,
             },
             {
                 projectName: 'test007',
-                successRate: 98.1094527363184,
+                value: 98.1094527363184,
             },
             {
                 projectName: 'test079',
-                successRate: 98.0083857442348,
+                value: 98.0083857442348,
             },
         ],
     })
diff --git a/backend/console-server/src/log/rank/dto/get-traffic-rank-response.dto.ts b/backend/console-server/src/log/rank/dto/get-traffic-rank-response.dto.ts
@@ -6,7 +6,7 @@ export class TrafficRank {
     projectName: string;
 
     @IsNumber()
-    count: number;
+    value: number;
 }
 
 export class GetTrafficRankResponseDto {
@@ -22,15 +22,15 @@ export class GetTrafficRankResponseDto {
         example: [
             {
                 projectName: 'test059',
-                count: 10000,
+                value: 10000,
             },
             {
                 projectName: 'test007',
-                count: 9999,
+                value: 9999,
             },
             {
                 projectName: 'test079',
-                count: 9898,
+                value: 9898,
             },
         ],
     })
diff --git a/backend/console-server/src/log/rank/rank.controller.spec.ts b/backend/console-server/src/log/rank/rank.controller.spec.ts
@@ -64,11 +64,11 @@ describe('RankController', () => {
                     rank: [
                         {
                             projectName: 'watchducks001',
-                            successRate: 98.5,
+                            value: 98.5,
                         },
                         {
                             projectName: 'watchducks002',
-                            successRate: 97.2,
+                            value: 97.2,
                         },
                     ],
                 };
@@ -146,11 +146,11 @@ describe('RankController', () => {
                     rank: [
                         {
                             projectName: 'watchducks001',
-                            count: 10000,
+                            value: 10000,
                         },
                         {
                             projectName: 'watchducks002',
-                            count: 9998,
+                            value: 9998,
                         },
                     ],
                 };
diff --git a/backend/console-server/src/log/rank/rank.controller.ts b/backend/console-server/src/log/rank/rank.controller.ts
@@ -8,7 +8,9 @@ import { GetElapsedTimeRankDto } from './dto/get-elapsed-time-rank.dto';
 import { GetDAURankDto } from './dto/get-dau-rank.dto';
 import { GetDAURankResponseDto } from './dto/get-dau-rank-response.dto';
 import { GetTrafficRankDto } from './dto/get-traffic-rank.dto';
+import { GetTrafficRankResponseDto } from './dto/get-traffic-rank-response.dto';
 import { CacheTTLUntilMidnight, CustomCacheInterceptor } from '../../common/cache';
+import { GetTrafficRankResponseDto } from './dto/get-traffic-rank-response.dto';
 
 @Controller('log/rank')
 @UseInterceptors(CustomCacheInterceptor)
@@ -70,7 +72,7 @@ export class RankController {
     @ApiResponse({
         status: HttpStatus.OK,
         description: '기수 내 트래픽 랭킹이 성공적으로 반환됨.',
-        type: GetTrafficRankDto,
+        type: GetTrafficRankResponseDto,
     })
     async getTrafficRank(@Query() getTrafficRankDto: GetTrafficRankDto) {
         return await this.rankService.getTrafficRank(getTrafficRankDto);
diff --git a/backend/console-server/src/log/rank/rank.service.spec.ts b/backend/console-server/src/log/rank/rank.service.spec.ts
@@ -75,9 +75,9 @@ describe('RankService', () => {
                 expect(result.total).toBe(mockRankResults.length);
                 expect(result.rank).toHaveLength(mockRankResults.length);
                 expect(result.rank[0].projectName).toBe('Project 1');
-                expect(result.rank[0].successRate).toBe(90);
+                expect(result.rank[0].value).toBe(90);
                 expect(result.rank[1].projectName).toBe('Project 2');
-                expect(result.rank[1].successRate).toBe(80);
+                expect(result.rank[1].value).toBe(80);
             });
 
             it('프로젝트 정보가 없는 경우 Unknown으로 표시해야 한다', async () => {
@@ -121,9 +121,9 @@ describe('RankService', () => {
                 mockProjectRepository.find.mockResolvedValue(mockProjects);
 
                 const result = await service.getElapsedTimeRank(mockDto);
-                expect(result.rank[0].elapsedTime).toBe(100);
+                expect(result.rank[0].value).toBe(100);
                 expect(result.rank[1].projectName).toBe('Project 2');
-                expect(result.rank[1].elapsedTime).toBe(150);
+                expect(result.rank[1].value).toBe(150);
             });
 
             it('프로젝트 정보가 없는 경우 Unknown으로 표시해야 한다', async () => {
@@ -184,7 +184,7 @@ describe('RankService', () => {
                 expect(result.total).toBe(mockRankResults.length);
                 expect(result.rank).toHaveLength(mockRankResults.length);
                 result.rank.forEach((rankItem, index) => {
-                    expect(rankItem.dau).toBe(mockRankResults[index].dau);
+                    expect(rankItem.value).toBe(mockRankResults[index].dau);
                 });
             });
 
@@ -232,9 +232,9 @@ describe('RankService', () => {
                 mockProjectRepository.find.mockResolvedValue(mockProjects);
 
                 const result = await service.getTrafficRank(mockDto);
-                expect(result.rank[0].count).toBe(9999);
+                expect(result.rank[0].value).toBe(9999);
                 expect(result.rank[1].projectName).toBe('Project 2');
-                expect(result.rank[1].count).toBe(9090);
+                expect(result.rank[1].value).toBe(9090);
             });
 
             it('프로젝트 정보가 없는 경우 Unknown으로 표시해야 한다', async () => {
diff --git a/backend/console-server/src/log/rank/rank.service.ts b/backend/console-server/src/log/rank/rank.service.ts
@@ -38,7 +38,7 @@ export class RankService {
 
             return plainToInstance(SuccessRateRank, {
                 projectName: projectName || `Unknown`,
-                successRate: 100 - result.is_error_rate,
+                value: 100 - result.is_error_rate,
             });
         });
 
@@ -55,7 +55,7 @@ export class RankService {
         const rank = results.map<ElapsedTimeRank>((result) => {
             return {
                 projectName: projectMap.get(result.host) || `Unknown`,
-                elapsedTime: result.avg_elapsed_time,
+                value: result.avg_elapsed_time,
             };
         });
 
@@ -90,7 +90,7 @@ export class RankService {
 
             return plainToInstance(DAURank, {
                 projectName: projectName || `Unknown`,
-                dau: result.dau,
+                value: result.dau,
             });
         });
 
@@ -108,7 +108,7 @@ export class RankService {
 
             return plainToInstance(TrafficRank, {
                 projectName: projectName || `Unknown`,
-                count: result.count,
+                value: result.count,
             });
         });
 
diff --git a/backend/proxy-server/Dockerfile b/backend/proxy-server/Dockerfile
@@ -16,6 +16,8 @@ FROM node:22-alpine
 
 WORKDIR /usr/src/app
 
+RUN apk add --no-cache tzdata
+
 # 프로덕션 의존성 설치
 COPY package*.json ./
 RUN npm install --production
diff --git a/backend/proxy-server/clickhouse-local.yml b/backend/proxy-server/clickhouse-local.yml
diff --git a/backend/proxy-server/docker-compose.yml b/backend/proxy-server/docker-compose.yml
@@ -1,20 +1,20 @@
 version: '3'
 services:
+
   redis:
     image: redis:latest
     container_name: app-redis
     restart: always
     ports:
       - "6379:6379"
-    networks:
-      - app-network
 
   server-blue:
     image: ghcr.io/boostcampwm-2024/web35-watchducks/backend/proxy-server:latest
     container_name: app-server-blue-1
     environment:
       - NODE_ENV=production
       - PORT=3001
+      - TZ=Asia/Seoul
     restart: always
     volumes:
       - ./.env:/usr/src/app/.env
@@ -31,6 +31,7 @@ services:
     environment:
       - NODE_ENV=production
       - PORT=3002
+      - TZ=Asia/Seoul
     restart: always
     volumes:
       - ./.env:/usr/src/app/.env
diff --git a/backend/proxy-server/package.json b/backend/proxy-server/package.json
@@ -7,7 +7,9 @@
   "scripts": {
     "test": "jest --config jest.config.js -ts-config=tsconfig.test.json",
     "build": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
-    "dev": "NODE_ENV=development tsx src/index.ts"
+    "dev": "NODE_ENV=development tsx src/index.ts",
+    "lint": "eslint src/**/*.ts",
+    "lint:fix": "eslint src/**/*.ts --fix"
   },
   "repository": {
     "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`http {`
`2`	`2`	`upstream console_server {`
`3`	`3`	`server server-blue:3001 weight=1;`
`4`		`- server server-green:3002 backup;`
	`4`	`+ server server-green:3002 weight=1;`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`# http를 https로 리디렉션`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export class ElapsedTimeRank {`
`9`	`9`
`10`	`10`	`@IsNumber()`
`11`	`11`	`@Expose()`
`12`		`- elapsedTime: number;`
	`12`	`+ value: number;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`export class GetElapsedTimeRankResponseDto {`