Merge branch 'master' into issue/401

app/controllers/concerns/paginator.rb

@@ -51,7 +51,7 @@ module Paginator
           if(model.columns_hash[key].type == :integer)
             model = model.where("#{key}": value)
           else
-            model = model.where("#{key} ILIKE ?", "%#{value}%")
+            model = model.where("#{key} ILIKE  '%'|| ? || '%'", value)
           end
         end
       end

app/services/search_service/collection.rb

@@ -58,7 +58,9 @@ module SearchService
       when 'likes' then { likes: { order: :desc } }
       when 'downloads' then { downloads: { order: :desc } }
       when 'review_average' then { review_average: { order: :desc } }
-      else "_score"
+      else
+        { score: {order: :desc} } if @search.query == '*'
+        "_score"
       end
     end
 

app/services/search_service/learning_object.rb

@@ -66,7 +66,9 @@ module SearchService
       when 'likes' then { likes: { order: :desc } }
       when 'downloads' then { downloads: { order: :desc } }
       when 'review_average' then { review_average: { order: :desc } }
-      else "_score"
+      else
+        { score: {order: :desc} } if @search.query == '*'
+        "_score"
       end
     end
 

app/services/search_service/user.rb

@@ -39,6 +39,7 @@ module SearchService
 
     def order_hash
       return { name: { order: :asc, unmapped_type: :string } } if @search.order == 'title'
+      { score: {order: :desc} } if @search.query == '*'
       "_score"
     end
   end

db/migrate/20190205121252_add_status_to_complaint_reasons.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class AddStatusToComplaintReasons < ActiveRecord::Migration[5.0]
   def change
     add_column :complaint_reasons, :status, :integer, default: 0

db/migrate/20190215133653_add_state_and_suspended_at_and_reactivated_a_to_user.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class AddStateAndSuspendedAtAndReactivatedAToUser < ActiveRecord::Migration[5.0]
   def change
     add_column :users, :state, :integer, default: 0

db/migrate/20190225143721_create_join_table_search_subject.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class CreateJoinTableSearchSubject < ActiveRecord::Migration[5.0]
   def change
     create_join_table :searches, :subjects do |t|

db/migrate/20190226122727_create_join_table_educational_stage_search.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class CreateJoinTableEducationalStageSearch < ActiveRecord::Migration[5.0]
   def change
     create_join_table :educational_stages, :searches do |t|

db/migrate/20190226122759_create_join_table_object_type_search.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class CreateJoinTableObjectTypeSearch < ActiveRecord::Migration[5.0]
   def change
     create_join_table :object_types, :searches do |t|

db/migrate/20190226131445_create_join_table_search_tag.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class CreateJoinTableSearchTag < ActiveRecord::Migration[5.0]
   def change
     create_join_table :searches, :tags do |t|

db/migrate/20190227115926_create_join_table_language_learning_object.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class CreateJoinTableLanguageLearningObject < ActiveRecord::Migration[5.0]
   def change
     create_join_table :languages, :learning_objects do |t|

db/migrate/20190307135526_add_times_blocked_to_user.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class AddTimesBlockedToUser < ActiveRecord::Migration[5.0]
   def change
     add_column :users, :times_blocked, :integer, default: 0

db/migrate/20190311133847_create_join_table_languages_searches.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class CreateJoinTableLanguagesSearches < ActiveRecord::Migration[5.0]
   def change
     create_join_table :languages, :searches do |t|

db/migrate/20190313143808_add_number_of_results_column_to_searches.rb

+# Copyright (C) 2015 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana
+#
+# This file is part of portalmec.
+#
+# portalmec is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# portalmec is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with portalmec.  If not, see <http://www.gnu.org/licenses/>.
+
 class AddNumberOfResultsColumnToSearches < ActiveRecord::Migration[5.0]
   def change
     add_column :searches, :number_of_results, :integer