gillbus 0.20.7 → 0.20.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e0833d277086c53aa7b0c7200cc08f82a8c4afab04ab9f734e921efe9a8653
-  data.tar.gz: e9032330fad73fc9d6481145a7addb761a6c2f8b045c6eb27b5cebfeede07034
+  metadata.gz: f8361c79694f78a6bf0e69712d72128d8ece89e53677eab24b5534b5662e096b
+  data.tar.gz: 4e0efe0e59ffd350698ded2cc7a6fbd70ec097703e6ff84f69a56ed0bfb0766f
 SHA512:
-  metadata.gz: 3a113a7163c1c480b69657eb4aa4a9fdf7c8b19e5999f2a4e37eeeae3bca0edf7da783fd4eaa5cb6af4cf2d364ed143ac5bca0048d570f32e4cb4b15a1cd2585
-  data.tar.gz: 827dbfde7454a93a01d6391620c58e4640f28fdc835f61ba96e3974d3023c8c3feb6204dfd081761b525e3d07c3814bba68fc7e44c960b8e16179970dc1691d8
+  metadata.gz: fb84cdcebde50aa95fc7a0d181c9e3ae93817921d0630e09a296b7995acc25cb3646f76801f8b81da31db792178bd21fbeb67695c1dd12b3cd4c79f075362879
+  data.tar.gz: 4e4b7b34efd3975617d71e788dc885b901ab1a320551364f818826169b5e552bae95d1fc125cda57ace11e8e55365cc1a3272f1b670da8ccb7aab4f42e6aa296

data/lib/gillbus/structs/ticket.rb

@@ -283,6 +283,8 @@ class Gillbus
 
     field :is_online_refund, :bool
 
+    field :is_baggage, :bool
+
     parser do
       def ticket_status(value)
         ::Gillbus::Ticket::STATUS_MAPPING[value]

data/lib/gillbus/tickets_booking.rb

@@ -147,11 +147,29 @@ class Gillbus
         # Величина скидки в валюте продажи для пассажира с порядковым номером 0…N.
         attr_accessor :discount
 
+        # passenger0baggageCount... passengerNbaggageCount (не обязательный)
+        # На рейс без сегментов
+        # Количество мест багажа для пассажира с порядковым номером 0...N.
+        attr_accessor :baggage
+
+        # passenger0segment0baggageCount... passengerNsegmentMbaggageCount
+        # На рейс с сегментами
+        # Количество мест багажа для пассажира 0...N на сегмент 0...M
+        attr_accessor :segments_baggage
 
         attr_accessor :insurance_id
         attr_accessor :insurance_cost
 
         def params(prefix = '')
+          # [0, 1] => {'segment0baggageCount' => 0, 'segment1baggageCount' => 1}
+          prepared_segments_baggage =
+            if segments_baggage
+              segments_baggage.map.with_index do |baggage_count, index|
+                ["segment#{index}baggageCount".to_sym, baggage_count]
+              end.to_h
+            else
+              {}
+            end
           compact(
             birthday: date(birthday),
             ISIC: isic,
@@ -168,6 +186,8 @@ class Gillbus
             discountValue: discount.to_f.to_s,
             insuranceId: insurance_id,
             insurance: insurance_cost,
+            baggageCount: baggage&.first, # baggage используется для односегментных
+            **prepared_segments_baggage,
           ).map { |k, v| [:"#{prefix}#{k}", v] }.to_h
         end
 

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = '0.20.7'.freeze
+  VERSION = '0.20.8'.freeze
 end

data/test/responses/ticketsBooking.xml

@@ -71,5 +71,6 @@
         <VAT>3.33</VAT>
         <CURRENCY>UAH</CURRENCY>
     </COMMISSION>
+    <IS_BAGGAGE>true</IS_BAGGAGE>
 </TICKET>
 </DATA>

data/test/tickets_booking_test.rb

@@ -12,4 +12,67 @@ class TicketsBookingTest < Minitest::Test
   def test_total
     assert_equal(Money.new(110_00, 'UAH'), tickets_booking.tickets.first.total_amount)
   end
+
+  def test_params_generation_with_no_baggage
+    request = Gillbus::TicketsBooking::Request.new(
+      passengers: [
+        { },
+        { },
+      ],
+    )
+    expected_params = {
+      passenger0discountValue: '0.0',
+      passenger1discountValue: '0.0',
+    }
+    assert_equal expected_params, request.params
+  end
+
+  def test_params_generation_with_baggage_with_one_segment
+    request = Gillbus::TicketsBooking::Request.new(
+      passengers: [
+        {
+          baggage: [1],
+        },
+        {
+          baggage: [2],
+        }
+      ],
+    )
+    expected_params = {
+      passenger0discountValue: '0.0',
+      passenger0baggageCount: 1,
+      passenger1discountValue: '0.0',
+      passenger1baggageCount: 2,
+    }
+    assert_equal expected_params, request.params
+  end
+
+  def test_params_generation_with_baggage_with_two_segments
+    request = Gillbus::TicketsBooking::Request.new(
+      passengers: [
+        {
+          segments_baggage: [0, 1],
+        },
+        {
+          segments_baggage: [1, 0],
+        }
+      ],
+    )
+    expected_params = {
+      passenger0discountValue: '0.0',
+      passenger0segment0baggageCount: 0,
+      passenger0segment1baggageCount: 1,
+      passenger1discountValue: '0.0',
+      passenger1segment0baggageCount: 1,
+      passenger1segment1baggageCount: 0,
+    }
+    assert_equal expected_params, request.params
+  end
+
+  def test_parse_is_baggage_field
+    response = tickets_booking
+    ticket = response.tickets.first
+
+    assert_equal true, ticket.is_baggage
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.20.7
+  version: 0.20.8
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport