Merge pull request #411 from depromeet/fix/406-memory-detail-id-npe

fix: ImmutableCollections 문제 해결
depromeet · Sep 10, 2024 · 0eab87f · 0eab87f
2 parents 9cde333 + 6144b9a
commit 0eab87f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.../persistence-database/src/main/java/com/depromeet/memory/repository/MemoryRepository.java b/.../persistence-database/src/main/java/com/depromeet/memory/repository/MemoryRepository.java
@@ -20,6 +20,7 @@
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -209,7 +210,10 @@ public MemoryAndDetailId findMemoryAndDetailIdsByMemberId(Long memberId) {
                         .fetch();
         List<Long> memoryIds = result.stream().map(r -> r.get(memory.id)).toList();
         List<Long> memoryDetailIds =
-                result.stream().map(r -> r.get(memory.memoryDetail.id)).toList();
+                result.stream()
+                        .map(r -> r.get(memory.memoryDetail.id))
+                        .filter(Objects::nonNull)
+                        .toList();
         return new MemoryAndDetailId(memoryIds, memoryDetailIds);
     }
 

diff --git a/module-presentation/src/main/java/com/depromeet/auth/facade/AuthFacade.java b/module-presentation/src/main/java/com/depromeet/auth/facade/AuthFacade.java
@@ -32,7 +32,6 @@
 import com.depromeet.reaction.port.in.usecase.DeleteReactionUseCase;
 import com.depromeet.reaction.port.in.usecase.GetReactionUseCase;
 import com.depromeet.type.auth.AuthErrorType;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 import lombok.RequiredArgsConstructor;
@@ -136,7 +135,6 @@ public void deleteAccount(Long memberId) {
                 getMemoryUseCase.findMemoryAndDetailIdsByMemberId(memberId);
         List<Long> memoryIds = memoryAndDetailId.memoryIds();
         List<Long> memoryDetailIds = memoryAndDetailId.memoryDetailIds();
-        memoryDetailIds.removeAll(Collections.singletonList(null));
         // Following memory log 삭제
         followingMemoryLogUseCase.deleteAllByMemoryIds(memoryIds);
         // Reaction 조회