diff --git a/src/user/controller/user.controller.js b/src/user/controller/user.controller.js index ae14009..3c68842 100644 --- a/src/user/controller/user.controller.js +++ b/src/user/controller/user.controller.js @@ -181,6 +181,7 @@ export const AccessArtistProfile = async(req, res, next) => { try{ const artistId = req.params.artistId; const accountId = req.user.accountId; + const userId = req.user.userId; const result = await UserService.AccessArtistProfile(artistId, accountId); diff --git a/src/user/repository/user.repository.js b/src/user/repository/user.repository.js index 2df62ec..e8f7066 100644 --- a/src/user/repository/user.repository.js +++ b/src/user/repository/user.repository.js @@ -287,7 +287,7 @@ export const UserRepository = { }) }, // 작가가 등록한 커미션 목록 불러오기 - async FetchArtistCommissions(artistId) { + async FetchArtistCommissions(artistId, userId) { return await prisma.commission.findMany({ where: { artistId: artistId }, select: { @@ -302,6 +302,10 @@ export const UserRepository = { select: { tag: { select: { name: true } } } + }, + bookmarks:{ + where:{userId}, + select:{id:true} } } }); diff --git a/src/user/service/user.service.js b/src/user/service/user.service.js index 6e2731d..186d2b5 100644 --- a/src/user/service/user.service.js +++ b/src/user/service/user.service.js @@ -343,7 +343,7 @@ export const UserService = { return await BadgeRepository.ViewUserBadges(accountId); }, // 작가 프로필 조회하기 - async AccessArtistProfile(artistId, accountId) { + async AccessArtistProfile(artistId, accountId, userId) { const profile = await UserRepository.AccessArtistProfile(artistId); const rawReviews = await UserRepository.ArtistReviews(artistId); @@ -371,7 +371,7 @@ export const UserService = { }}); // 작가가 등록한 커미션 목록 - const commissions = await UserRepository.FetchArtistCommissions(artistId); + const commissions = await UserRepository.FetchArtistCommissions(artistId, userId); const commissionList = commissions.map(c=> ({ id: c.id, title: c.title, @@ -379,7 +379,8 @@ export const UserService = { minPrice: c.minPrice, category: c.category.name, tags: c.commissionTags.map(t => t.tag.name), - thumbnail: c.thumbnailImage // 컬럼 존재 시 + thumbnail: c.thumbnailImage, // 컬럼 존재 시 + bookmark: c.bookmarks.length > 0 }));