Merge pull request #338 from boostcampwm-2022/develop

v0.2.6 배포

Author: tunggary

README.md

@@ -1,4 +1,5 @@
-# <img src="https://user-images.githubusercontent.com/79798443/206173852-a4baafe3-5de7-4afa-b494-f630d5170d54.svg"/> Devrank <img src="https://user-images.githubusercontent.com/79798443/206173852-a4baafe3-5de7-4afa-b494-f630d5170d54.svg"/>
+<div align="center">
+<h1> <img src="https://user-images.githubusercontent.com/79798443/206173852-a4baafe3-5de7-4afa-b494-f630d5170d54.svg"/> Devrank <img src="https://user-images.githubusercontent.com/79798443/206173852-a4baafe3-5de7-4afa-b494-f630d5170d54.svg"/></h1>
 
 [![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Fboostcampwm-2022%2Fweb21-devrank&count_bg=%23C455F9&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://hits.seeyoufarm.com)
 
@@ -7,6 +8,11 @@
 ![redis](https://img.shields.io/badge/redis-6.2.5-%23DC382D?style=flat&logo=Redis)
 ![mongoDB](https://img.shields.io/badge/mongoDB-5.0.14-%2347A248?style=flat&logo=MongoDB)
 ![docker](https://img.shields.io/badge/docker-20.10.21-%232496ED?style=flat&logo=Docker)
+![React](https://img.shields.io/badge/react-18.2.0-%2361DAFB?style=flat&logo=React)
+![Next.js](https://img.shields.io/badge/next-13.0.3-%23000000?style=flat&logo=Next.js)
+
+</div>
+
 
 ![Frame 12023](https://user-images.githubusercontent.com/79798443/206137429-5cb1d269-4bec-4aaa-85ad-053ae564c625.png)
 

backend/libs/consts/index.ts

@@ -13,3 +13,5 @@ export const PAGE_UNIT_COUNT = 10;
 export const RANK_CACHE_DELAY = 12 * HOUR;
 
 export const GITHUB_API_DELAY = 1500; // ms
+
+export const KR_TIME_DIFF = 9 * HOUR * 1000; // ms

backend/src/app.controller.ts

@@ -7,6 +7,6 @@ export class AppController {
 
   @Get()
   getHello(): string {
-    return this.appService.getHello();
+    return this.appService.healthCheck();
   }
 }

backend/src/app.service.ts

@@ -1,8 +1,22 @@
-import { Injectable } from '@nestjs/common';
+import { logger } from '@libs/utils';
+import { Injectable, OnApplicationBootstrap } from '@nestjs/common';
+import { UserRepository } from './user/user.repository';
 
 @Injectable()
-export class AppService {
-  getHello(): string {
-    return 'Hello World!';
+export class AppService implements OnApplicationBootstrap {
+  constructor(private readonly userRepository: UserRepository) {}
+
+  async onApplicationBootstrap() {
+    const allUsers = await this.userRepository.findAll({}, false, ['lowerUsername', 'score', 'tier', 'history']);
+    await Promise.all(
+      allUsers
+        .filter((user) => user.history)
+        .map(({ lowerUsername, score, tier }) => this.userRepository.updateCachedUserRank(tier, score, lowerUsername)),
+    );
+    logger.log('all user score loaded in Redis.');
+  }
+
+  healthCheck(): string {
+    return 'devrank server is listening!';
   }
 }

backend/src/auth/auth.service.ts

@@ -74,16 +74,6 @@ export class AuthService {
     await this.authRepository.create(id, refreshToken);
   }
 
-  // async replaceRefreshToken(id: string, refreshToken: string, githubToken: string): Promise<string> {
-  //   const storedRefreshToken = await this.authRepository.findRefreshTokenById(id);
-  //   if (refreshToken !== storedRefreshToken) {
-  //     throw new UnauthorizedException('invalid token.');
-  //   }
-  //   const newRefreshToken = this.issueRefreshToken(id, githubToken);
-  //   await this.authRepository.create(id, newRefreshToken);
-  //   return newRefreshToken;
-  // }
-
   async deleteRefreshToken(id: string): Promise<void> {
     await this.authRepository.delete(id);
   }

backend/src/ranking/dto/ranking-user.dto.ts

@@ -23,18 +23,26 @@ export class RankingUserDto {
   @ApiProperty()
   tier: string;
 
+  @ApiProperty()
+  totalRank?: number;
+
+  @ApiProperty()
+  tierRank?: number;
+
   @ApiProperty()
   primaryLanguages: string[];
 
   of(user: UserDto): RankingUserDto {
     this.id = user.id;
     this.username = user.username;
     this.avatarUrl = user.avatarUrl;
-    this.score = user.commitsScore + user.followersScore + user.issuesScore;
+    this.score = user.score;
     this.tier = user.tier;
     this.dailyViews = user.dailyViews;
     this.scoreDifference = user.scoreDifference;
     this.primaryLanguages = user.primaryLanguages;
+    this.totalRank = user.totalRank;
+    this.tierRank = user.tierRank;
     return this;
   }
 }

backend/src/ranking/ranking.service.ts

@@ -19,6 +19,12 @@ export class RankingService {
     if (!paginationResult?.metadata || paginationResult?.users.length === 0) {
       throw new NotFoundException('user not found.');
     }
+    for (const user of paginationResult.users) {
+      const [totalRank, tierRank] = await this.userRepository.findCachedUserRank(user.tier, user.lowerUsername);
+      user.totalRank = totalRank;
+      user.tierRank = tierRank;
+    }
+
     const lastPage = Math.ceil(paginationResult.metadata.total / limit);
     const lastPageGroupNumber = Math.ceil(lastPage / PAGE_UNIT_COUNT);
     const pageGroupNumber = Math.ceil(page / PAGE_UNIT_COUNT);

backend/src/user/dto/rank.dto.ts

@@ -78,6 +78,12 @@ export class UserDto {
   @ApiProperty({ type: History })
   history?: History;
 
+  @ApiProperty()
+  totalRank?: number;
+
+  @ApiProperty()
+  tierRank?: number;
+
   @ApiProperty({ isArray: true, type: PinnedRepositoryDto })
   pinnedRepositories?: PinnedRepositoryDto[];
 

backend/src/user/dto/user.dto.ts

@@ -6,7 +6,6 @@ import {
   Controller,
   DefaultValuePipe,
   Get,
-  NotFoundException,
   Param,
   ParseIntPipe,
   Patch,