From 2d22c3765238fa01ff4dcc5304b495d0541ff120 Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Thu, 26 May 2022 13:34:41 -0400
Subject: [PATCH] update unit tests & monthsUntilNextHourglass

---
 .../android/habitica/models/user/SubscriptionPlan.kt     | 9 ++++-----
 .../android/habitica/models/user/SubscriptionPlanTest.kt | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
index 67ade63df..ea478b96e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
@@ -11,9 +11,11 @@ open class SubscriptionPlan : RealmObject(), BaseObject {
     var customerId: String? = null
     var dateCreated: Date? = null
     var dateUpdated: Date? = null
+
     @JvmField
     var dateTerminated: Date? = null
     var paymentMethod: String? = null
+
     @JvmField
     var planId: String? = null
     var gemsBought: Int? = null
@@ -51,14 +53,11 @@ open class SubscriptionPlan : RealmObject(), BaseObject {
       If user has a initial basic monthly subscription, receive hourglasses on fourth month,
       else receive on third month (subtract 1 from total consecutive count)
      */
+
     val monthsUntilNextHourglass: Int?
         get() {
             return if (consecutive?.offset == 0) {
-                if (consecutive?.count == 0) {
-                    4
-                } else {
-                    (3 - (((consecutive?.count ?: 0) - 1) % 3))
-                }
+                (3 - (((consecutive?.count ?: 0)) % 3))
             } else {
                 consecutive?.offset
             }
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanTest.kt
index f78dd4833..67ea29465 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanTest.kt
@@ -77,7 +77,7 @@ class SubscriptionPlanTest : WordSpec({
 
         "months until next hourglass with initial basic sub" {
             plan.planId = SubscriptionPlan.PLANID_BASIC
-            plan.monthsUntilNextHourglass shouldBe 4
+            plan.monthsUntilNextHourglass shouldBe 3
         }
 
         "months until receiving first hourglass with basic sub" {