Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<AssignmentRes> searchAssignment(AssignmentRes assignmentRes) {
return assignmentService.searchAssignment(assignmentRes);
}

// 과제 삭제 API
@Operation(summary = "과제 삭제 API", description = "관리자가 과제를 삭제합니다.")
@ApiResponses(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package backend.pirocheck.Assignment.dto.response;

import backend.pirocheck.Assignment.entity.AssignmentStatus;
import lombok.AllArgsConstructor;
import lombok.Getter;

@Getter
@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;

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -76,6 +77,7 @@ public List<AssignmentWeekRes> search(Long userId) {
return assignmentResponses;
}

// 과제 생성
public String createAssignment(AssignmentCreateReq assignmentCreateReq) {

Assignment assignment = Assignment.create(
Expand Down Expand Up @@ -105,6 +107,28 @@ public String createAssignment(AssignmentCreateReq assignmentCreateReq) {
return assignment.getAssignmentName();
}

// 과제 조회
public List<AssignmentRes> searchAssignment(AssignmentRes assignmentRes) {
List<Assignment> list = assignmentRepository.findAll();

List<AssignmentRes> 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);
Expand Down