egov_utils 1.5.0.alpha16 → 1.5.0.alpha17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42577786177c1af8817f136fe3f860c925d2cd91540f49e17dc11b2fe3635397
-  data.tar.gz: fbb299d6905f40c3102c22cb28403ff3c5c0ffd032fb1de7934d30de40c3bf92
+  metadata.gz: f2d9c2f0865a844342b3e80729356354092681e4f680bb90de22e68259258ed2
+  data.tar.gz: 6c47f3787cee7fb3415422500b5591a9fead43ac07b43b3f4a6fa57dde705a5a
 SHA512:
-  metadata.gz: 966c54f84cf6b291350dc61a80369541fef8dc322346d2c4fffef384a07cfd37ae74a30165ab626e8d538168927f50ec79cbfb29656c7f964dd7f21c575f037a
-  data.tar.gz: d315fe2d9a406873884bf5a3d88970b843653bf9fa5ce6254851f79fe83947e2b73b95a3bb76700d928d95606079823b92242d26ae7faea646294128e8ccd892
+  metadata.gz: a006382752a2064a135b8c66df67c022600b67d57b5ea51c29395b65efe0ba86f7ed5afb4682ac7e1f48915df25c426d1726bfde77d5fe8b4920e50993bffb1d
+  data.tar.gz: 4357089c5a0e4bab18a7e3d8481c96c54db580a5742d69ea4b9a59f8b2cb22ca3a361cdfca9fe0f0e1bbffcdf3045e374744580d8ad65902a948579806841513

data/app/models/egov_utils/address.rb

@@ -3,17 +3,21 @@ module EgovUtils
 
     # before_safe :identify_address , if: :changed?
 
-    validates :street, :city, length: 2..255
-    validates :postcode, numericality: { only_integer: true }
-    with_options if: :in_czech_republic? do
-      validates :district, inclusion: { in: :district_names }
-      validates :region, inclusion: { in: :region_names }
-    end
-    with_options unless: :in_czech_republic? do
-      validates :district, inclusion: { in: :district_names }, allow_nil: true
-      validates :region, inclusion: { in: :region_names }, allow_nil: true
+    with_options unless: :text_address? do
+      validates :street, :city, length: 2..255
+      validates :postcode, numericality: { only_integer: true }
+      with_options if: :in_czech_republic? do
+        validates :district, inclusion: { in: :district_names }
+        validates :region, inclusion: { in: :region_names }
+      end
+      with_options if: -> { !in_czech_republic? } do
+        validates :district, inclusion: { in: :district_names }, allow_nil: true
+        validates :region, inclusion: { in: :region_names }, allow_nil: true
+      end
+      validates :country, inclusion: { in: :country_ids }, allow_nil: true
     end
-    validates :country, inclusion: { in: :country_ids }, allow_nil: true
+
+    before_validation -> { self.country = CZ_ISO_CODE if text_address? }
 
     District = Struct.new(:id, :name, :region_id)
     Region = Struct.new(:id, :name)
@@ -22,6 +26,10 @@ module EgovUtils
 
     CZ_ISO_CODE = '203'
 
+    def text_address?
+      text_address.present?
+    end
+
     def self.countries
       return @countries if @countries
       require 'csv'
@@ -99,7 +107,7 @@ module EgovUtils
     end
 
     def to_s
-      "#{street} #{number}, #{postcode} #{city}"
+      text_address.presence || "#{street} #{number}, #{postcode} #{city}"
     end
 
     def prepare_egon_message(message)

data/app/services/egov_utils/iszr/find_address_by_aifo.rb

@@ -8,18 +8,28 @@ module EgovUtils
       private
 
       def handle_response!
-        EgovUtils::Address.new(
-          street:
-            response_body.xpath('//UliceNazev').text.presence || response_body.xpath('//CastObceNazev').text,
-          house_number: response_body.xpath('//CisloDomovni').text,
-          orientation_number: response_body.xpath('//CisloOrientacni').text,
-          city: response_body.xpath('//ObecNazev').text,
-          postcode: response_body.xpath('//PostaKod').text,
-          egov_identifier: response_body.xpath('//AdresniMistoKod').text,
-          country: 203,
-          district: district.name,
-          region: region.name
-        )
+        if text_address?
+          EgovUtils::Address.new(
+            text_address: response_body.xpath('//AdresaTextem').text
+          )
+        else
+          EgovUtils::Address.new(
+            street:
+              response_body.xpath('//UliceNazev').text.presence || response_body.xpath('//CastObceNazev').text,
+            house_number: response_body.xpath('//CisloDomovni').text,
+            orientation_number: response_body.xpath('//CisloOrientacni').text,
+            city: response_body.xpath('//ObecNazev').text,
+            postcode: response_body.xpath('//PostaKod').text,
+            egov_identifier: response_body.xpath('//AdresniMistoKod').text,
+            country: 203,
+            district: district.name,
+            region: region.name,
+          )
+        end
+      end
+
+      def text_address?
+        response_body.xpath('//AdresaTextem').text.present?
       end
 
       def district

data/app/services/egov_utils/iszr/find_address_by_ico.rb

@@ -6,18 +6,28 @@ module EgovUtils
       private
 
       def handle_response!
-        EgovUtils::Address.new(
-          street:
-            response_body.xpath('//UliceNazev').text.presence || response_body.xpath('//CastObceNazev').text,
-          house_number: response_body.xpath('//CisloDomovni').text,
-          orientation_number: response_body.xpath('//CisloOrientacni').text,
-          city: response_body.xpath('//ObecNazev').text,
-          postcode: response_body.xpath('//PostaKod').text,
-          egov_identifier: response_body.xpath('//AdresniMistoKod').text,
-          country: 203,
-          district: district.name,
-          region: region.name
-        )
+        if text_address?
+          EgovUtils::Address.new(
+            text_address: response_body.xpath('//AdresaTextem').text
+          )
+        else
+          EgovUtils::Address.new(
+            street:
+              response_body.xpath('//UliceNazev').text.presence || response_body.xpath('//CastObceNazev').text,
+            house_number: response_body.xpath('//CisloDomovni').text,
+            orientation_number: response_body.xpath('//CisloOrientacni').text,
+            city: response_body.xpath('//ObecNazev').text,
+            postcode: response_body.xpath('//PostaKod').text,
+            egov_identifier: response_body.xpath('//AdresniMistoKod').text,
+            country: 203,
+            district: district.name,
+            region: region.name,
+          )
+        end
+      end
+
+      def text_address?
+        response_body.xpath('//AdresaTextem').text.present?
       end
 
       def district

data/db/migrate/20250413085634_add_text_address_to_addresses.rb

@@ -0,0 +1,5 @@
+class AddTextAddressToAddresses < ActiveRecord::Migration[7.1]
+  def change
+    add_column :egov_utils_addresses, :text_address, :string
+  end
+end

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '1.5.0.alpha16'
+  VERSION = '1.5.0.alpha17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha16
+  version: 1.5.0.alpha17
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2025-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -779,6 +779,7 @@ files:
 - db/migrate/20230427091407_add_fields_to_registration_requests.rb
 - db/migrate/20231006131159_add_supervisor_assignment_to_registration_requests.rb
 - db/migrate/20240711130901_add_remote_id_to_people.rb
+- db/migrate/20250413085634_add_text_address_to_addresses.rb
 - lib/azahara_schema_currency.rb
 - lib/azahara_schema_currency/aggregation_attribute_patch.rb
 - lib/azahara_schema_currency/association_attribute_patch.rb