Merge branch 'develop' into refactor/2053-admin-history

Author: Soundbar91

src/main/java/in/koreatech/koin/domain/graduation/controller/GraduationApi.java

@@ -15,7 +15,6 @@
 import in.koreatech.koin.domain.graduation.dto.GraduationCourseCalculationResponse;
 import in.koreatech.koin.domain.graduation.model.GeneralEducationArea;
 import in.koreatech.koin.global.auth.Auth;
-import in.koreatech.koin.global.validation.FileTypeValid;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -54,7 +53,7 @@ ResponseEntity<Void> createStudentCourseCalculation(
     @SecurityRequirement(name = "Jwt Authentication")
     @PostMapping("/graduation/excel/upload")
     ResponseEntity<String> uploadStudentGradeExcelFile(
-        @FileTypeValid(extensions = {"xls", "xlsx"}) @RequestParam(value = "file") MultipartFile file,
+        @RequestParam(value = "file") MultipartFile file,
         @Auth(permit = {STUDENT}) Integer userId
     );
 

src/main/java/in/koreatech/koin/domain/graduation/controller/GraduationController.java

@@ -1,13 +1,12 @@
 package in.koreatech.koin.domain.graduation.controller;
 
-import static in.koreatech.koin.domain.user.model.UserType.COUNCIL;
-import static in.koreatech.koin.domain.user.model.UserType.STUDENT;
-
 import java.io.IOException;
 import java.util.List;
 
+import static in.koreatech.koin.domain.user.model.UserType.COUNCIL;
+import static in.koreatech.koin.domain.user.model.UserType.STUDENT;
+
 import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -21,10 +20,8 @@
 import in.koreatech.koin.domain.graduation.service.GraduationService;
 import in.koreatech.koin.domain.user.model.UserType;
 import in.koreatech.koin.global.auth.Auth;
-import in.koreatech.koin.global.validation.FileTypeValid;
 import lombok.RequiredArgsConstructor;
 
-@Validated
 @RestController
 @RequiredArgsConstructor
 public class GraduationController implements GraduationApi {
@@ -40,7 +37,7 @@ public ResponseEntity<Void> createStudentCourseCalculation(
 
     @PostMapping("/graduation/excel/upload")
     public ResponseEntity<String> uploadStudentGradeExcelFile(
-        @FileTypeValid(extensions = {"xls", "xlsx"}) @RequestParam(value = "file") MultipartFile file,
+        @RequestParam(value = "file") MultipartFile file,
         @Auth(permit = {UserType.STUDENT}) Integer userId
     ) {
         try {

src/main/java/in/koreatech/koin/domain/graduation/exception/ExcelFileCheckException.java

@@ -0,0 +1,19 @@
+package in.koreatech.koin.domain.graduation.exception;
+
+import in.koreatech.koin.global.exception.custom.DataNotFoundException;
+
+public class ExcelFileCheckException extends DataNotFoundException {
+    private static final String DEFAULT_MESSAGE = "엑셀 파일 형식이 아닙니다.";
+
+    public ExcelFileCheckException(String message) {
+        super(message);
+    }
+
+    public ExcelFileCheckException(String message, String detail) {
+        super(message, detail);
+    }
+
+    public static ExcelFileCheckException withDetail(String detail) {
+        return new ExcelFileCheckException(DEFAULT_MESSAGE, detail);
+    }
+}

src/main/java/in/koreatech/koin/domain/graduation/exception/ExcelFileNotFoundException.java

@@ -0,0 +1,19 @@
+package in.koreatech.koin.domain.graduation.exception;
+
+import in.koreatech.koin.global.exception.custom.DataNotFoundException;
+
+public class ExcelFileNotFoundException extends DataNotFoundException {
+    private static final String DEFAULT_MESSAGE = "엑셀 파일을 찾을 수 없습니다.";
+
+    public ExcelFileNotFoundException(String message) {
+        super(message);
+    }
+
+    public ExcelFileNotFoundException(String message, String detail) {
+        super(message, detail);
+    }
+
+    public static ExcelFileNotFoundException withDetail(String detail) {
+        return new ExcelFileNotFoundException(DEFAULT_MESSAGE, detail);
+    }
+}

src/main/java/in/koreatech/koin/domain/graduation/model/GradeExcelData.java

@@ -1,8 +1,7 @@
 package in.koreatech.koin.domain.graduation.model;
 
-import static in.koreatech.koin.global.code.ApiResponseCode.INVALID_SEMESTER_REGEX;
-
-import in.koreatech.koin.global.exception.CustomException;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
 
 public record GradeExcelData(
     String year,
@@ -16,32 +15,29 @@ public record GradeExcelData(
     String grade,
     String retakeStatus
 ) {
-
-    private static final String MIDDLE_TOTAL = "소 계";
-    private static final String FAIL = "F";
-    private static final String UNSATISFACTORY = "U";
-    private static final String TOTAL = "합 계";
-    private static final String FIRST_SEMESTER = "1";
-    private static final String SECOND_SEMESTER = "2";
-    private static final String SUMMER_SEMESTER = "하계";
-    private static final String WINTER_SEMESTER = "동계";
-
-    public boolean isSkipRow() {
-        return classTitle.equals(MIDDLE_TOTAL) ||
-            grade.equals(FAIL) ||
-            grade.equals(UNSATISFACTORY);
-    }
-
-    public boolean isTotalRow() {
-        return classTitle.equals(TOTAL);
+    public static GradeExcelData fromRow(Row row) {
+        return new GradeExcelData(
+            getCellValueAsString(row.getCell(1)),
+            getCellValueAsString(row.getCell(2)),
+            getCellValueAsString(row.getCell(4)),
+            getCellValueAsString(row.getCell(5)),
+            getCellValueAsString(row.getCell(6)),
+            getCellValueAsString(row.getCell(7)),
+            getCellValueAsString(row.getCell(8)),
+            getCellValueAsString(row.getCell(9)),
+            getCellValueAsString(row.getCell(10)),
+            getCellValueAsString(row.getCell(11))
+        );
     }
 
-    public String getKoinSemester() {
-        return switch (semester) {
-            case FIRST_SEMESTER, SECOND_SEMESTER -> year + semester;
-            case WINTER_SEMESTER -> year + "-" + "겨울";
-            case SUMMER_SEMESTER -> year + "-" + "여름";
-            default -> throw CustomException.of(INVALID_SEMESTER_REGEX);
+    private static String getCellValueAsString(Cell cell) {
+        if (cell == null) {
+            return "";
+        }
+        return switch (cell.getCellType()) {
+            case STRING -> cell.getStringCellValue();
+            case NUMERIC -> String.valueOf((int)cell.getNumericCellValue());
+            default -> "";
         };
     }
 }