From 5cbf7b28727c10e102a09f4e6adeaf9727ad1ae6 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Fri, 27 Sep 2024 18:29:00 +0100 Subject: [PATCH] Reorder status logic --- app/models/bulk_upload.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/bulk_upload.rb b/app/models/bulk_upload.rb index 7b34b4e81..30d1d6f7b 100644 --- a/app/models/bulk_upload.rb +++ b/app/models/bulk_upload.rb @@ -46,7 +46,6 @@ class BulkUpload < ApplicationRecord def status return :blank_template if failed == "blank_template" return :wrong_template if failed == "wrong_template" - return :logs_uploaded_no_errors if bulk_upload_errors.none? if logs.visible.exists? return :errors_fixed_in_service if completed? && bulk_upload_errors.any? @@ -55,10 +54,12 @@ class BulkUpload < ApplicationRecord if bulk_upload_errors.any? { |error| error.category == "setup" } :important_errors + elsif bulk_upload_errors.any? { |error| error.category.nil? || error.category == "not_answered" } + :critical_errors elsif bulk_upload_errors.any? { |error| error.category == "soft_validation" } :potential_errors else - :critical_errors + :logs_uploaded_no_errors end end