1 files changed, 34 insertions, 10 deletions
diff --git a/lib/api/helpers/members_helpers.rb b/lib/api/helpers/members_helpers.rb
index e72bbb931f0..1e89f9f97a2 100644
--- a/lib/api/helpers/members_helpers.rb
+++ b/lib/api/helpers/members_helpers.rb
@@ -50,24 +50,48 @@ module API
         GroupMembersFinder.new(group).execute
       end
 
-      def create_member(current_user, user, source, params)
-        source.add_user(user, params[:access_level], current_user: current_user, expires_at: params[:expires_at])
+      def present_members(members)
+        present members, with: Entities::Member, current_user: current_user, show_seat_info: params[:show_seat_info]
       end
 
-      def track_areas_of_focus(member, areas_of_focus)
-        return unless areas_of_focus
+      def present_member_invitations(invitations)
+        present invitations, with: Entities::Invitation, current_user: current_user
+      end
+
+      def add_single_member_by_user_id(create_service_params)
+        source = create_service_params[:source]
+        user_id = create_service_params[:user_ids]
+        user = User.find_by(id: user_id) # rubocop: disable CodeReuse/ActiveRecord
+
+        if user
+          conflict!('Member already exists') if member_already_exists?(source, user_id)
+
+          instance = ::Members::CreateService.new(current_user, create_service_params)
+          instance.execute
+
+          not_allowed! if instance.membership_locked # This currently can only be reached in EE if group membership is locked
 
-        areas_of_focus.each do |area_of_focus|
-          Gitlab::Tracking.event(::Members::CreateService.name, 'area_of_focus', label: area_of_focus, property: member.id.to_s)
+          member = instance.single_member
+          render_validation_error!(member) if member.invalid?
+
+          present_members(member)
+        else
+          not_found!('User')
         end
       end
 
-      def present_members(members)
-        present members, with: Entities::Member, current_user: current_user, show_seat_info: params[:show_seat_info]
+      def add_multiple_members?(user_id)
+        user_id.include?(',')
       end
 
-      def present_member_invitations(invitations)
-        present invitations, with: Entities::Invitation, current_user: current_user
+      def add_single_member?(user_id)
+        user_id.present?
+      end
+
+      private
+
+      def member_already_exists?(source, user_id)
+        source.members.exists?(user_id: user_id) # rubocop: disable CodeReuse/ActiveRecord
       end
     end
   end