dscf-banking 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc685fe54cfe3ac3a4eaa5f241c70e71fabbb659daed56ff93ba9d40762c262
-  data.tar.gz: 7ba510d6818243bded3582c1ddaa66e87a92f3ebcf7bf7a1f393d83064ff811c
+  metadata.gz: e27d20f9d483fe4d6cad89eee3cfca5b645b7f0506533417239094a374f2d605
+  data.tar.gz: 35544741b37e86abbba9b2fe5340385e2ba5548a707af606f590b9cde3427666
 SHA512:
-  metadata.gz: 4ddabc45b7019977470f880cb364e853ba7269319ecede9d7d2f75db6c6e99fed19ca6bc915e7f613b6367d5abe0360850e2aeaf84312db58c8197091a6114ed
-  data.tar.gz: 7e038bfe9f2a4558e05971d4cc11374e779553fd72a953d7db25a743c7f334ed6ea758126aeaa30a9f8c63684be617178ab0f6d64eb57560f01c4ad7fbd48730
+  metadata.gz: 5d4dc562bceac06f973435d2b9ea61983a426374b498a184df51da088cff5a6cf8bc4cae0cd7a339beb201dda12285ff74f821c7ef961f02cf9df88974d0c3ee
+  data.tar.gz: 698c1120914bc32176231f198b6538b6d5a18338b3fd14ed5d1461d5a36b6ed61fbb5cd25064b82426ce77684691a0ac4b5ce9df14643424d8939bd2a77a79d5

data/app/controllers/dscf/banking/accounts_controller.rb

@@ -0,0 +1,152 @@
+module Dscf::Banking
+  class AccountsController < ApplicationController
+    include Dscf::Core::Common
+
+    def activate
+      account = Dscf::Banking::Account.find(params[:id])
+
+      unless account.can_be_activated?
+        return render json: {
+          success: false,
+          error: "Failed to activate account",
+          errors: [ "Account cannot be activated from current status: #{account.status}" ]
+        }, status: :unprocessable_entity
+      end
+
+      if account.activate!
+        render json: {
+          success: true,
+          data: account_data(account),
+          message: "Account activated successfully"
+        }
+      else
+        render json: {
+          success: false,
+          error: "Failed to activate account",
+          errors: account.errors.full_messages
+        }, status: :unprocessable_entity
+      end
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        success: false,
+        error: "Account not found"
+      }, status: :not_found
+    end
+
+    def suspend
+      account = Dscf::Banking::Account.find(params[:id])
+
+      unless account.can_be_suspended?
+        return render json: {
+          success: false,
+          error: "Failed to suspend account",
+          errors: [ "Account cannot be suspended from current status: #{account.status}" ]
+        }, status: :unprocessable_entity
+      end
+
+      if account.suspend!
+        render json: {
+          success: true,
+          data: account_data(account),
+          message: "Account suspended successfully"
+        }
+      else
+        render json: {
+          success: false,
+          error: "Failed to suspend account",
+          errors: account.errors.full_messages
+        }, status: :unprocessable_entity
+      end
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        success: false,
+        error: "Account not found"
+      }, status: :not_found
+    end
+
+    def close
+      account = Dscf::Banking::Account.find(params[:id])
+
+      unless account.can_be_closed?
+        return render json: {
+          success: false,
+          error: "Failed to close account",
+          errors: [ "Account cannot be closed from current status: #{account.status}" ]
+        }, status: :unprocessable_entity
+      end
+
+      if account.close!
+        render json: {
+          success: true,
+          data: account_data(account),
+          message: "Account closed successfully"
+        }
+      else
+        render json: {
+          success: false,
+          error: "Failed to close account",
+          errors: account.errors.full_messages
+        }, status: :unprocessable_entity
+      end
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        success: false,
+        error: "Account not found"
+      }, status: :not_found
+    end
+
+    private
+
+    def account_data(account)
+      {
+        id: account.id,
+        account_number: account.account_number,
+        name: account.name,
+        status: account.status,
+        activation_date: account.activation_date,
+        closure_date: account.closure_date,
+        current_balance: account.current_balance,
+        available_balance: account.available_balance,
+        minimum_balance: account.minimum_balance,
+        currency: account.currency,
+        active: account.active,
+        application_id: account.application_id,
+        virtual_account_product_id: account.virtual_account_product_id,
+        created_at: account.created_at,
+        updated_at: account.updated_at
+      }
+    end
+
+    def model_params
+      params.require(:payload).permit(
+        :application_id,
+        :virtual_account_product_id,
+        :name,
+        :status,
+        :activation_date,
+        :closure_date,
+        :current_balance,
+        :available_balance,
+        :minimum_balance,
+        :currency,
+        :active,
+        account_properties: {}
+      )
+    end
+
+    def eager_loaded_associations
+      [ :application, :virtual_account_product ]
+    end
+
+    def allowed_order_columns
+      %w[id account_number name status activation_date closure_date current_balance created_at updated_at]
+    end
+
+    def default_serializer_includes
+      {
+        application: {},
+        virtual_account_product: {}
+      }
+    end
+  end
+end

data/app/controllers/dscf/banking/applications_controller.rb

@@ -0,0 +1,113 @@
+module Dscf::Banking
+  class ApplicationsController < ApplicationController
+    include Dscf::Core::Common
+
+    def approve
+      application = Dscf::Banking::Application.find(params[:id])
+
+      unless application.can_be_approved_via_api?
+        return render json: {
+          success: false,
+          error: "Failed to approve application",
+          errors: [ "Application cannot be approved from current status: #{application.status}" ]
+        }, status: :unprocessable_entity
+      end
+
+      if application.approve!
+        render json: {
+          success: true,
+          data: application_data(application),
+          message: "Application approved successfully"
+        }
+      else
+        render json: {
+          success: false,
+          error: "Failed to approve application",
+          errors: application.errors.full_messages
+        }, status: :unprocessable_entity
+      end
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        success: false,
+        error: "Application not found"
+      }, status: :not_found
+    end
+
+    def reject
+      application = Dscf::Banking::Application.find(params[:id])
+      rejection_reason = params[:rejection_reason]
+
+      unless application.can_be_rejected_via_api?
+        return render json: {
+          success: false,
+          error: "Failed to reject application",
+          errors: [ "Application cannot be rejected from current status: #{application.status}" ]
+        }, status: :unprocessable_entity
+      end
+
+      if application.reject!(rejection_reason)
+        render json: {
+          success: true,
+          data: application_data(application),
+          message: "Application rejected successfully"
+        }
+      else
+        render json: {
+          success: false,
+          error: "Failed to reject application",
+          errors: application.errors.full_messages
+        }, status: :unprocessable_entity
+      end
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        success: false,
+        error: "Application not found"
+      }, status: :not_found
+    end
+
+    private
+
+    def application_data(application)
+      {
+        id: application.id,
+        application_number: application.application_number,
+        applicant_type: application.applicant_type,
+        status: application.status,
+        user_id: application.user_id,
+        virtual_account_product_id: application.virtual_account_product_id,
+        form_data: application.form_data,
+        submitted_at: application.submitted_at,
+        completed_at: application.completed_at,
+        rejection_reason: application.rejection_reason,
+        created_at: application.created_at,
+        updated_at: application.updated_at
+      }
+    end
+
+    def model_params
+      params.require(:payload).permit(
+        :user_id,
+        :virtual_account_product_id,
+        :applicant_type,
+        :status,
+        form_data: {}
+      )
+    end
+
+    def eager_loaded_associations
+      [ :user, :virtual_account_product ]
+    end
+
+    def allowed_order_columns
+      %w[id application_number status submitted_at completed_at created_at updated_at]
+    end
+
+    def default_serializer_includes
+      {
+        user: {},
+        virtual_account_product: {},
+        account: {}
+      }
+    end
+  end
+end

data/app/models/dscf/banking/account.rb

@@ -0,0 +1,88 @@
+module Dscf::Banking
+  class Account < ApplicationRecord
+    belongs_to :virtual_account_product
+    belongs_to :application
+
+    enum :status, {
+      draft: 0,
+      pending_activation: 1,
+      active: 2,
+      suspended: 3,
+      closed: 4,
+      dormant: 5
+    }
+
+    validates :account_number, presence: true, uniqueness: { case_sensitive: false }
+    validates :name, presence: true
+    validates :currency, presence: true
+    validates :current_balance, :available_balance, :minimum_balance,
+              numericality: { greater_than_or_equal_to: 0 }
+
+    before_validation :generate_account_number, on: :create
+    before_validation :set_defaults, on: :create
+
+    scope :active_accounts, -> { where(active: true, status: :active) }
+    scope :by_currency, ->(currency) { where(currency: currency) }
+
+    def sufficient_funds_for_withdrawal?(amount)
+      available_balance - amount >= minimum_balance
+    end
+
+    def suspend!(reason = nil)
+      update!(status: :suspended)
+    end
+
+    def activate!
+      update!(status: :active, activation_date: Date.current)
+    end
+
+    def close!(reason = nil)
+      update!(status: :closed, active: false, closure_date: Date.current)
+    end
+
+    def formatted_account_number
+      return nil unless account_number
+      account_number.gsub(/(\d{3})(\d{1})(\d{1})(\d{6})/, '\1 \2 \3 \4')
+    end
+
+    def can_be_activated?
+      draft? || pending_activation? || suspended?
+    end
+
+    def can_be_suspended?
+      active?
+    end
+
+    def can_be_closed?
+      active? || suspended? || dormant?
+    end
+
+    private
+
+    def generate_account_number
+      return if account_number.present?
+
+      branch_code = "001"
+      product_scheme = "1"
+      voucher_type = "0"
+
+      loop do
+        sequence = SecureRandom.random_number(1000000).to_s.rjust(6, "0")
+        account_num = "#{branch_code}#{product_scheme}#{voucher_type}#{sequence}"
+
+        unless self.class.exists?(account_number: account_num)
+          self.account_number = account_num
+          break
+        end
+      end
+    end
+
+    def set_defaults
+      return unless virtual_account_product
+
+      self.currency ||= "ETB"
+      self.minimum_balance ||= 0
+      self.name ||= "Account Holder"
+    end
+  end
+end

data/app/models/dscf/banking/application.rb

@@ -0,0 +1,70 @@
+module Dscf::Banking
+  class Application < ApplicationRecord
+    include Dscf::Banking::Auditable
+
+    belongs_to :user, class_name: "Dscf::Core::User"
+    belongs_to :assigned_kyc_officer, class_name: "Dscf::Core::User", optional: true
+    belongs_to :assigned_branch_manager, class_name: "Dscf::Core::User", optional: true
+    belongs_to :virtual_account_product, class_name: "Dscf::Banking::VirtualAccountProduct"
+    has_one :account, class_name: "Dscf::Banking::Account"
+
+    validates :application_number, presence: true, uniqueness: true, length: { maximum: 50 }
+    validates :applicant_type, presence: true
+    validates :status, presence: true
+    validates :form_data, presence: true
+    validates :rejection_reason, presence: true, if: -> { status == "rejected" }
+
+    enum :applicant_type, { individual: 0, business: 1 }, prefix: :applicant_type
+    enum :status, { draft: 0, submitted: 1, under_review: 2, approved: 3, rejected: 4 }, prefix: :status
+
+    before_validation :generate_application_number, if: -> { new_record? && application_number.blank? }
+    before_update :set_timestamps_on_status_change
+    after_update :create_account_if_approved
+
+    def approve!(approved_by = nil)
+      update!(status: :approved, completed_at: Time.current)
+    end
+
+    def reject!(reason, rejected_by = nil)
+      update!(status: :rejected, rejection_reason: reason, completed_at: Time.current)
+    end
+
+    def can_be_approved_via_api?
+      status_submitted? || status_under_review?
+    end
+
+    def can_be_rejected_via_api?
+      status_submitted? || status_under_review?
+    end
+
+    def has_account?
+      Account.exists?(application: self)
+    end
+
+    def create_account_if_approved
+      if saved_change_to_status? && status_approved?
+        AccountCreationService.call(self)
+      end
+    end
+
+    private
+
+    def generate_application_number
+      prefix = applicant_type == "individual" ? "IND" : "BUS"
+      timestamp = Time.current.strftime("%Y%m%d")
+      random_suffix = SecureRandom.random_number(10000).to_s.rjust(4, "0")
+      self.application_number = "#{prefix}#{timestamp}#{random_suffix}"
+    end
+
+    def set_timestamps_on_status_change
+      if status_changed?
+        case status
+        when "submitted"
+          self.submitted_at = Time.current
+        when "completed"
+          self.completed_at = Time.current
+        end
+      end
+    end
+  end
+end

data/app/serializers/dscf/banking/account_serializer.rb

@@ -0,0 +1,11 @@
+module Dscf::Banking
+  class AccountSerializer < ActiveModel::Serializer
+    attributes :id, :account_number, :name, :status, :activation_date, :closure_date,
+               :account_properties, :current_balance, :available_balance, :minimum_balance,
+               :currency, :active, :created_at, :updated_at
+
+    belongs_to :virtual_account_product, serializer: VirtualAccountProductSerializer
+
+    attribute :application_id
+  end
+end

data/app/serializers/dscf/banking/application_serializer.rb

@@ -0,0 +1,16 @@
+module Dscf::Banking
+  class ApplicationSerializer < ActiveModel::Serializer
+    attributes :id, :application_number, :applicant_type, :status, :form_data,
+               :submitted_at, :completed_at, :rejection_reason, :created_at, :updated_at
+
+    belongs_to :user
+    belongs_to :virtual_account_product, serializer: VirtualAccountProductSerializer
+    belongs_to :assigned_kyc_officer, optional: true
+    belongs_to :assigned_branch_manager, optional: true
+    has_one :account, serializer: AccountSerializer, if: :has_account?
+
+    def has_account?
+      object.has_account?
+    end
+  end
+end

data/app/services/dscf/banking/account_creation_service.rb

@@ -0,0 +1,53 @@
+module Dscf::Banking
+  class AccountCreationService
+    def self.call(application)
+      new(application).call
+    end
+
+    def initialize(application)
+      @application = application
+    end
+
+    def call
+      return nil unless @application.status_approved?
+      return nil if account_already_exists?
+
+      create_account
+    rescue => e
+      Rails.logger.error "Account creation failed: #{e.message}" if defined?(Rails)
+      nil
+    end
+
+    private
+
+    attr_reader :application
+
+    def account_already_exists?
+      Account.exists?(application: @application)
+    end
+
+    def create_account
+      account = Account.new(
+        application: @application,
+        virtual_account_product: @application.virtual_account_product,
+        name: generate_account_name,
+        currency: "ETB",
+        minimum_balance: 0,
+        current_balance: 0,
+        available_balance: 0,
+        status: :draft
+      )
+
+      if account.save
+        account
+      else
+        Rails.logger.error "Account validation failed: #{account.errors.full_messages}" if defined?(Rails)
+        nil
+      end
+    end
+
+    def generate_account_name
+      "Test Account - #{@application.application_number}"
+    end
+  end
+end

data/config/routes.rb

@@ -1,4 +1,11 @@
 Dscf::Banking::Engine.routes.draw do
+  resources :accounts do
+    member do
+      post :activate
+      post :suspend
+      post :close
+    end
+  end
   resources :product_categories
   resources :interest_rate_types
   resources :virtual_account_products do
@@ -9,4 +16,10 @@ Dscf::Banking::Engine.routes.draw do
   resources :interest_configurations
   resources :interest_rate_tiers
   resources :product_approvals
+  resources :applications do
+    member do
+      post :approve
+      post :reject
+    end
+  end
 end

data/db/migrate/20250912193134_create_dscf_banking_applications.rb

@@ -0,0 +1,20 @@
+class CreateDscfBankingApplications < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_banking_applications do |t|
+      t.string :application_number, null: false
+      t.references :user, null: false, foreign_key: { to_table: :dscf_core_users }
+      t.integer :applicant_type, null: false
+      t.integer :status, null: false, default: 0
+
+      t.jsonb :form_data
+      t.datetime :submitted_at
+      t.datetime :completed_at
+      t.text :rejection_reason
+      t.references :assigned_kyc_officer, null: true, foreign_key: { to_table: :dscf_core_users }
+      t.references :assigned_branch_manager, null: true, foreign_key: { to_table: :dscf_core_users }
+      t.references :virtual_account_product, null: false, foreign_key: { to_table: :dscf_banking_virtual_account_products }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250912203527_create_dscf_banking_accounts.rb

@@ -0,0 +1,21 @@
+class CreateDscfBankingAccounts < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_banking_accounts do |t|
+      t.string :account_number, null: false
+      t.references :virtual_account_product, null: false, foreign_key: { to_table: :dscf_banking_virtual_account_products }
+      t.references :application, null: false, foreign_key: { to_table: :dscf_banking_applications }
+      t.string :name, null: false
+      t.integer :status, default: 0
+      t.date :activation_date
+      t.date :closure_date
+      t.jsonb :account_properties, default: {}
+      t.decimal :current_balance, precision: 20, scale: 4, default: 0
+      t.decimal :available_balance, precision: 20, scale: 4, default: 0
+      t.decimal :minimum_balance, precision: 20, scale: 4, default: 0
+      t.string :currency, null: false, default: 'ETB'
+      t.boolean :active, default: true
+
+      t.timestamps
+    end
+  end
+end

data/lib/dscf/banking/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Banking
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/factories/dscf/banking/accounts.rb

@@ -0,0 +1,51 @@
+FactoryBot.define do
+  factory :dscf_banking_account, class: "Dscf::Banking::Account" do
+    association :virtual_account_product, factory: :virtual_account_product
+    association :application, factory: :application
+
+    name { "Test Account" }
+    currency { "ETB" }
+    current_balance { 0 }
+    available_balance { 0 }
+    minimum_balance { 0 }
+    status { :draft }
+    active { true }
+    account_properties { {} }
+
+    trait :active do
+      status { :active }
+      activation_date { Date.current }
+    end
+
+    trait :suspended do
+      status { :suspended }
+    end
+
+    trait :closed do
+      status { :closed }
+      active { false }
+      closure_date { Date.current }
+    end
+
+    trait :with_balance do
+      current_balance { 1000 }
+      available_balance { 1000 }
+      minimum_balance { 100 }
+    end
+  end
+
+  # Alias for shared spec compatibility
+  factory :account, class: "Dscf::Banking::Account" do
+    association :virtual_account_product, factory: :virtual_account_product
+    association :application, factory: :application
+
+    name { "Test Account" }
+    currency { "ETB" }
+    current_balance { 0 }
+    available_balance { 0 }
+    minimum_balance { 0 }
+    status { :draft }
+    active { true }
+    account_properties { {} }
+  end
+end

data/spec/factories/dscf/banking/applications.rb

@@ -0,0 +1,64 @@
+FactoryBot.define do
+  factory :application, class: "Dscf::Banking::Application" do
+    association :user
+    association :virtual_account_product
+    applicant_type { :individual }
+    status { :draft }
+
+    form_data do
+      {
+        first_name: Faker::Name.first_name,
+        last_name: Faker::Name.last_name,
+        date_of_birth: Faker::Date.birthday(min_age: 18, max_age: 80).to_s,
+        nationality: "Ethiopian",
+        phone: Faker::PhoneNumber.phone_number,
+        address: Faker::Address.full_address
+      }
+    end
+    submitted_at { nil }
+    completed_at { nil }
+    rejection_reason { nil }
+    assigned_kyc_officer { nil }
+    assigned_branch_manager { nil }
+
+    trait :business do
+      applicant_type { :business }
+      application_type { :current }
+      form_data do
+        {
+          business_name: Faker::Company.name,
+          tin_number: Faker::Number.number(digits: 10).to_s,
+          business_type: "Limited Company",
+          contact_person: Faker::Name.name,
+          phone: Faker::PhoneNumber.phone_number,
+          address: Faker::Address.full_address
+        }
+      end
+    end
+
+    trait :submitted do
+      status { :submitted }
+      submitted_at { 1.day.ago }
+    end
+
+    trait :under_review do
+      status { :under_review }
+      submitted_at { 2.days.ago }
+      association :assigned_kyc_officer, factory: [ :user, :dscf_core ]
+    end
+
+    trait :approved do
+      status { :approved }
+      submitted_at { 3.days.ago }
+      association :assigned_kyc_officer, factory: [ :user, :dscf_core ]
+      association :assigned_branch_manager, factory: [ :user, :dscf_core ]
+    end
+
+    trait :rejected do
+      status { :rejected }
+      submitted_at { 3.days.ago }
+      rejection_reason { "Incomplete documentation" }
+      association :assigned_kyc_officer, factory: [ :user, :dscf_core ]
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-banking
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Eyosiyas Mekbib
 bindir: bin
 cert_chain: []
-date: 2025-08-31 00:00:00.000000000 Z
+date: 2025-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -439,7 +439,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/controllers/dscf/banking/accounts_controller.rb
 - app/controllers/dscf/banking/application_controller.rb
+- app/controllers/dscf/banking/applications_controller.rb
 - app/controllers/dscf/banking/interest_configurations_controller.rb
 - app/controllers/dscf/banking/interest_rate_tiers_controller.rb
 - app/controllers/dscf/banking/interest_rate_types_controller.rb
@@ -449,6 +451,8 @@ files:
 - app/jobs/dscf/banking/application_job.rb
 - app/mailers/dscf/banking/application_mailer.rb
 - app/models/concerns/dscf/banking/auditable.rb
+- app/models/dscf/banking/account.rb
+- app/models/dscf/banking/application.rb
 - app/models/dscf/banking/application_record.rb
 - app/models/dscf/banking/interest_configuration.rb
 - app/models/dscf/banking/interest_rate_tier.rb
@@ -457,12 +461,15 @@ files:
 - app/models/dscf/banking/product_audit_log.rb
 - app/models/dscf/banking/product_category.rb
 - app/models/dscf/banking/virtual_account_product.rb
+- app/serializers/dscf/banking/account_serializer.rb
+- app/serializers/dscf/banking/application_serializer.rb
 - app/serializers/dscf/banking/interest_configuration_serializer.rb
 - app/serializers/dscf/banking/interest_rate_tier_serializer.rb
 - app/serializers/dscf/banking/interest_rate_type_serializer.rb
 - app/serializers/dscf/banking/product_approval_serializer.rb
 - app/serializers/dscf/banking/product_category_serializer.rb
 - app/serializers/dscf/banking/virtual_account_product_serializer.rb
+- app/services/dscf/banking/account_creation_service.rb
 - config/routes.rb
 - db/migrate/20250830211002_create_dscf_banking_product_categories.rb
 - db/migrate/20250830211027_create_dscf_banking_interest_rate_types.rb
@@ -473,10 +480,14 @@ files:
 - db/migrate/20250831082356_create_dscf_banking_product_approvals.rb
 - db/migrate/20250831083907_create_dscf_banking_product_audit_logs.rb
 - db/migrate/20250831084706_allow_null_virtual_account_product_id_in_product_audit_logs.rb
+- db/migrate/20250912193134_create_dscf_banking_applications.rb
+- db/migrate/20250912203527_create_dscf_banking_accounts.rb
 - lib/dscf/banking.rb
 - lib/dscf/banking/engine.rb
 - lib/dscf/banking/version.rb
 - lib/tasks/dscf/banking_tasks.rake
+- spec/factories/dscf/banking/accounts.rb
+- spec/factories/dscf/banking/applications.rb
 - spec/factories/dscf/banking/interest_configurations.rb
 - spec/factories/dscf/banking/interest_rate_tiers.rb
 - spec/factories/dscf/banking/interest_rate_types.rb