Move methods from helper to summary component

app/components/bulk_upload_summary_component.html.erb

@@ -14,8 +14,8 @@
       </div>
       <p class="govuk-body govuk-!-margin-bottom-3">
         <%= download_file_link(controller, bulk_upload) %>
-        <%= view_error_report_link(bulk_upload) %>
+        <%#= view_error_report_link(bulk_upload) %>
-        <%= view_logs_link(bulk_upload) %>
+        <%#= view_logs_link(bulk_upload) %>
       </p>
     </div>
     <footer class="govuk-grid-column-one-third app-log-summary__footer">

app/components/bulk_upload_summary_component.rb

@@ -1,6 +1,4 @@
 class BulkUploadSummaryComponent < ViewComponent::Base
-  include BulkUploadHelper
-
   attr_reader :bulk_upload
 
   def initialize(bulk_upload:)
@@ -24,4 +22,47 @@ class BulkUploadSummaryComponent < ViewComponent::Base
   def potential_errors_count
     @bulk_upload_errors.where(category: "soft_validations").count
   end
+
+  def formatted_count_text(count, singular_text, plural_text = nil)
+    return if count.nil? || count <= 0
+
+    text = count > 1 ? (plural_text || singular_text.pluralize(count)) : singular_text
+    content_tag(:p, class: "govuk-!-font-size-16 govuk-!-margin-bottom-1") do
+      concat(content_tag(:strong, count))
+      concat(" #{text}")
+    end
+  end
+
+  def counts(*counts_with_texts)
+    counts_with_texts.map { |count, singular_text, plural_text|
+      formatted_count_text(count, singular_text, plural_text) if count.present?
+    }.compact.join("").html_safe
+  end
+
+  def download_file_link(controller, bulk_upload)
+    case controller.controller_name
+    when "lettings_logs"
+      download_lettings_file_link(bulk_upload)
+    when "sales_logs"
+      download_sales_file_link(bulk_upload)
+    else
+      raise "Download file link not found for bulk upload"
+    end
+  end
+
+  def download_lettings_file_link(bulk_upload)
+    link_to "Download file", download_lettings_bulk_upload_path(bulk_upload), class: "govuk-link govuk-!-margin-right-2"
+  end
+
+  def download_sales_file_link(bulk_upload)
+    link_to "Download file", download_sales_bulk_upload_path(bulk_upload), class: "govuk-link govuk-!-margin-right-2"
+  end
+
+  def view_error_report_link(bulk_upload)
+    link_to "View error report", "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/start", class: "govuk-link"
+  end
+
+  def view_logs_link(bulk_upload)
+    link_to "View logs", "#", class: "govuk-link"
+  end
 end

app/helpers/bulk_upload_helper.rb

@@ -10,57 +10,34 @@ module BulkUploadHelper
     end
   end
 
-  def bulk_upload_details(bulk_upload)
+  def bulk_upload_status(bulk_upload)
-    content_tag(:span) do
+    validator = validator_class(bulk_upload).new(bulk_upload: bulk_upload, path: bulk_upload.file_path)
-      concat("Uploaded by: #{bulk_upload.user.name} (#{bulk_upload.user.email})<br>".html_safe)
+
-      concat("Uploading organisation: #{bulk_upload.user.organisation.name}<br>".html_safe)
+    if validator.invalid?
-      concat("Time of upload: #{bulk_upload.created_at.to_formatted_s(:govuk_date)}".html_safe)
+      "The bulk upload has failed due to validation errors."
+    elsif validator.any_setup_errors?
+      "The bulk upload has setup errors."
+    elsif validator.soft_validation_errors_only?
+      "The bulk upload has soft validation errors."
+    elsif bulk_upload.logs.where.not(status_cache: %w[completed]).count.positive?
+      "The bulk upload has created logs but some are incomplete."
+    elsif bulk_upload.logs.group(:status_cache).count.keys == %w[completed]
+      "The bulk upload has successfully completed."
+    else
+      "The bulk upload status is unknown."
     end
   end
 
-  def formatted_count_text(count, singular_text, plural_text = nil)
+private
-    return if count.nil? || count <= 0
 
-    text = count > 1 ? (plural_text || singular_text.pluralize(count)) : singular_text
+  def validator_class(bulk_upload)
-    content_tag(:p, class: "govuk-!-font-size-16 govuk-!-margin-bottom-1") do
+    case bulk_upload.log_type
-      concat(content_tag(:strong, count))
+    when "lettings"
-      concat(" #{text}")
+      BulkUpload::Lettings::Validator
-    end
+    when "sales"
-  end
+      BulkUpload::Sales::Validator
-
-  def counts(*counts_with_texts)
-    counts_with_texts.map { |count, singular_text, plural_text|
-      formatted_count_text(count, singular_text, plural_text) if count.present?
-    }.compact.join("").html_safe
-  end
-
-  def download_file_link(controller, bulk_upload)
-    case controller.controller_name
-    when "lettings_logs"
-      download_lettings_file_link(bulk_upload)
-    when "sales_logs"
-      download_sales_file_link(bulk_upload)
     else
-      raise "Download file link not found for bulk upload"
+      raise "Validator not found for #{bulk_upload.log_type}"
     end
   end
-
-  def view_error_report_link
-    link_to "View error report", "#", class: "govuk-link"
-  def download_lettings_file_link(bulk_upload)
-    link_to "Download file", download_lettings_bulk_upload_path(bulk_upload), class: "govuk-link govuk-!-margin-right-2"
-  end
-
-  def download_sales_file_link(bulk_upload)
-    link_to "Download file", download_sales_bulk_upload_path(bulk_upload), class: "govuk-link govuk-!-margin-right-2"
-  end
-
-  def view_error_report_link(bulk_upload)
-    link_to "View error report", "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/start", class: "govuk-link"
-  end
-
-  def view_logs_link(bulk_upload)
-    link_to "View logs", "#", class: "govuk-link"
-  end
-
 end