Merge pull request #197 from TiimMate/feat/178

[FEAT] 매칭내역 조회 리뷰 여부 추가
TiimMate · Feb 19, 2024 · f12530e · f12530e
2 parents e8c76c5 + 87f58ba
commit f12530e
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 2 deletions.
diff --git a/src/controllers/matchings.controller.ts b/src/controllers/matchings.controller.ts
@@ -6,6 +6,7 @@ import {
     readMatchingGuesting,
     readMatchingHosting,
     readHostingApplicantsTeamList,
+    readMatchingHostingGuestUser,
 } from "../services/matchings.service";
 import { addOpposingTeam } from "../services/teams.service";
 import { updateGuestUserStatus } from "../services/guests.service";
@@ -18,6 +19,10 @@ export const matchingHostingPreview = async (req, res: Response, next) => {
     res.send(response(status.SUCCESS, await readMatchingHosting(req.user.id, req.query)));
 };
 
+export const matchingHostingGuestUserPreview = async (req, res: Response, next) => {
+    res.send(response(status.SUCCESS, await readMatchingHostingGuestUser(req.user.id, req.params)));
+};
+
 export const ApplyGuestingUserPreview = async (req, res: Response, next) => {
     res.send(response(status.SUCCESS, await readApplyGuestingUser(req.params)));
 };

diff --git a/src/daos/game.dao.ts b/src/daos/game.dao.ts
@@ -154,7 +154,7 @@ const findGameByTeamsAndGameTime = async (teamFilter, gameTime: string) => {
                 attributes: ["id", "name", "region", "gender", "ageGroup", "skillLevel"],
             },
         ],
-        attributes: ["id", "gameTime"],
+        attributes: ["id", "opposingTeamId", "gameTime"],
     });
     for (const gameResult of gameResults) {
         gameResult.type = MatchType.game;

diff --git a/src/daos/guest-user.dao.ts b/src/daos/guest-user.dao.ts
@@ -84,3 +84,30 @@ export const checkForDuplicateGuestUser = async (userId, guestId) => {
         },
     });
 };
+
+export const getGuestingUser = async (guestingId: number) => {
+    return await db.GuestUser.findAll({
+        raw: true,
+        where: {
+            guestId: guestingId,
+            status: 1,
+        },
+        include: [
+            {
+                model: db.User,
+                include: [
+                    {
+                        model: db.Profile,
+                        attributes: ["position"],
+                    },
+                ],
+                attributes: ["nickname", "height", "avatarUrl"],
+            },
+            {
+                model: db.Guest,
+                attiributes: ["gametime"],
+            },
+        ],
+        attiributes: ["userId"],
+    });
+};
diff --git a/src/dtos/matchings.dto.ts b/src/dtos/matchings.dto.ts
@@ -2,6 +2,17 @@ import { getAgeGroup } from "../constants/age-group.constant";
 import { getTeamGender } from "../constants/gender.constant";
 import { getGuestUserStatus } from "../constants/guest-status.constant";
 
+export const readGuestingUserResponseDTO = (result) => {
+    return result.map((guestingUser) => ({
+        userId: guestingUser.userId,
+        nickname: guestingUser["User.nickname"],
+        height: guestingUser["User.height"],
+        avatarUrl: guestingUser["User.avatarUrl"],
+        position: guestingUser["User.Profiles.position"],
+        reviewStatus: guestingUser.reviewStatus,
+    }));
+};
+
 export const readApplyGuestingUserResponseDTO = (result) => {
     return result.map((guestingUser) => ({
         nickname: guestingUser["User.nickname"],
@@ -36,6 +47,7 @@ export const readMatchingResponseDTO = (guestings, games) => {
                 memberCount: match.memberCount,
                 ageGroup: getAgeGroup(match["Team.ageGroup"]),
                 skillLevel: match["Team.skillLevel"],
+                reviewStatus: match.reviewStatus,
             };
         } else {
             return {
@@ -49,6 +61,7 @@ export const readMatchingResponseDTO = (guestings, games) => {
                 memberCount: match.memberCount,
                 ageGroup: getAgeGroup(match["HostTeam.ageGroup"]),
                 skillLevel: match["HostTeam.skillLevel"],
+                reviewStatus: match.reviewStatus,
             };
         }
     });

diff --git a/src/routes/matchings.route.ts b/src/routes/matchings.route.ts
@@ -9,6 +9,7 @@ import {
     modifyGuestStatus,
     fetchHostingApplicantsTeamList,
     gameApplicationApproval,
+    matchingHostingGuestUserPreview,
 } from "../controllers/matchings.controller";
 import { dateQuery } from "../schemas/fields";
 
@@ -20,6 +21,8 @@ matchingsRouter.get("/guesting", validate(dateQuery), asyncHandler(matchingGuest
 
 matchingsRouter.get("/hosting", validate(dateQuery), asyncHandler(matchingHostingPreview));
 
+matchingsRouter.get("/hosting/:guestingId", asyncHandler(matchingHostingGuestUserPreview));
+
 matchingsRouter.get("/hosting/user/:guestingId", asyncHandler(ApplyGuestingUserPreview));
 
 matchingsRouter.patch("/hosting/guest/:guestUserId", asyncHandler(modifyGuestStatus));

diff --git a/src/services/matchings.service.ts b/src/services/matchings.service.ts
@@ -1,20 +1,55 @@
 import { findGameByHostTeamsAndGameTime, findGameByOpposingTeamsAndGameTime } from "../daos/game.dao";
-import { getApplyGuestingUser } from "../daos/guest-user.dao";
+import { getApplyGuestingUser, getGuestingUser } from "../daos/guest-user.dao";
 import { findGuestingByTeamsAndGameTime, findGuestingByUserAndGameTime } from "../daos/guest.dao";
 import { getTeamsAppliedById } from "../daos/matching.dao";
 import { getMemberCountByTeamId, addMemberCount } from "../daos/member.dao";
+import { getExistingTeamReview } from "../daos/team-review.dao";
 import { findTeamIdByLeaderId } from "../daos/team.dao";
+import { getExistingUserReview } from "../daos/user-review.dao";
 import {
     readApplyGuestingUserResponseDTO,
+    readGuestingUserResponseDTO,
     readHostingApplicantsTeamResponseDTO,
     readMatchingResponseDTO,
 } from "../dtos/matchings.dto";
 
 export const readMatchingGuesting = async (userId, query) => {
     const gameTime = query.date;
     const matchingGuestings = await findGuestingByUserAndGameTime(userId, query.date);
+    for (const matchingGuesting of matchingGuestings) {
+        const guestReviewId = await getExistingTeamReview(
+            userId,
+            matchingGuesting["Team.id"],
+            undefined,
+            matchingGuesting.id,
+        );
+        if (new Date() < new Date(matchingGuesting.gameTime)) {
+            matchingGuesting.reviewStatus = "PENDING";
+        } else if (!guestReviewId) {
+            matchingGuesting.reviewStatus = "UNCOMPLETED";
+        } else {
+            matchingGuesting.reviewStatus = "COMPLETED";
+        }
+    }
+
     const teamIds = await findTeamIdByLeaderId(userId);
     const matchingGames = await findGameByOpposingTeamsAndGameTime(teamIds, gameTime);
+    for (const matchingGame of matchingGames) {
+        const gameReviewId = await getExistingTeamReview(
+            userId,
+            matchingGame["HostTeam.id"],
+            matchingGame.id,
+            undefined,
+        );
+        if (new Date() < new Date(matchingGame.gameTime)) {
+            matchingGame.reviewStatus = "PENDING";
+        } else if (!gameReviewId) {
+            matchingGame.reviewStatus = "UNCOMPLETED";
+        } else {
+            matchingGame.reviewStatus = "COMPLETED";
+        }
+    }
+
     await addMemberCount(matchingGuestings);
     await addMemberCount(matchingGames);
     return readMatchingResponseDTO(matchingGuestings, matchingGames);
@@ -25,11 +60,43 @@ export const readMatchingHosting = async (userId: number, query) => {
     const teamIds = await findTeamIdByLeaderId(userId);
     const matchingGuestings = await findGuestingByTeamsAndGameTime(teamIds, gameTime);
     const matchingGames = await findGameByHostTeamsAndGameTime(teamIds, gameTime);
+    for (const matchingGame of matchingGames) {
+        const gameReviewId = await getExistingTeamReview(
+            userId,
+            matchingGame.opposingTeamId,
+            matchingGame.id,
+            undefined,
+        );
+        if (new Date() < new Date(matchingGame.gameTime)) {
+            matchingGame.reviewStatus = "PENDING";
+        } else if (!gameReviewId) {
+            matchingGame.reviewStatus = "UNCOMPLETED";
+        } else {
+            matchingGame.reviewStatus = "COMPLETED";
+        }
+    }
+
     await addMemberCount(matchingGuestings);
     await addMemberCount(matchingGames);
     return readMatchingResponseDTO(matchingGuestings, matchingGames);
 };
 
+export const readMatchingHostingGuestUser = async (userId: number, params) => {
+    const guestingId = params.guestingId;
+    const guestUsers = await getGuestingUser(guestingId);
+    for (const guestUser of guestUsers) {
+        const guestReviewId = await getExistingUserReview(userId, guestUser.userId, guestingId);
+        if (new Date() < new Date(guestUser["guest.gameTime"])) {
+            guestUser.reviewStatus = "PENDING";
+        } else if (!guestReviewId) {
+            guestUser.reviewStatus = "UNCOMPLETED";
+        } else {
+            guestUser.reviewStatus = "COMPLETED";
+        }
+    }
+    return readGuestingUserResponseDTO(guestUsers);
+};
+
 export const readApplyGuestingUser = async (params) => {
     const guestingId = params.guestingId;
     const applyGuestingUser = await getApplyGuestingUser(guestingId);