[BE] Refactor/#540 지연로딩의 경우, soft delete을 반영할 수 없는 문제 해결

backend/src/main/java/com/mapbefine/mapbefine/admin/application/AdminCommandService.java

@@ -1,5 +1,6 @@
 package com.mapbefine.mapbefine.admin.application;
 
+import static com.mapbefine.mapbefine.pin.exception.PinErrorCode.PIN_NOT_FOUND;
 import static com.mapbefine.mapbefine.topic.exception.TopicErrorCode.TOPIC_NOT_FOUND;
 
 import com.mapbefine.mapbefine.atlas.domain.AtlasRepository;
@@ -11,19 +12,23 @@
 import com.mapbefine.mapbefine.pin.domain.Pin;
 import com.mapbefine.mapbefine.pin.domain.PinImageRepository;
 import com.mapbefine.mapbefine.pin.domain.PinRepository;
+import com.mapbefine.mapbefine.pin.exception.PinException.PinNotFoundException;
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import com.mapbefine.mapbefine.topic.domain.TopicRepository;
 import com.mapbefine.mapbefine.topic.exception.TopicException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.util.List;
 import java.util.NoSuchElementException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Transactional
 public class AdminCommandService {
 
+    @PersistenceContext
+    private EntityManager entityManager;
     private final MemberRepository memberRepository;
     private final TopicRepository topicRepository;
     private final PinRepository pinRepository;
@@ -61,12 +66,13 @@ private void deleteAllRelatedMember(Member member) {
         List<Long> pinIds = extractPinIdsByMember(member);
         Long memberId = member.getId();
 
-        pinImageRepository.deleteAllByPinIds(pinIds);
-        topicRepository.deleteAllByMemberId(memberId);
-        pinRepository.deleteAllByMemberId(memberId);
         permissionRepository.deleteAllByMemberId(memberId);
         atlasRepository.deleteAllByMemberId(memberId);
         bookmarkRepository.deleteAllByMemberId(memberId);
+        entityManager.flush();
+        pinImageRepository.deleteAllByPinIds(pinIds);
+        pinRepository.deleteAllByMemberId(memberId);
+        topicRepository.deleteAllByMemberId(memberId);
     }
 
     private Member findMemberById(Long id) {
@@ -91,12 +97,18 @@ public void deleteTopicImage(Long topicId) {
     }
 
     private Topic findTopicById(Long topicId) {
-        return topicRepository.findByIdAndIsDeletedFalse(topicId)
+        return topicRepository.findById(topicId)
                 .orElseThrow(() -> new TopicException.TopicNotFoundException(TOPIC_NOT_FOUND, List.of(topicId)));
     }
 
     public void deletePin(Long pinId) {
-        pinRepository.deleteById(pinId);
+        Pin pin = pinRepository.findById(pinId)
+                .orElseThrow(() -> new PinNotFoundException(PIN_NOT_FOUND, pinId));
+
+        /// TODO: 2023/10/05 soft delete를 @Query로 구현하면서, pinCount 반영을 통합할 수 없음
+        pin.decrementTopicPinCount();
+        pinRepository.deleteById(pin.getId());
+        /// TODO: 2023/10/05  pinImage는?
     }
 
     public void deletePinImage(Long pinImageId) {

backend/src/main/java/com/mapbefine/mapbefine/atlas/application/AtlasCommandService.java

@@ -13,11 +13,10 @@
 import com.mapbefine.mapbefine.member.domain.MemberRepository;
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import com.mapbefine.mapbefine.topic.domain.TopicRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.util.NoSuchElementException;
 import java.util.Objects;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Transactional
@@ -73,7 +72,7 @@ private boolean isTopicAlreadyAdded(Long topicId, Long memberId) {
     }
 
     private Topic findTopicById(Long topicId) {
-        return topicRepository.findByIdAndIsDeletedFalse(topicId)
+        return topicRepository.findById(topicId)
                 .orElseThrow(() -> new AtlasBadRequestException(ILLEGAL_TOPIC_ID));
     }
 

backend/src/main/java/com/mapbefine/mapbefine/auth/application/AuthService.java

@@ -11,7 +11,6 @@
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,6 +30,7 @@ public void validateMember(Long memberId) {
         }
     }
 
+    // TODO 테스트가 필요하긴 한데, MemberQueryService와 너무 중복되는 내용이다. 엔티티 테스트로 중복을 없앨 수 있으면 좋겠다.
     public AuthMember findAuthMemberByMemberId(Long memberId) {
         return memberRepository.findById(memberId)
                 .map(this::convertToAuthMember)
@@ -63,15 +63,4 @@ private List<Long> getCreatedTopics(Member member) {
                 .toList();
     }
 
-    public boolean isAdmin(Long memberId) {
-        if (Objects.isNull(memberId)) {
-            return false;
-        }
-
-        Optional<Member> member = memberRepository.findById(memberId);
-
-        return member.map(Member::isAdmin)
-                .orElse(false);
-    }
-
 }

backend/src/main/java/com/mapbefine/mapbefine/bookmark/application/BookmarkCommandService.java

@@ -15,11 +15,10 @@
 import com.mapbefine.mapbefine.member.domain.MemberRepository;
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import com.mapbefine.mapbefine.topic.domain.TopicRepository;
+import java.util.NoSuchElementException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.NoSuchElementException;
-
 @Service
 @Transactional
 public class BookmarkCommandService {
@@ -53,7 +52,7 @@ public Long addTopicInBookmark(AuthMember authMember, Long topicId) {
     }
 
     private Topic getTopicById(Long topicId) {
-        return topicRepository.findByIdAndIsDeletedFalse(topicId)
+        return topicRepository.findById(topicId)
                 .orElseThrow(() -> new BookmarkBadRequestException(ILLEGAL_TOPIC_ID));
     }
 

backend/src/main/java/com/mapbefine/mapbefine/bookmark/domain/BookmarkRepository.java

@@ -1,15 +1,12 @@
 package com.mapbefine.mapbefine.bookmark.domain;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-
 import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
 
     boolean existsByMemberIdAndTopicId(Long memberId, Long topicId);
 
-    @Modifying(clearAutomatically = true)
     void deleteAllByMemberId(Long memberId);
 
     Optional<Bookmark> findByMemberIdAndTopicId(Long memberId, Long topicId);

backend/src/main/java/com/mapbefine/mapbefine/member/application/MemberCommandService.java

@@ -26,7 +26,7 @@ public void updateInfoById(AuthMember authMember, MemberUpdateRequest request) {
 
         validateNicknameDuplicated(nickName);
 
-        member.update(nickName);
+        member.updateNickName(nickName);
     }
 
     private Member findMemberById(Long memberId) {

backend/src/main/java/com/mapbefine/mapbefine/member/application/MemberQueryService.java

@@ -66,7 +66,7 @@ public List<MemberResponse> findAll() {
     public List<TopicResponse> findAllTopicsInBookmark(AuthMember authMember) {
         Member member = findMemberById(authMember.getMemberId());
 
-        List<Topic> bookMarkedTopics = topicRepository.findTopicsByBookmarksMemberIdAndIsDeletedFalse(
+        List<Topic> bookMarkedTopics = topicRepository.findTopicsByBookmarksMemberId(
                 authMember.getMemberId());
         return bookMarkedTopics.stream()
                 .map(topic -> TopicResponse.from(

backend/src/main/java/com/mapbefine/mapbefine/member/domain/Member.java

@@ -104,12 +104,16 @@ private static String createNicknameSuffix() {
                 .substring(0, DEFAULT_NICKNAME_SUFFIX_LENGTH);
     }
 
-    public void update(
+    public void updateNickName(
             String nickName
     ) {
         memberInfo = memberInfo.createUpdatedMemberInfo(nickName);
     }
 
+    public void updateStatus(Status status) {
+        memberInfo = memberInfo.createUpdatedMemberInfo(status);
+    }
+
     public void addTopic(Topic topic) {
         createdTopics.add(topic);
     }
@@ -147,14 +151,4 @@ public List<Topic> getTopicsWithPermissions() {
     public boolean isNormalStatus() {
         return memberInfo.getStatus() == Status.NORMAL;
     }
-
-    public void updateStatus(Status status) {
-        memberInfo = MemberInfo.of(
-                memberInfo.getNickName(),
-                memberInfo.getEmail(),
-                memberInfo.getImageUrl(),
-                memberInfo.getRole(),
-                status
-        );
-    }
 }

backend/src/main/java/com/mapbefine/mapbefine/member/domain/MemberInfo.java

@@ -113,6 +113,11 @@ public MemberInfo createUpdatedMemberInfo(String nickName) {
         return MemberInfo.of(nickName, this.email, this.imageUrl.getImageUrl(), this.role, this.status);
     }
 
+    public MemberInfo createUpdatedMemberInfo(Status status) {
+
+        return MemberInfo.of(this.nickName, this.email, this.imageUrl.getImageUrl(), this.role, status);
+    }
+
     public String getImageUrl() {
         return imageUrl.getImageUrl();
     }

backend/src/main/java/com/mapbefine/mapbefine/permission/application/PermissionCommandService.java

@@ -15,11 +15,10 @@
 import com.mapbefine.mapbefine.permission.exception.PermissionException.PermissionForbiddenException;
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import com.mapbefine.mapbefine.topic.domain.TopicRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.util.List;
 import java.util.Objects;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Transactional
@@ -78,7 +77,7 @@ private boolean isNotSelfMember(AuthMember authMember, Member member) {
 
     private Topic findTopic(PermissionRequest request) {
         Long topicId = request.topicId();
-        return topicRepository.findByIdAndIsDeletedFalse(topicId)
+        return topicRepository.findById(topicId)
                 .orElseThrow(() -> new PermissionBadRequestException(ILLEGAL_TOPIC_ID, topicId));
     }
 

backend/src/main/java/com/mapbefine/mapbefine/permission/application/PermissionQueryService.java

@@ -14,11 +14,10 @@
 import com.mapbefine.mapbefine.topic.domain.TopicStatus;
 import com.mapbefine.mapbefine.topic.exception.TopicErrorCode;
 import com.mapbefine.mapbefine.topic.exception.TopicException.TopicNotFoundException;
+import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @Service
 @Transactional(readOnly = true)
 public class PermissionQueryService {
@@ -43,7 +42,7 @@ public TopicAccessDetailResponse findTopicAccessDetailById(Long topicId) {
     }
 
     private Publicity findTopicPublicityById(Long topicId) {
-        return topicRepository.findByIdAndIsDeletedFalse(topicId)
+        return topicRepository.findById(topicId)
                 .map(Topic::getTopicStatus)
                 .map(TopicStatus::getPublicity)
                 .orElseThrow(() -> new TopicNotFoundException(TopicErrorCode.TOPIC_NOT_FOUND, topicId));

backend/src/main/java/com/mapbefine/mapbefine/permission/domain/PermissionRepository.java

@@ -10,4 +10,5 @@ public interface PermissionRepository extends JpaRepository<Permission, Long> {
     boolean existsByTopicIdAndMemberId(Long topicId, Long memberId);
 
     void deleteAllByMemberId(Long memberId);
+
 }

backend/src/main/java/com/mapbefine/mapbefine/pin/application/PinCommandService.java

@@ -27,13 +27,12 @@
 import com.mapbefine.mapbefine.topic.domain.Topic;
 import com.mapbefine.mapbefine.topic.domain.TopicRepository;
 import com.mapbefine.mapbefine.topic.exception.TopicException.TopicBadRequestException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Objects;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 @Transactional
 @Service
@@ -100,7 +99,7 @@ private Topic findTopic(Long topicId) {
         if (Objects.isNull(topicId)) {
             throw new TopicBadRequestException(ILLEGAL_TOPIC_ID);
         }
-        return topicRepository.findByIdAndIsDeletedFalse(topicId)
+        return topicRepository.findById(topicId)
                 .orElseThrow(() -> new TopicBadRequestException(ILLEGAL_TOPIC_ID));
     }
 
@@ -146,7 +145,7 @@ public void update(
     }
 
     private Pin findPin(Long pinId) {
-        return pinRepository.findByIdAndIsDeletedFalse(pinId)
+        return pinRepository.findById(pinId)
                 .orElseThrow(() -> new PinBadRequestException(ILLEGAL_PIN_ID));
     }
 
@@ -182,7 +181,7 @@ public void removeImageById(AuthMember authMember, Long pinImageId) {
     }
 
     private PinImage findPinImage(Long pinImageId) {
-        return pinImageRepository.findByIdAndIsDeletedFalse(pinImageId)
+        return pinImageRepository.findById(pinImageId)
                 .orElseThrow(() -> new PinBadRequestException(ILLEGAL_PIN_IMAGE_ID));
     }
 

backend/src/main/java/com/mapbefine/mapbefine/pin/application/PinQueryService.java

@@ -11,11 +11,10 @@
 import com.mapbefine.mapbefine.pin.exception.PinException.PinForbiddenException;
 import com.mapbefine.mapbefine.pin.exception.PinException.PinNotFoundException;
 import com.mapbefine.mapbefine.topic.domain.Topic;
+import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @Transactional(readOnly = true)
 @Service
 public class PinQueryService {
@@ -27,15 +26,15 @@ public PinQueryService(PinRepository pinRepository) {
     }
 
     public List<PinResponse> findAllReadable(AuthMember member) {
-        return pinRepository.findAllByIsDeletedFalse()
+        return pinRepository.findAll()
                 .stream()
                 .filter(pin -> member.canRead(pin.getTopic()))
                 .map(PinResponse::from)
                 .toList();
     }
 
     public PinDetailResponse findDetailById(AuthMember member, Long pinId) {
-        Pin pin = pinRepository.findByIdAndIsDeletedFalse(pinId)
+        Pin pin = pinRepository.findById(pinId)
                 .orElseThrow(() -> new PinNotFoundException(PIN_NOT_FOUND, pinId));
         validateReadAuth(member, pin.getTopic());
 
@@ -51,7 +50,7 @@ private void validateReadAuth(AuthMember member, Topic topic) {
     }
 
     public List<PinResponse> findAllPinsByMemberId(AuthMember authMember, Long memberId) {
-        return pinRepository.findAllByCreatorIdAndIsDeletedFalse(memberId)
+        return pinRepository.findAllByCreatorId(memberId)
                 .stream()
                 .filter(pin -> authMember.canRead(pin.getTopic()))
                 .map(PinResponse::from)

backend/src/main/java/com/mapbefine/mapbefine/pin/domain/Pin.java

@@ -24,10 +24,12 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.Where;
 
 @Entity
 @NoArgsConstructor(access = PROTECTED)
 @Getter
+@Where(clause = "is_deleted = false")
 public class Pin extends BaseTimeEntity {
 
     @Id
@@ -102,6 +104,10 @@ public void updatePinInfo(String name, String description) {
         pinInfo = PinInfo.of(name, description);
     }
 
+    public void decrementTopicPinCount() {
+        topic.decrementPinCount();
+    }
+
     public void copyToTopic(Member creator, Topic topic) {
         Pin copiedPin = Pin.createPinAssociatedWithLocationAndTopicAndMember(
                 pinInfo.getName(),