From cce14991d00130f3b82fe4a19c06cadd1b9dbe1c Mon Sep 17 00:00:00 2001 From: legton <lvs16@inf.ufpr.br> Date: Thu, 14 Mar 2019 10:40:58 -0300 Subject: [PATCH] SCRUM#388: Change has_results to number_of_results --- app/controllers/v1/search_controller.rb | 9 ++------- .../20190313143808_add_has_results_column_to_searches.rb | 5 ----- ...313143808_add_number_of_results_column_to_searches.rb | 5 +++++ 3 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 db/migrate/20190313143808_add_has_results_column_to_searches.rb create mode 100644 db/migrate/20190313143808_add_number_of_results_column_to_searches.rb diff --git a/app/controllers/v1/search_controller.rb b/app/controllers/v1/search_controller.rb index 942e79c4..c80fe5d9 100644 --- a/app/controllers/v1/search_controller.rb +++ b/app/controllers/v1/search_controller.rb @@ -27,13 +27,8 @@ class V1::SearchController < ApplicationController # GET v1/search.json def index search = SearchService.instance(@search, current_user).search - if ((search.results).empty?) - @search.has_results = false - save_search() - else - @search.has_results = true - save_search() - end + @search.number_of_results = search.total_count + save_search() headers['X-Total-Count'] = search.total_count render json: search.results, status: :ok diff --git a/db/migrate/20190313143808_add_has_results_column_to_searches.rb b/db/migrate/20190313143808_add_has_results_column_to_searches.rb deleted file mode 100644 index 815b4b21..00000000 --- a/db/migrate/20190313143808_add_has_results_column_to_searches.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddHasResultsColumnToSearches < ActiveRecord::Migration[5.0] - def change - add_column :searches, :has_results, :boolean - end -end diff --git a/db/migrate/20190313143808_add_number_of_results_column_to_searches.rb b/db/migrate/20190313143808_add_number_of_results_column_to_searches.rb new file mode 100644 index 00000000..36e8fa0b --- /dev/null +++ b/db/migrate/20190313143808_add_number_of_results_column_to_searches.rb @@ -0,0 +1,5 @@ +class AddNumberOfResultsColumnToSearches < ActiveRecord::Migration[5.0] + def change + add_column :searches, :number_of_results, :integer + end +end -- GitLab