dscf-credit 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6914417c9552b795ef7f98f17f2ffbd9854c52230e2a7dcc972e2f62d48e43f1
-  data.tar.gz: 27aa925e0fa5dbe419c9df8f54d77c0a03b94101e81c9a61ce3daeddac1bd0a6
+  metadata.gz: 447633e68d0087ea77917d1630137c52d138096a52039af3c67c577ce3c5edd9
+  data.tar.gz: 5f4b38640b2adf043787cca20d5138b3e40185333f04bb9d747203bd14abf575
 SHA512:
-  metadata.gz: c7f0f12531ba3b30ec55c527f0091bd49bbb4606218a6ddbe03d45793c16a10d22e02258f6a3ea821fde1812c386fafe3f98b64590c9c074960c4cc22c0d4883
-  data.tar.gz: ac5a855d4322ba647a1c9439b32600eaf736253dc6397ed5eb333339e9bd901550f73fe326c4a24e87a1fd77b70cdde9558fd41bb146c7bdd779602703c18e41
+  metadata.gz: 02ad7c0149c073efb33bbc55e318d6cee9f6096aa29af50ef7316f3caf80ee7396c5cd3fdc7387287e88152e5af9b5854b90620b436fc6487c8c241ec8c1a98a
+  data.tar.gz: '099dd81a6c2f8f788fb38fb6c4f2d8b7f636a0853fbbed972b1078e0da5ef8e6cfe4c7b7fdec5d4bd1d5965e68f93cc8861a3122b20c1f670ebea186dba7c67b'

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

@@ -1,10 +1,15 @@
 module Dscf::Credit
   class DisbursementsController < ApplicationController
     def create
-      credit_line = Dscf::Credit::CreditLine.find(params[:credit_line_id])
-      payment_request = Dscf::Credit::PaymentRequest.find(params[:payment_request_id])
+      amount = disbursement_params[:amount]
+      loan_profile = Dscf::Credit::LoanProfile.find(disbursement_params[:loan_profile_id])
+      eligible_credit_line = Dscf::Credit::EligibleCreditLine.find(disbursement_params[:eligible_credit_line_id])
 
-      service = Dscf::Credit::DisbursementService.new(credit_line, payment_request, current_user)
+      service = Dscf::Credit::DisbursementService.new(
+        amount: amount,
+        loan_profile: loan_profile,
+        eligible_credit_line: eligible_credit_line
+      )
       result = service.process_disbursement
 
       if result[:success]
@@ -12,17 +17,7 @@ module Dscf::Credit
           "disbursement.success.create",
           data: {
             loan: result[:loan],
-            disbursement_details: result[:disbursement_details],
-            credit_line: credit_line,
-            payment_request: payment_request
-          },
-          serializer_options: {
-            include: [
-              :loan_profile,
-              :credit_line,
-              :payment_request,
-              :loan_transactions
-            ]
+            disbursement_details: result[:disbursement_details]
           }
         )
       else
@@ -48,8 +43,12 @@ module Dscf::Credit
 
     private
 
-    def model_params
-      params.permit(:credit_line_id, :payment_request_id)
+    def disbursement_params
+      params.require(:disbursement).permit(
+        :amount,
+        :loan_profile_id,
+        :eligible_credit_line_id
+      )
     end
   end
 end

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

@@ -8,7 +8,6 @@ module Dscf::Credit
       params.require(:loan).permit(
         :loan_profile_id,
         :credit_line_id,
-        :payment_request_id,
         :status,
         :principal_amount,
         :accrued_interest,
@@ -17,12 +16,13 @@ module Dscf::Credit
         :total_loan_amount,
         :remaining_amount,
         :due_date,
-        :disbursed_at
+        :disbursed_at,
+        :active
       )
     end
 
     def eager_loaded_associations
-      [ :loan_profile, :credit_line, :payment_request, :loan_transactions ]
+      [ :loan_profile, :credit_line, :loan_transactions ]
     end
 
     def allowed_order_columns
@@ -31,10 +31,10 @@ module Dscf::Credit
 
     def default_serializer_includes
       {
-        index: [ :loan_profile, :credit_line, :payment_request ],
-        show: [ :loan_profile, :credit_line, :payment_request, :loan_transactions ],
-        create: [ :loan_profile, :credit_line, :payment_request ],
-        update: [ :loan_profile, :credit_line, :payment_request, :loan_transactions ]
+        index: [ :loan_profile, :credit_line ],
+        show: [ :loan_profile, :credit_line, :loan_transactions ],
+        create: [ :loan_profile, :credit_line ],
+        update: [ :loan_profile, :credit_line, :loan_transactions ]
       }
     end
   end

data/app/models/dscf/credit/loan.rb

@@ -4,7 +4,6 @@ module Dscf::Credit
 
     belongs_to :loan_profile, class_name: "Dscf::Credit::LoanProfile", foreign_key: "loan_profile_id"
     belongs_to :credit_line, class_name: "Dscf::Credit::CreditLine", foreign_key: "credit_line_id"
-    belongs_to :payment_request, class_name: "Dscf::Credit::PaymentRequest", foreign_key: "payment_request_id"
     has_many :loan_transactions, class_name: "Dscf::Credit::LoanTransaction", foreign_key: "loan_id", dependent: :destroy
     has_many :daily_routine_transactions, class_name: "Dscf::Credit::DailyRoutineTransaction", foreign_key: "loan_id", dependent: :destroy
 
@@ -13,18 +12,19 @@ module Dscf::Credit
     validates :accrued_interest, :accrued_penalty, :facilitation_fee, numericality: { greater_than_or_equal_to: 0 }
     validates :status, inclusion: { in: %w[pending approved disbursed active overdue paid closed] }
 
-    scope :active, -> { where(status: "active") }
+    scope :active, -> { where(active: true) }
+    scope :inactive, -> { where(active: false) }
     scope :overdue, -> { where(status: "overdue") }
     scope :paid, -> { where(status: "paid") }
     scope :due_today, -> { where(due_date: Date.current) }
     scope :past_due, -> { where("due_date < ? AND status IN (?)", Date.current, [ "active", "overdue" ]) }
 
     def self.ransackable_attributes(auth_object = nil)
-      %w[id status principal_amount accrued_interest accrued_penalty facilitation_fee total_loan_amount remaining_amount due_date disbursed_at created_at updated_at]
+      %w[id status principal_amount accrued_interest accrued_penalty facilitation_fee total_loan_amount remaining_amount due_date disbursed_at active created_at updated_at]
     end
 
     def self.ransackable_associations(auth_object = nil)
-      %w[loan_profile credit_line payment_request loan_transactions daily_routine_transactions]
+      %w[loan_profile credit_line loan_transactions daily_routine_transactions]
     end
 
     delegate :user, to: :loan_profile, allow_nil: true

data/app/serializers/dscf/credit/loan_serializer.rb

@@ -1,11 +1,10 @@
 module Dscf::Credit
   class LoanSerializer < ActiveModel::Serializer
     attributes :id, :status, :principal_amount, :accrued_interest, :accrued_penalty, :facilitation_fee,
-               :total_loan_amount, :remaining_amount, :due_date, :disbursed_at, :created_at, :updated_at
+               :total_loan_amount, :remaining_amount, :due_date, :disbursed_at, :active, :created_at, :updated_at
 
     belongs_to :loan_profile, serializer: LoanProfileSerializer
     belongs_to :credit_line, serializer: CreditLineSerializer
-    belongs_to :payment_request, serializer: PaymentRequestSerializer
     has_many :loan_transactions, serializer: LoanTransactionSerializer
     has_many :daily_routine_transactions, serializer: DailyRoutineTransactionSerializer
   end

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

@@ -1,34 +1,35 @@
 module Dscf::Credit
   class DisbursementService
-    attr_reader :credit_line, :payment_request, :current_user
+    attr_reader :amount, :loan_profile, :eligible_credit_line
 
-    def initialize(credit_line, payment_request, current_user)
-      @credit_line = credit_line
-      @payment_request = payment_request
-      @current_user = current_user
+    def initialize(amount:, loan_profile:, eligible_credit_line:)
+      @amount = amount.to_f
+      @loan_profile = loan_profile
+      @eligible_credit_line = eligible_credit_line
     end
 
-    # Process disbursement by creating a loan record from selected credit line
+    # Process disbursement by creating a loan record from eligible credit line
     # @return [Hash] Result containing created loan and disbursement details
     def process_disbursement
+      return error_result("Loan profile not found") unless loan_profile
+      return error_result("Eligible credit line not found") unless eligible_credit_line
+      return error_result("Invalid amount") unless amount > 0
+
+      credit_line = eligible_credit_line.credit_line
       return error_result("Credit line not found") unless credit_line
-      return error_result("Payment request not found") unless payment_request
-      return error_result("Credit line is not approved") unless credit_line.status == "approved"
 
-      eligible_credit_line = find_eligible_credit_line
-      return error_result("No eligible credit line found") unless eligible_credit_line
+      credit_line_status = credit_line.current_status_for(:default)
+      return error_result("Credit line is not approved") unless credit_line_status == "approved"
 
-      loan_profile = eligible_credit_line.loan_profile
-      return error_result("Loan profile not approved") unless loan_profile.status == "approved"
+      loan_profile_status = loan_profile.current_status_for(:default)
+      return error_result("Loan profile not approved") unless loan_profile_status == "approved"
 
-      validation_result = validate_disbursement_amount(eligible_credit_line)
+      validation_result = validate_disbursement_amount
       return validation_result unless validation_result[:success]
 
       ActiveRecord::Base.transaction do
-        loan = create_loan_record(loan_profile, eligible_credit_line)
-        process_payment_and_charges(loan)
-        update_credit_line_limits(eligible_credit_line, loan)
-        lock_other_credit_lines(loan_profile, credit_line)
+        loan = create_loan_record(credit_line)
+        update_credit_line_limits(loan)
 
         success_result(loan)
       end
@@ -38,36 +39,27 @@ module Dscf::Credit
 
     private
 
-    def find_eligible_credit_line
-      credit_line.eligible_credit_lines
-                 .joins(:loan_profile)
-                 .where(dscf_credit_loan_profiles: { status: "approved" })
-                 .first
-    end
-
-    def validate_disbursement_amount(eligible_credit_line)
-      requested_amount = payment_request.amount
+    def validate_disbursement_amount
       available_limit = eligible_credit_line.available_limit
 
-      if requested_amount <= 0
+      if amount <= 0
         return error_result("Invalid disbursement amount")
       end
 
-      if requested_amount > available_limit
+      if amount > available_limit
         return error_result("Requested amount exceeds available credit limit")
       end
 
       { success: true }
     end
 
-    def create_loan_record(loan_profile, eligible_credit_line)
-      loan_terms = calculate_loan_terms(eligible_credit_line)
+    def create_loan_record(credit_line)
+      loan_terms = calculate_loan_terms(credit_line)
 
       loan = Dscf::Credit::Loan.new(
         loan_profile: loan_profile,
         credit_line: credit_line,
-        payment_request: payment_request,
-        principal_amount: payment_request.amount,
+        principal_amount: amount,
         facilitation_fee: loan_terms[:facilitation_fee],
         total_loan_amount: loan_terms[:total_amount],
         remaining_amount: loan_terms[:total_amount],
@@ -75,7 +67,8 @@ module Dscf::Credit
         accrued_penalty: 0,
         status: "disbursed",
         due_date: loan_terms[:due_date],
-        disbursed_at: Time.current
+        disbursed_at: Time.current,
+        active: true
       )
 
       raise "Failed to create loan: #{loan.errors.full_messages.join(', ')}" unless loan.save
@@ -83,21 +76,20 @@ module Dscf::Credit
       loan
     end
 
-    def calculate_loan_terms(eligible_credit_line)
-      principal = payment_request.amount
+    def calculate_loan_terms(credit_line)
+      principal = amount
 
       credit_line_spec = credit_line.credit_line_specs.active.first
 
-      if credit_line_spec
-        facilitation_rate = credit_line_spec.facilitation_fee_rate
-        vat_rate = credit_line_spec.vat
-        loan_duration = credit_line_spec.loan_duration
-      else
-        facilitation_rate = 0.02  # 2%
-        vat_rate = 0.15          # 15%
-        loan_duration = 30       # 30 days
+      unless credit_line_spec
+        raise "No active credit line specification found for credit line #{credit_line.id}. " \
+              "Please configure a CreditLineSpec before processing disbursements."
       end
 
+      facilitation_rate = credit_line_spec.facilitation_fee_rate
+      vat_rate = credit_line_spec.vat
+      loan_duration = credit_line_spec.loan_duration
+
       facilitation_fee = principal * facilitation_rate
       vat_amount = facilitation_fee * vat_rate
       total_amount = principal + facilitation_fee + vat_amount
@@ -112,46 +104,9 @@ module Dscf::Credit
       }
     end
 
-    def process_payment_and_charges(loan)
-      payment_request.update!(
-        status: "processed",
-        approved_at: Time.current
-      )
-
-      Dscf::Credit::LoanTransaction.create!(
-        loan: loan,
-        transaction_type: "disbursement",
-        amount: loan.principal_amount,
-        transaction_reference: "DISB-#{payment_request.order_id}-#{Time.current.to_i}",
-        status: "completed"
-      )
-
-      if loan.facilitation_fee > 0
-        Dscf::Credit::LoanTransaction.create!(
-          loan: loan,
-          transaction_type: "fee_charge",
-          amount: loan.facilitation_fee,
-          transaction_reference: "FEE-#{loan.id}-#{Time.current.to_i}",
-          status: "completed"
-        )
-      end
-    end
-
-    def update_credit_line_limits(eligible_credit_line, loan)
+    def update_credit_line_limits(loan)
       new_available_limit = eligible_credit_line.available_limit - loan.total_loan_amount
       eligible_credit_line.update!(available_limit: [ new_available_limit, 0 ].max)
-
-      # Update loan profile available amount
-      loan_profile = eligible_credit_line.loan_profile
-      new_profile_available = loan_profile.available_amount - loan.total_loan_amount
-      loan_profile.update!(available_amount: [ new_profile_available, 0 ].max)
-    end
-
-    def lock_other_credit_lines(loan_profile, current_credit_line)
-      other_eligible_lines = loan_profile.eligible_credit_lines
-                                        .where.not(credit_line: current_credit_line)
-
-      other_eligible_lines.update_all(available_limit: 0)
     end
 
     def success_result(loan)
@@ -159,9 +114,9 @@ module Dscf::Credit
         success: true,
         loan: loan,
         disbursement_details: {
-          principal_amount: loan.principal_amount,
-          facilitation_fee: loan.facilitation_fee,
-          total_loan_amount: loan.total_loan_amount,
+          principal_amount: loan.principal_amount.to_f,
+          facilitation_fee: loan.facilitation_fee.to_f,
+          total_loan_amount: loan.total_loan_amount.to_f,
           due_date: loan.due_date,
           disbursed_at: loan.disbursed_at
         },

data/config/locales/en.yml

@@ -328,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

@@ -18,7 +18,6 @@ Dscf::Credit::Engine.routes.draw do
     member do
       patch "approve"
       patch "reject"
-      post "calculate_score"
       post "calculate_facility_limits"
     end
   end
@@ -78,7 +77,6 @@ Dscf::Credit::Engine.routes.draw do
       patch "update_facilitator_info"
       patch "update_field_assessment"
       post "calculate_credit_score"
-      patch "apply_risk_factor"
     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

data/db/seeds.rb

@@ -804,35 +804,11 @@ Dscf::Credit::EligibleCreditLine.create!(
   risk: 0.45
 )
 
-# 12. Payment Requests (depends on users)
-puts "Seeding payment requests..."
-payment_request1 = Dscf::Credit::PaymentRequest.create!(
-  user: user2,
-  order_id: "ORD-#{Time.current.to_i}-001",
-  request_type: 'loan_disbursement',
-  amount: 50000.00,
-  receiver_account_reference: 'ACC-BORROWER-001',
-  status: 'approved',
-  initiated_at: 2.days.ago,
-  approved_at: 1.day.ago
-)
-
-payment_request2 = Dscf::Credit::PaymentRequest.create!(
-  user: user2,
-  order_id: "ORD-#{Time.current.to_i}-002",
-  request_type: 'loan_repayment',
-  amount: 15000.00,
-  receiver_account_reference: 'ACC-BANK-001',
-  status: 'pending',
-  initiated_at: 1.hour.ago
-)
-
-# 13. Loans (depends on loan profiles, credit lines, and payment requests)
+# 12. Loans (depends on loan profiles and credit lines)
 puts "Seeding loans..."
 loan1 = Dscf::Credit::Loan.create!(
   loan_profile: loan_profile1,
   credit_line: credit_line1,
-  payment_request: payment_request1,
   status: 'active',
   principal_amount: 50000.00,
   accrued_interest: 2500.00,
@@ -841,10 +817,11 @@ loan1 = Dscf::Credit::Loan.create!(
   total_loan_amount: 53500.00,
   remaining_amount: 53500.00,
   due_date: 3.months.from_now.to_date,
-  disbursed_at: 1.day.ago
+  disbursed_at: 1.day.ago,
+  active: true
 )
 
-# 14. Loan Transactions (depends on loans)
+# 13. Loan Transactions (depends on loans)
 puts "Seeding loan transactions..."
 Dscf::Credit::LoanTransaction.create!(
   loan: loan1,
@@ -862,7 +839,7 @@ Dscf::Credit::LoanTransaction.create!(
   status: 'completed'
 )
 
-# 15. Daily Routine Transactions (depends on loans)
+# 14. Daily Routine Transactions (depends on loans)
 puts "Seeding daily routine transactions..."
 Dscf::Credit::DailyRoutineTransaction.create!(
   loan: loan1,
@@ -873,63 +850,6 @@ Dscf::Credit::DailyRoutineTransaction.create!(
   approved_at: Date.current.beginning_of_day + 1.hour
 )
 
-# 16. Payments (depends on payment requests)
-puts "Seeding payments..."
-Dscf::Credit::Payment.create!(
-  payment_request: payment_request1,
-  amount: 50000.00,
-  receiver_account_reference: 'ACC-BORROWER-001',
-  transaction_reference: "PAY-#{Time.current.to_i}-001",
-  status: 'completed',
-  processed_at: 1.day.ago
-)
-
-# 17. Accounting Audit Requests (depends on various entities)
-puts "Seeding accounting audit requests..."
-audit_request1 = Dscf::Credit::AccountingAuditRequest.create!(
-  source_entity: loan1,
-  transaction_type: 'debit',
-  amount: 50000.00,
-  webhook_key: "WEBHOOK-#{SecureRandom.hex(16)}",
-  status: 'completed'
-)
-
-Dscf::Credit::AccountingAuditRequest.create!(
-  source_entity: payment_request1,
-  transaction_type: 'transfer',
-  amount: 50000.00,
-  webhook_key: "WEBHOOK-#{SecureRandom.hex(16)}",
-  status: 'pending'
-)
-
-# 18. Accounting Entries (depends on audit requests)
-puts "Seeding accounting entries..."
-Dscf::Credit::AccountingEntry.create!(
-  audit_request: audit_request1,
-  account_code: 'LOAN_ASSET_001',
-  entry_type: 'debit',
-  amount: 50000.00,
-  status: 'completed'
-)
-
-Dscf::Credit::AccountingEntry.create!(
-  audit_request: audit_request1,
-  account_code: 'CASH_001',
-  entry_type: 'credit',
-  amount: 50000.00,
-  status: 'completed'
-)
-
-# 19. Failed Operations Logs (depends on various entities)
-puts "Seeding failed operations logs..."
-Dscf::Credit::FailedOperationsLog.create!(
-  entity: payment_request2,
-  failure_type: 'payment_processing',
-  reason: 'Payment gateway did not respond within timeout period',
-  retry_count: 2,
-  resolved: false
-)
-
 puts "DSCF Credit Engine seed data completed successfully!"
 puts "Created sample data for all models with proper relationships."
 puts "Summary:"
@@ -943,8 +863,6 @@ puts "- Categories: #{Dscf::Credit::Category.count}"
 puts "- Credit Lines: #{Dscf::Credit::CreditLine.count}"
 puts "- Loan Profiles: #{Dscf::Credit::LoanProfile.count}"
 puts "- Loans: #{Dscf::Credit::Loan.count}"
-puts "- Payment Requests: #{Dscf::Credit::PaymentRequest.count}"
-puts "- Payments: #{Dscf::Credit::Payment.count}"
 puts "- Facilitators: #{Dscf::Credit::Facilitator.count} (will be created via API)"
 puts "- System Configs: #{Dscf::Credit::SystemConfig.count}"
 puts "- Scoring Parameters: #{Dscf::Credit::ScoringParameter.count}"

data/lib/dscf/credit/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Credit
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/spec/factories/dscf/credit/loans.rb

@@ -2,7 +2,6 @@ FactoryBot.define do
   factory :loan, class: "Dscf::Credit::Loan" do
     association :loan_profile, factory: :loan_profile
     association :credit_line, factory: :credit_line
-    association :payment_request, factory: :payment_request
     status { %w[pending approved disbursed active overdue paid closed].sample }
     principal_amount { Faker::Number.decimal(l_digits: 5, r_digits: 2) }
     accrued_interest { Faker::Number.decimal(l_digits: 3, r_digits: 2) }
@@ -12,6 +11,7 @@ FactoryBot.define do
     remaining_amount { Faker::Number.decimal(l_digits: 5, r_digits: 2) }
     due_date { Faker::Date.between(from: 1.month.from_now, to: 6.months.from_now) }
     disbursed_at { Faker::Time.between(from: 2.months.ago, to: Time.current) if status.in?(%w[disbursed active overdue paid closed]) }
+    active { true }
 
     trait :pending do
       status { "pending" }
@@ -33,5 +33,9 @@ FactoryBot.define do
       status { "paid" }
       remaining_amount { 0 }
     end
+
+    trait :inactive do
+      active { false }
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-credit
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Adoniyas
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dscf-core
@@ -337,8 +337,6 @@ files:
 - app/controllers/dscf/credit/loan_profiles_controller.rb
 - app/controllers/dscf/credit/loans_controller.rb
 - app/controllers/dscf/credit/parameter_normalizers_controller.rb
-- app/controllers/dscf/credit/payment_requests_controller.rb
-- app/controllers/dscf/credit/payments_controller.rb
 - app/controllers/dscf/credit/repayments_controller.rb
 - app/controllers/dscf/credit/scoring_param_types_controller.rb
 - app/controllers/dscf/credit/scoring_parameters_controller.rb
@@ -371,8 +369,6 @@ files:
 - app/models/dscf/credit/loan_profile_scoring_spec.rb
 - app/models/dscf/credit/loan_transaction.rb
 - app/models/dscf/credit/parameter_normalizer.rb
-- app/models/dscf/credit/payment.rb
-- app/models/dscf/credit/payment_request.rb
 - app/models/dscf/credit/scoring_param_type.rb
 - app/models/dscf/credit/scoring_parameter.rb
 - app/models/dscf/credit/system_config.rb
@@ -400,8 +396,6 @@ files:
 - app/serializers/dscf/credit/loan_serializer.rb
 - app/serializers/dscf/credit/loan_transaction_serializer.rb
 - app/serializers/dscf/credit/parameter_normalizer_serializer.rb
-- app/serializers/dscf/credit/payment_request_serializer.rb
-- app/serializers/dscf/credit/payment_serializer.rb
 - app/serializers/dscf/credit/scoring_param_type_serializer.rb
 - app/serializers/dscf/credit/scoring_parameter_serializer.rb
 - app/serializers/dscf/credit/system_config_definition_serializer.rb
@@ -448,12 +442,10 @@ files:
 - db/migrate/20250822092426_create_dscf_credit_facilitator_applications.rb
 - db/migrate/20250822092436_create_dscf_credit_facilitators.rb
 - db/migrate/20250822092528_create_dscf_credit_facilitator_performances.rb
-- db/migrate/20250822092608_create_dscf_credit_payment_requests.rb
 - db/migrate/20250822092654_create_dscf_credit_loans.rb
 - db/migrate/20250822092717_create_dscf_credit_loan_transactions.rb
 - db/migrate/20250822092738_create_dscf_credit_daily_routine_transactions.rb
 - db/migrate/20250822092819_create_dscf_credit_accounting_audit_requests.rb
-- db/migrate/20250822092843_create_dscf_credit_payments.rb
 - db/migrate/20250822092908_create_dscf_credit_failed_operations_logs.rb
 - db/migrate/20250822092936_create_dscf_credit_accounting_entries.rb
 - db/migrate/20250825231109_create_dscf_credit_bank_staff.rb
@@ -483,8 +475,6 @@ files:
 - spec/factories/dscf/credit/loan_transactions.rb
 - spec/factories/dscf/credit/loans.rb
 - spec/factories/dscf/credit/parameter_normalizers.rb
-- spec/factories/dscf/credit/payment_requests.rb
-- spec/factories/dscf/credit/payments.rb
 - spec/factories/dscf/credit/scoring_param_types.rb
 - spec/factories/dscf/credit/scoring_parameters.rb
 - spec/factories/dscf/credit/system_config_definitions.rb

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

@@ -1,85 +0,0 @@
-module Dscf::Credit
-  class PaymentRequestsController < ApplicationController
-    include Dscf::Core::Common
-
-    def create
-      super do
-        obj = @clazz.new(model_params)
-        obj.request_type = "credit"
-        obj.initiated_at = Time.current
-        obj
-      end
-    end
-
-    def approve
-      @obj = @clazz.find(params[:id])
-
-      if @obj.update(status: "approved", approved_at: Time.current)
-        @obj = @clazz.includes(eager_loaded_associations).find(@obj.id) if eager_loaded_associations.present?
-        includes = serializer_includes_for_action(:show)
-        options = includes.present? ? { include: includes } : {}
-        render_success(data: @obj, serializer_options: options)
-      else
-        render_error(errors: @obj.errors.full_messages[0], status: :unprocessable_entity)
-      end
-    rescue StandardError => e
-      render_error(error: e.message)
-    end
-
-    def eligible_credit_lines
-      payment_request = @clazz.find(params[:id])
-
-      if payment_request.user.nil?
-        return render_error(error: "Payment request has no associated user", status: :unprocessable_entity)
-      end
-
-      # Find all eligible credit lines for the user through their approved loan profiles
-      # Only include credit lines with available credit
-      eligible_credit_lines = Dscf::Credit::EligibleCreditLine
-        .joins(loan_profile: [ { loan_application: :user }, :reviews ])
-        .where(dscf_credit_loan_applications: { user_id: payment_request.user_id })
-        .where(dscf_core_reviews: { status: "approved" })  # Only approved loan profiles via reviews
-        .where("dscf_credit_eligible_credit_lines.available_limit > 0")  # Only with available credit
-        .includes(:loan_profile, :credit_line)
-        .order("dscf_credit_eligible_credit_lines.available_limit DESC")  # Order by available limit
-
-      render_success(
-        data: eligible_credit_lines,
-      )
-    rescue ActiveRecord::RecordNotFound
-      render_error(error: "Payment request not found", status: :not_found)
-    rescue StandardError => e
-      render_error(error: e.message)
-    end
-
-    private
-
-    def model_params
-      params.require(:payment_request).permit(
-        :user_id,
-        :order_id,
-        :amount,
-        :receiver_account_reference,
-        :status,
-        :failure_reason
-        )
-    end
-
-    def eager_loaded_associations
-      [ :user, :loans, :payments ]
-    end
-
-    def allowed_order_columns
-      %w[id order_id request_type amount status initiated_at approved_at created_at updated_at]
-    end
-
-    def default_serializer_includes
-      {
-        index: [ :user ],
-        show: [ :user, :loans, :payments ],
-        create: [ :user ],
-        update: [ :user, :loans, :payments ]
-      }
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-module Dscf::Credit
-  class PaymentsController < ApplicationController
-    include Dscf::Core::Common
-
-    private
-
-    def model_params
-      params.require(:payment).permit(
-        :payment_request_id,
-        :amount,
-        :receiver_account_reference,
-        :transaction_reference,
-        :status,
-        :failure_reason,
-        :processed_at
-      )
-    end
-
-    def eager_loaded_associations
-      [ :payment_request ]
-    end
-
-    def allowed_order_columns
-      %w[id amount status processed_at created_at updated_at]
-    end
-
-    def default_serializer_includes
-      {
-        index: [ :payment_request ],
-        show: [ :payment_request ],
-        create: [ :payment_request ],
-        update: [ :payment_request ]
-      }
-    end
-  end
-end

data/app/models/dscf/credit/payment.rb

@@ -1,22 +0,0 @@
-module Dscf::Credit
-  class Payment < ApplicationRecord
-    self.table_name = "dscf_credit_payments"
-
-    belongs_to :payment_request, class_name: "Dscf::Credit::PaymentRequest", foreign_key: "payment_request_id"
-
-    validates :amount, :receiver_account_reference, :transaction_reference, :status, presence: true
-    validates :amount, numericality: { greater_than: 0 }
-    validates :status, inclusion: { in: %w[pending processing completed failed cancelled] }
-    validates :transaction_reference, uniqueness: true
-
-    scope :by_status, ->(status) { where(status: status) }
-
-    def self.ransackable_attributes(auth_object = nil)
-      %w[id amount receiver_account_reference transaction_reference status failure_reason processed_at created_at updated_at]
-    end
-
-    def self.ransackable_associations(auth_object = nil)
-      %w[payment_request]
-    end
-  end
-end

data/app/models/dscf/credit/payment_request.rb

@@ -1,29 +0,0 @@
-module Dscf::Credit
-  class PaymentRequest < ApplicationRecord
-    self.table_name = "dscf_credit_payment_requests"
-
-    if defined?(Dscf::Core::User)
-      belongs_to :user, class_name: "Dscf::Core::User", foreign_key: "user_id"
-    end
-    has_many :loans, class_name: "Dscf::Credit::Loan", foreign_key: "payment_request_id", dependent: :destroy
-    has_many :payments, class_name: "Dscf::Credit::Payment", foreign_key: "payment_request_id", dependent: :destroy
-
-    validates :order_id, presence: true, uniqueness: true
-    validates :request_type, :amount, :receiver_account_reference, presence: true
-    validates :amount, numericality: { greater_than: 0 }
-    validates :status, inclusion: { in: %w[pending approved rejected processed failed] }
-
-    scope :pending, -> { where(status: "pending") }
-    scope :approved, -> { where(status: "approved") }
-    scope :processed, -> { where(status: "processed") }
-    scope :failed, -> { where(status: "failed") }
-
-    def self.ransackable_attributes(auth_object = nil)
-      %w[id order_id request_type amount receiver_account_reference status failure_reason initiated_at approved_at created_at updated_at]
-    end
-
-    def self.ransackable_associations(auth_object = nil)
-      %w[user loans payments]
-    end
-  end
-end

data/app/serializers/dscf/credit/payment_request_serializer.rb

@@ -1,10 +0,0 @@
-module Dscf::Credit
-  class PaymentRequestSerializer < ActiveModel::Serializer
-    attributes :id, :order_id, :request_type, :amount, :receiver_account_reference,
-               :status, :failure_reason, :initiated_at, :approved_at, :created_at, :updated_at
-
-    belongs_to :user, serializer: Dscf::Core::UserSerializer
-    has_many :loans, serializer: Dscf::Credit::LoanSerializer
-    has_many :payments, serializer: Dscf::Credit::PaymentSerializer
-  end
-end

data/app/serializers/dscf/credit/payment_serializer.rb

@@ -1,8 +0,0 @@
-module Dscf::Credit
-  class PaymentSerializer < ActiveModel::Serializer
-    attributes :id, :amount, :receiver_account_reference, :transaction_reference,
-               :status, :failure_reason, :processed_at, :created_at, :updated_at
-
-    belongs_to :payment_request, serializer: PaymentRequestSerializer
-  end
-end

data/db/migrate/20250822092608_create_dscf_credit_payment_requests.rb

@@ -1,26 +0,0 @@
-class CreateDscfCreditPaymentRequests < ActiveRecord::Migration[8.0]
-  def change
-    create_table :dscf_credit_payment_requests do |t|
-      t.references :user, null: false, foreign_key: { to_table: :dscf_core_users }
-      t.string :order_id, null: false
-      t.string :request_type, null: false
-      t.decimal :amount, precision: 15, scale: 2, null: false
-      t.string :receiver_account_reference, null: false
-      t.string :status, default: 'pending'
-      t.text :failure_reason
-      t.datetime :initiated_at
-      t.datetime :approved_at
-
-      t.timestamps
-    end
-
-    add_index :dscf_credit_payment_requests, :order_id, unique: true
-    add_index :dscf_credit_payment_requests, :request_type
-    add_index :dscf_credit_payment_requests, :status
-    add_index :dscf_credit_payment_requests, :receiver_account_reference
-    add_index :dscf_credit_payment_requests, :initiated_at
-    add_index :dscf_credit_payment_requests, :approved_at
-    add_index :dscf_credit_payment_requests, [ :user_id, :status ]
-    add_index :dscf_credit_payment_requests, [ :user_id, :request_type ]
-  end
-end

data/db/migrate/20250822092843_create_dscf_credit_payments.rb

@@ -1,23 +0,0 @@
-class CreateDscfCreditPayments < ActiveRecord::Migration[8.0]
-  def change
-    create_table :dscf_credit_payments do |t|
-      t.references :payment_request, null: false, foreign_key: { to_table: :dscf_credit_payment_requests }
-      t.decimal :amount, precision: 15, scale: 2, null: false
-      t.string :receiver_account_reference, null: false
-      t.string :transaction_reference, null: false
-      t.string :status, default: 'pending'
-      t.text :failure_reason
-      t.datetime :processed_at
-
-      t.timestamps
-    end
-
-    add_index :dscf_credit_payments, :transaction_reference, unique: true
-    add_index :dscf_credit_payments, :receiver_account_reference
-    add_index :dscf_credit_payments, :status
-    add_index :dscf_credit_payments, :amount
-    add_index :dscf_credit_payments, :processed_at
-    add_index :dscf_credit_payments, [ :payment_request_id, :status ]
-    add_index :dscf_credit_payments, :created_at
-  end
-end

data/spec/factories/dscf/credit/payment_requests.rb

@@ -1,40 +0,0 @@
-FactoryBot.define do
-  factory :payment_request, class: "Dscf::Credit::PaymentRequest" do
-    association :user, factory: :user if defined?(Dscf::Core::User)
-    order_id { Faker::Alphanumeric.alphanumeric(number: 16).upcase }
-    request_type { %w[loan_disbursement loan_repayment interest_payment fee_payment].sample }
-    amount { Faker::Number.decimal(l_digits: 5, r_digits: 2) }
-    receiver_account_reference { Faker::Bank.account_number }
-    status { %w[pending approved rejected processed failed].sample }
-    failure_reason { Faker::Lorem.sentence if status.in?(%w[rejected failed]) }
-    initiated_at { Faker::Time.between(from: 1.month.ago, to: Time.current) }
-    approved_at { initiated_at + rand(1..24).hours if status.in?(%w[approved processed]) }
-
-    trait :pending do
-      status { "pending" }
-      approved_at { nil }
-      failure_reason { nil }
-    end
-
-    trait :approved do
-      status { "approved" }
-      approved_at { initiated_at + rand(1..24).hours }
-      failure_reason { nil }
-    end
-
-    trait :rejected do
-      status { "rejected" }
-      failure_reason { Faker::Lorem.sentence }
-    end
-
-    trait :processed do
-      status { "processed" }
-      approved_at { initiated_at + rand(1..24).hours }
-    end
-
-    trait :failed do
-      status { "failed" }
-      failure_reason { Faker::Lorem.sentence }
-    end
-  end
-end

data/spec/factories/dscf/credit/payments.rb

@@ -1,39 +0,0 @@
-FactoryBot.define do
-  factory :payment, class: "Dscf::Credit::Payment" do
-    association :payment_request, factory: :payment_request
-    amount { Faker::Number.decimal(l_digits: 5, r_digits: 2) }
-    receiver_account_reference { Faker::Alphanumeric.alphanumeric(number: 20) }
-    transaction_reference { Faker::Alphanumeric.alphanumeric(number: 16) }
-    status { %w[pending processing completed failed cancelled].sample }
-    failure_reason { Faker::Lorem.sentence if status.in?(%w[failed cancelled]) }
-    processed_at { Faker::Time.between(from: 1.month.ago, to: Time.current) if status.in?(%w[completed failed]) }
-
-    trait :pending do
-      status { "pending" }
-      processed_at { nil }
-      failure_reason { nil }
-    end
-
-    trait :processing do
-      status { "processing" }
-      processed_at { nil }
-    end
-
-    trait :completed do
-      status { "completed" }
-      processed_at { Faker::Time.between(from: 1.month.ago, to: Time.current) }
-      failure_reason { nil }
-    end
-
-    trait :failed do
-      status { "failed" }
-      processed_at { Faker::Time.between(from: 1.month.ago, to: Time.current) }
-      failure_reason { Faker::Lorem.sentence }
-    end
-
-    trait :cancelled do
-      status { "cancelled" }
-      failure_reason { Faker::Lorem.sentence }
-    end
-  end
-end