blend_spreadsheet_loan_generator 0.1.33 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caf298e238200e25827511da7dac19fb3632a4e4a85b1ea86f16323dd2e28b58
-  data.tar.gz: 52fc113243acc66cc02c65016871ba435cbeb70762b28d9240e07afb0a27dbd9
+  metadata.gz: 7600f8eb355e9e5505dbddbbf4fee01c9f3830f20a3f33d40e64d90a1ef4ca92
+  data.tar.gz: 34f88205215b6c1885061567a2e506500749bba02e4ea37c859abb192a392f66
 SHA512:
-  metadata.gz: a41171c8bda9961b3b483fdc911a2eca6c0e7cd7d7fa47824e14d306f8d65316c6a9a8ec8e00fe16d25e0d9927d990664f69d75c0728d2c8608586dfde06fe72
-  data.tar.gz: 9bf8c3e0e21dc5f5419d90db5fd3be45032bf6f485c9cf4c077d441acfa443f73a7e16102fd4c2bba751ac21351fa50530debd677ef240a82ec446977caa7a66
+  metadata.gz: a98439ca0cc32a014b5eb9a319db03e1ea5e176b20dbde268dc4f81d54da3b702d33ffc085a329988858d0f0448880e76fae10ad5440009253031dfc1d340439
+  data.tar.gz: 0663020d3eecf5a36d7c7eff0fedfa2f166692eac16d4959a32e2157c4e7cd3aede6dc60c981e2de0b444eee82bec8c07621011d7876caa980adc01ec6779dec

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -169,15 +169,28 @@ module BlendSpreadsheetLoanGenerator
     end
 
     def period_calculated_fees_formula(line:)
-      amount_to_capitalize = [
-        '(',
-        remaining_capital_start(line),
-        '+',
-        capitalized_interests_start(line),
-        ')'
-      ].join(' ')
+      term = line - 1
+      if loan.deferred_and_capitalized > 0 && term > loan.deferred_and_capitalized
+        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)} + #{period_fees_rate(line)})^#{loan.deferred_and_capitalized} * (#{period_rate(line)} + #{period_fees_rate(line)})"
+        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{loan.deferred_and_capitalized} * #{period_rate(line)}"
+        "=#{with_fees} - #{without_fees}"
+      elsif loan.bullet_term?(term)
+        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index(line)}"
+        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index(line)}"
+        current = "#{with_fees} - #{without_fees}"
 
-      "=#{amount_to_capitalize} * #{period_fees_rate(line)}"
+        "=#{current} - #{capitalized_fees_end(line - 1)}"
+      else
+        amount_to_capitalize = [
+          '(',
+          remaining_capital_start(line),
+          '+',
+          capitalized_interests_start(line),
+          ')'
+        ].join(' ')
+
+        "=#{amount_to_capitalize} * #{period_fees_rate(line)}"
+      end
     end
 
     def capitalized_fees_start_formula(line:)

data/lib/blend_spreadsheet_loan_generator/loan.rb

@@ -112,6 +112,10 @@ module BlendSpreadsheetLoanGenerator
       fully_deferred? && deferred_and_capitalized == total_deferred_duration
     end
 
+    def bullet_term?(term)
+      deferred_and_capitalized <= term || bullet? # for last term
+    end
+
     def in_fine?
       fully_deferred? && deferred == total_deferred_duration
     end

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.33'.freeze
+  VERSION = '0.1.38'.freeze
 
   class Version < Dry::CLI::Command
     desc 'Print version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blend_spreadsheet_loan_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.38
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport