From 4a8da65a4d0fcfe6e4dac6729fee2e1368457dd9 Mon Sep 17 00:00:00 2001
From: Matthew Phelan <matthew.phelan@madetech.com>
Date: Thu, 7 Oct 2021 12:25:27 +0100
Subject: [PATCH] Dynamically passing question to validator

---
 app/controllers/case_logs_controller.rb |  1 +
 app/models/case_log.rb                  | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index 40a88a8ca..a14adf2e9 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -26,6 +26,7 @@ class CaseLogsController < ApplicationController
     previous_page = params[:case_log][:previous_page]
     questions_for_page = form.questions_for_page(previous_page).keys
     answers_for_page = page_params(questions_for_page).select { |k, _v| questions_for_page.include?(k) }
+    @case_log.custom_validator_options = { previous_page: previous_page }
     if @case_log.update(answers_for_page)
       redirect_path = form.next_page_redirect_path(previous_page)
       redirect_to(send(redirect_path, @case_log))
diff --git a/app/models/case_log.rb b/app/models/case_log.rb
index d4321572c..d56dba600 100644
--- a/app/models/case_log.rb
+++ b/app/models/case_log.rb
@@ -1,6 +1,9 @@
 class CaseLogValidator < ActiveModel::Validator
+
   def validate_tenant_age(record)
-    if record.tenant_age < 0
+    if !record.tenant_age?
+      record.errors.add :base, "Tenant age can't be blank"
+    elsif record.tenant_age < 0
       record.errors.add :base, "Age needs to be above 0"
     elsif record.tenant_age > 120
       record.errors.add :base, "Age needs to be below 120"
@@ -8,13 +11,23 @@ class CaseLogValidator < ActiveModel::Validator
   end
 
   def validate(record)
-    if record.tenant_age?
-      validate_tenant_age(record)
+    question_to_validate = options[:previous_page]
+
+    if question_to_validate == "tenant_code"
+      if !record.tenant_code?
+        record.errors.add :base, "Tenant code can't be blank"
+      end
+    elsif question_to_validate == "tenant_age"
+        validate_tenant_age(record)
     end
   end
 end
 
-class CaseLog < ApplicationRecord
+class CaseLog < ApplicationRecord 
+  validate :instance_validations
+  attr_accessor :custom_validator_options
   enum status: { "in progress" => 0, "submitted" => 1 }
-  validates_with CaseLogValidator
+  def instance_validations
+    validates_with CaseLogValidator, (custom_validator_options || {})
+  end
 end