Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/auth.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const kakaoStrategy = new KakaoStrategy(
{
clientID: process.env.PASSPORT_KAKAO_CLIENT_ID,
clientSecret: process.env.PASSPORT_KAKAO_CLIENT_SECRET,
callbackURL: `${process.env.BASE_URL}/api/users/oauth2/callback/google`,
callbackURL: `${process.env.BASE_URL}/api/users/oauth2/callback/kakao`,
scope: undefined,
state: true,
},
Expand Down
60 changes: 33 additions & 27 deletions src/user/service/user.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,15 @@ export const UserService = {

const reviews = (await UserRepository.UserReviewList(userId)) ?? [];

const reviewsThumbnailImage = await Promise.all(
reviews.map(async (r) => {
const images = await reviewRepository.getImagesByTarget("review", r.id);
const reviewThumbnail = images?.[0]?.imageUrl ?? null;

return {...r, reviewThumbnail}
})
)



return {
Expand All @@ -141,7 +150,7 @@ export const UserService = {
profileImage:user.profileImage,
description: user.description,
badges,
reviews
reviews : reviewsThumbnailImage
}
}
}
Expand Down Expand Up @@ -361,36 +370,33 @@ export const UserService = {
const reviews = await Promise.all(
rawReviews.map(async (r) => {




const start = r.request.inProgressAt ? new Date(r.request.inProgressAt) : null;
const end = r.request.completedAt ? new Date(r.request.completedAt) : null;
const start = r.request.inProgressAt ? new Date(r.request.inProgressAt) : null;
const end = r.request.completedAt ? new Date(r.request.completedAt) : null;


let workingTime = null;
if (start && end) {
const diffMs = end - start;
const hours = Math.floor(diffMs / (1000 * 60 * 60));
workingTime = hours < 24 ? `${hours}시간` : `${Math.floor(hours / 24)}일`;
}
let workingTime = null;
if (start && end) {
const diffMs = end - start;
const hours = Math.floor(diffMs / (1000 * 60 * 60));
workingTime = hours < 24 ? `${hours}시간` : `${Math.floor(hours / 24)}일`;
}

const images = await reviewRepository.getImagesByTarget('review', r.id);
const images = await reviewRepository.getImagesByTarget('review', r.id);

return {
id: r.id,
rate: r.rate,
content: r.content,
createdAt: r.createdAt,
commissionTitle: r.request.commission.title,
workingTime: workingTime,
review_thumbnail: images.length > 0 ? images[0] : null,
writer: {
nickname: r.user.nickname
},
};
})
);
return {
id: r.id,
rate: r.rate,
content: r.content,
createdAt: r.createdAt,
commissionTitle: r.request.commission.title,
workingTime: workingTime,
review_thumbnail: images.length > 0 ? images[0] : null,
writer: {
nickname: r.user.nickname
},
};
})
);

// 작가가 등록한 커미션 목록
const commissions = await UserRepository.FetchArtistCommissions(artistId, userId);
Expand Down