From ab26082cf6d246f01a8c0e2682867ae77e5393c5 Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Tue, 26 Aug 2025 01:06:29 +0900
Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=ED=82=A4=EC=9B=8C=EB=93=9C=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/(my)/my-study-review/page.tsx             | 37 +++++++++++-----
 .../user/ui/more-keyword-review-modal.tsx     | 42 +++++++++++++++++++
 2 files changed, 69 insertions(+), 10 deletions(-)
 create mode 100644 src/entities/user/ui/more-keyword-review-modal.tsx

diff --git a/app/(my)/my-study-review/page.tsx b/app/(my)/my-study-review/page.tsx
index 730daa9d..373cc1d4 100644
--- a/app/(my)/my-study-review/page.tsx
+++ b/app/(my)/my-study-review/page.tsx
@@ -3,6 +3,7 @@
 import Image from 'next/image';
 import { useState } from 'react';
 import KeywordReview from '@/entities/user/ui/keyword-review';
+import MoreKeywordReviewModal from '@/entities/user/ui/more-keyword-review-modal';
 import { MyReviewItem } from '@/features/study/api/types';
 import {
   useMyNegativeKeywordsQuery,
@@ -15,6 +16,7 @@ export default function MyStudyReview() {
   const { data: positiveKeywordsData } = useUserPositiveKeywordsQuery({
     pageSize: 5,
   });
+
   const { data: negativeKeywordsData } = useMyNegativeKeywordsQuery({
     pageSize: 5,
   });
@@ -55,11 +57,7 @@ export default function MyStudyReview() {
             <div className="mb-200 flex justify-between">
               <h3 className="font-designer-16b text-text-default">좋았던 점</h3>
 
-              {positiveKeywords.length > 5 && (
-                <button className="font-designer-12m text-text-subtlest cursor-pointer">
-                  더보기
-                </button>
-              )}
+              {positiveKeywords.length > 5 && <MorePositiveKeywordsModal />}
             </div>
 
             <ul className="flex flex-col gap-50">
@@ -85,11 +83,7 @@ export default function MyStudyReview() {
                 개선이 필요한 점
               </h3>
 
-              {negativeKeywords.length > 5 && (
-                <button className="font-designer-12m text-text-subtlest cursor-pointer">
-                  더보기
-                </button>
-              )}
+              {negativeKeywords.length > 5 && <MoreNegativeKeywordsModal />}
             </div>
 
             <ul className="flex flex-col gap-50">
@@ -153,6 +147,29 @@ export default function MyStudyReview() {
   );
 }
 
+function MorePositiveKeywordsModal() {
+  const { data: allPositiveKeywordsData } = useUserPositiveKeywordsQuery({});
+
+  const allPositiveKeywords = allPositiveKeywordsData.keywords || [];
+
+  return (
+    <MoreKeywordReviewModal title="좋았던 점" keywords={allPositiveKeywords} />
+  );
+}
+
+function MoreNegativeKeywordsModal() {
+  const { data: allNegativeKeywordsData } = useMyNegativeKeywordsQuery({});
+
+  const allNegativeKeywords = allNegativeKeywordsData.keywords || [];
+
+  return (
+    <MoreKeywordReviewModal
+      title="개선이 필요한 점"
+      keywords={allNegativeKeywords}
+    />
+  );
+}
+
 function Review({ data }: { data: MyReviewItem }) {
   const [expanded, setExpanded] = useState(false);
 
diff --git a/src/entities/user/ui/more-keyword-review-modal.tsx b/src/entities/user/ui/more-keyword-review-modal.tsx
new file mode 100644
index 00000000..25590a07
--- /dev/null
+++ b/src/entities/user/ui/more-keyword-review-modal.tsx
@@ -0,0 +1,42 @@
+import { XIcon } from 'lucide-react';
+import { Modal } from '@/shared/ui/modal';
+import KeywordReview from './keyword-review';
+
+export default function MoreKeywordReviewModal({
+  title,
+  keywords,
+}: {
+  title: string;
+  keywords: { id: number; content: string; count: number }[];
+}) {
+  return (
+    <Modal.Root>
+      <Modal.Trigger asChild>
+        <button className="font-designer-12m text-text-subtlest cursor-pointer">
+          더보기
+        </button>
+      </Modal.Trigger>
+      <Modal.Portal>
+        <Modal.Overlay />
+        <Modal.Content size="large" className="w-full">
+          <Modal.Header className="border-border-default flex justify-between border-b">
+            <Modal.Title className="font-designer-20b text-text-strong">
+              {title}
+            </Modal.Title>
+            <Modal.Close>
+              <XIcon />
+            </Modal.Close>
+          </Modal.Header>
+
+          <Modal.Body className="flex flex-col gap-400 p-400">
+            <ul className="flex flex-col gap-50">
+              {keywords.map((keyword) => (
+                <KeywordReview key={keyword.id} {...keyword} />
+              ))}
+            </ul>
+          </Modal.Body>
+        </Modal.Content>
+      </Modal.Portal>
+    </Modal.Root>
+  );
+}

From 24aefc3caffbd50b34203f366590a77fbec3608d Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Wed, 27 Aug 2025 00:32:51 +0900
Subject: [PATCH 02/12] =?UTF-8?q?feat:=20=EC=9E=90=EC=8B=A0=EC=9D=B4=20?=
 =?UTF-8?q?=EC=9D=B4=EB=B2=88=EC=A3=BC=EC=97=90=20=EC=8A=A4=ED=84=B0?=
 =?UTF-8?q?=EB=94=94=20=ED=9B=84=EA=B8=B0=EB=A5=BC=20=EB=82=A8=EA=B2=BC?=
 =?UTF-8?q?=EB=8A=94=EC=A7=80=20=EC=97=AC=EB=B6=80=EC=97=90=20=EA=B4=80?=
 =?UTF-8?q?=ED=95=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=85=80=20=ED=9B=85=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/study/api/get-review.ts         | 8 ++++++++
 src/features/study/api/types.ts              | 2 ++
 src/features/study/model/use-review-query.ts | 8 ++++++++
 3 files changed, 18 insertions(+)

diff --git a/src/features/study/api/get-review.ts b/src/features/study/api/get-review.ts
index e188d28d..fd9768e7 100644
--- a/src/features/study/api/get-review.ts
+++ b/src/features/study/api/get-review.ts
@@ -8,6 +8,7 @@ import type {
   MyNegativeKeywordsResponse,
   MyReviewsResponse,
   MyReviewsRequest,
+  WeeklyStudyStatusResponse,
 } from './types';
 
 export const getPartnerStudyReview =
@@ -79,3 +80,10 @@ export const getMyReviews = async ({
 
   return res.data.content;
 };
+
+export const getWeeklyStudyReviewStatus =
+  async (): Promise<WeeklyStudyStatusResponse> => {
+    const res = await axiosInstance.get('/study/reviews/this-week/is-writer');
+
+    return res.data.content;
+  };
diff --git a/src/features/study/api/types.ts b/src/features/study/api/types.ts
index 77cfa766..46722749 100644
--- a/src/features/study/api/types.ts
+++ b/src/features/study/api/types.ts
@@ -183,3 +183,5 @@ export interface MyReviewsResponse {
     hasNext: boolean;
   };
 }
+
+export type WeeklyStudyStatusResponse = boolean;
diff --git a/src/features/study/model/use-review-query.ts b/src/features/study/model/use-review-query.ts
index 40e17990..7f333df2 100644
--- a/src/features/study/model/use-review-query.ts
+++ b/src/features/study/model/use-review-query.ts
@@ -10,6 +10,7 @@ import {
   getPartnerStudyReview,
   getMyNegativeKeywords,
   getMyReviews,
+  getWeeklyStudyReviewStatus,
 } from '../api/get-review';
 import {
   MyNegativeKeywordsRequest,
@@ -84,3 +85,10 @@ export const useMyReviewsInfinityQuery = () => {
     },
   });
 };
+
+export const useWeeklyStudyReviewStatusQuery = () => {
+  return useQuery({
+    queryKey: ['weeklyStudyReviewStatus'],
+    queryFn: getWeeklyStudyReviewStatus,
+  });
+};

From 47d4d6315490e94b37926d9902b5c49002fafbcf Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Wed, 27 Aug 2025 01:31:56 +0900
Subject: [PATCH 03/12] =?UTF-8?q?fix:=20TextAreaInput=20onChange=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=97=90=EB=9F=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/study/ui/study-review-modal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/study/ui/study-review-modal.tsx b/src/features/study/ui/study-review-modal.tsx
index e2dbd8db..fe291dda 100644
--- a/src/features/study/ui/study-review-modal.tsx
+++ b/src/features/study/ui/study-review-modal.tsx
@@ -353,7 +353,7 @@ function PositiveTextArea({
         value={value}
         maxLength={1000}
         placeholder="좋았던 점을 자세히 말해주세요"
-        onChange={onChange}
+        onChange={(e) => onChange(e.target.value)}
       />
     </div>
   );
@@ -428,7 +428,7 @@ function NegativeTextArea({
 
       <TextAreaInput
         value={value}
-        onChange={onChange}
+        onChange={(e) => onChange(e.target.value)}
         maxLength={1000}
         placeholder="아쉬웠던 점을 자세히 말해주세요"
       />

From 20ade3b2b8ec115a31ba9d2eea6d5b8a6d5782d0 Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Wed, 27 Aug 2025 02:08:01 +0900
Subject: [PATCH 04/12] =?UTF-8?q?feat:=20=ED=9B=84=EA=B8=B0=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1=EC=95=88=ED=95=98=EB=A9=B4,=20=EC=A3=BC?=
 =?UTF-8?q?=EB=A7=90=EC=97=90=2030=EB=B6=84=20=EC=A3=BC=EA=B8=B0=EB=A1=9C?=
 =?UTF-8?q?=20=ED=9B=84=EA=B8=B0=20=EB=AA=A8=EB=8B=AC=20=EB=A0=8C=EB=8D=94?=
 =?UTF-8?q?=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entities/user/ui/my-profile-card.tsx      | 89 +++++++++++--------
 .../study/lib/use-reminder-review.tsx         | 35 ++++++++
 src/features/study/model/use-review-query.ts  |  1 +
 src/features/study/ui/study-review-modal.tsx  | 45 +++++-----
 4 files changed, 109 insertions(+), 61 deletions(-)
 create mode 100644 src/features/study/lib/use-reminder-review.tsx

diff --git a/src/entities/user/ui/my-profile-card.tsx b/src/entities/user/ui/my-profile-card.tsx
index 32ab753a..f16c5ebf 100644
--- a/src/entities/user/ui/my-profile-card.tsx
+++ b/src/entities/user/ui/my-profile-card.tsx
@@ -3,6 +3,8 @@
 import Link from 'next/link';
 import React, { useState } from 'react';
 import { usePatchAutoMatchingMutation } from '@/entities/user/model/use-user-profile-query';
+import { useReviewReminder } from '@/features/study/lib/use-reminder-review';
+import StudyReviewModal from '@/features/study/ui/study-review-modal';
 import UserAvatar from '@/shared/ui/avatar';
 import { ToggleSwitch } from '@/shared/ui/toggle';
 import AccessTimeIcon from 'public/icons/access_time.svg';
@@ -31,6 +33,10 @@ export default function MyProfileCard({
   techStacks,
   studyApplied,
 }: MyProfileCardProps) {
+  const shouldReview = useReviewReminder();
+  const [isOpenReviewModal, setIsOpenReviewModal] =
+    useState<boolean>(shouldReview);
+
   const [enabled, setEnabled] = useState(matching);
 
   const { mutate: patchAutoMatching, isPending } =
@@ -52,45 +58,54 @@ export default function MyProfileCard({
   };
 
   return (
-    <section className="rounded-200 border-border-subtle bg-text-inverse flex flex-col items-start gap-200 border p-200">
-      <div className="flex flex-row items-center gap-200">
-        <div className="relative h-[64px] w-[64px] shrink-0">
-          <UserAvatar size={64} image={imageUrl?.trim() || ''} />
-          <Link
-            href="my-page"
-            className="bg-background-accent-gray-strong absolute right-0 bottom-0 flex h-[24px] w-[24px] items-center justify-center rounded-full"
-          >
-            <SettingIcon />
-          </Link>
-        </div>
-        <div className="flex flex-col">
-          <div className="font-designer-18b">{name?.trim() || '비회원'}님</div>
-          <div className="flex flex-row items-center gap-100">
-            <span className="font-designer-14r text-gray-800">스터디 매칭</span>
-            <ToggleSwitch.Root
-              size="md"
-              checked={enabled}
-              onCheckedChange={handleToggleChange}
-              disabled={isPending || !studyApplied}
-            />
+    <>
+      <StudyReviewModal
+        open={isOpenReviewModal}
+        onOpenChange={setIsOpenReviewModal}
+      />
+      <section className="rounded-200 border-border-subtle bg-text-inverse flex flex-col items-start gap-200 border p-200">
+        <div className="flex flex-row items-center gap-200">
+          <div className="relative h-[64px] w-[64px] shrink-0">
+            <UserAvatar size={64} image={imageUrl?.trim() || ''} />
+            <Link
+              href="my-page"
+              className="bg-background-accent-gray-strong absolute right-0 bottom-0 flex h-[24px] w-[24px] items-center justify-center rounded-full"
+            >
+              <SettingIcon />
+            </Link>
+          </div>
+          <div className="flex flex-col">
+            <div className="font-designer-18b">
+              {name?.trim() || '비회원'}님
+            </div>
+            <div className="flex flex-row items-center gap-100">
+              <span className="font-designer-14r text-gray-800">
+                스터디 매칭
+              </span>
+              <ToggleSwitch.Root
+                size="md"
+                checked={enabled}
+                onCheckedChange={handleToggleChange}
+                disabled={isPending || !studyApplied}
+              />
+            </div>
           </div>
         </div>
-      </div>
-
-      <div className="bg-background-alternative rounded-100 font-designer-15m text-text-default flex w-full flex-col gap-200 px-200 py-150">
-        <div className="flex items-center gap-100">
-          <AssignmentIcon />
-          <span>{subject?.trim() || '없음'}</span>
-        </div>
-        <div className="flex items-center gap-100">
-          <AccessTimeIcon />
-          <span>{time?.trim() || '없음'}</span>
-        </div>
-        <div className="flex items-center gap-100">
-          <CodeIcon />
-          <span>{techStacks?.trim() || '없음'}</span>
+        <div className="bg-background-alternative rounded-100 font-designer-15m text-text-default flex w-full flex-col gap-200 px-200 py-150">
+          <div className="flex items-center gap-100">
+            <AssignmentIcon />
+            <span>{subject?.trim() || '없음'}</span>
+          </div>
+          <div className="flex items-center gap-100">
+            <AccessTimeIcon />
+            <span>{time?.trim() || '없음'}</span>
+          </div>
+          <div className="flex items-center gap-100">
+            <CodeIcon />
+            <span>{techStacks?.trim() || '없음'}</span>
+          </div>
         </div>
-      </div>
-    </section>
+      </section>
+    </>
   );
 }
diff --git a/src/features/study/lib/use-reminder-review.tsx b/src/features/study/lib/use-reminder-review.tsx
new file mode 100644
index 00000000..5f1f14b6
--- /dev/null
+++ b/src/features/study/lib/use-reminder-review.tsx
@@ -0,0 +1,35 @@
+import { useEffect, useState } from 'react';
+
+import { getKoreaDate } from '@/shared/lib/time';
+import { useWeeklyStudyReviewStatusQuery } from '../model/use-review-query';
+
+export const useReviewReminder = () => {
+  const { data: reviewDone } = useWeeklyStudyReviewStatusQuery();
+  const [shouldReview, setShouldReview] = useState(false);
+
+  useEffect(() => {
+    // 이미 리뷰를 달았을 경우
+    if (reviewDone) return;
+
+    const now = getKoreaDate();
+    const dayOfWeek = now.getDay();
+
+    const isWeekend = dayOfWeek === 0 || dayOfWeek === 6; // 0: 일요일, 6: 토요일
+
+    // 평일인 경우
+    if (!isWeekend) return;
+
+    const lastShown = localStorage.getItem('lastReviewModalShown');
+
+    const diff = now.getTime() - Number(lastShown);
+    const THIRTY_MIN = 30 * 60 * 1000;
+
+    if (!lastShown || diff >= THIRTY_MIN) {
+      setShouldReview(true);
+
+      localStorage.setItem('lastReviewModalShown', String(now.getTime()));
+    }
+  }, [reviewDone]);
+
+  return shouldReview;
+};
diff --git a/src/features/study/model/use-review-query.ts b/src/features/study/model/use-review-query.ts
index 7f333df2..c78d7eab 100644
--- a/src/features/study/model/use-review-query.ts
+++ b/src/features/study/model/use-review-query.ts
@@ -90,5 +90,6 @@ export const useWeeklyStudyReviewStatusQuery = () => {
   return useQuery({
     queryKey: ['weeklyStudyReviewStatus'],
     queryFn: getWeeklyStudyReviewStatus,
+    refetchInterval: 1000 * 60 * 30, // 30분
   });
 };
diff --git a/src/features/study/ui/study-review-modal.tsx b/src/features/study/ui/study-review-modal.tsx
index fe291dda..dd959979 100644
--- a/src/features/study/ui/study-review-modal.tsx
+++ b/src/features/study/ui/study-review-modal.tsx
@@ -3,6 +3,7 @@
 import { XIcon } from 'lucide-react';
 import Image from 'next/image';
 import { useState } from 'react';
+import UserAvatar from '@/shared/ui/avatar';
 import Button from '@/shared/ui/button';
 import Checkbox from '@/shared/ui/checkbox';
 import { TextAreaInput } from '@/shared/ui/input';
@@ -22,26 +23,20 @@ interface FormState {
   content: string;
 }
 
-export default function StudyReviewModal() {
+export default function StudyReviewModal({
+  open,
+  onOpenChange,
+}: {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}) {
   return (
-    <Modal.Root>
-      <Modal.Trigger>
-        <div className="bg-background-alternative rounded-100 flex items-center justify-between px-250 py-300">
-          <p className="flex flex-col items-start gap-50">
-            <span className="font-designer-15b text-text-default">
-              CS 스터디를 시작해 보세요!
-            </span>
-            <span className="font-designer-12m text-text-subtlest">
-              스터디 신청하기
-            </span>
-          </p>
-        </div>
-      </Modal.Trigger>
+    <Modal.Root open={open} onOpenChange={onOpenChange}>
       <Modal.Portal>
         <Modal.Overlay />
         <Modal.Content size="large">
           <Modal.Header className="border-border-default flex justify-end border-b">
-            <Modal.Close>
+            <Modal.Close onClick={() => onOpenChange(false)}>
               <XIcon />
             </Modal.Close>
           </Modal.Header>
@@ -57,14 +52,14 @@ export default function StudyReviewModal() {
             </div>
           </div>
 
-          <StudyReviewForm />
+          <StudyReviewForm onClose={() => onOpenChange(false)} />
         </Modal.Content>
       </Modal.Portal>
     </Modal.Root>
   );
 }
 
-function StudyReviewForm() {
+function StudyReviewForm({ onClose }: { onClose: () => void }) {
   const { data } = usePartnerStudyReviewQuery();
   const { mutate: addStudyReview } = useAddStudyReviewMutation();
 
@@ -86,7 +81,11 @@ function StudyReviewForm() {
     )
       return;
 
-    addStudyReview(form);
+    addStudyReview(form, {
+      onSuccess: () => {
+        onClose();
+      },
+    });
   };
 
   return (
@@ -154,7 +153,7 @@ function StudyReviewForm() {
       </Modal.Body>
       <Modal.Footer className="flex justify-end gap-100">
         <Modal.Close asChild>
-          <Button color="secondary" size="large">
+          <Button color="secondary" size="large" onClick={onClose}>
             취소
           </Button>
         </Modal.Close>
@@ -178,12 +177,10 @@ function PartnerInfo(data: StudyEvaluationResponse) {
 
   return (
     <div className="flex justify-center gap-200">
-      <Image
-        src={partner.profileImageUrl || '/profile-default.svg'}
+      <UserAvatar
+        image={partner.profileImageUrl}
+        size={80}
         alt="Study Member"
-        width={80}
-        height={80}
-        className="rounded-full"
       />
 
       <div className="flex flex-col justify-center gap-50">

From bc053d873cfdb0ae9419cc7451d00f8b738f887a Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Thu, 28 Aug 2025 00:15:29 +0900
Subject: [PATCH 05/12] =?UTF-8?q?fix:=20=EC=B2=AB=20=EB=A0=8C=EB=8D=94?=
 =?UTF-8?q?=EB=A7=81=20=EC=8B=9C=EC=97=90=20=EC=8A=A4=ED=84=B0=EB=94=94=20?=
 =?UTF-8?q?=ED=9B=84=EA=B8=B0=20=EB=AA=A8=EB=8B=AC=EC=9D=B4=20=EB=9C=A8?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entities/user/ui/my-profile-card.tsx       | 9 ++-------
 src/features/study/lib/use-reminder-review.tsx | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/entities/user/ui/my-profile-card.tsx b/src/entities/user/ui/my-profile-card.tsx
index f16c5ebf..659e942f 100644
--- a/src/entities/user/ui/my-profile-card.tsx
+++ b/src/entities/user/ui/my-profile-card.tsx
@@ -33,9 +33,7 @@ export default function MyProfileCard({
   techStacks,
   studyApplied,
 }: MyProfileCardProps) {
-  const shouldReview = useReviewReminder();
-  const [isOpenReviewModal, setIsOpenReviewModal] =
-    useState<boolean>(shouldReview);
+  const { shouldReview, setShouldReview } = useReviewReminder();
 
   const [enabled, setEnabled] = useState(matching);
 
@@ -59,10 +57,7 @@ export default function MyProfileCard({
 
   return (
     <>
-      <StudyReviewModal
-        open={isOpenReviewModal}
-        onOpenChange={setIsOpenReviewModal}
-      />
+      <StudyReviewModal open={shouldReview} onOpenChange={setShouldReview} />
       <section className="rounded-200 border-border-subtle bg-text-inverse flex flex-col items-start gap-200 border p-200">
         <div className="flex flex-row items-center gap-200">
           <div className="relative h-[64px] w-[64px] shrink-0">
diff --git a/src/features/study/lib/use-reminder-review.tsx b/src/features/study/lib/use-reminder-review.tsx
index 5f1f14b6..1f1f9952 100644
--- a/src/features/study/lib/use-reminder-review.tsx
+++ b/src/features/study/lib/use-reminder-review.tsx
@@ -31,5 +31,5 @@ export const useReviewReminder = () => {
     }
   }, [reviewDone]);
 
-  return shouldReview;
+  return { shouldReview, setShouldReview };
 };

From e111a82858c755bca0a8293837893af82ca2a970 Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Thu, 28 Aug 2025 00:26:24 +0900
Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=EB=A6=AC=EB=B7=B0=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EC=BF=BC=EB=A6=AC=EC=97=90=20isFetching=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=A1=9C=20=EB=AA=A8=EB=8B=AC=20=EB=A0=8C?=
 =?UTF-8?q?=EB=8D=94=EB=A7=81=20=EC=A1=B0=EA=B1=B4=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/study/lib/use-reminder-review.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/features/study/lib/use-reminder-review.tsx b/src/features/study/lib/use-reminder-review.tsx
index 1f1f9952..aa00bdbc 100644
--- a/src/features/study/lib/use-reminder-review.tsx
+++ b/src/features/study/lib/use-reminder-review.tsx
@@ -4,12 +4,11 @@ import { getKoreaDate } from '@/shared/lib/time';
 import { useWeeklyStudyReviewStatusQuery } from '../model/use-review-query';
 
 export const useReviewReminder = () => {
-  const { data: reviewDone } = useWeeklyStudyReviewStatusQuery();
+  const { data: reviewDone, isFetching } = useWeeklyStudyReviewStatusQuery();
   const [shouldReview, setShouldReview] = useState(false);
 
   useEffect(() => {
-    // 이미 리뷰를 달았을 경우
-    if (reviewDone) return;
+    if (reviewDone || isFetching) return;
 
     const now = getKoreaDate();
     const dayOfWeek = now.getDay();
@@ -29,7 +28,7 @@ export const useReviewReminder = () => {
 
       localStorage.setItem('lastReviewModalShown', String(now.getTime()));
     }
-  }, [reviewDone]);
+  }, [reviewDone, isFetching]); // 30분마다 refetch하여 effect 실행하기 위해 isFetching 추가
 
   return { shouldReview, setShouldReview };
 };

From 7c6ca7e3a42f3ebae629a4ea3acfea8147e612af Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Thu, 28 Aug 2025 00:31:55 +0900
Subject: [PATCH 07/12] =?UTF-8?q?feat:=20=EC=8A=A4=ED=84=B0=EB=94=94=20?=
 =?UTF-8?q?=ED=9B=84=EA=B8=B0=20=EC=9E=91=EC=84=B1=20=EC=97=AC=EB=B6=80=20?=
 =?UTF-8?q?useQuery=EC=9D=98=20enabled=20=EC=86=8D=EC=84=B1=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/study/model/use-review-query.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/features/study/model/use-review-query.ts b/src/features/study/model/use-review-query.ts
index c78d7eab..4e0468d6 100644
--- a/src/features/study/model/use-review-query.ts
+++ b/src/features/study/model/use-review-query.ts
@@ -4,6 +4,7 @@ import {
   useQuery,
   useSuspenseQuery,
 } from '@tanstack/react-query';
+import { getKoreaDate } from '@/shared/lib/time';
 import {
   addStudyReview,
   getUserPositiveKeywords,
@@ -91,5 +92,12 @@ export const useWeeklyStudyReviewStatusQuery = () => {
     queryKey: ['weeklyStudyReviewStatus'],
     queryFn: getWeeklyStudyReviewStatus,
     refetchInterval: 1000 * 60 * 30, // 30분
+    enabled: () => {
+      const now = getKoreaDate();
+      const dayOfWeek = now.getDay();
+      const isWeekend = dayOfWeek === 0 || dayOfWeek === 6; // 0: 일요일, 6: 토요일
+
+      return isWeekend;
+    },
   });
 };

From 339f5c17c737ed3fdabcb575145ce050c401e062 Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Fri, 29 Aug 2025 00:58:37 +0900
Subject: [PATCH 08/12] =?UTF-8?q?refactor:=20=EC=9E=90=EC=8B=A0=EC=9D=B4?=
 =?UTF-8?q?=20=EC=9D=B4=EB=B2=88=20=EC=A3=BC=20=EC=8A=A4=ED=84=B0=EB=94=94?=
 =?UTF-8?q?=20=ED=9B=84=EA=B8=B0=20=EC=9E=91=EC=84=B1=20=EB=8C=80=EC=83=81?=
 =?UTF-8?q?=EC=9E=90=EC=9D=B8=EC=A7=80=20=EC=97=AC=EB=B6=80=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=ED=95=98=EB=8A=94=20=ED=95=A8=EC=88=98=20=EB=84=A4?=
 =?UTF-8?q?=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entities/user/ui/my-profile-card.tsx      |  7 ++++--
 src/features/study/api/get-review.ts          |  6 ++---
 src/features/study/api/types.ts               |  2 +-
 .../study/lib/use-reminder-review.tsx         | 22 +++++++++++--------
 src/features/study/model/use-review-query.ts  |  8 +++----
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/entities/user/ui/my-profile-card.tsx b/src/entities/user/ui/my-profile-card.tsx
index 659e942f..8e2bf597 100644
--- a/src/entities/user/ui/my-profile-card.tsx
+++ b/src/entities/user/ui/my-profile-card.tsx
@@ -33,7 +33,7 @@ export default function MyProfileCard({
   techStacks,
   studyApplied,
 }: MyProfileCardProps) {
-  const { shouldReview, setShouldReview } = useReviewReminder();
+  const { showReviewReminder, setShowReviewReminder } = useReviewReminder();
 
   const [enabled, setEnabled] = useState(matching);
 
@@ -57,7 +57,10 @@ export default function MyProfileCard({
 
   return (
     <>
-      <StudyReviewModal open={shouldReview} onOpenChange={setShouldReview} />
+      <StudyReviewModal
+        open={showReviewReminder}
+        onOpenChange={setShowReviewReminder}
+      />
       <section className="rounded-200 border-border-subtle bg-text-inverse flex flex-col items-start gap-200 border p-200">
         <div className="flex flex-row items-center gap-200">
           <div className="relative h-[64px] w-[64px] shrink-0">
diff --git a/src/features/study/api/get-review.ts b/src/features/study/api/get-review.ts
index fd9768e7..58b3a4cb 100644
--- a/src/features/study/api/get-review.ts
+++ b/src/features/study/api/get-review.ts
@@ -8,7 +8,7 @@ import type {
   MyNegativeKeywordsResponse,
   MyReviewsResponse,
   MyReviewsRequest,
-  WeeklyStudyStatusResponse,
+  ShouldReviewPartnerResponse,
 } from './types';
 
 export const getPartnerStudyReview =
@@ -81,8 +81,8 @@ export const getMyReviews = async ({
   return res.data.content;
 };
 
-export const getWeeklyStudyReviewStatus =
-  async (): Promise<WeeklyStudyStatusResponse> => {
+export const getShouldReviewPartner =
+  async (): Promise<ShouldReviewPartnerResponse> => {
     const res = await axiosInstance.get('/study/reviews/this-week/is-writer');
 
     return res.data.content;
diff --git a/src/features/study/api/types.ts b/src/features/study/api/types.ts
index 46722749..92ab0371 100644
--- a/src/features/study/api/types.ts
+++ b/src/features/study/api/types.ts
@@ -184,4 +184,4 @@ export interface MyReviewsResponse {
   };
 }
 
-export type WeeklyStudyStatusResponse = boolean;
+export type ShouldReviewPartnerResponse = boolean;
diff --git a/src/features/study/lib/use-reminder-review.tsx b/src/features/study/lib/use-reminder-review.tsx
index aa00bdbc..53d9a089 100644
--- a/src/features/study/lib/use-reminder-review.tsx
+++ b/src/features/study/lib/use-reminder-review.tsx
@@ -1,19 +1,20 @@
 import { useEffect, useState } from 'react';
 
 import { getKoreaDate } from '@/shared/lib/time';
-import { useWeeklyStudyReviewStatusQuery } from '../model/use-review-query';
+import { useShouldReviewPartnerQuery } from '../model/use-review-query';
 
 export const useReviewReminder = () => {
-  const { data: reviewDone, isFetching } = useWeeklyStudyReviewStatusQuery();
-  const [shouldReview, setShouldReview] = useState(false);
+  const { data: shouldReview, isFetching } = useShouldReviewPartnerQuery();
+  const [showReviewReminder, setShowReviewReminder] = useState(false);
 
   useEffect(() => {
-    if (reviewDone || isFetching) return;
+    // 이미 리뷰를 달았을 경우
+    if (!shouldReview || isFetching) return;
 
     const now = getKoreaDate();
     const dayOfWeek = now.getDay();
 
-    const isWeekend = dayOfWeek === 0 || dayOfWeek === 6; // 0: 일요일, 6: 토요일
+    const isWeekend = dayOfWeek === 0 || dayOfWeek === 6; // 일요일(0), 토요일(6)
 
     // 평일인 경우
     if (!isWeekend) return;
@@ -21,14 +22,17 @@ export const useReviewReminder = () => {
     const lastShown = localStorage.getItem('lastReviewModalShown');
 
     const diff = now.getTime() - Number(lastShown);
-    const THIRTY_MIN = 30 * 60 * 1000;
+    const THIRTY_MIN = 60 * 1000;
 
     if (!lastShown || diff >= THIRTY_MIN) {
-      setShouldReview(true);
+      setShowReviewReminder(true);
 
       localStorage.setItem('lastReviewModalShown', String(now.getTime()));
     }
-  }, [reviewDone, isFetching]); // 30분마다 refetch하여 effect 실행하기 위해 isFetching 추가
+  }, [shouldReview, isFetching]);
 
-  return { shouldReview, setShouldReview };
+  return {
+    showReviewReminder,
+    setShowReviewReminder,
+  };
 };
diff --git a/src/features/study/model/use-review-query.ts b/src/features/study/model/use-review-query.ts
index 4e0468d6..fe2fbfc7 100644
--- a/src/features/study/model/use-review-query.ts
+++ b/src/features/study/model/use-review-query.ts
@@ -11,7 +11,7 @@ import {
   getPartnerStudyReview,
   getMyNegativeKeywords,
   getMyReviews,
-  getWeeklyStudyReviewStatus,
+  getShouldReviewPartner,
 } from '../api/get-review';
 import {
   MyNegativeKeywordsRequest,
@@ -87,10 +87,10 @@ export const useMyReviewsInfinityQuery = () => {
   });
 };
 
-export const useWeeklyStudyReviewStatusQuery = () => {
+export const useShouldReviewPartnerQuery = () => {
   return useQuery({
-    queryKey: ['weeklyStudyReviewStatus'],
-    queryFn: getWeeklyStudyReviewStatus,
+    queryKey: ['shouldReviewPartner'],
+    queryFn: getShouldReviewPartner,
     refetchInterval: 1000 * 60 * 30, // 30분
     enabled: () => {
       const now = getKoreaDate();

From 973d84c9d4b04650957fe4970274309f258fbcdb Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Fri, 29 Aug 2025 21:55:23 +0900
Subject: [PATCH 09/12] =?UTF-8?q?refactor:=20MoreKeywordReviewModal=20?=
 =?UTF-8?q?=EC=95=88=EC=9D=98=20=EB=8D=94=EB=B3=B4=EA=B8=B0=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EC=A1=B0=EA=B1=B4=EB=B6=80=20=EB=A0=8C=EB=8D=94?=
 =?UTF-8?q?=EB=A7=81=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/(my)/my-study-review/page.tsx                  | 8 ++++----
 src/entities/user/ui/more-keyword-review-modal.tsx | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/(my)/my-study-review/page.tsx b/app/(my)/my-study-review/page.tsx
index 373cc1d4..2a45f2f6 100644
--- a/app/(my)/my-study-review/page.tsx
+++ b/app/(my)/my-study-review/page.tsx
@@ -57,7 +57,7 @@ export default function MyStudyReview() {
             <div className="mb-200 flex justify-between">
               <h3 className="font-designer-16b text-text-default">좋았던 점</h3>
 
-              {positiveKeywords.length > 5 && <MorePositiveKeywordsModal />}
+              <MorePositiveKeywordsModal />
             </div>
 
             <ul className="flex flex-col gap-50">
@@ -83,7 +83,7 @@ export default function MyStudyReview() {
                 개선이 필요한 점
               </h3>
 
-              {negativeKeywords.length > 5 && <MoreNegativeKeywordsModal />}
+              <MoreNegativeKeywordsModal />
             </div>
 
             <ul className="flex flex-col gap-50">
@@ -150,7 +150,7 @@ export default function MyStudyReview() {
 function MorePositiveKeywordsModal() {
   const { data: allPositiveKeywordsData } = useUserPositiveKeywordsQuery({});
 
-  const allPositiveKeywords = allPositiveKeywordsData.keywords || [];
+  const allPositiveKeywords = allPositiveKeywordsData?.keywords || [];
 
   return (
     <MoreKeywordReviewModal title="좋았던 점" keywords={allPositiveKeywords} />
@@ -160,7 +160,7 @@ function MorePositiveKeywordsModal() {
 function MoreNegativeKeywordsModal() {
   const { data: allNegativeKeywordsData } = useMyNegativeKeywordsQuery({});
 
-  const allNegativeKeywords = allNegativeKeywordsData.keywords || [];
+  const allNegativeKeywords = allNegativeKeywordsData?.keywords || [];
 
   return (
     <MoreKeywordReviewModal
diff --git a/src/entities/user/ui/more-keyword-review-modal.tsx b/src/entities/user/ui/more-keyword-review-modal.tsx
index 25590a07..b55fb84a 100644
--- a/src/entities/user/ui/more-keyword-review-modal.tsx
+++ b/src/entities/user/ui/more-keyword-review-modal.tsx
@@ -12,9 +12,11 @@ export default function MoreKeywordReviewModal({
   return (
     <Modal.Root>
       <Modal.Trigger asChild>
-        <button className="font-designer-12m text-text-subtlest cursor-pointer">
-          더보기
-        </button>
+        {keywords.length > 5 && (
+          <button className="font-designer-12m text-text-subtlest cursor-pointer">
+            더보기
+          </button>
+        )}
       </Modal.Trigger>
       <Modal.Portal>
         <Modal.Overlay />

From 0692843f026405637b8c657d27e48d46b66edc69 Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Fri, 29 Aug 2025 21:58:31 +0900
Subject: [PATCH 10/12] =?UTF-8?q?fix:=20THIRTY=5FMIN=20=EA=B0=92=20?=
 =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/study/lib/use-reminder-review.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/study/lib/use-reminder-review.tsx b/src/features/study/lib/use-reminder-review.tsx
index 53d9a089..4ab66b54 100644
--- a/src/features/study/lib/use-reminder-review.tsx
+++ b/src/features/study/lib/use-reminder-review.tsx
@@ -22,7 +22,7 @@ export const useReviewReminder = () => {
     const lastShown = localStorage.getItem('lastReviewModalShown');
 
     const diff = now.getTime() - Number(lastShown);
-    const THIRTY_MIN = 60 * 1000;
+    const THIRTY_MIN = 1000 * 60 * 30; // 30분
 
     if (!lastShown || diff >= THIRTY_MIN) {
       setShowReviewReminder(true);

From 440e91ebcaa3cfcf538f544142baf99eb60bfca7 Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Fri, 29 Aug 2025 22:08:15 +0900
Subject: [PATCH 11/12] =?UTF-8?q?fix:=20=EC=8A=A4=ED=84=B0=EB=94=94=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC=EC=9D=98=20=ED=9B=84=EA=B8=B0=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9=20=EC=95=88=EB=90=9C=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entities/user/ui/user-profile-modal.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/entities/user/ui/user-profile-modal.tsx b/src/entities/user/ui/user-profile-modal.tsx
index 2d98c663..f49fe6ba 100644
--- a/src/entities/user/ui/user-profile-modal.tsx
+++ b/src/entities/user/ui/user-profile-modal.tsx
@@ -127,14 +127,14 @@ export default function UserProfileModal({
               />
             </div>
 
-            <div className="bg-border-subtle h-[2px] w-full" />
+            <div className="bg-border-subtle h-[2px] w-full flex-none" />
 
-            <div className="flex gap-400 px-250">
+            <div className="flex gap-400 pl-250">
               <span className="font-designer-16b text-text-default w-[132px] shrink-0">
                 받은 평가
               </span>
 
-              <div className="text-text-default font-designer-14r">
+              <div className="text-text-default font-designer-14r grow-1">
                 {/* todo: 기획 fix되면 수정 */}
                 {/* <span>n명의 유저들이 이런 점이 좋다고 했어요.</span> */}
 

From 01197cd7ad0474db49a754d1c94b2bb564d56169 Mon Sep 17 00:00:00 2001
From: aken-you <kinsk2839@naver.com>
Date: Fri, 29 Aug 2025 22:12:17 +0900
Subject: [PATCH 12/12] =?UTF-8?q?fix:=20=EC=8A=A4=ED=84=B0=EB=94=94=20?=
 =?UTF-8?q?=EC=A3=BC=EC=A0=9C=20=EC=97=86=EC=9C=BC=EB=A9=B4=20=ED=9B=84?=
 =?UTF-8?q?=EA=B8=B0=EC=97=90=20=ED=91=9C=EC=8B=9C=20x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/(my)/my-study-review/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/(my)/my-study-review/page.tsx b/app/(my)/my-study-review/page.tsx
index 2a45f2f6..b653e736 100644
--- a/app/(my)/my-study-review/page.tsx
+++ b/app/(my)/my-study-review/page.tsx
@@ -220,7 +220,7 @@ function Review({ data }: { data: MyReviewItem }) {
         <div className="text-text-subtle">
           <span className="font-designer-14b mr-100">스터디 주제</span>
           <span className="font-designer-13r">
-            {data.studySubjects.join(', ')}
+            {data.studySubjects.filter((subject) => subject).join(', ')}
           </span>
         </div>
       </div>