🛠️ ProfileFeed, User Content 이슈 수정 (#97)

* feat: user content 제거

* feat: ProfileFeed Interface와 관련 mockdata 삭제

* fix: feed mockdata id 오기입 수정

* feat: user test 코드 수정

uri 수정 및 test case 수정

* fix: userHandler 수정

profileFeed Interface 삭제에 따라 사용자별 피드 조회 handler가 feeds data로 적절하게 반환하도록 수정

Closes #93, #94

src/app/mocks/consts/feed.ts

@@ -21,11 +21,11 @@ export const feeds: Feeds = {
         imageUrl: 'https://picsum.photos/320/320',
       },
       {
-        id: 1,
+        id: 2,
         imageUrl: 'https://picsum.photos/320/320',
       },
       {
-        id: 2,
+        id: 3,
         imageUrl: 'https://picsum.photos/320/320',
       },
       {

src/app/mocks/consts/likeUser.ts

@@ -10,7 +10,6 @@ export const likeUsers: Users = {
     profileImage: '',
     name: '이의찬',
     username: 'Legitgoons',
-    content: '취업하고싶당',
     locked: false,
     feedCount: 124,
     followingCount: 2,
@@ -21,7 +20,6 @@ export const likeUsers: Users = {
     profileImage: '',
     name: '양재서',
     username: 'psychology50',
-    content: 'IMPM',
     locked: true,
     feedCount: 6,
     followingCount: 35,
@@ -32,7 +30,6 @@ export const likeUsers: Users = {
     profileImage: 'https://picsum.photos/32/32',
     name: '신얀',
     username: 'yanni13',
-    content: 'imiOSDev',
     locked: true,
     feedCount: 51,
     followingCount: 7897,
@@ -43,7 +40,6 @@ export const likeUsers: Users = {
     profileImage: 'https://picsum.photos/32/32',
     name: '이수민',
     username: 'SSXXMM22',
-    content: 'imdesigner',
     locked: true,
     feedCount: 24,
     followingCount: 42,
@@ -54,7 +50,6 @@ export const likeUsers: Users = {
     profileImage: 'https://picsum.photos/32/32',
     name: '안성윤',
     username: 'asn6878',
-    content: 'imbackend',
     locked: true,
     feedCount: 87,
     followingCount: 67,

src/app/mocks/consts/user.ts

@@ -10,7 +10,6 @@ export const users: Users = {
     profileImage: '',
     name: '강병준',
     username: 'bangdori',
-    content: '스타트업으로 갑니당',
     locked: false,
     feedCount: 100,
     followingCount: 347,
@@ -21,7 +20,6 @@ export const users: Users = {
     profileImage: '',
     name: '이의찬',
     username: 'Legitgoons',
-    content: '취업하고싶당',
     locked: false,
     feedCount: 124,
     followingCount: 2,
@@ -32,7 +30,6 @@ export const users: Users = {
     profileImage: '',
     name: '양재서',
     username: '오늘도밤샘',
-    content: 'IMPM',
     locked: true,
     feedCount: 6,
     followingCount: 35,
@@ -43,7 +40,6 @@ export const users: Users = {
     profileImage: 'https://picsum.photos/32/32',
     name: '이수민',
     username: 'SSXXMM22',
-    content: 'imdesigner',
     locked: true,
     feedCount: 24,
     followingCount: 42,
@@ -54,7 +50,6 @@ export const users: Users = {
     profileImage: 'https://picsum.photos/32/32',
     name: '신얀',
     username: 'yanni13',
-    content: 'imiOSDev',
     locked: true,
     feedCount: 51,
     followingCount: 7897,
@@ -65,7 +60,6 @@ export const users: Users = {
     profileImage: 'https://picsum.photos/32/32',
     name: '이주원',
     username: '2weeksone',
-    content: 'imdesignertoo',
     locked: false,
     feedCount: 97,
     followingCount: 98,
@@ -76,7 +70,6 @@ export const users: Users = {
     profileImage: 'https://picsum.photos/32/32',
     name: '안성윤',
     username: 'asn6878',
-    content: 'imbackend',
     locked: true,
     feedCount: 87,
     followingCount: 67,
@@ -87,7 +80,6 @@ export const users: Users = {
     profileImage: 'https://picsum.photos/32/32',
     name: '이진우',
     username: '네이버맨',
-    content: 'imbackendtoo',
     locked: false,
     feedCount: 32,
     followingCount: 24,
@@ -98,7 +90,6 @@ export const users: Users = {
     profileImage: 'https://picsum.photos/32/32',
     name: '최희진',
     username: '부자가될거야',
-    content: 'iLoveNewjeans',
     locked: false,
     feedCount: 66,
     followingCount: 1,

src/app/mocks/handler/user.ts

@@ -6,8 +6,9 @@ import {
 } from '../dir/response';
 
 import { users } from '../consts/user';
-import { profileFeeds } from '../consts/profileFeed';
+import { feeds } from '../consts/feed';
 import { reports } from '../consts/report';
+import { hiddens } from '../consts/hidden';
 
 export const userHandler = [
   // 1️⃣ 사용자 조회
@@ -27,8 +28,8 @@ export const userHandler = [
 
     return createHttpSuccessResponse({ user: user });
   }),
-  // 2️⃣ 사용자 프로필 피드 조회
-  http.get('/profile/:user_id', ({ request, params }) => {
+  // 2️⃣ 사용자별 피드 조회
+  http.get('/users/:user_id/feeds', ({ request, params }) => {
     const { user_id } = params;
 
     const url = new URL(request.url);
@@ -52,11 +53,12 @@ export const userHandler = [
     const formattedPage = Number(page);
     const pageCount = 5;
 
-    const profileFeedsData = Object.values(profileFeeds)
+    const profileFeedsData = Object.values(feeds)
+      .filter((feed) => formattedUserId === feed.user.id)
       .slice((formattedPage - 1) * pageCount, formattedPage * pageCount)
-      .filter((feed) => !reports[feed.id]);
+      .filter((feed) => !reports[feed.id] && !hiddens[feed.id]);
 
-    const totalFeeds = Object.values(profileFeeds).length;
+    const totalFeeds = Object.values(profileFeedsData).length;
     const endOfPageRange = formattedPage * pageCount;
     const hasNextPage = endOfPageRange < totalFeeds;
 

src/app/mocks/test/user/user.error.test.ts

@@ -36,7 +36,7 @@ describe('[GET] 프로필 피드 조회 API', () => {
     for (const userId of userIds) {
       const response = await axios({
         method: 'GET',
-        url: `/profile/${userId}`,
+        url: `/users/${userId}`,
       });
       const { code } = response.data;
 
@@ -49,7 +49,7 @@ describe('[GET] 프로필 피드 조회 API', () => {
 
     const response = await axios({
       method: 'GET',
-      url: `/profile/${userId}`,
+      url: `/users/${userId}`,
     });
     const { code } = response.data;
 
@@ -62,7 +62,7 @@ describe('[GET] 프로필 피드 조회 API', () => {
     for (const page of pages) {
       const response = await axios({
         method: 'GET',
-        url: `/profile/${userId}&p=${page}`,
+        url: `/users/${userId}/feeds?page=${page}`,
       });
       const { code } = response.data;
 

src/app/mocks/test/user/user.test.ts

@@ -9,7 +9,8 @@ async function getUserById(userId: number) {
 }
 
 async function getProfileFeedById(userId: number, page: number) {
-  const profileFeed = await axios.get(`/profile/${userId}?page=${page}`);
+  const profileFeed = await axios.get(`/users/${userId}/feeds?page=${page}`);
+
   const profileFeedData = profileFeed.data.data;
   return { profileFeedData };
 }
@@ -24,14 +25,13 @@ it('유저 정보 조회 시, id에 일치하는 유저 정보를 반환한다.'
 });
 
 it('유저의 ProfileFeed 조회 시, 해당 유저의 ProfileFeed를 반환한다.', async () => {
-  const userId = 4;
+  const userId = 1;
   let page = 1;
 
   // ProfileFeed 가져오기
   const { profileFeedData: profileFeedData } = await getProfileFeedById(
     userId,
     page,
   );
-
-  expect(profileFeedData.currentPageNumber).toBe(5);
+  expect(profileFeedData.feeds[0].images.length).toBe(10);
 });

src/shared/consts/types/index.ts

@@ -2,4 +2,3 @@ export type * from './feed';
 export type { Comment } from './comment';
 export type { Like } from './like';
 export type * from './user';
-export type { ProfileFeed } from './profileFeed';

src/shared/consts/types/user.ts

@@ -3,7 +3,6 @@ export interface User {
   profileImage: string;
   name: string;
   username: string;
-  content: string;
   locked: boolean;
 
   feedCount: number;