Ranking 로직 분리

src/controllers/ChallengeController.js

@@ -5,7 +5,7 @@ import { getAchievement } from '../utils/AchievementCalculator';
 import { transformRecords } from './RecordController';
 import { DuplicateChallengeError } from '../errors/DuplicateChallengeError';
 import { NotFoundChallengeError } from '../errors/NotFoundChallengeError';
-import { Ranking } from '../utils/Ranking';
+import { Ranking } from './RankingController';
 import { QuotaError } from '../errors/QuotaError';
 
 const getChallenges = async function(req ,res){
@@ -26,27 +26,6 @@ const getChallenges = async function(req ,res){
     res.send(result)
 }
 
-const getChallenge = async function(req, res, next){
-    const user = req.user;
-    const id = req.params.challengeId;
-    const challenge = await Challenge.findOne({ where: { id: id } });
-    if (challenge) {
-        const ranks = await Ranking(challenge);
-        const baseChallenge = await challenge.getBaseChallenge();
-        const challengeWithMeta = {
-            baseChallenge,
-            ranks,
-            achievement: await getAchievement(challenge, req.user),
-            challengersNumber: (await baseChallenge.getChallenges()).length,
-        }
-        res.send({ data: transformChallenge(challengeWithMeta) });
-    }
-    else {
-        next(new NotFoundChallengeError('존재하지 않는 challenge'));
-        return;
-    }
-}
-
 const getChallengeRecords = async function(req, res){
     const challengeId = req.params.challengeId
     const user = req.user
@@ -156,8 +135,7 @@ const transformChallenge = (challenge) => ({
         object_unit: challenge.baseChallenge.objectUnit,
         exercise_type: challenge.baseChallenge.exerciseType,
         quota: challenge.baseChallenge.quota,
-    },
-    ranks: challenge.ranks ? challenge.ranks : undefined,
+    }
 });
 
 const transformChallenges = (challenges) => challenges.map(transformChallenge);
@@ -173,7 +151,6 @@ const hasSameChallenge = async (user, baseChallenge) => {
 
 export default {
     getChallenges,
-    getChallenge,
     getChallengeRecords,
     createChallenge,
     deleteChallenge

src/controllers/RankingController.js

@@ -0,0 +1,34 @@
+import { getAchievement } from "../utils/AchievementCalculator"
+import { Challenge } from "../models";
+
+const getRanking = async function(req, res, next){
+    const id = req.params.challengeId;
+    const challenge = await Challenge.findOne({ where: { id: id } });
+    if (challenge) {
+        const ranks = await Ranking(challenge);
+        res.send({ data: {
+            ranks: ranks
+        }});
+    }
+    else {
+        next(new NotFoundChallengeError('존재하지 않는 challenge'));
+        return;
+    }
+}
+
+const Ranking = async (challenge) => {
+    const baseChallenge = await challenge.getBaseChallenge();
+    const challenges = await baseChallenge.getChallenges({ include: ['user'] });
+    const achivements = await Promise.all(challenges.map(async (item) => {
+        const userAchivement = await getAchievement(item, item.user);
+        return {
+            user: item.user,
+            achivement: userAchivement,
+        }
+    }))
+    return achivements.sort((a, b) => b.achivement - a.achivement)
+}
+
+export {
+    getRanking
+}

src/routes/challenge.js

@@ -4,7 +4,6 @@ import ChallengeController from '../controllers/ChallengeController';
 const router = Router();
 
 router.get('', ChallengeController.getChallenges)
-router.get('/:challengeId', ChallengeController.getChallenge)
 router.get('/:challengeId/records', ChallengeController.getChallengeRecords)
 router.post('', ChallengeController.createChallenge)
 router.delete('/:challengeId', ChallengeController.deleteChallenge)

src/routes/index.js

@@ -6,6 +6,7 @@ import user from './user';
 import auth from './auth';
 import badge from './badge';
 import job from './job';
+import rank from './rank';
 
 const router = Router();        
 
@@ -21,5 +22,6 @@ router.use('/challenges', challenge);
 router.use('/records', record);
 router.use('/user', user);
 router.use('/badges', badge);
+router.use('/rank', rank);
 
 export default router;

src/routes/rank.js

@@ -0,0 +1,8 @@
+import { Router } from 'express';
+import { getRanking } from '../controllers/RankingController';
+
+const router = Router();
+
+router.get('/challenge/:challengeId', getRanking);
+
+export default router;