dscf-banking 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eedd9dcd4195d04eab117fdd48ada017e648a3c6ef79d94e634d29e0494c4e98
-  data.tar.gz: 044fdc35040403f853e0d110118c024928a4c8b736a4c159dd7be820ef9268fe
+  metadata.gz: 9fc221b52889b3f647a6bf2aece413c37920cd18b793e15507d0c54d10d64049
+  data.tar.gz: 36c852689c3e64245e5b3f36bbd31d54506e04e82fb259329e4c711274ce9e48
 SHA512:
-  metadata.gz: 597e8e1187c4f547600aac35269d32d0446d01e99acc52546ddf975defea380b367b27d91d018b33942ea7b581f223f1f6992d72c133f900c18e500b3cc4a8cb
-  data.tar.gz: a0f408ddc7caf76d005c6767406586a9e98f5bf79c2009afcd13115c67f42706d95e6db386fb6899b36e7ae1b9c3ab6a2bd578c7bd298360d2ff65cc9615d301
+  metadata.gz: 35049ee207d00a654faf0f8bdebf0e24c6cbed1e0534a923814040bd88d667b89e8bb643e7b35ff14555cce633b68d99c0fce786a4a8e2b6ecac0aff06c28cd0
+  data.tar.gz: d3d6818202de5b7ecdcfc5a7d33495a0d4040b2c00b8f63b0ed13a45645c7a53852209e960c6cb89770f51578e3893843afd1023fa96e061f74ab769666e58b8

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

@@ -210,6 +210,7 @@ module Dscf::Banking
         minimum_balance: account.minimum_balance,
         currency: account.currency,
         active: account.active,
+        system_account: account.system_account,
         application_id: account.application_id,
         virtual_account_product_id: account.virtual_account_product_id,
         account_properties: account.account_properties,
@@ -219,7 +220,7 @@ module Dscf::Banking
     end
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:account).permit(
         :application_id,
         :virtual_account_product_id,
         :name,
@@ -231,6 +232,7 @@ module Dscf::Banking
         :minimum_balance,
         :currency,
         :active,
+        :system_account,
         account_properties: {}
       )
     end

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

@@ -1,6 +1,8 @@
 module Dscf
   module Banking
     class ApplicationController < ActionController::API
+      include Dscf::Core::Authenticatable
+      include Dscf::Core::JsonResponse
     end
   end
 end

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

@@ -1,69 +1,23 @@
 module Dscf::Banking
   class ApplicationsController < ApplicationController
     include Dscf::Core::Common
+    include Dscf::Core::ReviewableController
 
-    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
+    # Custom default context for applications
+    reviewable_context :default,
+      statuses: %w[draft submitted under_review approved rejected],
+      initial_status: "submitted",
+      transitions: {
+        "draft" => %w[submitted],
+        "submitted" => %w[under_review approved rejected],
+        "under_review" => %w[approved rejected]
+      },
+      actions: {
+        submit: { status: "submitted" },
+        assign_for_review: { status: "under_review" },
+        approve: { status: "approved" },
+        reject: { status: "rejected", require_feedback: true }
+      }
 
     private
 
@@ -85,7 +39,7 @@ module Dscf::Banking
     end
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:application).permit(
         :user_id,
         :virtual_account_product_id,
         :applicant_type,
@@ -95,7 +49,7 @@ module Dscf::Banking
     end
 
     def eager_loaded_associations
-      [ :user, :virtual_account_product ]
+      [ :user, :virtual_account_product, :documents, reviews: { reviewed_by: :user_profile } ]
     end
 
     def allowed_order_columns
@@ -104,9 +58,10 @@ module Dscf::Banking
 
     def default_serializer_includes
       {
-        user: {},
-        virtual_account_product: {},
-        account: {}
+        index: [:user, :virtual_account_product, :documents, reviews: { reviewed_by: :user_profile }],
+        show: [:user, :virtual_account_product, :account, :documents, reviews: { reviewed_by: :user_profile }],
+        create: [:documents, :reviews],
+        update: [:user, :virtual_account_product, :account, :documents, reviews: { reviewed_by: :user_profile }]
       }
     end
   end

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

@@ -0,0 +1,154 @@
+module Dscf::Banking
+  class DocumentsController < ApplicationController
+    include Dscf::Core::Common
+
+    def index
+      documents = Dscf::Core::Document.all
+
+      # Handle nested routes
+      if params[:application_id].present?
+        documents = documents.where(documentable_type: "Dscf::Banking::Application", documentable_id: params[:application_id])
+      end
+
+      # Filter by documentable type and ID if provided
+      if params[:documentable_type].present? && params[:documentable_id].present?
+        documents = documents.where(documentable_type: params[:documentable_type], documentable_id: params[:documentable_id])
+      end
+
+      # Filter by document type if provided
+      documents = documents.where(document_type: params[:document_type]) if params[:document_type].present?
+
+      # Apply ordering
+      order_column = allowed_order_columns.include?(params[:order_by]) ? params[:order_by] : "created_at"
+      order_direction = %w[asc desc].include?(params[:order_direction]) ? params[:order_direction] : "desc"
+      documents = documents.order("#{order_column} #{order_direction}")
+
+      render json: {
+        success: true,
+        data: documents.map { |document| document_data(document) }
+      }
+    end
+
+    def show
+      document = Dscf::Core::Document.find(params[:id])
+      render json: {
+        success: true,
+        data: document_data(document)
+      }
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        success: false,
+        error: "Document not found"
+      }, status: :not_found
+    end
+
+    def create
+      document_params = model_params
+
+      # Handle nested routes - set documentable_type and documentable_id from URL params
+      if params[:application_id].present?
+        document_params[:documentable_type] = "Dscf::Banking::Application"
+        document_params[:documentable_id] = params[:application_id]
+      end
+
+      document = Dscf::Core::Document.new(document_params)
+
+      if document.save
+        render json: {
+          success: true,
+          data: document_data(document)
+        }, status: :created
+      else
+        render json: {
+          success: false,
+          error: "Failed to create document",
+          errors: document.errors.full_messages
+        }, status: :unprocessable_content
+      end
+    end
+
+    def update
+      document = Dscf::Core::Document.find(params[:id])
+
+      if document.update(model_params)
+        render json: {
+          success: true,
+          data: document_data(document)
+        }
+      else
+        render json: {
+          success: false,
+          error: "Failed to update document",
+          errors: document.errors.full_messages
+        }, status: :unprocessable_content
+      end
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        success: false,
+        error: "Document not found"
+      }, status: :not_found
+    end
+
+    def destroy
+      document = Dscf::Core::Document.find(params[:id])
+
+      if document.destroy
+        render json: {
+          success: true,
+          message: "Document deleted successfully"
+        }
+      else
+        render json: {
+          success: false,
+          error: "Failed to delete document"
+        }, status: :unprocessable_content
+      end
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        success: false,
+        error: "Document not found"
+      }, status: :not_found
+    end
+
+    private
+
+    def document_data(document)
+      {
+        id: document.id,
+        document_type: document.document_type,
+        file_url: document.file_url,
+        documentable_type: document.documentable_type,
+        documentable_id: document.documentable_id,
+        verified_by: document.verified_by,
+        created_at: document.created_at,
+        updated_at: document.updated_at
+      }
+    rescue => e
+      # Handle cases where file_url might fail (e.g., ActiveStorage not set up)
+      {
+        id: document.id,
+        document_type: document.document_type,
+        file_url: nil,
+        documentable_type: document.documentable_type,
+        documentable_id: document.documentable_id,
+        verified_by: document.verified_by,
+        created_at: document.created_at,
+        updated_at: document.updated_at
+      }
+    end
+
+    def model_params
+      params.require(:document).permit(
+        :document_type,
+        :documentable_type,
+        :documentable_id,
+        :verified_by_id,
+        :file
+      )
+    end
+
+    def allowed_order_columns
+      %w[id document_type created_at updated_at]
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Dscf::Banking
     private
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:interest_configuration).permit(
         :virtual_account_product_id,
         :interest_rate_type_id,
         :annual_interest_rate,

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

@@ -5,7 +5,7 @@ module Dscf::Banking
     private
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:interest_rate_tier).permit(
         :interest_config_id,
         :tier_order,
         :balance_min,

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

@@ -5,7 +5,7 @@ module Dscf::Banking
     private
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:interest_rate_type).permit(
         :code,
         :name,
         :description

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

@@ -5,7 +5,7 @@ module Dscf::Banking
     private
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:product_approval).permit(
         :virtual_account_product_id,
         :submitted_by_id,
         :submitted_at,

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

@@ -5,7 +5,7 @@ module Dscf::Banking
     private
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:product_category).permit(
         :name,
         :description,
         :is_active

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

@@ -5,7 +5,7 @@ module Dscf::Banking
     private
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:transaction_type).permit(
         :code,
         :name,
         :description

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

@@ -2,6 +2,14 @@ module Dscf::Banking
   class TransactionsController < ApplicationController
     include Dscf::Core::Common
 
+    rescue_from ActiveRecord::RecordNotFound do |exception|
+      render json: {
+        success: false,
+        error: "Transaction not found",
+        errors: ["Transaction with ID #{params[:id]} not found"]
+      }, status: :not_found
+    end
+
     # Transfer money between accounts (from test cases)
     def transfer
       debit_account = Dscf::Banking::Account.find_by(account_number: transfer_params[:debit_account_number])
@@ -243,7 +251,7 @@ module Dscf::Banking
     end
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:transaction).permit(
         :account_id,
         :transaction_type_id,
         :debit_account_id,

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

@@ -1,6 +1,24 @@
 module Dscf::Banking
   class VirtualAccountProductsController < ApplicationController
     include Dscf::Core::Common
+    include Dscf::Core::ReviewableController
+
+    # Custom default context with request_modification status
+    reviewable_context :default,
+      statuses: %w[draft pending_approval approved rejected request_modification],
+      initial_status: "pending_approval",
+      transitions: {
+        "draft" => %w[pending_approval],
+        "pending_approval" => %w[approved rejected request_modification],
+        "request_modification" => %w[pending_approval]
+      },
+      actions: {
+        submit: { status: "pending_approval" },
+        approve: { status: "approved" },
+        reject: { status: "rejected", require_feedback: true },
+        request_modification: { status: "request_modification", require_feedback: true },
+        resubmit: { status: "pending_approval", update_model: true }
+      }
 
     def audit_logs
       product = Dscf::Banking::VirtualAccountProduct.find(params[:id])
@@ -41,7 +59,7 @@ module Dscf::Banking
     end
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:virtual_account_product).permit(
         :product_code,
         :product_name,
         :product_category_id,
@@ -56,7 +74,7 @@ module Dscf::Banking
     end
 
     def eager_loaded_associations
-      [ :product_category, :created_by, :approved_by ]
+      [ :product_category, :created_by, :approved_by, reviews: { reviewed_by: :user_profile } ]
     end
 
     def allowed_order_columns
@@ -65,9 +83,10 @@ module Dscf::Banking
 
     def default_serializer_includes
       {
-        product_category: {},
-        created_by: {},
-        approved_by: {}
+        index: [:product_category, :created_by, :approved_by, reviews: { reviewed_by: :user_profile }],
+        show: [:product_category, :created_by, :approved_by, reviews: { reviewed_by: :user_profile }],
+        create: [:reviews],
+        update: [:product_category, :created_by, :approved_by, reviews: { reviewed_by: :user_profile }]
       }
     end
   end

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

@@ -1,12 +1,14 @@
 module Dscf::Banking
   class Application < ApplicationRecord
     include Dscf::Banking::Auditable
+    include Dscf::Core::ReviewableModel
 
     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"
+    has_many :documents, as: :documentable, class_name: "Dscf::Core::Document"
 
     validates :application_number, presence: true, uniqueness: true, length: { maximum: 50 }
     validates :applicant_type, presence: true
@@ -47,6 +49,14 @@ module Dscf::Banking
       end
     end
 
+    def self.ransackable_attributes(auth_object = nil)
+      %w[id application_number status submitted_at completed_at created_at updated_at]
+    end
+
+    def self.ransackable_associations(auth_object = nil)
+      %w[user virtual_account_product account reviews documents]
+    end
+
     private
 
     def generate_application_number

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

@@ -1,6 +1,7 @@
 module Dscf::Banking
   class VirtualAccountProduct < ApplicationRecord
     include Auditable
+    include Dscf::Core::ReviewableModel
 
     self.table_name = "dscf_banking_virtual_account_products"
 
@@ -8,7 +9,8 @@ module Dscf::Banking
       draft: 0,
       pending_approval: 1,
       approved: 2,
-      rejected: 3
+      rejected: 3,
+      request_modification: 4
     }
 
     belongs_to :product_category, class_name: "Dscf::Banking::ProductCategory", optional: true
@@ -35,6 +37,14 @@ module Dscf::Banking
     scope :by_category, ->(category_id) { where(product_category_id: category_id) }
     scope :created_by_user, ->(user_id) { where(created_by_id: user_id) }
 
+    def self.ransackable_attributes(auth_object = nil)
+      %w[id product_code product_name status is_active created_at updated_at]
+    end
+
+    def self.ransackable_associations(auth_object = nil)
+      %w[product_category created_by approved_by reviews]
+    end
+
     before_validation :strip_whitespace
 
     private

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

@@ -8,6 +8,8 @@ module Dscf::Banking
     belongs_to :assigned_kyc_officer, optional: true
     belongs_to :assigned_branch_manager, optional: true
     has_one :account, serializer: AccountSerializer, if: :has_account?
+    has_many :reviews, serializer: Dscf::Core::ReviewSerializer
+    has_many :documents, serializer: Dscf::Banking::DocumentSerializer
 
     def has_account?
       object.has_account?

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

@@ -0,0 +1,7 @@
+module Dscf::Banking
+  class DocumentSerializer < ActiveModel::Serializer
+    attributes :id, :document_type, :file_url, :created_at, :updated_at
+
+    belongs_to :verified_by, polymorphic: true, optional: true
+  end
+end

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

@@ -6,5 +6,7 @@ module Dscf::Banking
     belongs_to :product_category, serializer: ProductCategorySerializer
     belongs_to :created_by
     belongs_to :approved_by
+
+    has_many :reviews, serializer: Dscf::Core::ReviewSerializer
   end
 end

data/config/locales/en.yml

@@ -0,0 +1,25 @@
+en:
+  virtual_account_product:
+    success:
+      submit: "Virtual account product submitted for approval successfully"
+      approve: "Virtual account product approved successfully"
+      reject: "Virtual account product rejected successfully"
+      request_modification: "Modification requested for virtual account product"
+      resubmit: "Virtual account product resubmitted successfully"
+    errors:
+      submit: "Failed to submit virtual account product for approval"
+      approve: "Failed to approve virtual account product"
+      reject: "Failed to reject virtual account product"
+      request_modification: "Failed to request modification for virtual account product"
+      resubmit: "Failed to resubmit virtual account product"
+  application:
+    success:
+      submit: "Application submitted successfully"
+      assign_for_review: "Application assigned for review successfully"
+      approve: "Application approved successfully"
+      reject: "Application rejected successfully"
+    errors:
+      submit: "Failed to submit application"
+      assign_for_review: "Failed to assign application for review"
+      approve: "Failed to approve application"
+      reject: "Failed to reject application"

data/config/routes.rb

@@ -11,6 +11,11 @@ Dscf::Banking::Engine.routes.draw do
   resources :virtual_account_products do
     member do
       get :audit_logs
+      patch :submit
+      patch :approve
+      patch :reject
+      patch :request_modification
+      patch :resubmit
     end
   end
   resources :interest_configurations
@@ -18,11 +23,16 @@ Dscf::Banking::Engine.routes.draw do
   resources :product_approvals
   resources :applications do
     member do
-      post :approve
-      post :reject
+      patch :submit
+      patch :assign_for_review
+      patch :approve
+      patch :reject
     end
+    resources :documents, only: [:index, :create]
   end
 
+  resources :documents
+
   resources :transaction_types
 
   resources :transactions do

data/db/migrate/20250919084927_make_account_associations_optional.rb

@@ -1,6 +1,11 @@
 class MakeAccountAssociationsOptional < ActiveRecord::Migration[8.0]
-  def change
+  def up
     change_column_null :dscf_banking_accounts, :virtual_account_product_id, true
     change_column_null :dscf_banking_accounts, :application_id, true
   end
+
+  def down
+    change_column_null :dscf_banking_accounts, :virtual_account_product_id, false
+    change_column_null :dscf_banking_accounts, :application_id, false
+  end
 end

data/db/seeds.rb

@@ -48,4 +48,30 @@ user7 = User.create(name: "Fikirte Alemayehu", email: "fikirte@example.com", pas
 user7.roles << branch_manager_role
 puts "Created user: #{user7.name}"
 
+# Seed system accounts for transaction processing
+puts "Seeding system accounts..."
+system_deposit_account = Dscf::Banking::Account.find_or_create_by(
+  name: "System Deposit Account",
+  system_account: true
+) do |account|
+  account.currency = "ETB"
+  account.status = :active
+  account.current_balance = 0
+  account.available_balance = 0
+  account.minimum_balance = 0
+end
+puts "Created system deposit account: #{system_deposit_account.name}"
+
+system_withdrawal_account = Dscf::Banking::Account.find_or_create_by(
+  name: "System Withdrawal Account", 
+  system_account: true
+) do |account|
+  account.currency = "ETB"
+  account.status = :active
+  account.current_balance = 0
+  account.available_balance = 0
+  account.minimum_balance = 0
+end
+puts "Created system withdrawal account: #{system_withdrawal_account.name}"
+
 puts "Seeding completed successfully."

data/lib/dscf/banking/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Banking
-    VERSION = "0.2.1"
+    VERSION = "0.2.3"
   end
 end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :dscf_banking_document, class: "Dscf::Core::Document" do
+    association :documentable, factory: :application
+    document_type { :business_license }
+    verified_by { nil }
+
+    # For file attachment, we can use a simple fixture or skip it in basic tests
+    # file { Rack::Test::UploadedFile.new(Rails.root.join('spec', 'fixtures', 'test.pdf'), 'application/pdf') }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-banking
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Eyosiyas Mekbib
 bindir: bin
 cert_chain: []
-date: 2025-10-05 00:00:00.000000000 Z
+date: 2025-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -442,6 +442,7 @@ files:
 - 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/documents_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
@@ -467,6 +468,7 @@ files:
 - 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/document_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
@@ -480,6 +482,7 @@ files:
 - app/services/dscf/banking/deposit_service.rb
 - app/services/dscf/banking/transfer_service.rb
 - app/services/dscf/banking/withdrawal_service.rb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20250830211002_create_dscf_banking_product_categories.rb
 - db/migrate/20250830211027_create_dscf_banking_interest_rate_types.rb
@@ -503,6 +506,7 @@ files:
 - lib/tasks/dscf/banking_tasks.rake
 - spec/factories/dscf/banking/accounts.rb
 - spec/factories/dscf/banking/applications.rb
+- spec/factories/dscf/banking/documents.rb
 - spec/factories/dscf/banking/interest_configurations.rb
 - spec/factories/dscf/banking/interest_rate_tiers.rb
 - spec/factories/dscf/banking/interest_rate_types.rb