diff --git a/src/auth.config.js b/src/auth.config.js index e6c4aec..f89c67f 100644 --- a/src/auth.config.js +++ b/src/auth.config.js @@ -54,7 +54,7 @@ export const kakaoStrategy = new KakaoStrategy( { clientID: process.env.PASSPORT_KAKAO_CLIENT_ID, clientSecret: process.env.PASSPORT_KAKAO_CLIENT_SECRET, - callbackURL: "http://localhost:3000/api/users/oauth2/callback/kakao", + callbackURL: `${process.env.BASE_URL}/api/users/oauth2/callback/google`, scope: undefined, state: true, }, diff --git a/src/common/swagger/user.json b/src/common/swagger/user.json index 2642bf6..248cefa 100644 --- a/src/common/swagger/user.json +++ b/src/common/swagger/user.json @@ -762,6 +762,7 @@ "createdAt" :{"type":"string", "example": "2025-08-04T02:31:36.000Z"}, "commissionTitle":{"type":"string", "example":"테스트 커미션 글"}, "workingTime":{"type":"string", "example":"33일"}, + "review_thumbnail":{"type":"string", "example":"https://example.com/reviewThumbnail1.png"}, "writer":{ "type":"object", "properties":{ @@ -785,6 +786,7 @@ "items":{"type":"string"}, "example":["감성", "낙서"] }, + "bookmark":{"type":"boolean", "example":false, "commission_img":{"type":"string", "example":"http://example.com/image.jpg"} } } @@ -846,5 +848,5 @@ } } } - +} diff --git a/src/user/service/user.service.js b/src/user/service/user.service.js index 83e7403..fbef300 100644 --- a/src/user/service/user.service.js +++ b/src/user/service/user.service.js @@ -384,19 +384,19 @@ export const UserService = { createdAt: r.createdAt, commissionTitle: r.request.commission.title, workingTime: workingTime, + review_thumbnail: images.length > 0 ? images[0] : null, writer: { nickname: r.user.nickname }, - reviewImage: images - }; - }) + }; + }) ); // 작가가 등록한 커미션 목록 const commissions = await UserRepository.FetchArtistCommissions(artistId, userId); const commissionList = await Promise.all( commissions.map(async (c) => { - const images = await CommissionRepository.findImagesByCommissionId(c.id); // c.id == targetId + const images = await CommissionRepository.findThumbnailImageByCommissionId(c.id); // c.id == targetId return { id: c.id, @@ -407,7 +407,7 @@ export const UserService = { tags: c.commissionTags.map(t => t.tag.name), thumbnail: c.thumbnailImage, bookmark: c.bookmarks.length > 0, - commission_img: images.length > 0 ? images[0].url : null // 첫 번째 이미지를 대표로 + commission_img: images?.imageUrl ?? null }; }) );