Merge pull request #84 from MJSEC-MJU/feat/AssignStatus

Feat/assign status

Author: tember8003

src/main/java/com/mjsec/lms/controller/AssignmentController.java

@@ -6,6 +6,7 @@
 import com.mjsec.lms.service.AssignmentSubmissionService;
 import com.mjsec.lms.service.PlanService;
 import com.mjsec.lms.type.ResponseMessage;
+import com.mjsec.lms.type.SubmissionStatus;
 import com.mjsec.lms.util.IpUtils;
 import com.mjsec.lms.util.ValidationUtils;
 import jakarta.servlet.http.HttpServletRequest;
@@ -291,7 +292,7 @@ public ResponseEntity<SuccessResponse<Void>> leaveFeedback(
             @PathVariable Long groupId,
             @PathVariable Long planId,
             @PathVariable Long submitId,
-            @RequestBody SubmissionFeedbackDto dto,
+            @Valid @RequestBody SubmissionFeedbackDto dto,
             Authentication authentication){
 
         // JwtFilter에서 설정한 studentNumber를 가져옴
@@ -313,7 +314,7 @@ public ResponseEntity<SuccessResponse<SubmissionFeedbackDto>> updateFeedback(
             @PathVariable Long groupId,
             @PathVariable Long planId,
             @PathVariable Long submitId,
-            @RequestBody SubmissionFeedbackDto dto,
+            @Valid @RequestBody SubmissionFeedbackDto dto,
             Authentication authentication){
 
         // JwtFilter에서 설정한 studentNumber를 가져옴
@@ -323,7 +324,8 @@ public ResponseEntity<SuccessResponse<SubmissionFeedbackDto>> updateFeedback(
 
         return ResponseEntity.ok(
                 SuccessResponse.of(
-                        ResponseMessage.FEEDBACK_UPDATE_SUCCESS
+                        ResponseMessage.FEEDBACK_UPDATE_SUCCESS,
+                        submissionFeedbackDto
                 )
         );
     }
@@ -347,4 +349,67 @@ public ResponseEntity<SuccessResponse<Void>> deleteFeedback(
                 )
         );
     }
+
+    //과제 상태별 조회 API
+    @GetMapping("/{groupId}/assignment/submit/{planId}/status/{status}")
+    public ResponseEntity<SuccessResponse<List<SubmissionResponse>>> getSubmissionsByStatus(
+            @PathVariable Long groupId,
+            @PathVariable Long planId,
+            @PathVariable SubmissionStatus status,
+            Authentication authentication) {
+
+        Long currentUserStudentNumber = (Long) authentication.getPrincipal();
+
+        List<SubmissionResponse> submissionResponseList = assignmentSubmissionService.getSubmissionsByStatus(
+                groupId, planId, status, currentUserStudentNumber);
+
+        return ResponseEntity.ok(
+                SuccessResponse.of(
+                        ResponseMessage.ASSIGNMENT_SUBMIT_CHECK_SUCCESS,
+                        submissionResponseList
+                )
+        );
+    }
+
+    // 멘티용 수정 필요한 과제 조회 API <- 필요할까 싶기도 함 일단 추가함.
+    @GetMapping("/{groupId}/assignment/submit/{planId}/revision-required")
+    public ResponseEntity<SuccessResponse<List<SubmissionResponse>>> getRevisionRequiredSubmissions(
+            @PathVariable Long groupId,
+            @PathVariable Long planId,
+            Authentication authentication) {
+
+        Long currentUserStudentNumber = (Long) authentication.getPrincipal();
+
+        // REVISION_REQUIRED 상태인 과제들 조회
+        List<SubmissionResponse> submissionResponseList = assignmentSubmissionService.getSubmissionsByStatus(
+                groupId, planId, SubmissionStatus.REVISION_REQUIRED, currentUserStudentNumber);
+
+        return ResponseEntity.ok(
+                SuccessResponse.of(
+                        ResponseMessage.REVISION_REQUIRED_SUBMISSIONS_SUCCESS,
+                        submissionResponseList
+                )
+        );
+    }
+
+    // 과제 상태 통계 조회 API (멘토용)
+    @GetMapping("/{groupId}/assignment/submit/{planId}/statistics")
+    public ResponseEntity<SuccessResponse<SubmissionStatisticsResponse>> getSubmissionStatistics(
+            @PathVariable Long groupId,
+            @PathVariable Long planId,
+            Authentication authentication) {
+
+        // JwtFilter에서 설정한 studentNumber를 가져옴
+        Long currentUserStudentNumber = (Long) authentication.getPrincipal();
+
+        SubmissionStatisticsResponse statistics = assignmentSubmissionService.getSubmissionStatistics(
+                groupId, planId, currentUserStudentNumber);
+
+        return ResponseEntity.ok(
+                SuccessResponse.of(
+                        ResponseMessage.SUBMISSION_STATISTICS_SUCCESS,
+                        statistics
+                )
+        );
+    }
 }

src/main/java/com/mjsec/lms/domain/AssignmentSubmission.java

@@ -1,5 +1,6 @@
 package com.mjsec.lms.domain;
 
+import com.mjsec.lms.type.SubmissionStatus;
 import jakarta.persistence.*;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -36,6 +37,11 @@ public class AssignmentSubmission extends BaseEntity {
     @Column(name = "feedback", columnDefinition = "TEXT")
     private String feedback;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status", nullable = false, length = 20)
+    @Builder.Default
+    private SubmissionStatus status = SubmissionStatus.SUBMITTED;
+
     // 연관관계 매핑
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")

src/main/java/com/mjsec/lms/dto/DetailSubmissionResponse.java

@@ -1,5 +1,6 @@
 package com.mjsec.lms.dto;
 
+import com.mjsec.lms.type.SubmissionStatus;
 import lombok.Builder;
 import lombok.Data;
 
@@ -19,6 +20,8 @@ public class DetailSubmissionResponse {
 
     private String feedback;
 
+    private SubmissionStatus status;
+
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;

src/main/java/com/mjsec/lms/dto/SubmissionFeedbackDto.java

@@ -1,5 +1,7 @@
 package com.mjsec.lms.dto;
 
+import com.mjsec.lms.type.SubmissionStatus;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -12,5 +14,7 @@
 public class SubmissionFeedbackDto {
 
     private String feedback;
-    
+
+    @NotNull(message = "과제 상태는 필수입니다.")
+    private SubmissionStatus status;
 }

src/main/java/com/mjsec/lms/dto/SubmissionResponse.java

@@ -1,5 +1,6 @@
 package com.mjsec.lms.dto;
 
+import com.mjsec.lms.type.SubmissionStatus;
 import lombok.Builder;
 import lombok.Data;
 
@@ -16,5 +17,7 @@ public class SubmissionResponse {
 
     private String creatorName;
 
+    private SubmissionStatus status;
+
     private LocalDateTime createdAt;
 }

src/main/java/com/mjsec/lms/dto/SubmissionStatisticsResponse.java

@@ -0,0 +1,16 @@
+package com.mjsec.lms.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class SubmissionStatisticsResponse {
+
+    private int totalMentees;           // 전체 멘티 수
+    private int submittedCount;         // 제출 완료 상태
+    private int completedCount;         // 과제 완료 상태
+    private int revisionRequiredCount;  // 수정 필요 상태
+    private int notSubmittedCount;      // 미제출 수
+
+}

src/main/java/com/mjsec/lms/repository/SubmissionRepository.java

@@ -1,8 +1,8 @@
 package com.mjsec.lms.repository;
 
 import com.mjsec.lms.domain.AssignmentSubmission;
-import com.mjsec.lms.domain.StudyGroup;
 import com.mjsec.lms.domain.User;
+import com.mjsec.lms.type.SubmissionStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -37,4 +37,17 @@ public interface SubmissionRepository extends JpaRepository<AssignmentSubmission
             "WHERE a.submitter.userId = :userId " +
             "AND a.plan.studyGroup.studyId = :studyId")
     List<Long> findIdsByUserIdAndStudyGroupId(@Param("userId") Long userId, @Param("studyId") Long studyId);
+
+    // 특정 과제의 특정 상태 제출물들 조회
+    List<AssignmentSubmission> findByPlanPlanIdAndStatus(Long planId, SubmissionStatus status);
+
+    // 특정 사용자의 특정 과제의 특정 상태 제출물들 조회
+    List<AssignmentSubmission> findByPlanPlanIdAndSubmitterUserIdAndStatus(Long planId, Long submitterUserId, SubmissionStatus status);
+
+    int countByPlanPlanIdAndStatus(Long planId, SubmissionStatus status);
+
+    // 특정 과제에 제출한 고유 제출자 수 조회 (미제출자 계산용)
+    @Query("SELECT COUNT(DISTINCT a.submitter.userId) FROM AssignmentSubmission a WHERE a.plan.planId = :planId")
+    int countDistinctSubmittersByPlanId(@Param("planId") Long planId);
+
 }