Revert "feat: add photo count to album"

This reverts commit 9eacb5e.
YAPP-Github · Jul 19, 2024 · d603fff · d603fff
1 parent 9eacb5e
commit d603fff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 26 deletions.
diff --git a/photo-service/src/main/java/kr/mafoo/photo/controller/dto/response/AlbumResponse.java b/photo-service/src/main/java/kr/mafoo/photo/controller/dto/response/AlbumResponse.java
@@ -16,14 +16,14 @@ public record AlbumResponse(
         AlbumType type,
 
         @Schema(description = "앨범 내 사진 수", example = "6")
-        Long photoCount
+        String photoCount
 ) {
         public static AlbumResponse fromEntity(AlbumEntity entity) {
                 return new AlbumResponse(
                         entity.getAlbumId(),
                         entity.getName(),
                         entity.getType(),
-                        entity.getPhotoCount()
+                        "0"
                 );
         }
 }
diff --git a/photo-service/src/main/java/kr/mafoo/photo/domain/AlbumEntity.java b/photo-service/src/main/java/kr/mafoo/photo/domain/AlbumEntity.java
@@ -42,9 +42,6 @@ public class AlbumEntity implements Persistable<String> {
     @Transient
     private boolean isNew = false;
 
-    @Transient
-    private long photoCount = 0;
-
     @Override
     public boolean equals(Object obj) {
        if (this == obj) return true;

diff --git a/photo-service/src/main/java/kr/mafoo/photo/repository/PhotoRepository.java b/photo-service/src/main/java/kr/mafoo/photo/repository/PhotoRepository.java
@@ -3,9 +3,7 @@
 import kr.mafoo.photo.domain.PhotoEntity;
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 public interface PhotoRepository extends R2dbcRepository<PhotoEntity, String> {
     Flux<PhotoEntity> findAllByAlbumId(String ownerAlbumId);
-    Mono<Long> countAllByAlbumId(String albumId);
-}
+}
diff --git a/photo-service/src/main/java/kr/mafoo/photo/service/AlbumService.java b/photo-service/src/main/java/kr/mafoo/photo/service/AlbumService.java
@@ -4,7 +4,6 @@
 import kr.mafoo.photo.domain.AlbumType;
 import kr.mafoo.photo.exception.AlbumNotFoundException;
 import kr.mafoo.photo.repository.AlbumRepository;
-import kr.mafoo.photo.repository.PhotoRepository;
 import kr.mafoo.photo.util.IdGenerator;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -15,39 +14,27 @@
 @Service
 public class AlbumService {
     private final AlbumRepository albumRepository;
-    private final PhotoRepository photoRepository;
 
     public Mono<AlbumEntity> createNewAlbum(String ownerMemberId, String albumName, AlbumType albumType) {
         AlbumEntity albumEntity = AlbumEntity.newAlbum(IdGenerator.generate(), albumName, albumType, ownerMemberId);
         return albumRepository.save(albumEntity);
     }
 
     public Flux<AlbumEntity> findAllByOwnerMemberId(String ownerMemberId) {
-        return albumRepository
-                .findAllByOwnerMemberId(ownerMemberId)
-                .flatMap((albumEntity) -> photoRepository
-                        .countAllByAlbumId(albumEntity.getId())
-                        .map(photoCount -> {
-                            albumEntity.setPhotoCount(photoCount);
-                            return albumEntity;
-                        })
-                );
+        return albumRepository.findAllByOwnerMemberId(ownerMemberId);
     }
 
     public Mono<AlbumEntity> findByAlbumId(String albumId, String requestMemberId) {
         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 {
                         return Mono.just(albumEntity);
                     }
-                }).zipWith(photoRepository.countAllByAlbumId(albumId), (album, albumCount) -> {
-                    album.setPhotoCount(albumCount);
-                    return album;
                 });
     }
 
@@ -56,7 +43,7 @@ public Mono<Void> deleteAlbumById(String albumId, String requestMemberId) {
                 .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 {
@@ -70,7 +57,7 @@ public Mono<AlbumEntity> updateAlbumName(String albumId, String albumName, Strin
                 .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 {
@@ -84,7 +71,7 @@ public Mono<AlbumEntity> updateAlbumType(String albumId, AlbumType albumType, St
                 .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 {