fix: avoid deleting manual assignments while syncing demand

TallerWebSolutions · Dec 19, 2024 · e1e1e53 · e1e1e53
1 parent a8d38d8
commit e1e1e53
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/controllers/demands_controller.rb b/app/controllers/demands_controller.rb
@@ -105,7 +105,7 @@ def demand_efforts
   private
 
   def clean_assignments_efforts
-    @demand.item_assignments.destroy_all
+    @demand.item_assignments.joins(:demand_efforts).where(demand_efforts: { automatic_update: true }).destroy_all
     @demand.demand_efforts.where(automatic_update: true).destroy_all
   end
 

diff --git a/spec/controllers/demands_controller_spec.rb b/spec/controllers/demands_controller_spec.rb
@@ -385,8 +385,10 @@
           it 'calls the services and the reader' do
             first_assignment = Fabricate :item_assignment, demand: first_demand
             second_assignment = Fabricate :item_assignment, demand: first_demand
-            first_effort = Fabricate :demand_effort, demand: first_demand
-            other_effort = Fabricate :demand_effort, demand: first_demand
+            manual_assignment = Fabricate :item_assignment, demand: first_demand
+            first_effort = Fabricate :demand_effort, demand: first_demand, automatic_update: true, item_assignment: first_assignment
+            other_effort = Fabricate :demand_effort, demand: first_demand, automatic_update: true, item_assignment: second_assignment
+            manual_effort = Fabricate :demand_effort, demand: first_demand, automatic_update: false, item_assignment: manual_assignment
 
             expect(Jira::ProcessJiraIssueJob).to receive(:perform_later)
             put :synchronize_jira, params: { company_id: company, id: first_demand }
@@ -396,6 +398,8 @@
 
             expect(first_demand.reload.item_assignments).not_to include(first_assignment, second_assignment)
             expect(first_demand.demand_efforts).not_to include(first_effort, other_effort)
+            expect(first_demand.demand_efforts).to include(manual_effort)
+            expect(first_demand.item_assignments).to include(manual_assignment)
           end
         end
       end