blend_spreadsheet_loan_generator 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41bd051665f94b48954cb0d2067a075a9740eb8da3e72b672be25a724ffdeee2
-  data.tar.gz: 17a1bbd4686e4a92a7da7720de63f71a5387455563e1853b1bce25508556187b
+  metadata.gz: bbb638c6b9da3b44d76b3c6bdcd25ff0c72c859e1f972e5f032b58e202bbb411
+  data.tar.gz: b104a0c811a1cc485a9914831db47e613af2a7f873aeffa0cb5dfc45859ba8b7
 SHA512:
-  metadata.gz: '08a55ddabdf7e9b46f56a66cb6c9a2aafd02144a3776ad6ad575f90e922636c08a08448037941e16996ac5794cd51dc046e250a5c147dfa1e352f858fef78817'
-  data.tar.gz: 2ae1b8b409995fef289f60148cbdd73d44a9402664d5b894f2fc83f556bee1055f0bcd1eff56f085773b095cc173f09ca9529425517f6060b1b1f2d974b543fd
+  metadata.gz: af51b53a9b4073e41d898ee41d8ca6725b04ce50c16300d00f25a0867af0c3ce874290343ac66d3edb5e2096d7210b287b91b77640ce2cd1304557125146dc08
+  data.tar.gz: 22b8948a0826f7f184672a3a0741514f17a7f133f61c46f7699f73dcd78b27dccf31b0cd24cd531a946b6addc404b6e1ee4b72d24cd555cf2d00bcac6ab17238

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -3,7 +3,7 @@ module BlendSpreadsheetLoanGenerator
     extend ActiveSupport::Concern
 
     included do
-      
+
       def columns
         %w[
           index

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -12,6 +12,7 @@ module BlendSpreadsheetLoanGenerator
     argument :from_path, type: :string, required: true, desc: 'csv to restructure'
     argument :rate, type: :float, required: true, desc: 'year rate post restructuration'
 
+    option :guaranteed_terms, type: :integer, default: 0
     option :duration, type: :integer, desc: 'duration'
     option :period_duration, type: :integer, default: 1, desc: 'duration of a period in months'
     option :due_on, type: :date, default: Date.today, desc: 'date of the pay day of the first period DD/MM/YYYY'
@@ -43,6 +44,14 @@ module BlendSpreadsheetLoanGenerator
       values.map! { |r| set_types([columns, r].transpose.to_h.with_indifferent_access) }
 
       last_paid_line = values.index { |term| term[:index] == last_paid_term.to_i }
+      guaranteed_line = values.index { |term| term[:index] == options.fetch(:guaranteed_terms, nil) } || nil
+      total_guaranteed_interests = (
+        if guaranteed_line.present? && guaranteed_line > last_paid_line
+          values[last_paid_line..guaranteed_line].sum(:period_calculated_interests)
+        else
+          0
+        end
+      )
 
       total_to_be_paid = (
         values[last_paid_line + 1][:remaining_capital_start] +
@@ -59,15 +68,17 @@ module BlendSpreadsheetLoanGenerator
         end
       )
 
-      starting_capitalized_interests = 0.0
-      starting_capitalized_fees = 0.0
-
       due_on = values[last_paid_line + 1][:due_on] + 1.month
 
       capital_paid = amount_paid.to_f - (
         values[last_paid_line + 1][:capitalized_interests_start] +
         values[last_paid_line + 1][:capitalized_fees_start]
       )
+      guaranteed_interests_paid = (
+        (capital_paid.to_f / values[last_paid_line + 1][:remaining_capital_start]) *
+        total_guaranteed_interests
+      )
+      capital_paid -= guaranteed_interests_paid
 
       @loan = Loan.new(
         amount: values[last_paid_line][:remaining_capital_end],
@@ -80,8 +91,8 @@ module BlendSpreadsheetLoanGenerator
         deferred: options.fetch(:deferred),
         type: options.fetch(:type),
         interests_type: options.fetch(:interests_type),
-        starting_capitalized_interests: starting_capitalized_interests,
-        starting_capitalized_fees: starting_capitalized_fees
+        starting_capitalized_interests: 0.0,
+        starting_capitalized_fees: 0.0
       )
 
       spreadsheet = session.create_spreadsheet(loan.name)
@@ -98,7 +109,7 @@ module BlendSpreadsheetLoanGenerator
         "=#{excel_float(values[last_paid_line][:remaining_capital_end])} - #{period_capital(2)}"
 
       worksheet[2, columns.index('period_interests') + 1] =
-        "=ARRONDI(#{period_theoric_interests(2)}; 2)"
+        "=ARRONDI(#{period_theoric_interests(2)} + #{guaranteed_interests_paid}; 2)"
 
       worksheet[2, columns.index('period_theoric_interests') + 1] =
         "=#{excel_float(values[last_paid_line + 1][:period_calculated_interests])}"

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.15'.freeze
+  VERSION = '0.1.16'.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.15
+  version: 0.1.16
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport