czech_post_b2b_client 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7c296befdf3e8a0575b0855f80ddc0bfd730db4
-  data.tar.gz: 2c9519c8d7e5a483c60cf356bafe5dd652149763
+  metadata.gz: 07426ba1b8f688f648faebda86173b514127a3b9
+  data.tar.gz: 8cfd179622eaa1aac8b0043acf01089a9d66e1b9
 SHA512:
-  metadata.gz: a66d5f3d8160159490b7197cd0e1edf0107e7cb6610d019495a8ab02650118881f94d6c8deca7ef3bce55cdcfe3573392626e10220ec158876f807556f147b81
-  data.tar.gz: f0cdc245a2c4f58432475e7cb3afe32acb707d0710e150977e823418142424f955ae3301748aeae072cf994db52654d0c544d02257bfd8bdc6e6dc7219e16a94
+  metadata.gz: 538d4a70a50d9b48d3740e67eadcdd82ea8965acd321cbb9bb690ed7cb987966bc03f757ccff7115d67287a581f6dd53a0e948ea14a70168a95e89bb1236c330
+  data.tar.gz: 5549ec8f20778309738add18ec827a4b20cb449a307e1825e7bd1b2891608129ef1f806e4e73eb101e700640a57d76e0f79f7c0275a291a993f9addcab80bb49

data/.rubocop.yml

@@ -14,7 +14,7 @@ AllCops:
     - "bin/*"
 Documentation:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 Metrics/AbcSize:
   Max: 20

data/README.md

@@ -2,12 +2,15 @@
 Accessing B2B API of Czech Post for bulk processing of parcels ("B2B - WS PodáníOnline").
 
 There are these supported operations of API:
+- *parcelServiceSync* - stores data of one parcel and return package_code and optional PDF adress sheet [HTTP POST - sync response]
+                        Seems to me, that there are is no place extensive Cash On Delivery data, just `amount` and `currency`
 - *sendParcels* - stores data of parcels for async processing [HTTP POST - async response]
 - *getResultParcels* - return results of such processing [HTTP GET - sync response]
 - *getStats* - returns statistics of parcels sent in time period [HTTP GET - sync response]
 - *getParcelState* - returns all known states for listed parcels [HTTP GET - sync response]
 - *getParcelsPrinting* - returns PDF with address labels/stickers for listed parcels [HTTP GET - sync response]
 
+
 ## Installation
 ### 1) Registration at Czech Post (CP)
 The longterm and hardest part.
@@ -140,9 +143,9 @@ Or install it yourself as:
 
   1) Pack your parcel(s)
 
-  2) Call `ParcelsSender`, this will store in `result` `transmission_id` and expected time to ask for results.
+  2) Call `ParcelsAsyncSender`, this will store in `result` `transmission_id` and expected time to ask for results.
       ```
-        psender = CzechPostB2bClient::Services::ParcelsSender.call(sending_data: sending_data, parcels: parcels)
+        psender = CzechPostB2bClient::Services::ParcelsAsyncSender.call(sending_data: sending_data, parcels: parcels)
 
         if psender.success?
           result = psender.result

data/lib/czech_post_b2b_client/configuration.rb

@@ -21,8 +21,8 @@ module CzechPostB2bClient
 
       # ours, accessible, but maybe out of date, for test usage
       @namespaces = {
-        'xmlns' => 'https://raw.githubusercontent.com/foton/czech_post_b2b_client/master/doc/20181023/B2BCommon-v1.1.xsd',
-        'xmlns:ns2' => 'https://raw.githubusercontent.com/foton/czech_post_b2b_client/master/doc/20181023/B2B-POLServices-v1.6.xsd'
+        'xmlns' => 'https://raw.githubusercontent.com/foton/czech_post_b2b_client/master/documents/B2B_CP_POL_2020-05-21/B2BCommon-v1.1.xsd',
+        'xmlns:ns2' => 'https://raw.githubusercontent.com/foton/czech_post_b2b_client/master/documents/B2B_CP_POL_2020-05-21/B2B-POLServices-v1.8.xsd'
       }
       # original, accessible only with setup certificates
       @namespaces = {

data/lib/czech_post_b2b_client/printing_templates.rb

@@ -22,6 +22,7 @@ module CzechPostB2bClient
         @id = 8
         @description = 'adresní štítek (alonž) + dobírková poukázka A'
       end
+
       class Blank4OnPage < Base
         @id = 20
         @description = 'adresní štítek bianco - 4x (A4)'
@@ -40,22 +41,22 @@ module CzechPostB2bClient
       module ForeignPackage
         class Standard < Base
           @id = 58
-          @description = 'AŠ - samostatný Standardní balík do zahraničí'
+          @description = 'CP72 - standardní balík do zahraničí'
         end
 
-        class Standard4OnPage < Base
+        class Standard2OnPage < Base
           @id = 59
-          @description = 'AŠ - 4xA4 Standardní balík do zahraničí'
+          @description = 'CP72 - standardní balík do zahraničí (2x A4 )'
         end
 
         class Valuable < Base
           @id = 60
-          @description = 'AŠ - samostatný Cenný balík do zahraničí'
+          @description = 'CP72 - cenný balík do zahraničí'
         end
 
         class Valuable4OnPage < Base
           @id = 61
-          @description = '4xA4 Cenný balík do zahraničí'
+          @description = 'CP72 - cenný balík do zahraničí (2x A4)'
         end
 
         class EMS < Base
@@ -67,6 +68,18 @@ module CzechPostB2bClient
           @id = 63
           @description = 'AŠ - 2xA4 EMS do zahraničí'
         end
+
+        # Formulare ID 72 a 73 je mozno pouzit pouze pro zasilky s prefixem CE
+        # do zemi AT, DE, FR, GR, HR, CH, IS, LU, LV, NO, PL, SK
+        class HarmonizedLabel < Base
+          @id = 72
+          @description = 'Obchodní balík do zahraničí – samostatný'
+        end
+
+        class HarmonizedLabel4OnPage < Base
+          @id = 73
+          @description = 'Obchodní balík do zahraničí –  4x (A4)'
+        end
       end
     end
 
@@ -132,28 +145,32 @@ module CzechPostB2bClient
       @description = 'Dodejka'
     end
 
-    class CustomDeclarationCN22 < Base
-      @id = 56
-      @description = 'Celní prohlášení CN22'
-    end
+    module CustomDeclaration
+      class CN22 < Base
+        @id = 56
+        @description = 'Celní prohlášení CN22 - 1x (A4)'
+      end
 
-    class CustomDeclarationCN23 < Base
-      @id = 57
-      @description = 'Celní prohlášení CN23'
-    end
+      class CN23 < Base
+        @id = 57
+        @description = 'Celní prohlášení CN23 - 1x (A4)'
+      end
 
-    # Formulare ID 72 a 73 je mozno pouzit pouze pro zasilky s prefixem CE
-    # do zemi AT, DE, FR, GR, HR, CH, IS, LU, LV, NO, PL, SK
-    class HarmonizedLabel < Base
-      @id = 72
-      @description = 'Harmonizovaný štítek pro MZ produkty – samostatný'
-    end
+      class CN224OnPage < Base
+        @id = 74
+        @description = 'Celní prohlášení CN22 - 4x (A4)'
+      end
 
-    class HarmonizedLabel4OnPage < Base
-      @id = 73
-      @description = 'Harmonizovaný štítek pro MZ produkty –  4x (A4)'
-    end
+      class CN22WithCK < Base
+        @id = 75
+        @description = 'Celní prohlášení CN22  s ČK - 1x (A4)'
+      end
 
+      class CN22WithCK4OnPage < Base
+        @id = 76
+        @description = 'Celní prohlášení CN22  s ČK - 4x (A4)'
+      end
+    end
     # has to be at the end, to load all subcasses before
     def self.all_classes
       ObjectSpace.each_object(CzechPostB2bClient::PrintingTemplates::Base.singleton_class)

data/lib/czech_post_b2b_client/request_builders.rb

@@ -6,3 +6,4 @@ require 'czech_post_b2b_client/request_builders/get_parcels_printing_builder'
 require 'czech_post_b2b_client/request_builders/get_parcel_state_builder'
 require 'czech_post_b2b_client/request_builders/get_result_parcels_builder'
 require 'czech_post_b2b_client/request_builders/send_parcels_builder'
+require 'czech_post_b2b_client/request_builders/parcel_service_sync_builder'

data/lib/czech_post_b2b_client/request_builders/parcel_service_sync_builder.rb

@@ -0,0 +1,312 @@
+# frozen_string_literal: true
+
+# rubocop:disable Layout/LineLength, Style/AsciiComments
+
+module CzechPostB2bClient
+  module RequestBuilders
+    class ParcelServiceSyncBuilder < BaseBuilder # rubocop:disable Metrics/ClassLength
+      attr_reader :common_data, :parcel
+
+      def initialize(common_data:, parcel:, request_id: 1)
+        @common_data = common_data
+        @parcel = parcel
+        @request_id = request_id
+      end
+
+      private
+
+      def validate_data
+        validate_common_data_required_fields
+
+        if parcel.empty?
+          errors.add(:parcel, 'One parcel is needed!')
+        else
+          validate_parcel_required_fields
+        end
+
+        fail! unless errors.empty?
+      end
+
+      def service_data_struct
+        new_element('serviceData').tap do |srv_data|
+          add_element_to(srv_data, send_parcels)
+        end
+      end
+
+      def validate_common_data_required_fields
+        [[:parcels_sending_date],
+         [:customer_id],
+         [:sending_post_office_code]].each do |key_chain|
+           value = common_data.dig(*key_chain)
+           if value.nil? || value == ''
+             errors.add(:common_data, "Missing value for key { :#{key_chain.join(' => :')} }!")
+           end
+         end
+      end
+
+      def validate_parcel_required_fields
+        rq_fields = [
+          %i[params parcel_id],
+          %i[params parcel_code_prefix],
+          %i[addressee address last_name],
+          %i[addressee address street],
+          %i[addressee address house_number],
+          %i[addressee address city],
+          %i[addressee address post_code]
+        ]
+
+        parcel_id = parcel.dig(:params, :parcel_id)
+        rq_fields.each do |key_chain|
+          value = parcel.dig(*key_chain)
+
+          if value.nil? || value == ''
+            errors.add(:parcel, "Missing value for key { :#{key_chain.join(' => :')} } for parcel (parcel_id: '#{parcel_id}')!")
+          end
+        end
+      end
+
+      def send_parcels
+        new_element('ns2:parcelServiceSyncRequest').tap do |ps_sync_request|
+          add_element_to(ps_sync_request, do_parcel_header) # REQUIRED
+          add_element_to(ps_sync_request, do_parcel_data) # optional
+        end
+      end
+
+      def do_parcel_header # rubocop:disable Metrics/AbcSize
+        new_element('ns2:doPOLSyncParcelHeader').tap do |parcel_header|
+          add_element_to(parcel_header, 'ns2:transmissionDate', value: common_data[:parcels_sending_date].strftime('%d.%m.%Y')) # Predpokladane datum podani (format DD.MM.YYYY !)
+          add_element_to(parcel_header, 'ns2:customerID', value: common_data[:customer_id]) # Technologicke cislo podavatele
+          add_element_to(parcel_header, 'ns2:postCode', value: common_data[:sending_post_office_code]) # PSC podaci posty
+          add_element_to(parcel_header, 'ns2:contractNumber', value: common_data[:contract_number]) # Nepovinne: Cislo zakazky
+          add_element_to(parcel_header, 'ns2:frankingNumber', value: common_data[:franking_machine_number]) # Nepovinne: Cislo vyplatniho stroje
+          add_element_to(parcel_header, 'ns2:transmissionEnd', value: common_data[:close_requests_batch]) # Nepovinna, default true: Indikace zda uzavrit podani, nebo budou jeste nasledovat dalsi requesty pro stejne podani
+          add_element_to(parcel_header, 'ns2:locationNumber', value: common_data[:sending_post_office_location_number]) # Nepovinne: cislo podaciho mista (z nastaveni v Podani Online)
+          add_element_to(parcel_header, 'ns2:senderCustCardNum', value: sender_data[:custom_card_number]) # Nepovinne: cislo zakaznicke karty odesilatele
+          add_element_to(parcel_header, print_params)
+        end
+      end
+
+      def do_parcel_data
+        new_element('ns2:doPOLSyncParcelData').tap do |do_parcel_data|
+          add_element_to(do_parcel_data, do_parcel_params)
+          add_element_to(do_parcel_data, do_parcel_address)
+          add_element_to(do_parcel_data, do_parcel_address_document)
+          add_element_to(do_parcel_data, do_parcel_customs_declaration)
+          add_customs_documents_to(do_parcel_data)
+        end
+      end
+
+      def print_params
+        return nil unless (pp = common_data[:print_params])
+
+        new_element('ns2:printParams').tap do |print_params|
+          add_element_to(print_params, 'ns2:idForm', value: pp[:template_id]) # Nepovine[0-20x]: ID formulare
+          add_element_to(print_params, 'ns2:shiftHorizontal', value: pp[:margin_in_mm][:left]) # Hodnota posunu doprava v mm
+          add_element_to(print_params, 'ns2:shiftVertical', value: pp[:margin_in_mm][:top]) # Hodnota posunu dolu v mm
+          add_element_to(print_params, 'ns2:position', value: pp[:position_order]) # Nepovinna: Hodnota pozice
+        end
+      end
+
+      def cache_on_delivery_address
+        adr_data = common_data.dig(:cash_on_delivery, :address)
+        return nil unless adr_data
+
+        new_element('ns2:codAddress').tap do |cod_address|
+          add_address_elements(cod_address, adr_data, without: ['ns2:firstName', 'ns2:surname'])
+        end
+      end
+
+      def cache_on_delivery_bank
+        data = common_data.dig(:cash_on_delivery, :bank_account)
+        return nil unless data
+
+        new_element('ns2:codBank').tap do |cod_bank|
+          add_bank_elements(cod_bank, data)
+        end
+      end
+
+      def sender_contacts
+        return nil unless sender_data
+
+        new_element('ns2:senderContacts').tap do |element|
+          add_contact_elements(element, sender_data) # Nepovinne. Telefon, Mobil a Email
+        end
+      end
+
+      def do_parcel_params # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        params = parcel[:params]
+        cod = parcel[:cash_on_delivery] || {}
+        new_element('ns2:doPOLSyncParcelParams').tap do |parcel_params|
+          add_element_to(parcel_params, 'ns2:recordID', value: params[:parcel_id]) # Unikatni ID zaznamu
+          add_element_to(parcel_params, 'ns2:parcelCode', value: params[:parcel_code]) # Nepovinne: ID zasilky
+          add_element_to(parcel_params, 'ns2:prefixParcelCode', value: params[:parcel_code_prefix]) # Typ zasilky (prefix)
+          add_element_to(parcel_params, 'ns2:weight', value: params[:weight_in_kg]) # Nepovinne: Hmotnost
+          add_element_to(parcel_params, 'ns2:insuredValue', value: params[:insured_value]) # Nepovinne: Udana cena
+          add_element_to(parcel_params, 'ns2:amount', value: cod[:amount]) # Nepovinne: Dobirka
+          add_element_to(parcel_params, 'ns2:currency', value: cod[:currency_iso_code]) # Nepovinne, default CZK: ISO kod meny dobirky
+          add_element_to(parcel_params, 'ns2:vsVoucher', value: params[:voucher_variable_symbol]) # Nepovinne: Variabilni symbol - poukazka
+          add_element_to(parcel_params, 'ns2:vsParcel', value: params[:parcel_variable_symbol]) # Nepovinne: Variabilni symbol - zasilka
+          add_element_to(parcel_params, 'ns2:sequenceParcel', value: params[:parcel_order]) # Nepovinne: Poradi v ramci vicekusove zasilky
+          add_element_to(parcel_params, 'ns2:quantityParcel', value: params[:parcels_count]) # Nepovinne: Celkovy pocet zasilek vicekusove zasilky
+          add_element_to(parcel_params, 'ns2:note', value: params[:note]) # Nepovinne: Poznamka
+          add_element_to(parcel_params, 'ns2:notePrint', value: params[:note_for_print]) # Nepovinne: Poznamka pro tisk
+          add_element_to(parcel_params, 'ns2:length', value: params[:length]) # Nepovinne: Delka
+          add_element_to(parcel_params, 'ns2:width', value: params[:width]) # Nepovinne: Sirka
+          add_element_to(parcel_params, 'ns2:height', value: params[:height]) # Nepovinne: Vyska
+          add_element_to(parcel_params, 'ns2:mrn', value: params[:mrn_code]) # Nepovinne: Kod MRN
+          add_element_to(parcel_params, 'ns2:referenceNumber', value: params[:reference_number]) # Nepovinne: Cislo jednaci
+          add_element_to(parcel_params, 'ns2:pallets', value: params[:pallets_count]) # Nepovinne: Pocet palet
+          add_element_to(parcel_params, 'ns2:specSym', value: params[:specific_symbol]) # Nepovinne: Specificky symbol
+          add_element_to(parcel_params, 'ns2:note2', value: params[:note2]) # Nepovinne: Poznamka 2
+          add_element_to(parcel_params, 'ns2:numSign', value: params[:documents_to_sign_count]) # Nepovinne: Počet dokumentů
+          add_element_to(parcel_params, 'ns2:score', value: params[:score]) # Nepovinne: Napocet ceny sluzby
+          add_element_to(parcel_params, 'ns2:orderNumberZPRO', value: params[:zpro_order_number]) # Nepovinne: Cislo objednavky ZPRO
+          add_element_to(parcel_params, 'ns2:returnNumDays', value: params[:days_to_deposit]) # Nepovinne: Pocet dni pro vraceni zasilky
+          add_parcel_services(parcel_params)
+        end
+      end
+
+      def add_parcel_services(parent_element)
+        (parcel[:services] || []).each do |p_service|
+          srv_element = new_element('ns2:doPOLParcelServices').tap do |dps|
+            add_element_to(dps, 'ns2:service', value: p_service)
+          end
+
+          add_element_to(parent_element, srv_element)
+        end
+      end
+
+      def do_parcel_address
+        add_parcel_adress_element('ns2:doPOLParcelAddress', parcel[:addressee])
+      end
+
+      def do_parcel_address_document
+        add_parcel_adress_element('ns2:doPOLParcelAddressDocument', parcel[:document_addressee])
+      end
+
+      def add_parcel_adress_element(element_name, addressee_data) # rubocop:disable Metrics/AbcSize
+        return nil if addressee_data.nil?
+
+        address_data = addressee_data[:address]
+        new_element(element_name).tap do |do_parcel_address|
+          add_element_to(do_parcel_address, 'ns2:recordID', value: addressee_data[:addressee_id]) # Nepovinne: Interni oznaceni adresata
+
+          add_address_elements(do_parcel_address, address_data) # Nepovinne: Adresa
+
+          add_element_to(do_parcel_address, 'ns2:subject', value: addressee_data[:addressee_type]) # Nepovinne: Typ adresata
+          add_element_to(do_parcel_address, 'ns2:ic', value: addressee_data[:ic]) # Nepovinne: ICO
+          add_element_to(do_parcel_address, 'ns2:dic', value: addressee_data[:dic]) # Nepovinne: DIC
+          add_element_to(do_parcel_address, 'ns2:specification', value: addressee_data[:addressee_specification]) # Nepovinne: Specifikace napr. datum narozeni
+
+          add_bank_elements(do_parcel_address, addressee_data[:bank_account]) # Nepovinne. Kod banky, cislo a predcisli uctu
+          add_contact_elements(do_parcel_address, addressee_data) # Nepovinne. Telefon, Mobil a Email
+
+          add_element_to(do_parcel_address, 'ns2:custCardNum', value: addressee_data[:custom_card_number]) # Nepovinne: cislo zakaznicke karty
+
+          (addressee_data[:advice_informations] || []).each_with_index do |adv_info, index|
+            add_element_to(do_parcel_address, 'ns2:adviceInformation' + (index + 1).to_s, value: adv_info) # Nepovinne: Informace 1- 6 k dodejce
+          end
+
+          add_element_to(do_parcel_address, 'ns2:adviceNote', value: addressee_data[:advice_note]) # Nepovinne: Poznamka k dodejce
+        end
+      end
+
+      def do_parcel_customs_declaration
+        declaration_data = parcel[:custom_declaration]
+        return nil if declaration_data.nil?
+
+        new_element('ns2:doPOLParcelCustomsDeclaration').tap do |do_p_customs_declaration|
+          add_element_to(do_p_customs_declaration, 'ns2:category', value: declaration_data[:category]) # Kategorie zasilky
+          add_element_to(do_p_customs_declaration, 'ns2:note', value: declaration_data[:note]) # Nepovinne: Poznamka
+          add_element_to(do_p_customs_declaration, 'ns2:customValCur', value: declaration_data[:value_currency_iso_code]) # ISO kod meny celni hodnoty
+          add_element_to(do_p_customs_declaration, 'ns2:importerRefNum', value: declaration_data[:importer_reference_number]) # Nepovinne: Cislo dovozce
+
+          (declaration_data[:content_descriptions] || []).each do |dsc|
+            do_p_customs_declaration << custom_goods_for(dsc)
+          end
+        end
+      end
+
+      def add_customs_documents_to(parent_element)
+        (parcel[:customs_documents] || []).each do |doc_data| # 0-3 documents
+          doc_element = new_element('ns2:doPOLParcelCustomsDocument').tap do |do_p_customs_document| # VVD dokument
+            add_element_to(do_p_customs_document, 'ns2:recordID', value: doc_data[:record_id]) #  ID Záznamu
+            add_element_to(do_p_customs_document, 'ns2:code', value: doc_data[:code]) # Typ
+            add_element_to(do_p_customs_document, 'ns2:name', value: doc_data[:name]) # Název
+            add_element_to(do_p_customs_document, 'ns2:id', value: doc_data[:id]) # Id
+          end
+
+          add_element_to(parent_element, doc_element)
+        end
+      end
+
+      def custom_goods_for(description_data)
+        new_element('ns2:doPOLParcelCustomsGoods').tap do |do_p_customs_goods|
+          add_element_to(do_p_customs_goods, 'ns2:sequence', value: description_data[:order]) # Nepovinne: Poradi
+          add_element_to(do_p_customs_goods, 'ns2:customCont', value: description_data[:description]) # Nepovinne: Popis zbozi
+          add_element_to(do_p_customs_goods, 'ns2:quantity', value: description_data[:quantity]) # Nepovinne: Mnozstvi
+          add_element_to(do_p_customs_goods, 'ns2:weight', value: description_data[:weight_in_kg]) # Nepovinne: Hmotnost
+          add_element_to(do_p_customs_goods, 'ns2:customVal', value: description_data[:value]) # Nepovinne: Celni hodnota
+          add_element_to(do_p_customs_goods, 'ns2:hsCode', value: description_data[:hs_code]) # Nepovinne: HS kod
+          add_element_to(do_p_customs_goods, 'ns2:iso', value: description_data[:origin_country_iso_code]) # Nepovinne: Zeme puvodu zbozi
+        end
+      end
+
+      # Nepovinne. Adresa
+      def add_address_elements(parent_element, address_data, without: [])
+        return if address_data.nil?
+
+        address_tags_and_values(address_data).each_pair do |xml_tag, value|
+          unless without.include?(xml_tag)
+            add_element_to(parent_element, xml_tag, value: value) unless value.nil?
+          end
+        end
+      end
+
+      def address_tags_and_values(address_data)
+        {
+          'ns2:firstName' => address_data[:first_name], # Nepovinne: Jmeno
+          'ns2:surname' => address_data[:last_name], # Nepovinne: Prijmeni
+          'ns2:companyName' => address_data[:company_name], # Nepovinne: Nazev spolecnosti
+          'ns2:aditionAddress' => address_data[:addition_to_name], # Nepovinne: Doplnujici iformace k nazvu podavatele
+          'ns2:street' => address_data[:street], # Nepovinne: Ulice
+          'ns2:houseNumber' => address_data[:house_number], # Nepovinne: Cislo popisne
+          'ns2:sequenceNumber' => address_data[:sequence_number], # Nepovinne: Cislo orientacni
+          'ns2:partCity' => address_data[:city_part], # Nepovinne: Cast obce
+          'ns2:city' => address_data[:city], # Nepovinne: Obec
+          'ns2:zipCode' => address_data[:post_code], # Nepovinne: PSC
+          'ns2:isoCountry' => address_data[:country_iso_code], # Nepovinne, default 'CZ': ISO kod zeme
+          'ns2:subIsoCountry' => address_data[:subcountry_iso_code] # Nepovinne: ISO kod uzemi
+        }
+      end
+
+      def add_bank_elements(parent_element, bank_account)
+        return if bank_account.to_s == ''
+
+        if (m = bank_account.match(%r{(?:(\d+)-)?(\d+)\/(\d+)}))
+          prefix = m[1]
+          account = m[2]
+          bank = m[3]
+        else
+          prefix, account, bank = nil
+        end
+
+        add_element_to(parent_element, 'ns2:prefixAccount', value: prefix) # Nepovinne: Predcisli k uctu
+        add_element_to(parent_element, 'ns2:account', value: account) # Nepovinne: cislo uctu
+        add_element_to(parent_element, 'ns2:bank', value: bank) # Nepovinne: kod banky
+      end
+
+      def add_contact_elements(parent_element, data_hash)
+        add_element_to(parent_element, 'ns2:mobileNumber', value: data_hash[:mobile_phone]) # Nepovinne: Mobil
+        add_element_to(parent_element, 'ns2:phoneNumber', value: data_hash[:phone]) # Nepovinne: Telefon
+        add_element_to(parent_element, 'ns2:emailAddress', value: data_hash[:email]) # Nepovinne: Email
+      end
+
+      def sender_data
+        common_data[:sender]
+      end
+    end
+  end
+end
+
+# rubocop:enable Layout/LineLength, Style/AsciiComments

data/lib/czech_post_b2b_client/response_parsers.rb

@@ -6,3 +6,4 @@ require 'czech_post_b2b_client/response_parsers/get_parcels_printing_parser'
 require 'czech_post_b2b_client/response_parsers/get_parcel_state_parser'
 require 'czech_post_b2b_client/response_parsers/get_result_parcels_parser'
 require 'czech_post_b2b_client/response_parsers/send_parcels_parser'
+require 'czech_post_b2b_client/response_parsers/parcel_service_sync_parser'

data/lib/czech_post_b2b_client/response_parsers/base_parser.rb

@@ -37,7 +37,7 @@ module CzechPostB2bClient
           request: { created_at: request_data.time_stamp,
                      contract_id: request_data.id_contract,
                      request_id: request_data.id_ext_transaction },
-          response: { created_at: Time.parse(response_header.dig('timeStamp')) }
+          response: { created_at: response_time }
         }
       end
 
@@ -69,6 +69,12 @@ module CzechPostB2bClient
                        id_contract: b2b_request_hash.dig('idContract').to_s)
       end
 
+      def response_time
+        Time.parse(response_header.dig('timeStamp'))
+      rescue TypeError
+        Time.now.utc
+      end
+
       def state_hash_from(hash)
         state_hash = hash || { 'responseCode' => '999', 'responseText' => 'Unknown' }
         state_hash = state_hash.first if state_hash.is_a?(Array) # more <doParcelStateResponse> elements

data/lib/czech_post_b2b_client/response_parsers/get_result_parcels_parser.rb

@@ -42,11 +42,12 @@ module CzechPostB2bClient
 
         return pd_hash if value.nil?
 
-        # more doParcelParamsResult nodes for one parcel_id => probably errors
+        # merging states
+        value[:states] = (value[:states] + pd_hash[:states]).sort { |a, b| a[:code] <=> b[:code] }
+
+        # more parcel_codes for one parcel_id => probably errors
         old_p_code = value[:parcel_code]
         new_p_code = pd_hash[:parcel_code]
-
-        value[:states] = (value[:states] + pd_hash[:states]).sort { |a, b| a[:code] <=> b[:code] }
         if old_p_code != new_p_code
           raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'"
         end

data/lib/czech_post_b2b_client/response_parsers/parcel_service_sync_parser.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'base64'
+
+module CzechPostB2bClient
+  module ResponseParsers
+    class ParcelServiceSyncParser < BaseParser
+      def build_result
+        super
+        @result[:response][:state] = state_hash_from(response_state_response)
+        @result[:parcel] = parcel_data_hash
+      end
+
+      def parcel_data_hash
+        parcel_id = nil
+        pdh = response_parcel_hashes.each_with_object({}) do |rp_hash, result|
+          parcel_id = parcel_parcel_id_from(rp_hash)
+          result[parcel_id] = updated_result_value_for(result[parcel_id], rp_hash)
+        end
+        pdh[parcel_id].merge!(print: print_data_from(response_print_hash))
+
+        pdh
+      end
+
+      def response_root_node_name
+        'parcelServiceSyncResponse'
+      end
+
+      def response_state_response
+        response_root_node.dig('responseHeader', 'resultHeader')
+      end
+
+      def response_parcel_hashes
+        [response_root_node.dig('responseHeader', 'resultParcelData')].flatten.compact # to always get array of hash(es)
+      end
+
+      def response_print_hash
+        response_root_node.dig('responsePrintParams')
+      end
+
+      def parcel_parcel_id_from(rp_hash)
+        rp_hash['recordNumber'].to_s
+      end
+
+      def parcel_data_from(rp_hash)
+        { parcel_code: rp_hash['parcelCode'],
+          states: [state_hash_from(rp_hash.dig('parcelDataResponse'))] }
+      end
+
+      def print_data_from(print_hash)
+        return nil if print_hash.nil? || print_hash.empty?
+
+        { pdf_content: pdf_content_from(print_hash.dig('file')),
+          state: state_hash_from(print_hash.dig('printParamsResponse')) }
+      end
+
+      def pdf_content_from(pdf_content_encoded)
+        return nil if pdf_content_encoded.nil?
+
+        ::Base64.decode64(pdf_content_encoded)
+      end
+
+      def updated_result_value_for(value, parcel_params_result_hash)
+        pd_hash = parcel_data_from(parcel_params_result_hash)
+
+        return pd_hash if value.nil?
+
+        # merging states
+        value[:states] = (value[:states] + pd_hash[:states]).sort { |a, b| a[:code] <=> b[:code] }
+
+        # more parcel_codes for one parcel_id => probably errors
+        old_p_code = value[:parcel_code]
+        new_p_code = pd_hash[:parcel_code]
+        if old_p_code != new_p_code
+          raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'"
+        end
+
+        value
+      end
+    end
+  end
+end

data/lib/czech_post_b2b_client/services.rb

@@ -3,8 +3,9 @@
 require 'czech_post_b2b_client/services/orchestrator'
 require 'czech_post_b2b_client/services/communicator'
 require 'czech_post_b2b_client/services/api_caller'
-require 'czech_post_b2b_client/services/parcels_sender'
-require 'czech_post_b2b_client/services/parcels_immediate_sender'
+require 'czech_post_b2b_client/services/parcels_async_sender'
+require 'czech_post_b2b_client/services/parcels_sync_sender'
+require 'czech_post_b2b_client/services/parcels_sender' # deprecated
 require 'czech_post_b2b_client/services/parcels_send_process_updater'
 require 'czech_post_b2b_client/services/address_sheets_generator'
 require 'czech_post_b2b_client/services/parcels_submission_closer'

data/lib/czech_post_b2b_client/services/parcels_async_sender.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module CzechPostB2bClient
+  module Services
+    class ParcelsAsyncSender < CzechPostB2bClient::Services::Communicator
+      attr_reader :sending_data, :parcels
+
+      def initialize(sending_data:, parcels:)
+        @sending_data = sending_data
+        @parcels = parcels
+      end
+
+      private
+
+      def request_builder_args
+        { common_data: common_data, parcels: parcels }
+      end
+
+      def request_builder_class
+        CzechPostB2bClient::RequestBuilders::SendParcelsBuilder
+      end
+
+      def api_caller_class
+        CzechPostB2bClient::Services::ApiCaller
+      end
+
+      def response_parser_class
+        CzechPostB2bClient::ResponseParsers::SendParcelsParser
+      end
+
+      def common_data
+        data_from_config.merge(sending_data)
+      end
+
+      def data_from_config
+        {
+          contract_id: configuration.contract_id,
+          customer_id: configuration.customer_id,
+          sending_post_office_code: configuration.sending_post_office_code
+        }
+      end
+
+      def endpoint_path
+        '/sendParcels'
+      end
+
+      def build_result_from(response_hash)
+        OpenStruct.new(transaction_id: response_hash.dig(:async_result, :transaction_id),
+                       processing_end_expected_at: response_hash.dig(:async_result, :processing_end_expected_at))
+      end
+    end
+  end
+end

data/lib/czech_post_b2b_client/services/parcels_sender.rb

@@ -2,51 +2,10 @@
 
 module CzechPostB2bClient
   module Services
-    class ParcelsSender < CzechPostB2bClient::Services::Communicator
-      attr_reader :sending_data, :parcels
-
-      def initialize(sending_data:, parcels:)
-        @sending_data = sending_data
-        @parcels = parcels
-      end
-
-      private
-
-      def request_builder_args
-        { common_data: common_data, parcels: parcels }
-      end
-
-      def request_builder_class
-        CzechPostB2bClient::RequestBuilders::SendParcelsBuilder
-      end
-
-      def api_caller_class
-        CzechPostB2bClient::Services::ApiCaller
-      end
-
-      def response_parser_class
-        CzechPostB2bClient::ResponseParsers::SendParcelsParser
-      end
-
-      def common_data
-        data_from_config.merge(sending_data)
-      end
-
-      def data_from_config
-        {
-          contract_id: configuration.contract_id,
-          customer_id: configuration.customer_id,
-          sending_post_office_code: configuration.sending_post_office_code
-        }
-      end
-
-      def endpoint_path
-        '/sendParcels'
-      end
-
-      def build_result_from(response_hash)
-        OpenStruct.new(transaction_id: response_hash.dig(:async_result, :transaction_id),
-                       processing_end_expected_at: response_hash.dig(:async_result, :processing_end_expected_at))
+    class ParcelsSender < CzechPostB2bClient::Services::ParcelsAsyncSender
+      class << self
+        extend Gem::Deprecate
+        deprecate :call, 'CzechPostB2bClient::Services::ParcelsAsyncSender.call', 2020, 8
       end
     end
   end

data/lib/czech_post_b2b_client/services/parcels_submission_closer.rb

@@ -2,7 +2,7 @@
 
 module CzechPostB2bClient
   module Services
-    class ParcelsSubmissionCloser < CzechPostB2bClient::Services::ParcelsSender
+    class ParcelsSubmissionCloser < CzechPostB2bClient::Services::ParcelsAsyncSender
       attr_reader :sending_data
 
       def initialize(sending_data:)

data/lib/czech_post_b2b_client/services/{parcels_immediate_sender.rb → parcels_sync_sender.rb}

@@ -2,10 +2,10 @@
 
 module CzechPostB2bClient
   module Services
-    # Combination of ParcelsSender + ParcelsSendProcessUpdater for fast SYNC registering parcel at CPOST
-    # It accept all parcels or none!
+    # Combination of ParcelsAsyncSender + ParcelsSendProcessUpdater for fast SYNC registering parcel at CPOST
+    # It accept only one parcel!
     # It should be used for instant one parcel registration.
-    class ParcelsImmediateSender < CzechPostB2bClient::Services::Communicator
+    class ParcelsSyncSender < CzechPostB2bClient::Services::Communicator
       attr_reader :sending_data, :parcels
 
       def initialize(sending_data:, parcels:)
@@ -20,11 +20,11 @@ module CzechPostB2bClient
       private
 
       def request_builder_args
-        { common_data: common_data, parcels: parcels }
+        { common_data: common_data, parcel: parcels.first }
       end
 
       def request_builder_class
-        CzechPostB2bClient::RequestBuilders::SendParcelsBuilder
+        CzechPostB2bClient::RequestBuilders::ParcelServiceSyncBuilder
       end
 
       def api_caller_class
@@ -32,7 +32,7 @@ module CzechPostB2bClient
       end
 
       def response_parser_class
-        CzechPostB2bClient::ResponseParsers::GetResultParcelsParser
+        CzechPostB2bClient::ResponseParsers::ParcelServiceSyncParser
       end
 
       def common_data
@@ -48,11 +48,11 @@ module CzechPostB2bClient
       end
 
       def endpoint_path
-        '/sendParcelsSync'
+        '/parcelServiceSync'
       end
 
       def build_result_from(response_hash)
-        OpenStruct.new(parcels_hash: response_hash[:parcels],
+        OpenStruct.new(parcels_hash: response_hash[:parcel],
                        state_text: response_hash.dig(:response, :state, :text),
                        state_code: response_hash.dig(:response, :state, :code))
       end

data/lib/czech_post_b2b_client/services/xsds_downloader.rb

@@ -48,6 +48,8 @@ module CzechPostB2bClient
 
       def save_response_to_file
         filename = xsd_uri.request_uri.split('/').last
+        filename += '.xsd' if filename.split('.').last.downcase != 'xsd'
+
         File.write(filename, response.body)
       end
 

data/lib/czech_post_b2b_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CzechPostB2bClient
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: czech_post_b2b_client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Petr Mlčoch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -516,6 +516,7 @@ files:
 - lib/czech_post_b2b_client/request_builders/get_parcels_printing_builder.rb
 - lib/czech_post_b2b_client/request_builders/get_result_parcels_builder.rb
 - lib/czech_post_b2b_client/request_builders/get_stats_builder.rb
+- lib/czech_post_b2b_client/request_builders/parcel_service_sync_builder.rb
 - lib/czech_post_b2b_client/request_builders/send_parcels_builder.rb
 - lib/czech_post_b2b_client/response_codes.rb
 - lib/czech_post_b2b_client/response_parsers.rb
@@ -524,6 +525,7 @@ files:
 - lib/czech_post_b2b_client/response_parsers/get_parcels_printing_parser.rb
 - lib/czech_post_b2b_client/response_parsers/get_result_parcels_parser.rb
 - lib/czech_post_b2b_client/response_parsers/get_stats_parser.rb
+- lib/czech_post_b2b_client/response_parsers/parcel_service_sync_parser.rb
 - lib/czech_post_b2b_client/response_parsers/send_parcels_parser.rb
 - lib/czech_post_b2b_client/services.rb
 - lib/czech_post_b2b_client/services/address_sheets_generator.rb
@@ -531,10 +533,11 @@ files:
 - lib/czech_post_b2b_client/services/communicator.rb
 - lib/czech_post_b2b_client/services/delivering_inspector.rb
 - lib/czech_post_b2b_client/services/orchestrator.rb
-- lib/czech_post_b2b_client/services/parcels_immediate_sender.rb
+- lib/czech_post_b2b_client/services/parcels_async_sender.rb
 - lib/czech_post_b2b_client/services/parcels_send_process_updater.rb
 - lib/czech_post_b2b_client/services/parcels_sender.rb
 - lib/czech_post_b2b_client/services/parcels_submission_closer.rb
+- lib/czech_post_b2b_client/services/parcels_sync_sender.rb
 - lib/czech_post_b2b_client/services/time_period_statisticator.rb
 - lib/czech_post_b2b_client/services/xsds_downloader.rb
 - lib/czech_post_b2b_client/version.rb