Remove default values from foreign keys

app/controllers/organizations/invitations_controller.rb

@@ -1,4 +1,7 @@
 class Organizations::InvitationsController < Devise::InvitationsController
+  include OrganizationScopable
+  # TODO: remove next line once we fix links in the invitation emails
+  skip_before_action :set_tenant, except: [:new, :create]
   before_action :require_organization_admin, only: [:new, :create]
   layout "dashboard", only: [:new, :create]
 

app/models/adopter_account.rb

@@ -5,7 +5,7 @@
 #  id         :bigint           not null, primary key
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
-#  user_id    :bigint           default(0), not null
+#  user_id    :bigint           not null
 #
 # Indexes
 #

app/models/staff_account.rb

@@ -3,11 +3,12 @@
 # Table name: staff_accounts
 #
 #  id              :bigint           not null, primary key
+#  deactivated_at  :datetime
 #  verified        :boolean          default(FALSE), not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
-#  organization_id :bigint           default(1), not null
-#  user_id         :bigint           default(0), not null
+#  organization_id :bigint           not null
+#  user_id         :bigint           not null
 #
 # Indexes
 #

db/migrate/20231023113924_remove_default_values.rb

@@ -0,0 +1,7 @@
+class RemoveDefaultValues < ActiveRecord::Migration[7.0]
+  def change
+    change_column_default(:adopter_accounts, :user_id, nil)
+    change_column_default(:staff_accounts, :organization_id, nil)
+    change_column_default(:staff_accounts, :user_id, nil)
+  end
+end

test/integration/organizations/invite_staff_test.rb

@@ -13,7 +13,9 @@ class Organizations::InviteStaffTest < ActionDispatch::IntegrationTest
   end
 
   test "staff admin can invite other staffs to the organization" do
-    sign_in create(:user, :staff_admin)
+    admin = create(:user, :staff_admin)
+    sign_in admin
+    set_organization(admin.organization)
 
     post(
       user_invitation_path,
@@ -32,7 +34,9 @@ class Organizations::InviteStaffTest < ActionDispatch::IntegrationTest
   end
 
   test "staff admin can not invite existing user to the organization" do
-    sign_in create(:user, :staff_admin)
+    admin = create(:user, :staff_admin)
+    sign_in admin
+    set_organization(admin.organization)
     _existing_user = create(:user, email: "[email protected]")
 
     post(