Merge pull request #52 from YAPP-Github/MAFOO-38

[MAFOO-38] feat: 사진의 앨범 정보 등록 (사진 앨범 id 변경) 시 소유자가 없는 사진의 소유자 할당 로직 추가
YAPP-Github · Jul 28, 2024 · e5c460d · e5c460d
2 parents a16f704 + 9f6833b
commit e5c460d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/photo-service/src/main/java/kr/mafoo/photo/domain/PhotoEntity.java b/photo-service/src/main/java/kr/mafoo/photo/domain/PhotoEntity.java
@@ -62,6 +62,15 @@ public String getId() {
         return photoId;
     }
 
+    public Boolean hasOwnerMemberId() {
+        return this.getOwnerMemberId() != null;
+    }
+
+    public PhotoEntity updateOwnerMemberId(String ownerMemberId) {
+        this.ownerMemberId = ownerMemberId;
+        return this;
+    }
+
     public PhotoEntity updateAlbumId(String albumId) {
         this.albumId = albumId;
         return this;

diff --git a/photo-service/src/main/java/kr/mafoo/photo/service/PhotoService.java b/photo-service/src/main/java/kr/mafoo/photo/service/PhotoService.java
@@ -7,11 +7,13 @@
 import kr.mafoo.photo.repository.PhotoRepository;
 import kr.mafoo.photo.util.IdGenerator;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class PhotoService {
@@ -39,7 +41,7 @@ public Flux<PhotoEntity> findAllByAlbumId(String albumId, String requestMemberId
                 .findById(albumId)
                 .switchIfEmpty(Mono.error(new AlbumNotFoundException()))
                 .flatMapMany(albumEntity -> {
-                    if(!albumEntity.getOwnerMemberId().equals(requestMemberId)) {
+                    if (!albumEntity.getOwnerMemberId().equals(requestMemberId)) {
                         // 내 앨범이 아니면 그냥 없는 앨범 처리
                         return Mono.error(new AlbumNotFoundException());
                     } else {
@@ -54,7 +56,7 @@ public Mono<Void> deletePhotoById(String photoId, String requestMemberId) {
                 .findById(photoId)
                 .switchIfEmpty(Mono.error(new PhotoNotFoundException()))
                 .flatMap(photoEntity -> {
-                    if(!photoEntity.getOwnerMemberId().equals(requestMemberId)) {
+                    if (!photoEntity.getOwnerMemberId().equals(requestMemberId)) {
                         // 내 사진이 아니면 그냥 없는 사진 처리
                         return Mono.error(new PhotoNotFoundException());
                     } else {
@@ -70,15 +72,20 @@ public Mono<PhotoEntity> updatePhotoAlbumId(String photoId, String albumId, Stri
                 .findById(photoId)
                 .switchIfEmpty(Mono.error(new PhotoNotFoundException()))
                 .flatMap(photoEntity -> {
-                    if(!photoEntity.getOwnerMemberId().equals(requestMemberId)) {
+
+                    if (!photoEntity.hasOwnerMemberId()) {
+                        photoRepository.save(photoEntity.updateOwnerMemberId(requestMemberId));
+                    }
+
+                    if (!photoEntity.getOwnerMemberId().equals(requestMemberId)) {
                         // 내 사진이 아니면 그냥 없는 사진 처리
                         return Mono.error(new PhotoNotFoundException());
                     } else {
                         return albumRepository
                                 .findById(albumId)
                                 .switchIfEmpty(Mono.error(new AlbumNotFoundException()))
                                 .flatMap(albumEntity -> {
-                                    if(!albumEntity.getOwnerMemberId().equals(requestMemberId)) {
+                                    if (!albumEntity.getOwnerMemberId().equals(requestMemberId)) {
                                         // 내 앨범이 아니면 그냥 없는 앨범 처리
                                         return Mono.error(new AlbumNotFoundException());
                                     } else {