czech_post_b2b_client 1.2.6 → 1.3.0

data/lib/czech_post_b2b_client/response_parsers/send_parcels_parser.rb

@@ -7,8 +7,8 @@ module CzechPostB2bClient
         super
 
         @result[:async_result] = {
-          transaction_id: response_header.dig('idTransaction'),
-          processing_end_expected_at: parse_time_with_correction(response_header.dig('timeStampProcessing'))
+          transaction_id: response_header['idTransaction'],
+          processing_end_expected_at: parse_time_with_correction(response_header['timeStampProcessing'])
         }
       end
 

data/lib/czech_post_b2b_client/services/address_sheets_generator.rb

@@ -5,7 +5,10 @@ module CzechPostB2bClient
     class AddressSheetsGenerator < CzechPostB2bClient::Services::Communicator
       attr_reader :parcel_codes, :options
 
+      AddressSheetsGeneratorResult = Struct.new(:pdf_content, :zpl_content, :state_text, :state_code, keyword_init: true)
+
       def initialize(parcel_codes:, options: {})
+        super()
         @parcel_codes = parcel_codes
         @options = options
       end
@@ -37,9 +40,10 @@ module CzechPostB2bClient
       end
 
       def build_result_from(response_hash)
-        OpenStruct.new(pdf_content: response_hash.dig(:printings, :pdf_content),
-                       state_text: response_hash.dig(:response, :state, :text),
-                       state_code: response_hash.dig(:response, :state, :code))
+        AddressSheetsGeneratorResult.new(pdf_content: response_hash.dig(:printings, :pdf_content),
+                                         zpl_content: response_hash.dig(:printings, :zpl_content),
+                                         state_text: response_hash.dig(:response, :state, :text),
+                                         state_code: response_hash.dig(:response, :state, :code))
       end
 
       def check_for_state_errors

data/lib/czech_post_b2b_client/services/api_caller.rb

@@ -18,7 +18,10 @@ module CzechPostB2bClient
         Net::ProtocolError
       ].freeze
 
+      ApiCallerResult = Struct.new(:code, :xml, keyword_init: true)
+
       def initialize(endpoint_path:, xml:)
+        super()
         @endpoint_path = endpoint_path
         @request_xml = xml
       end
@@ -40,7 +43,7 @@ module CzechPostB2bClient
       def handle_response
         CzechPostB2bClient.logger.debug("CzechPost B2B RESPONSE: #{response} with body:\n#{response.body}")
 
-        @result = ::OpenStruct.new(code: response.code.to_i, xml: response.body)
+        @result = ApiCallerResult.new(code: response.code.to_i, xml: response.body)
         return unless b2b_error?
 
         errors.add(:b2b, b2b_error_text)
@@ -102,12 +105,12 @@ module CzechPostB2bClient
       end
 
       def b2b_error_text
-        err_code_without_namespace_regexp = %r{<(?:\w+\:)?errorCode>(\d+)</(?:\w+\:)?errorCode>}
+        err_code_without_namespace_regexp = %r{<(?:\w+:)?errorCode>(\d+)</(?:\w+:)?errorCode>}
         error_match = result.xml.match(err_code_without_namespace_regexp)
         return 'error code not found in XML' unless error_match
 
         error_code = error_match[1].to_i
-        error_details = result.xml.match(%r{<(?:\w+\:)?errorDescription>(.*)</(?:\w+\:)?errorDescription>})
+        error_details = result.xml.match(%r{<(?:\w+:)?errorDescription>(.*)</(?:\w+:)?errorDescription>})
         error = CzechPostB2bClient::B2BErrors.new_by_code(error_code, error_details[1])
         return "error code [#{error_code}] is unknown" unless error
 
@@ -115,7 +118,7 @@ module CzechPostB2bClient
       end
 
       def handle_connection_error(error)
-        @result = OpenStruct.new(code: 500, xml: '')
+        @result = ApiCallerResult.new(code: 500, xml: '')
         errors.add(:connection, "#{error.class} > #{service_uri} - #{error}")
         fail!
       end

data/lib/czech_post_b2b_client/services/delivering_inspector.rb

@@ -6,6 +6,7 @@ module CzechPostB2bClient
       attr_reader :parcel_codes
 
       def initialize(parcel_codes:)
+        super()
         @parcel_codes = parcel_codes
       end
 

data/lib/czech_post_b2b_client/services/orchestrator.rb

@@ -11,7 +11,7 @@ module CzechPostB2bClient
         service = service_class.call(service_hash.values.first)
 
         if service.failed?
-          errors.add_from_hash(Hash[service_name, service.errors.full_messages])
+          errors.add_from_hash({ service_name => service.errors.full_messages })
           fail!
         end
 

data/lib/czech_post_b2b_client/services/parcels_async_sender.rb

@@ -5,7 +5,10 @@ module CzechPostB2bClient
     class ParcelsAsyncSender < CzechPostB2bClient::Services::Communicator
       attr_reader :sending_data, :parcels
 
+      ParcelsAsyncSenderResult = Struct.new(:transaction_id, :processing_end_expected_at, keyword_init: true)
+
       def initialize(sending_data:, parcels:)
+        super()
         @sending_data = sending_data
         @parcels = parcels
       end
@@ -45,8 +48,8 @@ module CzechPostB2bClient
       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))
+        ParcelsAsyncSenderResult.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

data/lib/czech_post_b2b_client/services/parcels_send_process_updater.rb

@@ -5,7 +5,10 @@ module CzechPostB2bClient
     class ParcelsSendProcessUpdater < CzechPostB2bClient::Services::Communicator
       attr_reader :transaction_id
 
+      ParcelsSendProcessUpdaterResult = Struct.new(:parcels_hash, :state_text, :state_code, keyword_init: true)
+
       def initialize(transaction_id:)
+        super()
         @transaction_id = transaction_id
       end
 
@@ -36,9 +39,11 @@ module CzechPostB2bClient
       end
 
       def build_result_from(response_hash)
-        OpenStruct.new(parcels_hash: response_hash[:parcels],
-                       state_text: response_hash.dig(:response, :state, :text),
-                       state_code: response_hash.dig(:response, :state, :code))
+        ParcelsSendProcessUpdaterResult.new(
+          parcels_hash: response_hash[:parcels],
+          state_text: response_hash.dig(:response, :state, :text),
+          state_code: response_hash.dig(:response, :state, :code)
+        )
       end
 
       def check_for_state_errors

data/lib/czech_post_b2b_client/services/parcels_submission_closer.rb

@@ -6,7 +6,7 @@ module CzechPostB2bClient
       attr_reader :sending_data
 
       def initialize(sending_data:)
-        @sending_data = sending_data
+        super(sending_data: sending_data, parcels: [])
       end
 
       private

data/lib/czech_post_b2b_client/services/parcels_sync_sender.rb

@@ -8,7 +8,10 @@ module CzechPostB2bClient
     class ParcelsSyncSender < CzechPostB2bClient::Services::Communicator
       attr_reader :sending_data, :parcels
 
+      ParcelsSyncSenderResult = Struct.new(:parcels_hash, :state_text, :state_code, :pdf_content, keyword_init: true)
+
       def initialize(sending_data:, parcels:)
+        super()
         @sending_data = sending_data
         @parcels = parcels
       end
@@ -52,10 +55,12 @@ module CzechPostB2bClient
       end
 
       def build_result_from(response_hash)
-        OpenStruct.new(parcels_hash: response_hash[:parcel],
-                       pdf_content: response_hash[:parcel].values.first.dig(:printings, :pdf_content),
-                       state_text: response_hash.dig(:response, :state, :text),
-                       state_code: response_hash.dig(:response, :state, :code))
+        ParcelsSyncSenderResult.new(
+          parcels_hash: response_hash[:parcel],
+          pdf_content: response_hash[:parcel].values.first.dig(:printings, :pdf_content),
+          state_text: response_hash.dig(:response, :state, :text),
+          state_code: response_hash.dig(:response, :state, :code)
+        )
       end
 
       def check_for_state_errors

data/lib/czech_post_b2b_client/services/time_period_statisticator.rb

@@ -5,7 +5,11 @@ module CzechPostB2bClient
     class TimePeriodStatisticator < CzechPostB2bClient::Services::Communicator
       attr_reader :from_date, :to_date
 
+      TimePeriodStatisticatorResult = Struct.new(:requests, :imported_parcels, keyword_init: true)
+      TimePeriodStatisticatorRequestsResult = Struct.new(:total, :with_errors, :successful, keyword_init: true)
+
       def initialize(from_date:, to_date:)
+        super()
         @from_date = from_date
         @to_date = to_date
       end
@@ -34,10 +38,12 @@ module CzechPostB2bClient
 
       def build_result_from(response_hash)
         imports = response_hash[:imports]
-        OpenStruct.new(requests: OpenStruct.new(total: imports[:requested],
-                                                with_errors: imports[:with_errors],
-                                                successful: imports[:successful]),
-                       imported_parcels: imports[:imported_parcels])
+        TimePeriodStatisticatorResult.new(
+          requests: TimePeriodStatisticatorRequestsResult.new(total: imports[:requested],
+                                                              with_errors: imports[:with_errors],
+                                                              successful: imports[:successful]),
+          imported_parcels: imports[:imported_parcels]
+        )
       end
     end
   end

data/lib/czech_post_b2b_client/services/xsds_downloader.rb

@@ -6,7 +6,9 @@ require 'net/http'
 module CzechPostB2bClient
   module Services
     class XsdsDownloader < ApiCaller
-      def initialize(_anything); end
+      def initialize(_anything)
+        super()
+      end
 
       def steps
         %i[download_xsds]

data/lib/czech_post_b2b_client/version.rb

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