[Release] 리뷰미 v2.0.3 배포

woowacourse-teams · Oct 25, 2024 · 4960ca0 · 4960ca0
2 parents 726955d + 64359f5
commit 4960ca0
Show file tree

Hide file tree

Showing 10 changed files with 269 additions and 74 deletions.
diff --git a/backend/src/main/java/reviewme/review/service/mapper/ReviewMapper.java b/backend/src/main/java/reviewme/review/service/mapper/ReviewMapper.java
@@ -15,6 +15,7 @@
 import reviewme.review.service.dto.request.ReviewAnswerRequest;
 import reviewme.review.service.dto.request.ReviewRegisterRequest;
 import reviewme.review.service.exception.ReviewGroupNotFoundByReviewRequestCodeException;
+import reviewme.review.service.exception.SubmittedQuestionNotFoundException;
 import reviewme.reviewgroup.domain.ReviewGroup;
 import reviewme.reviewgroup.repository.ReviewGroupRepository;
 import reviewme.template.domain.Template;
@@ -62,6 +63,10 @@ private List<Answer> getAnswersByQuestionType(ReviewRegisterRequest request) {
     private Answer mapRequestToAnswer(Map<Long, Question> questions, ReviewAnswerRequest answerRequest) {
         Question question = questions.get(answerRequest.questionId());
 
+        if (question == null) {
+            throw new SubmittedQuestionNotFoundException(answerRequest.questionId());
+        }
+
         // TODO: 아래 코드를 삭제해야 한다
         if (question.isSelectable() && answerRequest.selectedOptionIds() != null && answerRequest.selectedOptionIds().isEmpty()) {
             return null;

diff --git a/frontend/src/apis/endpoints.ts b/frontend/src/apis/endpoints.ts
@@ -48,10 +48,17 @@ export const REVIEW_GROUP_DATA_API_PARAMS = {
   },
 };
 
+export const REVIEW_GROUP_API_PARAMS = {
+  queryString: {
+    sectionId: 'sectionId',
+  },
+};
+
 export const REVIEW_WRITING_API_URL = `${serverUrl}/${VERSION2}/${REVIEW_WRITING_API_PARAMS.resource}`;
 export const REVIEW_LIST_API_URL = `${serverUrl}/${VERSION2}/${REVIEW_LIST_API_PARAMS.resource}`;
 export const DETAILED_REVIEW_API_URL = `${serverUrl}/${VERSION2}/${DETAILED_REVIEW_API_PARAMS.resource}`;
 export const REVIEW_GROUP_DATA_API_URL = `${serverUrl}/${VERSION2}/${REVIEW_GROUP_DATA_API_PARAMS.resource}`;
+export const REVIEW_GROUP_API_URL = `${serverUrl}/${VERSION2}/reviews/gather`;
 
 const endPoint = {
   postingReview: `${serverUrl}/${VERSION2}/reviews`,
@@ -70,7 +77,8 @@ const endPoint = {
   gettingReviewGroupData: (reviewRequestCode: string) =>
     `${REVIEW_GROUP_DATA_API_URL}?${REVIEW_GROUP_DATA_API_PARAMS.queryString.reviewRequestCode}=${reviewRequestCode}`,
   gettingSectionList: `${serverUrl}/${VERSION2}/sections`,
-  gettingGroupedReviews: (sectionId: number) => `${serverUrl}/${VERSION2}/reviews/gather?sectionId=${sectionId}`,
+  gettingGroupedReviews: (sectionId: number) =>
+    `${REVIEW_GROUP_API_URL}?${REVIEW_GROUP_API_PARAMS.queryString.sectionId}=${sectionId}`,
   postingHighlight: `${serverUrl}/${VERSION2}/highlight`,
 };
 

diff --git a/frontend/src/components/common/Accordion/styles.ts b/frontend/src/components/common/Accordion/styles.ts
@@ -24,7 +24,6 @@ export const AccordionContainer = styled.div<AccordionStyleProps>`
 
 export const AccordionHeader = styled.div<AccordionStyleProps>`
   display: flex;
-  padding: 1rem;
   border-bottom: ${({ $isOpened, theme }) => $isOpened && `0.1rem solid ${theme.colors.placeholder}`};
 `;
 
@@ -36,7 +35,8 @@ export const AccordionButton = styled.button`
 
   width: 100%;
   height: fit-content;
-  min-height: 3rem;
+  min-height: 5rem;
+  padding: 1rem;
 `;
 
 export const AccordionTitle = styled.p`

diff --git a/frontend/src/components/highlight/components/HighlightEditor/hooks/useHighlight.ts b/frontend/src/components/highlight/components/HighlightEditor/hooks/useHighlight.ts
@@ -1,6 +1,11 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 
-import { EDITOR_ANSWER_CLASS_NAME, HIGHLIGHT_EVENT_NAME, HIGHLIGHT_SPAN_CLASS_NAME } from '@/constants';
+import {
+  EDITOR_ANSWER_CLASS_NAME,
+  HIGHLIGHT_EVENT_NAME,
+  HIGHLIGHT_SPAN_CLASS_NAME,
+  SESSION_STORAGE_KEY,
+} from '@/constants';
 import { EditorAnswerMap, EditorLine, HighlightResponseData, ReviewAnswerResponseData } from '@/types';
 import {
   getEndLineOffset,
@@ -71,13 +76,25 @@ const useHighlight = ({
   handleModalMessage,
 }: UseHighlightProps) => {
   const [editorAnswerMap, setEditorAnswerMap] = useState<EditorAnswerMap>(makeInitialEditorAnswerMap(answerList));
+  const storageKey = `${SESSION_STORAGE_KEY.editorAnswerMap}-${questionId}`;
+
+  useEffect(() => {
+    const item = localStorage.getItem(storageKey);
+    if (item) {
+      setEditorAnswerMap(new Map(JSON.parse(item)) as EditorAnswerMap);
+    }
+  }, []);
 
   // span 클릭 시, 제공되는 형광펜 삭제 기능 타겟
   const [longPressRemovalTarget, setLongPressRemovalTarget] = useState<RemovalTarget | null>(null);
 
   const resetLongPressRemovalTarget = () => setLongPressRemovalTarget(null);
 
-  const updateEditorAnswerMap = (newEditorAnswerMap: EditorAnswerMap) => setEditorAnswerMap(newEditorAnswerMap);
+  const updateEditorAnswerMap = (newEditorAnswerMap: EditorAnswerMap) => {
+    setEditorAnswerMap(newEditorAnswerMap);
+    // editorAnswerMap이 변경될 때 새로운 값을 로컬 스토리지에 저장
+    localStorage.setItem(storageKey, JSON.stringify(Array.from(newEditorAnswerMap)));
+  };
 
   const resetHighlightMenu = () => {
     removeSelection();

diff --git a/frontend/src/components/highlight/components/HighlightEditorContainer/index.tsx b/frontend/src/components/highlight/components/HighlightEditorContainer/index.tsx
@@ -8,7 +8,9 @@ import { ErrorBoundary } from '../../../error';
 import ErrorFallback from '../../../error/ErrorFallback';
 import HighlightEditor, { HighlightEditorProps } from '../HighlightEditor';
 
-const HighlightEditorContainer = (props: Omit<HighlightEditorProps, 'handleErrorModal'>) => {
+interface HighlightEditorContainerProps extends Omit<HighlightEditorProps, 'handleErrorModal' | 'handleModalMessage'> {}
+
+const HighlightEditorContainer = (props: HighlightEditorContainerProps) => {
   const [isOpenErrorModal, setIsOpenErrorModal] = useState(false);
   const [modalMessage, setModalMessage] = useState('');
 

diff --git a/frontend/src/constants/storageKey.ts b/frontend/src/constants/storageKey.ts
@@ -2,3 +2,7 @@ export const LOCAL_STORAGE_KEY = {
   isHighlightEditable: 'isHighlightEditable',
   isHighlightError: 'isHighlightError',
 };
+
+export const SESSION_STORAGE_KEY = {
+  editorAnswerMap: 'editorAnswerMap-question',
+};
diff --git a/frontend/src/mocks/handlers/review.ts b/frontend/src/mocks/handlers/review.ts
@@ -3,6 +3,8 @@ import { http, HttpResponse } from 'msw';
 import endPoint, {
   DETAILED_REVIEW_API_PARAMS,
   DETAILED_REVIEW_API_URL,
+  REVIEW_GROUP_API_PARAMS,
+  REVIEW_GROUP_API_URL,
   REVIEW_WRITING_API_PARAMS,
   REVIEW_WRITING_API_URL,
   VERSION2,
@@ -104,17 +106,23 @@ const getSectionList = () =>
     return authorizeWithCookie(cookies, () => HttpResponse.json(GROUPED_SECTION_MOCK_DATA));
   });
 
-const getGroupedReviews = (sectionId: number) =>
-  http.get(endPoint.gettingGroupedReviews(sectionId), ({ cookies }) => {
-    return authorizeWithCookie(cookies, () => HttpResponse.json(GROUPED_REVIEWS_MOCK_DATA));
+const getGroupedReviews = () => {
+  return http.get(new RegExp(`^${REVIEW_GROUP_API_URL}`), ({ request, cookies }) => {
+    const url = new URL(request.url);
+    const sectionId = url.searchParams.get(REVIEW_GROUP_API_PARAMS.queryString.sectionId);
+    const { length } = GROUPED_REVIEWS_MOCK_DATA;
+    const index = (Number(sectionId) + length) % length;
+
+    return authorizeWithCookie(cookies, () => HttpResponse.json(GROUPED_REVIEWS_MOCK_DATA[index]));
   });
+};
 
 const reviewHandler = [
   getDetailedReview(),
   getReviewList(null, 10),
   getDataToWriteReview(),
   getSectionList(),
-  getGroupedReviews(1),
+  getGroupedReviews(),
   getReviewInfoData(),
   postReview(),
 ];