Extract a method

app/controllers/lettings_logs_controller.rb

@@ -1,5 +1,4 @@
 class LettingsLogsController < LogsController
-  include CollectionTimeHelper
   rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
 
   before_action :find_resource, only: %i[update show]
@@ -64,7 +63,7 @@ class LettingsLogsController < LogsController
 
     if @log.unresolved
       redirect_to(send(@log.form.unresolved_log_path, @log))
-    elsif @log.form.edit_end_date < Time.zone.now || (@log.startdate.present? && @log.startdate < previous_collection_start_date)
+    elsif @log.collection_closed_for_editing?
       redirect_to review_lettings_log_path(@log)
     else
       render("logs/edit", locals: { current_user: })

app/controllers/sales_logs_controller.rb

@@ -1,6 +1,5 @@
 class SalesLogsController < LogsController
   rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
-  include CollectionTimeHelper
 
   before_action :session_filters, if: :current_user, only: %i[index email_csv download_csv]
   before_action -> { filter_manager.serialize_filters_to_session }, if: :current_user, only: %i[index email_csv download_csv]
@@ -38,7 +37,7 @@ class SalesLogsController < LogsController
 
   def edit
     @log = current_user.sales_logs.visible.find(params[:id])
-    if @log.form.edit_end_date < Time.zone.now || (@log.saledate.present? && @log.saledate < previous_collection_start_date)
+    if @log.collection_closed_for_editing?
       redirect_to review_sales_log_path(@log, sales_log: true)
     else
       render "logs/edit", locals: { current_user: }

app/models/log.rb

@@ -186,6 +186,10 @@ class Log < ApplicationRecord
     bulk_upload_id.present?
   end
 
+  def collection_closed_for_editing?
+    form.edit_end_date < Time.zone.now || older_than_previous_collection_year?
+  end
+
 private
 
   # Handle logs that are older than previous collection start date