dscf-credit 0.1.4 → 0.1.6

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

@@ -0,0 +1,91 @@
+module Dscf::Credit
+  class LoanProfileCreationService
+    attr_reader :loan_application, :score, :errors
+
+    def initialize(loan_application, score)
+      @loan_application = loan_application
+      @score = score
+      @errors = []
+    end
+
+    def create_loan_profile
+      return error_result("Loan application is required") unless loan_application
+      return error_result("Score is required") unless score
+
+      if loan_application.loan_profile.present?
+        return success_result(loan_application.loan_profile, "Loan profile already exists")
+      end
+
+      begin
+        ActiveRecord::Base.transaction do
+          loan_profile = build_loan_profile
+          loan_profile.save!
+
+          create_initial_review(loan_profile)
+
+          success_result(loan_profile, "Loan profile created successfully")
+        end
+      rescue StandardError => e
+        Rails.logger.error "Loan profile creation failed: #{e.message}"
+        Rails.logger.error e.backtrace.join("\n")
+        error_result("Failed to create loan profile: #{e.message}")
+      end
+    end
+
+    private
+
+    def build_loan_profile
+      loan_application.build_loan_profile(
+        code: generate_loan_profile_code,
+        score: score,
+        total_limit: calculate_total_limit
+      )
+    end
+
+    def generate_loan_profile_code
+      # Generate unique code starting with "BB" followed by up to 6 digits
+      loop do
+        # Generate a random 6-digit number
+        random_digits = sprintf("%06d", rand(1000000))
+        code = "BB#{random_digits}"
+
+        unless Dscf::Credit::LoanProfile.exists?(code: code)
+          return code
+        end
+      end
+    end
+
+    def calculate_total_limit
+      0.0
+    end
+
+    def create_initial_review(loan_profile)
+      loan_profile.reviews.create!(
+        context: "default",
+        status: "approved",
+        reviewed_by: nil, # System created
+        reviewed_at: Time.current,
+        feedback: {
+          message: "Loan profile automatically created for approved loan application"
+        }
+      )
+    end
+
+    def success_result(loan_profile, message)
+      {
+        success: true,
+        loan_profile: loan_profile,
+        message: message
+      }
+    end
+
+    def error_result(message)
+      @errors << message
+      {
+        success: false,
+        error: message,
+        errors: @errors
+      }
+    end
+  end
+end

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

@@ -1,27 +1,77 @@
 module Dscf::Credit
   class RiskApplicationService
-    def initialize(eligible_credit_line, risk_value)
+    attr_reader :eligible_credit_line, :risk_factor, :errors
+
+    def initialize(eligible_credit_line, risk_factor)
       @eligible_credit_line = eligible_credit_line
-      @risk_value = risk_value.to_f
+      @risk_factor = risk_factor.nil? ? nil : risk_factor.to_f
+      @errors = []
     end
 
     def apply_risk
-      return { success: false, errors: @eligible_credit_line.errors.full_messages } unless @eligible_credit_line.valid?
+      return error_result("Eligible credit line is required") unless eligible_credit_line
+      return error_result("Risk factor is required") if risk_factor.nil?
+      return error_result("Risk factor must be between 0.0 and 0.9") unless valid_risk_factor?
+
+      begin
+        ActiveRecord::Base.transaction do
+          eligible_credit_line.risk = risk_factor
+
+          new_available_limit = calculate_available_limit_with_risk
+          eligible_credit_line.available_limit = new_available_limit
+
+          eligible_credit_line.save!
 
-      @eligible_credit_line.risk = @risk_value
-      @eligible_credit_line.available_limit = calculate_available_limit
+          update_loan_profile_total_limit
 
-      if @eligible_credit_line.save
-        { success: true, data: @eligible_credit_line }
-      else
-        { success: false, errors: @eligible_credit_line.errors.full_messages }
+          success_result(eligible_credit_line, "Risk factor applied successfully")
+        end
+      rescue StandardError => e
+        Rails.logger.error "Risk application failed: #{e.message}"
+        Rails.logger.error e.backtrace.join("\n")
+        error_result("Failed to apply risk factor: #{e.message}")
       end
     end
 
     private
 
-    def calculate_available_limit
-      @eligible_credit_line.credit_limit * (1 - @risk_value)
+    def valid_risk_factor?
+      risk_factor >= 0.0 && risk_factor <= 0.9
+    end
+
+    def calculate_available_limit_with_risk
+      # available_limit = credit_limit × (1 - risk_factor)
+      # If risk_factor is 0.0 (0%), available_limit = credit_limit
+      # If risk_factor is 0.9 (90%), available_limit = credit_limit × 0.1
+      result = eligible_credit_line.credit_limit * (1 - risk_factor)
+      result.round(2)
+    end
+
+    def update_loan_profile_total_limit
+      loan_profile = eligible_credit_line.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
+
+    def success_result(data, message)
+      {
+        success: true,
+        data: data,
+        message: message
+      }
+    end
+
+    def error_result(message)
+      {
+        success: false,
+        error: message,
+        errors: [ message ]
+      }
     end
   end
 end

data/config/locales/en.yml

@@ -85,7 +85,10 @@ en:
       update: "Loan profile updated successfully"
       approve: "Loan profile approved successfully"
       reject: "Loan profile rejected successfully"
-      calculate_score: "Credit score calculated successfully"
+      request_modification: "Modification requested for loan profile successfully"
+      resubmit: "Loan profile resubmitted successfully"
+      calculate_facility_limits: "Facility limits calculated successfully"
+      apply_risk_factor: "Risk factor applied successfully"
     errors:
       index: "Failed to retrieve loan profiles"
       show: "Failed to retrieve loan profile details"
@@ -93,8 +96,11 @@ en:
       update: "Failed to update loan profile"
       approve: "Failed to approve loan profile"
       reject: "Failed to reject loan profile"
-      calculate_score: "Failed to calculate credit score"
+      request_modification: "Failed to request modification for loan profile"
+      resubmit: "Failed to resubmit loan profile"
       not_found: "Loan profile not found"
+      calculate_facility_limits: "Failed to calculate facility limits"
+      apply_risk_factor: "Failed to apply risk factor"
 
   parameter_normalizer:
     success:
@@ -118,27 +124,18 @@ en:
       update: "Facilitator updated successfully"
       approve: "Facilitator approved successfully"
       reject: "Facilitator rejected successfully"
-      set_limit: "Facilitator limit updated successfully"
-      submit_additional_info: "Additional information submitted successfully"
       request_modification: "Modification requested for facilitator successfully"
       resubmit: "Facilitator resubmitted successfully"
-      batch_created_all: "All facilitators created successfully"
-      batch_created_partial: "Batch processing completed with partial success"
     errors:
+      index: "Failed to retrieve facilitators"
+      show: "Failed to retrieve facilitator details"
       create: "Failed to create facilitator"
       update: "Failed to update facilitator"
-      show: "Failed to retrieve facilitator details"
       approve: "Failed to approve facilitator"
       reject: "Failed to reject facilitator"
-      set_limit: "Failed to update facilitator limit"
-      submit_additional_info: "Failed to submit additional information"
       request_modification: "Failed to request modification for facilitator"
       resubmit: "Failed to resubmit facilitator"
-      no_business: "User must have a business associated to become a facilitator"
-      invalid_batch_format: "Invalid batch format"
-      empty_batch: "Empty batch provided"
-      batch_too_large: "Batch size exceeds maximum allowed"
-      batch_failed_all: "All facilitators failed to create"
+      not_found: "Facilitator not found"
 
   credit_line_spec:
     success:
@@ -189,6 +186,7 @@ en:
       create: "Failed to create eligible credit line"
       update: "Failed to update eligible credit line"
       apply_risk: "Failed to apply risk"
+      not_found: "Eligible credit line not found"
 
   system_config_definition:
     success:
@@ -240,24 +238,6 @@ en:
       update: "Failed to update category"
       destroy: "Failed to delete category"
 
-  scoring_table:
-    success:
-      index: "Scoring tables retrieved successfully"
-      show: "Scoring table details retrieved successfully"
-      create: "Scoring table created successfully"
-      update: "Scoring table updated successfully"
-      activate: "Scoring table activated successfully"
-      deactivate: "Scoring table deactivated successfully"
-      destroy: "Scoring table deleted successfully"
-    errors:
-      index: "Failed to retrieve scoring tables"
-      show: "Failed to retrieve scoring table details"
-      create: "Failed to create scoring table"
-      update: "Failed to update scoring table"
-      activate: "Failed to activate scoring table"
-      deactivate: "Failed to deactivate scoring table"
-      destroy: "Failed to delete scoring table"
-
   payment_request:
     success:
       index: "Payment requests retrieved successfully"
@@ -276,17 +256,59 @@ en:
       eligible_credit_lines: "Failed to retrieve eligible credit lines"
       destroy: "Failed to delete payment request"
 
-  user:
+  loan_application:
     success:
-      index: "Users retrieved successfully"
-      show: "User details retrieved successfully"
-      create: "User created successfully"
-      update: "User updated successfully"
+      index: "Loan applications retrieved successfully"
+      show: "Loan application details retrieved successfully"
+      create: "Loan application created successfully"
+      update: "Loan application updated successfully"
+      update_bank_info: "Bank information updated successfully"
+      update_facilitator_info: "Facilitator information updated successfully"
+      update_field_assessment: "Field assessment updated successfully"
+      calculate_credit_score: "Credit score calculated successfully"
+      apply_risk_factor: "Risk factor applied successfully"
+      approve: "Loan application approved successfully"
+      reject: "Loan application rejected successfully"
+      request_modification: "Modification requested for loan application successfully"
+      resubmit: "Loan application resubmitted successfully"
     errors:
-      index: "Failed to retrieve Users"
-      show: "Failed to retrieve User details"
-      create: "Failed to create User"
-      update: "Failed to update User"
+      index: "Failed to retrieve loan applications"
+      show: "Failed to retrieve loan application details"
+      create: "Failed to create loan application"
+      update: "Failed to update loan application"
+      update_bank_info: "Failed to update bank information"
+      update_facilitator_info: "Failed to update facilitator information"
+      update_field_assessment: "Failed to update field assessment"
+      calculate_credit_score: "Failed to calculate credit score"
+      apply_risk_factor: "Failed to apply risk factor"
+      invalid_risk_percentage: "Invalid risk percentage provided"
+      no_loan_profile: "No loan profile found for this application"
+      approve: "Failed to approve loan application"
+      reject: "Failed to reject loan application"
+      request_modification: "Failed to request modification for loan application"
+      resubmit: "Failed to resubmit loan application"
+      not_found: "Loan application not found"
+
+  facilitator_application:
+    success:
+      index: "Facilitator applications retrieved successfully"
+      show: "Facilitator application details retrieved successfully"
+      create: "Facilitator application created successfully"
+      update: "Facilitator application updated successfully"
+      approve: "Facilitator application approved successfully"
+      reject: "Facilitator application rejected successfully"
+      request_modification: "Modification requested for facilitator application successfully"
+      resubmit: "Facilitator application resubmitted successfully"
+    errors:
+      index: "Failed to retrieve facilitator applications"
+      show: "Failed to retrieve facilitator application details"
+      create: "Failed to create facilitator application"
+      update: "Failed to update facilitator application"
+      approve: "Failed to approve facilitator application"
+      reject: "Failed to reject facilitator application"
+      request_modification: "Failed to request modification for facilitator application"
+      resubmit: "Failed to resubmit facilitator application"
+      not_found: "Facilitator application not found"
 
   # Global messages
   operations:
@@ -297,13 +319,6 @@ en:
       failed: "Operation failed"
       not_found: "Resource not found"
 
-  loan_profile:
-    success:
-      calculate_score: "Credit score calculated successfully"
-    errors:
-      calculate_score: "Failed to calculate credit score"
-      not_found: "Loan profile not found"
-
   credit_limit_calculation:
     success:
       create: "Credit limits calculated successfully"
@@ -313,10 +328,10 @@ en:
 
   disbursement:
     success:
-      create: "Disbursement processed successfully"
+      create: "Disbursement processed successfully. Loan created and credit limit updated."
     errors:
       create: "Failed to process disbursement"
-      not_found: "Credit line or payment request not found"
+      not_found: "Loan profile or eligible credit line not found"
 
   repayment:
     success:

data/config/routes.rb

@@ -1,19 +1,16 @@
 Dscf::Credit::Engine.routes.draw do
-  # Main API endpoints
-  resources :banks, only: [ :index, :show, :create, :update, :destroy ]
+  resources :banks
   resources :bank_branches
-  resources :payments, only: [ :index, :show, :create, :update, :destroy ]
-  resources :loans, only: [ :index, :show, :create, :update, :destroy ]
+  resources :payments
+  resources :loans
   resources :scoring_param_types
 
-  resources :facilitators, only: [ :index, :show, :create, :update, :destroy ] do
-    collection do
-      post "batch_create", to: "facilitators#batch_create"
-      post "additional_info", to: "facilitators#submit_additional_info"
-    end
+  resources :facilitators do
     member do
-      patch "approve", to: "facilitators#approve"
-      patch "reject", to: "facilitators#reject"
+      patch "approve"
+      patch "reject"
+      patch "request_modification"
+      patch "resubmit"
     end
   end
 
@@ -21,7 +18,7 @@ Dscf::Credit::Engine.routes.draw do
     member do
       patch "approve"
       patch "reject"
-      post "calculate_score"
+      post "calculate_facility_limits"
     end
   end
   resources :payment_requests do
@@ -63,12 +60,6 @@ Dscf::Credit::Engine.routes.draw do
     end
   end
   resources :categories
-  resources :scoring_tables do
-    member do
-      patch "activate", to: "scoring_tables#activate"
-      patch "deactivate", to: "scoring_tables#deactivate"
-    end
-  end
   resources :users
   resources :kyc_reviews, only: [ :index, :show ]
   resources :bank_staffs
@@ -76,4 +67,25 @@ Dscf::Credit::Engine.routes.draw do
   resources :credit_limit_calculations, only: [ :create ]
   resources :disbursements, only: [ :create ]
   resources :repayments, only: [ :create ]
+  resources :loan_applications do
+    member do
+      patch "approve"
+      patch "reject"
+      patch "request_modification"
+      patch "resubmit"
+      patch "update_bank_info"
+      patch "update_facilitator_info"
+      patch "update_field_assessment"
+      post "calculate_credit_score"
+    end
+  end
+
+  resources :facilitator_applications do
+    member do
+      patch "approve"
+      patch "reject"
+      patch "request_modification"
+      patch "resubmit"
+    end
+  end
 end

data/db/migrate/20250822091131_create_dscf_credit_credit_lines.rb

@@ -6,11 +6,7 @@ class CreateDscfCreditCreditLines < ActiveRecord::Migration[8.0]
       t.string :name, null: false
       t.string :code
       t.text :description
-      t.string :status, default: 'pending'
       t.references :created_by, polymorphic: true, null: false
-      t.references :reviewed_by, polymorphic: true, null: true
-      t.datetime :review_date
-      t.jsonb :review_feedback, default: {}
       t.string :document_reference
 
       t.timestamps
@@ -18,11 +14,8 @@ class CreateDscfCreditCreditLines < ActiveRecord::Migration[8.0]
 
     add_index :dscf_credit_credit_lines, :name
     add_index :dscf_credit_credit_lines, :code
-    add_index :dscf_credit_credit_lines, :status
-    add_index :dscf_credit_credit_lines, [ :created_by_type, :created_by_id ]
-    add_index :dscf_credit_credit_lines, [ :reviewed_by_type, :reviewed_by_id ]
-    add_index :dscf_credit_credit_lines, :review_date
     add_index :dscf_credit_credit_lines, :document_reference
+    add_index :dscf_credit_credit_lines, [ :created_by_type, :created_by_id ]
     add_index :dscf_credit_credit_lines, [ :bank_id, :code ], unique: true
   end
 end

data/db/migrate/20250822091820_create_dscf_credit_system_configs.rb

@@ -3,18 +3,11 @@ class CreateDscfCreditSystemConfigs < ActiveRecord::Migration[8.0]
     create_table :dscf_credit_system_configs do |t|
       t.references :config_definition, null: false, foreign_key: { to_table: :dscf_credit_system_config_definitions }, index: { unique: true }
       t.text :config_value, null: false
-      t.string :status, default: 'pending'
       t.references :last_updated_by, polymorphic: true, null: false
-      t.references :reviewed_by, polymorphic: true, null: false
-      t.datetime :review_date
-      t.jsonb :review_feedback, default: {}
 
       t.timestamps
     end
 
     add_index :dscf_credit_system_configs, [ :last_updated_by_type, :last_updated_by_id ]
-    add_index :dscf_credit_system_configs, [ :reviewed_by_type, :reviewed_by_id ]
-    add_index :dscf_credit_system_configs, :status
-    add_index :dscf_credit_system_configs, :review_date
   end
 end

data/db/migrate/20250822092050_create_dscf_credit_scoring_parameters.rb

@@ -2,6 +2,7 @@ class CreateDscfCreditScoringParameters < ActiveRecord::Migration[8.0]
   def change
     create_table :dscf_credit_scoring_parameters do |t|
       t.references :bank, null: false, foreign_key: { to_table: :dscf_credit_banks }
+      t.references :category, null: false, foreign_key: { to_table: :dscf_credit_categories }
       t.string :name, null: false
       t.text :description
       t.string :data_type, null: false
@@ -11,13 +12,9 @@ class CreateDscfCreditScoringParameters < ActiveRecord::Migration[8.0]
       t.boolean :active, default: true
       t.references :previous_version, foreign_key: { to_table: :dscf_credit_scoring_parameters }, null: true
       t.references :created_by, polymorphic: true, null: false
-      t.references :reviewed_by, polymorphic: true, null: false
-      t.datetime :review_date
-      t.jsonb :review_feedback, default: {}
       t.string :source
       t.references :scoring_param_type, null: false, foreign_key: { to_table: :dscf_credit_scoring_param_types }
       t.string :document_reference
-      t.string :status, default: 'pending'
 
       t.timestamps
     end
@@ -26,10 +23,9 @@ class CreateDscfCreditScoringParameters < ActiveRecord::Migration[8.0]
     add_index :dscf_credit_scoring_parameters, :data_type
     add_index :dscf_credit_scoring_parameters, :active
     add_index :dscf_credit_scoring_parameters, [ :created_by_type, :created_by_id ]
-    add_index :dscf_credit_scoring_parameters, [ :reviewed_by_type, :reviewed_by_id ]
-    add_index :dscf_credit_scoring_parameters, :review_date
     add_index :dscf_credit_scoring_parameters, :source
     add_index :dscf_credit_scoring_parameters, :document_reference
     add_index :dscf_credit_scoring_parameters, [ :bank_id, :name, :active ]
+    add_index :dscf_credit_scoring_parameters, [ :category_id, :name ]
   end
 end

data/db/migrate/20250822092225_create_dscf_credit_parameter_normalizers.rb

@@ -5,7 +5,7 @@ class CreateDscfCreditParameterNormalizers < ActiveRecord::Migration[8.0]
       t.string :name, null: false
       t.text :description
       t.string :raw_value, null: false
-      t.integer :normalized_value, null: false
+      t.decimal :normalized_value, precision: 5, scale: 4, null: false
 
       t.timestamps
     end

data/db/migrate/20250822092236_create_dscf_credit_loan_applications.rb

@@ -0,0 +1,20 @@
+class CreateDscfCreditLoanApplications < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_credit_loan_applications do |t|
+      t.references :bank, null: false, foreign_key: { to_table: :dscf_credit_banks }
+      t.references :user, null: false, foreign_key: { to_table: :dscf_core_users }
+      t.references :backer, polymorphic: true
+      t.references :review_branch, null: false, foreign_key: { to_table: :dscf_credit_bank_branches }
+      t.string :bank_statement_source
+      t.jsonb :user_info, default: {}
+      t.jsonb :facilitator_info, default: {}
+      t.jsonb :bank_info, default: {}
+      t.jsonb :field_assessment, default: {}
+      t.decimal :score, precision: 15, scale: 2
+
+      t.timestamps
+    end
+
+    add_index :dscf_credit_loan_applications, :bank_statement_source
+  end
+end

data/db/migrate/20250822092246_create_dscf_credit_loan_profiles.rb

@@ -1,28 +1,16 @@
 class CreateDscfCreditLoanProfiles < ActiveRecord::Migration[8.0]
   def change
     create_table :dscf_credit_loan_profiles do |t|
-      t.references :bank, null: false, foreign_key: { to_table: :dscf_credit_banks }
-      t.references :user, null: false, foreign_key: { to_table: :dscf_core_users }
-      t.references :backer, polymorphic: true, null: true
-      t.string :status, default: 'pending'
-      t.decimal :total_amount, precision: 15, scale: 2, default: 0
-      t.decimal :available_amount, precision: 15, scale: 2, default: 0
-      t.references :reviewed_by, polymorphic: true
-      t.datetime :review_date
-      t.jsonb :review_feedback, default: {}
-      t.references :review_branch, null: true, foreign_key: { to_table: :dscf_credit_bank_branches }
+      t.references :loan_application, null: false, foreign_key: { to_table: :dscf_credit_loan_applications }
+      t.string :code, null: false, limit: 8
+      t.decimal :score, precision: 8, scale: 2
+      t.decimal :total_limit, precision: 15, scale: 2, default: 0
 
       t.timestamps
     end
 
-    add_index :dscf_credit_loan_profiles, :status
-    add_index :dscf_credit_loan_profiles, :total_amount
-    add_index :dscf_credit_loan_profiles, :available_amount
-    add_index :dscf_credit_loan_profiles, [ :backer_type, :backer_id ]
-    add_index :dscf_credit_loan_profiles, [ :reviewed_by_type, :reviewed_by_id ]
-    add_index :dscf_credit_loan_profiles, :review_date
-    add_index :dscf_credit_loan_profiles, [ :bank_id, :user_id, :status ]
-    add_index :dscf_credit_loan_profiles, [ :user_id, :status ]
-    add_index :dscf_credit_loan_profiles, [ :total_amount, :available_amount ]
+    add_index :dscf_credit_loan_profiles, :code, unique: true
+    add_index :dscf_credit_loan_profiles, :score
+    add_index :dscf_credit_loan_profiles, :total_limit
   end
 end

data/db/migrate/20250822092426_create_dscf_credit_facilitator_applications.rb

@@ -0,0 +1,10 @@
+class CreateDscfCreditFacilitatorApplications < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_credit_facilitator_applications do |t|
+      t.references :user, null: false, foreign_key: { to_table: :dscf_core_users }
+      t.references :bank, null: false, foreign_key: { to_table: :dscf_credit_banks }
+      t.jsonb :facilitator_info, null: false, default: {}
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250822092436_create_dscf_credit_facilitators.rb

@@ -1,25 +1,10 @@
 class CreateDscfCreditFacilitators < ActiveRecord::Migration[8.0]
   def change
     create_table :dscf_credit_facilitators do |t|
-      t.references :user, null: false, foreign_key: { to_table: :dscf_core_users }
-      t.references :bank, null: false, foreign_key: { to_table: :dscf_credit_banks }
-      t.string :name, null: false
-      t.string :type, null: false
+      t.references :facilitator_application, null: false, foreign_key: { to_table: :dscf_credit_facilitator_applications }
       t.decimal :total_limit, precision: 15, scale: 2
-      t.string :kyc_status, default: 'pending'
-      t.references :kyc_reviewed_by, polymorphic: true, null: false
-      t.datetime :kyc_review_date
-      t.jsonb :review_feedback, default: {}
 
       t.timestamps
     end
-
-    add_index :dscf_credit_facilitators, :name
-    add_index :dscf_credit_facilitators, :type
-    add_index :dscf_credit_facilitators, :kyc_status
-    add_index :dscf_credit_facilitators, [ :kyc_reviewed_by_type, :kyc_reviewed_by_id ]
-    add_index :dscf_credit_facilitators, :kyc_review_date
-    add_index :dscf_credit_facilitators, [ :bank_id, :user_id ], unique: true
-    add_index :dscf_credit_facilitators, [ :user_id, :kyc_status ]
   end
 end

data/db/migrate/20250822092654_create_dscf_credit_loans.rb

@@ -3,7 +3,6 @@ class CreateDscfCreditLoans < ActiveRecord::Migration[8.0]
     create_table :dscf_credit_loans do |t|
       t.references :loan_profile, null: false, foreign_key: { to_table: :dscf_credit_loan_profiles }
       t.references :credit_line, null: false, foreign_key: { to_table: :dscf_credit_credit_lines }
-      t.references :payment_request, null: false, foreign_key: { to_table: :dscf_credit_payment_requests }
       t.string :status, default: 'pending'
       t.decimal :principal_amount, precision: 15, scale: 2, null: false
       t.decimal :accrued_interest, precision: 15, scale: 2, default: 0
@@ -13,6 +12,7 @@ class CreateDscfCreditLoans < ActiveRecord::Migration[8.0]
       t.decimal :remaining_amount, precision: 15, scale: 2, null: false
       t.date :due_date, null: false
       t.datetime :disbursed_at
+      t.boolean :active, default: true, null: false
 
       t.timestamps
     end
@@ -22,8 +22,10 @@ class CreateDscfCreditLoans < ActiveRecord::Migration[8.0]
     add_index :dscf_credit_loans, :disbursed_at
     add_index :dscf_credit_loans, :principal_amount
     add_index :dscf_credit_loans, :remaining_amount
+    add_index :dscf_credit_loans, :active
     add_index :dscf_credit_loans, [ :loan_profile_id, :status ]
     add_index :dscf_credit_loans, [ :credit_line_id, :status ]
     add_index :dscf_credit_loans, [ :status, :due_date ]
+    add_index :dscf_credit_loans, [ :active, :status ]
   end
 end