From 1d2fa8876eb065c6049d77cef963dac2b9009be2 Mon Sep 17 00:00:00 2001
From: hong-sile <gurwns9325@naver.com>
Date: Wed, 11 Oct 2023 16:38:58 +0900
Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=EB=B9=84=ED=81=AC=EB=A3=A8?=
 =?UTF-8?q?=EC=9D=B8=EC=9B=90=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20studyLog,=20?=
 =?UTF-8?q?=EB=A1=9C=EB=93=9C=EB=A7=B5=20=EB=8B=B5=EB=B3=80,=20comment=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1=20=EB=A7=89=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prolog/roadmap/application/EssayAnswerService.java |  9 +++++++++
 .../prolog/studylog/application/CommentService.java    |  9 +++++++++
 .../prolog/studylog/application/StudylogService.java   | 10 ++++++++++
 3 files changed, 28 insertions(+)

diff --git a/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java b/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java
index 5102e0629..aa6b74f22 100644
--- a/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java
+++ b/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java
@@ -1,6 +1,7 @@
 package wooteco.prolog.roadmap.application;
 
 import static wooteco.prolog.common.exception.BadRequestCode.ESSAY_ANSWER_NOT_FOUND_EXCEPTION;
+import static wooteco.prolog.common.exception.BadRequestCode.MEMBER_NOT_ALLOWED;
 import static wooteco.prolog.common.exception.BadRequestCode.ROADMAP_QUIZ_NOT_FOUND_EXCEPTION;
 
 import org.hibernate.Hibernate;
@@ -10,6 +11,7 @@
 import wooteco.prolog.common.exception.BadRequestException;
 import wooteco.prolog.member.application.MemberService;
 import wooteco.prolog.member.domain.Member;
+import wooteco.prolog.member.domain.Role;
 import wooteco.prolog.roadmap.application.dto.EssayAnswerRequest;
 import wooteco.prolog.roadmap.application.dto.EssayAnswerUpdateRequest;
 import wooteco.prolog.roadmap.domain.EssayAnswer;
@@ -43,12 +45,19 @@ public Long createEssayAnswer(EssayAnswerRequest essayAnswerRequest, Long member
             .orElseThrow(() -> new BadRequestException(ROADMAP_QUIZ_NOT_FOUND_EXCEPTION));
 
         Member member = memberService.findById(memberId);
+        validateMemberIsCrew(member);
         EssayAnswer essayAnswer = new EssayAnswer(quiz, essayAnswerRequest.getAnswer(), member);
         essayAnswerRepository.save(essayAnswer);
 
         return essayAnswer.getId();
     }
 
+    private void validateMemberIsCrew(final Member member) {
+        if (member.hasLowerImportanceRoleThan(Role.CREW)) {
+            throw new BadRequestException(MEMBER_NOT_ALLOWED);
+        }
+    }
+
     @Transactional
     public void updateEssayAnswer(Long answerId, EssayAnswerUpdateRequest request, Long memberId) {
         EssayAnswer essayAnswer = getById(answerId);
diff --git a/backend/src/main/java/wooteco/prolog/studylog/application/CommentService.java b/backend/src/main/java/wooteco/prolog/studylog/application/CommentService.java
index b0a818ab7..4ed007288 100644
--- a/backend/src/main/java/wooteco/prolog/studylog/application/CommentService.java
+++ b/backend/src/main/java/wooteco/prolog/studylog/application/CommentService.java
@@ -1,6 +1,7 @@
 package wooteco.prolog.studylog.application;
 
 import static wooteco.prolog.common.exception.BadRequestCode.COMMENT_NOT_FOUND;
+import static wooteco.prolog.common.exception.BadRequestCode.MEMBER_NOT_ALLOWED;
 import static wooteco.prolog.common.exception.BadRequestCode.MEMBER_NOT_FOUND;
 import static wooteco.prolog.common.exception.BadRequestCode.STUDYLOG_NOT_FOUND;
 
@@ -11,6 +12,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import wooteco.prolog.common.exception.BadRequestException;
 import wooteco.prolog.member.domain.Member;
+import wooteco.prolog.member.domain.Role;
 import wooteco.prolog.member.domain.repository.MemberRepository;
 import wooteco.prolog.studylog.application.dto.CommentResponse;
 import wooteco.prolog.studylog.application.dto.CommentSaveRequest;
@@ -33,6 +35,7 @@ public class CommentService {
     public Long insertComment(CommentSaveRequest request) {
         Member findMember = memberRepository.findById(request.getMemberId())
             .orElseThrow(() -> new BadRequestException(MEMBER_NOT_FOUND));
+        validateMemberIsCrew(findMember);
         Studylog findStudylog = studylogRepository.findById(request.getStudylogId())
             .orElseThrow(() -> new BadRequestException(STUDYLOG_NOT_FOUND));
 
@@ -41,6 +44,12 @@ public Long insertComment(CommentSaveRequest request) {
         return commentRepository.save(comment).getId();
     }
 
+    private void validateMemberIsCrew(final Member member) {
+        if (member.hasLowerImportanceRoleThan(Role.CREW)) {
+            throw new BadRequestException(MEMBER_NOT_ALLOWED);
+        }
+    }
+
     @Transactional(readOnly = true)
     public CommentsResponse findComments(Long studylogId) {
         Studylog findStudylog = studylogRepository.findById(studylogId)
diff --git a/backend/src/main/java/wooteco/prolog/studylog/application/StudylogService.java b/backend/src/main/java/wooteco/prolog/studylog/application/StudylogService.java
index edf5a0cc3..6e321724b 100644
--- a/backend/src/main/java/wooteco/prolog/studylog/application/StudylogService.java
+++ b/backend/src/main/java/wooteco/prolog/studylog/application/StudylogService.java
@@ -4,6 +4,7 @@
 import static java.time.temporal.TemporalAdjusters.lastDayOfMonth;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
+import static wooteco.prolog.common.exception.BadRequestCode.MEMBER_NOT_ALLOWED;
 import static wooteco.prolog.common.exception.BadRequestCode.STUDYLOG_ARGUMENT;
 import static wooteco.prolog.common.exception.BadRequestCode.STUDYLOG_DOCUMENT_NOT_FOUND;
 import static wooteco.prolog.common.exception.BadRequestCode.STUDYLOG_NOT_FOUND;
@@ -24,11 +25,13 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import wooteco.prolog.common.exception.BadRequestCode;
 import wooteco.prolog.common.exception.BadRequestException;
 import wooteco.prolog.login.ui.LoginMember;
 import wooteco.prolog.member.application.MemberService;
 import wooteco.prolog.member.application.MemberTagService;
 import wooteco.prolog.member.domain.Member;
+import wooteco.prolog.member.domain.Role;
 import wooteco.prolog.session.application.MissionService;
 import wooteco.prolog.session.application.SessionService;
 import wooteco.prolog.session.domain.Mission;
@@ -93,6 +96,7 @@ public List<StudylogResponse> insertStudylogs(Long memberId,
     @Transactional
     public StudylogResponse insertStudylog(Long memberId, StudylogRequest studylogRequest) {
         Member member = memberService.findById(memberId);
+        validateMemberIsCrew(member);
         Tags tags = tagService.findOrCreate(studylogRequest.getTags());
         Session session = sessionService.findSessionById(studylogRequest.getSessionId())
             .orElse(null);
@@ -113,6 +117,12 @@ public StudylogResponse insertStudylog(Long memberId, StudylogRequest studylogRe
         return StudylogResponse.of(persistStudylog);
     }
 
+    private void validateMemberIsCrew(final Member member) {
+        if (member.hasLowerImportanceRoleThan(Role.CREW)) {
+            throw new BadRequestException(MEMBER_NOT_ALLOWED);
+        }
+    }
+
     @Transactional
     public StudylogTempResponse insertStudylogTemp(Long memberId, StudylogRequest studylogRequest) {
         StudylogTemp createdStudylogTemp = creteStudylogTemp(memberId, studylogRequest);

From cafca779b9b350feb696a372b9ac473e3e7dbf4a Mon Sep 17 00:00:00 2001
From: hae-on <solbi2004@naver.com>
Date: Wed, 11 Oct 2023 17:07:31 +0900
Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20navbar&=ED=95=99=EC=8A=B5?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EA=B6=8C=ED=95=9C=20=EC=9E=88=EB=8A=94=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EB=A7=8C=20=EA=B8=80=EC=93=B0?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/NavBar/NavBar.tsx     | 5 +++--
 frontend/src/pages/StudylogListPage/index.tsx | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/NavBar/NavBar.tsx b/frontend/src/components/NavBar/NavBar.tsx
index 6bfe8ac09..a4c727771 100644
--- a/frontend/src/components/NavBar/NavBar.tsx
+++ b/frontend/src/components/NavBar/NavBar.tsx
@@ -50,7 +50,8 @@ const NavBar = () => {
 
   const { user, onLogout } = useContext(UserContext);
 
-  const { username, imageUrl: userImage = NoProfileImage, isLoggedIn } = user;
+  const { username, imageUrl: userImage = NoProfileImage, isLoggedIn, role } = user;
+  const authorized = isLoggedIn && role !== 'GUEST';
 
   const [isDropdownToggled, setDropdownToggled] = useState(false);
   const [isWritingDropdownToggled, setWritingDropdownToggled] = useState(false);
@@ -118,7 +119,7 @@ const NavBar = () => {
               </NavLink>
             ))}
           </Navigation>
-          {isLoggedIn ? (
+          {authorized ? (
             <>
               <Link to={PATH.NEW_STUDYLOG}>
                 <Button
diff --git a/frontend/src/pages/StudylogListPage/index.tsx b/frontend/src/pages/StudylogListPage/index.tsx
index 401c41200..3d5345cfb 100644
--- a/frontend/src/pages/StudylogListPage/index.tsx
+++ b/frontend/src/pages/StudylogListPage/index.tsx
@@ -47,8 +47,9 @@ const StudylogListPage = (): JSX.Element => {
   const search = new URLSearchParams(history.location.search).get('keyword');
 
   const { user } = useContext(UserContext);
-  const { isLoggedIn, accessToken } = user;
+  const { isLoggedIn, role, accessToken } = user;
 
+  const authorized = isLoggedIn && role !== 'GUEST';
   const { response: studylogs, getAllData: getStudylogs } = useStudylog([]);
 
   const [filters] = useFetch([], requestGetFilters);
@@ -185,7 +186,7 @@ const StudylogListPage = (): JSX.Element => {
               onResetFilter={resetFilter}
             />
           </FilterListWrapper>
-          {isLoggedIn && (
+          {authorized && (
             <Button
               type="button"
               size="SMALL"

From f6aa9ee8abb0efa2848e24f5e3f2b19df2343d88 Mon Sep 17 00:00:00 2001
From: hong-sile <gurwns9325@naver.com>
Date: Wed, 11 Oct 2023 17:07:54 +0900
Subject: [PATCH 3/8] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 로그인한 사용자의 권한을 crew로 변경
---
 .../resources/wooteco/prolog/article.feature          |  1 -
 .../java/wooteco/prolog/Documentation.java            | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/backend/src/acceptanceTest/resources/wooteco/prolog/article.feature b/backend/src/acceptanceTest/resources/wooteco/prolog/article.feature
index 50026d76e..ad5dfce3c 100644
--- a/backend/src/acceptanceTest/resources/wooteco/prolog/article.feature
+++ b/backend/src/acceptanceTest/resources/wooteco/prolog/article.feature
@@ -13,7 +13,6 @@ Feature: 아티클 관련 기능
 #        When 아티클을 전체 조회 하면
 #        Then 아티클이 전체 조회 된다
 
-
   Scenario: 아티클을 수정하기
     Given 아티클을 여러개 작성하고
     When 1번 아티클을 수정하면
diff --git a/backend/src/documentation/java/wooteco/prolog/Documentation.java b/backend/src/documentation/java/wooteco/prolog/Documentation.java
index 60b90313f..09da9ae88 100644
--- a/backend/src/documentation/java/wooteco/prolog/Documentation.java
+++ b/backend/src/documentation/java/wooteco/prolog/Documentation.java
@@ -8,7 +8,9 @@
 
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
 import io.restassured.specification.RequestSpecification;
+import java.util.HashMap;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +47,15 @@ public void setUp(RestDocumentationContextProvider restDocumentation) {
             .then().log().all()
             .extract().body().as(TokenResponse.class);
 
+        HashMap<String, Object> data = new HashMap<>();
+        data.put("role", "CREW");
+
+        final RequestSpecification requestSpecification = RestAssured
+            .given().log().all()
+            .body(data).contentType(ContentType.JSON)
+            .auth().oauth2(로그인_사용자.getAccessToken());
+        requestSpecification.patch("/members/" + 1 + "/role");
+
         this.spec = new RequestSpecBuilder()
             .addFilter(documentationConfiguration(restDocumentation))
             .build();

From 5ffec304ed75155f21d6e18debcb4ebc1fe7758e Mon Sep 17 00:00:00 2001
From: hong-sile <gurwns9325@naver.com>
Date: Wed, 11 Oct 2023 17:19:57 +0900
Subject: [PATCH 4/8] =?UTF-8?q?refactor:=20EssayAnswerService=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20validate=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roadmap/application/EssayAnswerService.java      | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java b/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java
index aa6b74f22..efe1c2aac 100644
--- a/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java
+++ b/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java
@@ -1,9 +1,9 @@
 package wooteco.prolog.roadmap.application;
 
 import static wooteco.prolog.common.exception.BadRequestCode.ESSAY_ANSWER_NOT_FOUND_EXCEPTION;
-import static wooteco.prolog.common.exception.BadRequestCode.MEMBER_NOT_ALLOWED;
 import static wooteco.prolog.common.exception.BadRequestCode.ROADMAP_QUIZ_NOT_FOUND_EXCEPTION;
 
+import java.util.List;
 import org.hibernate.Hibernate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,7 +11,6 @@
 import wooteco.prolog.common.exception.BadRequestException;
 import wooteco.prolog.member.application.MemberService;
 import wooteco.prolog.member.domain.Member;
-import wooteco.prolog.member.domain.Role;
 import wooteco.prolog.roadmap.application.dto.EssayAnswerRequest;
 import wooteco.prolog.roadmap.application.dto.EssayAnswerUpdateRequest;
 import wooteco.prolog.roadmap.domain.EssayAnswer;
@@ -19,8 +18,6 @@
 import wooteco.prolog.roadmap.domain.repository.EssayAnswerRepository;
 import wooteco.prolog.roadmap.domain.repository.QuizRepository;
 
-import java.util.List;
-
 @Transactional
 @Service
 public class EssayAnswerService {
@@ -45,19 +42,12 @@ public Long createEssayAnswer(EssayAnswerRequest essayAnswerRequest, Long member
             .orElseThrow(() -> new BadRequestException(ROADMAP_QUIZ_NOT_FOUND_EXCEPTION));
 
         Member member = memberService.findById(memberId);
-        validateMemberIsCrew(member);
         EssayAnswer essayAnswer = new EssayAnswer(quiz, essayAnswerRequest.getAnswer(), member);
         essayAnswerRepository.save(essayAnswer);
 
         return essayAnswer.getId();
     }
 
-    private void validateMemberIsCrew(final Member member) {
-        if (member.hasLowerImportanceRoleThan(Role.CREW)) {
-            throw new BadRequestException(MEMBER_NOT_ALLOWED);
-        }
-    }
-
     @Transactional
     public void updateEssayAnswer(Long answerId, EssayAnswerUpdateRequest request, Long memberId) {
         EssayAnswer essayAnswer = getById(answerId);

From 88c40bd8631c4879506743bc04581543a24a1b54 Mon Sep 17 00:00:00 2001
From: hae-on <solbi2004@naver.com>
Date: Wed, 11 Oct 2023 17:40:41 +0900
Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=EC=A2=8B=EC=95=84=EC=9A=94&?=
 =?UTF-8?q?=EB=B6=81=EB=A7=88=ED=81=AC=20=EB=B2=84=ED=8A=BC=20=EB=B9=84?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=9C=20api=20=EC=95=88?=
 =?UTF-8?q?=EA=B0=80=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Article/Article.tsx | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Article/Article.tsx b/frontend/src/components/Article/Article.tsx
index 64a9c7457..7c0cf3c69 100644
--- a/frontend/src/components/Article/Article.tsx
+++ b/frontend/src/components/Article/Article.tsx
@@ -1,7 +1,7 @@
 import * as Styled from './Article.style';
 import type { ArticleType } from '../../models/Article';
 import Scrap from '../Reaction/Scrap';
-import { useRef, useState } from 'react';
+import { useContext, useRef, useState } from 'react';
 import {
   usePostArticleViewsMutation,
   usePutArticleBookmarkMutation,
@@ -9,6 +9,7 @@ import {
 } from '../../hooks/queries/article';
 import debounce from '../../utils/debounce';
 import Like from '../Reaction/Like';
+import { UserContext } from '../../contexts/UserProvider';
 
 const Article = ({
   id,
@@ -28,10 +29,18 @@ const Article = ({
   const { mutate: putLike } = usePutArticleLikeMutation();
   const { mutate: postViews } = usePostArticleViewsMutation();
 
+  const { user } = useContext(UserContext);
+  const { isLoggedIn } = user;
+
   const toggleBookmark: React.MouseEventHandler<HTMLButtonElement> = (e) => {
     e.preventDefault();
     e.stopPropagation();
 
+    if (!isLoggedIn) {
+      alert('로그인을 해주세요');
+      return;
+    }
+
     bookmarkRef.current = !bookmarkRef.current;
     setBookmark((prev) => !prev);
 
@@ -44,6 +53,11 @@ const Article = ({
     e.preventDefault();
     e.stopPropagation();
 
+    if (!isLoggedIn) {
+      alert('로그인을 해주세요');
+      return;
+    }
+
     likeRef.current = !likeRef.current;
     setLike((prev) => !prev);
 

From 3c9ee5ea96b41a78ca056da295f25e0d5e523f16 Mon Sep 17 00:00:00 2001
From: hong-sile <gurwns9325@naver.com>
Date: Wed, 11 Oct 2023 17:42:53 +0900
Subject: [PATCH 6/8] =?UTF-8?q?feat:=20EssayAnswer=20=EC=9E=91=EC=84=B1=20?=
 =?UTF-8?q?=EC=8B=9C=20=EB=B9=84=ED=81=AC=EB=A3=A8=EC=9D=B8=EC=9B=90?=
 =?UTF-8?q?=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20=EC=98=88=EC=99=B8=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prolog/roadmap/application/EssayAnswerService.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java b/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java
index d87e08d6d..1b2943dc4 100644
--- a/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java
+++ b/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java
@@ -2,6 +2,7 @@
 
 import static wooteco.prolog.common.exception.BadRequestCode.CURRICULUM_NOT_FOUND_EXCEPTION;
 import static wooteco.prolog.common.exception.BadRequestCode.ESSAY_ANSWER_NOT_FOUND_EXCEPTION;
+import static wooteco.prolog.common.exception.BadRequestCode.MEMBER_NOT_ALLOWED;
 import static wooteco.prolog.common.exception.BadRequestCode.ROADMAP_QUIZ_NOT_FOUND_EXCEPTION;
 import static wooteco.prolog.common.exception.BadRequestCode.ROADMAP_SESSION_NOT_FOUND_EXCEPTION;
 
@@ -16,6 +17,7 @@
 import wooteco.prolog.common.exception.BadRequestException;
 import wooteco.prolog.member.application.MemberService;
 import wooteco.prolog.member.domain.Member;
+import wooteco.prolog.member.domain.Role;
 import wooteco.prolog.roadmap.application.dto.EssayAnswerRequest;
 import wooteco.prolog.roadmap.application.dto.EssayAnswerSearchRequest;
 import wooteco.prolog.roadmap.application.dto.EssayAnswerUpdateRequest;
@@ -61,12 +63,19 @@ public Long createEssayAnswer(EssayAnswerRequest essayAnswerRequest, Long member
             .orElseThrow(() -> new BadRequestException(ROADMAP_QUIZ_NOT_FOUND_EXCEPTION));
 
         Member member = memberService.findById(memberId);
+        validateMemberIsCrew(member);
         EssayAnswer essayAnswer = new EssayAnswer(quiz, essayAnswerRequest.getAnswer(), member);
         essayAnswerRepository.save(essayAnswer);
 
         return essayAnswer.getId();
     }
 
+    private void validateMemberIsCrew(final Member member) {
+        if (member.hasLowerImportanceRoleThan(Role.CREW)) {
+            throw new BadRequestException(MEMBER_NOT_ALLOWED);
+        }
+    }
+
     @Transactional
     public void updateEssayAnswer(Long answerId, EssayAnswerUpdateRequest request, Long memberId) {
         EssayAnswer essayAnswer = getById(answerId);

From 4e1e43ffbf5e4c5f57191a7c8eb42febc6152c0b Mon Sep 17 00:00:00 2001
From: hong-sile <gurwns9325@naver.com>
Date: Wed, 11 Oct 2023 17:52:30 +0900
Subject: [PATCH 7/8] =?UTF-8?q?test:=20essayAnswerService=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prolog/roadmap/application/EssayAnswerServiceTest.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java b/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java
index 1f4a12766..1da29ad60 100644
--- a/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java
+++ b/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java
@@ -22,6 +22,7 @@
 import wooteco.prolog.common.exception.BadRequestException;
 import wooteco.prolog.member.application.MemberService;
 import wooteco.prolog.member.domain.Member;
+import wooteco.prolog.member.domain.Role;
 import wooteco.prolog.roadmap.application.dto.EssayAnswerRequest;
 import wooteco.prolog.roadmap.application.dto.EssayAnswerUpdateRequest;
 import wooteco.prolog.roadmap.domain.EssayAnswer;
@@ -75,7 +76,7 @@ void createEssayAnswer() {
         when(quizRepository.findById(anyLong())).thenReturn(
             Optional.of(new Quiz(null, "question")));
         when(memberService.findById(anyLong())).thenReturn(
-            new Member(null, null, null, null, null));
+            new Member(null, null, Role.CREW, null, null));
 
         //when
         final Long essayAnswer = essayAnswerService.createEssayAnswer(ESSAY_ANSWER_REQUEST, 1L);

From e21d4372f09368a3fc2987b416aca1247c089cb4 Mon Sep 17 00:00:00 2001
From: hong-sile <gurwns9325@naver.com>
Date: Wed, 11 Oct 2023 17:56:39 +0900
Subject: [PATCH 8/8] =?UTF-8?q?test:=20studyLog=20=EC=97=AC=EB=9F=AC?=
 =?UTF-8?q?=EA=B0=9C=20=EC=9E=85=EB=A0=A5=ED=95=98=EB=8A=94=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/StudylogServiceTest.java      | 186 +++++++++++-------
 1 file changed, 114 insertions(+), 72 deletions(-)

diff --git a/backend/src/test/java/wooteco/prolog/studylog/application/StudylogServiceTest.java b/backend/src/test/java/wooteco/prolog/studylog/application/StudylogServiceTest.java
index e3cede2d0..7663ba901 100644
--- a/backend/src/test/java/wooteco/prolog/studylog/application/StudylogServiceTest.java
+++ b/backend/src/test/java/wooteco/prolog/studylog/application/StudylogServiceTest.java
@@ -1,5 +1,33 @@
 package wooteco.prolog.studylog.application;
 
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static wooteco.prolog.common.exception.BadRequestCode.ONLY_AUTHOR_CAN_EDIT;
+import static wooteco.prolog.common.exception.BadRequestCode.STUDYLOG_ARGUMENT;
+import static wooteco.prolog.common.exception.BadRequestCode.STUDYLOG_NOT_FOUND;
+
+import java.lang.reflect.Field;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -14,7 +42,6 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
-import wooteco.prolog.common.exception.BadRequestCode;
 import wooteco.prolog.common.exception.BadRequestException;
 import wooteco.prolog.login.ui.LoginMember;
 import wooteco.prolog.member.application.MemberService;
@@ -53,33 +80,6 @@
 import wooteco.prolog.studylog.domain.repository.dto.CommentCount;
 import wooteco.prolog.studylog.event.StudylogDeleteEvent;
 
-import java.lang.reflect.Field;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static wooteco.prolog.common.exception.BadRequestCode.*;
-
 @ExtendWith(MockitoExtension.class)
 class StudylogServiceTest {
 
@@ -119,8 +119,10 @@ class insertStudylog {
         Tags tags = Tags.of(singletonList("스터디로그"));
         Member member = new Member(1L, "김동해", "오션", Role.CREW, 1L, "image");
         List<TagRequest> tagRequests = singletonList(new TagRequest("스터디로그"));
-        StudylogRequest studylogRequest = new StudylogRequest(title, content, null, null, tagRequests);
-        Studylog studylog = new Studylog(member, studylogRequest.getTitle(), studylogRequest.getContent(), null, null, tags.getList());
+        StudylogRequest studylogRequest = new StudylogRequest(title, content, null, null,
+            tagRequests);
+        Studylog studylog = new Studylog(member, studylogRequest.getTitle(),
+            studylogRequest.getContent(), null, null, tags.getList());
         List<TagResponse> expectedTagResponses = singletonList(new TagResponse(null, "스터디로그"));
 
         @DisplayName("StudyLogTemp가 존재할 경우 삭제하고, 스터디로그를 정상적으로 생성하고 반환한다.")
@@ -139,7 +141,8 @@ void insertStudylog_existStudyLogTemp() {
             assertAll(() -> {
                 assertThat(studylogResponse.getTitle()).isEqualTo(title);
                 assertThat(studylogResponse.getContent()).isEqualTo(content);
-                assertThat(studylogResponse.getTags()).usingRecursiveComparison().isEqualTo(expectedTagResponses);
+                assertThat(studylogResponse.getTags()).usingRecursiveComparison()
+                    .isEqualTo(expectedTagResponses);
                 verify(studylogTempRepository, times(1)).deleteByMemberId(1L);
             });
         }
@@ -160,7 +163,8 @@ void insertStudylog_notExistStudyLogTemp() {
             assertAll(() -> {
                 assertThat(studylogResponse.getTitle()).isEqualTo(title);
                 assertThat(studylogResponse.getContent()).isEqualTo(content);
-                assertThat(studylogResponse.getTags()).usingRecursiveComparison().isEqualTo(expectedTagResponses);
+                assertThat(studylogResponse.getTags()).usingRecursiveComparison()
+                    .isEqualTo(expectedTagResponses);
                 verify(studylogTempRepository, never()).deleteByMemberId(1L);
             });
         }
@@ -176,8 +180,10 @@ class insertStudylogTemp {
         Member member = new Member(1L, "문채원", "라온", Role.CREW, 1L, "image");
         List<TagRequest> tagRequests = singletonList(new TagRequest("스터디로그"));
         List<TagResponse> tagResponses = singletonList(new TagResponse(null, "스터디로그"));
-        StudylogRequest studylogRequest = new StudylogRequest(title, content, null, null, tagRequests);
-        StudylogTemp studylogTemp = new StudylogTemp(member, studylogRequest.getTitle(), studylogRequest.getContent(), null, null, tags.getList());
+        StudylogRequest studylogRequest = new StudylogRequest(title, content, null, null,
+            tagRequests);
+        StudylogTemp studylogTemp = new StudylogTemp(member, studylogRequest.getTitle(),
+            studylogRequest.getContent(), null, null, tags.getList());
 
         @DisplayName("StudyLogTemp가 존재하지 않는 경우 삭제하고, 임시 스터디로그를 정상적으로 생성하고 반환한다.")
         @Test
@@ -189,13 +195,15 @@ void insertStudylogTemp_existStudylogTemp() {
             when(studylogTempRepository.existsByMemberId(1L)).thenReturn(true);
 
             // when
-            StudylogTempResponse studylogTempResponse = studylogService.insertStudylogTemp(1L, studylogRequest);
+            StudylogTempResponse studylogTempResponse = studylogService.insertStudylogTemp(1L,
+                studylogRequest);
 
             // then
             assertAll(() -> {
                 assertThat(studylogTempResponse.getTitle()).isEqualTo(title);
                 assertThat(studylogTempResponse.getContent()).isEqualTo(content);
-                assertThat(studylogTempResponse.getTags()).usingRecursiveComparison().isEqualTo(tagResponses);
+                assertThat(studylogTempResponse.getTags()).usingRecursiveComparison()
+                    .isEqualTo(tagResponses);
                 verify(studylogTempRepository, times(1)).deleteByMemberId(1L);
             });
         }
@@ -210,15 +218,16 @@ void insertStudylogTemp_notExistStudylogTemp() {
             when(studylogTempRepository.save(any())).thenReturn(studylogTemp);
             when(studylogTempRepository.existsByMemberId(1L)).thenReturn(false);
 
-
             // when
-            StudylogTempResponse studylogTempResponse = studylogService.insertStudylogTemp(1L, studylogRequest);
+            StudylogTempResponse studylogTempResponse = studylogService.insertStudylogTemp(1L,
+                studylogRequest);
 
             // then
             assertAll(() -> {
                 assertThat(studylogTempResponse.getTitle()).isEqualTo(title);
                 assertThat(studylogTempResponse.getContent()).isEqualTo(content);
-                assertThat(studylogTempResponse.getTags()).usingRecursiveComparison().isEqualTo(tagResponses);
+                assertThat(studylogTempResponse.getTags()).usingRecursiveComparison()
+                    .isEqualTo(tagResponses);
                 verify(studylogTempRepository, never()).deleteByMemberId(1L);
             });
         }
@@ -232,7 +241,8 @@ void findScrapIds() {
         //given
         final Member member = new Member(1L, "hihi", "연어", Role.CREW, 1L, "image");
         final Mission mission = new Mission(1L, "지하철", new Session("BE 레벨2"));
-        final Studylog studylog = new Studylog(member, "짜장면", "먹고싶다", mission, singletonList(new Tag("스프링")));
+        final Studylog studylog = new Studylog(member, "짜장면", "먹고싶다", mission,
+            singletonList(new Tag("스프링")));
         final StudylogScrap scrap = new StudylogScrap(member, studylog);
 
         when(studylogScrapRepository.findByMemberId(anyLong())).thenReturn(singletonList(scrap));
@@ -265,7 +275,8 @@ void findStudylogsWithoutKeyword() {
             1L);
 
         //then
-        verify(studylogRepository, times(1)).findAll((Specification<Studylog>) any(), (Pageable) any());
+        verify(studylogRepository, times(1)).findAll((Specification<Studylog>) any(),
+            (Pageable) any());
     }
 
     @DisplayName("StudylogResponse의 scrap 여부를 설정할 수 있다")
@@ -306,7 +317,9 @@ void insertStudyLogs() {
 
         final Member member = new Member(1L, "hihi", "연어", Role.CREW, 1L, "image");
         final Mission mission = new Mission(1L, "지하철", new Session("BE 레벨2"));
-        when(studylogRepository.save(any())).thenReturn(new Studylog(member, "제목", "내용", mission, emptyList()));
+        when(studylogRepository.save(any())).thenReturn(
+            new Studylog(member, "제목", "내용", mission, emptyList()));
+        when(memberService.findById(any())).thenReturn(member);
         when(tagService.findOrCreate(any())).thenReturn(new Tags(emptyList()));
 
         //when
@@ -332,6 +345,7 @@ void findStudylogById() {
 
     @Nested
     class retrieveStudylogById {
+
         private Studylog studylog;
         private long studyLogId = 1L;
 
@@ -360,14 +374,16 @@ void retrieveStudylogById_anonymous() {
                 .willReturn(Optional.of(studylog));
             final int previousViewCount = studylog.getViewCount();
 
-
             //when
-            final StudylogResponse studylogResponse = studylogService.retrieveStudylogById(loginMember, 1L, false);
+            final StudylogResponse studylogResponse = studylogService.retrieveStudylogById(
+                loginMember, 1L, false);
 
             //then
             assertAll(
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::getViewCount).isEqualTo(previousViewCount + 1),
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::getId).isEqualTo(studyLogId)
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::getViewCount)
+                    .isEqualTo(previousViewCount + 1),
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::getId)
+                    .isEqualTo(studyLogId)
             );
         }
 
@@ -376,7 +392,8 @@ void retrieveStudylogById_anonymous() {
         void retrieveStudylogById_readOtherUserStudylog() {
             //given
             final long otherUserId = 2L;
-            final LoginMember loginMember = new LoginMember(otherUserId, LoginMember.Authority.MEMBER);
+            final LoginMember loginMember = new LoginMember(otherUserId,
+                LoginMember.Authority.MEMBER);
             given(studylogRepository.findById(anyLong()))
                 .willReturn(Optional.of(studylog));
             given(studylogReadRepository.findByMemberIdAndStudylogId(anyLong(), anyLong()))
@@ -389,14 +406,19 @@ void retrieveStudylogById_readOtherUserStudylog() {
             final int previousViewCount = studylog.getViewCount();
 
             //when
-            final StudylogResponse studylogResponse = studylogService.retrieveStudylogById(loginMember, 1L, false);
+            final StudylogResponse studylogResponse = studylogService.retrieveStudylogById(
+                loginMember, 1L, false);
 
             //then
             assertAll(
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::getViewCount).isEqualTo(previousViewCount + 1),
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::getId).isEqualTo(studyLogId),
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::isRead).isEqualTo(true),
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::isScrap).isEqualTo(true)
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::getViewCount)
+                    .isEqualTo(previousViewCount + 1),
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::getId)
+                    .isEqualTo(studyLogId),
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::isRead)
+                    .isEqualTo(true),
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::isScrap)
+                    .isEqualTo(true)
             );
         }
 
@@ -417,14 +439,19 @@ void retrieveStudylogById_readMineStudyLog() {
             final int previousViewCount = studylog.getViewCount();
 
             //when
-            final StudylogResponse studylogResponse = studylogService.retrieveStudylogById(loginMember, 1L, false);
+            final StudylogResponse studylogResponse = studylogService.retrieveStudylogById(
+                loginMember, 1L, false);
 
             //then
             assertAll(
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::getViewCount).isEqualTo(previousViewCount),
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::getId).isEqualTo(studyLogId),
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::isRead).isEqualTo(true),
-                () -> assertThat(studylogResponse).extracting(StudylogResponse::isScrap).isEqualTo(true)
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::getViewCount)
+                    .isEqualTo(previousViewCount),
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::getId)
+                    .isEqualTo(studyLogId),
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::isRead)
+                    .isEqualTo(true),
+                () -> assertThat(studylogResponse).extracting(StudylogResponse::isScrap)
+                    .isEqualTo(true)
             );
         }
     }
@@ -629,14 +656,17 @@ void findStudylogs_responseByRequestIds() {
                 );
 
             //when
-            final StudylogsResponse studylogsResponse = studylogService.findStudylogs(studylogsSearchRequest, 1L);
+            final StudylogsResponse studylogsResponse = studylogService.findStudylogs(
+                studylogsSearchRequest, 1L);
             int oneIndexedParameter = 1;
 
             //then
             assertAll(
-                () -> assertThat(studylogsResponse.getCurrPage()).isEqualTo(requestPage + oneIndexedParameter),
+                () -> assertThat(studylogsResponse.getCurrPage()).isEqualTo(
+                    requestPage + oneIndexedParameter),
                 () -> assertThat(studylogsResponse.getTotalSize()).isEqualTo(findElementCounts),
-                () -> assertThat(studylogsResponse.getTotalPage()).isEqualTo((findElementCounts / pageSize) + 1),
+                () -> assertThat(studylogsResponse.getTotalPage()).isEqualTo(
+                    (findElementCounts / pageSize) + 1),
                 () -> assertThat(studylogsResponse.getData()).hasSize(1)
             );
         }
@@ -677,14 +707,17 @@ void findStudylogs_findBySpecs() {
                 );
 
             //when
-            final StudylogsResponse studylogsResponse = studylogService.findStudylogs(studylogsSearchRequest, 1L);
+            final StudylogsResponse studylogsResponse = studylogService.findStudylogs(
+                studylogsSearchRequest, 1L);
             int oneIndexedParameter = 1;
 
             //then
             assertAll(
-                () -> assertThat(studylogsResponse.getCurrPage()).isEqualTo(requestPage + oneIndexedParameter),
+                () -> assertThat(studylogsResponse.getCurrPage()).isEqualTo(
+                    requestPage + oneIndexedParameter),
                 () -> assertThat(studylogsResponse.getTotalSize()).isEqualTo(findElementCounts),
-                () -> assertThat(studylogsResponse.getTotalPage()).isEqualTo((findElementCounts / pageSize) + 1),
+                () -> assertThat(studylogsResponse.getTotalPage()).isEqualTo(
+                    (findElementCounts / pageSize) + 1),
                 () -> assertThat(studylogsResponse.getData()).hasSize(1)
             );
         }
@@ -708,7 +741,8 @@ void findStudylogs_findByKeyword() {
                 pageableRequest
             );
 
-            given(studylogDocumentService.findBySearchKeyword(any(), any(), any(), any(), any(), any(), any(), any()))
+            given(studylogDocumentService.findBySearchKeyword(any(), any(), any(), any(), any(),
+                any(), any(), any()))
                 .willReturn(StudylogDocumentResponse.of(Arrays.asList(1L), 1, 1, 0));
 
             final int findElementCounts = 1;
@@ -722,14 +756,17 @@ void findStudylogs_findByKeyword() {
                 );
 
             //when
-            final StudylogsResponse studylogsResponse = studylogService.findStudylogs(studylogsSearchRequest, 1L);
+            final StudylogsResponse studylogsResponse = studylogService.findStudylogs(
+                studylogsSearchRequest, 1L);
             int oneIndexedParameter = 1;
 
             //then
             assertAll(
-                () -> assertThat(studylogsResponse.getCurrPage()).isEqualTo(requestPage + oneIndexedParameter),
+                () -> assertThat(studylogsResponse.getCurrPage()).isEqualTo(
+                    requestPage + oneIndexedParameter),
                 () -> assertThat(studylogsResponse.getTotalSize()).isEqualTo(findElementCounts),
-                () -> assertThat(studylogsResponse.getTotalPage()).isEqualTo((findElementCounts / pageSize) + 1),
+                () -> assertThat(studylogsResponse.getTotalPage()).isEqualTo(
+                    (findElementCounts / pageSize) + 1),
                 () -> assertThat(studylogsResponse.getData()).hasSize(1)
             );
         }
@@ -770,7 +807,8 @@ void updateStudylogSession() {
 
         //then
         assertAll(
-            () -> assertEquals(updatedSession.getCurriculumId(), studylog.getSession().getCurriculumId()),
+            () -> assertEquals(updatedSession.getCurriculumId(),
+                studylog.getSession().getCurriculumId()),
             () -> assertEquals(updatedSession.getName(), studylog.getSession().getName())
         );
     }
@@ -922,7 +960,8 @@ void findReadIds() throws NoSuchFieldException, IllegalAccessException {
         }
 
         private Studylog makeStudyLogFor(final long id) {
-            final Studylog idInjectedStudylog = new Studylog(judy, "제목", "내용", session, mission, new ArrayList<>());
+            final Studylog idInjectedStudylog = new Studylog(judy, "제목", "내용", session, mission,
+                new ArrayList<>());
             try {
                 final Field idField = idInjectedStudylog.getClass().getDeclaredField("id");
                 idField.setAccessible(true);
@@ -985,20 +1024,23 @@ void readRssFeeds() {
                 .willReturn(studylogs);
 
             //when
-            List<StudylogRssFeedResponse> studylogRssFeedResponses = studylogService.readRssFeeds("URI");
+            List<StudylogRssFeedResponse> studylogRssFeedResponses = studylogService.readRssFeeds(
+                "URI");
 
             //then
             assertThat(studylogRssFeedResponses).hasSize(50);
         }
 
         private Studylog makeStudylogWithDateFor(final long id) {
-            final Studylog idAndDateInjectedStudylog = new Studylog(judy, "제목", "내용", session, mission, new ArrayList<>());
+            final Studylog idAndDateInjectedStudylog = new Studylog(judy, "제목", "내용", session,
+                mission, new ArrayList<>());
             try {
                 final Field idField = idAndDateInjectedStudylog.getClass().getDeclaredField("id");
                 idField.setAccessible(true);
                 idField.set(idAndDateInjectedStudylog, id);
 
-                final Field createdAtField = idAndDateInjectedStudylog.getClass().getSuperclass().getDeclaredField("createdAt");
+                final Field createdAtField = idAndDateInjectedStudylog.getClass().getSuperclass()
+                    .getDeclaredField("createdAt");
                 createdAtField.setAccessible(true);
                 createdAtField.set(idAndDateInjectedStudylog, LocalDateTime.now());