spree_cm_commissioner 2.0.3.pre.pre3 → 2.0.3.pre.pre4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (193) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/test_and_build_gem.yml +2 -16
  3. data/.gitignore +1 -2
  4. data/Gemfile.lock +1 -28
  5. data/Rakefile +4 -33
  6. data/app/assets/stylesheets/spree_cm_commissioner/backend/calendar.scss +11 -8
  7. data/app/controllers/concerns/spree_cm_commissioner/transit/taxon_bitwise.rb +44 -0
  8. data/app/controllers/spree/admin/stock_managements_controller.rb +1 -63
  9. data/app/controllers/spree/api/v2/operator/event_charts_controller.rb +2 -8
  10. data/app/controllers/spree/api/v2/storefront/accommodations_controller.rb +31 -14
  11. data/app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb +2 -2
  12. data/app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb +20 -0
  13. data/app/jobs/spree_cm_commissioner/application_job.rb +0 -20
  14. data/app/jobs/spree_cm_commissioner/application_unique_job.rb +0 -20
  15. data/app/models/concerns/spree_cm_commissioner/line_item_durationable.rb +15 -9
  16. data/app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb +12 -2
  17. data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb +0 -39
  18. data/app/models/concerns/spree_cm_commissioner/product_delegation.rb +3 -1
  19. data/app/models/concerns/spree_cm_commissioner/product_type.rb +0 -10
  20. data/app/models/concerns/spree_cm_commissioner/route_type.rb +1 -1
  21. data/app/models/concerns/spree_cm_commissioner/taxon_kind.rb +1 -1
  22. data/app/models/spree_cm_commissioner/branch.rb +12 -0
  23. data/app/models/spree_cm_commissioner/guest.rb +0 -18
  24. data/app/models/spree_cm_commissioner/line_item_decorator.rb +78 -46
  25. data/app/models/spree_cm_commissioner/line_item_seat.rb +10 -0
  26. data/app/models/spree_cm_commissioner/notification_taxon.rb +1 -1
  27. data/app/models/spree_cm_commissioner/option_type_decorator.rb +11 -1
  28. data/app/models/spree_cm_commissioner/option_value_vehicle_type.rb +8 -0
  29. data/app/models/spree_cm_commissioner/order_decorator.rb +1 -30
  30. data/app/models/spree_cm_commissioner/place.rb +4 -1
  31. data/app/models/spree_cm_commissioner/product_decorator.rb +6 -10
  32. data/app/models/spree_cm_commissioner/service_calendar.rb +2 -0
  33. data/app/models/spree_cm_commissioner/state_decorator.rb +1 -0
  34. data/app/models/spree_cm_commissioner/stock/availability_checker.rb +25 -26
  35. data/app/models/spree_cm_commissioner/stock/availability_validator_decorator.rb +1 -2
  36. data/app/models/spree_cm_commissioner/stock/line_item_availability_checker.rb +3 -3
  37. data/app/models/spree_cm_commissioner/stock_item_decorator.rb +0 -17
  38. data/app/models/spree_cm_commissioner/stop.rb +23 -0
  39. data/app/models/spree_cm_commissioner/taxon_decorator.rb +1 -0
  40. data/app/models/spree_cm_commissioner/taxonomy_decorator.rb +6 -0
  41. data/app/models/spree_cm_commissioner/trip.rb +10 -12
  42. data/app/models/spree_cm_commissioner/trip_connection.rb +5 -5
  43. data/app/models/spree_cm_commissioner/trip_stop.rb +21 -10
  44. data/app/models/spree_cm_commissioner/variant_decorator.rb +47 -37
  45. data/app/models/spree_cm_commissioner/variant_options.rb +23 -0
  46. data/app/models/spree_cm_commissioner/vehicle.rb +16 -11
  47. data/app/models/spree_cm_commissioner/vehicle_seat.rb +11 -0
  48. data/app/models/spree_cm_commissioner/vehicle_type.rb +76 -0
  49. data/app/models/spree_cm_commissioner/vendor_decorator.rb +14 -11
  50. data/app/models/spree_cm_commissioner/vendor_place.rb +3 -13
  51. data/app/models/spree_cm_commissioner/vendor_stop.rb +10 -0
  52. data/app/queries/spree_cm_commissioner/trip_query.rb +131 -110
  53. data/app/queries/spree_cm_commissioner/trip_search_query.rb +76 -0
  54. data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb +45 -0
  55. data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb +55 -0
  56. data/app/queries/spree_cm_commissioner/vendor_stop_place_query.rb +54 -0
  57. data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb +0 -3
  58. data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb +1 -1
  59. data/app/serializers/spree/v2/storefront/accommodation_serializer.rb +0 -2
  60. data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb +0 -1
  61. data/app/services/spree_cm_commissioner/vehicle_option_value_creator.rb +11 -0
  62. data/app/views/spree/admin/stock_managements/_variant_stock_items.html.erb +2 -7
  63. data/app/views/spree/admin/stock_managements/index.html.erb +6 -55
  64. data/config/initializers/spree_permitted_attributes.rb +0 -5
  65. data/config/routes.rb +2 -24
  66. data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb +1 -3
  67. data/docker-compose.yml +1 -1
  68. data/lib/cm_app_logger.rb +4 -11
  69. data/lib/generators/spree_cm_commissioner/install/install_generator.rb +11 -14
  70. data/lib/generators/spree_cm_commissioner/install/templates/app/javascript/{spree_dashboard/spree_cm_commissioner → spree_cm_commissioner}/utilities.js +0 -4
  71. data/lib/spree_cm_commissioner/calendar_event.rb +1 -11
  72. data/lib/spree_cm_commissioner/test_helper/factories/branch_factory.rb +12 -0
  73. data/lib/spree_cm_commissioner/test_helper/factories/departure_time_option_type_factory.rb +8 -0
  74. data/lib/spree_cm_commissioner/test_helper/factories/duration_option_type_factory.rb +8 -0
  75. data/lib/spree_cm_commissioner/test_helper/factories/guest_factory.rb +0 -10
  76. data/lib/spree_cm_commissioner/test_helper/factories/homepage_section_relatable_factory.rb +1 -1
  77. data/lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb +1 -1
  78. data/lib/spree_cm_commissioner/test_helper/factories/line_item_seat_factory.rb +7 -0
  79. data/lib/spree_cm_commissioner/test_helper/factories/option_type_factory.rb +30 -6
  80. data/lib/spree_cm_commissioner/test_helper/factories/order_factory.rb +36 -0
  81. data/lib/spree_cm_commissioner/test_helper/factories/product_factory.rb +34 -18
  82. data/lib/spree_cm_commissioner/test_helper/factories/stock_location_factory.rb +2 -2
  83. data/lib/spree_cm_commissioner/test_helper/factories/stop_factory.rb +14 -0
  84. data/lib/spree_cm_commissioner/test_helper/factories/transit_place_factory.rb +8 -0
  85. data/lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb +3 -11
  86. data/lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb +19 -41
  87. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_factory.rb +1 -1
  88. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_option_type_factory.rb +8 -0
  89. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_type_factory.rb +96 -0
  90. data/lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb +1 -6
  91. data/lib/spree_cm_commissioner/test_helper/factories/vendor_place_factory.rb +1 -13
  92. data/lib/spree_cm_commissioner/trip_query_result.rb +0 -16
  93. data/lib/spree_cm_commissioner/trip_result.rb +10 -12
  94. data/lib/spree_cm_commissioner/trip_seat_layout_result.rb +11 -0
  95. data/lib/spree_cm_commissioner/version.rb +1 -1
  96. data/lib/spree_cm_commissioner.rb +1 -35
  97. data/spree_cm_commissioner.gemspec +0 -7
  98. metadata +26 -154
  99. data/app/controllers/spree/admin/inventory_items_controller.rb +0 -83
  100. data/app/controllers/spree/api/v2/storefront/accommodations/variants_controller.rb +0 -42
  101. data/app/controllers/spree/api/v2/storefront/trip_search_controller.rb +0 -60
  102. data/app/finders/spree_cm_commissioner/accommodations/find.rb +0 -37
  103. data/app/finders/spree_cm_commissioner/accommodations/find_variant.rb +0 -32
  104. data/app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb +0 -40
  105. data/app/interactors/spree_cm_commissioner/inventory_item_syncer.rb +0 -25
  106. data/app/interactors/spree_cm_commissioner/stock/inventory_item_resetter.rb +0 -44
  107. data/app/interactors/spree_cm_commissioner/stock/inventory_items_adjuster.rb +0 -13
  108. data/app/interactors/spree_cm_commissioner/stock/inventory_items_generator.rb +0 -15
  109. data/app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb +0 -75
  110. data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb +0 -32
  111. data/app/interactors/spree_cm_commissioner/taxi_trip_creator.rb +0 -66
  112. data/app/interactors/spree_cm_commissioner/variant_block_updater.rb +0 -62
  113. data/app/interactors/spree_cm_commissioner/vehicle_updater.rb +0 -41
  114. data/app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb +0 -7
  115. data/app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb +0 -7
  116. data/app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb +0 -11
  117. data/app/jobs/spree_cm_commissioner/stock/inventory_items_generator_job.rb +0 -11
  118. data/app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb +0 -9
  119. data/app/models/concerns/spree_cm_commissioner/order_seatable.rb +0 -44
  120. data/app/models/concerns/spree_cm_commissioner/vehicle_type.rb +0 -11
  121. data/app/models/spree_cm_commissioner/block.rb +0 -43
  122. data/app/models/spree_cm_commissioner/inventory.rb +0 -11
  123. data/app/models/spree_cm_commissioner/inventory_item.rb +0 -69
  124. data/app/models/spree_cm_commissioner/price_decorator.rb +0 -9
  125. data/app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb +0 -41
  126. data/app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb +0 -126
  127. data/app/models/spree_cm_commissioner/redis_stock/line_items_cached_inventory_items_builder.rb +0 -36
  128. data/app/models/spree_cm_commissioner/redis_stock/variant_cached_inventory_items_builder.rb +0 -25
  129. data/app/models/spree_cm_commissioner/reserved_block.rb +0 -30
  130. data/app/models/spree_cm_commissioner/seat_layout.rb +0 -20
  131. data/app/models/spree_cm_commissioner/seat_section.rb +0 -16
  132. data/app/models/spree_cm_commissioner/seats/blocks_canceler.rb +0 -30
  133. data/app/models/spree_cm_commissioner/seats/blocks_holder.rb +0 -53
  134. data/app/models/spree_cm_commissioner/seats/blocks_reserver.rb +0 -49
  135. data/app/models/spree_cm_commissioner/seats/errors/blocks_are_on_hold_by_other_guest.rb +0 -4
  136. data/app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_other_guest.rb +0 -4
  137. data/app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_same_guest.rb +0 -4
  138. data/app/models/spree_cm_commissioner/seats/errors/unable_to_save_reserved_block_record.rb +0 -4
  139. data/app/models/spree_cm_commissioner/stock/order_availability_checker.rb +0 -44
  140. data/app/models/spree_cm_commissioner/variant_block.rb +0 -9
  141. data/app/request_schemas/spree_cm_commissioner/trip_search_request_schema.rb +0 -20
  142. data/app/request_schemas/spree_cm_commissioner/variant_request_schema.rb +0 -19
  143. data/app/serializers/spree/v2/storefront/amenity_serializer.rb +0 -15
  144. data/app/serializers/spree/v2/storefront/trip_query_result_serializer.rb +0 -14
  145. data/app/serializers/spree/v2/storefront/trip_result_serializer.rb +0 -16
  146. data/app/serializers/spree/v2/storefront/trip_vehicle_serializer.rb +0 -11
  147. data/app/serializers/spree/v2/storefront/trip_vendor_serializer.rb +0 -13
  148. data/app/views/spree/admin/inventory_items/show.html.erb +0 -72
  149. data/app/views/spree/admin/stock_managements/calendar.html.erb +0 -56
  150. data/config/initializers/paper_trail.rb +0 -1
  151. data/db/migrate/20250122000000_move_route_type_from_vehicles_to_trips.rb +0 -7
  152. data/db/migrate/20250304293518_create_cm_inventory_items.rb +0 -21
  153. data/db/migrate/20250429094228_add_lock_version_to_cm_inventory_items.rb +0 -5
  154. data/db/migrate/20250502025848_add_index_to_spree_products.rb +0 -5
  155. data/db/migrate/20250502030001_add_product_type_to_spree_variants.rb +0 -5
  156. data/db/migrate/20250502030002_add_product_type_to_spree_line_items.rb +0 -5
  157. data/db/migrate/20250603035256_add_inventory_item_to_spree_prices.rb +0 -7
  158. data/db/migrate/20250619073724_drop_table_cm_line_item_seats.rb +0 -5
  159. data/db/migrate/20250619073812_drop_table_cm_vehicle_seats.rb +0 -5
  160. data/db/migrate/20250619073844_drop_table_cm_vehicle_types.rb +0 -9
  161. data/db/migrate/20250619073957_drop_table_cm_option_value_vehicle_types.rb +0 -5
  162. data/db/migrate/20250619082354_remove_unnecessary_fields_from_cm_places.rb +0 -9
  163. data/db/migrate/20250619082736_remove_route_type_from_spree_products.rb +0 -5
  164. data/db/migrate/20250619083055_remove_unnecessary_fields_from_spree_taxons.rb +0 -5
  165. data/db/migrate/20250620083055_remove_variant_id_from_cm_trips.rb +0 -5
  166. data/db/migrate/20250620090000_update_cm_trip_connections_to_use_cm_trips.rb +0 -6
  167. data/db/migrate/20250620090001_create_cm_seat_layouts.rb +0 -17
  168. data/db/migrate/20250620090002_create_cm_seat_sections.rb +0 -18
  169. data/db/migrate/20250620090003_create_cm_blocks.rb +0 -18
  170. data/db/migrate/20250624091005_create_cm_reserved_blocks.rb +0 -29
  171. data/db/migrate/20250626083642_create_cm_variant_blocks.rb +0 -24
  172. data/db/migrate/20250627023314_add_block_id_to_cm_guests.rb +0 -13
  173. data/db/migrate/20250716022821_add_location_reference_to_cm_vendor_places.rb +0 -5
  174. data/db/migrate/20250716031743_drop_table_cm_vendor_stops.rb +0 -5
  175. data/db/migrate/20250717023824_add_vendor_reference_to_cm_trips.rb +0 -5
  176. data/db/migrate/20250717041414_add_location_place_reference_to_cm_trip_stops.rb +0 -5
  177. data/db/migrate/20250717042539_rename_cm_trip_stops_stop_id_column_to_stop_place_id.rb +0 -7
  178. data/db/migrate/20250717042707_rename_cm_trips_origin_and_destination_to_origin_place_and_destination_place.rb +0 -11
  179. data/db/migrate/20250721080738_add_vehicle_type_to_cm_vehicles.rb +0 -7
  180. data/db/migrate/20250725092713_add_block_type_to_cm_blocks.rb +0 -5
  181. data/db/migrate/20250731062816_add_departure_time_and_arrival_time_to_trip_stop.rb +0 -6
  182. data/lib/spree_cm_commissioner/cached_inventory_item.rb +0 -23
  183. data/lib/spree_cm_commissioner/test_helper/factories/block_factory.rb +0 -16
  184. data/lib/spree_cm_commissioner/test_helper/factories/inventory_item_factory.rb +0 -9
  185. data/lib/spree_cm_commissioner/test_helper/factories/reserved_block_factory.rb +0 -27
  186. data/lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb +0 -11
  187. data/lib/spree_cm_commissioner/test_helper/factories/seat_section_factory.rb +0 -16
  188. data/lib/spree_cm_commissioner/test_helper/factories/trip_connection_factory.rb +0 -6
  189. data/lib/spree_cm_commissioner/test_helper/factories/trip_stop_factory.rb +0 -10
  190. data/lib/spree_cm_commissioner/test_helper/factories/variant_block_factory.rb +0 -7
  191. data/lib/tasks/create_default_non_permanent_inventory_items.rake +0 -16
  192. data/lib/tasks/ensure_correct_product_type.rake +0 -7
  193. data/lib/tasks/generate_inventory_items.rake +0 -7
@@ -1,23 +0,0 @@
1
- module SpreeCmCommissioner
2
- class CachedInventoryItem
3
- attr_reader :inventory_key, :active, :quantity_available, :inventory_item_id, :variant_id
4
-
5
- def initialize(inventory_key:, active:, quantity_available:, inventory_item_id:, variant_id:)
6
- @inventory_key = inventory_key
7
- @active = active
8
- @quantity_available = quantity_available
9
- @inventory_item_id = inventory_item_id
10
- @variant_id = variant_id
11
- end
12
-
13
- def active?
14
- active
15
- end
16
-
17
- def to_h
18
- instance_variables.each_with_object({}) do |var, hash|
19
- hash[var.to_s.delete('@').to_sym] = instance_variable_get(var)
20
- end
21
- end
22
- end
23
- end
@@ -1,16 +0,0 @@
1
- FactoryBot.define do
2
- factory :cm_block, class: SpreeCmCommissioner::Block do
3
- label { "Block #{rand(1.0..100.0)}" }
4
- block_type { :seat }
5
-
6
- association :seat_section, factory: :cm_seat_section
7
-
8
- width { rand(10.0..100.0) }
9
- height { rand(10.0..100.0) }
10
-
11
- x { rand(0.0..500.0) }
12
- y { rand(0.0..500.0) }
13
-
14
- rotation { rand(-180.0..180.0) }
15
- end
16
- end
@@ -1,9 +0,0 @@
1
- FactoryBot.define do
2
- factory :cm_inventory_item, class: SpreeCmCommissioner::InventoryItem do
3
- variant { create(:cm_variant) }
4
- max_capacity { 10 }
5
- quantity_available { 10 }
6
- product_type { 'accommodation' }
7
- inventory_date { Date.today }
8
- end
9
- end
@@ -1,27 +0,0 @@
1
- FactoryBot.define do
2
- factory :cm_reserved_block, class: SpreeCmCommissioner::ReservedBlock do
3
- association :inventory_item, factory: :cm_inventory_item
4
- association :block, factory: :cm_block
5
- association :guest, factory: :guest
6
- association :updated_by, factory: :user
7
-
8
- status { :on_hold } # or :reserved, :canceled based on enum
9
- inventory_date { Time.current }
10
- expired_at { 10.minutes.from_now }
11
-
12
- trait :reserved do
13
- status { :reserved }
14
- expired_at { nil }
15
- end
16
-
17
- trait :on_hold do
18
- status { :on_hold }
19
- expired_at { 8.minutes.from_now }
20
- end
21
-
22
- trait :canceled do
23
- status { :canceled }
24
- expired_at { nil }
25
- end
26
- end
27
- end
@@ -1,11 +0,0 @@
1
- FactoryBot.define do
2
- factory :cm_seat_layout, class: SpreeCmCommissioner::SeatLayout do
3
- association :layoutable, factory: :cm_vehicle
4
-
5
- name { "Layout #{rand(1.0..50.0)}" }
6
- status { :active }
7
-
8
- width { rand(200.0..1000.0) }
9
- height { rand(200.0..1000.0) }
10
- end
11
- end
@@ -1,16 +0,0 @@
1
- FactoryBot.define do
2
- factory :cm_seat_section, class: SpreeCmCommissioner::SeatSection do
3
- name { "Section #{rand(1.0..50.0)}" }
4
-
5
- association :seat_layout, factory: :cm_seat_layout
6
-
7
- width { rand(50.0..500.0) }
8
- height { rand(50.0..500.0) }
9
-
10
- x { rand(0.0..500.0) }
11
- y { rand(0.0..500.0) }
12
-
13
- rotation { rand(-180.0..180.0) }
14
- shape_path { "M0,0 L10,0 L10,10 L0,10 Z" }
15
- end
16
- end
@@ -1,6 +0,0 @@
1
- FactoryBot.define do
2
- factory :cm_trip_connection, class: SpreeCmCommissioner::TripConnection do
3
- from_trip_id { create(:cm_trip) }
4
- to_trip_id { create(:cm_trip) }
5
- end
6
- end
@@ -1,10 +0,0 @@
1
- FactoryBot.define do
2
- factory :cm_trip_stop, class: SpreeCmCommissioner::TripStop do
3
- association :trip, factory: :cm_trip
4
- association :stop_place, factory: :cm_place
5
- association :location_place, factory: :cm_place
6
-
7
- stop_type { :boarding }
8
- stop_name { stop_place.name }
9
- end
10
- end
@@ -1,7 +0,0 @@
1
- FactoryBot.define do
2
- factory :cm_variant_block, class: SpreeCmCommissioner::VariantBlock do
3
- association :variant, factory: :cm_variant
4
- association :trip, factory: :cm_trip
5
- association :block, factory: :cm_block
6
- end
7
- end
@@ -1,16 +0,0 @@
1
- # recommend to be used in schedule.yml & manually access in /sidekiq/cron
2
- namespace :spree_cm_commissioner do
3
- desc 'Create default inventory items for non-permanent stock products'
4
- task create_default_non_permanent_inventory_items: :environment do
5
- Spree::Variant.active.with_non_permanent_stock.find_each do |variant|
6
- total_purchases = variant.complete_line_items.sum(:quantity).to_i || 0
7
- max_capacity = variant.total_on_hand || 0
8
- quantity_available = [max_capacity - total_purchases, 0].max
9
-
10
- variant.create_default_non_permanent_inventory_item!(
11
- max_capacity: max_capacity,
12
- quantity_available: quantity_available
13
- )
14
- end
15
- end
16
- end
@@ -1,7 +0,0 @@
1
- # recommend to be used in schedule.yml & manually access in /sidekiq/cron
2
- namespace :spree_cm_commissioner do
3
- desc 'Ensure product_type in variants, line_items, inventory_items are correct with product'
4
- task ensure_correct_product_type: :environment do
5
- SpreeCmCommissioner::EnsureCorrectProductTypeJob.perform_now
6
- end
7
- end
@@ -1,7 +0,0 @@
1
- # recommend to be used in schedule.yml & schedule run it everyday
2
- namespace :spree_cm_commissioner do
3
- desc 'Generate inventory items for permanent_stock variants.'
4
- task generate_inventory_items: :environment do
5
- SpreeCmCommissioner::Stock::PermanentInventoryItemsGeneratorJob.perform_now
6
- end
7
- end