From 3420ecde8f41f253a04ef229e189cb63f5a8c716 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 10 Nov 2021 09:21:46 +0000 Subject: [PATCH] refactor infered poscode method --- app/models/case_log.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 73940008b..4d1d40097 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -38,6 +38,7 @@ class CaseLog < ApplicationRecord include Discard::Model include SoftValidations include DbEnums + require "uk_postcode" default_scope -> { kept } scope :not_completed, -> { where.not(status: "completed") } @@ -139,25 +140,25 @@ class CaseLog < ApplicationRecord def postcode if property_postcode.present? - get_inferred_postcode(property_postcode).outcode + UKPostcode.parse(property_postcode).outcode end end def postcod2 if property_postcode.present? - get_inferred_postcode(property_postcode).incode + UKPostcode.parse(property_postcode).incode end end def ppostc1 if previous_postcode.present? - get_inferred_postcode(previous_postcode).outcode + UKPostcode.parse(previous_postcode).outcode end end def ppostc2 if previous_postcode.present? - get_inferred_postcode(previous_postcode).incode + UKPostcode.parse(previous_postcode).incode end end @@ -169,11 +170,6 @@ class CaseLog < ApplicationRecord private - def get_inferred_postcode(postcode) - require "uk_postcode" - UKPostcode.parse(postcode) - end - def update_status! self.status = if all_fields_completed? && errors.empty? "completed"