czech_post_b2b_client 1.0.0 → 1.0.2

data/lib/czech_post_b2b_client/printing_templates.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
+
 # Available printing templates, which can be used in AdressSheetsGenerator `options[:template_id]`
 #
-# Do not miss `CzechPostB2bClient::PrintingTemplate.all_template_classes` method,
+# Do not miss `CzechPostB2bClient::PrintingTemplates.all_classes` method,
 # it has to be at end of module to work properly
 module CzechPostB2bClient
   module PrintingTemplates
     class Base
       class << self
-        attr_reader :id
-      end
-
-      class << self
-        attr_reader :description
+        attr_reader :id, :description
       end
     end
 
@@ -158,9 +155,9 @@ module CzechPostB2bClient
     end
 
     # has to be at the end, to load all subcasses before
-    def all_template_classes
+    def all_classes
       ObjectSpace.each_object(CzechPostB2bClient::PrintingTemplates::Base.singleton_class)
     end
-    module_function :all_template_classes
+    module_function :all_classes
   end
 end

data/lib/czech_post_b2b_client/request_builders/get_parcels_printing_builder.rb

@@ -12,7 +12,7 @@ module CzechPostB2bClient
       end
 
       def self.allowed_printing_template_classes
-        @allowed_printing_template_classes ||= CzechPostB2bClient::PrintingTemplates.all_template_classes
+        @allowed_printing_template_classes ||= CzechPostB2bClient::PrintingTemplates.all_classes
       end
 
       private

data/lib/czech_post_b2b_client/request_builders/send_parcels_builder.rb

@@ -34,7 +34,7 @@ module CzechPostB2bClient
          [: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(' => :') } }!")
+             errors.add(:common_data, "Missing value for key { :#{key_chain.join(' => :')} }!")
            end
          end
       end
@@ -260,7 +260,7 @@ module CzechPostB2bClient
           '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
+          'ns2:subIsoCountry' => address_data[:subcountry_iso_code] # Nepovinne: ISO kod uzemi
         }
       end
 

data/lib/czech_post_b2b_client/response_codes.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 # Codes, which can be returned in response nodes `doParcelStateResponse`
 #
-# Do not miss `CzechPostB2bClient::ResponseCodes.all_code_classes` and `CzechPostB2bClient::ResponseCodes.new_by_code`,
+# Do not miss `CzechPostB2bClient::ResponseCodes.all_classes` and `CzechPostB2bClient::ResponseCodes.new_by_code`,
 # they have to be at end of module to work properly
 module CzechPostB2bClient
   module ResponseCodes
     class BaseCode
-        @code = 'undefined'
-        @text = '_NONE_'
-        @decription = 'Unspecified B2B response code, is it listed in /doc/.../ResponseCodes.ods'
+      @code = 'undefined'
+      @text = '_NONE_'
+      @decription = 'Unspecified B2B response code, is it listed in /doc/.../ResponseCodes.ods'
 
-      def self.code
-        @code
-      end
+      class << self
+        attr_reader :code
+        end
 
-      def self.text
-        @text
-      end
+      class << self
+        attr_reader :text
+        end
 
-      def self.description
-        @description
-      end
+      class << self
+        attr_reader :description
+        end
 
       def self.error?
         @type == :error
@@ -29,9 +31,9 @@ module CzechPostB2bClient
         @type == :info
       end
 
-      def self.type
-        @type
-      end
+      class << self
+        attr_reader :type
+        end
 
       def self.to_s
         "ResponseCode[#{code} #{text}] #{description}"
@@ -1061,7 +1063,6 @@ module CzechPostB2bClient
       @type = :chyba
     end
 
-
     class AddressSuitableForLocalDelivery < CzechPostB2bClient::ResponseCodes::BaseCode
       @code = 257
       @text = 'INVALID_ADRESS' # no kidding! Like 6 times same text?
@@ -1881,14 +1882,14 @@ module CzechPostB2bClient
       @type = :info
     end
 
-    def all_code_classes
+    def all_classes
       ObjectSpace.each_object(CzechPostB2bClient::ResponseCodes::BaseCode.singleton_class)
     end
 
-    module_function :all_code_classes
+    module_function :all_classes
 
     def new_by_code(code)
-      klass = all_code_classes.detect { |k| k.code == code }
+      klass = all_classes.detect { |k| k.code == code }
       raise "ResponseCode with code: #{code}  is unknown!" unless klass
 
       klass.new
@@ -1897,4 +1898,3 @@ module CzechPostB2bClient
     module_function :new_by_code
   end
 end
-

data/lib/czech_post_b2b_client/response_parsers/base_parser.rb

@@ -22,14 +22,14 @@ module CzechPostB2bClient
                                  strip_namespace: true,
                                  symbolize_keys: false,
                                  mode: :hash_no_attrs)
-      rescue Ox::ParseError => error
-        handle_parsing_error(error)
+      rescue Ox::ParseError => e
+        handle_parsing_error(e)
       end
 
       def safely_build_result
         build_result
-      rescue NoMethodError => error # NoMethodError: undefined method `dig' for nil:NilClass
-        handle_result_building_error(error)
+      rescue NoMethodError => e # NoMethodError: undefined method `dig' for nil:NilClass
+        handle_result_building_error(e)
       end
 
       def build_result
@@ -50,7 +50,9 @@ module CzechPostB2bClient
       end
 
       def response_root_node
-        return response_service_data.dig(response_root_node_name) if response_service_data.keys.include?(response_root_node_name)
+        if response_service_data.keys.include?(response_root_node_name)
+          return response_service_data.dig(response_root_node_name)
+        end
 
         errors.add(:xml, "Cannot find `#{response_root_node_name}` in `serviceData` node.")
         fail_on_structure_parsing
@@ -71,7 +73,7 @@ module CzechPostB2bClient
         state_hash = hash || { 'responseCode' => '999', 'responseText' => 'Unknown' }
         state_hash = state_hash.first if state_hash.is_a?(Array) # more <doParcelStateResponse> elements
 
-        { code: state_hash['responseCode'].to_i, text: state_hash['responseText'].to_s}
+        { code: state_hash['responseCode'].to_i, text: state_hash['responseText'].to_s }
       end
 
       def handle_parsing_error(error)

data/lib/czech_post_b2b_client/response_parsers/get_parcel_state_parser.rb

@@ -27,7 +27,7 @@ module CzechPostB2bClient
       def parcel_data_from(rp_hash)
         {
           parcel_type: rp_hash['parcelType'].to_s,
-          weight_in_kg: rp_hash['weight'].nil? ? nil : rp_hash['weight'].to_f,  # hopefully it is in KG
+          weight_in_kg: rp_hash['weight'].nil? ? nil : rp_hash['weight'].to_f, # hopefully it is in KG
           cash_on_delivery: { amount: (rp_hash['amount'] || 0).to_f, currency_iso_code: rp_hash['currency'].to_s },
           pieces: (rp_hash['quantityParcel'] || 1).to_i,
           deposited_until: rp_hash['depositTo'].nil? ? nil : Date.parse(rp_hash['depositTo']),

data/lib/czech_post_b2b_client/response_parsers/get_parcels_printing_parser.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require "base64"
+
+require 'base64'
 
 module CzechPostB2bClient
   module ResponseParsers

data/lib/czech_post_b2b_client/response_parsers/get_result_parcels_parser.rb

@@ -38,7 +38,7 @@ module CzechPostB2bClient
       end
 
       def updated_result_value_for(value, parcel_params_result_hash)
-        pd_hash=parcel_data_from(parcel_params_result_hash)
+        pd_hash = parcel_data_from(parcel_params_result_hash)
 
         return pd_hash if value.nil?
 
@@ -47,7 +47,9 @@ module CzechPostB2bClient
         new_p_code = pd_hash[:parcel_code]
 
         value[:states] = (value[:states] + pd_hash[:states]).sort { |a, b| a[:code] <=> b[:code] }
-        raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'" if old_p_code != new_p_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

data/lib/czech_post_b2b_client/services.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
+
 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_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/delivering_inspector.rb

@@ -36,10 +36,10 @@ module CzechPostB2bClient
         result_hash = {}
         response_hash[:parcels].each_pair do |parcel_code, delivering_hash|
           result_hash[parcel_code] = {
-              deposited_until: delivering_hash[:deposited_until],
-              deposited_for_days: delivering_hash[:deposited_for_days],
-              current_state: delivering_hash[:states].last,
-              all_states: delivering_hash[:states]
+            deposited_until: delivering_hash[:deposited_until],
+            deposited_for_days: delivering_hash[:deposited_for_days],
+            current_state: delivering_hash[:states].last,
+            all_states: delivering_hash[:states]
           }
         end
         puts("RESULT_HASH: #{result_hash}")

data/lib/czech_post_b2b_client/services/orchestrator.rb

@@ -3,7 +3,6 @@
 module CzechPostB2bClient
   module Services
     class Orchestrator < SteppedService::Base
-
       private
 
       def result_of_subservice(service_hash)

data/lib/czech_post_b2b_client/services/parcels_immediate_sender.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module CzechPostB2bClient
+  module Services
+    # Combination of ParcelsSender + ParcelsSendProcessUpdater for fast SYNC registering parcel at CPOST
+    # It accept all parcels or none!
+    # It should be used for instant one parcel registration.
+    class ParcelsImmediateSender < CzechPostB2bClient::Services::Communicator
+      attr_reader :sending_data, :parcels
+
+      def initialize(sending_data:, parcels:)
+        @sending_data = sending_data
+        @parcels = parcels
+      end
+
+      def steps
+        super + %i[check_for_state_errors]
+      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::GetResultParcelsParser
+      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
+        '/sendParcelsSync'
+      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))
+      end
+
+      def check_for_state_errors
+        return if result.state_code == CzechPostB2bClient::ResponseCodes::Ok.code
+
+        r_code = CzechPostB2bClient::ResponseCodes.new_by_code(result.state_code)
+        errors.add(:response_state, r_code.to_s)
+
+        collect_parcel_errors
+
+        fail! unless r_code.info?
+      end
+
+      def collect_parcel_errors
+        result.parcels_hash.each_pair do |parcel_id, parcel_hash|
+          add_errors_for_failed_states(parcel_id, parcel_hash[:states])
+        end
+      end
+
+      def add_errors_for_failed_states(parcel_id, response_states)
+        response_states.each do |response_state|
+          response_code = response_state[:code]
+          next if response_code == CzechPostB2bClient::ResponseCodes::Ok.code
+
+          errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}")
+        end
+      end
+    end
+  end
+end

data/lib/czech_post_b2b_client/services/parcels_send_process_updater.rb

@@ -61,7 +61,7 @@ module CzechPostB2bClient
       def add_errors_for_failed_states(parcel_id, response_states)
         response_states.each do |response_state|
           response_code = response_state[:code]
-          next if  response_code == CzechPostB2bClient::ResponseCodes::Ok.code
+          next if response_code == CzechPostB2bClient::ResponseCodes::Ok.code
 
           errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}")
         end

data/lib/czech_post_b2b_client/services/time_period_statisticator.rb

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

data/lib/czech_post_b2b_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: czech_post_b2b_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Petr Mlčoch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -508,6 +508,7 @@ files:
 - lib/czech_post_b2b_client.rb
 - lib/czech_post_b2b_client/b2b_errors.rb
 - lib/czech_post_b2b_client/configuration.rb
+- lib/czech_post_b2b_client/post_services.rb
 - lib/czech_post_b2b_client/printing_templates.rb
 - lib/czech_post_b2b_client/request_builders.rb
 - lib/czech_post_b2b_client/request_builders/base_builder.rb
@@ -530,6 +531,7 @@ 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_send_process_updater.rb
 - lib/czech_post_b2b_client/services/parcels_sender.rb
 - lib/czech_post_b2b_client/services/parcels_submission_closer.rb