dscf-banking 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5ee5ccda8af113288e3eea6f69ba2a24b71d980850d72b25efb187b4f82579b
-  data.tar.gz: ab2d16dcde12321a0a18da6824e5f5788c10ca8aba568eb138085440187c3976
+  metadata.gz: 1d9aebfb57294bdeee3240fe4079565174e97a172b44aaf93c4d93f3be94573d
+  data.tar.gz: f7acfa8939c35b2ce39f99a787772712ee886be3ed89326247948edf6f4b8a9e
 SHA512:
-  metadata.gz: e68fcc9ad5dee13a9589181cede9394c2854c32d14db75e76618d523a2c8ec82a412acb867a62281477197e143a845b3d68299fe254d446e0158a059fe8f9bde
-  data.tar.gz: 99cdc4974f9c5068416f14c3fba844c3e7b023a1da84b0e42838f9aa88d0c4bc283824225344297f5afac92f4d7dd031d20390384d3538abcb9b5e8d6ad46c31
+  metadata.gz: 714c5cdb80e79dea3fd95842f9ef2ddb5e1f39c49af9f08ffee40625157ec2147fb0676430316885f8c28534811982a48ada4c471aef0c91a338d9c3fc068b5a
+  data.tar.gz: b1b6079ab0ad3d70f2c9c1076f70b06f6cefe57c118a1fa001710319a29054808bede0b95dfada63702968a6310ca74190d7013444c72889c7a1eca8ac034255

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

@@ -30,18 +30,12 @@ module Dscf::Banking
 
     def full_name
       account = Dscf::Banking::Account.find_by(account_number: params[:id])
-      if account && account.application && account.application.user
-        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(" ")
-          render json: { success: true, data: { full_name: full_name } }
-        else
-          render json: { success: false, error: "User profile not found" }, status: :not_found
-        end
-      else
-        render json: { success: false, error: "Account not found" }, status: :not_found
-      end
+      return render json: { success: false, error: "Account not found" }, status: :not_found unless account
+
+      full_name = account.name.to_s.strip
+      full_name = "Unnamed" if full_name.empty?
+
+      render json: { success: true, data: { full_name: full_name } }
     end
 
     def show

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, :interest_rate_tiers ]
+      [ :virtual_account_product, :interest_rate_type ]
     end
 
     def allowed_order_columns
@@ -33,10 +33,8 @@ module Dscf::Banking
 
     def default_serializer_includes
       {
-        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 ]
+        virtual_account_product: {},
+        interest_rate_type: {}
       }
     end
   end

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

@@ -6,7 +6,7 @@ module Dscf::Banking
       render json: {
         success: false,
         error: "Transaction not found",
-        errors: [ "Transaction with ID #{params[:id]} not found" ]
+        errors: ["Transaction with ID #{params[:id]} not found"]
       }, status: :not_found
     end
 

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

@@ -83,10 +83,10 @@ module Dscf::Banking
 
     def default_serializer_includes
       {
-        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 } ]
+        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/controllers/dscf/banking/vouchers_controller.rb

@@ -0,0 +1,133 @@
+module Dscf
+  module Banking
+    class VouchersController < ApplicationController
+      include Dscf::Core::Common
+
+      def create
+        parent_account = Dscf::Banking::Account.find_by(account_number: model_params[:parent_account_number])
+
+        unless parent_account
+          return render_error(errors: "Parent account not found", status: :not_found)
+        end
+
+        service = Dscf::Banking::VoucherService.new
+        service.generate_voucher(
+          parent_account: parent_account,
+          amount: model_params[:amount],
+          recipient_mobile: model_params[:recipient_mobile],
+          recipient_name: model_params[:recipient_name],
+          message: model_params[:message],
+          expires_at: model_params[:expires_at]
+        )
+
+        if service.success?
+          render_success(data: service.voucher, serializer_options: { include: default_serializer_includes[:default] }, status: :created)
+        else
+          render_error(errors: service.errors, status: :unprocessable_entity)
+        end
+      end
+
+      def redeem
+        service = Dscf::Banking::VoucherService.new
+        destination_account = nil
+
+        if redeem_params[:destination_account_number].present?
+          destination_account = Dscf::Banking::Account.find_by(account_number: redeem_params[:destination_account_number])
+          unless destination_account
+            return render_error(errors: "Destination account not found", status: :not_found)
+          end
+        end
+
+        service.redeem_voucher(
+          code: redeem_params[:code] || params[:code],
+          amount: redeem_params[:amount],
+          recipient_mobile: redeem_params[:recipient_mobile],
+          destination_account: destination_account
+        )
+
+        if service.success?
+          render_success(
+            data: {
+              voucher: service.voucher,
+              redemption: service.redemption
+            },
+            serializer_options: {
+              voucher: { include: default_serializer_includes[:default] },
+              redemption: { include: [ :destination_account ] }
+            }
+          )
+        else
+          render_error(errors: service.errors, status: :unprocessable_entity)
+        end
+      end
+
+      def show
+        voucher = Dscf::Banking::Voucher.find_by(code: params[:id].to_s.strip.upcase)
+        return render_error(errors: "Voucher not found", status: :not_found) unless voucher
+
+        if voucher.active? && voucher.expired?
+          Dscf::Banking::VoucherService.new.expire_voucher(voucher)
+          voucher.reload
+        end
+
+        render_success(data: voucher, serializer_options: { include: default_serializer_includes[:default] })
+      end
+
+      def cancel
+        service = Dscf::Banking::VoucherService.new
+        service.cancel_voucher(code: params[:code])
+
+        if service.success?
+          render_success(data: service.voucher, serializer_options: { include: default_serializer_includes[:default] })
+        else
+          render_error(errors: service.errors, status: :unprocessable_entity)
+        end
+      end
+
+      def account_vouchers
+        account = Dscf::Banking::Account.find(params[:account_id])
+        vouchers = account.vouchers.order(created_at: :desc)
+
+        render_success(data: vouchers, serializer_options: { include: default_serializer_includes[:default] })
+      rescue ActiveRecord::RecordNotFound
+        render_error(errors: "Account not found", status: :not_found)
+      end
+
+      private
+
+      def model_params
+        params.require(:voucher).permit(
+          :parent_account_number,
+          :amount,
+          :recipient_mobile,
+          :recipient_name,
+          :message,
+          :expires_at
+        )
+      end
+
+      def redeem_params
+        params.require(:redemption).permit(
+          :code,
+          :amount,
+          :recipient_mobile,
+          :destination_account_number
+        )
+      end
+
+      def eager_loaded_associations
+        []
+      end
+
+      def allowed_order_columns
+        %w[id code status amount remaining_amount recipient_mobile created_at updated_at]
+      end
+
+      def default_serializer_includes
+        {
+          default: [ :parent_account, :redemptions ]
+        }
+      end
+    end
+  end
+end

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

@@ -3,6 +3,9 @@ module Dscf::Banking
     belongs_to :virtual_account_product, optional: true
     belongs_to :application, optional: true
 
+    has_many :vouchers, class_name: "Dscf::Banking::Voucher", foreign_key: :parent_account_id, dependent: :restrict_with_error
+    has_many :voucher_redemptions, through: :vouchers, class_name: "Dscf::Banking::VoucherRedemption"
+
     enum :status, {
       draft: 0,
       pending_activation: 1,
@@ -16,7 +19,7 @@ module Dscf::Banking
     validates :name, presence: true
     validates :currency, presence: true
     validates :current_balance, :available_balance, :minimum_balance,
-              numericality: { greater_than_or_equal_to: 0 }
+      numericality: { greater_than_or_equal_to: 0 }
     validates :system_account, inclusion: { in: [ true, false ] }
     validate :system_account_associations
 

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

@@ -2,25 +2,19 @@ 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", foreign_key: :interest_config_id, dependent: :destroy
+    has_many :interest_rate_tiers, class_name: "Dscf::Banking::InterestRateTier", dependent: :destroy
 
-    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 :annual_interest_rate, presence: true, numericality: { greater_than: 0, less_than_or_equal_to: 1 }
     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, 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 ] }
+    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 :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,
@@ -63,33 +57,6 @@ 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
@@ -114,81 +81,5 @@ 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,7 +19,6 @@ 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 }
@@ -43,7 +42,7 @@ module Dscf::Banking
     end
 
     def self.ransackable_associations(auth_object = nil)
-      %w[product_category created_by approved_by reviews interest_configurations]
+      %w[product_category created_by approved_by reviews]
     end
 
     before_validation :strip_whitespace

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

@@ -0,0 +1,76 @@
+module Dscf
+  module Banking
+    class Voucher < ApplicationRecord
+      self.table_name = "dscf_banking_vouchers"
+
+      belongs_to :parent_account, class_name: "Dscf::Banking::Account"
+      has_many :redemptions, class_name: "Dscf::Banking::VoucherRedemption", dependent: :restrict_with_error
+
+      enum :status, {
+        pending: 0,
+        active: 1,
+        redeemed: 2,
+        expired: 3,
+        cancelled: 4
+      }
+
+      validates :parent_account, presence: true
+      validates :amount, presence: true, numericality: { greater_than: 0 }
+      validates :remaining_amount, presence: true, numericality: { greater_than_or_equal_to: 0 }
+      validates :currency, presence: true
+      validates :code, presence: true, uniqueness: { case_sensitive: false }
+      validates :recipient_mobile, presence: true
+      validate :remaining_amount_not_exceed_amount
+      validate :expires_at_in_future, if: -> { expires_at.present? }
+
+      before_validation :set_defaults, on: :create
+      before_validation :normalize_code, if: -> { code.present? }
+
+      scope :by_status, ->(status) { where(status: status) }
+      scope :active_now, -> { where(status: :active).where("expires_at IS NULL OR expires_at > ?", Time.current) }
+      scope :expired_now, -> { where(status: :active).where("expires_at IS NOT NULL AND expires_at <= ?", Time.current) }
+
+      def expired?
+        expires_at.present? && expires_at <= Time.current
+      end
+
+      def fully_redeemed?
+        remaining_amount.to_f.zero?
+      end
+
+      def mark_expired!
+        update!(status: :expired) if expired? && !expired_status?
+      end
+
+      def expired_status?
+        status == "expired"
+      end
+
+      private
+
+      def set_defaults
+        self.currency ||= parent_account&.currency
+        self.remaining_amount = amount if remaining_amount.nil? && amount
+        self.status ||= :pending
+      end
+
+      def normalize_code
+        self.code = code.to_s.strip.upcase
+      end
+
+      def remaining_amount_not_exceed_amount
+        return if amount.nil? || remaining_amount.nil?
+
+        if remaining_amount > amount
+          errors.add(:remaining_amount, "cannot exceed voucher amount")
+        end
+      end
+
+      def expires_at_in_future
+        if expires_at <= Time.current
+          errors.add(:expires_at, "must be in the future")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Dscf
+  module Banking
+    class VoucherRedemption < ApplicationRecord
+      self.table_name = "dscf_banking_voucher_redemptions"
+
+      belongs_to :voucher, class_name: "Dscf::Banking::Voucher"
+      belongs_to :destination_account, class_name: "Dscf::Banking::Account", optional: true
+
+      validates :voucher, presence: true
+      validates :amount, presence: true, numericality: { greater_than: 0 }
+      validates :recipient_mobile, presence: true
+      validates :currency, presence: true
+      validates :redeemed_at, presence: true
+
+      before_validation :set_defaults, on: :create
+
+      scope :by_voucher, ->(voucher_id) { where(voucher_id: voucher_id) }
+
+      private
+
+      def set_defaults
+        self.currency ||= voucher&.currency
+        self.recipient_mobile ||= voucher&.recipient_mobile
+      end
+    end
+  end
+end

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

@@ -1,11 +1,12 @@
 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
+      :account_properties, :current_balance, :available_balance, :minimum_balance,
+      :currency, :active, :created_at, :updated_at
 
     belongs_to :virtual_account_product, serializer: VirtualAccountProductSerializer
 
     attribute :application_id
+    attribute :system_account
   end
 end

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

@@ -1,14 +1,8 @@
 module Dscf::Banking
   class DocumentSerializer < ActiveModel::Serializer
-    attributes :id, :document_type, :is_verified, :verified_at, :metadata, :file_urls, :created_at, :updated_at,
-               :documentable_type, :documentable_id, :documentable
+    attributes :id, :document_type, :is_verified, :verified_at, :metadata, :file_urls, :created_at, :updated_at
 
-    def documentable
-      {
-        type: object.documentable_type,
-        id: object.documentable_id
-      }
-    end
+    belongs_to :documentable, polymorphic: true
 
     def file_urls
       return [] unless object.files.attached?
@@ -22,7 +16,7 @@ module Dscf::Banking
           object.files.map(&:url)
         end
       end
-    rescue StandardError
+    rescue
       []
     end
   end

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

@@ -7,6 +7,5 @@ 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/app/serializers/dscf/banking/voucher_redemption_serializer.rb

@@ -0,0 +1,10 @@
+module Dscf
+  module Banking
+    class VoucherRedemptionSerializer < ActiveModel::Serializer
+      attributes :id, :voucher_id, :destination_account_id, :amount, :currency,
+        :recipient_mobile, :redeemed_at, :created_at, :updated_at
+
+      belongs_to :destination_account, serializer: AccountSerializer
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Dscf
+  module Banking
+    class VoucherSerializer < ActiveModel::Serializer
+      attributes :id, :parent_account_id, :code, :status, :amount, :remaining_amount,
+        :currency, :recipient_mobile, :recipient_name, :message, :expires_at,
+        :redeemed_at, :created_at, :updated_at
+
+      attribute :amount do
+        object.amount.to_f
+      end
+
+      attribute :remaining_amount do
+        object.remaining_amount.to_f
+      end
+
+      belongs_to :parent_account, serializer: AccountSerializer
+      has_many :redemptions, serializer: VoucherRedemptionSerializer
+    end
+  end
+end