diff options
| author | charlieablett <cablett@gitlab.com> | 2019-06-06 20:13:18 +1200 |
|---|---|---|
| committer | charlieablett <cablett@gitlab.com> | 2019-06-06 22:13:14 +1200 |
| commit | 27dd0b8e3609aae92b8e59dd202a999fc1db5a4e (patch) | |
| tree | 29728e4b5e439b1f284cb6a4f31d73749e808c25 /app | |
| parent | 7468ed5fd28d08907384787d657d2bbe9af77411 (diff) | |
| download | gitlab-ce-27dd0b8e3609aae92b8e59dd202a999fc1db5a4e.tar.gz | |
Use serialization for project boards
- Add serializers and Grape::Entity
- Replace to_json
- Add specs
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/boards_actions.rb | 8 | ||||
| -rw-r--r-- | app/controllers/concerns/boards_responses.rb | 6 | ||||
| -rw-r--r-- | app/serializers/board_serializer.rb | 5 | ||||
| -rw-r--r-- | app/serializers/board_simple_entity.rb | 5 |
4 files changed, 23 insertions, 1 deletions
diff --git a/app/controllers/concerns/boards_actions.rb b/app/controllers/concerns/boards_actions.rb index ed7ea2f0e04..e4123d87137 100644 --- a/app/controllers/concerns/boards_actions.rb +++ b/app/controllers/concerns/boards_actions.rb @@ -35,4 +35,12 @@ module BoardsActions boards.find(params[:id]) end end + + def serializer + BoardSerializer.new(current_user: current_user) + end + + def serialize_as_json(resource) + serializer.represent(resource, serializer: 'board', include_full_project_path: board.group_board?) + end end diff --git a/app/controllers/concerns/boards_responses.rb b/app/controllers/concerns/boards_responses.rb index 8b191c86397..ce2740147f7 100644 --- a/app/controllers/concerns/boards_responses.rb +++ b/app/controllers/concerns/boards_responses.rb @@ -69,7 +69,7 @@ module BoardsResponses end def serialize_as_json(resource) - resource.as_json(only: [:id]) + serializer.represent(resource) end def respond_with(resource) @@ -80,4 +80,8 @@ module BoardsResponses end end end + + def serializer + BoardSerializer.new + end end diff --git a/app/serializers/board_serializer.rb b/app/serializers/board_serializer.rb new file mode 100644 index 00000000000..70a4c9ae282 --- /dev/null +++ b/app/serializers/board_serializer.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class BoardSerializer < BaseSerializer + entity BoardSimpleEntity +end diff --git a/app/serializers/board_simple_entity.rb b/app/serializers/board_simple_entity.rb new file mode 100644 index 00000000000..f297d993e27 --- /dev/null +++ b/app/serializers/board_simple_entity.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class BoardSimpleEntity < Grape::Entity + expose :id +end |
