1 files changed, 11 insertions, 11 deletions

diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index 85b6eb3fe3d..718a7ac1f22 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -1,12 +1,13 @@
 module Issues
   class CreateService < Issues::BaseService
     include SpamCheckService
+    include ResolveDiscussions
 
     def execute
-      filter_spam_check_params
+      @issue = BuildService.new(project, current_user, params).execute
 
-      issue_attributes = params.merge(merge_request_for_resolving_discussions: merge_request_for_resolving_discussions)
-      @issue = BuildService.new(project, current_user, issue_attributes).execute
+      filter_spam_check_params
+      filter_resolve_discussion_params
 
       create(@issue)
     end
@@ -21,17 +22,16 @@ module Issues
       notification_service.new_issue(issuable, current_user)
       todo_service.new_issue(issuable, current_user)
       user_agent_detail_service.create
-
-      if merge_request_for_resolving_discussions.try(:discussions_can_be_resolved_by?, current_user)
-        resolve_discussions_in_merge_request(issuable)
-      end
+      resolve_discussions_with_issue(issuable)
     end
 
-    def resolve_discussions_in_merge_request(issue)
+    def resolve_discussions_with_issue(issue)
+      return if discussions_to_resolve.empty?
+
       Discussions::ResolveService.new(project, current_user,
-                                      merge_request: merge_request_for_resolving_discussions,
-                                      follow_up_issue: issue).
-          execute(merge_request_for_resolving_discussions.resolvable_discussions)
+                                      merge_request: merge_request_to_resolve_discussions_of,
+                                      follow_up_issue: issue)
+        .execute(discussions_to_resolve)
     end
 
     private