Merge pull request #31 from 9oormthon-univ/30-hotfix-update-donation-…

…usage-validation-for-multi-store-ownership #30 - fix: Update donation usage validation for multi-store ownership
9oormthon-univ · Nov 23, 2024 · fd49abb · fd49abb
2 parents 4e940d6 + 071cba4
commit fd49abb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/...in/java/com/example/mymoo/domain/donationusage/service/impl/DonationUsageServiceImpl.java b/...in/java/com/example/mymoo/domain/donationusage/service/impl/DonationUsageServiceImpl.java
@@ -15,6 +15,8 @@
 import com.example.mymoo.domain.donationusage.repository.DonationUsageRepository;
 import com.example.mymoo.domain.donationusage.service.DonationUsageService;
 import com.example.mymoo.domain.store.entity.Store;
+import com.example.mymoo.domain.store.repository.StoreRepository;
+import java.util.List;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,28 +32,34 @@ public class DonationUsageServiceImpl implements DonationUsageService {
     private final DonationRepository donationRepository;
     private final ChildRepository childRepository;
     private final DonationUsageRepository donationUsageRepository;
+    private final StoreRepository storeRepository;
 
     @Override
     public void useDonation(
         final Long storeAccountId,
         final DonationUsageCreateRequestDto donationUsageCreateRequestDto
     ) {
         Donation donation = donationRepository.findById(donationUsageCreateRequestDto.donationId())
-                .orElseThrow(() -> new DonationException(DonationExceptionDetails.DONATION_NOT_FOUND));
+            .orElseThrow(() -> new DonationException(DonationExceptionDetails.DONATION_NOT_FOUND));
         Child child = childRepository.findByAccount_Id(donationUsageCreateRequestDto.childAccountId())
-                .orElseThrow(() -> new ChildException(ChildExceptionDetails.CHILD_NOT_FOUND));
-        Store store = donation.getStore();
-        // 자신의 가게가 아닌 다른 가게의 후원을 사용하려 할 때
-        if (!Objects.equals(store.getAccount().getId(), storeAccountId)){
+            .orElseThrow(() -> new ChildException(ChildExceptionDetails.CHILD_NOT_FOUND));
+
+        Store storeUsingDonation = donation.getStore();
+        // 해당 가게 계정이 가진 store 들의 id들 뽑기
+        List<Store> storesOwns = storeRepository.findAllByAccount_Id(storeAccountId);
+        Long storeUsingDonationId = storeUsingDonation.getId();
+        boolean hasMatchingStore = storesOwns.stream()
+            .anyMatch(store -> store.getId().equals(storeUsingDonationId));
+        if (!hasMatchingStore){
             throw new DonationUsageException(DonationUsageExceptionDetails.FORBIDDEN_ACCESS_TO_OTHER_STORE);
         }
 
         // 사용 여부 업데이트
         donation.setIsUsedToTrue();
         // 사용 가능한 후원 금액 감소
-        store.useUsableDonation(donation.getPoint());
+        storeUsingDonation.useUsableDonation(donation.getPoint());
         // store 계정의 point 증가. 향후 현금으로 바꿀 수 있음
-        store.getAccount().chargePoint(donation.getPoint());
+        storeUsingDonation.getAccount().chargePoint(donation.getPoint());
 
         donationUsageRepository.save(
             DonationUsage.builder()

diff --git a/src/main/java/com/example/mymoo/domain/store/repository/StoreRepository.java b/src/main/java/com/example/mymoo/domain/store/repository/StoreRepository.java
@@ -1,6 +1,7 @@
 package com.example.mymoo.domain.store.repository;
 
 import com.example.mymoo.domain.store.entity.Store;
+import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -11,4 +12,5 @@
 @Repository
 public interface StoreRepository extends JpaRepository<Store, Long> {
     Page<Store> findAllByNameContainsOrAddressContains(String nameKeyword, String addressKeyword, Pageable pageable);
+    List<Store> findAllByAccount_Id(Long storeAccountId);
 }