blend_spreadsheet_loan_generator 0.1.25 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 169f284925fdd8ff961eecf431c8fd62625cf9b5cc1006cf2c0d1fe2ff3d290d
-  data.tar.gz: af871dff6102cbb857cd7fbc65f75265b597cee10689adc820c1b7060cf72dbe
+  metadata.gz: c2feb14eec33c86a032e711df82ad3b93bf8fd5b3f97c3746a5a24bef7814398
+  data.tar.gz: e526d50983256ede22d4d54d3e5f0486c36ca88509d254d57b8ad77f5e86a8a4
 SHA512:
-  metadata.gz: 483fbcafe2c4f763f2b1a53108d4d80f344471a730de69e2a938370ae5159581925f93b1efa33e29530afbc74897a0aaf4251a9885c46ac2f7926478a15c51cc
-  data.tar.gz: da813c5b56325a72db5023b2fad4be50008bb112c2198ac491a99d7d17c57131245eb2bc48750aef5c19addd9b2825a27e34a7e639a59ac125844c63e4aa4e11
+  metadata.gz: 59c7cf8b548249e27dd0c945598ab2d9a8287c32372b370d6bbbec2f7ffaf960ed978e9fd6e747564541152659dc841f57410769c3fd2571721898f2b389163a
+  data.tar.gz: 3a83c45004a61448074532f5d7ee1d0541b54734657821d965ab8de33649b056108470d9ac26c1056c3f78d8dd1630ce3b3fad32e01b1795679e2ed492bddd2f

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

@@ -46,13 +46,14 @@ module BlendSpreadsheetLoanGenerator
 
       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] +
@@ -84,12 +85,20 @@ module BlendSpreadsheetLoanGenerator
         values[last_paid_line + 1][:period_calculated_interests] +
         values[last_paid_line + 1][:period_calculated_fees]
       )
-
-      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
+      capital_paid_for_ratio = amount_paid.to_f - (
+        values[last_paid_line + 1][:capitalized_fees_start] +
+        values[last_paid_line + 1][:period_calculated_fees]
+      )
+      remaining_capital_for_ratio = (
+        values[last_paid_line + 1][:remaining_capital_start] +
+        values[last_paid_line + 1][:capitalized_interests_start] +
+        values[last_paid_line + 1][:period_calculated_interests]
       )
 
+      ratio = options.fetch(:ratio, capital_paid_for_ratio.to_f / remaining_capital_for_ratio).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]
@@ -156,6 +165,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
@@ -196,6 +208,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.25'.freeze
+  VERSION = '0.1.29'.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.25
+  version: 0.1.29
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport