Compare commits

..

1 Commits

Author SHA1 Message Date
vizitor 5bfe76a944 add rate calculator
Gitea Actions / Gitea-Actions (push) Successful in 17s
2025-11-03 21:22:20 +03:00
3 changed files with 11 additions and 79 deletions
+4 -11
View File
@@ -7,28 +7,21 @@ import java.time.LocalDate
class AmountByRateCalculator {
private val leapYearDuration = BigDecimal.valueOf(366L)
private val nonLeapYearDuration = BigDecimal.valueOf(365L)
fun calculate(amount: BigDecimal, rate: Rate, dateFrom: LocalDate, dateTo: LocalDate): BigDecimal {
fun caluculate(amount: BigDecimal, rate: Rate, dateFrom: LocalDate, dateTo: LocalDate): BigDecimal {
var result = amount
var curRate = rate.rateOnDate(dateFrom)
while (curRate != null && curRate.since < dateTo) {
val curDateFrom = max(curRate.since, dateFrom)
val curDateTo = min(dateTo, curRate.till)
result *= (BigDecimal.ONE + getRateForPeriod(curRate.rate!!, curDateFrom, curDateTo))
result *= (BigDecimal.ONE + (curRate.rate!!.setScale(20) *
(curDateTo.dayOfYear - curDateFrom.dayOfYear + 1).toBigDecimal() /
(if (curDateFrom.isLeapYear) leapYearDuration else nonLeapYearDuration)))
curRate = rate.rateOnDate(curDateTo.plusDays(1))?.let {
if (it === curRate) null else it
}
}
return result
}
private fun getRateForPeriod(rate: BigDecimal, dateFrom: LocalDate, dateTo: LocalDate): BigDecimal {
return if (dateFrom.year == dateTo.year) {
rate.setScale(20) *
(dateTo.dayOfYear - dateFrom.dayOfYear + 1).toBigDecimal() /
if (dateFrom.isLeapYear) leapYearDuration else nonLeapYearDuration
} else getRateForPeriod(rate, dateFrom, LocalDate.of(dateFrom.year, 12, 31)) +
getRateForPeriod(rate, LocalDate.of(dateTo.year, 1, 1), dateTo)
}
}
private fun max(localDate1: LocalDate, localDate2: LocalDate?) =
@@ -9,8 +9,6 @@ sealed class Rate {
abstract val since: LocalDate
open val till: LocalDate? = null
abstract fun rateOnDate(date: LocalDate): Rate?
override fun toString() = "Rate($rate since $since ${till?.let { "till $it" }}"
}
class SimpleRate(
@@ -18,10 +16,6 @@ class SimpleRate(
override val since: LocalDate,
override val till: LocalDate? = null,
) : Rate() {
constructor(rate: Double, since: LocalDate, till: LocalDate?) :
this(BigDecimal.valueOf(rate), since, till)
override fun rateOnDate(date: LocalDate) =
if (date >= since && (till == null || date <= till)) this else null
}
@@ -29,16 +23,10 @@ class SimpleRate(
class PeriodicRate(
private val rates: TreeMap<LocalDate, Rate>
) : Rate() {
constructor(vararg rates: Rate) : this(TreeMap(rates.associateBy { it.since }))
override val since: LocalDate
get() = rates.firstKey()
override fun rateOnDate(date: LocalDate) =
rates.floorEntry(date)?.value?.let {
if (it.till == null || it.till!! >= date) it else null
}
override fun toString() = rates.values.toString()
}
@@ -1,6 +1,5 @@
package dev.darktale
import dev.darktale.model.PeriodicRate
import dev.darktale.model.Rate
import dev.darktale.model.SimpleRate
import org.junit.jupiter.api.extension.ExtensionContext
@@ -12,11 +11,10 @@ import java.math.BigDecimal
import java.time.LocalDate
import java.util.stream.Stream
import kotlin.math.abs
import kotlin.math.pow
import kotlin.test.DefaultAsserter.assertTrue
class AmountByRateCalculatorTest {
private val amountByRateCalculator = AmountByRateCalculator()
val amountByRateCalculator = AmountByRateCalculator()
@ParameterizedTest
@ArgumentsSource(RateProvider::class)
@@ -27,70 +25,23 @@ class AmountByRateCalculatorTest {
dateTo: LocalDate,
expectedAmount: BigDecimal
) {
val result = amountByRateCalculator.calculate(sourceAmount, rate, dateFrom, dateTo)
val maxDelta = 10.0.pow(-expectedAmount.scale().toDouble())
val result = amountByRateCalculator.caluculate(sourceAmount, rate, dateFrom, dateTo)
assertTrue(
"expected amount was $expectedAmount ± ${
BigDecimal.valueOf(maxDelta).toPlainString()
}, but actual is $result",
abs((expectedAmount - result).toDouble()) <= maxDelta,
"expected amount was $expectedAmount ± 0.0001, but actual is $result",
abs((expectedAmount - result).toDouble()) <= 0.0001,
)
}
}
class RateProvider : ArgumentsProvider {
override fun provideArguments(context: ExtensionContext): Stream<out Arguments> {
val baseAmount = BigDecimal.valueOf(1000L)
val startOfYear = LocalDate.of(2025, 1, 1)
val endOfMonth = LocalDate.of(2025, 1, 31)
val endOfMonth2 = LocalDate.of(2025, 2, 28)
val endOfYear = LocalDate.of(2025, 12, 31)
val middleOfYear = startOfYear.plusDays((endOfYear.dayOfYear / 2).toLong())
val simpleRate = SimpleRate(0.1, startOfYear, endOfYear)
val periodicRate = PeriodicRate(
SimpleRate(0.1, startOfYear, endOfMonth),
SimpleRate(0.1, endOfMonth.plusDays(1), endOfMonth2)
)
val decemberOfNonLeapYear = LocalDate.of(2023, 12, 1)
val januaryOfLeapYear = LocalDate.of(2024, 1, 31)
val nonLeapAndLeapYearRate = SimpleRate(
0.1,
decemberOfNonLeapYear,
januaryOfLeapYear
)
val simpleRate = SimpleRate(BigDecimal.valueOf(0.1), startOfYear, endOfYear)
return Stream.of(
Arguments.of(
simpleRate, baseAmount, startOfYear, endOfYear, BigDecimal.valueOf(1100L)
),
Arguments.of(
simpleRate,
baseAmount,
startOfYear,
middleOfYear,
BigDecimal.valueOf(1050.137)
),
Arguments.of(
periodicRate,
baseAmount,
startOfYear,
endOfMonth2,
BigDecimal.valueOf(1016.2295)
),
Arguments.of(
periodicRate,
baseAmount,
startOfYear,
middleOfYear,
BigDecimal.valueOf(1016.2295)
),
Arguments.of(
nonLeapAndLeapYearRate,
baseAmount,
nonLeapAndLeapYearRate.since,
nonLeapAndLeapYearRate.till,
BigDecimal.valueOf(1016.963096)
)
Arguments.of(simpleRate, BigDecimal.valueOf(1000L), startOfYear, endOfYear, BigDecimal.valueOf(1100L)),
Arguments.of(simpleRate, BigDecimal.valueOf(1000L), startOfYear, middleOfYear, BigDecimal.valueOf(1050.137)),
)
}