Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

3 files changed, 41 insertions, 1 deletions

diff --git a/app/services/members/create_service.rb b/app/services/members/create_service.rb
index 0cc62e661a3..cb905e01613 100644
--- a/app/services/members/create_service.rb
+++ b/app/services/members/create_service.rb
@@ -63,10 +63,14 @@ module Members
         invites,
         params[:access_level],
         expires_at: params[:expires_at],
-        current_user: current_user
+        current_user: current_user,
+        tasks_to_be_done: params[:tasks_to_be_done],
+        tasks_project_id: params[:tasks_project_id]
       )
 
       members.each { |member| process_result(member) }
+
+      create_tasks_to_be_done
     end
 
     def process_result(member)
@@ -112,6 +116,19 @@ module Members
       end
     end
 
+    def create_tasks_to_be_done
+      return unless experiment(:invite_members_for_task).enabled?
+      return if params[:tasks_to_be_done].blank? || params[:tasks_project_id].blank?
+
+      valid_members = members.select { |member| member.valid? && member.member_task.valid? }
+      return unless valid_members.present?
+
+      # We can take the first `member_task` here, since all tasks will have the same attributes needed
+      # for the `TasksToBeDone::CreateWorker`, ie. `project` and `tasks_to_be_done`.
+      member_task = valid_members[0].member_task
+      TasksToBeDone::CreateWorker.perform_async(member_task.id, current_user.id, valid_members.map(&:user_id))
+    end
+
     def areas_of_focus
       params[:areas_of_focus] || []
     end
diff --git a/app/services/members/creator_service.rb b/app/services/members/creator_service.rb
index 7b0bebff760..f2c8a6f20a1 100644
--- a/app/services/members/creator_service.rb
+++ b/app/services/members/creator_service.rb
@@ -4,6 +4,8 @@ module Members
   # This class serves as more of an app-wide way we add/create members
   # All roads to add members should take this path.
   class CreatorService
+    include Gitlab::Experiment::Dsl
+
     class << self
       def parsed_access_level(access_level)
         access_levels.fetch(access_level) { access_level.to_i }
@@ -24,6 +26,7 @@ module Members
     def execute
       find_or_build_member
       update_member
+      create_member_task
 
       member
     end
@@ -61,6 +64,21 @@ module Members
       }
     end
 
+    def create_member_task
+      return unless experiment(:invite_members_for_task).enabled?
+      return unless member.persisted?
+      return if member_task_attributes.value?(nil)
+
+      member.create_member_task(member_task_attributes)
+    end
+
+    def member_task_attributes
+      {
+        tasks_to_be_done: args[:tasks_to_be_done],
+        project_id: args[:tasks_project_id]
+      }
+    end
+
     def approve_request
       ::Members::ApproveAccessRequestService.new(current_user,
                                                  access_level: access_level)
diff --git a/app/services/members/invite_service.rb b/app/services/members/invite_service.rb
index 257a986b8dd..85acb720f0f 100644
--- a/app/services/members/invite_service.rb
+++ b/app/services/members/invite_service.rb
@@ -39,6 +39,11 @@ module Members
       errors[invite_email(member)] = member.errors.full_messages.to_sentence
     end
 
+    override :create_tasks_to_be_done
+    def create_tasks_to_be_done
+      # Only create task issues for existing users. Tasks for new users are created when they signup.
+    end
+
     def invite_email(member)
       member.invite_email || member.user.email
     end