dscf-credit 0.2.9 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c914fd16b9fb0dd15339a3af9bf97e95d48d3e1775a729f4fefe00e6d097b070
-  data.tar.gz: a22057ffd689e168026b01e279a5695af7ffb292bec64998db8d73266cfdb2d2
+  metadata.gz: 9e3b6a324773633a199dfe48d49baa98a8e410671da8ad4916f107ad38ad33fb
+  data.tar.gz: 5accc6330524779a8720ebc16b9db48bd8ee9673552216d8fce8d38ebd6e40cd
 SHA512:
-  metadata.gz: 7d322610efcb2472084f0bdc462a76ee502da87f4d9be227ad66b4f8e38041b39b6c74690281ab407e50e38c445231cdc702a1e04c389c490d6d2189870ba096
-  data.tar.gz: 0af0fb14a256dc42893fe5dc6b920107b0f104a6ebfc403de37467b36b64017f4684a64201024ea9766f563132c5de3a24b3df21ba4b47121c32cdcf0cfcba32
+  metadata.gz: 2979387747dc0f40646df26c2cdcd266443cf07fb1c417deed6f704b62292f650469a490149891f0594df3e245e8ec1e3884f65abab9af58692aae4dd71c13ce
+  data.tar.gz: 8263bd4bc902d6525d3674736fe6301e1d032f84e9c1db21dcc038b7c36c2049e532e23097b4d03532f99e6a8288caf186f9793a2189522e9ffe7eaa9a532e6b

data/app/controllers/dscf/credit/loan_accruals_controller.rb

@@ -13,13 +13,11 @@ module Dscf::Credit
 
       if result[:success]
         render_success(
-          result[:message],
           data: result,
           status: :created
         )
       else
         render_error(
-          result[:message],
           errors: result[:errors],
           status: :unprocessable_entity
         )

data/app/services/dscf/credit/loan_accrual_generator_service.rb

@@ -119,31 +119,45 @@ module Dscf::Credit
     # @param loan [Dscf::Credit::Loan] The loan to generate accruals for
     # @return [Array<Hash>] Array of accrual details created
     def generate_accruals_for_loan(loan)
-      return [] if accrual_exists_for_date?(loan) && !force_regenerate
-
       accruals = []
 
       # Generate interest accrual
       if loan.remaining_amount > 0
-        interest_accrual = generate_interest_accrual(loan)
-        accruals << interest_accrual if interest_accrual
+        unless accrual_exists_for_date?(loan, "interest") && !force_regenerate
+          interest_accrual = generate_interest_accrual(loan)
+          accruals << interest_accrual if interest_accrual
+        end
       end
 
       # Generate penalty accrual if overdue
       if loan_is_overdue?(loan)
-        penalty_accrual = generate_penalty_accrual(loan)
-        accruals << penalty_accrual if penalty_accrual
+        unless accrual_exists_for_date?(loan, "penalty") && !force_regenerate
+          penalty_accrual = generate_penalty_accrual(loan)
+          accruals << penalty_accrual if penalty_accrual
+        end
       end
 
       accruals
     end
 
-    # Check if accruals already exist for the loan on the given date
+    # Check if a specific type of accrual already exists for the loan on the given date
+    #
+    # This method checks per accrual type (interest or penalty) rather than both together.
+    # This ensures that an existing penalty accrual doesn't block an interest accrual,
+    # and vice versa, making the method more precise and flexible.
+    #
+    # Note: Only checks for interest and penalty accruals, not facilitation fees,
+    # since facilitation fees are generated during disbursement and should not
+    # prevent daily interest/penalty generation.
     #
     # @param loan [Dscf::Credit::Loan] The loan to check
-    # @return [Boolean] True if accruals exist for the date
-    def accrual_exists_for_date?(loan)
-      loan.loan_accruals.where(applied_on: accrual_date).exists?
+    # @param accrual_type [String] The type of accrual to check ('interest' or 'penalty')
+    # @return [Boolean] True if the specified accrual type exists for the date
+    def accrual_exists_for_date?(loan, accrual_type)
+      loan.loan_accruals
+          .where(applied_on: accrual_date)
+          .where(accrual_type: accrual_type)
+          .exists?
     end
 
     # Generate interest accrual for a loan

data/app/services/dscf/credit/repayment_service.rb

@@ -261,25 +261,32 @@ module Dscf::Credit
     # Only runs if loan.status == "paid"
     #
     # Process:
-    # 1. Find all locked eligible credit lines (locked during disbursement)
-    # 2. For each locked line, recalculate available_limit based on:
-    #    - Credit limit (total allowed)
-    #    - Minus current usage from other active loans
-    # 3. Unlock the credit line by setting locked: false
+    # 1. Find the eligible credit line used for this loan
+    # 2. Reset available_limit to credit_limit, applying risk if present
+    # 3. Find all other locked eligible credit lines (locked during disbursement)
+    # 4. Unlock them by setting locked: false
     #
     # This allows the borrower to access credit again after repayment.
     #
     # @return [void]
     #
     # @example
-    #   # Before: eligible_line.locked = true
-    #   # After payment: eligible_line.locked = false
+    #   # Before: eligible_line.locked = true, available_limit = 50000
+    #   # After payment: eligible_line.locked = false, available_limit = 100000 (or adjusted for risk)
     def reactivate_facilities_if_paid_off
       return unless loan.status == "paid"
 
       loan_profile = loan.loan_profile
       credit_line = loan.credit_line
 
+      # Reset available limit for the eligible credit line used for this loan
+      eligible_credit_line = loan_profile.eligible_credit_lines
+        .find_by(credit_line: credit_line)
+
+      if eligible_credit_line
+        reset_available_limit(eligible_credit_line)
+      end
+
       # Unlock other eligible credit lines that were locked during disbursement
       loan_profile.eligible_credit_lines
         .where.not(credit_line: credit_line)
@@ -287,6 +294,57 @@ module Dscf::Credit
         .update_all(locked: false)
     end
 
+    # Reset available limit for an eligible credit line, applying risk if present
+    #
+    # If risk > 0, the available limit is reduced by the risk percentage
+    # Formula: available_limit = credit_limit * (1 - risk)
+    #
+    # Also recalculates and updates the loan profile's total_limit to reflect
+    # the current state of all eligible credit lines.
+    #
+    # @param eligible_credit_line [Dscf::Credit::EligibleCreditLine]
+    # @return [void]
+    #
+    # @example Without risk
+    #   # risk = 0 or nil
+    #   # available_limit = credit_limit (100000)
+    #
+    # @example With risk
+    #   # risk = 0.1 (10%)
+    #   # available_limit = credit_limit * (1 - 0.1) = 100000 * 0.9 = 90000
+    def reset_available_limit(eligible_credit_line)
+      credit_limit = eligible_credit_line.credit_limit
+      risk = eligible_credit_line.risk || 0
+
+      if risk > 0
+        available_limit = credit_limit * (1 - risk)
+      else
+        available_limit = credit_limit
+      end
+
+      eligible_credit_line.update!(available_limit: available_limit)
+
+      # Recalculate loan_profile total_limit after updating available_limit
+      update_loan_profile_total_limit(eligible_credit_line.loan_profile)
+    end
+
+    # Recalculate and update loan profile's total_limit
+    #
+    # Sums all available_limit values from the loan profile's eligible credit lines
+    # and updates the loan_profile.total_limit to reflect the current state.
+    #
+    # @param loan_profile [Dscf::Credit::LoanProfile]
+    # @return [void]
+    def update_loan_profile_total_limit(loan_profile)
+      return unless loan_profile
+
+      total_available_limit = loan_profile.eligible_credit_lines.sum(:available_limit)
+
+      loan_profile.update!(total_limit: total_available_limit)
+
+      Rails.logger.info "Updated loan profile #{loan_profile.id} total limit to #{total_available_limit}"
+    end
+
     # Build success result hash
     #
     # @param allocation [Hash] The allocation hash with payment details

data/lib/dscf/credit/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Credit
-    VERSION = "0.2.9"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-credit
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.1
 platform: ruby
 authors:
 - Adoniyas