Change matches table to handle adoptions and fosters (#655)

* Add migration for match_type to Matches

* Add enum to model and allow params in controller

* Update seeds with match_type

* Add match_type param to new adoption button

* Update tests with match_type

* Update policy tests with match_type

* Add test for enum validation

app/controllers/organizations/matches_controller.rb

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

app/models/match.rb

@@ -3,6 +3,9 @@
 # Table name: matches
 #
 #  id                        :bigint           not null, primary key
+#  end_date                  :datetime
+#  match_type                :integer          not null
+#  start_date                :datetime
 #  created_at                :datetime         not null
 #  updated_at                :datetime         not null
 #  adopter_foster_account_id :bigint           not null
@@ -30,6 +33,8 @@ class Match < ApplicationRecord
 
   after_create_commit :send_reminder
 
+  enum :match_type, [:adoption, :foster]
+
   def send_reminder
     MatchMailer.reminder(self).deliver_later
   end

app/views/organizations/pets/tabs/partials/_application_status.html.erb

@@ -30,7 +30,9 @@
       <!--create adoption button-->
       <%= button_to "New Adoption", matches_path, method: :post,
         params: {match:
-          {pet_id: app.pet_id, adopter_foster_account_id: app.adopter_foster_account_id}
+          {pet_id: app.pet_id, 
+           adopter_foster_account_id: app.adopter_foster_account_id,
+           match_type: :adoption}
         },
         class: "btn btn-outline-primary",
         data: { turbo_method: :post, 

db/migrate/20240418120309_add_match_type_to_matches.rb

@@ -0,0 +1,7 @@
+class AddMatchTypeToMatches < ActiveRecord::Migration[7.1]
+  def change
+    add_column :matches, :match_type, :integer, null: false
+    add_column :matches, :start_date, :datetime
+    add_column :matches, :end_date, :datetime
+  end
+end

db/seeds/01_alta.rb

@@ -258,7 +258,8 @@
 
   @match = Match.create!(
     pet_id: Pet.first.id,
-    adopter_foster_account_id: @adopter_foster_account_one.id
+    adopter_foster_account_id: @adopter_foster_account_one.id,
+    match_type: :adoption
   )
 
   10.times do

db/seeds/02_baja.rb

@@ -258,7 +258,8 @@
 
   @match = Match.create!(
     pet_id: Pet.first.id,
-    adopter_foster_account_id: @adopter_foster_account_one.id
+    adopter_foster_account_id: @adopter_foster_account_one.id,
+    match_type: :adoption
   )
 
   10.times do

test/controllers/organizations/matches_controller_test.rb

@@ -19,7 +19,8 @@ class Organizations::MatchesControllerTest < ActionDispatch::IntegrationTest
         @params = {
           match: {
             pet_id: pet.id,
-            adopter_foster_account_id: adopter_foster_account.id
+            adopter_foster_account_id: adopter_foster_account.id,
+            match_type: :adoption
           }
         }
       end
@@ -37,7 +38,7 @@ class Organizations::MatchesControllerTest < ActionDispatch::IntegrationTest
 
     context "#destroy" do
       setup do
-        @match = create(:match)
+        @match = create(:match, match_type: :adoption)
       end
 
       should "be authorized" do

test/factories/pets.rb

@@ -18,7 +18,7 @@
     end
 
     trait :adopted do
-      match { association :match, pet: instance }
+      match { association :match, pet: instance, match_type: :adoption }
       adopter_applications { build_list(:adopter_application, 1, :successful_applicant, pet: instance) }
     end
 

test/mailers/match_mailer_test.rb

@@ -2,7 +2,7 @@
 
 class MatchMailerTest < ActionMailer::TestCase
   test "reminder" do
-    match = create(:match)
+    match = create(:match, match_type: :adoption)
     email = MatchMailer.reminder(match)
 
     assert_emails 1 do

test/models/match_test.rb

@@ -8,6 +8,10 @@ class MatchTest < ActiveSupport::TestCase
     should belong_to(:adopter_foster_account)
   end
 
+  context "validations" do
+    should define_enum_for(:match_type)
+  end
+
   setup do
     @match = build_stubbed(:match)
   end

test/policies/organizations/match_policy_test.rb

@@ -101,7 +101,7 @@ class Organizations::MatchPolicyTest < ActiveSupport::TestCase
 
   context "#destroy?" do
     setup do
-      @match = create(:match)
+      @match = create(:match, match_type: :adoption)
       @policy = -> {
         Organizations::MatchPolicy.new(@match, user: @user)
       }
@@ -146,7 +146,7 @@ class Organizations::MatchPolicyTest < ActiveSupport::TestCase
       context "when match belongs to a different organization" do
         setup do
           ActsAsTenant.with_tenant(create(:organization)) do
-            @match = create(:match)
+            @match = create(:match, match_type: :adoption)
           end
         end
 
@@ -180,7 +180,7 @@ class Organizations::MatchPolicyTest < ActiveSupport::TestCase
       context "when match belongs to a different organization" do
         setup do
           ActsAsTenant.with_tenant(create(:organization)) do
-            @match = create(:match)
+            @match = create(:match, match_type: :adoption)
           end
         end