dscf-banking 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd6bfb0114ad393bd22ae2bf1db82507a7e50299aa6f7ac0c433e53ae3a24e91
-  data.tar.gz: 97773b5c82e95ab7d227d9473ce82658ce4df88966506d0354ee10d360749023
+  metadata.gz: df271e9f69727201aab1508e782bf5a18e7b59fba9e67dffd2224d92319f9280
+  data.tar.gz: '0618830ecf6bbab8f90cfffc3da24303cd08788cc8387d42070c4093b9be5b45'
 SHA512:
-  metadata.gz: 41ff719fa8dceb6e423d57c80bc8d9b96aeb2ab619ab94eccffb24bc1cbe4ce852b160ecde131084e11902aedf95df074af6b3589ffe3335f28cfcf10abccdcc
-  data.tar.gz: 5db3b15472498d3509cfe556ade8bf5e64ff7261cd3e0a338f898351c8a59110fddba5d4a04f1857a106508a5154c88d8dcd3964fbcaa5b22800478ede721e49
+  metadata.gz: 8ff010dc9f9a04cddbcebf7dcdd83b5ba0b592a6bac40da63422002a7db9e2f9ecede7ae7aef4cc0cafd8ce579c2d8df8c3773f1e4ea8261de8839de353c8788
+  data.tar.gz: 8e52eeaa335df4fbeb0af438cbb1ac1f9a9c9ee15de8629212ad9bae3ce7eb2984e2936f485f9a5edb052e45ab7bd2738c0cc3fe898dcf5ce5bcb5971ed4d393

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

@@ -195,6 +195,24 @@ module Dscf::Banking
       }, status: :not_found
     end
 
+    def me
+      accounts = Dscf::Banking::Account
+        .joins(:application)
+        .where("dscf_banking_applications.user_id = ?", current_user.id)
+        .includes(:application, :virtual_account_product)
+
+      # 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"
+      accounts = accounts.order("dscf_banking_accounts.#{order_column} #{order_direction}")
+
+      render json: {
+        success: true,
+        data: accounts.map { |account| account_data(account) },
+        message: "User accounts retrieved successfully"
+      }
+    end
+
     private
 
     def account_data(account)

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

@@ -22,30 +22,6 @@ module Dscf::Banking
         resubmit: { status: "submitted", update_model: true }
       }
 
-    # Override perform_review_action to sync application status with review status
-    def perform_review_action(action_name, action_config, context_name)
-      result = super
-      
-      # After successful review action, update the application's status to match
-      if result.is_a?(Hash) && result[:success] && @obj
-        review_status = @obj.review_status
-        application_status_map = {
-          "submitted" => "submitted",
-          "under_review" => "under_review",
-          "approved" => "approved",
-          "rejected" => "rejected",
-          "request_modification" => "request_modification"
-        }
-        
-        new_status = application_status_map[review_status]
-        if new_status && @obj.status != new_status
-          @obj.update_column(:status, Application.statuses[new_status])
-        end
-      end
-      
-      result
-    end
-
     private
 
   def application_data(application)

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

@@ -22,6 +22,7 @@ module Dscf::Banking
     before_validation :generate_application_number, if: -> { new_record? && application_number.blank? }
     before_update :set_timestamps_on_status_change
     after_commit :create_account_if_approved, on: :update
+    after_find :sync_status_if_needed
 
     def approve!(approved_by = nil)
       update!(status: :approved, completed_at: Time.current)
@@ -45,7 +46,12 @@ module Dscf::Banking
 
     def review_status
       latest_review = reviews.where(context: "default").order(created_at: :desc).first
-      latest_review&.status || status
+      review_st = latest_review&.status || status
+
+      # Sync application status with review status
+      sync_status_with_review(review_st) if latest_review
+
+      review_st
     end
 
     def self.ransackable_attributes(auth_object = nil)
@@ -77,10 +83,57 @@ module Dscf::Banking
     end
 
     def create_account_if_approved
-      return unless review_status == "approved"
+      # First sync the status with the latest review
+      current_review_status = review_status  # This will call sync_status_with_review
+
+      reload  # Reload to get the updated status
+
+      return unless status_approved?
       return if has_account?
 
       AccountCreationService.call(self)
     end
+
+    def sync_status_with_review(review_st)
+      return if @syncing_status
+
+      status_map = {
+        "submitted" => "submitted",
+        "under_review" => "under_review",
+        "approved" => "approved",
+        "rejected" => "rejected",
+        "request_modification" => "request_modification"
+      }
+
+      mapped_status = status_map[review_st]
+      if mapped_status && status != mapped_status && !new_record?
+        @syncing_status = true
+
+        # Prepare attributes for update
+        attributes_to_update = { status: mapped_status }
+
+        # If rejecting, also set rejection_reason from review feedback
+        if mapped_status == "rejected"
+          latest_review = reviews.where(context: "default", status: "rejected").order(created_at: :desc).first
+          if latest_review&.feedback.present?
+            attributes_to_update[:rejection_reason] = latest_review.feedback
+          end
+        end
+
+        update!(attributes_to_update)
+        @syncing_status = false
+      end
+    end
+
+    def sync_status_if_needed
+      return if @status_synced || new_record?
+
+      latest_review = reviews.where(context: "default").order(created_at: :desc).first
+      if latest_review && latest_review.status != status
+        sync_status_with_review(latest_review.status)
+      end
+
+      @status_synced = true
+    end
   end
 end

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

@@ -1,8 +1,12 @@
 module Dscf::Banking
   class DocumentSerializer < ActiveModel::Serializer
-    attributes :id, :document_type, :is_verified, :verified_at, :metadata, :created_at, :updated_at
+    attributes :id, :document_type, :is_verified, :verified_at, :metadata, :created_at, :updated_at, :file_url
 
     # Remove polymorphic association that causes ActiveStorage issues
     # belongs_to :verified_by, polymorphic: true, optional: true
+
+    def file_url
+      object.file_url
+    end
   end
 end

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

@@ -47,7 +47,7 @@ module Dscf::Banking
     end
 
     def generate_account_name
-      "Test Account - #{@application.application_number}"
+      "#{@application.virtual_account_product.product_name}"
     end
   end
 end

data/config/initializers/review_extensions.rb

@@ -0,0 +1,36 @@
+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

data/config/routes.rb

@@ -1,5 +1,8 @@
 Dscf::Banking::Engine.routes.draw do
   resources :accounts do
+    collection do
+      get :me
+    end
     member do
       post :activate
       post :suspend

data/lib/dscf/banking/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Banking
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-banking
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Eyosiyas Mekbib
@@ -482,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/initializers/review_extensions.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20250830211002_create_dscf_banking_product_categories.rb