dscf-banking 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fe37bdff67cefd5cc8827eba966f74185e155c3cf627fed75b4e27ad43ebdec
-  data.tar.gz: 905268bd1b0f28a2e806fc7a950851b85915d7bab0354f6bd7473b40b196d3d2
+  metadata.gz: '0086738f163c88e967b2850c3b0c2e29804725e059996dd2edfd152a98c874b5'
+  data.tar.gz: 2bc163e912db1cb78a491610f88efc8d99f8455f034ed90f64031628bce1375c
 SHA512:
-  metadata.gz: 8f525a5e131f5fa21f717101a98fd7698477e242818489338fca9b94caa6133bc0feb9d2eea3c2854564449d2454d68a493ca1b7e1797fc6cd64df91b826b5b5
-  data.tar.gz: 97c43049bf4d9cbb18cce581dcac6e59b5cc219ac5ae03812edb6875426531a7325765e9ff2ad627bd124cb1786fe94ec06ff5a4442a05dc1ffd58fabf67a8d0
+  metadata.gz: 970cd3f5b838bcd3a5c74a9b2511569cd4ec7eeb7ecf28d90e32d9efda437707214514088d562a2e35bff1a43f7dc8b89a5abff66c56071a5ff3f2e2f3abc832
+  data.tar.gz: 29f3c5f3299b0b1dc1da0cfb11594f22a0c2970865482701097bd0492552165a90a76817b8acef394f63e4de15a5758571635236edd482f633ed700117af684f

data/app/controllers/dscf/banking/accounts_controller.rb

@@ -426,7 +426,41 @@ module Dscf::Banking
         errors << "transactions must be an array"
       end
 
+      if params[:initial_balance].present? && !valid_decimal?(params[:initial_balance])
+        errors << "initial_balance must be a valid number"
+      end
+
+      start_date = nil
+      end_date = nil
+
+      if params[:start_date].present?
+        start_date = parse_iso_date(params[:start_date])
+        errors << "start_date must be a valid date" unless start_date
+      end
+
+      if params[:end_date].present?
+        end_date = parse_iso_date(params[:end_date])
+        errors << "end_date must be a valid date" unless end_date
+      end
+
+      if start_date && end_date && start_date > end_date
+        errors << "start_date must be before or equal to end_date"
+      end
+
       errors
     end
+
+    def valid_decimal?(value)
+      BigDecimal(value.to_s)
+      true
+    rescue ArgumentError
+      false
+    end
+
+    def parse_iso_date(value)
+      Date.iso8601(value.to_s)
+    rescue Date::Error
+      nil
+    end
   end
 end

data/app/services/dscf/banking/interest_simulation_service.rb

@@ -12,15 +12,16 @@ module Dscf::Banking
       @initial_balance = decimal(initial_balance)
       @start_date = to_date(start_date)
       @end_date = to_date(end_date)
+      @transactions_by_date = {}
       @transactions = normalize_transactions(transactions || [])
     end
 
     def call
       raise ArgumentError, "start_date must be before or equal to end_date" if @start_date > @end_date
 
-      daily_rate = annual_interest_rate / BigDecimal(day_basis.to_s)
       balance = @initial_balance
       gross_interest = BigDecimal("0")
+      accrued_interest = BigDecimal("0")
       daily_breakdown = []
 
       (@start_date..@end_date).each do |date|
@@ -28,14 +29,25 @@ module Dscf::Banking
         daily_transaction_sum = daily_transactions.sum(BigDecimal("0")) { |transaction| transaction[:signed_amount] }
         balance += daily_transaction_sum
 
-        daily_interest = balance * daily_rate
-        gross_interest += daily_interest
+        daily_rate = annual_interest_rate_for(balance) / BigDecimal(day_basis.to_s)
+        raw_daily_interest = eligible_for_interest?(date, balance) ? balance * daily_rate : BigDecimal("0")
+        accrued_interest += raw_daily_interest
+
+        posted_daily_interest = BigDecimal("0")
+        if accrual_posting_due?(date)
+          posted_daily_interest = accrued_interest
+          accrued_interest = BigDecimal("0")
+          gross_interest += posted_daily_interest
+
+          # Compound mode credits posted interest into principal for subsequent days.
+          balance += posted_daily_interest if compound_calculation? && compounding_due?(date)
+        end
 
         daily_breakdown << {
           date: date.iso8601,
           balance: money(balance),
           transaction_total: money(daily_transaction_sum),
-          daily_interest: money(daily_interest)
+          daily_interest: money(posted_daily_interest)
         }
       end
 
@@ -64,6 +76,10 @@ module Dscf::Banking
       configured.present? ? decimal(configured) : DEFAULT_ANNUAL_INTEREST_RATE
     end
 
+    def annual_interest_rate_for(balance)
+      interest_rate_tier_for(balance)&.yield_self { |tier| decimal(tier.interest_rate) } || annual_interest_rate
+    end
+
     def tax_rate
       configured = interest_configuration&.income_tax_rate
       configured.present? ? decimal(configured) : DEFAULT_TAX_RATE
@@ -78,10 +94,76 @@ module Dscf::Banking
       end
     end
 
+    def compound_calculation?
+      interest_configuration&.calculation_method == "compound"
+    end
+
+    def accrual_posting_due?(date)
+      return date == date.end_of_month || date == @end_date if monthly_accrual_mode?
+
+      true
+    end
+
+    def compounding_due?(date)
+      return date == date.end_of_month || date == @end_date if monthly_compounding_mode?
+
+      true
+    end
+
+    def monthly_accrual_mode?
+      interest_configuration&.accrual_frequency == "monthly"
+    end
+
+    def monthly_compounding_mode?
+      interest_configuration&.compounding_period == "monthly"
+    end
+
+    def eligible_for_interest?(date, balance)
+      meets_minimum_balance?(balance) && within_promotional_window?(date)
+    end
+
+    def meets_minimum_balance?(balance)
+      balance >= minimum_balance_for_interest
+    end
+
+    def minimum_balance_for_interest
+      configured = interest_configuration&.minimum_balance_for_interest
+      configured.present? ? decimal(configured) : BigDecimal("0")
+    end
+
+    def interest_rate_tier_for(balance)
+      interest_rate_tiers.find do |tier|
+        lower_bound_satisfied = balance >= decimal(tier.balance_min)
+        upper_bound_satisfied = tier.balance_max.blank? || balance <= decimal(tier.balance_max)
+
+        lower_bound_satisfied && upper_bound_satisfied
+      end
+    end
+
+    def interest_rate_tiers
+      @interest_rate_tiers ||= begin
+        if interest_configuration
+          Dscf::Banking::InterestRateTier.by_interest_config(interest_configuration.id).ordered.to_a
+        else
+          []
+        end
+      end
+    end
+
+    def within_promotional_window?(date)
+      return true unless interest_configuration&.promotional_start_date.present? || interest_configuration&.promotional_end_date.present?
+
+      date >= interest_configuration.promotional_start_date && date <= interest_configuration.promotional_end_date
+    end
+
     def normalize_transactions(transactions)
       return [] unless transactions.is_a?(Array)
 
-      normalized = transactions.map do |transaction|
+      normalized = transactions.each_with_index.map do |transaction, index|
+        unless transaction.respond_to?(:[]) && (transaction.is_a?(Hash) || transaction.respond_to?(:to_h))
+          raise ArgumentError, "Invalid transaction payload at index #{index}"
+        end
+
         date = to_date(transaction[:date] || transaction["date"])
         amount = decimal(transaction[:amount] || transaction["amount"])
         type = (transaction[:type] || transaction["type"]).to_s.downcase
@@ -104,7 +186,7 @@ module Dscf::Banking
     end
 
     def to_date(value)
-      Date.parse(value.to_s)
+      Date.iso8601(value.to_s)
     rescue Date::Error
       raise ArgumentError, "Invalid date value: #{value}"
     end
@@ -116,7 +198,7 @@ module Dscf::Banking
     end
 
     def money(amount)
-      decimal(amount).round(2).to_s("F")
+      format("%.2f", decimal(amount).round(2).to_f)
     end
 
     def accounting_records(gross_interest, tax_amount, net_interest)

data/lib/dscf/banking/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Banking
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-banking
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Asrat Efrem
 bindir: bin
 cert_chain: []
-date: 2026-03-15 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails