Merge branch 'dev' into refactor/#47

ysw789 · web-flow · commit 5368fe021ba3 · 2025-03-01T03:18:12.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,9 @@ out/
 
 ### dev ###
 application-dev.yml
+
+### google ###
+src/main/resources/credentials/dasomGoogle.json
+
+### google ###
+src/main/resources/credentials/dasomGoogle.json
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/entity/Applicant.java b/src/main/java/dmu/dasom/api/domain/applicant/entity/Applicant.java
@@ -16,6 +16,7 @@
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @AllArgsConstructor
 @Builder
@@ -82,6 +83,23 @@ public void updateStatus(final ApplicantStatus status) {
         this.status = status;
     }
 
+    public List<Object> toGoogleSheetRow(){
+        return List.of(
+                this.id,
+                this.name,
+                this.studentNo,
+                this.contact,
+                this.email,
+                this.grade,
+                this.reasonForApply,
+                this.activityWish,
+                this.isPrivacyPolicyAgreed,
+                this.status.name(),
+                this.createdAt.toString(),
+                this.updatedAt.toString()
+        );
+    }
+
     public ApplicantResponseDto toApplicantResponse() {
         return ApplicantResponseDto.builder()
                 .id(this.id)
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/repository/ApplicantRepository.java b/src/main/java/dmu/dasom/api/domain/applicant/repository/ApplicantRepository.java
@@ -8,14 +8,12 @@
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
-
 import java.util.Optional;
 
 public interface ApplicantRepository extends JpaRepository<Applicant, Long> {
 
     @Query("SELECT a FROM Applicant a ORDER BY a.id DESC")
     Page<Applicant> findAllWithPageRequest(final Pageable pageable);
-
     // 상태별 지원자 조회
     List<Applicant> findByStatus(ApplicantStatus status);
     List<Applicant> findByStatusIn(List<ApplicantStatus> statuses);
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantServiceImpl.java b/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantServiceImpl.java
@@ -11,10 +11,12 @@
 import dmu.dasom.api.domain.common.exception.ErrorCode;
 import dmu.dasom.api.domain.email.enums.MailType;
 import dmu.dasom.api.domain.email.service.EmailService;
+import dmu.dasom.api.domain.google.service.GoogleApiService;
 import dmu.dasom.api.global.dto.PageResponse;
 import jakarta.mail.MessagingException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
@@ -34,6 +36,10 @@ public class ApplicantServiceImpl implements ApplicantService {
 
     private final ApplicantRepository applicantRepository;
     private final EmailService emailService;
+    private final GoogleApiService googleApiService;
+
+    @Value("${google.spreadsheet.id}")
+    private String spreadSheetId;
 
     // 지원자 저장
     @Override
@@ -46,13 +52,15 @@ public void apply(final ApplicantCreateRequestDto request) {
             if (!request.getIsOverwriteConfirmed())
                 throw new CustomException(ErrorCode.DUPLICATED_STUDENT_NO);
 
-            // 기존 지원자 정보 갱신 수행
-            applicant.get().overwrite(request);
+            Applicant existingApplicant = applicant.get();
+            existingApplicant.overwrite(request);
+
+            googleApiService.updateSheet(List.of(existingApplicant));
             return;
         }
 
-        // 새로운 지원자일 경우 저장
-        applicantRepository.save(request.toEntity());
+        Applicant savedApplicant = applicantRepository.save(request.toEntity());
+        googleApiService.appendToSheet(List.of(savedApplicant));
     }
 
     // 지원자 조회
@@ -77,8 +85,21 @@ public ApplicantDetailsResponseDto getApplicant(final Long id) {
     @Override
     public ApplicantDetailsResponseDto updateApplicantStatus(final Long id, final ApplicantStatusUpdateRequestDto request) {
         final Applicant applicant = findById(id);
+        // 지원자 상태 변경
         applicant.updateStatus(request.getStatus());
 
+        // Google Sheets에서 학번(Student No)을 기준으로 사용자 존재 여부 확인
+        int rowIndex = googleApiService.findRowIndexByStudentNo(spreadSheetId, "Sheet1", applicant.getStudentNo());
+        if (rowIndex == -1) {
+            // Google Sheets에 사용자 추가
+            googleApiService.appendToSheet(List.of(applicant));
+            log.info("지원자가 Google Sheets에 없어서 새로 추가되었습니다: {}", applicant.getStudentNo());
+        } else {
+            // Google Sheets에서 사용자 상태 업데이트
+            googleApiService.updateSheet(List.of(applicant));
+            log.info("Google Sheets에서 지원자 상태가 업데이트되었습니다: {}", applicant.getStudentNo());
+        }
+
         return applicant.toApplicantDetailsResponse();
     }
 
diff --git a/src/main/java/dmu/dasom/api/domain/common/exception/ErrorCode.java b/src/main/java/dmu/dasom/api/domain/common/exception/ErrorCode.java
@@ -25,7 +25,9 @@ public enum ErrorCode {
     INVALID_DATETIME_FORMAT(400, "C016", "날짜 형식이 올바르지 않습니다."),
     INVALID_TIME_FORMAT(400, "C017", "시간 형식이 올바르지 않습니다."),
     INVALID_INQUIRY_PERIOD(400, "C018", "조회 기간이 아닙니다."),
-    FILE_ENCODE_FAIL(400, "C028", "파일 인코딩에 실패하였습니다."),
+    SHEET_WRITE_FAIL(400, "C019", "시트에 데이터를 쓰는데 실패하였습니다."),
+    SHEET_READ_FAIL(400, "C200", "시트에 데이터를 쓰는데 실패하였습니다."),
+    FILE_ENCODE_FAIL(400, "C028", "파일 인코딩에 실패하였습니다.")
     ;
 
     private final int status;
diff --git a/src/main/java/dmu/dasom/api/domain/google/service/GoogleApiService.java b/src/main/java/dmu/dasom/api/domain/google/service/GoogleApiService.java
@@ -5,11 +5,12 @@
 import com.google.api.client.json.jackson2.JacksonFactory;
 
 import com.google.api.services.sheets.v4.Sheets;
-import com.google.api.services.sheets.v4.model.UpdateValuesResponse;
+import com.google.api.services.sheets.v4.model.BatchUpdateValuesRequest;
+import com.google.api.services.sheets.v4.model.BatchUpdateValuesResponse;
 import com.google.api.services.sheets.v4.model.ValueRange;
-import com.google.auth.Credentials;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auth.oauth2.GoogleCredentials;
+import dmu.dasom.api.domain.applicant.entity.Applicant;
 import dmu.dasom.api.domain.common.exception.CustomException;
 import dmu.dasom.api.domain.common.exception.ErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -19,10 +20,9 @@
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -33,19 +33,23 @@ public class GoogleApiService {
     private static final Logger logger = LoggerFactory.getLogger(GoogleApiService.class);
     private static final String APPLICATION_NAME = "Recruit Form";
     private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
-    @Value("${google.credentials.json}")
-    private String credentialsJson;
+    @Value("${google.credentials.file.path}")
+    private String credentialsFilePath;
+    @Value("${google.spreadsheet.id}")
+    private String spreadSheetId;
     private Sheets sheetsService;
 
     // Google Sheets API 서비스 객체를 생성하는 메소드
     private Sheets getSheetsService() throws IOException, GeneralSecurityException{
         if(sheetsService == null){
-            ByteArrayInputStream credentialsStream = new ByteArrayInputStream(credentialsJson.getBytes(StandardCharsets.UTF_8));
+            ClassPathResource resource = new ClassPathResource(credentialsFilePath);
             GoogleCredentials credentials = GoogleCredentials
-                    .fromStream(credentialsStream)
+                    .fromStream(resource.getInputStream())
                     .createScoped(Collections.singletonList("https://www.googleapis.com/auth/spreadsheets"));
 
-            sheetsService = new Sheets.Builder(GoogleNetHttpTransport.newTrustedTransport(), JSON_FACTORY, new HttpCredentialsAdapter(credentials))
+            sheetsService = new Sheets.Builder(GoogleNetHttpTransport.newTrustedTransport(),
+                    JSON_FACTORY,
+                    new HttpCredentialsAdapter(credentials))
                     .setApplicationName(APPLICATION_NAME)
                     .build();
         }
@@ -56,18 +60,121 @@ public void writeToSheet(String spreadsheetId, String range, List<List<Object>>
         try {
             Sheets service = getSheetsService();
             ValueRange body = new ValueRange().setValues(values);
-            UpdateValuesResponse result = service.spreadsheets().values()
+            service.spreadsheets().values()
                     .update(spreadsheetId, range, body)
                     .setValueInputOption("USER_ENTERED")
                     .execute();
-            logger.info("Updated rows: {}", result.getUpdatedRows());
-        }  catch (IOException e) {
-            logger.error("Failed to write data to the spreadsheet", e);
+        }  catch (IOException | GeneralSecurityException e) {
+            logger.error("구글 시트에 데이터를 쓰는 데 실패했습니다.", e);
             throw new CustomException(ErrorCode.WRITE_FAIL);
-        } catch (GeneralSecurityException e) {
-            logger.error("Failed to write data to the spreadsheet", e);
-            throw new CustomException(ErrorCode.INTERNAL_SERVER_ERROR);
         }
     }
 
+    public void appendToSheet(List<Applicant> applicants) {
+        processSheetsUpdate(applicants, true);
+    }
+
+    public void updateSheet(List<Applicant> applicants) {
+        processSheetsUpdate(applicants, false);
+    }
+
+    public int findRowIndexByStudentNo(String spreadSheetId, String sheetName, String studentNo){
+        try {
+            List<List<Object>> rows = readSheet(spreadSheetId, sheetName + "!A:L"); // A열부터 L열까지 읽기
+
+            for (int i = 0; i < rows.size(); i++){
+                List<Object> row = rows.get(i);
+                if(!row.isEmpty() && row.get(2).equals(studentNo)){ // 학번(Student No)이 3번째 열(A=0 기준)
+                    return i + 1;
+                }
+            }
+        } catch (Exception e) {
+            logger.error("구글시트에서 행 찾기 실패", e);
+        }
+        return -1;
+    }
+
+    public List<List<Object>> readSheet(String spreadsheetId, String range) {
+        try {
+            Sheets service = getSheetsService();
+            ValueRange response = service.spreadsheets().values()
+                    .get(spreadsheetId, range)
+                    .execute();
+
+            return response.getValues();
+        } catch (IOException | GeneralSecurityException e) {
+            logger.error("시트에서 데이터를 읽어오는데 실패했습니다.", e);
+            throw new CustomException(ErrorCode.SHEET_READ_FAIL);
+        }
+    }
+
+    public int getLastRow(String spreadsheetId, String sheetName) {
+        try {
+            List<List<Object>> rows = readSheet(spreadsheetId, sheetName + "!A:L"); // A~L 열까지 읽기
+            return rows == null ? 0 : rows.size(); // 데이터가 없으면 0 반환
+        } catch (Exception e) {
+            logger.error("Failed to retrieve last row from Google Sheet", e);
+            throw new CustomException(ErrorCode.SHEET_READ_FAIL);
+        }
+    }
+
+    public void batchUpdateSheet(String spreadsheetId, List<ValueRange> valueRanges) {
+        try {
+            Sheets service = getSheetsService();
+
+            // BatchUpdate 요청 생성
+            BatchUpdateValuesRequest batchUpdateRequest = new BatchUpdateValuesRequest()
+                    .setValueInputOption("USER_ENTERED") // 사용자 입력 형식으로 값 설정
+                    .setData(valueRanges); // 여러 ValueRange 추가
+
+            // BatchUpdate 실행
+            BatchUpdateValuesResponse response = service.spreadsheets().values()
+                    .batchUpdate(spreadsheetId, batchUpdateRequest)
+                    .execute();
+
+            logger.info("Batch update completed. Total updated rows: {}", response.getTotalUpdatedRows());
+        } catch (IOException | GeneralSecurityException e) {
+            logger.error("Batch update failed", e);
+            throw new CustomException(ErrorCode.SHEET_WRITE_FAIL);
+        }
+    }
+
+
+    private ValueRange createValueRange(String range, List<List<Object>> values) {
+        return new ValueRange()
+                .setRange(range)
+                .setMajorDimension("ROWS") // 행 단위로 데이터 설정
+                .setValues(values);
+    }
+
+    public void processSheetsUpdate(List<Applicant> applicants, boolean isAppend) {
+        try {
+            List<ValueRange> valueRanges = new ArrayList<>();
+            int lastRow = isAppend ? getLastRow(spreadSheetId, "Sheet1") : -1;
+
+            for (Applicant applicant : applicants) {
+                String range;
+                if (isAppend) {
+                    range = "Sheet1!A" + (lastRow + 1);
+                    lastRow++;
+                } else {
+                    int rowIndex = findRowIndexByStudentNo(spreadSheetId, "Sheet1", applicant.getStudentNo());
+                    if (rowIndex == -1) {
+                        logger.warn("구글시트에서 사용자를 찾을 수 없습니다. : {}", applicant.getStudentNo());
+                        continue;
+                    }
+                    range = "Sheet1!A" + rowIndex + ":L" + rowIndex;
+                }
+                valueRanges.add(createValueRange(range, List.of(applicant.toGoogleSheetRow())));
+            }
+
+            batchUpdateSheet(spreadSheetId, valueRanges);
+        } catch (Exception e) {
+            logger.error("구글시트 업데이트에 실패했습니다.", e);
+            throw new CustomException(ErrorCode.SHEET_WRITE_FAIL);
+        }
+    }
+
+
+
 }
diff --git a/src/main/java/dmu/dasom/api/global/healthcheck/HealthCheck.java b/src/main/java/dmu/dasom/api/global/healthcheck/HealthCheck.java
@@ -0,0 +1,15 @@
+package dmu.dasom.api.global.healthcheck;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Tag(name = "health-check", description = "서버 상태 체크")
+public class HealthCheck {
+    @GetMapping("/api/health-check")
+    public ResponseEntity<Void> healthCheck() {
+        return ResponseEntity.ok().build();
+    }
+}
diff --git a/src/main/resources/application-credentials.yml b/src/main/resources/application-credentials.yml
@@ -32,6 +32,7 @@ jwt:
   refresh-token-expiration: ${JWT_REFRESH_TOKEN_EXPIRATION}
 google:
   credentials:
-    json: ${GOOGLE_CREDENTIALS_JSON}
+    file:
+      path: ${GOOGLE_CREDENTIALS_PATH}
   spreadsheet:
     id: ${GOOGLE_SPREADSHEET_ID}
diff --git a/src/test/java/dmu/dasom/api/domain/applicant/ApplicantServiceTest.java b/src/test/java/dmu/dasom/api/domain/applicant/ApplicantServiceTest.java
