From ff1476d46ae6ad26bb36b6806405d75f59a0bd50 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Wed, 16 Sep 2020 13:45:58 +0200
Subject: [PATCH] Fix status consequences execution order [SCI-5004]

---
 app/models/my_module.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/models/my_module.rb b/app/models/my_module.rb
index 915695817..30fb3b7ec 100644
--- a/app/models/my_module.rb
+++ b/app/models/my_module.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MyModule < ApplicationRecord
   include ArchivableModel
   include SearchableModel
@@ -9,7 +11,7 @@ class MyModule < ApplicationRecord
   before_create :create_blank_protocol
   before_create :assign_default_status_flow
 
-  before_save :exec_status_consequences, if: :my_module_status_id_changed?
+  around_save :exec_status_consequences, if: :my_module_status_id_changed?
 
   auto_strip_attributes :name, :description, nullify: false
   validates :name,
@@ -538,14 +540,17 @@ class MyModule < ApplicationRecord
     return if my_module_status.blank? || status_changing
 
     self.changing_from_my_module_status_id = my_module_status_id_was if my_module_status_id_was.present?
+    self.status_changing = true
+
+    yield
 
     if my_module_status.my_module_status_consequences.any?(&:runs_in_background?)
-      self.status_changing = true
       MyModuleStatusConsequencesJob.perform_later(self, my_module_status.my_module_status_consequences.to_a)
     else
       my_module_status.my_module_status_consequences.each do |consequence|
         consequence.call(self)
       end
+      update!(status_changing: false)
     end
   end
 end