From bed9b40d8c4200500d00fc3381af92a0d1811ee3 Mon Sep 17 00:00:00 2001 From: l-wanderer01 Date: Thu, 29 May 2025 15:57:02 +0900 Subject: [PATCH] =?UTF-8?q?[feat]=20=EC=83=9D=EC=84=B1=EB=90=9C=20?= =?UTF-8?q?=EA=B3=BC=EC=A0=9C=EB=93=A4=EC=9D=84=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=EA=B0=80=20=EC=A1=B0=ED=9A=8C=ED=95=A0=20=EC=88=98=20?= =?UTF-8?q?=EC=9E=88=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AssignmentController.java | 14 +++++++++++ .../dto/response/AssignmentRes.java | 6 ++--- .../Assignment/service/AssignmentService.java | 24 +++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java index 042c94d..50257d2 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java @@ -4,6 +4,7 @@ import backend.pirocheck.Assignment.dto.request.AssignmentItemCreateReq; import backend.pirocheck.Assignment.dto.request.AssignmentItemUpdateReq; import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq; +import backend.pirocheck.Assignment.dto.response.AssignmentRes; import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes; import backend.pirocheck.Assignment.entity.AssignmentStatus; import backend.pirocheck.Assignment.service.AssignmentService; @@ -59,6 +60,19 @@ public String signupAssignment( return assignmentService.createAssignment(assignmentCreateReq); } + // 과제 조회 API + @Operation(summary = "과제 조회 API", description = "관리자가 과제를 조회합니다.") + @ApiResponses( + value = { + @ApiResponse(responseCode = "200", description = "과제 조회에 성공하였습니다."), + @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.") + } + ) + @GetMapping("/admin/assignment/search") + public List searchAssignment(AssignmentRes assignmentRes) { + return assignmentService.searchAssignment(assignmentRes); + } + // 과제 삭제 API @Operation(summary = "과제 삭제 API", description = "관리자가 과제를 삭제합니다.") @ApiResponses( diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentRes.java index ef2ad37..5dc738c 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentRes.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentRes.java @@ -1,6 +1,5 @@ package backend.pirocheck.Assignment.dto.response; -import backend.pirocheck.Assignment.entity.AssignmentStatus; import lombok.AllArgsConstructor; import lombok.Getter; @@ -8,11 +7,12 @@ @AllArgsConstructor public class AssignmentRes { -// private Long userId; + private Long id; + private String title; + private String subtitle; private String assignmentName; private Long week; private String day; private Long orderNumber; - private AssignmentStatus submitted; } diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java index fcf1383..489d3fa 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java @@ -6,6 +6,7 @@ import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq; import backend.pirocheck.Assignment.dto.response.AssignmentDayRes; import backend.pirocheck.Assignment.dto.response.AssignmentDetailRes; +import backend.pirocheck.Assignment.dto.response.AssignmentRes; import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes; import backend.pirocheck.Assignment.entity.Assignment; import backend.pirocheck.Assignment.entity.AssignmentItem; @@ -76,6 +77,7 @@ public List search(Long userId) { return assignmentResponses; } + // 과제 생성 public String createAssignment(AssignmentCreateReq assignmentCreateReq) { Assignment assignment = Assignment.create( @@ -105,6 +107,28 @@ public String createAssignment(AssignmentCreateReq assignmentCreateReq) { return assignment.getAssignmentName(); } + // 과제 조회 + public List searchAssignment(AssignmentRes assignmentRes) { + List list = assignmentRepository.findAll(); + + List assignmentResList = new ArrayList<>(); + + for (Assignment assignment : list) { + assignmentResList.add(new AssignmentRes( + assignment.getId(), + assignment.getTitle(), + assignment.getSubtitle(), + assignment.getAssignmentName(), + assignment.getWeek(), + assignment.getDay(), + assignment.getOrderNumber() + ) + ); + } + + return assignmentResList; + } + // 과제 삭제 public String deleteAssignment(Long assignmentId) { assignmentRepository.deleteById(assignmentId);