bscf-core 0.4.97 → 0.4.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5f351bc1c4d0ef3f5682b4b01524be4b79366267c313badd649185ba197118
-  data.tar.gz: 257e06eed096459bc7f7479abfe00620692fe7e534f1b327ecab8056b75d07ce
+  metadata.gz: b0455d1f4a5bcc686f33479c012b2bc9ec78ed743de0d101134a0c7a814011d1
+  data.tar.gz: b5082962af2d1679daf511986d30c6c6f9d3e25c818615c7674b63f64dfae2d8
 SHA512:
-  metadata.gz: dc857844cd4f14fdc8ac0d96be4b9eb06ac2513aef4b649c011dc4595387a4d63047fa4066ac85ec5cfbc9730264cb4709b4caf5a58d9c9cdff6b744c5ba0447
-  data.tar.gz: fc8944ef60c284da3bf9489a8f4dec0afdb75d732f167cc7831f9a64aeb76da8c8f95cb8dd1f9916da8841796f7223c43ed13aeb8c4a796124470c163d44025d
+  metadata.gz: c64b3a1a1d4e87ac64919c8948f5f9acf7c97b2cd0fb0410ef894f13e887ca71490e9bd7f5f7e9978ab55b46316bc701f4a37dcf30d2e47f8eb60e39a2603399
+  data.tar.gz: ad4848e51ba7b6220417f52f57172df8187bd1a3a70af91a64cb47617c932e771dab61844633bb1fc70dba950adf51126e27332977aaf0261a7d135772e81ee9

data/app/controllers/bscf/core/application_controller.rb

@@ -1,18 +1,14 @@
 module Bscf
   module Core
     class ApplicationController < ActionController::API
+      include Pundit::Authorization
+
       private
 
       def is_authenticated
         render json: { error: "Not authenticated" }, status: :unauthorized unless current_user
       end
 
-      def is_allowed
-        user_role = UserRole.find_by(user: current_user)
-        role = Role.find(user_role.role_id)
-        render json: { error: "Not authorized" }, status: :ok unless role.name == "User" || role.name == "Admin"
-      end
-
       def current_user
         return @current_user if defined?(@current_user)
 

data/app/models/bscf/core/loan.rb

@@ -0,0 +1,28 @@
+module Bscf::Core
+  class Loan < ApplicationRecord
+    belongs_to :virtual_account, class_name: "Bscf::Core::VirtualAccount"
+    belongs_to :disbursement_transaction, class_name: "Bscf::Core::VirtualAccountTransaction"
+
+    enum :status, { disbursed: 0, late: 1, paid: 2 }
+
+    validates :principal_amount, :interest_amount, :unpaid_balance, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :status, :due_date, presence: true
+    validates :status, inclusion: { in: statuses.keys }
+
+    validate :paid_at_requires_zero_balance_and_paid_status
+    validate :paid_status_requires_zero_balance
+
+    def paid_at_requires_zero_balance_and_paid_status
+      if paid_at.present?
+        errors.add(:paid_at, "can only be set if loan is marked as paid") if status != "paid"
+        errors.add(:paid_at, "can only be set if unpaid balance is zero") if unpaid_balance.to_f > 0
+      end
+    end
+
+    def paid_status_requires_zero_balance
+      if status == "paid" && unpaid_balance.to_f > 0
+        errors.add(:status, "can only be set to paid if unpaid balance is zero")
+      end
+    end
+  end
+end

data/app/models/bscf/core/loan_repayment.rb

@@ -0,0 +1,45 @@
+module Bscf::Core
+  class LoanRepayment < ApplicationRecord
+    belongs_to :loan, class_name: "Bscf::Core::Loan"
+    belongs_to :repayment_transaction, class_name: "Bscf::Core::VirtualAccountTransaction"
+
+    validates :amount, presence: true, numericality: { greater_than: 0 }
+    validates :payment_date, presence: true
+    validate :amount_cannot_exceed_unpaid_balance
+    validate :loan_cannot_be_already_paid
+
+    after_create :apply_repayment_to_loan
+
+    private
+
+    def apply_repayment_to_loan
+      loan.with_lock do
+        loan.unpaid_balance -= amount
+        loan.unpaid_balance = 0 if loan.unpaid_balance.negative?
+
+        if loan.unpaid_balance.zero?
+          loan.status = "paid"
+          loan.paid_at = payment_date
+        end
+
+        loan.save!
+      end
+    end
+
+    def amount_cannot_exceed_unpaid_balance
+      return if loan.blank? || amount.blank?
+
+      if amount > loan.unpaid_balance
+        errors.add(:amount, "cannot be greater than the loan's unpaid balance")
+      end
+    end
+
+    def loan_cannot_be_already_paid
+      return if loan.blank?
+
+      if loan.paid?
+        errors.add(:loan, "is already marked as paid")
+      end
+    end
+  end
+end

data/app/models/bscf/core/virtual_account.rb

@@ -76,9 +76,33 @@ module Bscf
       def generate_account_number
         return if account_number.present?
 
-        last_seq = self.class.maximum(:account_number).to_s[-6..-1].to_i
+        last_account = self.class.maximum(:account_number)
+        last_seq = last_account ? last_account[-6..-1].to_i : 0
         seq = (last_seq + 1).to_s.rjust(6, "0")
-        self.account_number = "#{branch_code}#{product_scheme}#{voucher_type}#{seq}"
+
+        branch_part = branch_code.to_s.rjust(3, "0")[0..2]
+        product_part = map_product_scheme_to_digit(product_scheme)
+        voucher_part = map_voucher_type_to_digit(voucher_type)
+
+        self.account_number = "#{branch_part}#{product_part}#{voucher_part}#{seq}"
+      end
+
+      def map_product_scheme_to_digit(scheme)
+        case scheme
+        when "SAVINGS" then "1"
+        when "CURRENT" then "2"
+        when "LOAN" then "3"
+        else "0"
+        end
+      end
+
+      def map_voucher_type_to_digit(type)
+        case type
+        when "REGULAR" then "1"
+        when "SPECIAL" then "2"
+        when "TEMPORARY" then "3"
+        else "0"
+        end
       end
 
       def transfer_to!(to_account, amount)

data/app/policies/application_policy.rb

@@ -0,0 +1,22 @@
+class ApplicationPolicy
+  attr_reader :user, :record
+
+  def initialize(user, record)
+    @user = user
+    @record = record
+  end
+
+  private
+
+  def admin?
+    user.user_roles.any? { |ur| ur.role.name == "Admin" }
+  end
+
+  def driver?
+    user.user_roles.any? { |ur| ur.role.name == "Driver" }
+  end
+
+  def user_role?
+    user.user_roles.any? { |ur| ur.role.name == "User" }
+  end
+end

data/db/migrate/20250720123239_create_bscf_core_loans.rb

@@ -0,0 +1,16 @@
+class CreateBscfCoreLoans < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_loans do |t|
+      t.references :virtual_account, null: false, foreign_key: { to_table: :bscf_core_virtual_accounts }
+      t.references :disbursement_transaction, null: false, foreign_key: { to_table: :bscf_core_virtual_account_transactions }
+      t.float :principal_amount, null: false, default: 0.0
+      t.float :interest_amount, null: false, default: 0.0
+      t.float :unpaid_balance, null: false, default: 0.0
+      t.integer :status, null: false, default: 0
+      t.date :due_date, null: false, default: Date.today + 15.days
+      t.date :paid_at, null: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250720131241_create_bscf_core_loan_repayments.rb

@@ -0,0 +1,12 @@
+class CreateBscfCoreLoanRepayments < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_loan_repayments do |t|
+      t.references :loan, null: false, foreign_key: { to_table: :bscf_core_loans }
+      t.references :repayment_transaction, null: false, foreign_key: { to_table: :bscf_core_virtual_account_transactions }
+      t.float :amount, null: false
+      t.date :payment_date, null: false, default: Date.today
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250720184059_nullable_occupation_source_of_funds.rb

@@ -0,0 +1,6 @@
+class NullableOccupationSourceOfFunds < ActiveRecord::Migration[8.0]
+  def change
+    change_column_null :bscf_core_user_profiles, :occupation, true
+    change_column_null :bscf_core_user_profiles, :source_of_funds, true
+  end
+end

data/lib/bscf/core/version.rb

@@ -1,5 +1,5 @@
 module Bscf
   module Core
-    VERSION = "0.4.97"
+    VERSION = "0.4.99"
   end
 end

data/spec/factories/bscf/core/loan_repayments.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :loan_repayment, class: 'Bscf::Core::LoanRepayment' do
+    association :loan, factory: :loan
+    association :repayment_transaction, factory: :virtual_account_transaction
+
+    amount { 1.5 }
+    payment_date { Date.today }
+  end
+end

data/spec/factories/bscf/core/loans.rb

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :loan, class: 'Bscf::Core::Loan' do
+    association :virtual_account
+    association :disbursement_transaction, factory: :virtual_account_transaction
+
+    principal_amount { 200.5 }
+    interest_amount { 10.5 }
+    unpaid_balance { 210.5 }
+    status { 0 }
+    due_date { Date.today + 15.days }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bscf-core
 version: !ruby/object:Gem::Version
-  version: 0.4.97
+  version: 0.4.99
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -147,6 +147,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pundit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +310,8 @@ files:
 - app/models/bscf/core/delivery_order_item.rb
 - app/models/bscf/core/invoice.rb
 - app/models/bscf/core/invoice_item.rb
+- app/models/bscf/core/loan.rb
+- app/models/bscf/core/loan_repayment.rb
 - app/models/bscf/core/marketplace_listing.rb
 - app/models/bscf/core/order.rb
 - app/models/bscf/core/order_item.rb
@@ -314,6 +330,7 @@ files:
 - app/models/bscf/core/virtual_account_transaction.rb
 - app/models/bscf/core/voucher.rb
 - app/models/bscf/core/wholesaler_product.rb
+- app/policies/application_policy.rb
 - app/services/bscf/core/gebeta_maps_service.rb
 - app/services/bscf/core/token_service.rb
 - app/services/bscf/core/transaction_service.rb
@@ -364,6 +381,9 @@ files:
 - db/migrate/20250624062746_rename_business_id_to_user_id_in_bscf_core_business_documents.rb
 - db/migrate/20250624122210_add_document_type_to_business_documents.rb
 - db/migrate/20250714201747_add_optimized_route_to_delivery_order.rb
+- db/migrate/20250720123239_create_bscf_core_loans.rb
+- db/migrate/20250720131241_create_bscf_core_loan_repayments.rb
+- db/migrate/20250720184059_nullable_occupation_source_of_funds.rb
 - lib/bscf/core.rb
 - lib/bscf/core/engine.rb
 - lib/bscf/core/version.rb
@@ -379,6 +399,8 @@ files:
 - spec/factories/bscf/core/delivery_orders.rb
 - spec/factories/bscf/core/invoice_items.rb
 - spec/factories/bscf/core/invoices.rb
+- spec/factories/bscf/core/loan_repayments.rb
+- spec/factories/bscf/core/loans.rb
 - spec/factories/bscf/core/marketplace_listings.rb
 - spec/factories/bscf/core/order_items.rb
 - spec/factories/bscf/core/orders.rb
@@ -418,7 +440,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.2
 specification_version: 4
 summary: An Engine for Supply Chain Financing
 test_files: []