Skip to content

Commit 226ea2b

Browse files
committed
Fix: /api/upload 요청 시 groupId 포함하여 리턴
1 parent 5399b5a commit 226ea2b

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎src/main/java/Codify/upload/service/ProcessingService.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void addFileUploadToGroup(Long assignmentId, Long submissionId) {
5353
//마지막 파일
5454
//group의 status를 COMPLETED로 변경 후 디비에 저장
5555
@Transactional
56-
public void addLastFileToGroup(Long assignmentId, Long submissionId) {
56+
public String addLastFileToGroup(Long assignmentId, Long submissionId) {
5757
addFileUploadToGroup(assignmentId, submissionId);
5858

5959
Optional<ProcessingGroup> lastUploadGroup = processingRepository.findGroupByAssignmentId(assignmentId);
@@ -68,6 +68,7 @@ public void addLastFileToGroup(Long assignmentId, Long submissionId) {
6868

6969
//group 객체로 메시지 생성
7070
MessageDto message = toProcessingMessage(group);
71+
String groupId = message.getGroupId();
7172

7273
//커밋 후 메시지 전송
7374
TransactionSynchronizationManager.registerSynchronization(
@@ -85,9 +86,10 @@ public void afterCommit() {
8586
}
8687
);
8788

88-
89+
return groupId;
8990
}
9091
}
92+
return null;
9193
}
9294

9395

‎src/main/java/Codify/upload/service/UploadService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class UploadService {
1616
private final ProcessingService processingService;
1717

1818
@Transactional
19-
public void saveUpload(SubmissionDto dto) {
19+
public String saveUpload(SubmissionDto dto) {
2020
final Submission submission = Submission.builder()
2121
.assignmentId(dto.getAssignmentId())
2222
.fileName(dto.getFileName())
@@ -34,10 +34,10 @@ public void saveUpload(SubmissionDto dto) {
3434
//마지막 파일이 아니라면
3535
if (!isLastFile) {
3636
processingService.addFileUploadToGroup(submission.getAssignmentId(),submission.getSubmissionId());
37+
return null; // 마지막 파일이 아니면 groupId 없음
3738
} else {
3839
//마지막 파일이라면
39-
processingService.addLastFileToGroup(submission.getAssignmentId(), submission.getSubmissionId());
40+
return processingService.addLastFileToGroup(submission.getAssignmentId(), submission.getSubmissionId());
4041
}
41-
4242
}
4343
}

‎src/main/java/Codify/upload/web/controller/UploadController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public class UploadController {
1717
private final UploadService uploadService;
1818

1919
@PostMapping
20-
public ResponseEntity<Void> save(@RequestBody SubmissionDto submissiondto) {
21-
uploadService.saveUpload(submissiondto);
22-
return ResponseEntity.ok().build();
20+
public ResponseEntity<String> save(@RequestBody SubmissionDto submissiondto) {
21+
String groupId = uploadService.saveUpload(submissiondto);
22+
return ResponseEntity.ok(groupId);
2323
}
2424
}

0 commit comments

Comments
 (0)