Merge pull request #282 from codesquad-members-2023-team6/dev

Be: Exception 처리
codesquad-members-2023-team6 · Jun 1, 2023 · 4085867 · 4085867
2 parents d1e89ee + 048d5da
commit 4085867
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/backend/src/main/java/com/team6/issue_tracker/domain/issue/controller/IssueController.java b/backend/src/main/java/com/team6/issue_tracker/domain/issue/controller/IssueController.java
@@ -4,9 +4,11 @@
 import com.team6.issue_tracker.domain.issue.dto.*;
 import com.team6.issue_tracker.domain.issue.service.IssueService;
 import com.team6.issue_tracker.domain.issue.service.IssueUpdateService;
+import com.team6.issue_tracker.domain.issue.service.IssueValidator;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
 @Slf4j
@@ -16,6 +18,11 @@ public class IssueController {
 
     private final IssueService issueService;
     private final IssueUpdateService issueUpdateService;
+    private final IssueValidator issueValidator;
+
+    @InitBinder
+    public void init(WebDataBinder dataBinder) {
+    }
 
     @Operation(
             summary = "이슈 상세 보기",
@@ -34,8 +41,6 @@ public IssueDetail getIssueDetails(@PathVariable("issueIdx") long issueIdx) {
     )
     @PostMapping("/issue")
     public void postNewIssue(@RequestBody CreateIssueRequest request) {
-        //TODO 유저 권한 검사
-        //TODO 유효성 검사
         issueService.saveIssue(request.toIssue());
     }
 
@@ -46,7 +51,6 @@ public void postNewIssue(@RequestBody CreateIssueRequest request) {
     )
     @PatchMapping("/issue")
     public void updateIssuesStatus(UpdateIssueListStatusRequest request) {
-        //TODO 유저 권한 검사
         //TODO 유효성 검사
         issueUpdateService.updateIssueListStatus(request.getIssueIdx(), request.getStatus());
     }
@@ -58,7 +62,6 @@ public void updateIssuesStatus(UpdateIssueListStatusRequest request) {
     )
     @PatchMapping("/issue/{issueIdx}/status")
     public void updateIssuesStatus(@RequestBody UpdateIssueStatusRequest request, @PathVariable("issueIdx") long issueIdx) {
-        //TODO 유저 권한 검사
         //TODO 유효성 검사
         issueUpdateService.updateIssueStatus(issueIdx, request.getStatus());
     }
@@ -70,7 +73,6 @@ public void updateIssuesStatus(@RequestBody UpdateIssueStatusRequest request, @P
     )
     @PatchMapping("/issue/{issueIdx}/title")
     public void updateIssuesTitle(@RequestBody UpdateIssueTitleRequest request, @PathVariable("issueIdx") long issueIdx) {
-        //TODO 유저 권한 검사
         //TODO 유효성 검사
         issueUpdateService.updateIssueTitle(issueIdx, request.getTitle());
     }
@@ -82,7 +84,6 @@ public void updateIssuesTitle(@RequestBody UpdateIssueTitleRequest request, @Pat
     )
     @PatchMapping("/issue/{issueIdx}/assignee")
     public void updateIssuesAssignee(@RequestBody UpdateIssueAssigneeRequest request, @PathVariable("issueIdx") long issueIdx) {
-        //TODO 유저 권한 검사
         //TODO 유효성 검사
         issueUpdateService.updateIssueAssignee(issueIdx, request.getAssigneeIdx());
     }
@@ -94,11 +95,9 @@ public void updateIssuesAssignee(@RequestBody UpdateIssueAssigneeRequest request
     )
     @PutMapping("/issue/{issueId}")
     public void updateIssueContents(IssueDetail issueDetail) {
-        //TODO 유저 권한 검사
         //TODO 유효성 검사
         Issue updatedIssue = issueDetail.fromDto(issueDetail);
         issueUpdateService.updateIssue(updatedIssue);
     }
 
-
 }
diff --git a/backend/src/main/java/com/team6/issue_tracker/domain/issue/dto/CreateIssueRequest.java b/backend/src/main/java/com/team6/issue_tracker/domain/issue/dto/CreateIssueRequest.java
@@ -5,6 +5,7 @@
 import com.team6.issue_tracker.domain.label.dto.LabelSummary;
 import com.team6.issue_tracker.domain.member.domain.Member;
 import com.team6.issue_tracker.domain.milestone.domain.Milestone;
+import com.team6.issue_tracker.domain.milestone.dto.MilestoneDetail;
 import lombok.Data;
 import org.springframework.data.jdbc.core.mapping.AggregateReference;
 
@@ -18,11 +19,10 @@ public class CreateIssueRequest {
     private String contents;
     private Long writer;
     private Long assignee;
-    private List<LabelSummary> labels;
-    private Milestone milestone;
+    private List<LabelSummary> labels = new ArrayList<>();
+    private MilestoneDetail milestone;
 
     public Issue toIssue() {
-
         return Issue.builder()
                 .issueIdx(null)
                 .title(title)
@@ -39,10 +39,8 @@ public Issue toIssue() {
 
     private List<Labeling> getLabelingMap (List<LabelSummary> labels) {
         List<Labeling> labelings= new ArrayList<>();
-        if (!labels.isEmpty()) {
-            labels.stream().map(e -> new Labeling(e.getLabelIdx()))
+        labels.stream().map(e -> new Labeling(e.getLabelIdx()))
                     .forEach(labelings::add);
-        }
         return labelings;
     }
 

diff --git a/backend/src/main/java/com/team6/issue_tracker/domain/milestone/dto/MilestoneDetail.java b/backend/src/main/java/com/team6/issue_tracker/domain/milestone/dto/MilestoneDetail.java
@@ -2,13 +2,17 @@
 
 import com.team6.issue_tracker.domain.milestone.domain.MilestoneWithIssueCount;
 import com.team6.issue_tracker.domain.model.Status;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.time.Instant;
 
 @Getter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class MilestoneDetail {
     private Long milestoneIdx;
     private String title;