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 new file mode 100644 index 0000000..2759f31 --- /dev/null +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java @@ -0,0 +1,131 @@ +package backend.pirocheck.Assignment.controller; + +import backend.pirocheck.Assignment.dto.request.AssignmentCreateReq; +import backend.pirocheck.Assignment.dto.request.AssignmentItemCreateReq; +import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq; +import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes; +import backend.pirocheck.Assignment.entity.AssignmentStatus; +import backend.pirocheck.Assignment.service.AssignmentService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +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.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api") +@RequiredArgsConstructor +@Tag(name = "과제관리", description = "과제 관련 API") +public class AssignmentController { + + private final AssignmentService assignmentService; + + // 과제 결과 확인 API + // 과제 주차별, 요일별 그룹화 JSON + @Operation(summary = "학생별 과제 결과 확인", description = "관리자가 채점한 과제의 결과를 학생들이 확인합니다.") + @ApiResponses( + value = { + @ApiResponse(responseCode = "200", description = "사용자별 과제 조회에 성공하였습니다."), + @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.") + } + ) + @GetMapping("/assignment/{userId}") + public List getGroupedAssignments( + @Parameter(description = "사용자 ID", example = "1") + @PathVariable Long userId + ) { + return assignmentService.search(userId); + } + + // 과제 생성 API + @Operation(summary = "과제 생성 API", description = "관리자가 과제를 생성합니다.") + @ApiResponses( + value = { + @ApiResponse(responseCode = "200", description = "과제 생성에 성공하였습니다."), + @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.") + } + ) + @PostMapping("/admin/assignment/signup") + public String signupAssignment( + @Valid + @RequestBody AssignmentCreateReq assignmentCreateReq + ) { + return assignmentService.createAssignment(assignmentCreateReq); + } + + // 과제 삭제 API + @Operation(summary = "과제 삭제 API", description = "관리자가 과제를 삭제합니다.") + @ApiResponses( + value = { + @ApiResponse(responseCode = "200", description = "과제 삭제에 성공하였습니다."), + @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.") + } + ) + @DeleteMapping("/admin/assignment/{assignmentId}") + public String deleteAssignment( + @Parameter(description = "과제 ID", example = "1") + @PathVariable Long assignmentId + ) { + return assignmentService.deleteAssignment(assignmentId); + } + + // 과제 수정 API + @Operation(summary = "과제 수정 API", description = "관리자가 과제의 잘못된 부분을 수정합니다.") + @ApiResponses( + value = { + @ApiResponse(responseCode = "200", description = "과제 수정에 성공하였습니다."), + @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.") + } + ) + @PutMapping("/admin/assignment/{assignmentId}") + public String updateAssignment( + @Parameter(description = "과제 ID", example = "1") + @PathVariable("assignmentId") Long assignmentId, + @RequestBody AssignmentUpdateReq assignmentUpdateReq + ) { + return assignmentService.updateAssignment(assignmentId, assignmentUpdateReq); + } + + // 사용자별 과제 제출 결과 생성 API + @Operation(summary = "관리자 과제 채점 API", description = "관리자가 사용자들의 과제를 채점한 결과 저장합니다.") + @ApiResponses( + value = { + @ApiResponse(responseCode = "200", description = "사용자의 과제 채점 결과 저장에 성공하였습니다."), + @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.") + } + ) + @PostMapping("/admin/users/{userId}/assignments/{assignmentId}/submission") + public AssignmentStatus submissionAssignment( + @Parameter(description = "사용자 ID", example = "1") + @PathVariable Long userId, + @Parameter(description = "과제 ID", example = "1") + @PathVariable Long assignmentId, + @RequestBody AssignmentItemCreateReq req + ) { + return assignmentService.createAssignmentItem(userId, assignmentId, req); + } + + // 사용자별 과제 제출 여부 수정 API + @Operation(summary = "관리자 과제 채점 내용 수정 API", description = "관리자가 사용자의 과제 결과를 수정하여 저장합니다.") + @ApiResponses( + value = { + @ApiResponse(responseCode = "200", description = "사용자 과제 채점 결과 수정에 성공하였습니다."), + @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.") + } + ) + @PutMapping("/admin/users/{userId}/assignments/{assignmentId}/submission") + public String updateSubmission( + @Parameter(description = "사용자 ID", example = "1") + @PathVariable Long userId, + @Parameter(description = "과제 ID", example = "1") + @PathVariable Long assignmentId + ) { + return null; + } + +} diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java new file mode 100644 index 0000000..65cbe2f --- /dev/null +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java @@ -0,0 +1,33 @@ +package backend.pirocheck.Assignment.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class AssignmentCreateReq { + + @Schema(description = "과제 주제", example = "Git/HTML/CSS") + @NotNull(message = "과제 주제는 필수입니다.") + private String subject; + + @Schema(description = "과제명", example = "제로초 인강") + @NotNull(message = "과제명은 필수입니다.") + private String assignmentName; + + @Schema(description = "주차", example = "1") + @Positive + private Long week; + + @Schema(description = "요일", example = "화") + @NotBlank(message = "요일을 입력해주세요.") + private String day; + + @Schema(description = "해당 일자 과제 numbering", example = "1") + private Long orderNumber; + +} diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemCreateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemCreateReq.java new file mode 100644 index 0000000..62fc718 --- /dev/null +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemCreateReq.java @@ -0,0 +1,22 @@ +package backend.pirocheck.Assignment.dto.request; + +import backend.pirocheck.Assignment.entity.AssignmentStatus; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Pattern; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class AssignmentItemCreateReq { + + private Long assignmentId; + + private Long userId; + + @Pattern(regexp = "SUCCESS/INSUFFICIENT/FAILURE", message = "status는 SUCCESS, INSUFFICIENT 혹은 FAILURE 여야 합니다.") + @Schema(description = "과제 결과", example = "SUCCESS") + private AssignmentStatus status; +} diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java new file mode 100644 index 0000000..5caa73a --- /dev/null +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java @@ -0,0 +1,33 @@ +package backend.pirocheck.Assignment.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class AssignmentUpdateReq { + + @Schema(description = "과제 주제", example = "Git/HTML/CSS") + @NotNull(message = "과제 주제는 필수입니다.") + private String subject; + + @Schema(description = "과제명", example = "제로초 인강") + @NotNull(message = "과제명은 필수입니다.") + private String assignmentName; + + @Schema(description = "주차", example = "1") + @Positive + private Long week; + + @Schema(description = "요일", example = "화") + @NotBlank(message = "요일을 입력해주세요.") + private String day; + + @Schema(description = "해당 일자 과제 numbering", example = "1") + private Long orderNumber; + +} diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDayRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDayRes.java similarity index 81% rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDayRes.java rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDayRes.java index be325e6..2f46e6a 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDayRes.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDayRes.java @@ -1,4 +1,4 @@ -package backend.pirocheck.assignment.dto.response; +package backend.pirocheck.Assignment.dto.response; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDetailRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDetailRes.java similarity index 63% rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDetailRes.java rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDetailRes.java index 5a40dad..9c0f7f3 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDetailRes.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDetailRes.java @@ -1,6 +1,6 @@ -package backend.pirocheck.assignment.dto.response; +package backend.pirocheck.Assignment.dto.response; -import backend.pirocheck.assignment.entity.AssignmentStatus; +import backend.pirocheck.Assignment.entity.AssignmentStatus; import lombok.AllArgsConstructor; import lombok.Getter; 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 similarity index 66% rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentRes.java rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentRes.java index c924848..ef2ad37 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,6 @@ -package backend.pirocheck.assignment.dto.response; +package backend.pirocheck.Assignment.dto.response; -import backend.pirocheck.assignment.entity.AssignmentStatus; +import backend.pirocheck.Assignment.entity.AssignmentStatus; import lombok.AllArgsConstructor; import lombok.Getter; @@ -11,7 +11,7 @@ public class AssignmentRes { // private Long userId; private String assignmentName; private Long week; - private Long section; + private String day; private Long orderNumber; private AssignmentStatus submitted; diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentWeekRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java similarity index 62% rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentWeekRes.java rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java index 4be2d26..b0d7721 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentWeekRes.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java @@ -1,4 +1,4 @@ -package backend.pirocheck.assignment.dto.response; +package backend.pirocheck.Assignment.dto.response; import lombok.AllArgsConstructor; import lombok.Getter; @@ -9,6 +9,6 @@ @AllArgsConstructor public class AssignmentWeekRes { private Long week; - private String title; // 각 주차 주제 (e.g, Git / HTML / CSS) + private String subject; // 각 주차 주제 (e.g, Git / HTML / CSS) private List days; } diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java new file mode 100644 index 0000000..410c522 --- /dev/null +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java @@ -0,0 +1,67 @@ +package backend.pirocheck.Assignment.entity; + +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder(access = AccessLevel.PRIVATE) +@NoArgsConstructor +@AllArgsConstructor +@Tag(name = "과제 관리", description = "과제 관련 API") +public class Assignment { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + // 전체 주제 + private String subject; + + // 과제명 + private String assignmentName; + + // 주차 + private Long week; + + // 요일 + private String day; + + // 과제 번호 + private Long orderNumber; + + // AssignmentItem 입장에서 "assignment" 필드의 외래 키를 가진 주인 + // assignment를 참조하는 assignmentitem 컬랙션을 가짐 + @OneToMany(mappedBy = "assignment", cascade = CascadeType.ALL, orphanRemoval = true) + private List assignments = new ArrayList<>(); + + // 연관관계 편의 메서드 (양방향 시 자주 사용) + public void addAssignmentItem(AssignmentItem assignmentItem) { + this.assignments.add(assignmentItem); + assignmentItem.setAssignment(this); + } + + // 관리자가 생성 + public static Assignment create(String subject, String assignmentName, Long week, String day, Long orderNumber) { + return Assignment.builder() + .subject(subject) + .assignmentName(assignmentName) + .week(week) + .day(day) + .orderNumber(orderNumber) + .build(); + } + + // 과제 내용 업데이트 + public void update(String subject, String assignmentName, Long week, String day, Long orderNumber) { + this.subject = subject; + this.assignmentName = assignmentName; + this.week = week; + this.day = day; + this.orderNumber = orderNumber; + } +} diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java new file mode 100644 index 0000000..74719c7 --- /dev/null +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java @@ -0,0 +1,38 @@ +package backend.pirocheck.Assignment.entity; + +import backend.pirocheck.User.entity.User; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Setter +@Builder(access = AccessLevel.PRIVATE) +@AllArgsConstructor +@NoArgsConstructor +public class AssignmentItem { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; // 유저별 과제 정보를 저장하는 ID + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "assignment_id") + private Assignment assignment; + + // 과제 결과 + @Enumerated(EnumType.STRING) + @Column(length = 100) + private AssignmentStatus submitted; // 수강생의 과제 제출여부 + + public static AssignmentItem create(User user, Assignment assignment, AssignmentStatus submitted) { + return AssignmentItem.builder() + .assignment(assignment) + .user(user) + .submitted(submitted) + .build(); + } +} diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/AssignmentStatus.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentStatus.java similarity index 60% rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/AssignmentStatus.java rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentStatus.java index dcc9466..290cfea 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/AssignmentStatus.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentStatus.java @@ -1,4 +1,4 @@ -package backend.pirocheck.assignment.entity; +package backend.pirocheck.Assignment.entity; public enum AssignmentStatus { SUCCESS, INSUFFICIENT, FAILURE; diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/repository/AssignmentRepository.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java similarity index 51% rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/repository/AssignmentRepository.java rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java index c0048f9..1a39eec 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/repository/AssignmentRepository.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java @@ -1,18 +1,18 @@ -package backend.pirocheck.assignment.repository; +package backend.pirocheck.Assignment.repository; +import backend.pirocheck.Assignment.entity.AssignmentItem; +import backend.pirocheck.Assignment.entity.AssignmentStatus; import backend.pirocheck.User.entity.User; -import backend.pirocheck.assignment.entity.Assignment; -import backend.pirocheck.assignment.entity.AssignmentStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.List; @Repository -public interface AssignmentRepository extends JpaRepository { +public interface AssignmentItemRepository extends JpaRepository { // 유저별 과제 목록 조회 - List findByUserId(Long userId); + List findByUserId(Long userId); // 보증금 int countByUserAndSubmitted(User user, AssignmentStatus status); diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java new file mode 100644 index 0000000..408e69c --- /dev/null +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java @@ -0,0 +1,9 @@ +package backend.pirocheck.Assignment.repository; + +import backend.pirocheck.Assignment.entity.Assignment; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface AssignmentRepository extends JpaRepository { +} 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 new file mode 100644 index 0000000..c4c25cd --- /dev/null +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java @@ -0,0 +1,124 @@ +package backend.pirocheck.Assignment.service; + +import backend.pirocheck.Assignment.dto.request.AssignmentCreateReq; +import backend.pirocheck.Assignment.dto.request.AssignmentItemCreateReq; +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.AssignmentWeekRes; +import backend.pirocheck.Assignment.entity.Assignment; +import backend.pirocheck.Assignment.entity.AssignmentItem; +import backend.pirocheck.Assignment.entity.AssignmentStatus; +import backend.pirocheck.Assignment.repository.AssignmentItemRepository; +import backend.pirocheck.Assignment.repository.AssignmentRepository; +import backend.pirocheck.User.entity.User; +import backend.pirocheck.User.repository.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +@Transactional +@RequiredArgsConstructor +public class AssignmentService { + + private final AssignmentItemRepository assignmentItemRepository; + private final AssignmentRepository assignmentRepository; + private final UserRepository userRepository; + + public List search(Long userId) { + + List assignments = assignmentItemRepository.findByUserId(userId); + // week 기준으로 그룹화 + Map> weekGroup = assignments.stream() + .collect(Collectors.groupingBy(item -> item.getAssignment().getWeek())); // assignmentItems를 week 별로 그룹핑 + + List assignmentResponses = new ArrayList<>(); + + for (Map.Entry> entry : weekGroup.entrySet()) { + Long week = entry.getKey(); // 주차 정보 + List assignmentList = entry.getValue(); // 주차에 해당하는 days의 list + + String subject = assignmentList.get(0).getAssignment().getSubject(); + + // day를 기준으로 그룹핑 + Map> dayGroup = assignmentList.stream() + .collect(Collectors.groupingBy(item -> item.getAssignment().getDay())); + + List assignmentDayResList = new ArrayList<>(); + + for (Map.Entry> dayEntry : dayGroup.entrySet()) { + String day = dayEntry.getKey(); + List dayAssignmentList = dayEntry.getValue(); + + // 세부 과제명과 과제 결과를 리스트 형태로 + List assignmentDetailResList = dayAssignmentList.stream() + .map(assignmentItem -> new AssignmentDetailRes( + assignmentItem.getAssignment().getAssignmentName(), + assignmentItem.getSubmitted() + )) + .toList(); + assignmentDayResList.add(new AssignmentDayRes(day, assignmentDetailResList)); + } + + assignmentResponses.add(new AssignmentWeekRes(week, subject, assignmentDayResList)); + } + + return assignmentResponses; + } + + public String createAssignment(AssignmentCreateReq assignmentCreateReq) { + + Assignment assignment = Assignment.create( + assignmentCreateReq.getSubject(), + assignmentCreateReq.getAssignmentName(), + assignmentCreateReq.getWeek(), + assignmentCreateReq.getDay(), + assignmentCreateReq.getOrderNumber()); + + assignment = assignmentRepository.save(assignment); + + return assignment.getAssignmentName(); + } + + // 과제 삭제 + public String deleteAssignment(Long assignmentId) { + assignmentRepository.deleteById(assignmentId); + return "과제가 성공적으로 삭제되었습니다."; + } + + // 과제 수정 + public String updateAssignment(Long assignmentId, AssignmentUpdateReq req) { + Assignment assignment = assignmentRepository.findById(assignmentId) + .orElseThrow(() -> new IllegalArgumentException("조회된 과제가 없습니다.")); + + assignment.update(req.getSubject(), req.getAssignmentName(), req.getWeek(), req.getDay(), req.getOrderNumber()); + assignmentRepository.save(assignment); + + return assignment.getAssignmentName(); + } + + // 과제 채점 결과 저장 + public AssignmentStatus createAssignmentItem(Long assignmentId, Long userId, AssignmentItemCreateReq req) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new IllegalArgumentException("조회된 사용자가 없습니다.")); + + Assignment assignment = assignmentRepository.findById(assignmentId) + .orElseThrow(() -> new IllegalArgumentException("조회된 과제가 없습니다.")); + + AssignmentItem assignmentItem = AssignmentItem.create( + user, + assignment, + req.getStatus() + ); + + assignmentItemRepository.save(assignmentItem); + + return assignmentItem.getSubmitted(); + } +} diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Deposit/service/DepositService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Deposit/service/DepositService.java index ce3da5f..66eafb1 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/Deposit/service/DepositService.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/Deposit/service/DepositService.java @@ -6,8 +6,8 @@ import backend.pirocheck.Deposit.repository.DepositRepository; import backend.pirocheck.User.entity.User; import backend.pirocheck.User.repository.UserRepository; -import backend.pirocheck.assignment.entity.AssignmentStatus; -import backend.pirocheck.assignment.repository.AssignmentRepository; +import backend.pirocheck.Assignment.entity.AssignmentStatus; +import backend.pirocheck.Assignment.repository.AssignmentItemRepository; import backend.pirocheck.Attendance.repository.AttendanceRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; @@ -20,7 +20,7 @@ public class DepositService { private final DepositRepository depositRepository; private final UserRepository userRepository; private final AttendanceRepository attendanceRepository; - private final AssignmentRepository assignmentRepository; + private final AssignmentItemRepository assignmentItemRepository; @Transactional public DepositResDto getDeposit(Long userId) { @@ -34,8 +34,8 @@ public DepositResDto getDeposit(Long userId) { int descentAttendance = failAttendanceCount * 10_000; // 과제 실패 - int failAssignmentCount = assignmentRepository.countByUserAndSubmitted(user, AssignmentStatus.FAILURE); - int weakAssignmentCount = assignmentRepository.countByUserAndSubmitted(user, AssignmentStatus.INSUFFICIENT); + int failAssignmentCount = assignmentItemRepository.countByUserAndSubmitted(user, AssignmentStatus.FAILURE); + int weakAssignmentCount = assignmentItemRepository.countByUserAndSubmitted(user, AssignmentStatus.INSUFFICIENT); int descentAssignment = failAssignmentCount * 20_000 + weakAssignmentCount * 10_000; // 방어권 diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/service/ManageStudentsService.java b/backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/service/ManageStudentsService.java index e28c409..ed60489 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/service/ManageStudentsService.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/service/ManageStudentsService.java @@ -1,5 +1,7 @@ package backend.pirocheck.ManageStudents.service; +import backend.pirocheck.Assignment.entity.AssignmentItem; +import backend.pirocheck.Assignment.repository.AssignmentItemRepository; import backend.pirocheck.Deposit.entity.Deposit; import backend.pirocheck.Deposit.repository.DepositRepository; import backend.pirocheck.ManageStudents.dto.response.ManageStudentDetailResDto; @@ -7,8 +9,6 @@ import backend.pirocheck.User.entity.Role; import backend.pirocheck.User.entity.User; import backend.pirocheck.User.repository.UserRepository; -import backend.pirocheck.assignment.entity.Assignment; -import backend.pirocheck.assignment.repository.AssignmentRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -21,17 +21,16 @@ public class ManageStudentsService { private final UserRepository userRepository; private final DepositRepository depositRepository; - private final AssignmentRepository assignmentRepository; + private final AssignmentItemRepository assignmentItemRepository; // 수강생 조회 public List searchMembers(String name) { List users; - if(name == null || name.isBlank()) { + if (name == null || name.isBlank()) { // 검색어가 없으면 맴버 전체 조회 users = userRepository.findByRole(Role.MEMBER); - } - else { + } else { // 이름 검색 users = userRepository.findByNameContainingAndRole(name, Role.MEMBER); } @@ -54,11 +53,11 @@ public ManageStudentDetailResDto getMemberDetail(Long studentId) { } // Assignment 리스트 조회 - List assignments = assignmentRepository.findByUserId(studentId); + List assignments = assignmentItemRepository.findByUserId(studentId); // 과제 제목만 리스트로 변환 List assignmentTitles = assignments.stream() - .map(Assignment::getAssignmentName) + .map(assignment -> assignment.getAssignment().getAssignmentName()) .toList(); // ManageStudentDetailResDto 조립 diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/User/entity/User.java b/backend/pirocheck/src/main/java/backend/pirocheck/User/entity/User.java index ad215b0..65b6717 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/User/entity/User.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/User/entity/User.java @@ -1,11 +1,15 @@ package backend.pirocheck.User.entity; +import backend.pirocheck.Assignment.entity.AssignmentItem; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.List; + @Entity @Getter @Table(name="users") @@ -30,6 +34,20 @@ public class User { @Enumerated(EnumType.STRING) private Role role; // MEMBER or ADMIN + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) + private List assignmentItems = new ArrayList<>(); + private Integer generation; + // AssignmentItem 입장에서 "user" 필드의 외래 키를 가진 주인 + // assignment를 참조하는 assignmentitem 컬랙션을 가짐 + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) + private List assignments = new ArrayList<>(); + + // 연관관계 편의 메서드 (양방향 시 자주 사용) + public void addAssignmentItem(AssignmentItem assignmentItem) { + this.assignments.add(assignmentItem); + assignmentItem.setUser(this); + } + } \ No newline at end of file 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 deleted file mode 100644 index 0c1379f..0000000 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/controller/AssignmentController.java +++ /dev/null @@ -1,36 +0,0 @@ -package backend.pirocheck.assignment.controller; - -import backend.pirocheck.assignment.dto.request.AssignmentReq; -import backend.pirocheck.assignment.dto.response.AssignmentRes; -import backend.pirocheck.assignment.dto.response.AssignmentWeekRes; -import backend.pirocheck.assignment.service.AssignmentService; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/api/assignment") -@RequiredArgsConstructor -public class AssignmentController { - - private final AssignmentService assignmentService; - - // 과제 결과 확인 API -// @GetMapping("/{userId}") -// public List getAssignment(@PathVariable("userId") Long userId) { -// // 주차별 과제 제목, 요일별 과제 제목, 과제 상태 반환 -// return assignmentService.search(userId); -// } - // 과제 주차별, 요일별 그룹화 JSON - @GetMapping("/grouped/{userId}") - public List getGroupedAssignments(@PathVariable Long userId) { - return assignmentService.search(userId); - } - - // 과제 생성 API - @PostMapping("/signup") - public String signupAssignment(@RequestBody AssignmentReq assignmentReq) { - return assignmentService.create(assignmentReq); - } -} diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/request/AssignmentReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/request/AssignmentReq.java deleted file mode 100644 index 3d1cfd6..0000000 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/request/AssignmentReq.java +++ /dev/null @@ -1,16 +0,0 @@ -package backend.pirocheck.assignment.dto.request; - -import backend.pirocheck.assignment.entity.AssignmentStatus; -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public class AssignmentReq { - - private String assignmentName; - private Long week; - private Long section; - private Long orderNumber; - -} diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/Assignment.java b/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/Assignment.java deleted file mode 100644 index 62aa724..0000000 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/Assignment.java +++ /dev/null @@ -1,49 +0,0 @@ -package backend.pirocheck.assignment.entity; - -import backend.pirocheck.User.entity.User; -import jakarta.persistence.*; -import lombok.*; - -@Entity -@Getter -@Builder(access = AccessLevel.PRIVATE) -@NoArgsConstructor -@AllArgsConstructor -public class Assignment { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - // user 정보와 과제 정보를 연결해 저장 - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id") - private User user; // user를 생성했을 때의 해당 user 엔티티 - - // 과제명 - private String assignmentName; - - // 주차 - private Long week; - - // 요일 - private Long section; - - // 과제 번호 - private Long orderNumber; - - // 과제 결과 - @Enumerated(EnumType.STRING) - @Column(length = 100) - private AssignmentStatus submitted; - - // 관리자가 생성 - public static Assignment create(String assignmentName, Long week, Long section, Long orderNumber) { - return Assignment.builder() - .assignmentName(assignmentName) - .week(week) - .section(section) - .orderNumber(orderNumber) - .build(); - } -} 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 deleted file mode 100644 index d98b74b..0000000 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/service/AssignmentService.java +++ /dev/null @@ -1,83 +0,0 @@ -package backend.pirocheck.assignment.service; - -import backend.pirocheck.assignment.dto.request.AssignmentReq; -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.repository.AssignmentRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -@Transactional -@RequiredArgsConstructor -public class AssignmentService { - - private final AssignmentRepository assignmentRepository; - - // 그룹화 되지 않은 JSON 형식 -// public List search(Long userId) { -// // 각 유저별 전체 과제 목록 조회 (userId를 어떻게 넘길 것인가?) search의 인자로 넘긴다... -// List assignments = assignmentRepository.findByUserId(userId); -// -// return assignments.stream() -// .map(assignment -> new AssignmentRes(assignment.getAssignmentName(), assignment.getWeek(), assignment.getSection(), assignment.getOrderNumber(), assignment.getSubmitted())) -// .toList(); -// } - public List search(Long userId) { - - List assignments = assignmentRepository.findByUserId(userId); - // week 기준으로 그룹화 - Map> weekGroup = assignments.stream() - .collect(Collectors.groupingBy(Assignment::getWeek)); // assignments를 week 별로 그룹핑 - - List assignmentResponses = new ArrayList<>(); - - for (Map.Entry> entry : weekGroup.entrySet()) { - Long week = entry.getKey(); - List assignmentList = entry.getValue(); - - // day를 기준으로 그룹핑 - Map> dayGroup = assignments.stream() - .collect(Collectors.groupingBy(Assignment::getSection)); - - List assignmentDayResList = new ArrayList<>(); - - for (Map.Entry> dayEntry : dayGroup.entrySet()) { - Long day = dayEntry.getKey(); - List dayAssignmentList = dayEntry.getValue(); - - // 세부 과제명과 과제 결과를 리스트 형태로 - List assignmentDetailResList = dayAssignmentList.stream() - .map(assignment -> new AssignmentDetailRes( - assignment.getAssignmentName(), - assignment.getSubmitted() - )) - .toList(); - } - } - - return assignmentResponses; - } - - public String create(AssignmentReq assignmentReq) { - - Assignment assignment = Assignment.create( - assignmentReq.getAssignmentName(), - assignmentReq.getWeek(), - assignmentReq.getSection(), - assignmentReq.getOrderNumber()); - - assignment = assignmentRepository.save(assignment); - - return assignment.getAssignmentName(); - } -} diff --git a/frontend/public/assets/img/edit.png b/frontend/public/assets/img/edit.png new file mode 100644 index 0000000..639f11c Binary files /dev/null and b/frontend/public/assets/img/edit.png differ diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 35cf6b5..3f48079 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -24,7 +24,7 @@ function App() { } /> } /> } /> - } /> + } /> } /> } /> diff --git a/frontend/src/api/students.js b/frontend/src/api/students.js index eac3665..271ee4f 100644 --- a/frontend/src/api/students.js +++ b/frontend/src/api/students.js @@ -1,7 +1,7 @@ import api from "./api"; export const getStudentsByName = async (name) => { - const res = await api.get("/admin/managestudent", { + const res = await api.get(`/admin/managestudent`, { params: { name }, }); return res.data; // [{ id: ..., name: ... }] diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx index fe0403d..9530644 100644 --- a/frontend/src/components/Header.jsx +++ b/frontend/src/components/Header.jsx @@ -11,10 +11,14 @@ const Header = () => { else if (path.includes("deposit")) title = "DEPOSIT"; else if (path.includes("attendance")) title = "ATTENDANCE\nCHECK"; else if (path.includes("managestudent")) title = "수강생 관리"; - else if (path.includes("magagetask")) title = "과제 관리"; + else if (path.includes("managetask")) title = "과제 관리"; else if (path.includes("attendancecode")) title = "출석코드 생성"; - const showRightDeposit = !path.includes("deposit"); + const showRightDeposit = + !path.includes("deposit") && + !path.includes("managestudent") && + !path.includes("managetask"); // 수강생 관리, 과제 관리 페이지 추가 + const showRightMagageStudent = path.includes("attendancecode"); return ( diff --git a/frontend/src/components/TaskModal.jsx b/frontend/src/components/TaskModal.jsx new file mode 100644 index 0000000..b3a3b6b --- /dev/null +++ b/frontend/src/components/TaskModal.jsx @@ -0,0 +1,62 @@ +import { useState } from "react"; +import styles from "../pages/admin/ManageTask.module.css"; + +const TaskModal = ({ weekInfo, onClose }) => { + const [topic, setTopic] = useState(""); + const [day, setDay] = useState(""); + const [taskList, setTaskList] = useState([""]); + + const handleTaskChange = (index, value) => { + const newTasks = [...taskList]; + newTasks[index] = value; + setTaskList(newTasks); + }; + + const handleAddTask = () => { + setTaskList([...taskList, ""]); + }; + + return ( +
+
+
+

{weekInfo.week}

+ +
+
+ + setTopic(e.target.value)} + /> + + setDay(e.target.value)} + /> + + {taskList.map((task, i) => ( + handleTaskChange(i, e.target.value)} + /> + ))} + +
+
+ +
+
+
+ ); +}; + +export default TaskModal; diff --git a/frontend/src/pages/admin/Admin.jsx b/frontend/src/pages/admin/Admin.jsx index 6b9e4e9..ddcbf85 100644 --- a/frontend/src/pages/admin/Admin.jsx +++ b/frontend/src/pages/admin/Admin.jsx @@ -15,7 +15,7 @@ const Admin = () => { diff --git a/frontend/src/pages/admin/ManageStudent.module.css b/frontend/src/pages/admin/ManageStudent.module.css index 014c39f..931680a 100644 --- a/frontend/src/pages/admin/ManageStudent.module.css +++ b/frontend/src/pages/admin/ManageStudent.module.css @@ -21,11 +21,14 @@ color: white; padding: 15px; border-radius: 8px; - border: 1px solid #39ff14; + border: 1px solid var(--fill-gray); text-align: left; font-size: 16px; width: 100%; } +.student_button:hover { + border: 1px solid #39ff14; +} .pagination { margin-top: 60px; display: flex; diff --git a/frontend/src/pages/admin/ManageTask.jsx b/frontend/src/pages/admin/ManageTask.jsx index 7140e6e..82075dc 100644 --- a/frontend/src/pages/admin/ManageTask.jsx +++ b/frontend/src/pages/admin/ManageTask.jsx @@ -1,4 +1,52 @@ -const MagageTask = () => { - return

과제 관리

; +import { useState } from "react"; +import Header from "../../components/Header"; +import style from "./ManageTask.module.css"; +import TaskModal from "../../components/TaskModal"; + +const weekData = [ + { week: "1주차", title: "Comming soon~", tasks: [] }, + { week: "2주차", title: "Comming soon~", tasks: [] }, + { week: "3주차", title: "Comming soon~", tasks: [] }, + { week: "4주차", title: "Comming soon~", tasks: [] }, + { week: "5주차", title: "Comming soon~", tasks: [] }, +]; + +const ManageTask = () => { + const [selectedWeekIndex, setSelectedWeekIndex] = useState(null); + const [showModal, setShowModal] = useState(false); + + const handleEditClick = (index) => { + setSelectedWeekIndex(index); + setShowModal(true); + }; + + const closeModal = () => setShowModal(false); + + return ( +
+
+
+ {weekData.map((week, index) => ( +
+ + edit handleEditClick(index)} + /> +
+ ))} +
+ {showModal && ( + + )} +
+ ); }; -export default MagageTask; +export default ManageTask; diff --git a/frontend/src/pages/admin/ManageTask.module.css b/frontend/src/pages/admin/ManageTask.module.css new file mode 100644 index 0000000..36906ff --- /dev/null +++ b/frontend/src/pages/admin/ManageTask.module.css @@ -0,0 +1,106 @@ +.managetask_wrapper { + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; +} +.week_container { + display: flex; + flex-direction: column; + align-items: center; + width: 100%; +} +.week_block { + display: flex; + align-items: center; + margin: 10px 0; + width: 100%; + justify-content: center; +} +.week_button { + background-color: #444; + color: white; + padding: 14px 16px; + border: none; + border-radius: 8px; + min-width: 250px; + margin-right: 8px; + font-size: 16px; + display: flex; + justify-content: flex-start; +} +.edit_icon { + width: 20px; + height: 20px; + cursor: pointer; +} +.modal_overlay { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, 0.6); + display: flex; + justify-content: center; + align-items: center; +} +.modal { + background-color: #333; + border: 1px solid #4fff24; + border-radius: 12px; + padding: 20px; + width: 300px; + color: white; + display: flex; + flex-direction: column; + gap: 10px; + align-items: center; +} +.modal_header { + display: flex; + justify-content: space-between; + align-items: center; + position: relative; +} +.close_button { + background: none; + border: none; + color: white; + font-size: 20px; + cursor: pointer; + position: absolute; + left: 130px; +} +.modal_body { + width: 90%; +} +.modal_body label { + margin-block: 10px; + display: block; +} +.modal_body input { + width: 100%; + padding: 6px; + margin-bottom: 8px; + background-color: #555; + border: none; + border-radius: 4px; + color: white; +} +.add_button { + background: none; + border: none; + font-size: 24px; + color: white; + cursor: pointer; +} +.save_button { + margin-top: 10px; + padding: 8px 16px; + background-color: #666; + border: none; + border-radius: 6px; + color: white; + cursor: not-allowed; +}