czech_post_b2b_client 1.2.4 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 468b92710ed75993d00a0f30f9a66a1e40ae8b23607ed92796c9682a0493f237
-  data.tar.gz: c48017f58f179a0dae607662c309a1eabb0b7370f7372521acdfb655983eff44
+  metadata.gz: 5dbbe20befb04e719073a9ebda4cf114d8e546eb90d92a7e08a49fcc270f65c1
+  data.tar.gz: 1de84b51f03160843a22541311f0dd410412bb64ca0cd6e5ef7410ed4d5790d1
 SHA512:
-  metadata.gz: 3b6dd0a6c4bb96f076cb37a42ec1dd0ce08346f28285109079831bf3fe94eb2d45d054156119b80e846b3f22ed9a18f2ded82856f2345b394e05c2c7e0560c2a
-  data.tar.gz: 2a461713e123f67b66d45a02fab03123c75f7a9b968dede63351bbadc123baa74ab7a0be8648124643008602f35d372a5fcaf86d24e768bac4165ec85ceed773
+  metadata.gz: a2af402dee3c7b80de93d86af58d9feccb459ebf05c4eb8f35e6d75195e580575eb458a51e5962d32d643414892f2b939a6483e7b04afd86ca12c7af1550ef33
+  data.tar.gz: cba547aac3305bcee6b7ac7e6d34557c8542fcafbfe46d5a746075593ae47dd097378c7cebd0d22c69dcd9dc33c3563ca56805c54a2b31e37f32c5887d42b258

data/.rubocop.yml

@@ -15,7 +15,7 @@ AllCops:
 Documentation:
   Enabled: false
 Layout/LineLength:
-  Max: 120
+  Max: 140
 Metrics/AbcSize:
   Max: 20
 Metrics/MethodLength:

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All changes to the gem are documented here.
 
+## [1.2.6] - 2020-10-27
+
+ - fixed passing all errors from `parcelsServiceSync` response.
+
+## [1.2.5] - 2020-10-06
+
+ - `errorDescription` from `B2BError` response is now merged into error message.
+
 ## [1.2.4] - 2020-10-06
 
  - Added `configuration.log_messages_at_least_as` option, to be able debug client behaviour when app log level is higher (eg. production)
@@ -48,4 +56,3 @@ Production ready release
 ### Added
 - All the stuff
 
-

data/README.md

@@ -32,7 +32,7 @@ After full usage in production (vyvolej.to, squared.one), we found that Czech PO
 
 *Reality is, that Parcel IS NOT registered!*
 
-They say, that this should be fixed in v1.10 release. But nobody knows, when it will be deployed. And I do not know if there is some public way how to find, which version is now in production.
+They say, that this should be fixed in 2020-10-01 release. But I still can not grab new XSD.
 
 
 # CzechPostB2bClient

data/lib/czech_post_b2b_client/b2b_errors.rb

@@ -35,12 +35,17 @@ module CzechPostB2bClient
         attr_reader :message
       end
 
+      def initialize(details = '')
+        self.details = details
+      end
+
+      attr_accessor :details
       def code
         self.class.code
       end
 
       def message
-        self.class.message
+        "#{self.class.message} -- #{details}"
       end
     end
 
@@ -94,11 +99,11 @@ module CzechPostB2bClient
       ObjectSpace.each_object(CzechPostB2bClient::B2BErrors::BaseError.singleton_class)
     end
 
-    def self.new_by_code(code)
+    def self.new_by_code(code, details = '')
       klass = all_error_classes.detect { |k| k.code == code }
       raise "B2BError with code: #{code} is unknown!" unless klass
 
-      klass.new
+      klass.new(details)
     end
   end
 end

data/lib/czech_post_b2b_client/logger.rb

@@ -14,7 +14,6 @@ module CzechPostB2bClient
     end
 
     def log(original_level, message)
-      puts("#{message} #{original_level} => #{modified_log_level(original_level)}")
       target_logger.send(modified_log_level(original_level), message)
     end
 

data/lib/czech_post_b2b_client/request_builders/get_parcels_printing_builder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Layout/LineLength
-
 module CzechPostB2bClient
   module RequestBuilders
     class GetParcelsPrintingBuilder < BaseBuilder
@@ -79,5 +77,3 @@ module CzechPostB2bClient
     end
   end
 end
-
-# rubocop:enable Layout/LineLength

data/lib/czech_post_b2b_client/request_builders/parcel_service_sync_builder.rb

@@ -38,9 +38,7 @@ module CzechPostB2bClient
          [: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
+           errors.add(:common_data, "Missing value for key { :#{key_chain.join(' => :')} }!") if value.nil? || value == ''
          end
       end
 
@@ -63,36 +61,38 @@ module CzechPostB2bClient
             errors.add(:parcel, "Missing value for key { :#{key_chain.join(' => :')} } for parcel (parcel_id: '#{parcel_id}')!")
           end
         end
+
+        # TODO: check custom goods if present
       end
 
       def parcel_service_sync
         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
+          add_element_to(ps_sync_request, do_parcel_data) # REQUIRED
         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:customerID', value: common_data[:customer_id]) # Nepovinne: 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)
+          add_element_to(parcel_header, print_params) # Nepovinne
         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_params) # 1-5x
           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)
+          add_element_to(do_parcel_data, do_parcel_address_document) # 0-1x
+          add_element_to(do_parcel_data, do_parcel_customs_declaration) # 0-1x
+          add_customs_documents_to(do_parcel_data) # 0-3x
         end
       end
 
@@ -223,6 +223,7 @@ module CzechPostB2bClient
           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
 
+          # 0-99x
           (declaration_data[:content_descriptions] || []).each do |dsc|
             do_p_customs_declaration << custom_goods_for(dsc)
           end
@@ -244,13 +245,13 @@ module CzechPostB2bClient
 
       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].to_i) # Nepovinne: Poradi , cisl0 1-20
-          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
+          add_element_to(do_p_customs_goods, 'ns2:sequence', value: description_data[:order].to_i) # Poradi , cisl0 1-20
+          add_element_to(do_p_customs_goods, 'ns2:customCont', value: description_data[:description]) # Popis zbozi
+          add_element_to(do_p_customs_goods, 'ns2:quantity', value: description_data[:quantity]) # Mnozstvi
+          add_element_to(do_p_customs_goods, 'ns2:weight', value: description_data[:weight_in_kg]) # Hmotnost
+          add_element_to(do_p_customs_goods, 'ns2:customVal', value: description_data[:value]) # Celni hodnota
+          add_element_to(do_p_customs_goods, 'ns2:hsCode', value: description_data[:hs_code]) # HS kod
+          add_element_to(do_p_customs_goods, 'ns2:iso', value: description_data[:origin_country_iso_code]) # Zeme puvodu zbozi
         end
       end
 

data/lib/czech_post_b2b_client/request_builders/send_parcels_builder.rb

@@ -35,9 +35,7 @@ module CzechPostB2bClient
          [: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
+           errors.add(:common_data, "Missing value for key { :#{key_chain.join(' => :')} }!") if value.nil? || value == ''
          end
       end