Update use cases

Maruchin1 · Apr 21, 2023 · 7dca7c3 · 7dca7c3
1 parent 67309c7
commit 7dca7c3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/app/src/main/java/com/maruchin/domaindrivenandroid/domain/coupon/CollectableCoupon.kt b/app/src/main/java/com/maruchin/domaindrivenandroid/domain/coupon/CollectableCoupon.kt
@@ -1,9 +1,16 @@
 package com.maruchin.domaindrivenandroid.domain.coupon
 
+import com.maruchin.domaindrivenandroid.data.account.Account
 import com.maruchin.domaindrivenandroid.data.coupon.Coupon
 import com.maruchin.domaindrivenandroid.data.coupon.sampleCoupons
 
-data class CollectableCoupon(val coupon: Coupon, val canCollect: Boolean)
+data class CollectableCoupon(val coupon: Coupon, val canCollect: Boolean) {
+
+    constructor(coupon: Coupon, account: Account) : this(
+        coupon = coupon,
+        canCollect = account.canExchangePointsFor(coupon)
+    )
+}
 
 val sampleCollectableCoupons = listOf(
     CollectableCoupon(coupon = sampleCoupons[2], canCollect = true),

diff --git a/...in/java/com/maruchin/domaindrivenandroid/domain/coupon/GetAllCollectableCouponsUseCase.kt b/...in/java/com/maruchin/domaindrivenandroid/domain/coupon/GetAllCollectableCouponsUseCase.kt
@@ -17,10 +17,10 @@ class GetAllCollectableCouponsUseCase @Inject constructor(
             accountRepository.getLoggedInAccount().filterNotNull(),
             couponsRepository.getAllCoupons()
         ) { account, allCoupons ->
-            allCoupons.sortedBy {
-                it.points
+            allCoupons.sortedBy { coupon ->
+                coupon.points
             }.map { coupon ->
-                CollectableCoupon(coupon = coupon, canCollect = account.canExchangePointsFor(coupon))
+                CollectableCoupon(coupon, account)
             }
         }
     }

diff --git a/...c/main/java/com/maruchin/domaindrivenandroid/domain/coupon/GetCollectableCouponUseCase.kt b/...c/main/java/com/maruchin/domaindrivenandroid/domain/coupon/GetCollectableCouponUseCase.kt
@@ -18,10 +18,7 @@ class GetCollectableCouponUseCase @Inject constructor(
             accountRepository.getLoggedInAccount().filterNotNull(),
             couponsRepository.getCoupon(couponId).filterNotNull(),
         ) { account, coupon ->
-            CollectableCoupon(
-                coupon = coupon,
-                canCollect = account.canExchangePointsFor(coupon)
-            )
+            CollectableCoupon(coupon, account)
         }
     }
 }