dscf-banking 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eedd9dcd4195d04eab117fdd48ada017e648a3c6ef79d94e634d29e0494c4e98
-  data.tar.gz: 044fdc35040403f853e0d110118c024928a4c8b736a4c159dd7be820ef9268fe
+  metadata.gz: 15401decf84bf542c773e447b403a9bf49631c9d0a566b81b0301dfddb880ff4
+  data.tar.gz: 5f5cc744a1fadafbd69fd740167aad3ab668c0aa37951ce8ff0a8842e0881e5c
 SHA512:
-  metadata.gz: 597e8e1187c4f547600aac35269d32d0446d01e99acc52546ddf975defea380b367b27d91d018b33942ea7b581f223f1f6992d72c133f900c18e500b3cc4a8cb
-  data.tar.gz: a0f408ddc7caf76d005c6767406586a9e98f5bf79c2009afcd13115c67f42706d95e6db386fb6899b36e7ae1b9c3ab6a2bd578c7bd298360d2ff65cc9615d301
+  metadata.gz: 57fbc8692e1d4767bb48be19d29c7ec5350239cbfdaaa18c9ee0349acd43246e83b8a8343d24d0788a9be475a250bce445f3740ffab362e1eb90c438a889a74a
+  data.tar.gz: 9a5eff19db2c9e2d1379c699a83d7409e339efb92d6bc8f761a92630912bfd58b2881743abc024f3809e2860fc044623dad1e8d53dfaece60670f06af1c986cb

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

@@ -219,7 +219,7 @@ module Dscf::Banking
     end
 
     def model_params
-      params.require(:payload).permit(
+      params.require(:account).permit(
         :application_id,
         :virtual_account_product_id,
         :name,

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, 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, reviews: { reviewed_by: :user_profile }],
+        show: [:user, :virtual_account_product, :account, reviews: { reviewed_by: :user_profile }],
+        create: [:reviews],
+        update: [:user, :virtual_account_product, :account, reviews: { reviewed_by: :user_profile }]
       }
     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

@@ -243,7 +243,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,6 +1,7 @@
 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
@@ -47,6 +48,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]
+    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,7 @@ 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
 
     def has_account?
       object.has_account?

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,8 +23,10 @@ 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
   end
 

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/lib/dscf/banking/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Banking
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   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.2
 platform: ruby
 authors:
 - Eyosiyas Mekbib
 bindir: bin
 cert_chain: []
-date: 2025-10-05 00:00:00.000000000 Z
+date: 2025-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -480,6 +480,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