From 79b876537141ff29217560707844c33943dc84ad Mon Sep 17 00:00:00 2001
From: Cho Sangwook <82208159+Sangwook02@users.noreply.github.com>
Date: Tue, 15 Oct 2024 19:48:58 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=88=98=EA=B0=95=EC=83=9D=20=EB=AA=85?=
 =?UTF-8?q?=EB=8B=A8=20=EC=A1=B0=ED=9A=8C=20API=EC=99=80=20=EC=97=91?=
 =?UTF-8?q?=EC=85=80=EC=97=90=20=EC=88=98=EB=A3=8C=20=EC=97=AC=EB=B6=80=20?=
 =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80=20(#807)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat: 수료 상태 필드 추가
---
 .../gdsc/domain/study/dto/response/StudyStudentResponse.java | 3 +++
 .../gdsc/global/common/constant/WorkbookConstant.java        | 2 +-
 src/main/java/com/gdschongik/gdsc/global/util/ExcelUtil.java | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentResponse.java b/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentResponse.java
index 598aa160b..35ed19f34 100644
--- a/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentResponse.java
+++ b/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentResponse.java
@@ -7,6 +7,7 @@
 import com.gdschongik.gdsc.domain.study.domain.AchievementType;
 import com.gdschongik.gdsc.domain.study.domain.StudyAchievement;
 import com.gdschongik.gdsc.domain.study.domain.StudyHistory;
+import com.gdschongik.gdsc.domain.study.domain.StudyHistoryStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 
@@ -17,6 +18,7 @@ public record StudyStudentResponse(
         @Schema(description = "디스코드 사용자명") String discordUsername,
         @Schema(description = "디스코드 닉네임") String nickname,
         @Schema(description = "깃허브 링크") String githubLink,
+        @Schema(description = "수료 상태") StudyHistoryStatus studyHistoryStatus,
         @Schema(description = "1차 우수 스터디원") boolean isFirstRoundOutstandingStudent,
         @Schema(description = "2차 우수 스터디원") boolean isSecondRoundOutstandingStudent,
         @Schema(description = "과제 및 출석 이력") List<StudyTodoResponse> studyTodos,
@@ -45,6 +47,7 @@ public static StudyStudentResponse of(
                 studyHistory.getStudent().getDiscordUsername(),
                 studyHistory.getStudent().getNickname(),
                 studyHistory.getRepositoryLink(),
+                studyHistory.getStudyHistoryStatus(),
                 isOutstandingStudent(FIRST_ROUND_OUTSTANDING_STUDENT, studyAchievements),
                 isOutstandingStudent(SECOND_ROUND_OUTSTANDING_STUDENT, studyAchievements),
                 studyTodos,
diff --git a/src/main/java/com/gdschongik/gdsc/global/common/constant/WorkbookConstant.java b/src/main/java/com/gdschongik/gdsc/global/common/constant/WorkbookConstant.java
index 7580c77b0..29f1a04b9 100644
--- a/src/main/java/com/gdschongik/gdsc/global/common/constant/WorkbookConstant.java
+++ b/src/main/java/com/gdschongik/gdsc/global/common/constant/WorkbookConstant.java
@@ -10,7 +10,7 @@ public class WorkbookConstant {
 
     // Study
     public static final String[] STUDY_SHEET_HEADER = {
-        "이름", "학번", "디스코드 유저네임", "커뮤니티 닉네임", "깃허브 링크", "수료 여부", "1차 우수 스터디원 여부", "2차 우수 스터디원 여부", "출석률", "과제 수행률"
+        "이름", "학번", "디스코드 유저네임", "커뮤니티 닉네임", "깃허브 링크", "수료 상태", "1차 우수 스터디원 여부", "2차 우수 스터디원 여부", "출석률", "과제 수행률"
     };
     public static final String WEEKLY_ASSIGNMENT = "%d주차 과제";
     public static final String WEEKLY_ATTENDANCE = "%d주차 출석";
diff --git a/src/main/java/com/gdschongik/gdsc/global/util/ExcelUtil.java b/src/main/java/com/gdschongik/gdsc/global/util/ExcelUtil.java
index 5ca7974a1..a7037d37a 100644
--- a/src/main/java/com/gdschongik/gdsc/global/util/ExcelUtil.java
+++ b/src/main/java/com/gdschongik/gdsc/global/util/ExcelUtil.java
@@ -79,8 +79,9 @@ private void createStudySheet(Workbook workbook, Study study, List<StudyStudentR
             studentRow.createCell(cellIndex.getAndIncrement()).setCellValue(student.discordUsername());
             studentRow.createCell(cellIndex.getAndIncrement()).setCellValue(student.nickname());
             studentRow.createCell(cellIndex.getAndIncrement()).setCellValue(student.githubLink());
-            // todo: 수료 여부 추가
-            studentRow.createCell(cellIndex.getAndIncrement()).setCellValue("X");
+            studentRow
+                    .createCell(cellIndex.getAndIncrement())
+                    .setCellValue(student.studyHistoryStatus().getValue());
             studentRow
                     .createCell(cellIndex.getAndIncrement())
                     .setCellValue(student.isFirstRoundOutstandingStudent() ? "O" : "X");