extracted regex into initializer - part 2

3 years ago · f76d854ec1
3 changed files with 1 additions and 3 deletions
--- a/app/models/case_log.rb
+++ b/app/models/case_log.rb
@ -585,7 +585,7 @@ private

  def get_inferred_la(postcode)
    # Avoid network calls when postcode is invalid
-    return unless postcode.match(Validations::PropertyValidations::POSTCODE_REGEXP)
+    return unless postcode.match(POSTCODE_REGEXP)

    postcode_lookup = nil
    begin
--- a/app/models/validations/local_authority_validations.rb
+++ b/app/models/validations/local_authority_validations.rb
@ -1,5 +1,4 @@
 module Validations::LocalAuthorityValidations
-  POSTCODE_REGEXP = Validations::PropertyValidations::POSTCODE_REGEXP

  def validate_previous_accommodation_postcode(record)
    postcode = record.ppostcode_full
--- a/app/services/imports/case_logs_import_service.rb
+++ b/app/services/imports/case_logs_import_service.rb
@ -417,7 +417,6 @@ module Imports
      end
    end

-    POSTCODE_REGEXP = Validations::PropertyValidations::POSTCODE_REGEXP
    def compose_postcode(xml_doc, outcode, incode)
      outcode_value = string_or_nil(xml_doc, outcode)
      incode_value = string_or_nil(xml_doc, incode)