[Fix] confilct 해결 #151

AppCenter-Snaptime · Oct 1, 2024 · 1451f88 · 1451f88
2 parents 25fa1aa + 7275c9a
commit 1451f88
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/src/main/java/me/snaptime/profile/service/ProfileService.java b/src/main/java/me/snaptime/profile/service/ProfileService.java
@@ -17,4 +17,5 @@ public interface ProfileService {
     /* loginId에 해당하는 User가 Tag된 snap들을 조회합니다 */
     List<ProfileTagSnapResDto> getTagSnap(String email);
 
+
 }
diff --git a/src/main/java/me/snaptime/profile/service/impl/ProfileServiceImpl.java b/src/main/java/me/snaptime/profile/service/impl/ProfileServiceImpl.java
@@ -79,4 +79,8 @@ public List<ProfileTagSnapResDto> getTagSnap(String email) {
         return profileRepository.findTagSnap(user);
     }
 
+
+
+
+
 }
diff --git a/src/main/java/me/snaptime/snap/dto/res/SnapDetailInfoResDto.java b/src/main/java/me/snaptime/snap/dto/res/SnapDetailInfoResDto.java
@@ -26,6 +26,7 @@ public record SnapDetailInfoResDto(
         List<TagUserFindResDto> tagUserFindResDtos,
         Long likeCnt,
         boolean isLikedSnap
+
 ) {
     public static SnapDetailInfoResDto toDto(Tuple tuple, String profilePhotoURL, String snapPhotoURL,
                                              List<TagUserFindResDto> tagUserFindResDtos, Long likeCnt, boolean isLikedSnap){

diff --git a/src/main/java/me/snaptime/snap/service/impl/SnapServiceImpl.java b/src/main/java/me/snaptime/snap/service/impl/SnapServiceImpl.java
@@ -85,18 +85,20 @@ public Long createSnap(CreateSnapReqDto createSnapReqDto, String userEmail, bool
     }
 
     @Override
-    public SnapDetailInfoResDto findSnap(Long id, String userEmail) {
-        Snap foundSnap = snapRepository.findById(id).orElseThrow(() -> new CustomException(ExceptionCode.SNAP_NOT_EXIST));
-        if(foundSnap.isPrivate()) {
-            User foundUser = userRepository.findByEmail(userEmail).orElseThrow(() -> new CustomException(ExceptionCode.USER_NOT_EXIST));
-            // Snap이 비공개라면, 요청한 유저와 스냅의 ID가 일치하는지 확인한다.
-            if (!Objects.equals(foundUser.getUserId(), foundSnap.getUser().getUserId())) {
-                throw new CustomException(ExceptionCode.SNAP_IS_PRIVATE);
+        public SnapDetailInfoResDto findSnap(Long id, String userEmail) {
+            Snap foundSnap = snapRepository.findById(id).orElseThrow(() -> new CustomException(ExceptionCode.SNAP_NOT_EXIST));
+            if(foundSnap.isPrivate()) {
+                User foundUser = userRepository.findByEmail(userEmail).orElseThrow(() -> new CustomException(ExceptionCode.USER_NOT_EXIST));
+                // Snap이 비공개라면, 요청한 유저와 스냅의 ID가 일치하는지 확인한다.
+                if (!Objects.equals(foundUser.getUserId(), foundSnap.getUser().getUserId())) {
+                    throw new CustomException(ExceptionCode.SNAP_IS_PRIVATE);
+                }
             }
-        }
+
         String snapPhotoUrl = urlComponent.makePhotoURL(foundSnap.getFileName(), foundSnap.isPrivate());
         String profilePhotoUrl = urlComponent.makeProfileURL(foundSnap.getUser().getProfilePhoto().getProfilePhotoId());
         List<TagUserFindResDto> tagUserFindResDtos = snapTagService.findTagUsers(foundSnap.getId(), userEmail);
+
         Long likeCnt = snapLikeService.findSnapLikeCnt(foundSnap.getId());
         boolean isLikedSnap = snapLikeService.isLikedSnap(foundSnap.getId(), userEmail);
         return SnapDetailInfoResDto.toDto(foundSnap, profilePhotoUrl, snapPhotoUrl, tagUserFindResDtos, likeCnt, isLikedSnap);

diff --git a/src/main/resources/test_resource/default.png b/src/main/resources/test_resource/default.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,5 @@ public interface ProfileService {
		/* loginId에 해당하는 User가 Tag된 snap들을 조회합니다 */
		List<ProfileTagSnapResDto> getTagSnap(String email);


		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -79,4 +79,8 @@ public List<ProfileTagSnapResDto> getTagSnap(String email) {
		return profileRepository.findTagSnap(user);
		}





		}