Postgresql Migration

.github/workflows/tests.yml

@@ -25,7 +25,7 @@ on:
         default: 'master'
 jobs:
   wagon_tests:
-    uses: hitobito/hitobito/.github/workflows/wagon-tests.yml@master
+    uses: hitobito/hitobito/.github/workflows/wagon-tests.yml@psql-migration
     with:
       wagon_repository: ${{ github.event.repository.name }}
       wagon_dependency_repository: hitobito_youth

Rakefile

@@ -23,5 +23,3 @@ load 'rspec/rails/tasks/rspec.rake'
 require 'ci/reporter/rake/rspec' unless Rails.env == 'production'
 
 HitobitoPbs::Wagon.load_tasks
-
-task 'test:prepare' => 'db:test:prepare'

app/abilities/pbs/event_ability.rb

@@ -147,7 +147,7 @@ def if_participating_as_leader_role_of_supercamp
   end
 
   def if_part_of_krisenteam
-    user.roles.where(type: CAMP_KRISENTEAM_ROLES, group: kantonalverbaende).exists?
+    user.roles.where(type: CAMP_KRISENTEAM_ROLES.map(&:to_s), group: kantonalverbaende).exists?
   end
 
   def kantonalverbaende

app/controllers/event/approvals_controller.rb

@@ -10,7 +10,7 @@ class Event::ApprovalsController < CrudController
   decorates :group, :event, :participation
 
   def index
-    @approvals = entries.group_by(&:participation)
+    @approvals = entries.select("event_approvals.*").group_by(&:participation)
   end
 
   def new

app/controllers/group_health_controller.rb

@@ -35,7 +35,7 @@ class GroupHealthController < ApplicationController
   CANTON_JOIN = "LEFT JOIN #{Group.quoted_table_name} AS canton " \
                 "ON #{Group.quoted_table_name}.lft >= canton.lft " \
                 "AND #{Group.quoted_table_name}.lft < canton.rgt " \
-                'AND canton.type = "Group::Kantonalverband"'.freeze
+                "AND canton.type = 'Group::Kantonalverband'".freeze
 
   # exclude Group::InternesGremium groups
   INTERNES_GREMIUM_GROUP_TYPES = [Group::InternesGremium, Group::InternesAbteilungsGremium,
@@ -77,6 +77,7 @@ def groups
     respond(Group.from("((#{bund}) UNION (#{cantons}) UNION (#{abt_and_below})) " \
                        "AS #{Group.quoted_table_name}")
                 .where(EXCLUDE_INTERNES_GREMIUM)
+                .order(:lft)
                 .page(params[:page]).per(params[:size] || DEFAULT_PAGE_SIZE)
                 .as_json(only: GROUPS_FIELDS))
   end

app/controllers/pbs/event/lists_controller.rb

@@ -96,6 +96,7 @@ def all_kantonalverband_camps
       .joins(:groups)
       .where("groups.lft >= ? AND groups.rgt <= ?", @group.lft, @group.rgt)
       .in_year(year)
+      .list
   end
 
   def all_camps_in_canton
@@ -108,17 +109,17 @@ def all_camps_abroad
     base_camp_query
       .where(canton: Event::Camp::ABROAD_CANTON)
       .in_year(year)
+      .list
   end
 
   def base_camp_query(excluded_states = %w[created canceled])
     Event::Camp.where.not(camp_submitted_at: nil)
       .where.not(state: excluded_states)
       .includes(:groups)
-      .list
   end
 
   def in_next_three_weeks(scope)
     timespan = Time.zone.now.midnight + 3.weeks
-    scope.where("event_dates.start_at <= ? OR event_dates.finish_at <= ?", timespan, timespan)
+    scope.where("event_dates.start_at <= ? OR event_dates.finish_at <= ?", timespan, timespan).list
   end
 end

app/controllers/population_controller.rb

@@ -29,7 +29,7 @@ def group
   end
 
   def load_groups
-    group.self_and_descendants.without_deleted.order_by_type(group)
+    group.self_and_descendants.without_deleted.order_by_type
   end
 
   def load_people_by_group
@@ -50,6 +50,7 @@ def load_people(group)
       .where(roles: {group_id: group})
       .includes(:groups)
       .preload_groups
+      .select("people.*")
       .order_by_role
       .order_by_name
   end

app/controllers/supercamps_controller.rb

@@ -72,7 +72,7 @@ def supercamps_on_group_and_above
   def matching_supercamps
     Event::Camp.upcoming
       .left_joins(:translations)
-      .where("event_translations.name LIKE ?", "%#{params[:q]}%")
+      .where("event_translations.name ILIKE ?", "%#{params[:q]}%")
       .where(allow_sub_camps: true, state: "created").distinct
   end
 

app/domain/pbs/export/tabular/events/bsv_row.rb

@@ -38,11 +38,11 @@ def kurs_kind
     end
 
     def kantonalverband
-      entry.groups.where(type: Group::Kantonalverband).join(", ") || nil
+      entry.groups.where(type: "Group::Kantonalverband").join(", ") || nil
     end
 
     def region
-      entry.groups.where(type: Group::Region).join(", ") || nil
+      entry.groups.where(type: "Group::Region").join(", ") || nil
     end
 
     def language_count_pbs

app/jobs/event/approval_cleanup_job.rb

@@ -44,7 +44,7 @@ def old_events
               .select(:event_id).select("MAX(finish_at) AS finish_at, MAX(start_at) AS start_at")
               .joins(:event).where(events: {state: "closed"})
               .group(:event_id))
-      .where("IFNULL(finish_at, start_at) < ?", cutoff_date)
+      .where("COALESCE(finish_at, start_at) < ?", cutoff_date)
   end
 
   def approvals

app/jobs/event/camp_reminder_job.rb

@@ -7,7 +7,7 @@ class Event::CampReminderJob < RecurringJob
   RUN_AT = 3 # 3 a.m.
   SPAN_NATIONAL = 6.weeks
   SPAN_ABROAD = 10.weeks
-  NOTIFIED_ROLES = [Event::Camp::Role::Leader, Event::Camp::Role::Coach].freeze
+  NOTIFIED_ROLES = ["Event::Camp::Role::Leader", "Event::Camp::Role::Coach"].freeze
 
   run_every 24.hours
 

app/jobs/event/canceled_camp_participation_job.rb

@@ -34,6 +34,7 @@ def camp_leaders
       .where(event_roles: {type: Event::Camp::Role::Leader.sti_name})
       .distinct
       .includes(:additional_emails)
+      .order(:id)
   end
 
   def participation

app/mailers/black_list_mailer.rb

@@ -24,7 +24,7 @@ def hit(person, target = nil)
   def recipients
     @recipients ||= Person
       .joins(:roles)
-      .where(roles: {type: BLACK_LIST_ROLES})
+      .where(roles: {type: BLACK_LIST_ROLES.map(&:sti_name)})
       .pluck(:email)
   end
 

app/mailers/crisis_mailer.rb

@@ -7,10 +7,10 @@ class CrisisMailer < ApplicationMailer
   CONTENT_CRISIS_ACKNOWLEDGED = "content_crisis_acknowledged".freeze
   CONTENT_CRISIS_TRIGGERED = "content_crisis_triggered".freeze
 
-  BUND_RECIPIENTS = [Group::Bund::VerantwortungKrisenteam,
-    Group::Bund::LeitungKernaufgabeKommunikation]
+  BUND_RECIPIENTS = [Group::Bund::VerantwortungKrisenteam.sti_name,
+    Group::Bund::LeitungKernaufgabeKommunikation.sti_name]
 
-  BUND_CREATORS = BUND_RECIPIENTS + [Group::Bund::MitgliedKrisenteam]
+  BUND_CREATORS = BUND_RECIPIENTS + [Group::Bund::MitgliedKrisenteam.sti_name]
 
   attr_reader :crisis
 

app/models/member_count.rb

@@ -82,17 +82,18 @@ def total_by_regionen(year, state)
     end
 
     def total_for_bund(year)
-      totals_by(year, :year).first
+      totals_by(year, :year).order("MIN(member_counts.id)").first
     end
 
     def total_for_abteilung(year, abteilung)
-      totals_by(year, :abteilung_id, abteilung_id: abteilung.id).first
+      totals_by(year, :abteilung_id, abteilung_id: abteilung.id).order("MIN(member_counts.id)")
+        .first
     end
 
     def totals(year)
-      columns = "kantonalverband_id, " \
-                "region_id, " \
-                "abteilung_id, " +
+      columns = "MIN(kantonalverband_id) AS kantonalverband_id, " \
+                "MIN(region_id) AS region_id, " \
+                "MIN(abteilung_id) AS abteilung_id, " +
         COUNT_COLUMNS.collect { |c| "SUM(#{c}) AS #{c}" }.join(",")
 
       select(columns).where(year: year)

app/models/pbs/group.rb

@@ -46,6 +46,9 @@ module Pbs::Group
     self.used_attributes += [:website, :bank_account, :pbs_shortname]
     self.superior_attributes = [:pbs_shortname]
 
+    Group::SEARCHABLE_ATTRS << :pbs_shortname << :description << :website << :bank_account
+    include PgSearchable
+
     validates :description, length: {allow_nil: true, maximum: 2**16 - 1}
     validates :hostname, uniqueness: true, allow_blank: true
     has_many :crises

app/models/pbs/person.rb

@@ -57,6 +57,9 @@ module Pbs::Person
       :prefers_digital_correspondence << :kantonalverband_id
     Person::ADDRESS_ATTRS << "prefers_digital_correspondence"
 
+    Person::SEARCHABLE_ATTRS << :title << :pbs_number
+    include PgSearchable
+
     alias_method_chain :full_name, :title
 
     i18n_boolean_setter :prefers_digital_correspondence

db/migrate/20211108083000_harmonize_digital_correspondence_on_households.rb

@@ -37,18 +37,16 @@ def initialize(people_scope)
     end
 
     def grouped_households
-      people = Person.quoted_table_name
-
       @people_scope.
         # remove previously added selects, very important to make this query scale
         unscope(:select, :includes).
         # group by household, but keep NULLs separate
-        select("IFNULL(#{people}.`household_key`, #{people}.`id`) as `key`").
+        select("COALESCE(#{people}.\"household_key\", \"people\".\"id\"::text) as \"key\"").
         group(:key).
         # Primary sorting criterion
-        select("COUNT(#{people}.`household_key`) as `member_count`").
+        select("COUNT(#{people}.\"household_key\") as \"member_count\"").
         # Secondary, unique sorting criterion
-        select("MIN(#{people}.`id`) as `id`")
+        select("MIN(#{people}.\"id\") as \"id\"")
     end
 
     def households_in_batches

spec/abilities/black_list_spec.rb

@@ -30,8 +30,8 @@
 
   describe 'other roles' do
     it 'cannot read BlackList' do
-      other_roles = Role.where.not(type: [Group::Bund::Geschaeftsleitung,
-                                           Group::Bund::LeitungKernaufgabeKommunikation])
+      other_roles = Role.where.not(type: ["Group::Bund::Geschaeftsleitung",
+                                           "Group::Bund::LeitungKernaufgabeKommunikation"])
 
       other_roles.each do |role|
         ability = Ability.new(role.person)

spec/controllers/event/lists_controller_spec.rb

@@ -263,7 +263,7 @@
         values = rows.second.split(';')
         #main labels
         expect(values[0..8]).to eq(
-          ["", "", "LPK (Leitpfadikurs)", "Zürich, Bern", '""', "124", "11.11.2015", "12.11.2015", ""]
+          ["", "", "LPK (Leitpfadikurs)", "Bern, Zürich", '""', "124", "11.11.2015", "12.11.2015", ""]
         )
         #counts -> participant_, canton_ & language_count are incorrectly 0 here
         #          as person.canton is not easily setable in test here.

spec/controllers/population_controller_spec.rb

@@ -35,11 +35,11 @@
 
       it do
         is_expected.to eq([abteilung,
-                   groups(:sunnewirbu),
+                   groups(:sunnewirbu),        
+                   groups(:baereried),
+                   groups(:medusa),
                    groups(:pegasus),
                    groups(:poseidon),
-                   groups(:medusa),
-                   groups(:baereried),
                    groups(:rovers),
                    groups(:elternrat),
                    groups(:fussballers)])
@@ -48,7 +48,7 @@
 
     describe 'people by group' do
       subject { assigns(:people_by_group) }
-
+      
       it { expect(subject[abteilung].collect(&:to_s)).to contain_exactly(*[leader, people(:al_schekka), guide].collect(&:to_s)) }
       it { expect(subject[groups(:pegasus)].collect(&:to_s)).to contain_exactly(*[group_leader, child, people(:child)].collect(&:to_s)) }
       it { expect(subject[groups(:baereried)]).to be_nil } # no people in group - not displayed at all

spec/domain/search_strategy/group_search_spec.rb

@@ -0,0 +1,41 @@
+#  Copyright (c) 2024, Pfadibewegung Schweiz. This file is part of
+#  hitobito_pbs and licensed under the Affero General Public License version 3
+#  or later. See the COPYING file at the top-level directory or at
+#  https://github.com/hitobito/hitobito_pbs.
+#
+require "spec_helper"
+
+describe SearchStrategies::GroupSearch do
+  before do
+    groups(:bund).update!(pbs_shortname: "shortname", description: "description", website: "lemurenshop",
+                          bank_account: "account")
+  end
+
+  describe "#search_fulltext" do
+    let(:user) { people(:root) }
+
+    it "finds accessible groups by shortname" do
+      result = search_class(groups(:bund).pbs_shortname).search_fulltext
+      expect(result).to include(groups(:bund))
+    end
+
+    it "finds accessible groups by description" do
+      result = search_class(groups(:bund).description).search_fulltext
+      expect(result).to include(groups(:bund))
+    end
+
+    it "finds accessible groups by website" do
+      result = search_class(groups(:bund).website).search_fulltext
+      expect(result).to include(groups(:bund))
+    end
+
+    it "finds accessible groups by bank account" do
+      result = search_class(groups(:bund).bank_account).search_fulltext
+      expect(result).to include(groups(:bund))
+    end
+  end
+
+  def search_class(term = nil, page = nil)
+    described_class.new(user, term, page)
+  end
+end

spec/domain/search_strategy/person_search_spec.rb

@@ -0,0 +1,30 @@
+#  Copyright (c) 2024, Pfadibewegung Schweiz. This file is part of
+#  hitobito_pbs and licensed under the Affero General Public License version 3
+#  or later. See the COPYING file at the top-level directory or at
+#  https://github.com/hitobito/hitobito_pbs.
+
+require "spec_helper"
+
+describe SearchStrategies::PersonSearch do
+  before do
+    people(:al_schekka).update!(pbs_number: 4566, title: "Sky")
+  end
+
+  describe "#search_fulltext" do
+    let(:user) { people(:bulei) }
+
+    it "finds accessible person by title" do
+      result = search_class(people(:al_schekka).title).search_fulltext
+      expect(result).to include(people(:al_schekka))
+    end
+
+    it "finds accessible person by pbs number" do
+      result = search_class(people(:al_schekka).pbs_number.to_s).search_fulltext
+      expect(result).to include(people(:al_schekka))
+    end
+  end
+
+  def search_class(term = nil, page = nil)
+    described_class.new(user, term, page)
+  end
+end