Revert "Merge branch 'dev' into fix/#67"

hodoon · hodoon · commit 7bdbfbd0ac19 · 2025-07-29T14:47:40.000+09:00
This reverts commit d46c64c, reversing changes made to 86690a1.
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantService.java b/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantService.java
@@ -4,7 +4,7 @@
 import dmu.dasom.api.domain.applicant.dto.ApplicantDetailsResponseDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantResponseDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantStatusUpdateRequestDto;
-import dmu.dasom.api.domain.google.enums.MailType;
+import dmu.dasom.api.domain.email.enums.MailType;
 import dmu.dasom.api.domain.recruit.dto.ResultCheckRequestDto;
 import dmu.dasom.api.domain.recruit.dto.ResultCheckResponseDto;
 import dmu.dasom.api.global.dto.PageResponse;
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
@@ -9,8 +9,8 @@
 import dmu.dasom.api.domain.applicant.repository.ApplicantRepository;
 import dmu.dasom.api.domain.common.exception.CustomException;
 import dmu.dasom.api.domain.common.exception.ErrorCode;
-import dmu.dasom.api.domain.google.enums.MailType;
-import dmu.dasom.api.domain.google.service.EmailService;
+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.domain.recruit.dto.ResultCheckRequestDto;
 import dmu.dasom.api.domain.recruit.dto.ResultCheckResponseDto;
diff --git a/src/main/java/dmu/dasom/api/domain/common/exception/CustomErrorController.java b/src/main/java/dmu/dasom/api/domain/common/exception/CustomErrorController.java
@@ -1,6 +1,5 @@
 package dmu.dasom.api.domain.common.exception;
 
-import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.servlet.RequestDispatcher;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.boot.web.servlet.error.ErrorController;
@@ -9,7 +8,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Hidden
 @RestController
 public class CustomErrorController implements ErrorController {
 
diff --git a/src/main/java/dmu/dasom/api/domain/email/enums/MailType.java b/src/main/java/dmu/dasom/api/domain/email/enums/MailType.java
@@ -1,4 +1,4 @@
-package dmu.dasom.api.domain.google.enums;
+package dmu.dasom.api.domain.email.enums;
 
 public enum MailType {
     DOCUMENT_RESULT, // 서류 합격
diff --git a/src/main/java/dmu/dasom/api/domain/email/service/EmailService.java b/src/main/java/dmu/dasom/api/domain/email/service/EmailService.java
@@ -1,8 +1,8 @@
-package dmu.dasom.api.domain.google.service;
+package dmu.dasom.api.domain.email.service;
 
 import dmu.dasom.api.domain.common.exception.CustomException;
 import dmu.dasom.api.domain.common.exception.ErrorCode;
-import dmu.dasom.api.domain.google.enums.MailType;
+import dmu.dasom.api.domain.email.enums.MailType;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/dmu/dasom/api/domain/google/controller/GoogleController.java b/src/main/java/dmu/dasom/api/domain/google/controller/GoogleController.java
@@ -0,0 +1,38 @@
+package dmu.dasom.api.domain.google.controller;
+
+import dmu.dasom.api.domain.google.service.GoogleApiService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Collections;
+import java.util.List;
+
+@RestController
+@RequestMapping("/google")
+@RequiredArgsConstructor
+public class GoogleController {
+
+    private final GoogleApiService googleApiService;
+    @Value("${google.spreadsheet.id}")
+    private String spreadsheetId;
+
+    private static final String RANGE = "A1";
+
+    @PostMapping("/write")
+    public ResponseEntity<String> writeToSheet(@RequestParam String word){
+        try{
+            List<List<Object>> values = List.of(Collections.singletonList(word));
+
+            googleApiService.writeToSheet(spreadsheetId, RANGE, values);
+            return ResponseEntity.ok("Data written successfully to the spreadsheet" + word);
+        } catch (Exception e){
+            e.printStackTrace();
+            return ResponseEntity.internalServerError().body("Failed to write data to the spreadsheet" + e.getMessage());
+        }
+    }
+}
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
@@ -64,6 +64,21 @@ private Sheets getSheetsService() throws IOException, GeneralSecurityException {
         return sheetsService;
     }
 
+    public void writeToSheet(String spreadsheetId, String range, List<List<Object>> values) {
+        try {
+            Sheets service = getSheetsService();
+            ValueRange body = new ValueRange().setValues(values);
+            service.spreadsheets()
+                .values()
+                .update(spreadsheetId, range, body)
+                .setValueInputOption("USER_ENTERED")
+                .execute();
+        } catch (IOException | GeneralSecurityException e) {
+            log.error("시트에 데이터를 쓰는 데 실패했습니다.");
+            throw new CustomException(ErrorCode.WRITE_FAIL);
+        }
+    }
+
     public void appendToSheet(List<Applicant> applicants) {
         processSheetsUpdate(applicants, true);
     }
diff --git a/src/main/java/dmu/dasom/api/domain/member/controller/MemberController.java b/src/main/java/dmu/dasom/api/domain/member/controller/MemberController.java
@@ -11,7 +11,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
@@ -22,7 +21,6 @@
 @RestController
 @RequestMapping("/api")
 @RequiredArgsConstructor
-@Tag(name = "Member API", description = "회원 관리 API")
 public class MemberController {
 
     private final MemberService memberService;
diff --git a/src/main/java/dmu/dasom/api/domain/news/controller/NewsController.java b/src/main/java/dmu/dasom/api/domain/news/controller/NewsController.java
@@ -12,7 +12,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@Tag(name = "News API", description = "뉴스 API")
+@Tag(name = "NEWS API", description = "뉴스 API")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/news")
@@ -32,4 +32,24 @@ public ResponseEntity<NewsResponseDto> getNewsById(@PathVariable @Min(1) Long id
         return ResponseEntity.ok(newsService.getNewsById(id));
     }
 
+    @Operation(summary = "뉴스 등록")
+    @PostMapping
+    public ResponseEntity<NewsCreationResponseDto> createNews(@Valid @RequestBody NewsRequestDto requestDto) {
+        return ResponseEntity.status(201).body(newsService.createNews(requestDto));
+    }
+
+    @Operation(summary = "뉴스 수정")
+    @PutMapping("/{id}")
+    public ResponseEntity<NewsResponseDto> updateNews(@PathVariable @Min(1) Long id,
+                                                      @Valid @RequestBody NewsUpdateRequestDto requestDto) {
+        return ResponseEntity.ok(newsService.updateNews(id, requestDto));
+    }
+
+    @Operation(summary = "뉴스 삭제")
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteNews(@PathVariable Long id) {
+        newsService.deleteNews(id);
+        return ResponseEntity.ok().build();
+    }
+
 }
diff --git a/src/main/java/dmu/dasom/api/domain/recruit/controller/RecruitController.java b/src/main/java/dmu/dasom/api/domain/recruit/controller/RecruitController.java
@@ -15,7 +15,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -28,7 +27,6 @@
 @RestController
 @RequestMapping("/api/recruit")
 @RequiredArgsConstructor
-@Tag(name = "Recruit API", description = "부원 모집 API")
 public class RecruitController {
 
     private final ApplicantService applicantService;
@@ -86,6 +84,20 @@ public ResponseEntity<ResultCheckResponseDto> checkResult(@ModelAttribute final
         return ResponseEntity.ok(applicantService.checkResult(request));
     }
 
+    // 면접 일정 생성
+    @Operation(summary = "면접 일정 생성", description = "새로운 면접 일정을 생성합니다.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "면접 일정 생성 성공"),
+            @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터")
+    })
+    @PostMapping("/interview/schedule")
+    public ResponseEntity<List<InterviewSlotResponseDto>> createInterviewSlots(@Valid @RequestBody InterviewSlotCreateRequestDto request) {
+
+        List<InterviewSlotResponseDto> slots =
+                interviewService.createInterviewSlots(request.getStartDate(), request.getEndDate(), request.getStartTime(), request.getEndTime());
+        return ResponseEntity.ok(slots);
+    }
+
     // 면접 예약
     @Operation(summary = "면접 예약", description = "지원자가 특정 면접 슬롯을 예약합니다.")
     @ApiResponses(value = {
@@ -116,4 +128,10 @@ public ResponseEntity<List<InterviewSlotResponseDto>> getAllInterviewSlots() {
         return ResponseEntity.ok(allSlots);
     }
 
+    @GetMapping("/interview/applicants")
+    public ResponseEntity<List<InterviewReservationApplicantResponseDto>> getAllInterviewApplicants() {
+        List<InterviewReservationApplicantResponseDto> applicants = interviewService.getAllInterviewApplicants();
+        return ResponseEntity.ok(applicants);
+    }
+
 }
diff --git a/src/main/java/dmu/dasom/api/global/admin/controller/AdminController.java b/src/main/java/dmu/dasom/api/global/admin/controller/AdminController.java
@@ -4,7 +4,9 @@
 import dmu.dasom.api.domain.applicant.dto.ApplicantResponseDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantStatusUpdateRequestDto;
 import dmu.dasom.api.domain.applicant.service.ApplicantService;
-import dmu.dasom.api.domain.google.enums.MailType;
+import dmu.dasom.api.domain.recruit.dto.RecruitScheduleModifyRequestDto;
+import dmu.dasom.api.domain.recruit.service.RecruitService;
+import dmu.dasom.api.domain.email.enums.MailType;
 import dmu.dasom.api.global.dto.PageResponse;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -14,7 +16,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Min;
 import lombok.RequiredArgsConstructor;
@@ -23,12 +24,12 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/admin/applicants")
+@RequestMapping("/api/admin")
 @RequiredArgsConstructor
-@Tag(name = "ADMIN - Applicant API", description = "어드민 지원자 관리 API")
-public class AdminApplicantController {
+public class AdminController {
 
     private final ApplicantService applicantService;
+    private final RecruitService recruitService;
 
     // 지원자 조회
     @Operation(summary = "지원자 전체 조회")
@@ -47,7 +48,7 @@ public class AdminApplicantController {
             )
         )
     })
-    @GetMapping
+    @GetMapping("/applicants")
     public ResponseEntity<PageResponse<ApplicantResponseDto>> getApplicants(
         @RequestParam(value = "page", defaultValue = "0") @Min(0) final int page
     ) {
@@ -71,7 +72,7 @@ public ResponseEntity<PageResponse<ApplicantResponseDto>> getApplicants(
             )
         )
     })
-    @GetMapping("/{id}")
+    @GetMapping("/applicants/{id}")
     public ResponseEntity<ApplicantDetailsResponseDto> getApplicant(@PathVariable("id") @Min(0) final Long id) {
         return ResponseEntity.ok(applicantService.getApplicant(id));
     }
@@ -93,14 +94,41 @@ public ResponseEntity<ApplicantDetailsResponseDto> getApplicant(@PathVariable("i
             )
         )
     })
-    @PatchMapping("/{id}/status")
+    @PatchMapping("/applicants/{id}/status")
     public ResponseEntity<ApplicantDetailsResponseDto> updateApplicantStatus(
         @PathVariable("id") @Min(0) final Long id,
         @Valid @RequestBody final ApplicantStatusUpdateRequestDto request
     ) {
         return ResponseEntity.ok(applicantService.updateApplicantStatus(id, request));
     }
 
+    // 모집 일정 수정
+    @Operation(summary = "모집 일정 수정")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "모집 일정 수정 성공"),
+        @ApiResponse(responseCode = "400", description = "잘못된 요청",
+            content = @Content(
+                mediaType = "application/json",
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = {
+                    @ExampleObject(
+                        name = "날짜 형식 오류",
+                        value = "{ \"code\": \"C016\", \"message\": \"날짜 형식이 올바르지 않습니다.\" }"
+                    ),
+                    @ExampleObject(
+                        name = "시간 형식 오류",
+                        value = "{ \"code\": \"C017\", \"message\": \"시간 형식이 올바르지 않습니다.\" }"
+                    )
+                }
+            )
+        )
+    })
+    @PatchMapping("/recruit/schedule")
+    public ResponseEntity<Void> modifyRecruitSchedule(@Valid @RequestBody final RecruitScheduleModifyRequestDto request) {
+        recruitService.modifyRecruitSchedule(request);
+        return ResponseEntity.ok().build();
+    }
+
     // 메일 전송
     @Operation(
         summary = "메일 전송",
@@ -121,7 +149,7 @@ public ResponseEntity<ApplicantDetailsResponseDto> updateApplicantStatus(
             )
         )
     })
-    @PostMapping("/send-email")
+    @PostMapping("/applicants/send-email")
     public ResponseEntity<Void> sendEmailsToApplicants(
         @RequestParam
         @Parameter(description = "메일 발송 타입", examples = {
diff --git a/src/main/java/dmu/dasom/api/global/admin/controller/AdminNewsController.java b/src/main/java/dmu/dasom/api/global/admin/controller/AdminNewsController.java
diff --git a/src/main/java/dmu/dasom/api/global/admin/controller/AdminRecruitController.java b/src/main/java/dmu/dasom/api/global/admin/controller/AdminRecruitController.java
diff --git a/src/main/java/dmu/dasom/api/global/file/controller/FileController.java b/src/main/java/dmu/dasom/api/global/file/controller/FileController.java
diff --git a/src/test/java/dmu/dasom/api/domain/applicant/ApplicantServiceTest.java b/src/test/java/dmu/dasom/api/domain/applicant/ApplicantServiceTest.java
diff --git a/src/test/java/dmu/dasom/api/domain/email/EmailServiceTest.java b/src/test/java/dmu/dasom/api/domain/email/EmailServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dmu.dasom.api.domain.google.enums;`
	`1`	`+package dmu.dasom.api.domain.email.enums;`
`2`	`2`
`3`	`3`	`public enum MailType {`
`4`	`4`	`DOCUMENT_RESULT, // 서류 합격`