Fix first term calculator to use correct date to calculate remaining … (#6)

* Fix first term calculator to use correct date to calculate remaining months

* Address comment

Author: ngoulongkam

README.md

@@ -55,7 +55,7 @@ Where `input` have the following object:
 regularPayment: Double, // 25.0
 currentBalance: Double, // 25.0
 paidInThisMonth: Double, // 50.0
-accountStartDate: YearMonthDayInput, // YearMonthDayInput(2020, 3)
+thisMonthEndDate: YearMonthDayInput, // YearMonthDayInput(2020, 3, 31)
 firstTermEndDate: YearMonthDayInput, // YearMonthDayInput(2022, 2, 28)
 secondTermEndDate: YearMonthDayInput, // YearMonthDayInput(2024, 2, 28)
 balanceMustBeMoreThanForBonus: Double // 50.0

src/commonMain/kotlin/uk/gov/hmrc/helptosavecalculator/FirstBonusTermCalculation.kt

@@ -87,11 +87,11 @@ internal class FirstBonusTermCalculation {
     }
 
     fun calculateMonthsLeftInScheme(input: FirstBonusInput): Pair<Int, Int> {
-        val startDate = input.accountStartDate.convertToDateTime()
+        val thisMonthEndDate = input.thisMonthEndDate.convertToDateTime()
         val secondTermEndDate = input.secondTermEndDate.convertToDateTime()
         val firstTermEndDate = input.firstTermEndDate.convertToDateTime()
-        val monthsLeftInScheme = startDate.monthsSince(secondTermEndDate)
-        val monthsLeftInFirstTerm = startDate.monthsSince(firstTermEndDate)
+        val monthsLeftInScheme = thisMonthEndDate.monthsSince(secondTermEndDate)
+        val monthsLeftInFirstTerm = thisMonthEndDate.monthsSince(firstTermEndDate)
         return Pair(monthsLeftInScheme, monthsLeftInFirstTerm)
     }
 }

src/commonMain/kotlin/uk/gov/hmrc/helptosavecalculator/models/FirstBonusInput.kt

@@ -19,7 +19,7 @@ data class FirstBonusInput(
     val regularPayment: Double,
     val currentBalance: Double,
     val paidInThisMonth: Double,
-    val accountStartDate: YearMonthDayInput,
+    val thisMonthEndDate: YearMonthDayInput,
     val firstTermEndDate: YearMonthDayInput,
     val secondTermEndDate: YearMonthDayInput,
     val balanceMustBeMoreThanForBonus: Double