blend_spreadsheet_loan_generator 0.1.23 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97656de6803defd1af54366733c9f096f2a571fba89576b0a96ced269bfdebae
-  data.tar.gz: 9b0036e1d46ae2835d7d1add57af17e18b29107a9b29e1f8e00dde54d86fef48
+  metadata.gz: b500ee01fce00eb5d3a71404f720ae470dd141bf187bef1634f3ad57588ba9f5
+  data.tar.gz: 46b53438bd6c349e3c5b52fc6fe333c081c1fd24bf5c098b28c4437abadb0ae4
 SHA512:
-  metadata.gz: 5ae85edc2da12b6d1689f33e7564486fad79968c51c5cbb8d3ffb998b2c563d544f5267dd3b3df5a869ac98bd28742d9ccd0e1908e0f8b186b0b7b04835edfc2
-  data.tar.gz: 5896188fffc2c776cf8f9a8ba847c35f4848830ac8f1a893bc59a216e24a5f11b994d1e41dd4304fa15c38e1513ecd543721e22ba93e19ece033ed8021221744
+  metadata.gz: c2ff7ffde2072fda5f29fb4fcaf61f6e3bccb663855c3527bba5d6f416d2949b2bc6a45bf92be0cc548f0976406dc115e54d225b01716b0072f8092a936b125e
+  data.tar.gz: 673dd3c59ce84d779cced52348043ce32e216faa5dc54bc332a8653206618f63ef5348b3a36b342e63ecfb26b3e795d99946c569c609314771300f0e47e00a66

data/exe/bslg

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/blend_spreadsheet_loan_generator'
+
 Dry::CLI.new(BlendSpreadsheetLoanGenerator).call

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -33,6 +33,7 @@ module BlendSpreadsheetLoanGenerator
           period_reimbursed_capitalized_fees
           period_fees_rate
           period_reimbursed_guaranteed_interests
+          period_reimbursed_guaranteed_fees
         ]
       end
 
@@ -54,6 +55,7 @@ module BlendSpreadsheetLoanGenerator
           capitalized_fees_end
           period_reimbursed_capitalized_fees
           period_reimbursed_guaranteed_interests
+          period_reimbursed_guaranteed_fees
         ]
       end
 

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -44,15 +44,16 @@ module BlendSpreadsheetLoanGenerator
       values = f.to_a
       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 }
+      last_paid_line = values.index { |term| term[:index] == last_paid_term.to_i } || -1
       guaranteed_line = values.index { |term| term[:index] == options.fetch(:guaranteed_terms, -1).to_i } || nil
-      total_guaranteed_interests = (
-        if guaranteed_line.present? && guaranteed_line > last_paid_line
-          values[(last_paid_line + 1)..guaranteed_line].sum { |value| value[:period_calculated_interests] }
-        else
-          0
-        end
-      )
+
+      if guaranteed_line.present? && guaranteed_line >= (last_paid_line + 2)
+        total_guaranteed_interests = values[(last_paid_line + 2)..guaranteed_line].sum { |value| value[:period_calculated_interests] }
+        total_guaranteed_fees = values[(last_paid_line + 2)..guaranteed_line].sum { |value| value[:period_calculated_fees] }
+      else
+        total_guaranteed_interests = 0
+        total_guaranteed_fees = 0
+      end
 
       total_to_be_paid = (
         values[last_paid_line + 1][:remaining_capital_start] +
@@ -65,7 +66,14 @@ module BlendSpreadsheetLoanGenerator
         if total_to_be_paid == amount_paid
           1
         else
-          options.fetch(:duration, values.last[:index] - values[last_paid_line][:index])
+          options.fetch(
+            :duration,
+            if last_paid_line == -1
+              values.last[:index]
+            else
+              values.last[:index] - values[last_paid_line][:index]
+            end
+          )
         end
       )
 
@@ -73,22 +81,25 @@ module BlendSpreadsheetLoanGenerator
 
       capital_paid = amount_paid.to_f - (
         values[last_paid_line + 1][:capitalized_interests_start] +
-        values[last_paid_line + 1][:capitalized_fees_start]
-      )
-      actual_capital_paid = (
-        capital_paid -
-        values[last_paid_line + 1][:period_calculated_interests] -
+        values[last_paid_line + 1][:capitalized_fees_start] +
+        values[last_paid_line + 1][:period_calculated_interests] +
         values[last_paid_line + 1][:period_calculated_fees]
       )
 
-      ratio = options.fetch(:ratio, (actual_capital_paid.to_f / values[last_paid_line + 1][:remaining_capital_start])).to_f
-      guaranteed_interests_paid = (
-        ratio * total_guaranteed_interests
+      ratio = options.fetch(:ratio, (capital_paid.to_f / values[last_paid_line + 1][:remaining_capital_start])).to_f
+      guaranteed_interests_paid = ratio * total_guaranteed_interests
+      guaranteed_fees_paid = ratio * total_guaranteed_fees
+
+      amount = (
+        if last_paid_line == -1
+          values[0][:remaining_capital_start]
+        else
+          values[last_paid_line][:remaining_capital_end]
+        end
       )
-      capital_paid -= guaranteed_interests_paid
 
       @loan = Loan.new(
-        amount: values[last_paid_line][:remaining_capital_end],
+        amount: amount,
         duration: duration,
         rate: rate,
         fees_rate: options.fetch(:fees_rate),
@@ -110,10 +121,10 @@ module BlendSpreadsheetLoanGenerator
       apply_formulas(worksheet: worksheet)
 
       worksheet[2, columns.index('remaining_capital_start') + 1] =
-        excel_float(values[last_paid_line][:remaining_capital_end])
+        excel_float(values[last_paid_line + 1][:remaining_capital_start])
 
       worksheet[2, columns.index('remaining_capital_end') + 1] =
-        "=#{excel_float(values[last_paid_line][:remaining_capital_end])} - #{period_capital(2)}"
+        "=#{excel_float(values[last_paid_line + 1][:remaining_capital_start])} - #{period_capital(2)}"
 
       worksheet[2, columns.index('period_interests') + 1] =
         "=ARRONDI(#{period_theoric_interests(2)}; 2)"
@@ -124,8 +135,7 @@ module BlendSpreadsheetLoanGenerator
       worksheet[2, columns.index('period_fees') + 1] =
         "=#{excel_float(values[last_paid_line + 1][:period_calculated_fees])}"
 
-      worksheet[2, columns.index('period_capital') + 1] =
-        "=#{excel_float(capital_paid)} - #{period_interests(2)} - #{period_fees(2)}"
+      worksheet[2, columns.index('period_capital') + 1] = "=#{excel_float(capital_paid)}"
 
       worksheet[2, columns.index('capitalized_interests_start') + 1] =
         excel_float(values[last_paid_line + 1][:capitalized_interests_start])
@@ -146,6 +156,9 @@ module BlendSpreadsheetLoanGenerator
       worksheet[2, columns.index('period_reimbursed_guaranteed_interests') + 1] =
         excel_float(guaranteed_interests_paid)
 
+      worksheet[2, columns.index('period_reimbursed_guaranteed_fees') + 1] =
+        excel_float(guaranteed_fees_paid)
+
       apply_formats(worksheet: worksheet)
 
       worksheet.save
@@ -186,6 +199,7 @@ module BlendSpreadsheetLoanGenerator
       h[:period_reimbursed_capitalized_fees] = h[:period_reimbursed_capitalized_fees].to_f
       h[:period_fees_rate] = h[:period_fees_rate].to_f
       h[:period_reimbursed_guaranteed_interests] = h[:period_reimbursed_guaranteed_interests].to_f
+      h[:period_reimbursed_guaranteed_fees] = h[:period_reimbursed_guaranteed_fees].to_f
 
       h
     end

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -213,5 +213,9 @@ module BlendSpreadsheetLoanGenerator
     def period_reimbursed_guaranteed_interests_formula(line:)
       excel_float(0.0)
     end
+
+    def period_reimbursed_guaranteed_fees_formula(line:)
+      excel_float(0.0)
+    end
   end
 end

data/lib/blend_spreadsheet_loan_generator/generate.rb

@@ -24,12 +24,6 @@ module BlendSpreadsheetLoanGenerator
 
     def call(amount:, duration:, rate:, **options)
       begin
-        # session = GoogleDrive::Session.from_service_account_key(
-        #   File.join(
-        #     ENV['SPREADSHEET_LOAN_GENERATOR_DIR'],
-        #     'loan-spreadsheet-generator-6c27a42bdda7.json'
-        #   )
-        # )
         session = GoogleDrive::Session.from_config(
           File.join(ENV['SPREADSHEET_LOAN_GENERATOR_DIR'], 'config.json')
         )
@@ -71,9 +65,6 @@ module BlendSpreadsheetLoanGenerator
       generate_csv(worksheet: worksheet, target_path: options.fetch(:target_path))
 
       puts worksheet.human_url
-    rescue => e
-      require 'pry'
-      binding.pry
     end
   end
 end

data/lib/blend_spreadsheet_loan_generator/version.rb

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