fix: 오류 수정

wibaek · wibaek · commit e9831d747a53 · 2025-02-22T05:10:21.000+09:00
diff --git a/.env b/.env
@@ -1 +1,2 @@
-VITE_API_SERVER_URL=https://stage.solid-connection.com
+VITE_API_SERVER_URL=https://stage.solid-connection.com
+VITE_S3_BASE_URL=https://solid-connection-uploaded.s3.ap-northeast-2.amazonaws.com/
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "axios": "^1.7.9",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
+    "date-fns": "^4.1.0",
     "lucide-react": "^0.475.0",
     "next-themes": "^0.4.4",
     "react": "^19.0.0",
diff --git a/src/api/auth.ts b/src/api/auth.ts
@@ -6,7 +6,7 @@ export const adminSignInApi = (
   email: string,
   password: string,
 ): Promise<AxiosResponse<AdminSignInResponse>> =>
-  publicAxiosInstance.post("/admin/auth/sign-in", { email, password });
+  publicAxiosInstance.post("/auth/email/sign-in", { email, password });
 
 export const reissueAccessTokenApi = (
   refreshToken: string,
diff --git a/src/components/scores/gpa/GpaScoreTable.tsx b/src/components/scores/gpa/GpaScoreTable.tsx
@@ -1,14 +1,17 @@
 import { useEffect, useState } from "react";
 import { scoreApi } from "@/api/scores";
-import type { GpaScore, VerifyStatus } from "@/types/scores";
+import type { GpaScoreWithUser, VerifyStatus } from "@/types/scores";
 import { ScoreVerifyButton } from "../ScoreVerifyButton";
+import { format } from "date-fns";
 
 interface Props {
   verifyFilter: VerifyStatus;
 }
 
+const S3_BASE_URL = import.meta.env.VITE_S3_BASE_URL;
+
 export function GpaScoreTable({ verifyFilter }: Props) {
-  const [scores, setScores] = useState<GpaScore[]>([]);
+  const [scores, setScores] = useState<GpaScoreWithUser[]>([]);
   const [page] = useState(1);
   const [loading, setLoading] = useState(false);
 
@@ -41,7 +44,7 @@ export function GpaScoreTable({ verifyFilter }: Props) {
         verifyStatus: status,
         rejectedReason: reason,
       });
-      fetchScores(); // 데이터 새로고침
+      fetchScores();
     } catch (error) {
       console.error("Failed to update GPA score:", error);
     }
@@ -57,6 +60,9 @@ export function GpaScoreTable({ verifyFilter }: Props) {
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
               ID
             </th>
+            <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
+              닉네임
+            </th>
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
               GPA
             </th>
@@ -66,33 +72,73 @@ export function GpaScoreTable({ verifyFilter }: Props) {
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
               상태
             </th>
+            <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
+              제출일
+            </th>
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
               거절사유
             </th>
+            <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
+              인증파일
+            </th>
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
               작업
             </th>
           </tr>
         </thead>
         <tbody className="divide-y divide-gray-200 bg-white">
           {scores.map((score) => (
-            <tr key={score.id}>
-              <td className="whitespace-nowrap px-6 py-4">{score.id}</td>
-              <td className="whitespace-nowrap px-6 py-4">{score.gpa}</td>
+            <tr key={score.gpaScoreStatusResponse.id}>
+              <td className="whitespace-nowrap px-6 py-4">
+                {score.gpaScoreStatusResponse.id}
+              </td>
+              <td className="whitespace-nowrap px-6 py-4">
+                <div className="flex items-center">
+                  <img
+                    src={score.siteUserResponse.profileImageUrl}
+                    alt="프로필"
+                    className="mr-2 h-8 w-8 rounded-full"
+                  />
+                  {score.siteUserResponse.nickname}
+                </div>
+              </td>
+              <td className="whitespace-nowrap px-6 py-4">
+                {score.gpaScoreStatusResponse.gpaResponse.gpa}
+              </td>
+              <td className="whitespace-nowrap px-6 py-4">
+                {score.gpaScoreStatusResponse.gpaResponse.gpaCriteria}
+              </td>
+              <td className="whitespace-nowrap px-6 py-4">
+                {score.gpaScoreStatusResponse.verifyStatus}
+              </td>
               <td className="whitespace-nowrap px-6 py-4">
-                {score.gpaCriteria}
+                {format(
+                  new Date(score.gpaScoreStatusResponse.createdAt),
+                  "yyyy-MM-dd HH:mm",
+                )}
               </td>
               <td className="whitespace-nowrap px-6 py-4">
-                {score.verifyStatus}
+                {score.gpaScoreStatusResponse.rejectedReason || "-"}
               </td>
               <td className="whitespace-nowrap px-6 py-4">
-                {score.rejectedReason || "-"}
+                <a
+                  href={`${S3_BASE_URL}${score.gpaScoreStatusResponse.gpaResponse.gpaReportUrl}`}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="text-blue-600 hover:text-blue-800 hover:underline"
+                >
+                  파일 보기
+                </a>
               </td>
               <td className="whitespace-nowrap px-6 py-4">
                 <ScoreVerifyButton
-                  currentStatus={score.verifyStatus}
+                  currentStatus={score.gpaScoreStatusResponse.verifyStatus}
                   onVerifyChange={(status, reason) =>
-                    handleVerifyStatus(score.id, status, reason)
+                    handleVerifyStatus(
+                      score.gpaScoreStatusResponse.id,
+                      status,
+                      reason,
+                    )
                   }
                 />
               </td>
diff --git a/src/components/scores/language/LanguageScoreTable.tsx b/src/components/scores/language/LanguageScoreTable.tsx
@@ -1,14 +1,17 @@
 import { useEffect, useState } from "react";
 import { scoreApi } from "@/api/scores";
-import type { LanguageTestScore, VerifyStatus } from "@/types/scores";
+import type { LanguageScoreWithUser, VerifyStatus } from "@/types/scores";
 import { ScoreVerifyButton } from "../ScoreVerifyButton";
+import { format } from "date-fns";
 
 interface Props {
   verifyFilter: VerifyStatus;
 }
 
+const S3_BASE_URL = import.meta.env.VITE_S3_BASE_URL;
+
 export function LanguageScoreTable({ verifyFilter }: Props) {
-  const [scores, setScores] = useState<LanguageTestScore[]>([]);
+  const [scores, setScores] = useState<LanguageScoreWithUser[]>([]);
   const [page] = useState(1);
   const [loading, setLoading] = useState(false);
 
@@ -21,7 +24,7 @@ export function LanguageScoreTable({ verifyFilter }: Props) {
       );
       setScores(response.content);
     } catch (error) {
-      console.error("Failed to fetch Language Test scores:", error);
+      console.error("Failed to fetch Language scores:", error);
     } finally {
       setLoading(false);
     }
@@ -41,9 +44,9 @@ export function LanguageScoreTable({ verifyFilter }: Props) {
         verifyStatus: status,
         rejectedReason: reason,
       });
-      fetchScores(); // 데이터 새로고침
+      fetchScores();
     } catch (error) {
-      console.error("Failed to update Language Test score:", error);
+      console.error("Failed to update Language score:", error);
     }
   };
 
@@ -58,43 +61,92 @@ export function LanguageScoreTable({ verifyFilter }: Props) {
               ID
             </th>
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
-              시험 종류
+              닉네임
+            </th>
+            <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
+              시험종류
             </th>
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
               점수
             </th>
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
               상태
             </th>
+            <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
+              제출일
+            </th>
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
               거절사유
             </th>
+            <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
+              인증파일
+            </th>
             <th className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
               작업
             </th>
           </tr>
         </thead>
         <tbody className="divide-y divide-gray-200 bg-white">
           {scores.map((score) => (
-            <tr key={score.id}>
-              <td className="whitespace-nowrap px-6 py-4">{score.id}</td>
+            <tr key={score.languageTestScoreStatusResponse.id}>
+              <td className="whitespace-nowrap px-6 py-4">
+                {score.languageTestScoreStatusResponse.id}
+              </td>
+              <td className="whitespace-nowrap px-6 py-4">
+                <div className="flex items-center">
+                  <img
+                    src={score.siteUserResponse.profileImageUrl}
+                    alt="프로필"
+                    className="mr-2 h-8 w-8 rounded-full"
+                  />
+                  {score.siteUserResponse.nickname}
+                </div>
+              </td>
+              <td className="whitespace-nowrap px-6 py-4">
+                {
+                  score.languageTestScoreStatusResponse.languageTestResponse
+                    .languageTestType
+                }
+              </td>
+              <td className="whitespace-nowrap px-6 py-4">
+                {
+                  score.languageTestScoreStatusResponse.languageTestResponse
+                    .languageTestScore
+                }
+              </td>
               <td className="whitespace-nowrap px-6 py-4">
-                {score.languageTestType}
+                {score.languageTestScoreStatusResponse.verifyStatus}
               </td>
               <td className="whitespace-nowrap px-6 py-4">
-                {score.languageTestScore}
+                {format(
+                  new Date(score.languageTestScoreStatusResponse.createdAt),
+                  "yyyy-MM-dd HH:mm",
+                )}
               </td>
               <td className="whitespace-nowrap px-6 py-4">
-                {score.verifyStatus}
+                {score.languageTestScoreStatusResponse.rejectedReason || "-"}
               </td>
               <td className="whitespace-nowrap px-6 py-4">
-                {score.rejectedReason || "-"}
+                <a
+                  href={`${S3_BASE_URL}${score.languageTestScoreStatusResponse.languageTestResponse.languageTestReportUrl}`}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="text-blue-600 hover:text-blue-800 hover:underline"
+                >
+                  파일 보기
+                </a>
               </td>
               <td className="whitespace-nowrap px-6 py-4">
                 <ScoreVerifyButton
-                  currentStatus={score.verifyStatus}
+                  currentStatus={
+                    score.languageTestScoreStatusResponse.verifyStatus
+                  }
                   onVerifyChange={(status, reason) =>
-                    handleVerifyStatus(score.id, status, reason)
+                    handleVerifyStatus(
+                      score.languageTestScoreStatusResponse.id,
+                      status,
+                      reason,
+                    )
                   }
                 />
               </td>
diff --git a/src/types/scores.ts b/src/types/scores.ts
@@ -2,29 +2,75 @@ export type VerifyStatus = "PENDING" | "APPROVED" | "REJECTED";
 
 export interface ScoreSearchCondition {
   verifyStatus?: VerifyStatus;
-  // 추가 검색 조건이 있다면 여기에 추가
 }
 
-export interface GpaScore {
-  id: number;
+export interface GpaResponse {
   gpa: number;
   gpaCriteria: number;
-  verifyStatus: VerifyStatus;
-  rejectedReason?: string;
+  gpaReportUrl: string;
 }
 
-export interface LanguageTestScore {
+export interface GpaScoreStatusResponse {
   id: number;
-  languageTestType: string;
-  languageTestScore: string;
+  gpaResponse: GpaResponse;
   verifyStatus: VerifyStatus;
-  rejectedReason?: string;
+  rejectedReason: string | null;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface SiteUserResponse {
+  id: number;
+  nickname: string;
+  profileImageUrl: string;
+}
+
+export interface GpaScoreWithUser {
+  gpaScoreStatusResponse: GpaScoreStatusResponse;
+  siteUserResponse: SiteUserResponse;
 }
 
 export interface PageResponse<T> {
   content: T[];
+  pageNumber: number;
+  pageSize: number;
   totalElements: number;
   totalPages: number;
-  size: number;
-  number: number;
+}
+
+export interface LanguageResponse {
+  languageType: string;
+  score: number;
+  testDate: string;
+  expireDate: string;
+  languageReportUrl: string;
+}
+
+export interface LanguageScoreStatusResponse {
+  id: number;
+  languageResponse: LanguageResponse;
+  verifyStatus: VerifyStatus;
+  rejectedReason: string | null;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface LanguageScoreWithUser {
+  languageTestScoreStatusResponse: LanguageTestScoreStatusResponse;
+  siteUserResponse: SiteUserResponse;
+}
+
+export interface LanguageTestResponse {
+  languageTestType: string;
+  languageTestScore: string;
+  languageTestReportUrl: string;
+}
+
+export interface LanguageTestScoreStatusResponse {
+  id: number;
+  languageTestResponse: LanguageTestResponse;
+  verifyStatus: VerifyStatus;
+  rejectedReason: string | null;
+  createdAt: string;
+  updatedAt: string;
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-VITE_API_SERVER_URL=https://stage.solid-connection.com`
	`1`	`+VITE_API_SERVER_URL=https://stage.solid-connection.com`
	`2`	`+VITE_S3_BASE_URL=https://solid-connection-uploaded.s3.ap-northeast-2.amazonaws.com/`