blend_spreadsheet_loan_generator 0.1.36 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a7e3accb3a4c91a0e137d14ce6edd247ee88ebfe3d0274eecc6c00c8992bff3
-  data.tar.gz: 07d4a5959dfff0b803ebd21d8bd8373169d5e59e112a8ed8d9004cdfa6afff0c
+  metadata.gz: 36f54b0c351b2b367ae9742d235e2aaa484df2e16388935da8ca576aa405b862
+  data.tar.gz: f87380832034597138217d523984e200e45c3826433ad4e25d9addc03b344da8
 SHA512:
-  metadata.gz: f696017d9e91af295abfa3f6c35a2a8a166b4c2db458df06119e8572d19e36bdba78442f2529cced271394e5652fe8c29483c322daf513a75faeb28dcb5a8bd3
-  data.tar.gz: d98ef75e469b8bda35fd9a6d1f46ebaecf7e57d2f3e20164f7b2839a147aba24a1b2d5d59e09da7d13a97e317a89e98bac144efd05177a02b2b1594b0be8fe57
+  metadata.gz: 2cfa0694a3f2ef0ca4fe5e85025e1f6912bc37c2667ff0fe872add54a85664f7868dc79d79c96fdf5a753485aa5685652f7f4af9499e06f417187e85448e5eed
+  data.tar.gz: 5dbd7beb01e12da8b58f6402769c0842b0929a61e04fefc93f427ba94b5ccc34d53b21517b2dad53b9f32eea6f620636d03638f000dafe76d787f927e72635ba

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -87,13 +87,17 @@ module BlendSpreadsheetLoanGenerator
         end
       end
 
-      def apply_formulas(worksheet:)
+      def apply_formulas(worksheet:, early_repayment?: true)
         columns.each.with_index do |title, column|
           worksheet[1, column + 1] = title
         end
         loan.duration.times do |line|
           columns.each.with_index do |title, column|
-            worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2)
+            if early_repayment && title == 'period_calculated_fees'
+              worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2, early_repayment?: true)
+            else
+              worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2)
+            end
           end
         end
       end

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -127,7 +127,7 @@ module BlendSpreadsheetLoanGenerator
 
       @formula = Formula.new(loan: loan)
 
-      apply_formulas(worksheet: worksheet)
+      apply_formulas(worksheet: worksheet, early_repayment?: true)
 
       worksheet[2, columns.index('remaining_capital_start') + 1] =
         excel_float(values[last_paid_line + 1][:remaining_capital_start])

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -163,19 +163,31 @@ module BlendSpreadsheetLoanGenerator
       term = line - 1
       if term <= loan.deferred_and_capitalized
         excel_float(0.0)
-      elsif loan.deferred_and_capitalized > 0 && loan.deferred.present?
-
       else
         "=ARRONDI(#{period_calculated_fees(line)}; 2)"
       end
     end
 
-    def period_calculated_fees_formula(line:)
+    def period_calculated_fees_formula(line:, early_repayment?: false)
       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)
+        index = (
+          if early_repayment?
+            index(line - 1)
+          else
+            index(line)
+          end
+        )
+        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index}"
+        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index}"
+        current = "#{with_fees} - #{without_fees}"
+
+        "=#{current} - #{capitalized_fees_start(line)}"
       else
         amount_to_capitalize = [
           '(',

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.36'.freeze
+  VERSION = '0.1.40'.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.36
+  version: 0.1.40
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport