dscf-banking 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c92f5cf56bdb2b4a3f6d15d1c75cfd1ac51da1e2e525ba7a568e80f289564d8a
-  data.tar.gz: 34962544cd525e20993f49a278655c6d291803c86a411b90eb3946f1aec62aea
+  metadata.gz: bd6bfb0114ad393bd22ae2bf1db82507a7e50299aa6f7ac0c433e53ae3a24e91
+  data.tar.gz: 97773b5c82e95ab7d227d9473ce82658ce4df88966506d0354ee10d360749023
 SHA512:
-  metadata.gz: 12ba4363d0f4ab6b8edf6a432539b325d68a58d7ef49b1a1d0d756ccbe7880d311eeb903e63d19920a4bc25631b1c345abcabf5bb95cd8307ffa3be2b694c43d
-  data.tar.gz: 2b8514d69f366c986b88f393fb8e7102974c71ae3936ab618b21ad59318c2002df6b1b21db304465177351189be07486ce4552f2ac0dbdb556fb4e1010a86b2b
+  metadata.gz: 41ff719fa8dceb6e423d57c80bc8d9b96aeb2ab619ab94eccffb24bc1cbe4ce852b160ecde131084e11902aedf95df074af6b3589ffe3335f28cfcf10abccdcc
+  data.tar.gz: 5db3b15472498d3509cfe556ade8bf5e64ff7261cd3e0a338f898351c8a59110fddba5d4a04f1857a106508a5154c88d8dcd3964fbcaa5b22800478ede721e49

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

@@ -22,9 +22,33 @@ 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)
+  def application_data(application)
       {
         id: application.id,
         application_number: application.application_number,
@@ -52,7 +76,7 @@ module Dscf::Banking
     end
 
     def eager_loaded_associations
-      [ :user, :virtual_account_product, :documents, reviews: { reviewed_by: :user_profile } ]
+      [ :user, :virtual_account_product, :account, :documents, reviews: { reviewed_by: :user_profile } ]
     end
 
     def allowed_order_columns

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

@@ -21,7 +21,7 @@ module Dscf::Banking
 
     before_validation :generate_application_number, if: -> { new_record? && application_number.blank? }
     before_update :set_timestamps_on_status_change
-    after_update :create_account_if_approved
+    after_commit :create_account_if_approved, on: :update
 
     def approve!(approved_by = nil)
       update!(status: :approved, completed_at: Time.current)
@@ -48,12 +48,6 @@ module Dscf::Banking
       latest_review&.status || status
     end
 
-    def create_account_if_approved
-      if review_status == "approved" && !has_account?
-        AccountCreationService.call(self)
-      end
-    end
-
     def self.ransackable_attributes(auth_object = nil)
       %w[id application_number status submitted_at completed_at created_at updated_at]
     end
@@ -81,5 +75,12 @@ module Dscf::Banking
         end
       end
     end
+
+    def create_account_if_approved
+      return unless review_status == "approved"
+      return if has_account?
+
+      AccountCreationService.call(self)
+    end
   end
 end

data/lib/dscf/banking/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-banking
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Eyosiyas Mekbib