509 bug recurring pet task (#518)

* commit annotation change

* add tests for completing a recurring task with a due date

* update task update action to not remove next due in days when completing task

app/controllers/organizations/tasks_controller.rb

@@ -24,7 +24,7 @@ def edit
   end
 
   def update
-    @task.next_due_date_in_days = nil unless task_params.dig(:next_due_date_in_days)
+    @task.next_due_date_in_days = nil unless task_params.dig(:next_due_date_in_days) || task_params.dig(:completed)
 
     if @task.update(task_params)
       if @task.recurring && @task.completed_previously_changed?(from: false, to: true)

app/models/adopter_foster_profile.rb

@@ -42,8 +42,8 @@
 #
 # Indexes
 #
-#  index_adopter_profiles_on_adopter_account_id  (adopter_account_id)
-#  index_adopter_profiles_on_location_id         (location_id)
+#  index_adopter_foster_profiles_on_adopter_account_id  (adopter_account_id)
+#  index_adopter_foster_profiles_on_location_id         (location_id)
 #
 # Foreign Keys
 #

test/controllers/organizations/tasks_controller_test.rb

@@ -135,7 +135,7 @@ class TasksControllerTest < ActionDispatch::IntegrationTest
     assert_turbo_stream action: "remove", target: @task
   end
 
-  test "should create a new task when recurring task is completed" do
+  test "should create a new task when recurring task without due date is completed" do
     task = create(:task, pet: @pet, recurring: true)
 
     assert_difference "Task.count", 1 do
@@ -147,6 +147,18 @@ class TasksControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "should create a new task when recurring task with due date is completed" do
+    task = create(:task, pet: @pet, recurring: true, due_date: Date.today + 2, next_due_date_in_days: 4)
+
+    assert_difference "Task.count", 1 do
+      patch pet_task_path(@pet, task, format: :turbo_stream), params: {
+        task: {
+          completed: true
+        }
+      }
+    end
+  end
+
   test "should not create a new task if non-recurring task is completed" do
     task = create(:task, pet: @pet, recurring: false)
 

test/system/tasks_test.rb

@@ -39,7 +39,7 @@ class TasksTest < ApplicationSystemTestCase
     assert has_current_path?(pet_path(@pet, active_tab: "tasks"))
   end
 
-  test "marking a recurring task as complete creates and displays a new task without redirecting" do
+  test "marking a recurring task without due date as complete creates and displays a new task without redirecting" do
     recurring_task = create(:task, recurring: true, pet: @pet, name: "recurring task")
 
     visit pet_path(@pet, active_tab: "tasks")
@@ -52,6 +52,20 @@ class TasksTest < ApplicationSystemTestCase
     assert has_current_path?(pet_path(@pet, active_tab: "tasks"))
   end
 
+  test "marking a recurring task with due date as complete creates and displays a new task without redirecting" do
+    due_date = (Date.today + 2.days)
+    recurring_task_with_due_date = create(:task, recurring: true, pet: @pet, name: "recurring task with due date", due_date: due_date, next_due_date_in_days: 4)
+
+    visit pet_path(@pet, active_tab: "tasks")
+
+    within("#edit_task_#{recurring_task_with_due_date.id}") do
+      check "task_completed"
+    end
+
+    assert_text("recurring task with due date", count: 2)
+    assert has_current_path?(pet_path(@pet, active_tab: "tasks"))
+  end
+
   test "doesn't incomplete completed recurring task" do
     recurring_task = create(:task, recurring: true, completed: true, pet: @pet, name: "completed recurring task")
     visit pet_path(@pet, active_tab: "tasks")