Number of small Rubocop fixings and refactorings.

Author: fspeirs

app/controllers/admin/school_import_results_controller.rb

@@ -53,7 +53,7 @@ def new
 
     def create
       if params[:csv_file].blank?
-        flash[:error] = 'CSV file is required'
+        flash[:error] = I18n.t('errors.admin.csv_file_required')
         redirect_to new_admin_school_import_result_path
         return
       end
@@ -140,9 +140,9 @@ def fetch_users_batch(user_ids)
       return {} if user_ids.empty?
 
       users = UserInfoApiClient.fetch_by_ids(user_ids)
-      users.index_by do |user|
-        user[:id]
-      end
+      return {} if users.nil?
+
+      users.index_by { |user| user[:id] }
     rescue StandardError => e
       Rails.logger.error("Failed to batch fetch user info: #{e.message}")
       {}

app/fields/status_field.rb

@@ -13,24 +13,32 @@ def job_status
     job = GoodJob::Job.find_by(active_job_id: data)
     return 'not_found' unless job
 
-    return 'discarded' if job.discarded?
-    return 'succeeded' if job.succeeded?
-    return 'failed' if job.finished? && job.error.present?
-    return 'running' if job.running?
-    return 'scheduled' if job.scheduled_at.present? && job.scheduled_at > Time.current
-
-    'queued'
+    determine_job_status(job)
   end
 
   def status_class
     case job_status
-    when 'succeeded' then 'status-completed'
-    when 'completed' then 'status-completed'
-    when 'failed' then 'status-failed'
-    when 'discarded' then 'status-failed'
+    when 'succeeded', 'completed' then 'status-completed'
+    when 'failed', 'discarded' then 'status-failed'
     when 'running' then 'status-running'
     when 'queued', 'scheduled' then 'status-queued'
     else 'status-unknown'
     end
   end
+
+  private
+
+  def determine_job_status(job)
+    return 'discarded' if job.discarded?
+    return 'succeeded' if job.succeeded?
+    return 'failed' if job.finished? && job.error.present?
+    return 'running' if job.running?
+    return 'scheduled' if scheduled?(job)
+
+    'queued'
+  end
+
+  def scheduled?(job)
+    job.scheduled_at.present? && job.scheduled_at > Time.current
+  end
 end

config/locales/en.yml

@@ -2,6 +2,7 @@ en:
   errors:
     admin:
       unauthorized: "Not authorized."
+      csv_file_required: "A CSV file is required."
     project:
       editing:
         delete_default_component: "Cannot delete default file"

spec/requests/admin/school_import_results_spec.rb

@@ -3,10 +3,10 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin::SchoolImportResults' do
-  let(:admin_user) { create(:user, roles: 'editor-admin') }
+  let(:admin_user) { create(:admin_user) }
 
   before do
-    allow_any_instance_of(Admin::ApplicationController).to receive(:current_user).and_return(admin_user)
+    sign_in_as(admin_user)
 
     # Stub UserInfoApiClient to avoid external API calls
     allow(UserInfoApiClient).to receive(:fetch_by_ids).and_return([
@@ -25,7 +25,7 @@
     end
 
     context 'with existing import results' do
-      let!(:import_result) do
+      before do
         SchoolImportResult.create!(
           job_id: SecureRandom.uuid,
           user_id: admin_user.id,
@@ -175,12 +175,19 @@
     let(:non_admin_user) { create(:user, roles: nil) }
 
     before do
-      allow_any_instance_of(Admin::ApplicationController).to receive(:current_user).and_return(non_admin_user)
+      sign_in_as(non_admin_user)
     end
 
     it 'redirects non-admin users' do
       get admin_school_import_results_path
       expect(response).to redirect_to('/')
     end
   end
+
+  private
+
+  def sign_in_as(user)
+    allow(User).to receive(:from_omniauth).and_return(user)
+    get '/auth/callback'
+  end
 end