From 27dd0b8e3609aae92b8e59dd202a999fc1db5a4e Mon Sep 17 00:00:00 2001 From: charlieablett Date: Thu, 6 Jun 2019 20:13:18 +1200 Subject: Use serialization for project boards - Add serializers and Grape::Entity - Replace to_json - Add specs --- app/controllers/concerns/boards_actions.rb | 8 ++++++++ app/controllers/concerns/boards_responses.rb | 6 +++++- app/serializers/board_serializer.rb | 5 +++++ app/serializers/board_simple_entity.rb | 5 +++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/serializers/board_serializer.rb create mode 100644 app/serializers/board_simple_entity.rb (limited to 'app') 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 -- cgit v1.2.3 From 714018145cb0ea3265dcfa64c9b4baa33dee588f Mon Sep 17 00:00:00 2001 From: charlieablett Date: Fri, 7 Jun 2019 13:56:40 +1200 Subject: Add `to_json` to `represent` method call --- app/controllers/concerns/boards_responses.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/controllers/concerns/boards_responses.rb b/app/controllers/concerns/boards_responses.rb index ce2740147f7..128409a2eef 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) - serializer.represent(resource) + serializer.represent(resource).to_json end def respond_with(resource) -- cgit v1.2.3 From 0c29aa0da38104c4c65cbadcc40abe25e56693aa Mon Sep 17 00:00:00 2001 From: charlieablett Date: Mon, 10 Jun 2019 22:30:00 +1200 Subject: Add `to_json` to `represent` method call --- app/controllers/concerns/boards_responses.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/controllers/concerns/boards_responses.rb b/app/controllers/concerns/boards_responses.rb index 128409a2eef..7625600e452 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) - serializer.represent(resource).to_json + serializer.represent(resource).as_json end def respond_with(resource) -- cgit v1.2.3