diff --git a/app/controllers/api/v1/results_controller.rb b/app/controllers/api/v1/results_controller.rb index 194116a7c..2d0712fd2 100644 --- a/app/controllers/api/v1/results_controller.rb +++ b/app/controllers/api/v1/results_controller.rb @@ -14,12 +14,15 @@ module Api .page(params.dig(:page, :number)) .per(params.dig(:page, :size)) - render jsonapi: results, - each_serializer: ResultSerializer + render jsonapi: results, include: %w( + result_table result_text result_asset + ), each_serializer: ResultSerializer end def show - render jsonapi: @result, serializer: ResultSerializer + render jsonapi: @result, include: %w( + result_table result_text result_asset + ), serializer: ResultSerializer end private diff --git a/app/serializers/api/v1/result_serializer.rb b/app/serializers/api/v1/result_serializer.rb index b90f9fa7c..23c3fca3e 100644 --- a/app/serializers/api/v1/result_serializer.rb +++ b/app/serializers/api/v1/result_serializer.rb @@ -6,7 +6,7 @@ module Api type :results attributes :id, :name, :my_module_id, :user_id, :created_at, :updated_at, :archived, :archived_on, :last_modified_by_id, :archived_by_id, - :restored_by_id, :restored_on + :restored_by_id, :restored_on, :result_text, :result_table, :result_asset belongs_to :my_module, serializer: MyModuleSerializer end diff --git a/config/routes.rb b/config/routes.rb index 0b4d28779..d3c3cfe9a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -598,10 +598,13 @@ Rails.application.routes.draw do end end end +<<<<<<< HEAD resources :users, only: %i(show) do resources :user_identities, only: %i(index create show update destroy) end +======= +>>>>>>> Added results endpoint end end end