more scoping to flow

Author: millerti

app/app/controllers/activities/activities_controller.rb

@@ -4,14 +4,14 @@ def index
     # on creation. If you exit out of an activity flow in the middle before you save from the
     # Review page, we should delete all the records that were not completed. This results in no
     # visible changes when the user returns to the Activity Hub.
-    if session[:creating_activity]
+    if session[:creating_activity] && session[:creating_activity]["activity_flow_id"] == @flow.id
       activity_class = session[:creating_activity]["class_name"].safe_constantize
-      activity_class&.find_by(id: session[:creating_activity]["id"], activity_flow_id: @flow.id)&.destroy
+      activity_class&.find_by(id: session[:creating_activity]["id"])&.destroy
       session.delete(:creating_activity)
     end
 
-    if session[:creating_payroll_account]
-      @flow.payroll_accounts.find_by(aggregator_account_id: session[:creating_payroll_account])&.destroy
+    if session[:creating_payroll_account] && session[:creating_payroll_account]["flow_id"] == @flow.id
+      @flow.payroll_accounts.find_by(aggregator_account_id: session[:creating_payroll_account]["aggregator_account_id"])&.destroy
       session.delete(:creating_payroll_account)
     end
 

app/app/controllers/activities/base_controller.rb

@@ -43,15 +43,15 @@ def progress_calculator
   end
 
   def track_creating_activity(activity)
-    session[:creating_activity] = { "class_name" => activity.class.name, "id" => activity.id }
+    session[:creating_activity] = { "class_name" => activity.class.name, "id" => activity.id, "activity_flow_id" => activity.activity_flow_id }
   end
 
   def clear_creating_activity
     session.delete(:creating_activity)
   end
 
   def track_creating_payroll_account(aggregator_account_id)
-    session[:creating_payroll_account] = aggregator_account_id
+    session[:creating_payroll_account] = { "aggregator_account_id" => aggregator_account_id, "flow_id" => @flow.id }
   end
 
   def clear_creating_payroll_account

app/spec/controllers/activities/activities_controller_spec.rb

@@ -57,7 +57,7 @@
 
     it "destroys the tracked incomplete activity on hub visit" do
       activity = create(:volunteering_activity, activity_flow: current_flow)
-      session[:creating_activity] = { "class_name" => "VolunteeringActivity", "id" => activity.id }
+      session[:creating_activity] = { "class_name" => "VolunteeringActivity", "id" => activity.id, "activity_flow_id" => current_flow.id }
 
       expect { get :index }.to change(VolunteeringActivity, :count).by(-1)
       expect(session[:creating_activity]).to be_nil
@@ -69,32 +69,41 @@
       expect { get :index }.not_to change(VolunteeringActivity, :count)
     end
 
-    it "does not destroy an activity belonging to a different flow" do
+    it "does not destroy an activity belonging to a different flow and preserves session" do
       other_flow = create(:activity_flow)
       activity = create(:volunteering_activity, activity_flow: other_flow)
-      session[:creating_activity] = { "class_name" => "VolunteeringActivity", "id" => activity.id }
+      session[:creating_activity] = { "class_name" => "VolunteeringActivity", "id" => activity.id, "activity_flow_id" => other_flow.id }
 
       expect { get :index }.not_to change(VolunteeringActivity, :count)
-      expect(session[:creating_activity]).to be_nil
+      expect(session[:creating_activity]).to be_present
     end
 
     it "handles an already-deleted activity gracefully" do
-      session[:creating_activity] = { "class_name" => "VolunteeringActivity", "id" => -1 }
+      session[:creating_activity] = { "class_name" => "VolunteeringActivity", "id" => -1, "activity_flow_id" => current_flow.id }
 
       expect { get :index }.not_to raise_error
       expect(session[:creating_activity]).to be_nil
     end
 
     it "destroys a tracked incomplete payroll account on hub visit" do
       payroll_account = create(:payroll_account, :pinwheel_fully_synced, flow: current_flow)
-      session[:creating_payroll_account] = payroll_account.aggregator_account_id
+      session[:creating_payroll_account] = { "aggregator_account_id" => payroll_account.aggregator_account_id, "flow_id" => current_flow.id }
 
       expect { get :index }.to change(current_flow.payroll_accounts, :count).by(-1)
       expect(session[:creating_payroll_account]).to be_nil
     end
 
+    it "does not destroy a payroll account tracked for a different flow and preserves session" do
+      other_flow = create(:activity_flow)
+      payroll_account = create(:payroll_account, :pinwheel_fully_synced, flow: other_flow)
+      session[:creating_payroll_account] = { "aggregator_account_id" => payroll_account.aggregator_account_id, "flow_id" => other_flow.id }
+
+      expect { get :index }.not_to change(PayrollAccount, :count)
+      expect(session[:creating_payroll_account]).to be_present
+    end
+
     it "handles an already-deleted payroll account gracefully" do
-      session[:creating_payroll_account] = "nonexistent-account-id"
+      session[:creating_payroll_account] = { "aggregator_account_id" => "nonexistent-account-id", "flow_id" => current_flow.id }
 
       expect { get :index }.not_to raise_error
       expect(session[:creating_payroll_account]).to be_nil

app/spec/controllers/activities/education_controller_spec.rb

@@ -45,7 +45,7 @@
       post :create
 
       activity = EducationActivity.last
-      expect(session[:creating_activity]).to eq("class_name" => "EducationActivity", "id" => activity.id)
+      expect(session[:creating_activity]).to eq("class_name" => "EducationActivity", "id" => activity.id, "activity_flow_id" => activity_flow.id)
     end
 
     it "creates a self-attested EducationActivity and redirects to month 0" do
@@ -63,7 +63,7 @@
       post :create, params: { education_activity: { school_name: "Test University", city: "Springfield", state: "IL", zip_code: "62701", street_address: "123 Main St" } }
 
       activity = EducationActivity.last
-      expect(session[:creating_activity]).to eq("class_name" => "EducationActivity", "id" => activity.id)
+      expect(session[:creating_activity]).to eq("class_name" => "EducationActivity", "id" => activity.id, "activity_flow_id" => activity_flow.id)
     end
 
     it "re-renders the form when self-attested params are invalid" do

app/spec/controllers/activities/employment_controller_spec.rb

@@ -94,7 +94,7 @@
       post :create, params: employment_params
 
       activity = activity_flow.employment_activities.last
-      expect(session[:creating_activity]).to eq("class_name" => "EmploymentActivity", "id" => activity.id)
+      expect(session[:creating_activity]).to eq("class_name" => "EmploymentActivity", "id" => activity.id, "activity_flow_id" => activity_flow.id)
     end
   end
 

app/spec/controllers/activities/income/synchronizations_controller_spec.rb

@@ -17,7 +17,7 @@
     it "tracks the payroll account in the session" do
       get :show, params: { user: { account_id: payroll_account.aggregator_account_id } }
 
-      expect(session[:creating_payroll_account]).to eq(payroll_account.aggregator_account_id)
+      expect(session[:creating_payroll_account]).to eq("aggregator_account_id" => payroll_account.aggregator_account_id, "flow_id" => flow.id)
     end
   end
 

app/spec/controllers/activities/job_training_controller_spec.rb

@@ -55,7 +55,7 @@
       post :create, params: job_training_params
 
       activity = activity_flow.job_training_activities.last
-      expect(session[:creating_activity]).to eq("class_name" => "JobTrainingActivity", "id" => activity.id)
+      expect(session[:creating_activity]).to eq("class_name" => "JobTrainingActivity", "id" => activity.id, "activity_flow_id" => activity_flow.id)
     end
 
     it "redirects to month 0 when total hours are below the threshold" do

app/spec/controllers/activities/volunteering_controller_spec.rb

@@ -48,7 +48,7 @@
       post :create, params: volunteering_params
 
       activity = activity_flow.volunteering_activities.last
-      expect(session[:creating_activity]).to eq("class_name" => "VolunteeringActivity", "id" => activity.id)
+      expect(session[:creating_activity]).to eq("class_name" => "VolunteeringActivity", "id" => activity.id, "activity_flow_id" => activity_flow.id)
     end
 
     it "stores optional fields when provided" do