Merge pull request #4803 from nhsuk/fix-timeline-compare-options

Fix comparing timeline of patient to another patient from import

Author: murugapl

app/controllers/inspect/timeline/patients_controller.rb

@@ -96,14 +96,17 @@ def sample_patient(compare_option)
 
     case compare_option
     when "class_import"
-      class_import = params[:compare_option_class_import]
-      class_import.patients.where.not(id: @patient.id).sample
+      class_import = ClassImport.find(params[:compare_option_class_import])
+      id = class_import.patients.where.not(id: @patient.id).pluck(:id).sample
+      Patient.find(id)
     when "cohort_import"
-      cohort_import = params[:compare_option_cohort_import]
-      cohort_import.patients.where.not(id: @patient.id).sample
+      cohort_import = CohortImport.find(params[:compare_option_cohort_import])
+      id = cohort_import.patients.where.not(id: @patient.id).pluck(:id).sample
+      Patient.find(id)
     when "session"
       session = Session.find(params[:compare_option_session])
-      session.patients.where.not(id: @patient.id).sample
+      id = session.patients.where.not(id: @patient.id).pluck(:id).sample
+      Patient.find(id)
     when "manual_entry"
       begin
         Patient.find(params[:manual_patient_id])

app/lib/timeline_records.rb

@@ -157,8 +157,8 @@ def render_timeline(*event_names, truncate_columns: false)
   end
 
   def additional_events(patient)
-    patient_imports = patient_events(patient)[:class_imports]
-    patient_sessions = patient_events(patient)[:sessions]
+    patient_imports = @patient_events[:class_imports]
+    patient_sessions = @patient_events[:sessions]
     patient_locations =
       Location.joins(:sessions).where(sessions: { id: patient_sessions })
     class_imports = ClassImport.where(location_id: patient_locations)
@@ -168,22 +168,22 @@ def additional_events(patient)
     {
       class_imports:
         class_imports
-          .group_by(&:location_id)
-          .transform_values { |imports| imports.map(&:id) },
+          .pluck(:location_id, :id)
+          .group_by(&:first)
+          .transform_values { |ids| ids.map(&:last) },
       cohort_imports:
-        patient
-          .teams
-          .flat_map(&:cohort_imports)
-          .map(&:id)
-          .reject { |id| patient_events(patient)[:cohort_imports].include?(id) }
+        CohortImport
+          .where(team_id: patient.teams.select(:id))
+          .where.not(id: @patient_events[:cohort_imports])
+          .pluck(:id)
     }
   end
 
   def patient_events(patient)
     {
-      class_imports: patient.class_imports.map(&:id),
-      cohort_imports: patient.cohort_imports.map(&:id),
-      sessions: patient.sessions.map(&:id)
+      class_imports: patient.class_imports.pluck(:id),
+      cohort_imports: patient.cohort_imports.pluck(:id),
+      sessions: patient.sessions.pluck(:id)
     }
   end
 

spec/lib/timeline_records_spec.rb

@@ -517,7 +517,7 @@
       it "returns cohort imports that the patient is not in, for teams that the patient is in" do
         result = timeline.additional_events(patient)
         expect(result[:cohort_imports]).to eq(
-          cohort_imports_without_patient.map(&:id)
+          cohort_imports_without_patient.pluck(:id)
         )
       end
     end
@@ -547,14 +547,14 @@
 
       it "returns an array of class import IDs" do
         result = timeline.patient_events(patient)
-        expect(result[:class_imports]).to eq(class_imports.map(&:id))
+        expect(result[:class_imports]).to eq(class_imports.pluck(:id))
       end
     end
 
     context "with cohort imports" do
       it "returns an array of cohort import IDs" do
         result = timeline.patient_events(patient)
-        expect(result[:cohort_imports]).to eq(cohort_imports.map(&:id))
+        expect(result[:cohort_imports]).to eq(cohort_imports.pluck(:id))
       end
     end
   end