[GGFE-16] Game - 게임 결과 등록과 조회

components/modal/statChange/StatChangeModal.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useSetRecoilState } from 'recoil';
 import { Exp } from 'types/modalTypes';
+import { GameResult } from 'types/gameTypes';
 import { modalState } from 'utils/recoil/modal';
 import { reloadMatchState } from 'utils/recoil/match';
 import ExpStat from './ExpStat';
@@ -11,17 +12,14 @@ import useAxiosGet from 'hooks/useAxiosGet';
 export default function StatChangeModal({ gameId, mode }: Exp) {
   const setModal = useSetRecoilState(modalState);
   const setReloadMatch = useSetRecoilState(reloadMatchState);
-  const [stat, setStat] = useState();
-
+  const [stat, setStat] = useState<GameResult | undefined>();
   useEffect(() => {
     getExpHandler();
   }, []);
 
   const getExpHandler = useAxiosGet({
     url: `/pingpong/games/${gameId}/result/${mode}`,
-    setState: (data) => {
-      setStat({ ...data });
-    },
+    setState: setStat,
     err: 'KP03',
     type: 'setError',
   });

hooks/modal/aftergame/useCurrentGame.ts

@@ -14,8 +14,8 @@ const useCurrentGame = () => {
     startTime: '2022-07-13 11:50',
     isScoreExist: false,
     matchTeamsInfo: {
-      myTeam: { teamScore: 0, teams: [] },
-      enemyTeam: { teamScore: 0, teams: [] },
+      myTeam: { teamScore: 0, teamId: 0, players: [] },
+      enemyTeam: { teamScore: 0, teamId: 0, players: [] },
     },
   });
 

hooks/modal/aftergame/useSubmitModal.ts

@@ -4,6 +4,20 @@ import { errorState } from 'utils/recoil/error';
 import { AfterGame, TeamScore } from 'types/scoreTypes';
 import { instance } from 'utils/axios';
 
+type rankRequest = {
+  gameId: number;
+  myTeamId: number;
+  myTeamScore: number | '';
+  enemyTeamId: number;
+  enemyTeamScore: number | '';
+};
+
+type normalRequest = {
+  gameId: number;
+  myTeamId: number;
+  enemyTeamId: number;
+};
+
 const useSubmitModal = (currentGame: AfterGame) => {
   const setError = useSetRecoilState(errorState);
   const setModal = useSetRecoilState(modalState);
@@ -15,7 +29,14 @@ const useSubmitModal = (currentGame: AfterGame) => {
 
   const submitRankHandler = async (result: TeamScore) => {
     try {
-      const res = await instance.post(`/pingpong/games/result/rank`, result);
+      const requestBody: rankRequest = {
+        gameId: currentGame.gameId,
+        myTeamId: currentGame.matchTeamsInfo.myTeam.teamId,
+        myTeamScore: result.myTeamScore,
+        enemyTeamId: currentGame.matchTeamsInfo.enemyTeam.teamId,
+        enemyTeamScore: result.enemyTeamScore,
+      };
+      const res = await instance.post(`/pingpong/games/rank`, requestBody);
       alert(rankResponse[`${res?.status}`]);
       await instance.put(`/pingpong/match/current`);
     } catch (e) {
@@ -26,8 +47,13 @@ const useSubmitModal = (currentGame: AfterGame) => {
   };
 
   const submitNormalHandler = async () => {
+    const requestBody: normalRequest = {
+      gameId: currentGame.gameId,
+      myTeamId: currentGame.matchTeamsInfo.myTeam.teamId,
+      enemyTeamId: currentGame.matchTeamsInfo.enemyTeam.teamId,
+    };
     try {
-      await instance.post(`/pingpong/games/result/normal`);
+      await instance.post(`/pingpong/games/normal`, requestBody);
       await instance.put(`/pingpong/match/current`);
     } catch (e) {
       setError('KP04');

hooks/useAxiosGet.ts

@@ -10,6 +10,7 @@ import { PppChart, ProfileBasic, ProfileRank } from 'types/userTypes';
 import { UserInfo } from 'types/admin/adminUserTypes';
 import { EditedSchedule } from 'types/admin/adminSlotTypes';
 import { AfterGame } from 'types/scoreTypes';
+import { GameResult } from 'types/gameTypes';
 
 interface useAxiosGetProps {
   url: string;
@@ -24,6 +25,7 @@ interface useAxiosGetProps {
     | Dispatch<SetStateAction<string>>
     | Dispatch<SetStateAction<EditedSchedule>>
     | Dispatch<SetStateAction<AfterGame>>
+    | Dispatch<SetStateAction<GameResult | undefined>>
     | Dispatch<SetStateAction<undefined>>
     | SetterOrUpdater<User>
     | SetterOrUpdater<SeasonList>

types/gameTypes.ts

@@ -28,3 +28,14 @@ export interface Game {
   status: string;
   time: string;
 }
+
+export type GameResult = {
+  beforeExp: number;
+  beforeMaxExp: number;
+  beforeLevel: number;
+  increasedExp: number;
+  increasedLevel: number;
+  afterMaxExp: number;
+  changedPpp?: number;
+  beforePpp?: number;
+};

types/scoreTypes.ts

@@ -11,10 +11,12 @@ export interface TeamScore {
 export interface Player {
   intraId: string;
   userImageUri: string;
+  level: number;
 }
 export interface Team {
   teamScore: number;
-  teams: Player[];
+  teamId: number;
+  players: Player[];
 }
 
 export interface Players {