dscf-banking 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033d842004e5e6c779e391bb9dca2e43925b3858212b50a94db2f3d8853a0dc1
-  data.tar.gz: eb48ab4b6287afbf75f93801f033c08327d284f127142e7199a7678ee74b3acc
+  metadata.gz: f5ee5ccda8af113288e3eea6f69ba2a24b71d980850d72b25efb187b4f82579b
+  data.tar.gz: ab2d16dcde12321a0a18da6824e5f5788c10ca8aba568eb138085440187c3976
 SHA512:
-  metadata.gz: f7bcc179bc00d1f81d16394e521b1d54188bd41efc89a0c0d1f9c076648eebc223a9642d3c21790bcb1270d649741b2692f54b74f7b6ec33cded00c44802d122
-  data.tar.gz: b915c7adccc0fcde6e40717023d0f9fe849c5e81298d1797371a4876d5c9dce9dec294b1b08065d23873dd3c210d61b54922d33024ea23fbaf6f3adefe5dad04
+  metadata.gz: e68fcc9ad5dee13a9589181cede9394c2854c32d14db75e76618d523a2c8ec82a412acb867a62281477197e143a845b3d68299fe254d446e0158a059fe8f9bde
+  data.tar.gz: 99cdc4974f9c5068416f14c3fba844c3e7b023a1da84b0e42838f9aa88d0c4bc283824225344297f5afac92f4d7dd031d20390384d3538abcb9b5e8d6ad46c31

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

@@ -34,7 +34,7 @@ module Dscf::Banking
         user = account.application.user
         profile = user.respond_to?(:user_profile) ? user.user_profile : nil
         if profile
-          full_name = [profile.first_name, profile.middle_name, profile.last_name].compact.join(" ")
+          full_name = [ profile.first_name, profile.middle_name, profile.last_name ].compact.join(" ")
           render json: { success: true, data: { full_name: full_name } }
         else
           render json: { success: false, error: "User profile not found" }, status: :not_found
@@ -231,29 +231,29 @@ module Dscf::Banking
 
     def transactions
       account = Dscf::Banking::Account.find(params[:id])
-      
+
       transactions = Dscf::Banking::Transaction
         .where("account_id = ? OR debit_account_id = ? OR credit_account_id = ?", account.id, account.id, account.id)
         .includes(:account, :transaction_type, :debit_account, :credit_account)
-      
+
       # Apply pagination if requested
       page = params[:page].to_i
       per_page = (params[:per_page] || 10).to_i
-      
+
       # Apply filters
       transactions = transactions.where(status: params[:status]) if params[:status].present?
       transactions = transactions.where(transaction_type_id: params[:transaction_type_id]) if params[:transaction_type_id].present?
-      
+
       # Apply ordering
       order_column = %w[id reference_number amount currency status created_at updated_at].include?(params[:order_by]) ? params[:order_by] : "created_at"
       order_direction = %w[asc desc].include?(params[:order_direction]) ? params[:order_direction] : "desc"
       transactions = transactions.order("#{order_column} #{order_direction}")
-      
+
       if page.positive?
         total_count = transactions.count
         total_pages = (total_count.to_f / per_page).ceil
         transactions = transactions.offset((page - 1) * per_page).limit(per_page)
-        
+
         render json: {
           success: true,
           message: "Account transactions retrieved successfully",

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

@@ -24,7 +24,7 @@ module Dscf::Banking
 
     private
 
-  def application_data(application)
+    def application_data(application)
       {
         id: application.id,
         application_number: application.application_number,
@@ -52,7 +52,7 @@ module Dscf::Banking
     end
 
     def eager_loaded_associations
-      [ :user, :virtual_account_product, :account, :documents, reviews: { reviewed_by: :user_profile } ]
+      [ :user, :virtual_account_product, :documents, reviews: { reviewed_by: :user_profile } ]
     end
 
     def allowed_order_columns

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

@@ -8,7 +8,7 @@ module Dscf::Banking
       super do
         documents = @application.documents
         options = { each_serializer: DocumentSerializer }
-        [documents, options]
+        [ documents, options ]
       end
     end
 
@@ -16,17 +16,17 @@ module Dscf::Banking
       super do
         document = @application.documents.find(params[:id])
         options = { serializer: DocumentSerializer }
-        [document, options]
+        [ document, options ]
       end
     end
 
     def create
       document = @application.documents.build(model_params)
-      
+
       if document.save
         # Attach file if provided
         document.files.attach(params[:document][:file]) if params[:document][:file].present?
-        
+
         render json: {
           success: true,
           data: DocumentSerializer.new(document).as_json

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

@@ -24,7 +24,7 @@ module Dscf::Banking
     end
 
     def eager_loaded_associations
-      [ :virtual_account_product, :interest_rate_type ]
+      [ :virtual_account_product, :interest_rate_type, :interest_rate_tiers ]
     end
 
     def allowed_order_columns
@@ -33,8 +33,10 @@ module Dscf::Banking
 
     def default_serializer_includes
       {
-        virtual_account_product: {},
-        interest_rate_type: {}
+        index: [ :virtual_account_product, :interest_rate_type, :interest_rate_tiers ],
+        show: [ :virtual_account_product, :interest_rate_type, :interest_rate_tiers ],
+        create: [ :virtual_account_product, :interest_rate_type, :interest_rate_tiers ],
+        update: [ :virtual_account_product, :interest_rate_type, :interest_rate_tiers ]
       }
     end
   end

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

@@ -2,19 +2,25 @@ module Dscf::Banking
   class InterestConfiguration < ApplicationRecord
     belongs_to :interest_rate_type, class_name: "Dscf::Banking::InterestRateType"
     belongs_to :virtual_account_product, class_name: "Dscf::Banking::VirtualAccountProduct"
-    has_many :interest_rate_tiers, class_name: "Dscf::Banking::InterestRateTier", dependent: :destroy
+    has_many :interest_rate_tiers, class_name: "Dscf::Banking::InterestRateTier", foreign_key: :interest_config_id, dependent: :destroy
 
-    validates :annual_interest_rate, presence: true, numericality: { greater_than: 0, less_than_or_equal_to: 1 }
+    validates :annual_interest_rate, presence: true, numericality: { greater_than: 0, less_than_or_equal_to: 1 }, unless: :interest_free?
+    validates :annual_interest_rate, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1 }, if: :interest_free?, allow_nil: true
     validates :income_tax_rate, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1 }
     validates :minimum_balance_for_interest, presence: true, numericality: { greater_than_or_equal_to: 0 }
-    validates :calculation_method, presence: true
-
-    validates :interest_basis, presence: true
-    validates :accrual_frequency, presence: true
-    validates :rounding_rule, presence: true
-    validates :calculation_timing, presence: true
+    validates :calculation_method, presence: true, unless: :interest_free?
+    validates :interest_basis, presence: true, unless: :interest_free?
+    validates :accrual_frequency, presence: true, unless: :interest_free?
+    validates :rounding_rule, presence: true, unless: :interest_free?
+    validates :calculation_timing, presence: true, unless: :interest_free?
     validates :is_active, inclusion: { in: [ true, false ] }
+
     validate :promotional_dates_consistency
+    validate :rate_type_specific_validations
+    validate :tiers_only_for_variable_rate
+    validate :interest_rate_type_requirements
+
+    before_validation :set_interest_basis_from_accrual_frequency
 
     enum :calculation_method, {
       simple: 0,
@@ -57,6 +63,33 @@ module Dscf::Banking
     scope :promotional, -> { where.not(promotional_start_date: nil, promotional_end_date: nil) }
     scope :current_promotional, -> { where("promotional_start_date <= ? AND promotional_end_date >= ?", Date.current, Date.current) }
 
+    def self.ransackable_attributes(auth_object = nil)
+      %w[id virtual_account_product_id interest_rate_type_id annual_interest_rate income_tax_rate
+         minimum_balance_for_interest calculation_method compounding_period interest_basis
+         accrual_frequency rounding_rule promotional_start_date promotional_end_date is_active
+         created_at updated_at]
+    end
+
+    def self.ransackable_associations(auth_object = nil)
+      %w[virtual_account_product interest_rate_type interest_rate_tiers]
+    end
+
+    def interest_free?
+      interest_rate_type&.code == "INTEREST_FREE"
+    end
+
+    def fixed_rate?
+      interest_rate_type&.code == "FIXED"
+    end
+
+    def variable_rate?
+      interest_rate_type&.code == "VARIABLE"
+    end
+
+    def promotional_rate?
+      interest_rate_type&.code == "PROMOTIONAL"
+    end
+
     private
 
     def promotional_dates_consistency
@@ -81,5 +114,81 @@ module Dscf::Banking
         errors.add(:calculation_day_of_month, "must be specified for annual accrual") if calculation_day_of_month.blank?
       end
     end
+
+    def rate_type_specific_validations
+      return if interest_rate_type.blank?
+
+      case interest_rate_type.code
+      when "INTEREST_FREE"
+        validate_interest_free
+      when "FIXED"
+        validate_fixed_rate
+      when "VARIABLE"
+        validate_variable_rate
+      when "PROMOTIONAL"
+        validate_promotional_rate
+      end
+    end
+
+    def validate_interest_free
+      if annual_interest_rate.present? && annual_interest_rate > 0
+        errors.add(:annual_interest_rate, "must be 0 for interest-free accounts")
+      end
+    end
+
+    def validate_fixed_rate
+      if annual_interest_rate.blank? || annual_interest_rate <= 0
+        errors.add(:annual_interest_rate, "must be greater than 0 for fixed rate")
+      end
+    end
+
+    def validate_variable_rate
+      if annual_interest_rate.blank? || annual_interest_rate <= 0
+        errors.add(:annual_interest_rate, "must be greater than 0 for variable rate")
+      end
+    end
+
+    def validate_promotional_rate
+      if promotional_start_date.blank?
+        errors.add(:promotional_start_date, "is required for promotional rate")
+      end
+      if promotional_end_date.blank?
+        errors.add(:promotional_end_date, "is required for promotional rate")
+      end
+      if annual_interest_rate.blank? || annual_interest_rate <= 0
+        errors.add(:annual_interest_rate, "must be greater than 0 for promotional rate")
+      end
+    end
+
+    def tiers_only_for_variable_rate
+      return if interest_rate_type.blank?
+      return unless persisted? || interest_rate_tiers.loaded?
+
+      if !variable_rate? && interest_rate_tiers.any?
+        errors.add(:base, "Interest rate tiers can only be used with variable rate type")
+      end
+    end
+
+    def interest_rate_type_requirements
+      return if interest_rate_type.blank?
+      return unless persisted?
+
+      if variable_rate? && interest_rate_tiers.empty?
+        errors.add(:base, "Variable rate type requires at least one interest rate tier")
+      end
+    end
+
+    def set_interest_basis_from_accrual_frequency
+      return if accrual_frequency.blank?
+      return if interest_free?
+      return if interest_basis.present?
+
+      case accrual_frequency
+      when "daily"
+        self.interest_basis = :actual_365
+      when "monthly", "quarterly", "annually"
+        self.interest_basis = :thirty_360
+      end
+    end
   end
 end

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

@@ -19,6 +19,7 @@ module Dscf::Banking
 
     has_many :product_approvals, class_name: "Dscf::Banking::ProductApproval", dependent: :destroy
     has_many :product_audit_logs, class_name: "Dscf::Banking::ProductAuditLog", dependent: :destroy
+    has_many :interest_configurations, class_name: "Dscf::Banking::InterestConfiguration", dependent: :destroy
 
     validates :product_code, presence: true, uniqueness: { case_sensitive: true }, length: { maximum: 50 }
     validates :product_name, presence: true, length: { maximum: 200 }
@@ -42,7 +43,7 @@ module Dscf::Banking
     end
 
     def self.ransackable_associations(auth_object = nil)
-      %w[product_category created_by approved_by reviews]
+      %w[product_category created_by approved_by reviews interest_configurations]
     end
 
     before_validation :strip_whitespace

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

@@ -9,7 +9,7 @@ module Dscf::Banking
     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
+    has_many :documents, serializer: DocumentSerializer
 
     def has_account?
       object.has_account?

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

@@ -1,6 +1,14 @@
 module Dscf::Banking
   class DocumentSerializer < ActiveModel::Serializer
-    attributes :id, :document_type, :is_verified, :verified_at, :metadata, :file_urls, :created_at, :updated_at
+    attributes :id, :document_type, :is_verified, :verified_at, :metadata, :file_urls, :created_at, :updated_at,
+               :documentable_type, :documentable_id, :documentable
+
+    def documentable
+      {
+        type: object.documentable_type,
+        id: object.documentable_id
+      }
+    end
 
     def file_urls
       return [] unless object.files.attached?

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

@@ -7,5 +7,6 @@ module Dscf::Banking
 
     belongs_to :virtual_account_product, serializer: VirtualAccountProductSerializer
     belongs_to :interest_rate_type, serializer: InterestRateTypeSerializer
+    has_many :interest_rate_tiers, serializer: InterestRateTierSerializer
   end
 end

data/config/routes.rb

@@ -1,6 +1,5 @@
 Dscf::Banking::Engine.routes.draw do
-    resources :accounts do
-      get "full_name", to: "accounts#full_name", on: :member
+  resources :accounts do
     collection do
       get :me
     end

data/db/seeds/interest_rate_types.rb

@@ -0,0 +1,38 @@
+puts "Seeding Interest Rate Types..."
+
+interest_rate_types = [
+  {
+    code: "INTEREST_FREE",
+    name: "Interest Free",
+    description: "No interest is earned on the account balance. Suitable for transactional accounts or specific product offerings."
+  },
+  {
+    code: "FIXED",
+    name: "Fixed Rate",
+    description: "A single flat interest rate applied to the entire account balance. Rate remains constant unless manually updated."
+  },
+  {
+    code: "VARIABLE",
+    name: "Variable Rate",
+    description: "Tiered interest rates based on balance ranges. Different rates apply to different balance brackets, encouraging higher deposits."
+  },
+  {
+    code: "PROMOTIONAL",
+    name: "Promotional Rate",
+    description: "Temporary special interest rate applied for a specific period. Automatically reverts to the default rate after the promotional period ends."
+  }
+]
+
+interest_rate_types.each do |rate_type_data|
+  rate_type = Dscf::Banking::InterestRateType.find_or_initialize_by(code: rate_type_data[:code])
+  rate_type.assign_attributes(rate_type_data)
+
+  if rate_type.save
+    puts "  ✓ Created/Updated: #{rate_type.name} (#{rate_type.code})"
+  else
+    puts "  ✗ Failed to create #{rate_type_data[:name]}: #{rate_type.errors.full_messages.join(', ')}"
+  end
+end
+
+puts "Interest Rate Types seeding completed!"
+puts "Total Interest Rate Types: #{Dscf::Banking::InterestRateType.count}"

data/db/seeds.rb

@@ -48,6 +48,43 @@ user7 = User.create(name: "Fikirte Alemayehu", email: "fikirte@example.com", pas
 user7.roles << branch_manager_role
 puts "Created user: #{user7.name}"
 
+# Seed Interest Rate Types
+puts "Seeding Interest Rate Types..."
+interest_rate_types = [
+  {
+    code: "INTEREST_FREE",
+    name: "Interest Free",
+    description: "No interest is earned on the account balance. Suitable for transactional accounts or specific product offerings."
+  },
+  {
+    code: "FIXED",
+    name: "Fixed Rate",
+    description: "A single flat interest rate applied to the entire account balance. Rate remains constant unless manually updated."
+  },
+  {
+    code: "VARIABLE",
+    name: "Variable Rate",
+    description: "Tiered interest rates based on balance ranges. Different rates apply to different balance brackets, encouraging higher deposits."
+  },
+  {
+    code: "PROMOTIONAL",
+    name: "Promotional Rate",
+    description: "Temporary special interest rate applied for a specific period. Automatically reverts to the default rate after the promotional period ends."
+  }
+]
+
+interest_rate_types.each do |rate_type_data|
+  rate_type = Dscf::Banking::InterestRateType.find_or_initialize_by(code: rate_type_data[:code])
+  rate_type.assign_attributes(rate_type_data)
+
+  if rate_type.save
+    puts "  ✓ Created/Updated: #{rate_type.name} (#{rate_type.code})"
+  else
+    puts "  ✗ Failed to create #{rate_type_data[:name]}: #{rate_type.errors.full_messages.join(', ')}"
+  end
+end
+puts "Interest Rate Types seeding completed!"
+
 # Seed transaction types
 puts "Seeding transaction types..."
 deposit_type = Dscf::Banking::TransactionType.find_or_create_by(code: "DEPOSIT") do |tt|

data/lib/dscf/banking/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Banking
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

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

@@ -3,34 +3,62 @@ FactoryBot.define do
     association :virtual_account_product, factory: :virtual_account_product
     association :interest_rate_type, factory: :interest_rate_type
 
-    annual_interest_rate { Faker::Number.decimal(l_digits: 1, r_digits: 4).clamp(0.0001, 1.0) }
-    income_tax_rate { Faker::Number.decimal(l_digits: 1, r_digits: 4).clamp(0.0, 1.0) }
-    minimum_balance_for_interest { Faker::Number.decimal(l_digits: 4, r_digits: 2).clamp(0.0, 999999.99) }
-    calculation_method { [ 0, 1 ].sample }
-    compounding_period { [ 0, 1, 2, 3, 4 ].sample }
-    interest_basis { [ 0, 1, 2 ].sample }
-    accrual_frequency { [ 0, 1, 2, 3, 4 ].sample }
-    rounding_rule { [ 0, 1, 2 ].sample }
-    calculation_timing { Faker::Time.between(from: Time.current.beginning_of_day, to: Time.current.end_of_day) }
+    annual_interest_rate { 0.05 }
+    income_tax_rate { 0.05 }
+    minimum_balance_for_interest { 0.0 }
+    calculation_method { :simple }
+    compounding_period { nil }
+    interest_basis { :actual_365 }
+    accrual_frequency { :monthly }
+    rounding_rule { :nearest_cent }
+    calculation_timing { Time.current }
     is_active { true }
 
     trait :inactive do
       is_active { false }
     end
 
+    trait :interest_free do
+      association :interest_rate_type, factory: [ :interest_rate_type, :interest_free ]
+      annual_interest_rate { 0 }
+      calculation_method { nil }
+      compounding_period { nil }
+      interest_basis { nil }
+      accrual_frequency { nil }
+      rounding_rule { nil }
+      calculation_timing { nil }
+    end
+
+    trait :fixed_rate do
+      association :interest_rate_type, factory: [ :interest_rate_type, :fixed_rate ]
+      annual_interest_rate { 0.05 }
+      calculation_method { :simple }
+    end
+
+    trait :variable_rate do
+      association :interest_rate_type, factory: [ :interest_rate_type, :variable_rate ]
+      annual_interest_rate { 0.03 }
+
+      after(:create) do |config|
+        create_list(:interest_rate_tier, 3, interest_config: config)
+      end
+    end
+
     trait :promotional do
-      promotional_start_date { Faker::Date.between(from: 30.days.ago, to: Date.current) }
-      promotional_end_date { Faker::Date.between(from: Date.current, to: 30.days.from_now) }
+      association :interest_rate_type, factory: [ :interest_rate_type, :promotional_rate ]
+      promotional_start_date { 30.days.ago.to_date }
+      promotional_end_date { 30.days.from_now.to_date }
+      annual_interest_rate { 0.08 }
     end
 
     trait :simple_interest do
-      calculation_method { 0 }
+      calculation_method { :simple }
       compounding_period { nil }
     end
 
     trait :compound_interest do
-      calculation_method { 1 }
-      compounding_period { [ 0, 1, 2, 3, 4 ].sample }
+      calculation_method { :compound }
+      compounding_period { :monthly }
     end
   end
 end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :interest_rate_type, class: "Dscf::Banking::InterestRateType" do
-    sequence(:code) { |n| "RATE#{n.to_s.rjust(3, '0')}" }
+    sequence(:code) { |n| "RATE_#{n.to_s.rjust(3, '0')}" }
     sequence(:name) { |n| "Interest Rate Type #{n}" }
     description { Faker::Lorem.paragraph(sentence_count: 2) }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-banking
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Eyosiyas Mekbib
 bindir: bin
 cert_chain: []
-date: 2025-10-17 00:00:00.000000000 Z
+date: 2025-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -482,8 +482,6 @@ files:
 - app/services/dscf/banking/deposit_service.rb
 - app/services/dscf/banking/transfer_service.rb
 - app/services/dscf/banking/withdrawal_service.rb
-- config/initializers/review_callbacks.rb
-- config/initializers/review_extensions.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20250830211002_create_dscf_banking_product_categories.rb
@@ -502,6 +500,7 @@ files:
 - db/migrate/20250919182831_create_dscf_banking_transaction_types.rb
 - db/migrate/20250919184220_create_dscf_banking_transactions.rb
 - db/seeds.rb
+- db/seeds/interest_rate_types.rb
 - lib/dscf/banking.rb
 - lib/dscf/banking/engine.rb
 - lib/dscf/banking/version.rb

data/config/initializers/review_callbacks.rb

@@ -1,23 +0,0 @@
-Rails.application.config.to_prepare do
-  ActiveSupport::Notifications.subscribe("review.created") do |name, start, finish, id, payload|
-    reviewable = payload[:reviewable]
-    
-    if reviewable.is_a?(Dscf::Banking::Application)
-      reviewable.reload
-      review_status = reviewable.review_status
-      
-      status_map = {
-        "submitted" => "submitted",
-        "under_review" => "under_review",
-        "approved" => "approved",
-        "rejected" => "rejected",
-        "request_modification" => "request_modification"
-      }
-      
-      mapped_status = status_map[review_status]
-      if mapped_status && reviewable.status != mapped_status
-        reviewable.update!(status: mapped_status)
-      end
-    end
-  end
-end

data/config/initializers/review_extensions.rb

@@ -1,36 +0,0 @@
-module Dscf::Banking
-  module ReviewExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      after_create :sync_application_status, if: -> { reviewable.is_a?(Dscf::Banking::Application) }
-    end
-
-    private
-
-    def sync_application_status
-      return unless reviewable.is_a?(Dscf::Banking::Application)
-
-      application = reviewable
-      review_status = application.review_status
-
-      status_map = {
-        "submitted" => "submitted",
-        "under_review" => "under_review",
-        "approved" => "approved",
-        "rejected" => "rejected",
-        "request_modification" => "request_modification"
-      }
-
-      mapped_status = status_map[review_status]
-      if mapped_status && application.status != mapped_status
-        application.update!(status: mapped_status)
-      end
-    end
-  end
-end
-
-# Extend the Dscf::Core::Review model with our extensions
-Rails.application.config.to_prepare do
-  Dscf::Core::Review.include(Dscf::Banking::ReviewExtensions) if defined?(Dscf::Core::Review)
-end