Merge pull request #119 from dnd-side-project/fix/#118-week_total

주간결제 계산 방식 수정

Author: youcastle03

src/main/java/com/dnd/sub/domain/product/repository/ProductRepository.java

@@ -30,6 +30,7 @@ public interface ProductRepository extends JpaRepository<Product, Long> {
     SELECT p
     FROM Product p
     WHERE p.category = :category
+      AND p.isAdminWritten = true
       AND p.id NOT IN (
           SELECT s.product.id
           FROM Subscription s

src/main/java/com/dnd/sub/domain/subscription/repository/SubscriptionQueryRepositoryImpl.java

@@ -9,6 +9,7 @@
 import com.dnd.sub.domain.subscription.dto.GetMySubscriptionDto;
 import com.dnd.sub.domain.subscription.dto.GetPaymentSoonDto;
 import com.dnd.sub.domain.subscription.dto.response.GetPaymentTotalResponse;
+import com.dnd.sub.domain.subscription.entity.PayCycleUnitType;
 import com.dnd.sub.domain.subscription.entity.QSubscription;
 import com.dnd.sub.domain.subscription.entity.Subscription;
 import com.querydsl.core.BooleanBuilder;
@@ -121,54 +122,88 @@ public GetPaymentTotalResponse findPaymentTotal(Long memberId) {
             Subscription sub = tuple.get(s);
             Integer price = tuple.get(pp.price);
 
-            if(sub.getStartedAt() == null){
+            if (sub.getStartedAt() == null) {
                 continue;
             }
             int personalPrice = price / sub.getParticipantCount();
-            LocalDate prevPayDay = sub.getPreviousPaymentDay();
-            LocalDate nextPayDay = sub.getNextPaymentDay();
-
-            // 이전 결제일이 이번달인 경우
-            boolean isPrevThisMonth = false;
-            if (prevPayDay != null) {
-                isPrevThisMonth = !prevPayDay.isBefore(startDay) &&
-                    !prevPayDay.isAfter(endDay);
+            PayCycleUnitType cycleUnit = sub.getPayCycleUnit();
+
+            if (cycleUnit == PayCycleUnitType.WEEK) {
+                LocalDate prevPayDay = sub.getPreviousPaymentDay();
+
+                if (prevPayDay != null) {
+                    LocalDate currentPaymentDay = prevPayDay;
+
+                    // 과거 방향으로 결제한 금액
+                    while (!currentPaymentDay.isBefore(startDay)) {
+                        if (!currentPaymentDay.isAfter(endDay) && !currentPaymentDay.isAfter(today)) {
+                            totalAmount += personalPrice;
+                            usedAmount += personalPrice;
+                        }
+                        currentPaymentDay = currentPaymentDay.minusWeeks(1);
+                    }
+
+                    // 미래 방향으로 결제할 금액
+                    LocalDate nextPayDay = sub.getNextPaymentDay();
+                    if (nextPayDay != null) {
+                        currentPaymentDay = nextPayDay;
+                        while (!currentPaymentDay.isAfter(endDay)) {
+                            if (!currentPaymentDay.isBefore(startDay) && currentPaymentDay.isAfter(today)) {
+                                totalAmount += personalPrice;
+                                remainingAmount += personalPrice;
+                            }
+                            currentPaymentDay = currentPaymentDay.plusWeeks(1);
+                        }
+                    }
+                }
             }
-            // 다음 결제일이 이번달인 경우
-            boolean isNextThisMonth = false;
-            if (nextPayDay != null) {
-                isNextThisMonth = !nextPayDay.isBefore(startDay) &&
+            else {
+                LocalDate prevPayDay = sub.getPreviousPaymentDay();
+                LocalDate nextPayDay = sub.getNextPaymentDay();
+
+                // 이전 결제일이 이번달인 경우
+                boolean isPrevThisMonth = false;
+                if (prevPayDay != null) {
+                    isPrevThisMonth = !prevPayDay.isBefore(startDay) &&
+                        !prevPayDay.isAfter(endDay);
+                }
+                // 다음 결제일이 이번달인 경우
+                boolean isNextThisMonth = false;
+                if (nextPayDay != null) {
+                    isNextThisMonth = !nextPayDay.isBefore(startDay) &&
                         !nextPayDay.isAfter(endDay) &&
                         nextPayDay.isAfter(today);
-            }
+                }
 
-            boolean isPrevPay = isPrevThisMonth && !prevPayDay.isAfter(today);
+                boolean isPrevPay = isPrevThisMonth && !prevPayDay.isAfter(today);
 
-            if (isPrevThisMonth || isNextThisMonth) {
-                totalAmount += personalPrice;
-            }
+                if (isPrevThisMonth || isNextThisMonth) {
+                    totalAmount += personalPrice;
+                }
 
-            if (isPrevPay) {
-                usedAmount += personalPrice;
-            }
+                if (isPrevPay) {
+                    usedAmount += personalPrice;
+                }
 
-            if (isNextThisMonth) {
-                remainingAmount += personalPrice;
+                if (isNextThisMonth) {
+                    remainingAmount += personalPrice;
+                }
             }
         }
 
-        int progressPercentage = 0;
-        if (totalAmount > 0) {
-            progressPercentage = (100 * usedAmount) / totalAmount;
-        }
+            int progressPercentage = 0;
+            if (totalAmount > 0) {
+                progressPercentage = (100 * usedAmount) / totalAmount;
+            }
 
-        return new GetPaymentTotalResponse(
+            return new GetPaymentTotalResponse(
                 tuples.get(0).get(m.name),
                 totalAmount,
                 remainingAmount,
                 progressPercentage,
                 subCount
-        );
+            );
+
     }
 
     private List<GetMySubscriptionDto> findSubscriptions(BooleanBuilder builder,