Skip to content

Commit 1f06a62

Browse files
committed
return to-review in endpoint, update progress
1 parent 51bbe40 commit 1f06a62

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

springAssignmentSystem/backend/SpringAssignmentSystem/src/main/java/com/yen/SpringAssignmentSystem/controller/AssignmentController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ public ResponseEntity<?> getToReviewAssignments(@AuthenticationPrincipal User us
8181
ListUtil list_util = new ListUtil();
8282
List<Assignment> submittedAssignment = assignmentService.findByStatus("Submitted");
8383
List<Assignment> inReviewAssignment = assignmentService.findByStatus("In Review");
84-
List<Assignment> merge = list_util.mergeList(submittedAssignment, inReviewAssignment);
84+
List<Assignment> needsUpdateAssignment = assignmentService.findByStatus("Needs Update");
85+
List<Assignment> _merge = list_util.mergeList(submittedAssignment, inReviewAssignment);
86+
List<Assignment> merge = list_util.mergeList(_merge, needsUpdateAssignment);
8587
return ResponseEntity.ok(merge);
8688
}
8789

springAssignmentSystem/doc/progress.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,7 @@
9191
- 20231009
9292
- https://youtu.be/utXVb3R1yuE?si=zbKXVhG7VMa214L4
9393
- https://youtu.be/iYchh7v7P1Q?si=mDFJUFlhijuH83CN
94+
- https://youtu.be/SOyfQCsOvO4?si=HsjKAdQBiflZHORp
95+
96+
- 20231010
9497
- https://youtu.be/SOyfQCsOvO4?si=HsjKAdQBiflZHORp

0 commit comments

Comments
 (0)