Create AdopterFosterAccount

app/controllers/adoptable_pets_controller.rb

@@ -12,14 +12,14 @@ def show
     @pet = Pet.find(params[:id])
     authorize! @pet, with: AdoptablePetPolicy
 
-    if current_user&.adopter_account
+    if current_user&.adopter_foster_account
       @adoption_application =
         AdopterApplication.find_by(
           pet_id: @pet.id,
-          adopter_account_id: current_user.adopter_account.id
+          adopter_foster_account_id: current_user.adopter_foster_account.id
         ) ||
         @pet.adopter_applications.build(
-          adopter_account: current_user.adopter_account
+          adopter_foster_account: current_user.adopter_foster_account
         )
     end
   end

app/controllers/adopter_applications_controller.rb

@@ -45,7 +45,7 @@ def update
   def application_params
     params.require(:adopter_application).permit(
       :pet_id,
-      :adopter_account_id,
+      :adopter_foster_account_id,
       :status,
       :profile_show
     )

app/controllers/adopter_foster_profiles_controller.rb

@@ -39,12 +39,12 @@ def update
   private
 
   def set_profile
-    @adopter_foster_profile = current_user.adopter_account.adopter_foster_profile
+    @adopter_foster_profile = current_user.adopter_foster_account.adopter_foster_profile
     authorize! @adopter_foster_profile
   end
 
   def adopter_foster_profile_params
-    params.require(:adopter_foster_profile).permit(:adopter_account_id,
+    params.require(:adopter_foster_profile).permit(:adopter_foster_account_id,
       :phone_number,
       :contact_method,
       :ideal_pet,

app/controllers/matches_controller.rb

@@ -31,7 +31,7 @@ def destroy
   private
 
   def match_params
-    params.require(:match).permit(:pet_id, :adopter_account_id)
+    params.require(:match).permit(:pet_id, :adopter_foster_account_id)
   end
 
   def set_pet

app/controllers/registrations_controller.rb

@@ -8,7 +8,7 @@ class RegistrationsController < Devise::RegistrationsController
   # no attributes need to be accepted, just create new account with user_id reference
   def new
     build_resource({})
-    resource.build_adopter_account
+    resource.build_adopter_foster_account
     respond_with resource
   end
 
@@ -30,7 +30,7 @@ def sign_up_params
       :password,
       :signup_role,
       :tos_agreement,
-      adopter_account_attributes: [:user_id])
+      adopter_foster_account_attributes: [:user_id])
   end
 
   def account_update_params

app/mailers/match_mailer.rb

@@ -2,8 +2,8 @@ class MatchMailer < ApplicationMailer
   def reminder(match)
     @match = match
 
-    @adopter_account = match.adopter_account
-    @user = @adopter_account.user
+    @adopter_foster_account = match.adopter_foster_account
+    @user = @adopter_foster_account.user
     @pet = match.pet
 
     mail to: @user.email, subject: "#{@pet.name}'s Reminder"

app/models/adopter_application.rb

@@ -2,28 +2,28 @@
 #
 # Table name: adopter_applications
 #
-#  id                 :bigint           not null, primary key
-#  notes              :text
-#  profile_show       :boolean          default(TRUE)
-#  status             :integer          default("awaiting_review")
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  adopter_account_id :bigint           not null
-#  pet_id             :bigint           not null
+#  id                        :bigint           not null, primary key
+#  notes                     :text
+#  profile_show              :boolean          default(TRUE)
+#  status                    :integer          default("awaiting_review")
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  adopter_foster_account_id :bigint
+#  pet_id                    :bigint           not null
 #
 # Indexes
 #
-#  index_adopter_applications_on_adopter_account_id  (adopter_account_id)
-#  index_adopter_applications_on_pet_id              (pet_id)
+#  index_adopter_applications_on_adopter_foster_account_id  (adopter_foster_account_id)
+#  index_adopter_applications_on_pet_id                     (pet_id)
 #
 # Foreign Keys
 #
-#  fk_rails_...  (adopter_account_id => adopter_accounts.id)
+#  fk_rails_...  (adopter_foster_account_id => adopter_foster_accounts.id)
 #  fk_rails_...  (pet_id => pets.id)
 #
 class AdopterApplication < ApplicationRecord
   belongs_to :pet
-  belongs_to :adopter_account
+  belongs_to :adopter_foster_account
 
   enum :status, [:awaiting_review,
     :under_review,
@@ -42,14 +42,14 @@ def self.app_review_statuses
   end
 
   # check if an adopter has applied to adopt a pet
-  def self.adoption_exists?(adopter_account_id, pet_id)
-    AdopterApplication.where(adopter_account_id: adopter_account_id,
+  def self.adoption_exists?(adopter_foster_account_id, pet_id)
+    AdopterApplication.where(adopter_foster_account_id: adopter_foster_account_id,
       pet_id: pet_id).exists?
   end
 
   # check if any applications are set to profile_show: true
-  def self.any_applications_profile_show_true?(adopter_account_id)
-    applications = AdopterApplication.where(adopter_account_id: adopter_account_id)
+  def self.any_applications_profile_show_true?(adopter_foster_account_id)
+    applications = AdopterApplication.where(adopter_foster_account_id: adopter_foster_account_id)
     applications.any? { |app| app.profile_show == true }
   end
 
@@ -60,7 +60,7 @@ def self.retire_applications(pet_id:)
   end
 
   def applicant_name
-    "#{adopter_account.user.last_name}, #{adopter_account.user.first_name}"
+    "#{adopter_foster_account.user.last_name}, #{adopter_foster_account.user.first_name}"
   end
 
   def withdraw

app/models/adopter_account.rb → app/models/adopter_foster_account.rb

@@ -1,6 +1,6 @@
 # == Schema Information
 #
-# Table name: adopter_accounts
+# Table name: adopter_foster_accounts
 #
 #  id         :bigint           not null, primary key
 #  created_at :datetime         not null
@@ -9,13 +9,13 @@
 #
 # Indexes
 #
-#  index_adopter_accounts_on_user_id  (user_id)
+#  index_adopter_foster_accounts_on_user_id  (user_id)
 #
 # Foreign Keys
 #
 #  fk_rails_...  (user_id => users.id)
 #
-class AdopterAccount < ApplicationRecord
+class AdopterFosterAccount < ApplicationRecord
   belongs_to :user
   has_one :adopter_foster_profile, dependent: :destroy
   has_many :adopter_applications, dependent: :destroy

app/models/adopter_foster_profile.rb

@@ -2,57 +2,57 @@
 #
 # Table name: adopter_foster_profiles
 #
-#  id                 :bigint           not null, primary key
-#  activities         :text
-#  adults_in_home     :integer
-#  alone_weekday      :integer
-#  alone_weekend      :integer
-#  annual_cost        :string
-#  checked_shelter    :boolean
-#  city_town          :string
-#  contact_method     :string
-#  contingency_plan   :text
-#  country            :string
-#  describe_pets      :text
-#  describe_surrender :text
-#  do_you_rent        :boolean
-#  experience         :text
-#  fenced_access      :boolean
-#  fenced_alternative :text
-#  housing_type       :string
-#  ideal_pet          :text
-#  kids_in_home       :integer
-#  lifestyle_fit      :text
-#  location_day       :text
-#  location_night     :text
-#  other_pets         :boolean
-#  pets_allowed       :boolean
-#  phone_number       :string
-#  province_state     :string
-#  referral_source    :text
-#  shared_owner       :text
-#  shared_ownership   :boolean
-#  surrendered_pet    :boolean
-#  visit_dates        :text
-#  visit_laventana    :boolean
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  adopter_account_id :bigint           not null
-#  location_id        :bigint           not null
+#  id                        :bigint           not null, primary key
+#  activities                :text
+#  adults_in_home            :integer
+#  alone_weekday             :integer
+#  alone_weekend             :integer
+#  annual_cost               :string
+#  checked_shelter           :boolean
+#  city_town                 :string
+#  contact_method            :string
+#  contingency_plan          :text
+#  country                   :string
+#  describe_pets             :text
+#  describe_surrender        :text
+#  do_you_rent               :boolean
+#  experience                :text
+#  fenced_access             :boolean
+#  fenced_alternative        :text
+#  housing_type              :string
+#  ideal_pet                 :text
+#  kids_in_home              :integer
+#  lifestyle_fit             :text
+#  location_day              :text
+#  location_night            :text
+#  other_pets                :boolean
+#  pets_allowed              :boolean
+#  phone_number              :string
+#  province_state            :string
+#  referral_source           :text
+#  shared_owner              :text
+#  shared_ownership          :boolean
+#  surrendered_pet           :boolean
+#  visit_dates               :text
+#  visit_laventana           :boolean
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  adopter_foster_account_id :bigint
+#  location_id               :bigint           not null
 #
 # Indexes
 #
-#  index_adopter_foster_profiles_on_adopter_account_id  (adopter_account_id)
-#  index_adopter_foster_profiles_on_location_id         (location_id)
+#  index_adopter_foster_profiles_on_adopter_foster_account_id  (adopter_foster_account_id)
+#  index_adopter_foster_profiles_on_location_id                (location_id)
 #
 # Foreign Keys
 #
-#  fk_rails_...  (adopter_account_id => adopter_accounts.id)
+#  fk_rails_...  (adopter_foster_account_id => adopter_foster_accounts.id)
 #  fk_rails_...  (location_id => locations.id)
 #
 class AdopterFosterProfile < ApplicationRecord
   belongs_to :location, dependent: :destroy
-  belongs_to :adopter_account
+  belongs_to :adopter_foster_account
   accepts_nested_attributes_for :location
   validates_associated :location
 

app/models/match.rb

@@ -2,28 +2,28 @@
 #
 # Table name: matches
 #
-#  id                 :bigint           not null, primary key
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  adopter_account_id :bigint           not null
-#  organization_id    :bigint           not null
-#  pet_id             :bigint           not null
+#  id                        :bigint           not null, primary key
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  adopter_foster_account_id :bigint
+#  organization_id           :bigint           not null
+#  pet_id                    :bigint           not null
 #
 # Indexes
 #
-#  index_matches_on_adopter_account_id  (adopter_account_id)
-#  index_matches_on_organization_id     (organization_id)
-#  index_matches_on_pet_id              (pet_id)
+#  index_matches_on_adopter_foster_account_id  (adopter_foster_account_id)
+#  index_matches_on_organization_id            (organization_id)
+#  index_matches_on_pet_id                     (pet_id)
 #
 # Foreign Keys
 #
-#  fk_rails_...  (adopter_account_id => adopter_accounts.id)
+#  fk_rails_...  (adopter_foster_account_id => adopter_foster_accounts.id)
 #  fk_rails_...  (pet_id => pets.id)
 #
 class Match < ApplicationRecord
   acts_as_tenant(:organization)
   belongs_to :pet
-  belongs_to :adopter_account
+  belongs_to :adopter_foster_account
 
   validate :belongs_to_same_organization_as_pet, if: -> { pet.present? }
 
@@ -50,6 +50,6 @@ def belongs_to_same_organization_as_pet
   end
 
   def adopter_application
-    AdopterApplication.find_by(pet:, adopter_account:)
+    AdopterApplication.find_by(pet:, adopter_foster_account:)
   end
 end

app/models/pet.rb

@@ -93,7 +93,7 @@ def self.org_pets(staff_org_id)
 
   # all pets under an organization with applications and no adoptions
   def self.org_pets_with_apps(staff_org_id)
-    Pet.org_pets(staff_org_id).includes(adopter_applications: [adopter_account: [:user]]).where
+    Pet.org_pets(staff_org_id).includes(adopter_applications: [adopter_foster_account: [:user]]).where
       .not(adopter_applications: {id: nil}).includes(:match)
       .where(match: {id: nil})
   end

app/models/user.rb

@@ -58,9 +58,9 @@ class User < ApplicationRecord
   #   allow_nil: false, on: :create
 
   has_one :staff_account, dependent: :destroy
-  has_one :adopter_account, dependent: :destroy
+  has_one :adopter_foster_account, dependent: :destroy
 
-  accepts_nested_attributes_for :adopter_account
+  accepts_nested_attributes_for :adopter_foster_account
 
   # get user accounts for staff in a given organization
   def self.organization_staff(org_id)

app/policies/adopter_application_policy.rb

@@ -5,7 +5,7 @@ class AdopterApplicationPolicy < ApplicationPolicy
   pre_check :verify_pet_appliable!, only: %i[create?]
 
   relation_scope do |relation|
-    relation.where(adopter_account_id: user.adopter_account.id)
+    relation.where(adopter_foster_account_id: user.adopter_foster_account.id)
   end
 
   def update?
@@ -23,18 +23,18 @@ def create?
   private
 
   def applicant?
-    user.id == record.adopter_account.user_id
+    user.id == record.adopter_foster_account.user_id
   end
 
   def already_applied?
-    user.adopter_account.adopter_applications.any? do |application|
+    user.adopter_foster_account.adopter_applications.any? do |application|
       application.pet_id == pet.id
     end
   end
 
   def verify_profile!
-    deny! unless user.adopter_account.present?
-    deny! unless user.adopter_account.adopter_foster_profile.present?
+    deny! unless user.adopter_foster_account.present?
+    deny! unless user.adopter_foster_account.adopter_foster_profile.present?
   end
 
   def verify_pet_appliable!

app/policies/adopter_foster_profile_policy.rb

@@ -10,10 +10,10 @@ def manage?
   private
 
   def no_profile?
-    user&.adopter_account&.adopter_foster_profile.nil?
+    user&.adopter_foster_account&.adopter_foster_profile.nil?
   end
 
   def owner?
-    user.id == record.adopter_account.user_id
+    user.id == record.adopter_foster_account.user_id
   end
 end

app/policies/profile_review_policy.rb

@@ -9,6 +9,6 @@ def show?
   private
 
   def organization
-    @organization || record.adopter_account.user.organization
+    @organization || record.adopter_foster_account.user.organization
   end
 end