Extract code into IssueBoardEntity

6 files changed, 66 insertions, 29 deletions

diff --git a/app/controllers/boards/issues_controller.rb b/app/controllers/boards/issues_controller.rb
index 7f874687212..0dd7500623d 100644
--- a/app/controllers/boards/issues_controller.rb
+++ b/app/controllers/boards/issues_controller.rb
@@ -100,18 +100,12 @@ module Boards
         .merge(board_id: params[:board_id], list_id: params[:list_id], request: request)
     end
 
+    def serializer
+      IssueSerializer.new(current_user: current_user)
+    end
+
     def serialize_as_json(resource)
-      resource.as_json(
-        only: [:id, :iid, :project_id, :title, :confidential, :due_date, :relative_position, :weight],
-        labels: true,
-        issue_endpoints: true,
-        include_full_project_path: board.group_board?,
-        include: {
-          project: { only: [:id, :path] },
-          assignees: { only: [:id, :name, :username], methods: [:avatar_url] },
-          milestone: { only: [:id, :title] }
-        }
-      )
+      serializer.represent(resource, serializer: 'board', include_full_project_path: board.group_board?)
     end
 
     def whitelist_query_limiting
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 0de5e434b02..abdb3448d4e 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -231,20 +231,6 @@ class Issue < ActiveRecord::Base
 
   def as_json(options = {})
     super(options).tap do |json|
-      if options.key?(:issue_endpoints) && project
-        url_helper = Gitlab::Routing.url_helpers
-
-        issue_reference = options[:include_full_project_path] ? to_reference(full: true) : to_reference
-
-        json.merge!(
-          reference_path: issue_reference,
-          real_path: url_helper.project_issue_path(project, self),
-          issue_sidebar_endpoint: url_helper.project_issue_path(project, self, format: :json, serializer: 'sidebar'),
-          toggle_subscription_endpoint: url_helper.toggle_subscription_project_issue_path(project, self),
-          assignable_labels_endpoint: url_helper.project_labels_path(project, format: :json, include_ancestor_groups: true)
-        )
-      end
-
       if options.key?(:labels)
         json[:labels] = labels.as_json(
           project: project,
diff --git a/app/serializers/README.md b/app/serializers/README.md
index 0337f88db5f..bb94745b0b5 100644
--- a/app/serializers/README.md
+++ b/app/serializers/README.md
@@ -180,7 +180,7 @@ def index
     render json: MyResourceSerializer
       .new(current_user: @current_user)
       .represent_details(@project.resources)
-  nd
+  end
 end
 ```
 
@@ -196,7 +196,7 @@ def index
         .represent_details(@project.resources),
       count: @project.resources.count
     }
-  nd
+  end
 end
 ```
 
diff --git a/app/serializers/issue_board_entity.rb b/app/serializers/issue_board_entity.rb
new file mode 100644
index 00000000000..6a9e9638e70
--- /dev/null
+++ b/app/serializers/issue_board_entity.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class IssueBoardEntity < Grape::Entity
+  include RequestAwareEntity
+
+  expose :id
+  expose :iid
+  expose :title
+
+  expose :confidential
+  expose :due_date
+  expose :project_id
+  expose :relative_position
+  expose :weight, if: -> (*) { respond_to?(:weight) }
+
+  expose :project do |issue|
+    API::Entities::Project.represent issue.project, only: [:id, :path]
+  end
+
+  expose :milestone, expose_nil: false do |issue|
+    API::Entities::Project.represent issue.milestone, only: [:id, :title]
+  end
+
+  expose :assignees do |issue|
+    API::Entities::UserBasic.represent issue.assignees, only: [:id, :name, :username, :avatar_url]
+  end
+
+  expose :labels do |issue|
+    LabelEntity.represent issue.labels, project: issue.project, only: [:id, :title, :description, :color, :priority, :text_color]
+  end
+
+  expose :reference_path, if: -> (issue) { issue.project } do |issue, options|
+    options[:include_full_project_path] ? issue.to_reference(full: true) : issue.to_reference
+  end
+
+  expose :real_path, if: -> (issue) { issue.project } do |issue|
+    project_issue_path(issue.project, issue)
+  end
+
+  expose :issue_sidebar_endpoint, if: -> (issue) { issue.project } do |issue|
+    project_issue_path(issue.project, issue, format: :json, serializer: 'sidebar')
+  end
+
+  expose :toggle_subscription_endpoint, if: -> (issue) { issue.project } do |issue|
+    toggle_subscription_project_issue_path(issue.project, issue)
+  end
+
+  expose :assignable_labels_endpoint, if: -> (issue) { issue.project } do |issue|
+    project_labels_path(issue.project, format: :json, include_ancestor_groups: true)
+  end
+end
diff --git a/app/serializers/issue_serializer.rb b/app/serializers/issue_serializer.rb
index 37cf5e28396..d66f0a5acb7 100644
--- a/app/serializers/issue_serializer.rb
+++ b/app/serializers/issue_serializer.rb
@@ -4,15 +4,17 @@ class IssueSerializer < BaseSerializer
   # This overrided method takes care of which entity should be used
   # to serialize the `issue` based on `basic` key in `opts` param.
   # Hence, `entity` doesn't need to be declared on the class scope.
-  def represent(merge_request, opts = {})
+  def represent(issue, opts = {})
     entity =
       case opts[:serializer]
       when 'sidebar'
         IssueSidebarEntity
+      when 'board'
+        IssueBoardEntity
       else
         IssueEntity
       end
 
-    super(merge_request, opts, entity)
+    super(issue, opts, entity)
   end
 end
diff --git a/app/serializers/label_entity.rb b/app/serializers/label_entity.rb
index 98743d62b50..5082245dda9 100644
--- a/app/serializers/label_entity.rb
+++ b/app/serializers/label_entity.rb
@@ -12,4 +12,8 @@ class LabelEntity < Grape::Entity
   expose :text_color
   expose :created_at
   expose :updated_at
+
+  expose :priority, if: -> (*) { options.key?(:project) } do |label|
+    label.priority(options[:project])
+  end
 end