Merge pull request #8745 from artoscinote/ma_SCI_12199

Fix protocol team assignment propagation [SCI-12199]

app/controllers/api/v1/experiment_user_assignments_controller.rb

@@ -35,12 +35,7 @@ module Api
 
           @user_assignment.update!(user_assignment_params.merge(assigned: :manually))
 
-          UserAssignments::PropagateAssignmentJob.perform_later(
-            @experiment,
-            @user_assignment.user_id,
-            @user_assignment.user_role,
-            current_user.id
-          )
+          UserAssignments::PropagateAssignmentJob.perform_later(@user_assignment)
 
           log_change_activity
 

app/controllers/api/v1/project_user_assignments_controller.rb

@@ -110,10 +110,7 @@ module Api
 
       def propagate_job(user_assignment, destroy: false)
         UserAssignments::PropagateAssignmentJob.perform_later(
-          @project,
-          user_assignment.user.id,
-          user_assignment.user_role,
-          current_user.id,
+          user_assignment,
           destroy: destroy
         )
       end

app/jobs/user_assignments/project_group_assignment_job.rb

@@ -28,12 +28,7 @@ module UserAssignments
           next unless project.experiments.any?
 
           # make sure all related experiments and my modules are assigned
-          UserAssignments::PropagateAssignmentJob.perform_later(
-            project,
-            user.id,
-            project.default_public_user_role || UserRole.find_predefined_viewer_role,
-            @assigned_by&.id
-          )
+          UserAssignments::PropagateAssignmentJob.perform_later(user_assignment)
         end
       end
     end

app/models/concerns/assignable.rb

@@ -113,6 +113,11 @@ module Assignable
       # Will be called when an assignment is changed (save/destroy) for the assignable model.
     end
 
+    def after_team_assignment_changed(team_assignment = nil)
+      # Optional, redefine in the assignable model.
+      # Will be called when an assignment is changed (save/destroy) for the assignable model.
+    end
+
     def create_user_assignments!(user = created_by)
       # First create initial assignments for the object's creator
       if top_level_assignable?

app/models/protocol.rb

@@ -601,11 +601,11 @@ class Protocol < ApplicationRecord
     end
 
     parent_protocol.user_assignments.each do |parent_user_assignment|
-      parent_protocol.sync_child_protocol_user_assignment(parent_user_assignment, draft.id)
+      parent_protocol.sync_child_protocol_assignment(parent_user_assignment, draft.id)
     end
 
     parent_protocol.user_group_assignments.each do |parent_user_group_assignment|
-      parent_protocol.sync_child_protocol_user_assignment(parent_user_group_assignment, draft.id)
+      parent_protocol.sync_child_protocol_assignment(parent_user_group_assignment, draft.id)
     end
     draft
   end
@@ -678,29 +678,30 @@ class Protocol < ApplicationRecord
     published_versions.or(Protocol.where(id: draft&.id))
   end
 
-  def sync_child_protocol_user_assignment(user_assignment, child_protocol_id = nil)
+  def sync_child_protocol_assignment(assignment, child_protocol_id = nil)
     # Copy user assignments to child protocol(s)
 
     Protocol.transaction(requires_new: true) do
       # Reload to ensure a potential new draft is also included in child versions
       reload
-      assignment_type = user_assignment.respond_to?(:user_group) ? 'user_group' : 'user'
-      assignment_key = "#{assignment_type}_id".to_sym
+      assignment_key = assignment.model_name.param_key
+      assignable_id_key = assignment_key.gsub('assignment', 'id')
+
       (
         # all or single child version protocol
         child_protocol_id ? child_version_protocols.where(id: child_protocol_id) : child_version_protocols
       ).find_each do |child_protocol|
-        child_assignment = child_protocol.public_send("#{assignment_type}_assignments").find_or_initialize_by(
-          assignment_key => user_assignment.public_send(assignment_key)
+        child_assignment = child_protocol.public_send(assignment_key.pluralize).find_or_initialize_by(
+          assignable_id_key => assignment.public_send(assignable_id_key)
         )
 
-        if user_assignment.destroyed?
+        if assignment.destroyed?
           child_assignment.destroy! if child_assignment.persisted?
           next
         end
 
         child_assignment.update!(
-          user_assignment.attributes.slice(
+          assignment.attributes.slice(
             'user_role_id',
             'assigned',
             'assigned_by_id',
@@ -716,13 +717,19 @@ class Protocol < ApplicationRecord
   def after_user_assignment_changed(user_assignment)
     return unless in_repository_published_original?
 
-    sync_child_protocol_user_assignment(user_assignment)
+    sync_child_protocol_assignment(user_assignment)
   end
 
   def after_user_group_assignment_changed(user_group_assignment)
     return unless in_repository_published_original?
 
-    sync_child_protocol_user_assignment(user_group_assignment)
+    sync_child_protocol_assignment(user_group_assignment)
+  end
+
+  def after_team_assignment_changed(user_group_assignment)
+    return unless in_repository_published_original?
+
+    sync_child_protocol_assignment(user_group_assignment)
   end
 
   def deep_clone(clone, current_user, include_file_versions: false)

app/models/team_assignment.rb

@@ -14,4 +14,11 @@ class TeamAssignment < ApplicationRecord
   scope :as_viewers, -> { where(user_role: UserRole.find_predefined_viewer_role) }
 
   validates :team, uniqueness: { scope: :assignable }
+
+  after_destroy :call_team_assignment_changed_hook
+  after_save :call_team_assignment_changed_hook
+
+  def call_team_assignment_changed_hook
+    assignable.__send__(:after_team_assignment_changed, self)
+  end
 end