Remove circular calls to myetm from engine on user CRUD, pass necessary params from myetm

Author: louispt1

app/models/scenario.rb

@@ -363,52 +363,37 @@ def delete_all_users
     scenario_users.delete_all
   end
 
-  def copy_preset_roles
+  def copy_preset_roles(preset_scenario_users = nil)
     return unless parent
-    return if copy_roles_from_saved_scenario
 
-    parent.scenario_users.each do |preset_user|
-      if (existing_user = scenario_users.find_by(user: preset_user.user))
-        existing_user.role_id = preset_user.role_id
-        existing_user.save(validate: false)
-      else
-        scenario_users.create(user: preset_user.user, role_id: preset_user.role_id)
-      end
+    if preset_scenario_users.present?
+      copy_roles_from_user_data(preset_scenario_users)
+    else
+      copy_roles_from_parent
     end
   end
 
   private
 
-  def copy_roles_from_saved_scenario
-    saved_scenario_id = fetch_saved_scenario_id_for(parent.id)
-    return false unless saved_scenario_id
-
-    users_data = fetch_saved_scenario_users(saved_scenario_id)
-    return false unless users_data
-
+  def copy_roles_from_user_data(users_data)
     users_data.each do |user_data|
       scenario_users.create(
-        user_id: user_data['user_id'],
-        user_email: user_data['user_email'],
-        role_id: user_data['role_id']
+        user_id: user_data['user_id'] || user_data[:user_id],
+        user_email: user_data['user_email'] || user_data[:user_email],
+        role_id: user_data['role_id'] || user_data[:role_id]
       )
     end
-
-    true
-  rescue StandardError
-    false
   end
 
-  def fetch_saved_scenario_id_for(scenario_id)
-    scenario = Scenario.find_by(id: scenario_id)
-    scenario&.metadata&.dig('saved_scenario_id')
-  end
-
-  def fetch_saved_scenario_users(saved_scenario_id)
-    response = ETEngine::MyEtm.client.get("/api/v1/saved_scenarios/#{saved_scenario_id}/users")
-    response.success? ? response.body : nil
-  rescue Faraday::Error
-    nil
+  def copy_roles_from_parent
+    parent.scenario_users.each do |preset_user|
+      if (existing_user = scenario_users.find_by(user: preset_user.user))
+        existing_user.role_id = preset_user.role_id
+        existing_user.save(validate: false)
+      else
+        scenario_users.create(user: preset_user.user, role_id: preset_user.role_id)
+      end
+    end
   end
 
   # Validation method for when a user sets their metadata.

app/models/scenario_updater.rb

@@ -59,7 +59,7 @@ def process(scenario_data, provided_values)
     balanced_values = yield calculate_balanced_values(
       user_values, provided_values, coupling_state, reset, autobalance, force_balance
     )
-    _balanced       = yield validate_balance(user_values, balanced_values, provided_values)
+    _balanced = yield validate_balance(user_values, balanced_values, provided_values)
 
     Success([coupling_state, user_values, balanced_values])
   end
@@ -75,7 +75,8 @@ def apply(scenario_data, (coupling_state, user_values, balanced_values))
   # Post-save
   def post_save(scenario_data, persisted)
     set_preset_roles = truthy?(scenario_data[:set_preset_roles])
-    _post_saved = yield post_save_operations(set_preset_roles)
+    preset_scenario_users = scenario_data[:preset_scenario_users]
+    _post_saved = yield post_save_operations(set_preset_roles, preset_scenario_users)
     Success(persisted)
   end
 
@@ -113,25 +114,26 @@ def calculate_user_values(provided_values, coupling_state, reset)
     )
   end
 
-  def calculate_balanced_values(user_values, provided_values, coupling_state, reset, autobalance, force_balance)
+  def calculate_balanced_values(user_values, provided_values, coupling_state, reset, autobalance,
+    force_balance)
     service(:CalculateBalancedValues).call(
       scenario,
-      user_values: user_values,
-      provided_values: provided_values,
+      user_values:,
+      provided_values:,
       uncoupled_inputs: coupling_state[:uncoupled_inputs],
-      reset: reset,
-      autobalance: autobalance,
-      force_balance: force_balance
+      reset:,
+      autobalance:,
+      force_balance:
     )
   end
 
   def validate_balance(user_values, balanced_values, provided_values)
     service(:ValidateBalance).call(
       scenario,
-      user_values: user_values,
-      balanced_values: balanced_values,
-      provided_values: provided_values,
-      skip_validation: skip_validation
+      user_values:,
+      balanced_values:,
+      provided_values:,
+      skip_validation:
     )
   end
 
@@ -147,8 +149,9 @@ def persist_scenario(attributes)
     service(:PersistScenario).call(scenario, attributes, skip_validation)
   end
 
-  def post_save_operations(set_preset_roles)
-    service(:PostSaveOperations).call(scenario, set_preset_roles, current_user)
+  def post_save_operations(set_preset_roles, preset_scenario_users)
+    service(:PostSaveOperations).call(scenario, set_preset_roles, preset_scenario_users,
+      current_user)
   end
 
   # Helper to instantiate services

app/models/scenario_updater/services/post_save_operations.rb

@@ -8,18 +8,18 @@ class PostSaveOperations
 
       TRUTHY_VALUES = Set.new([true, 'true', '1']).freeze
 
-      def call(scenario, set_preset_roles, current_user)
-        copy_preset_roles_if_requested(scenario, set_preset_roles)
+      def call(scenario, set_preset_roles, preset_scenario_users, current_user)
+        copy_preset_roles_if_requested(scenario, set_preset_roles, preset_scenario_users)
         update_version_tag(scenario, current_user)
 
         Success(scenario)
       end
 
       private
 
-      def copy_preset_roles_if_requested(scenario, set_preset_roles)
-        should_copy = TRUTHY_VALUES.include?(set_preset_roles)
-        scenario.copy_preset_roles if should_copy
+      def copy_preset_roles_if_requested(scenario, set_preset_roles, preset_scenario_users)
+        should_copy = TRUTHY_VALUES.include?(set_preset_roles) || preset_scenario_users.present?
+        scenario.copy_preset_roles(preset_scenario_users) if should_copy
       end
 
       def update_version_tag(scenario, current_user)