egov_utils 1.5.0.alpha3 → 1.5.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ea00706e2722fb8728d9c844bd50438b452a8de9445ef23390fb995b989db9
-  data.tar.gz: 9e678b274e4aa700191e2973675d94442a3545ed4c829ba5f2cc7e87015a5fbc
+  metadata.gz: 046c5759eba0d80446d93f8a3c3b8ce4dc18a83aa7fd5c562a5f5cb4dcac7359
+  data.tar.gz: b8b0bbb2f87977252bca9a46a14d62149ecd9bee5d153b54e4fd6aae3dbbcda3
 SHA512:
-  metadata.gz: 1ee1188c124f50fa5fc766c6438eb4883902972a75706ba9dd8ffc169396a3d91a0faca955c6aa8da70660a1b9da18febd9ffc89ed7b664842e70a64057363c9
-  data.tar.gz: 1b8233de8f1b144cf788e1d2b3bce95407dfeb54a01c9db26e1b6ecc22912e39407b5dd0191f8f176e6fec6022490874e176c77b0f2f0a5d0ba0cb3c697e1bde
+  metadata.gz: 80a826cb596f3add692963cc1b6b3924138c48409b0c3e91a0459ecd6712573de12f8ca22f2969c54828a89e69889ba9dc8f8bcd8a09fbfa064d96d7fae2e97f
+  data.tar.gz: 44ce23500051b01ac765299531ff15f9fed61ea7fd11c04056939a5fa0419103d0fb8902e3fc25783880737b9e222ac91a709768142412936512c9002c31483e

data/app/controllers/egov_utils/towns_controller.rb

@@ -0,0 +1,11 @@
+module EgovUtils
+  class TownsController < ApplicationController
+    def index
+      selected = EgovUtils::Address.towns.lazy.select do |town|
+        /\A#{params[:term]}/i.match?(town.name)
+      end.first(10)
+
+      render json: { towns: selected.map(&:to_h) }
+    end
+  end
+end

data/app/models/egov_utils/address.rb

@@ -18,6 +18,7 @@ module EgovUtils
     District = Struct.new(:id, :name, :region_id)
     Region = Struct.new(:id, :name)
     Country = Struct.new(:iso_id, :code2, :code3, :name)
+    Town = Struct.new(:id, :name, :district_name)
 
     CZ_ISO_CODE = '203'
 
@@ -51,6 +52,15 @@ module EgovUtils
       @regions
     end
 
+    def self.towns
+      @towns ||= begin
+        towns = File.read(EgovUtils::Engine.root.join('config', 'obec.json'))
+        JSON.parse(towns).map do |town|
+          Town.new(*town.slice('code', 'name', 'district_name').values)
+        end
+      end
+    end
+
     def self.region_for_district(district_name)
       district = districts.detect{|d| d[:name] == district_name }
       regions.detect{|r| r[:id] == district[:region_id] } if district

data/app/services/egov_utils/iszr/addresses/fetch_for_natural_person.rb

@@ -10,9 +10,9 @@ module EgovUtils
           strategy_class.run!(remote_id:)
         end
 
-        def strategy_class
+        def fetch_result
           if Rails.env.production?
-            EgovUtils::Iszr::Addresses::FetchForNaturalPerson::FromRemoteReposiory
+            EgovUtils::Iszr::FindResultByAifo
           else
             EgovUtils::Iszr::Addresses::FetchForNaturalPerson::FromSampleData
           end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module EgovUtils
+  module Iszr
+    class Client
+      def initialize(message)
+        @client = Savon.client(wsdl: EgovUtils::Settings['iszr']['endpoint'], log: true, log_level: :info, ssl_verify_mode: :none)
+        @message = message
+      end
+
+      def call
+        client.call(
+          :get_data,
+          message: { 'tns:inputXml' => message }
+        )
+      end
+
+      private
+
+      attr_reader :client, :message
+    end
+  end
+end

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module EgovUtils
+  module Iszr
+    class FindResultByAifo < Request
+      string :remote_id
+
+      private
+
+      def handle_response!
+        EgovUtils::Address.new(
+          street: response_body.xpath('//UliceNazev').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
+
+      def district
+        @district ||= begin
+          district =
+            EgovUtils::Address.towns.find do
+              _1.id == response_body.xpath('//ObecKod').text
+            end.district_name
+
+          EgovUtils::Address.districts.find { _1.name == district }
+        end
+      end
+
+      def region
+        @region ||=
+          EgovUtils::Address.regions.find { _1.id == district.region_id }
+      end
+
+      def body
+        Nokogiri::XML::Builder.new do |xml|
+          xml[service_id].RobCtiAifo2(
+            'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+            'xsi:schemaLocation' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiAifo2:v1 IszrRobCtiAifo2.xsd',
+            'xmlns:abs' => 'urn:cz:isvs:iszr:schemas:IszrAbstract:v1',
+            'xmlns:E276' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiAifo2:v1',
+            'xmlns:reg' => 'urn:cz:isvs:reg:schemas:RegTypy:v1',
+            'xmlns:rod' => 'urn:cz:isvs:rob:schemas:RobDotazyData:v1',
+            'xmlns:rob' => 'urn:cz:isvs:rob:schemas:RobTypy:v1'
+          ) {
+            xml['abs'].ZadostInfo {
+              xml['reg'].CasZadosti Time.current.iso8601
+              xml['reg'].Agenda EgovUtils::Settings['iszr']['agenda']
+              xml['reg'].AgendovaRole EgovUtils::Settings['iszr']['agendova_role']
+              xml['reg'].Ovm '00025429'
+              xml['reg'].Ais EgovUtils::Settings['iszr']['ais']
+              xml['reg'].Subjekt '00025429'
+              xml['reg'].Uzivatel 'Administrator'
+              xml['reg'].DuvodUcel 'ztotozneni'
+              xml['reg'].AgendaZadostId SecureRandom.uuid
+            }
+            xml['abs'].AutorizaceInfo {
+              xml['abs'].SeznamUdaju 'Aifo Prijmeni Jmeno DatumNarozeni RUIANCti AdresaPobytu MistoNarozeni'
+            }
+            xml['abs'].MapaAifo(nacistData: true) {
+              xml['reg'].PrevodAifo {
+                xml['reg'].LokalniAifo 1
+                xml['reg'].GlobalniAifo remote_id
+              }
+            }
+            xml[service_id].Zadost {
+              xml[service_id].RobCtiAifo2Data {
+                xml['rod'].Aifo 1
+                xml['rod'].VyuzitiPoskytnuti 'poskytnuti'
+              }
+            }
+          }
+        end
+      end
+
+      def service_id
+        'E276'
+      end
+    end
+  end
+end

data/app/services/egov_utils/iszr/natural_people/create_request.rb

@@ -19,31 +19,70 @@ module EgovUtils
           end
         end
 
+        def response_error_code
+          @response_error_code ||=
+            response_body.xpath('//VysledekSubKod').last&.text&.presence
+        end
+
+        def internal_error_code
+          return unless response_error_code
+
+          code = if response_error_code == 'ZAZNAM NENALEZEN'
+            "not_found"
+          elsif response_error_code == 'PREKROCEN POCET'
+            "multiple_records_found"
+          end
+
+          if birth_place.present?
+            "extended_search_#{code}"
+          else
+            code
+          end
+        end
+
+        def handle_response!
+          if internal_error_code
+            errors.add(:base, internal_error_code)
+            return
+          end
+
+          EgovUtils::Services::Iszr::NaturalPeople.new(
+            firstname: response_body.xpath('//Jmeno').text.capitalize,
+            lastname: response_body.xpath('//Prijmeni').text.capitalize,
+            birth_date: response_body.xpath('//DatumNarozeni').text,
+            birth_place: response_body.xpath('//Lokalita/Nazev').text,
+            remote_id: response_body.xpath('//GlobalniAifo').text
+          )
+
+        end
+
         def search_stage_one
           Nokogiri::XML::Builder.new do |xml|
-            xml['e05'].RobCtiPodleUdaju(
+            xml[service_id].RobCtiPodleUdaju2(
               'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-              'xsi:schemaLocation' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiPodleUdaju:v1 IszrRobCtiPodleUdaju.xsd',
+              'xsi:schemaLocation' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiPodleUdaju2:v1 IszrRobCtiPodleUdaju2.xsd',
               'xmlns:abs' => 'urn:cz:isvs:iszr:schemas:IszrAbstract:v1',
-              'xmlns:e05' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiPodleUdaju:v1',
+              'xmlns:E278' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiPodleUdaju2:v1',
               'xmlns:reg' => 'urn:cz:isvs:reg:schemas:RegTypy:v1',
               'xmlns:rod' => 'urn:cz:isvs:rob:schemas:RobDotazyData:v1',
               'xmlns:rob' => 'urn:cz:isvs:rob:schemas:RobTypy:v1'
             ) {
               xml['abs'].ZadostInfo {
-                xml['reg'].CasZadosti Time.current
-                xml['reg'].Agenda 'A482'
-                xml['reg'].AgendovaRole 'CTENAR'
+                xml['reg'].CasZadosti Time.current.iso8601
+                xml['reg'].Agenda EgovUtils::Settings['iszr']['agenda']
+                xml['reg'].AgendovaRole EgovUtils::Settings['iszr']['agendova_role']
                 xml['reg'].Ovm '00025429'
-                xml['reg'].Ais '124'
-                xml['reg'].Uzivatel 'Uzivatel156'
-                xml['reg'].AgendaZadostId '5a7b9af0-f759-4632-ab96-7bb06df1b98c'
+                xml['reg'].Ais EgovUtils::Settings['iszr']['ais']
+                xml['reg'].Subjekt '00025429'
+                xml['reg'].Uzivatel 'Administrator'
+                xml['reg'].DuvodUcel 'ztotozneni'
+                xml['reg'].AgendaZadostId SecureRandom.uuid
               }
               xml['abs'].AutorizaceInfo {
-                xml['abs'].SeznamUdaju 'Aifo Prijmeni Jmeno AdresaPobytu DorucovaciAdresa DatumNarozeni MistoNarozeni DatumUmrti DatumPravniMociUmrti MistoUmrti DatovaSchrankaROB Doklad Obcanstvi'
+                xml['abs'].SeznamUdaju 'Aifo Prijmeni Jmeno DatumNarozeni RUIANCti AdresaPobytu MistoNarozeni'
               }
-              xml['e05'].Zadost {
-                xml['e05'].RobCtiPodleUdajuData {
+              xml[service_id].Zadost {
+                xml[service_id].RobCtiPodleUdaju2Data {
                   xml['rod'].DatumNarozeni birth_date
                   xml['rod'].Jmeno firstname
                   xml['rod'].Prijmeni lastname
@@ -55,32 +94,36 @@ module EgovUtils
 
         def search_stage_two
           Nokogiri::XML::Builder.new do |xml|
-            xml['e05'].RobCtiPodleUdaju(
+            xml[service_id].RobCtiPodleUdaju2(
               'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-              'xsi:schemaLocation' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiPodleUdaju:v1 IszrRobCtiPodleUdaju.xsd',
+              'xsi:schemaLocation' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiPodleUdaju2:v1 IszrRobCtiPodleUdaju2.xsd',
               'xmlns:abs' => 'urn:cz:isvs:iszr:schemas:IszrAbstract:v1',
-              'xmlns:e05' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiPodleUdaju:v1',
+              'xmlns:E278' => 'urn:cz:isvs:iszr:schemas:IszrRobCtiPodleUdaju2:v1',
               'xmlns:reg' => 'urn:cz:isvs:reg:schemas:RegTypy:v1',
               'xmlns:rod' => 'urn:cz:isvs:rob:schemas:RobDotazyData:v1',
               'xmlns:rob' => 'urn:cz:isvs:rob:schemas:RobTypy:v1'
             ) {
               xml['abs'].ZadostInfo {
-                xml['reg'].CasZadosti Time.current
-                xml['reg'].Agenda 'A482'
-                xml['reg'].AgendovaRole 'CTENAR'
+                xml['reg'].CasZadosti Time.current.iso8601
+                xml['reg'].Agenda EgovUtils::Settings['iszr']['agenda']
+                xml['reg'].AgendovaRole EgovUtils::Settings['iszr']['agendova_role']
                 xml['reg'].Ovm '00025429'
-                xml['reg'].Ais '124'
-                xml['reg'].Uzivatel 'Uzivatel156'
-                xml['reg'].AgendaZadostId '5a7b9af0-f759-4632-ab96-7bb06df1b98c'
+                xml['reg'].Ais EgovUtils::Settings['iszr']['ais']
+                xml['reg'].Subjekt '00025429'
+                xml['reg'].Uzivatel 'Administrator'
+                xml['reg'].DuvodUcel 'ztotozneni'
+                xml['reg'].AgendaZadostId SecureRandom.uuid
               }
               xml['abs'].AutorizaceInfo {
-                xml['abs'].SeznamUdaju 'Aifo Prijmeni Jmeno AdresaPobytu DorucovaciAdresa DatumNarozeni MistoNarozeni DatumUmrti DatumPravniMociUmrti MistoUmrti DatovaSchrankaROB Doklad Obcanstvi'
+                xml['abs'].SeznamUdaju 'Aifo Prijmeni Jmeno DatumNarozeni RUIANCti AdresaPobytu MistoNarozeni'
               }
-              xml['e05'].Zadost {
-                xml['e05'].RobCtiPodleUdajuData {
-                  xml['rod'].MistoNarozeni birth_place
+              xml[service_id].Zadost {
+                xml[service_id].RobCtiPodleUdaju2Data {
                   xml['rod'].DatumNarozeni birth_date
                   xml['rod'].Jmeno firstname
+                  xml['rod'].MistoNarozeni {
+                    xml['rob'].NarozeniCr birth_place
+                  }
                   xml['rod'].Prijmeni lastname
                 }
               }
@@ -89,7 +132,7 @@ module EgovUtils
         end
 
         def service_id
-          'E05'
+          'E278'
         end
       end
     end

data/app/services/egov_utils/iszr/natural_people/search.rb

@@ -4,7 +4,7 @@ module EgovUtils
       class Search < ActiveInteraction::Base
         string :firstname
         string :lastname
-        date :birth_date, converter: :parse
+        string :birth_date
         string :birth_place, default: nil
 
         validates :firstname, :lastname, :birth_date, presence: true
@@ -20,7 +20,7 @@ module EgovUtils
 
         def find_person_service
           if Rails.env.production?
-            EgovUtils::Iszr::NaturalPeople::ProdSearch
+            EgovUtils::Iszr::NaturalPeople::CreateRequest
           else
             EgovUtils::Iszr::NaturalPeople::DevSearch
           end

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

@@ -2,7 +2,7 @@ module EgovUtils
   module Iszr
     class Request < ActiveInteraction::Base
       def execute
-        envelope.to_xml
+        handle_response!
       end
 
       private
@@ -19,7 +19,7 @@ module EgovUtils
               }
               xml.SenderDetails {
                 xml.Authentication(type: 'clear') {
-                  xml.ISId '124'
+                  xml.ISId EgovUtils::Settings['iszr']['ais']
                 }
               }
             }
@@ -31,6 +31,24 @@ module EgovUtils
       def encoded_body(body)
         Base64.encode64(body.to_xml)
       end
+
+      def response
+        @response ||= Client.new(envelope.to_xml).call
+      end
+
+      def response_body
+        @response_body ||= begin
+          body = Nokogiri::XML(
+            response.body[:get_data_response][:get_data_result]
+          ).xpath("//Body").text
+
+          Nokogiri::XML(Base64.decode64(body)).remove_namespaces!
+        end
+      end
+
+      def handle_response!
+        response_body
+      end
     end
   end
 end

data/app/views/egov_utils/people/_new_form.html.haml

@@ -18,16 +18,27 @@
                 = label_tag 'birth_date', 'Datum narození'
                 = date_field_tag :birth_date, {}, class: 'form-control'
               = link_to 'Vyhledat', {}, class: 'btn btn-primary'
-    .legal-person-row.identification-form.legal_person.row
-      .col-12
-        .card
-          .card-header Ztotožnění právnické osoby
-          .card-body
-            .form
-              .form-group
-                = label_tag 'ico', 'IČO'
-                = text_field_tag :ico, {}, class: 'form-control'
-              = link_to 'Vyhledat', nil, class: 'btn btn-primary'
+    .legal_person
+      .row
+        = form.fields_for(:legal_person, person.legal_person || EgovUtils::LegalPerson.new) do |fields|
+          .col-12= fields.text_field(:name)
+          .col-12.col-sm-6= fields.text_field(:ico)
+          .col-12.col-sm-6= fields.select2 :legal_form, list_values_for_select(azahara_attribute_for(EgovUtils::LegalPerson, 'legal_form'))
+      .row
+        .col-12
+          = form.fields_for(:residence, person.residence || EgovUtils::Address.new) do |fields|
+            = render 'egov_utils/addresses/form', form: fields, address: fields.object
+
+    -# .legal-person-row.identification-form.legal_person.row
+    -#   .col-12
+    -#     .card
+    -#       .card-header Ztotožnění právnické osoby
+    -#       .card-body
+    -#         .form
+    -#           .form-group
+    -#             = label_tag 'ico', 'IČO'
+    -#             = text_field_tag :ico, {}, class: 'form-control'
+    -#           = link_to 'Vyhledat', nil, class: 'btn btn-primary'
     = form.hidden_field :remote_id
 
 :javascript
@@ -41,9 +52,11 @@
       firstname: $npr.find('input[name=firstname]').val(),
       lastname: $npr.find('input[name=lastname]').val(),
       birth_date: $npr.find('input[name=birth_date]').val(),
-      birth_place: $npr.find('input[name=birth_place]').val()
+      birth_place: $npr.find('select[name=birth_place]').val()
     }
 
+    selected_birth_place = $npr.find('select[name=birth_place] option:selected').text().split('(')[0].trim();
+
     $.ajax({
       url: '/internals/iszr/search',
       data: {
@@ -82,21 +95,44 @@
           // Fill in the form with the data
           $old_person_form.find("input[name*='[firstname]']").val(form_data.firstname);
           $old_person_form.find("input[name*='[lastname]']").val(form_data.lastname);
-          $old_person_form.find("input[name*='[birth_place]']").val(form_data.birth_place);
+          $old_person_form.find("input[name*='[birth_place]']").val(selected_birth_place);
           $old_person_form.find("input[name*='[birth_date]']").val(form_data.birth_date);
         }
         else if(error_kind == 'multiple_results_found') {
           $form_group = $('<div>').addClass('form-group');
           $label = $('<label>').attr('for', 'birth_place').text('Místo narození');
-          $input = $('<input>').attr('type', 'text').attr('name', 'birth_place').addClass('form-control');
+          $input = $('<select>').attr('name', 'birth_place').addClass('form-control');
           $form_group.append($label).append($input);
+          $input.select2({
+            ajax: {
+              url: '/internals/towns',
+              data: function (params) {
+                var query = {
+                  term: params.term
+                }
+
+                return query;
+              },
+              processResults: function(data) {
+                return {
+                  results: data.towns.map(function(val) {
+                    return {
+                      id: val.id,
+                      text: `${val.name} (okr. ${val.district_name})`
+                    }
+                  })
+                }
+              }
+            }
+          });
+
           $npr.find('.card-body .form .btn').before($form_group);
 
           $icon = $('<i>').addClass('fa').addClass('fa-times');
           $error_div = $('<div>').addClass('alert').addClass('alert-danger').append($icon).append(' Nalezeno více osob, zadejte místo narození');
           $npr.find('.card-body').prepend($error_div);
         }
-        else if(error_kind == 'extended_search_multiple_records_found') {
+        else if(error_kind == 'extended_search_multiple_records_found' || error_kind == 'extended_search_not_found') {
           $icon = $('<i>').addClass('fa').addClass('fa-times');
           $error_div = $('<div>').addClass('alert').addClass('alert-danger').append($icon).append(' Nalezeno více osob, pokračujte, prosím, ručním zadáním údajů');
 
@@ -108,7 +144,7 @@
           // Fill in the form with the data
           $('.old-person-form').find("input[name*='[firstname]']").val(form_data.firstname);
           $('.old-person-form').find("input[name*='[lastname]']").val(form_data.lastname);
-          $('.old-person-form').find("input[name*='[birth_place]']").val(form_data.birth_place);
+          $('.old-person-form').find("input[name*='[birth_place]']").val(selected_birth_place);
           $('.old-person-form').find("input[name*='[birth_date]']").val(form_data.birth_date);
         }
       }

data/app/views/egov_utils/users/index.html.haml

@@ -3,6 +3,7 @@
 = bootstrap_form_tag(url: egov_utils.users_path, method: :get, layout: :inline) do |f|
   .form-group
     = f.text_field :search, value: params[:search], label: false, placeholder: t('label_search'), skip_label: true
+    = f.hidden_field :default_scope, value: params[:default_scope]
     = f.submit 'Vyhledat', class: 'btn btn-primary btn-sm'
 
 %table.table.table-striped