Merge branch 'dev' into release

codesquad-members-2023-team6 · Jun 2, 2023 · e8ae551 · e8ae551
2 parents 9b7dfd1 + e00d040
commit e8ae551
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 25 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,7 +4,6 @@
 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 com.team6.issue_tracker.domain.member.dto.MemberDetail;
 import com.team6.issue_tracker.global.exception.UpdateDomainFailed;
 import com.team6.issue_tracker.global.util.ResponseMessage;
@@ -16,13 +15,8 @@
 import org.springframework.security.authentication.AuthenticationServiceException;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.util.StringUtils;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.util.Arrays;
 
 @Slf4j
 @RestController
@@ -31,12 +25,6 @@ public class IssueController {
 
     private final IssueService issueService;
     private final IssueUpdateService issueUpdateService;
-    private final IssueValidator validator;
-
-    @InitBinder
-    public void init(WebDataBinder webDataBinder) {
-        webDataBinder.addValidators(validator);
-    }
 
     @Operation(
             summary = "이슈 상세 보기",
@@ -55,14 +43,9 @@ public ResponseEntity<ResponseMessage<IssueDetail>> getIssueDetails(@PathVariabl
             description = "사용자는 새로운 이슈를 작성할 수 있다."
     )
     @PostMapping("/issue")
-    public ResponseEntity<ResponseMessage<Object>> postNewIssue(@Validated @RequestBody CreateIssueRequest request,
-                                                                    BindingResult bindingResult) {
-
-        if (bindingResult.hasErrors()) {
-            throw new IllegalArgumentException("New issue created failed");
-        }
-
+    public ResponseEntity<ResponseMessage<Object>> postNewIssue(@RequestBody CreateIssueRequest request) {
         Issue saveIssue = issueService.saveIssue(request.toIssue());
+
         return ResponseMessage.of(HttpStatus.CREATED, "New issue created successfully", saveIssue);
     }
 

diff --git a/frontend/src/components/Layout/Layout.jsx b/frontend/src/components/Layout/Layout.jsx
@@ -1,5 +1,4 @@
 import { Navbar } from '@components/index';
-import { MY_USER_DATA } from '@src/constants/user';
 import styles from './Layout.module.css';
 import classNames from 'classnames/bind';
 import { storeContext } from '@stores/index';

diff --git a/frontend/src/constants/issue.js b/frontend/src/constants/issue.js
@@ -40,17 +40,17 @@ export const options = Object.freeze([
   Object.freeze({
     index: 1,
     contents: '내가 작성한 이슈',
-    filter: Object.freeze({ writer: MY_USER_DATA.index }),
+    filter: { writer: null },
   }),
   Object.freeze({
     index: 2,
     contents: '나에게 할당된 이슈',
-    filter: Object.freeze({ assignee: MY_USER_DATA.index }),
+    filter: { assignee: null },
   }),
   Object.freeze({
     index: 3,
     contents: '내가 댓글을 남긴 이슈',
-    filter: Object.freeze({ commentBy: MY_USER_DATA.index }),
+    filter: { commentBy: null },
   }),
   Object.freeze({
     index: 4,

diff --git a/frontend/src/containers/IssuePage/IssuePage.jsx b/frontend/src/containers/IssuePage/IssuePage.jsx
@@ -11,6 +11,8 @@ import {
 import { IssueList } from '@containers/index';
 import { isFilterApplied } from '@services/issue';
 import { useNavigate } from 'react-router-dom';
+import { useContext, useReducer } from 'react';
+import { storeContext } from '@stores/index';
 
 export const IssuePage = () => {
   const cx = classNames.bind(styles);
@@ -31,6 +33,26 @@ export const IssuePage = () => {
 
   const navigate = useNavigate();
 
+  const [user, userDispatch] = useContext(storeContext).user;
+
+  const insertLoginUserDataToOptions = (options) => {
+    const memberIdx = user.memberIdx;
+    const copiedOptions = [...options];
+    copiedOptions.forEach((option, i) => {
+      switch (option.index) {
+        case 1:
+          option.filter.writer = memberIdx;
+        case 2:
+          option.filter.writer = memberIdx;
+        case 3:
+          option.filter.commentBy = memberIdx;
+      }
+    });
+    return copiedOptions;
+  };
+
+  const copiedOptions = insertLoginUserDataToOptions(options);
+
   useEffect(() => {
     const noneLabel = {
       title: '레이블이 없는 이슈',
@@ -106,7 +128,7 @@ export const IssuePage = () => {
       <div className={issuePageClassNames}>
         <div className={headerClassNames}>
           <div className={headerLeftClassNames}>
-            <Filterbar options={options}></Filterbar>
+            <Filterbar options={copiedOptions}></Filterbar>
             {isFilterApplied(filters, initialFilter) && (
               <Button {...filterClearButtonInfo} />
             )}

diff --git a/frontend/src/containers/WritePage/WritePage.jsx b/frontend/src/containers/WritePage/WritePage.jsx
@@ -1,6 +1,5 @@
 import { useState, useEffect } from 'react';
 import { Profile, Button } from '@components/index';
-import { MY_USER_DATA } from '@src/constants/user';
 import classNames from 'classnames/bind';
 import styles from './WritePage.module.css';
 import { WriteBox, Sidebox } from '@components/index';