From 24141331ba8bc8c16666631c5dc09bb7558c5e85 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Tue, 19 Sep 2023 14:40:48 +0100
Subject: [PATCH] feat: update status before validation to prevent issue in
 future

---
 app/models/log.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/log.rb b/app/models/log.rb
index 024470b21..ce87ba975 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -8,7 +8,7 @@ class Log < ApplicationRecord
   belongs_to :updated_by, class_name: "User", optional: true
   belongs_to :bulk_upload, optional: true
 
-  before_save :update_status!
+  before_validation :update_status!
 
   STATUS = {
     "not_started" => 0,
@@ -188,6 +188,12 @@ class Log < ApplicationRecord
     form.edit_end_date < Time.zone.now || older_than_previous_collection_year?
   end
 
+  def update_status!
+    return if skip_update_status
+
+    self.status = calculate_status
+  end
+
 private
 
   # Handle logs that are older than previous collection start date
@@ -208,12 +214,6 @@ private
     end
   end
 
-  def update_status!
-    return if skip_update_status
-
-    self.status = calculate_status
-  end
-
   def all_subsections_completed?
     form.subsections.all? { |subsection| subsection.complete?(self) || subsection.not_displayed_in_tasklist?(self) }
   end