Feature/pbs 271 new root group

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 *   Das Anwesenheiten-Tab bei Kursen im Status "Qualifikationen erfasst" und "Abgeschlossen" wird neu mit einem Ausrufezeichen markiert, wenn die Anwesenheiten noch gespeichert werden müssen. Merci @ewangler! (hitobito/hitobito_pbs#262)
 *   Adressverwalter\*innen auf der Abteilungsebene können neu auch für Zugriffsanfragen ausgewählt werden. Merci @philobr! (hitobito/hitobito_pbs#261)
+*   Die Gruppenstruktur wurde so angepasst, dass neu Silverscouts und Silverscouts Regionen unter der "Root" Ebene erstellt werden können (hitobito_pbs#271)
 
 ## Version 1.28
 

README.md

@@ -5,6 +5,9 @@ This hitobito wagon defines the organization hierarchy with groups and roles of
 # Pfadi Organization Hierarchy
 
 <!-- roles:start -->
+    * Root
+      * Root
+        * Admin: 2FA [:layer_and_below_full]
     * Bund
       * Bund
         * Mitarbeiter*in GS: 2FA [:layer_and_below_full, :contact_data, :admin]
@@ -256,6 +259,10 @@ This hitobito wagon defines the organization hierarchy with groups and roles of
       * Internes Gremium
         * Leitung: [:group_and_below_full]
         * Mitglied: [:group_read]
+    * Silverscouts
+      * Silverscouts
+        * Leitung: [:group_read, :contact_data]
+        * Mitglied: []
     * Global
       * Ehemalige
         * Mitglied: []

app/abilities/pbs/event/constraints.rb

@@ -35,7 +35,7 @@ def in_same_layer_or_below_with_excluded_abteilungen_for_courses
   def in_same_layer_or_course_in_below_abteilung
     in_same_layer ||
       (course_in_abteilung? &&
-        permission_in_layers?(course_group_ids_above_abteilung - [Group.root.id]))
+       permission_in_layers?(course_group_ids_above_abteilung - [Group.bund.id]))
   end
 
   private

app/controllers/censuses_controller.rb

@@ -14,13 +14,13 @@ class CensusesController < CrudController
   decorates :group
 
   def create
-    super(location: census_bund_group_path(Group.root))
+    super(location: census_bund_group_path(group))
   end
 
   private
 
   def group
-    @group ||= Group.root
+    @group ||= Group.bund
   end
 
 end

app/models/group/root.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+#  Copyright (c) 2023, 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.
+
+class Group::Root < ::Group
+  self.layer = true
+
+  self.event_types = [] # only managing structure, does not have events (as of 2023-05-23)
+
+  class Admin < ::Role
+    self.permissions = [:layer_and_below_full, :admin]
+    self.two_factor_authentication_enforced = true
+  end
+
+  roles Admin
+
+  children Group::Bund, Group::Silverscouts
+end

app/models/group/silverscouts.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+#  Copyright (c) 2023, 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.
+
+class Group::Silverscouts < ::Group
+  self.layer = true
+
+  class Verantwortung < ::Role
+    self.permissions = [:layer_and_below_full]
+  end
+
+  class Lesezugriff < ::Role
+    self.permissions = [:layer_and_below_read]
+  end
+
+  class PowerUser < ::Role
+    self.permissions = [:layer_full]
+  end
+
+  roles Verantwortung, Lesezugriff, PowerUser
+
+  children Silverscouts::Region
+end

app/models/group/silverscouts/region.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+#  Copyright (c) 2023, 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.
+
+class Group::Silverscouts::Region < ::Group
+  self.layer = true
+
+  class Leitung < ::Role
+    self.permissions = [:group_read, :contact_data]
+  end
+
+  class Mitglied < ::Role
+  end
+
+  roles Leitung, Mitglied
+end

app/models/pbs/group.rb

@@ -52,7 +52,11 @@ module Pbs::Group
     validates :description, length: { allow_nil: true, maximum: 2**16 - 1 }
     has_many :crises
 
-    root_types Group::Bund
+    root_types Group::Root
+
+    def self.bund
+      Group::Bund.first
+    end
   end
 
   def active_crisis_acknowledgeable?(person)

app/models/pbs/person.rb

@@ -133,7 +133,7 @@ def find_kantonalverband
 
   def kantonalverband_for(group)
     group.hierarchy.select(:id).find_by(type: ::Group::Kantonalverband.sti_name) ||
-    Group.select(:id).root
+      Group::Bund.select(:id).first
   end
 
   def set_pbs_number!

app/views/censuses/_form.html.haml

@@ -6,6 +6,6 @@
 -title t('.title')
 
 = entry_form(buttons_bottom: false,
-             cancel_url: census_bund_group_path(Group.root))
+             cancel_url: census_bund_group_path(Group.bund))
 
 %p= t('.frozen_once_gathered')

config/locales/models.pbs.de.yml

@@ -91,9 +91,18 @@ de:
         one: Rover
         other: Rovers
         long: Regionale Rover
+      group/root:
+        one: Root
+        other: Root
       group/rover:
         one: Rover
         other: Rovers
+      group/silverscouts:
+        one: Silverscouts
+        other: Silverscouts
+      group/silverscouts/region:
+        one: Region
+        other: Regionen
       group/woelfe:
         one: Wölfe
         other: Wölfe
@@ -662,6 +671,32 @@ de:
         other: Selbstregistrierte
         description:
 
+      group/root/admin:
+        one: Admin
+        other: Admin
+
+      group/silverscouts/verantwortung:
+        one: Verantwortliche*r
+        other: Verantwortliche
+        description:
+      group/silverscouts/lesezugriff:
+        one: Lesezugriff
+        other: Lesezugriff
+        description:
+      group/silverscouts/power_user:
+        one: PowerUser
+        other: PowerUser
+        description:
+
+      group/silverscouts/region/leitung:
+        one: Leitung
+        other: Leitung
+        description:
+      group/silverscouts/region/mitglied:
+        one: Mitglied
+        other: Mitglieder
+        description:
+
       group/abteilung/abteilungsleitung:
         one: Abteilungsleiter*in
         other: Abteilungsleiter*innen

db/migrate/20230517082130_insert_new_root_group.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+#  Copyright (c) 2023, 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.
+
+class InsertNewRootGroup < ActiveRecord::Migration[6.1]
+  def up
+    admin_layer = nil
+
+    say_with_time 'Create new root-group' do
+      admin_layer = Group.find_or_create_by(
+        name: 'hitobito',
+        type: 'Group::Root',
+      )
+    end
+
+    say_with_time 'Move bund group below new root-group' do
+      Group
+        .where(type: 'Group::Bund', parent_id: nil)
+        .update_all(parent_id: admin_layer.id, lft: nil, rgt: nil)
+    end
+
+    say_with_time 'Create new silverscouts group below new root-group' do
+      Group::Silverscouts.create(name: 'Silverscouts', short_name: 'SiSc', type: 'Group::Silverscouts')
+      Group
+        .where(type: 'Group::Silverscouts', parent_id: nil)
+        .update_all(parent_id: admin_layer.id, lft: nil, rgt: nil)
+    end
+
+    say_with_time 'Rebuilding nested set...' do
+      Group.rebuild!(false)
+    end
+  end
+
+  def down
+    admin_layer_ids = Group.where(type: 'Group::Root').pluck(:id)
+
+    say_with_time 'Make current bund root' do
+      Group
+        .where(type: 'Group::Bund', parent_id: admin_layer_ids)
+        .update_all(parent_id: nil, lft: nil, rgt: nil)
+    end
+
+    say_with_time 'Remove silverscouts groups' do
+      Group.where(type: 'Group::Silverscouts', parent_id: admin_layer_ids).find_each { |g| g.really_destroy! }
+    end
+
+    say_with_time 'Rebuilding nested set...' do
+      Group.rebuild!(false)
+    end
+  end
+end

db/seeds/development/0_groups.rb

@@ -9,7 +9,7 @@
 
 seeder = GroupSeeder.new
 
-ch = Group.roots.first
+ch = Group::Bund.first
 srand(42)
 
 unless ch.address.present?

db/seeds/groups.rb

@@ -5,8 +5,12 @@
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_pbs.
 
-Group::Bund.seed_once(:parent_id,
-  {name: 'Pfadibewegung Schweiz',
-   short_name: 'PBS'}
-)
+Group::Root.seed_once(:parent_id,
+                      { name: 'Root' })
 
+Group::Bund.seed_once(:parent_id,
+                      { name: 'Pfadibewegung Schweiz',
+                        short_name: 'PBS', parent_id: Group.roots.first.id })
+Group::Silverscouts.seed_once(:parent_id,
+                              { name: 'Silverscouts Schweiz',
+                                short_name: 'SILV', parent_id: Group.roots.first.id })