-
+
{title}
diff --git a/src/features/my-page/ui/profile-info.tsx b/src/features/my-page/ui/profile-info.tsx
index 93e87afe..9b0047cc 100644
--- a/src/features/my-page/ui/profile-info.tsx
+++ b/src/features/my-page/ui/profile-info.tsx
@@ -1,8 +1,8 @@
'use client';
import { MemberInfo } from '@/entities/user/api/types';
+import ProfileInfoCard from '@/entities/user/ui/profile-info-card';
import ProfileInfoEditModal from '@/features/my-page/ui/profile-info-edit-modal';
-import ProfileInfoCard from '@/widgets/my-page/profileinfo-card';
interface ProfileInfoProps {
memberId: number;
diff --git a/src/features/my-page/ui/user-profile-modal.tsx b/src/features/my-page/ui/user-profile-modal.tsx
index 0cd0f824..2d98c663 100644
--- a/src/features/my-page/ui/user-profile-modal.tsx
+++ b/src/features/my-page/ui/user-profile-modal.tsx
@@ -2,14 +2,16 @@
import { XIcon } from 'lucide-react';
import { useUserProfileQuery } from '@/entities/user/model/use-user-profile-query';
+import KeywordReview from '@/entities/user/ui/keyword-review';
+import ProfileInfoCard from '@/entities/user/ui/profile-info-card';
import CakeIcon from '@/features/my-page/ui/icon/cake.svg';
import GithubIcon from '@/features/my-page/ui/icon/github-logo.svg';
import GlobeIcon from '@/features/my-page/ui/icon/globe-simple.svg';
import PhoneIcon from '@/features/my-page/ui/icon/phone.svg';
+import { useUserPositiveKeywordsQuery } from '@/features/study/model/use-review-query';
import UserAvatar from '@/shared/ui/avatar';
import Badge from '@/shared/ui/badge';
import { Modal } from '@/shared/ui/modal';
-import ProfileInfoCard from '@/widgets/my-page/profileinfo-card';
interface UserProfileModalProps {
memberId: number;
@@ -21,8 +23,13 @@ export default function UserProfileModal({
trigger,
}: UserProfileModalProps) {
const { data: profile, isLoading, isError } = useUserProfileQuery(memberId);
+ const { data: positiveKeywordsData } = useUserPositiveKeywordsQuery({
+ memberId,
+ });
- if (isLoading || isError || !profile) return null;
+ if (isLoading || isError || !profile || !positiveKeywordsData) return null;
+
+ const positiveKeywords = positiveKeywordsData?.keywords || [];
return (
@@ -71,25 +78,22 @@ export default function UserProfileModal({
- {profile.memberProfile.birthDate ??
- '생일을 입력해주세요!'}
+ {profile.memberProfile.birthDate ?? ''}
- {profile.memberProfile.tel ?? '번호를 입력해주세요!'}
+ {profile.memberProfile.tel ?? ''}
- {profile.memberProfile.githubLink?.url ??
- '깃허브 링크를 입력해주세요!'}
+ {profile.memberProfile.githubLink?.url ?? ''}
- {profile.memberProfile.blogOrSnsLink?.url ??
- '블로그 링크를 입력해주세요!'}
+ {profile.memberProfile.blogOrSnsLink?.url ?? ''}
@@ -122,6 +126,35 @@ export default function UserProfileModal({
content={profile.memberInfo.studyPlan}
/>
+
+
+
+
+
+ 받은 평가
+
+
+
+ {/* todo: 기획 fix되면 수정 */}
+ {/*
n명의 유저들이 이런 점이 좋다고 했어요. */}
+
+
+ {positiveKeywords.length > 0 ? (
+ positiveKeywords.map((keyword) => (
+
+ ))
+ ) : (
+
+ 아직 받은 평가가 없습니다.
+
+ )}
+
+
+
diff --git a/src/features/study/api/get-review.ts b/src/features/study/api/get-review.ts
new file mode 100644
index 00000000..e188d28d
--- /dev/null
+++ b/src/features/study/api/get-review.ts
@@ -0,0 +1,81 @@
+import { axiosInstance } from '@/shared/tanstack-query/axios';
+import type {
+ AddStudyReviewRequest,
+ UserPositiveKeywordsResponse,
+ UserPositiveKeywordsRequest,
+ StudyEvaluationResponse,
+ MyNegativeKeywordsRequest,
+ MyNegativeKeywordsResponse,
+ MyReviewsResponse,
+ MyReviewsRequest,
+} from './types';
+
+export const getPartnerStudyReview =
+ async (): Promise
=> {
+ const res = await axiosInstance.get(
+ '/study/reviews/this-week/target-study',
+ );
+
+ return res.data.content;
+ };
+
+export const addStudyReview = async (data: AddStudyReviewRequest) => {
+ const res = await axiosInstance.post('/study/reviews', data);
+
+ return res.data.content;
+};
+
+export const getUserPositiveKeywords = async ({
+ memberId,
+ pageSize,
+}: UserPositiveKeywordsRequest): Promise => {
+ const params: Record = {};
+
+ if (memberId) {
+ params['member-id'] = memberId;
+ }
+ if (pageSize) {
+ params['page-size'] = pageSize;
+ }
+
+ const res = await axiosInstance.get(
+ '/study/reviews/members/keywords/positive',
+ { params },
+ );
+
+ return res.data.content;
+};
+
+export const getMyNegativeKeywords = async ({
+ pageSize,
+}: MyNegativeKeywordsRequest): Promise => {
+ const params: Record = {};
+
+ if (pageSize) {
+ params['page-size'] = pageSize;
+ }
+
+ const res = await axiosInstance.get(
+ '/study/reviews/members/keywords/negative',
+ { params },
+ );
+
+ return res.data.content;
+};
+
+export const getMyReviews = async ({
+ cursor,
+}: MyReviewsRequest): Promise => {
+ const params: Record = {
+ 'page-size': 10,
+ };
+
+ // cursor 전송하지 않는 경우 첫 데이터부터 조회
+ if (cursor) {
+ params.cursor = cursor;
+ }
+
+ const res = await axiosInstance.get('/study/reviews/members', { params });
+
+ return res.data.content;
+};
diff --git a/src/features/study/api/types.ts b/src/features/study/api/types.ts
index f790661b..77cfa766 100644
--- a/src/features/study/api/types.ts
+++ b/src/features/study/api/types.ts
@@ -94,3 +94,92 @@ export interface CompleteStudyRequest {
feedback: string;
progressStatus: StudyProgressStatus;
}
+
+export interface EvalKeyword {
+ id: number;
+ keyword: string;
+ satisfactionId: number;
+ satisfactionLabel: string;
+}
+
+interface Partner {
+ memberId: number;
+ memberName: string;
+ profileImageUrl: string;
+}
+
+export interface StudyEvaluationResponse {
+ studySpaceId: number;
+ targetMembers: Partner[];
+ studySubject: string;
+ startDate: string; // "yyyy-MM-dd" 형식
+ endDate: string; // "yyyy-MM-dd" 형식
+ satisfiedEvalKeywords: EvalKeyword[];
+ notBadEvalKeywords: EvalKeyword[];
+ unsatisfiedEvalKeywords: EvalKeyword[];
+}
+
+export interface AddStudyReviewRequest {
+ studySpaceId: number;
+ targetMemberId: number;
+ satisfactionId: 10 | 20 | 30;
+ keywordIds: number[];
+ content: string;
+}
+
+interface Keyword {
+ id: number;
+ content: string;
+ count: number;
+}
+
+export interface UserPositiveKeywordsRequest {
+ memberId?: number;
+ pageSize?: number;
+}
+
+export interface UserPositiveKeywordsResponse {
+ totalCount: number | null; // params에 pageSize 값을 보내지 않는 경우 null
+ reviewerCount: number | null; // params에 pageSize 값을 보내지 않는 경우 null
+ keywords: Keyword[];
+}
+
+export interface MyNegativeKeywordsRequest {
+ pageSize?: number;
+}
+
+export interface MyNegativeKeywordsResponse {
+ totalCount: number | null; // params에 pageSize 값을 보내지 않는 경우 null
+ reviewerCount: number | null; // params에 pageSize 값을 보내지 않는 경우 null
+ keywords: Keyword[];
+}
+
+export interface MyReviewWriter {
+ memberId: number;
+ memberName: string;
+ profileImageUrl: string;
+}
+
+export interface MyReviewItem {
+ id: number;
+ writer: MyReviewWriter;
+ reviewedAt: string; // ISO 날짜 문자열
+ content: string;
+ studySpaceId: number;
+ startDate: string; // YYYY-MM-DD
+ endDate: string; // YYYY-MM-DD
+ studySubjects: string[];
+}
+
+export interface MyReviewsRequest {
+ cursor: number | null;
+}
+
+export interface MyReviewsResponse {
+ totalCount: number;
+ reviews: {
+ items: MyReviewItem[];
+ nextCursor: number;
+ hasNext: boolean;
+ };
+}
diff --git a/src/features/study/model/use-review-query.ts b/src/features/study/model/use-review-query.ts
new file mode 100644
index 00000000..40e17990
--- /dev/null
+++ b/src/features/study/model/use-review-query.ts
@@ -0,0 +1,86 @@
+import {
+ useInfiniteQuery,
+ useMutation,
+ useQuery,
+ useSuspenseQuery,
+} from '@tanstack/react-query';
+import {
+ addStudyReview,
+ getUserPositiveKeywords,
+ getPartnerStudyReview,
+ getMyNegativeKeywords,
+ getMyReviews,
+} from '../api/get-review';
+import {
+ MyNegativeKeywordsRequest,
+ UserPositiveKeywordsRequest,
+} from '../api/types';
+
+export const usePartnerStudyReviewQuery = () => {
+ return useSuspenseQuery({
+ queryKey: ['partnerStudyReview'],
+ queryFn: getPartnerStudyReview,
+ });
+};
+
+export const useAddStudyReviewMutation = () => {
+ return useMutation({
+ mutationFn: addStudyReview,
+ onSuccess: () => {
+ // todo: 모달로 변경
+ alert('후기 작성이 완료되었습니다.');
+ },
+ });
+};
+
+export const useUserPositiveKeywordsQuery = (
+ params: UserPositiveKeywordsRequest,
+) => {
+ return useQuery({
+ queryKey: ['userPositiveKeywords', params],
+ queryFn: ({ queryKey }) => {
+ const [, requestParams] = queryKey as [
+ string,
+ UserPositiveKeywordsRequest,
+ ];
+
+ return getUserPositiveKeywords(requestParams);
+ },
+ });
+};
+
+export const useMyNegativeKeywordsQuery = (
+ params: MyNegativeKeywordsRequest,
+) => {
+ return useQuery({
+ queryKey: ['myNegativeKeywords', params],
+ queryFn: () => getMyNegativeKeywords(params),
+ });
+};
+
+export const useMyReviewsInfinityQuery = () => {
+ return useInfiniteQuery({
+ queryKey: ['myReviews'],
+ queryFn: ({ pageParam = null }) => getMyReviews({ cursor: pageParam }),
+ initialPageParam: null,
+ getNextPageParam: (lastPage) => {
+ if (lastPage.reviews.hasNext) {
+ return lastPage.reviews.nextCursor;
+ }
+
+ return undefined;
+ },
+ select: (data) => {
+ const allReviews = data.pages.flatMap((page) => page.reviews.items);
+ const lastPage = data.pages[data.pages.length - 1];
+ const totalCount = data.pages[0].totalCount;
+ const hasNext = lastPage.reviews.hasNext;
+
+ return {
+ reviews: allReviews,
+ totalCount,
+ hasNext,
+ };
+ },
+ });
+};
diff --git a/src/features/study/ui/start-study-modal.tsx b/src/features/study/ui/start-study-modal.tsx
index 4c3a190e..f563fe57 100644
--- a/src/features/study/ui/start-study-modal.tsx
+++ b/src/features/study/ui/start-study-modal.tsx
@@ -89,14 +89,23 @@ export default function StartStudyModal({ memberId }: StartStudyModalProps) {
return (
-
+
+
+
+ CS 스터디를 시작해 보세요!
+
+
+ 스터디 신청하기
+
+
+
+
+
+
+
+ CS 스터디를 시작해 보세요!
+
+
+ 스터디 신청하기
+
+
+
+
함께 스터디한 멤버에 대해 알려주세요
+
+
+
+ 같이 성장할 수 있는 스터디 문화를 만들기 위해 평가를 남겨주세요.
+
+ 평가한 내용은 성실 온도에 반영됩니다.
+
+
+
+ 스터디 만족도
+
+
+
+ {
+ setForm({
+ ...form,
+ satisfactionId: 10,
+ keywordIds: [],
+ content: '',
+ });
+ }}
+ />
+
+ {
+ setForm({
+ ...form,
+ satisfactionId: 20,
+ keywordIds: [],
+ content: '',
+ });
+ }}
+ />
+
+ {
+ setForm({
+ ...form,
+ satisfactionId: 30,
+ keywordIds: [],
+ content: '',
+ });
+ }}
+ />
+
+
+
+
+
+
+ {partner.memberName}
+
+
+
+
+ {data.studySubject}
+
+
+ {data.startDate} ~ {data.endDate}
+
+
+
+
+
+
+ 이런 점이 좋았어요
+
+ 필수
+
+
+
+ {positiveKeywords.map(({ id, keyword }) => (
+
+ {
+ handleToggle(id);
+ }}
+ />
+
+
+ ))}
+
+
+
+
+ 어떤 점이 좋았나요?
+
+
+
+ 같이 성장할 수 있는 스터디 문화를 만들기 위해 평가를 남겨주세요.
+
+ 평가한 내용은 성실 온도에 반영됩니다.
+
+
+
+
+
+
+
+ 이런 점이 아쉬웠어요
+
+ 필수
+
+
+
+ {negativeKeywords.map(({ id, keyword }) => (
+
+ {
+ handleToggle(id);
+ }}
+ />
+
+
+ ))}
+
+
+
+
+ 어떤 점이 아쉬웠나요?
+
+
+
+ 스터디 과정에서 아쉬웠던 점이 있다면, 이는 성장을 위한 소중한
+ 피드백이 됩니다.
+
+ 작성하신 내용은 오직 상대방만 확인할 수 있어요.
+
+
+
+
+
+
+ 여러분의 의견이 궁금해요!
+
+
+ 소중한 피드백을 기다리고 있어요
+
+
+
+
+
);
diff --git a/src/widgets/my-page/sidebar.tsx b/src/widgets/my-page/sidebar.tsx
index 2e9d9cb1..af28bc7a 100644
--- a/src/widgets/my-page/sidebar.tsx
+++ b/src/widgets/my-page/sidebar.tsx
@@ -49,9 +49,15 @@ export default function Sidebar() {
>
마이스터디
- {}} isActive={false}>
- 계정설정
+ router.push('/my-study-review')}
+ isActive={pathname === '/my-study-review'}
+ >
+ 스터디 리뷰
+ {/* {}} isActive={false}>
+ 계정설정
+ */}
로그아웃