From 8c00ef77ca68fb3064bf462655f01eec5aff28f1 Mon Sep 17 00:00:00 2001 From: Misha Gorodnitzky Date: Mon, 30 Mar 2026 11:36:17 +0100 Subject: [PATCH] Rename processed? to processed_at? Jira-issue: MAV-6746 --- app/components/app_import_summary_component.html.erb | 2 +- app/controllers/class_imports_controller.rb | 2 +- app/controllers/cohort_imports_controller.rb | 2 +- app/jobs/process_patient_changeset_job.rb | 2 +- app/models/concerns/csv_importable.rb | 6 +----- app/views/imports/show.html.erb | 2 +- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/components/app_import_summary_component.html.erb b/app/components/app_import_summary_component.html.erb index ca09254b15..93ebbfbe62 100644 --- a/app/components/app_import_summary_component.html.erb +++ b/app/components/app_import_summary_component.html.erb @@ -68,7 +68,7 @@ import.parent_relationships.present? %> <% if import.removing_parent_relationships? %>

Parent-child relationships are currently being removed from this import

- <% elsif import.processed? && import.parent_relationships.any? %> + <% elsif import.processed_at? && import.parent_relationships.any? %>

<%= link_to "Remove all parent-child relationships from import", imports_bulk_remove_parents_path(import.class.name.underscore, import.id) %>

diff --git a/app/controllers/class_imports_controller.rb b/app/controllers/class_imports_controller.rb index ff10481a78..7b18fb8e28 100644 --- a/app/controllers/class_imports_controller.rb +++ b/app/controllers/class_imports_controller.rb @@ -49,7 +49,7 @@ def show redirect_to re_review_class_import_path(@class_import) and return end - if @class_import.processed? || @class_import.partially_processed? + if @class_import.processed_at? || @class_import.partially_processed? @pagy, @patients = pagy(@class_import.patients.includes(:school)) @duplicates = diff --git a/app/controllers/cohort_imports_controller.rb b/app/controllers/cohort_imports_controller.rb index 0b46990875..c468c26db5 100644 --- a/app/controllers/cohort_imports_controller.rb +++ b/app/controllers/cohort_imports_controller.rb @@ -48,7 +48,7 @@ def show redirect_to re_review_cohort_import_path(@cohort_import) and return end - if @cohort_import.processed? || @cohort_import.partially_processed? + if @cohort_import.processed_at? || @cohort_import.partially_processed? @pagy, @patients = pagy(@cohort_import.patients.includes(:school)) @duplicates = diff --git a/app/jobs/process_patient_changeset_job.rb b/app/jobs/process_patient_changeset_job.rb index 0176af93b1..bcacc6f22c 100644 --- a/app/jobs/process_patient_changeset_job.rb +++ b/app/jobs/process_patient_changeset_job.rb @@ -5,7 +5,7 @@ class ProcessPatientChangesetJob < ApplicationJob def perform(patient_changeset_id) patient_changeset = PatientChangeset.find(patient_changeset_id) - return if patient_changeset.processed? + return if patient_changeset.processed_at? unique_nhs_number = get_unique_nhs_number(patient_changeset) if unique_nhs_number diff --git a/app/models/concerns/csv_importable.rb b/app/models/concerns/csv_importable.rb index 7fb7a6a63d..bd03e6f9a8 100644 --- a/app/models/concerns/csv_importable.rb +++ b/app/models/concerns/csv_importable.rb @@ -141,10 +141,6 @@ def parse_rows! end end - def processed? - processed_at != nil - end - def remove! return if csv_removed? update!(csv_data: nil, csv_removed_at: Time.zone.now) @@ -218,7 +214,7 @@ def count_columns end def ensure_processed_with_count_statistics - if processed? && count_columns.any? { |column| send(column).nil? } + if processed_at? && count_columns.any? { |column| send(column).nil? } raise "Count statistics must be set for a processed import." end end diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb index b1a52a34c5..dbc88dd823 100644 --- a/app/views/imports/show.html.erb +++ b/app/views/imports/show.html.erb @@ -77,7 +77,7 @@ ) %> <% end %> -<% if import.processed? || import.partially_processed? || import.removing_parent_relationships? %> +<% if import.processed_at? || import.partially_processed? || import.removing_parent_relationships? %> <% if @cancelled.present? %>