#90 fix : profile url 변경

Journey-Together · Aug 28, 2024 · b39081d · b39081d
1 parent 162427f
commit b39081d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/Journey/Together/domain/bookbark/service/BookmarkService.java b/src/main/java/Journey/Together/domain/bookbark/service/BookmarkService.java
@@ -128,7 +128,7 @@ public List<PlanBookmarkRes> getPlanBookmarks(Member member) {
 
         List<PlanBookmark> planBookmarkList = planBookmarkRepository.findAllByMemberOrderByCreatedAtDesc(member);
         planBookmarkList.forEach( planBookmark -> {
-            list.add(PlanBookmarkRes.of(planBookmark.getPlan(),s3Client.getUrl()+planBookmark.getPlan().getMember().getProfileUuid()+"/profile",getPlanImageUrl(member, planBookmark.getPlan())));
+            list.add(PlanBookmarkRes.of(planBookmark.getPlan(),s3Client.getUrl()+planBookmark.getPlan().getMember().getProfileUuid()+"/profile_"+planBookmark.getPlan().getMember().getProfileUuid(),getPlanImageUrl(member, planBookmark.getPlan())));
         });
 
         return list;

diff --git a/src/main/java/Journey/Together/domain/member/service/AuthService.java b/src/main/java/Journey/Together/domain/member/service/AuthService.java
@@ -61,7 +61,7 @@ public LoginRes signIn(String token, String type) throws IOException {
             if(member == null) {
                 MultipartFile imageFile = convertUrlToMultipartFile(kakaoProfile.kakao_account().profile().profile_image_url());
                 String uuid = s3Client.createFolder();
-                s3Client.upload(imageFile,uuid,"profile");
+                s3Client.upload(imageFile,uuid,"profile_"+uuid);
                 Member newMember = Member.builder()
                         .email(kakaoProfile.kakao_account().email())
                         .name(kakaoProfile.kakao_account().name())
@@ -95,7 +95,7 @@ public LoginRes signIn(String token, String type) throws IOException {
             if (member == null) {
                 MultipartFile imageFile = convertUrlToMultipartFile(naverProfile.getProfile_image() != null ? naverProfile.getProfile_image() : null);
                 String uuid = s3Client.createFolder();
-                s3Client.upload(imageFile,uuid,"profile");
+                s3Client.upload(imageFile,uuid,"profile_"+uuid);
 
                 Member newMember = Member.builder()
                         .email(naverProfile.getEmail() != null ? naverProfile.getEmail() : "Unknown")

diff --git a/src/main/java/Journey/Together/domain/member/service/MemberService.java b/src/main/java/Journey/Together/domain/member/service/MemberService.java
@@ -48,7 +48,7 @@ public void saveInfo(Member member, MultipartFile profileImage, MemberReq member
         memberRepository.findMemberByEmailAndDeletedAtIsNull(member.getEmail()).orElseThrow(()->new ApplicationException(ErrorCode.NOT_FOUND_EXCEPTION));
         //Business
         if (profileImage != null) {
-            s3Client.update(member.getProfileUuid()+"/profile",profileImage);
+            s3Client.update(member.getProfileUuid()+"/profile_"+member.getProfileUuid(),profileImage);
             memberRepository.save(member);
         }
         if(memberReq == null){
@@ -94,7 +94,7 @@ public MemberRes findMemberInfo(Member member){
         // Validation
         memberRepository.findMemberByEmailAndDeletedAtIsNull(member.getEmail()).orElseThrow(()->new ApplicationException(ErrorCode.NOT_FOUND_EXCEPTION));
         //Business
-        MemberRes memberRes = MemberRes.of(member, s3Client.getUrl()+member.getProfileUuid()+"/profile");
+        MemberRes memberRes = MemberRes.of(member, s3Client.getUrl()+member.getProfileUuid()+"/profile_"+member.getProfileUuid());
         //Response
         return memberRes;
     }

diff --git a/src/main/java/Journey/Together/domain/place/service/PlaceService.java b/src/main/java/Journey/Together/domain/place/service/PlaceService.java
@@ -101,9 +101,9 @@ public PlaceDetailRes getPlaceDetail(Member member, Long placeId){
         placeReviews.forEach(placeReview -> {
             List<PlaceReviewImg> placeReviewImgs = placeReviewImgRepository.findAllByPlaceReview(placeReview);
             if (placeReviewImgs.size() > 0) {
-                reviewList.add(PlaceReviewDto.of(placeReview, s3Client.getUrl()+placeReview.getMember().getProfileUuid()+"/profile",placeReviewImgs.stream().map(PlaceReviewImg::getImgUrl).toList()));
+                reviewList.add(PlaceReviewDto.of(placeReview, s3Client.getUrl()+placeReview.getMember().getProfileUuid()+"/profile_"+placeReview.getMember().getProfileUuid(),placeReviewImgs.stream().map(PlaceReviewImg::getImgUrl).toList()));
             } else
-                reviewList.add(PlaceReviewDto.of(placeReview,s3Client.getUrl()+placeReview.getMember().getProfileUuid()+"/profile", null));
+                reviewList.add(PlaceReviewDto.of(placeReview,s3Client.getUrl()+placeReview.getMember().getProfileUuid()+"/profile_"+placeReview.getMember().getProfileUuid(), null));
         });
 
         return PlaceDetailRes.of(place, isMark, placeBookmarkList.size(), disability, subDisability, reviewList, isReview);
@@ -128,9 +128,9 @@ public PlaceDetailGuestRes getGeustPlaceDetail(Long placeId){
         placeReviews.forEach(placeReview -> {
             List<PlaceReviewImg> placeReviewImgs = placeReviewImgRepository.findAllByPlaceReview(placeReview);
             if (placeReviewImgs.size() > 0) {
-                reviewList.add(PlaceReviewDto.of(placeReview, s3Client.getUrl()+placeReview.getMember().getProfileUuid()+"/profile",placeReviewImgs.stream().map(PlaceReviewImg::getImgUrl).toList()));
+                reviewList.add(PlaceReviewDto.of(placeReview, s3Client.getUrl()+placeReview.getMember().getProfileUuid()+"/profile_"+placeReview.getMember().getProfileUuid(),placeReviewImgs.stream().map(PlaceReviewImg::getImgUrl).toList()));
             } else
-                reviewList.add(PlaceReviewDto.of(placeReview,s3Client.getUrl()+placeReview.getMember().getProfileUuid()+"/profile", null));
+                reviewList.add(PlaceReviewDto.of(placeReview,s3Client.getUrl()+placeReview.getMember().getProfileUuid()+"/profile_"+placeReview.getMember().getProfileUuid(), null));
         });
 
 

diff --git a/src/main/java/Journey/Together/domain/plan/service/PlanService.java b/src/main/java/Journey/Together/domain/plan/service/PlanService.java
@@ -227,7 +227,7 @@ public PlanReviewRes findPlanReview(Member member,long planId){
             isWriter = plan.getMember().getMemberId().equals(member.getMemberId());
         }
         List<String> imageList = getReviewImageList(plan);
-        String profileUrl = s3Client.baseUrl()+plan.getMember().getProfileUuid()+"/profile";
+        String profileUrl = s3Client.baseUrl()+plan.getMember().getProfileUuid()+"/profile_"+plan.getMember().getProfileUuid();
         if(planReview==null){
             return PlanReviewRes.of(null,null,null,isWriter,false,imageList,profileUrl);
         }else {
@@ -359,7 +359,7 @@ public OpenPlanPageRes findOpenPlans(Pageable page){
         Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize(), Sort.by("createdAt").descending());
         Page<Plan> planPage = planRepository.findAllByEndDateBeforeAndIsPublicIsTrueAndDeletedAtIsNull(LocalDate.now(),pageable);
         List<OpenPlanRes> openPlanResList = planPage.getContent().stream()
-                .map(plan -> OpenPlanRes.of(plan, s3Client.baseUrl()+plan.getMember().getProfileUuid()+"/profile",getPlaceFirstImage(plan)))
+                .map(plan -> OpenPlanRes.of(plan, s3Client.baseUrl()+plan.getMember().getProfileUuid()+"/profile_"+plan.getMember().getProfileUuid(),getPlaceFirstImage(plan)))
                 .collect(Collectors.toList());
         return OpenPlanPageRes.of(openPlanResList,planPage.getNumber(),planPage.getSize(),planPage.getTotalPages(),planPage.isLast());
     }