Handle deactivated users gracefully from a bank

app/models/role.rb

@@ -29,4 +29,5 @@ class Role < ApplicationRecord
   ORG_ADMIN = :org_admin
   SUPER_ADMIN = :super_admin
   PARTNER = :partner
+  DEACTIVATED = :deactivated
 end

app/models/user.rb

@@ -53,13 +53,14 @@ class User < ApplicationRecord
   # :invitable is from the devise_invitable gem
   # If you change any of these options, adjust ConsolidatedLoginsController::DeviseMappingShunt accordingly
   devise :invitable, :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :timeoutable
+    :recoverable, :rememberable, :trackable, :validatable,
+    :timeoutable
   devise :omniauthable, omniauth_providers: [:google_oauth2]
 
   validates :name, presence: true
+  before_validation
   validates :email, presence: true, uniqueness: {case_sensitive: false},
-  format: {with: URI::MailTo::EMAIL_REGEXP, on: :create}
+    format: {with: URI::MailTo::EMAIL_REGEXP, on: :create}
 
   validate :password_complexity
 
@@ -99,6 +100,7 @@ def kind
     return "admin" if has_role?(Role::ORG_ADMIN, organization)
     return "normal" if has_role?(Role::ORG_USER, organization)
     return "partner" if has_role?(Role::PARTNER, partner)
+    return "deactived" if has_role?(Role::DEACTIVATED)
 
     "normal"
   end

app/models/users_role.rb

@@ -15,7 +15,7 @@ class UsersRole < ApplicationRecord
   # @param user [User]
   # @return [Role,nil]
   def self.current_role_for(user)
-    role_order = [Role::SUPER_ADMIN, Role::ORG_ADMIN, Role::ORG_USER, Role::PARTNER]
+    role_order = [Role::SUPER_ADMIN, Role::ORG_ADMIN, Role::ORG_USER, Role::PARTNER, Role::DEACTIVATED]
     role_order.each do |role|
       found_role = user&.roles&.find { |r| r.name.to_sym == role }
       return found_role if found_role

db/migrate/20230529045228_deactive_users.rb

@@ -0,0 +1,7 @@
+class DeactiveUsers < ActiveRecord::Migration[7.0]
+  def change
+    Users.discarded.each do |user|
+      user.add_role(:deactivated)
+    end
+  end
+end

spec/models/user_spec.rb

@@ -39,6 +39,17 @@
     expect(build(:user)).to be_valid
   end
 
+  context "discarded user from organization should be able to create a partner profile" do
+    let(:discarded_at) { Time.zone.now }
+    let(:email) { "[email protected]" }
+    let!(:discarded_user) { build(:user, name: "Larry", email: email, discarded_at: discarded_at) }
+    let!(:partner) { create(:partner, email: email) }
+
+    it "allows a previously discarded user to create a partner account" do
+      expect(partner).not_to be_valid
+    end
+  end
+
   context "Validations >" do
     it "requires a name" do
       expect(build(:user, name: nil)).not_to be_valid
@@ -55,8 +66,8 @@
 
   describe "Scopes >" do
     describe "->alphabetized" do
-      let!(:z_name_user) { create(:user, name: 'Zachary') }
-      let!(:a_name_user) { create(:user, name: 'Amanda') }
+      let!(:z_name_user) { create(:user, name: "Zachary") }
+      let!(:a_name_user) { create(:user, name: "Amanda") }
 
       it "retrieves users in the correct order" do
         alphabetized_list = described_class.alphabetized
@@ -71,10 +82,10 @@
     describe "->alphabetized" do
       let(:discarded_at) { Time.zone.now }
 
-      let!(:z_name_user) { create(:user, name: 'Zachary') }
-      let!(:a_name_user) { create(:user, name: 'Amanda') }
-      let!(:deactivated_a_name_user) { create(:user, name: 'Alice', discarded_at: discarded_at) }
-      let!(:deactivated_z_name_user) { create(:user, name: 'Zeke', discarded_at: discarded_at) }
+      let!(:z_name_user) { create(:user, name: "Zachary") }
+      let!(:a_name_user) { create(:user, name: "Amanda") }
+      let!(:deactivated_a_name_user) { create(:user, name: "Alice", discarded_at: discarded_at) }
+      let!(:deactivated_z_name_user) { create(:user, name: "Zeke", discarded_at: discarded_at) }
 
       it "retrieves users in the correct order" do
         alphabetized_list = described_class.org_users.with_discarded.alphabetized
@@ -118,12 +129,12 @@
     end
   end
 
-  describe 'omniauth' do
-    it 'retrieves the user from an omniauth context' do
+  describe "omniauth" do
+    it "retrieves the user from an omniauth context" do
       # can't use instance_double since AuthHash uses Hashie for dynamically created methods
-      token = double(OmniAuth::AuthHash, info: {'email' => '[email protected]'})
+      token = double(OmniAuth::AuthHash, info: {"email" => "[email protected]"})
       expect(described_class.from_omniauth(token)).to eq(nil)
-      user = FactoryBot.create(:user, email: '[email protected]')
+      user = FactoryBot.create(:user, email: "[email protected]")
       expect(described_class.from_omniauth(token)).to eq(user)
     end
   end