Models: Re-order acts_as_tenant declaration.

When acts_as_tenant comes before other associations, it does not seem to
properly check the tenant when associating model instances with eachother. (WTF)

I debugged this for hours. See ErwinM/acts_as_tenant#255.

References #163.

app/models/activity.rb

@@ -7,9 +7,10 @@ class Activity < ApplicationRecord
   validate :date_must_be_valid_activity_day, unless: Proc.new { date.nil? }
   validates_uniqueness_of :room, scope: [:date, :name], case_sensitive: false
 
-  acts_as_tenant(:school)
   has_many :registrations, dependent: :destroy
 
+  acts_as_tenant :school
+
   def self.for_week(date)
     Week::ACTIVITY_DAYS.reduce({}) do |week, day|
       week[date.send(day)] = Activity.where(date: date.send(day)).order('name').to_a

app/models/registration.rb

@@ -2,10 +2,11 @@ class Registration < ApplicationRecord
 
   belongs_to :activity, counter_cache: true
   belongs_to :creator, class_name: 'User'
-  acts_as_tenant(:school)
   belongs_to :student, class_name: 'User'
   belongs_to :teacher
 
+  acts_as_tenant :school
+
   validates :activity, uniqueness: {scope: :student}
   validate :student_must_be_student
   validate :student_not_registered_for_another_activity_on_same_date, unless: :updating_activity

app/models/teacher.rb

@@ -7,10 +7,11 @@ class Teacher < ApplicationRecord
   validates :name, uniqueness: { scope: :title, case_sensitive: false }
   validates :active, inclusion: { in: [true, false] }
 
-  acts_as_tenant(:school)
   has_many :students, class_name: 'User', dependent: :restrict_with_error
   has_many :registrations, dependent: :restrict_with_error
 
+  acts_as_tenant :school
+
   default_scope { order(:name) }
   scope :active, -> { where(active: true) }
   scope :deactivated, -> { where(active: false) }

app/models/user.rb

@@ -10,7 +10,6 @@ class User < ApplicationRecord
   validates_presence_of :last_name
   validates :active, inclusion: { in: [true, false] }
 
-  acts_as_tenant(:school)
   belongs_to :teacher, optional: true
   validates_presence_of :teacher_id, unless: Proc.new { |u| u.new_record? || !u.student? || !u.active || u.active_changed?(from: false) }
   validate :school_of_teacher_matches, if: -> { teacher.present? }
@@ -20,6 +19,8 @@ class User < ApplicationRecord
 
   has_many :activities, through: :registrations
 
+  acts_as_tenant :school
+
   default_scope { order(:last_name) }
   scope :active, -> { where(active: true) }
   scope :deactivated, -> { where(active: false) }