Merge pull request #93 from boostcampwm-2024/be/fix/rank_error_fix

[BE/fix] 랭킹 로직 수정
boostcampwm-2024 · Nov 25, 2024 · 28bf1f9 · 28bf1f9
2 parents d317deb + 0a55a45
commit 28bf1f9
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 11 deletions.
diff --git a/apps/backend/src/rank/decorator/getRank.decorator.ts b/apps/backend/src/rank/decorator/getRank.decorator.ts
@@ -9,7 +9,31 @@ export function getRankResponseDecorator() {
     ApiResponse({
       status: 200,
       description: '랭킹 조회 성공',
-      type: GetRankSuccessResponseDto
+      type: GetRankSuccessResponseDto,
+      examples: {
+        success: {
+          summary: '랭킹이 있는 경우',
+          value: {
+            code: 200,
+            message: '현재 랭킹을 조회했습니다.',
+            data: {
+              rank: 5,
+              percentage: 50
+            }
+          }
+        },
+        noRank: {
+          summary: '랭킹이 갱신되지 않은 경우',
+          value: {
+            code: 200,
+            message: '현재 랭킹을 조회했습니다.',
+            data: {
+              rank: -1,
+              percentage: null
+            }
+          }
+        }
+      }
     })
   );
 }
diff --git a/apps/backend/src/rank/dto/getRank.dto.ts b/apps/backend/src/rank/dto/getRank.dto.ts
@@ -3,9 +3,15 @@ import { ApiProperty } from '@nestjs/swagger';
 export class GetRankDataDto {
   @ApiProperty({
     description: '순위',
-    example: '5'
+    example: 33
   })
   rank: number;
+
+  @ApiProperty({
+    description: '백분율',
+    example: 50
+  })
+  percentage: number | null;
 }
 
 export class GetRankSuccessResponseDto {

diff --git a/apps/backend/src/rank/rank.service.ts b/apps/backend/src/rank/rank.service.ts
@@ -23,12 +23,14 @@ export class RankService {
   async storeMoneyRanking() {
     await this.redisClient.del('ranking');
     const membersMoney = await this.databaseService.query(rankQueries.moneyDataQuery);
+    const pipeline = this.redisClient.multi();
     for (const memberMoney of membersMoney.rows) {
-      await this.redisClient.zAdd('ranking', {
+      pipeline.zAdd('ranking', {
         score: memberMoney.total_asset,
         value: memberMoney.nickname
       });
     }
+    await pipeline.exec();
   }
 
   async getTopRankings() {
@@ -38,13 +40,9 @@ export class RankService {
 
   async getRanking(nickname: string) {
     const rank = await this.redisClient.zRevRank('ranking', nickname);
-    if (rank) {
-      return {
-        rank: rank + 1
-      };
-    }
-    return {
-      rank: '해당 유저의 랭킹이 존재 하지 않습니다.'
-    };
+    const totalmembers = await this.redisClient.zCard('ranking');
+    if (!rank) return { rank: -1, percentage: null };
+    const percentage = ((rank + 1) / totalmembers) * 100;
+    return { rank: rank + 1, percentage: percentage == 0 ? 1 : percentage.toFixed(0) };
   }
 }