spree_cm_commissioner 1.10.0.pre.pre1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91babac12da4e1fc7e8083b3cb07936fd5a7b7af45217ef38b2a47fc3bed9ca
-  data.tar.gz: b5831b6964e0ea47ac4a6c7c2355330c9ed8386c160ec482ab8201100321a0cf
+  metadata.gz: 634d4cd6a4373be586e59598dab82c2440eb292abe53abeeb1161e6bfca85da2
+  data.tar.gz: 3e0e4f5293ce46f30d227269baf174b7b8b3a32ac269a30b733f3e7ea1065aca
 SHA512:
-  metadata.gz: 8f229d110a73433c448dece4554dfc99f60e0b9208e5260282b7b48c2f2869a9431700b8f418ba0ed0f00a6369924acf370506dc22234d678c157a4984b6d49d
-  data.tar.gz: b0913cc8c5bfc42042bd78bc23a3e13050b7cd39e9cbf315ae6f0f99dad38ce3984c1f042d34b95d29688c51ce9c9f67b38c450a857063659f395c297233bb3f
+  metadata.gz: 7830251cadb15def91fb9d7bc6c6c68dacb3af529d941f6c1d17364f3dd621c2e3539bf24d7d870d0b82e88f2309d78ab895de19219144192dd8924f1a1943b1
+  data.tar.gz: 64bbba3e3a8227f1788748ac27ee108d8f3ad93d89829336f53817556eb6a7e67fd4c43263ce6aa57e087df046139db1c9a665f57411634e1648d8dbd55b9f33

data/.github/workflows/test_and_build_gem.yml

@@ -133,14 +133,12 @@ jobs:
           bundle install --jobs 4 --retry 3
 
       - name: Quality
-        if: github.event_name == 'pull_request'
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
         run: |
           bundle exec rubocop
 
       - name: Security
-        if: github.event_name == 'pull_request'
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
         run: |

data/.gitignore

@@ -28,5 +28,4 @@ node_modules
 # VScode
 .vscode
 !.vscode/.settings.json
-.env
-vendor/bundle/
+.env

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.10.0.pre.pre1)
+    spree_cm_commissioner (1.10.0)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -42,7 +42,6 @@ PATH
       aws-sdk-s3
       blazer (~> 3.0.4)
       byebug
-      connection_pool
       counter_culture (~> 3.2)
       dry-validation (~> 1.10)
       elasticsearch (~> 8.5)
@@ -58,8 +57,6 @@ PATH
       phonelib
       premailer-rails
       rails (~> 7.0.4)
-      redis
-      redis-rails
       rqrcode (~> 2.0)
       searchkick (~> 5.1)
       simple_calendar (~> 2.4)
@@ -620,8 +617,6 @@ GEM
       activesupport (>= 2.3.14)
     racc (1.7.1)
     rack (2.2.8)
-    rack-session (1.0.2)
-      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)
@@ -665,24 +660,8 @@ GEM
     rbtree (0.4.6)
     redis (5.0.7)
       redis-client (>= 0.9.0)
-    redis-actionpack (5.5.0)
-      actionpack (>= 5)
-      redis-rack (>= 2.1.0, < 4)
-      redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.3.0)
-      activesupport (>= 3, < 8)
-      redis-store (>= 1.3, < 2)
     redis-client (0.17.0)
       connection_pool
-    redis-rack (3.0.0)
-      rack-session (>= 0.2.0)
-      redis-store (>= 1.2, < 2)
-    redis-rails (5.0.2)
-      redis-actionpack (>= 5.0, < 6)
-      redis-activesupport (>= 5.0, < 6)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.11.0)
-      redis (>= 4, < 6)
     regexp_parser (2.8.2)
     representable (3.2.0)
       declarative (< 0.1.0)

data/app/controllers/spree/admin/stock_managements_controller.rb

@@ -12,25 +12,9 @@ module Spree
       def index
         @variants = @product.variants.includes(:images, stock_items: :stock_location, option_values: :option_type)
         @variants = [@product.master] if @variants.empty?
-        @stock_locations = (@variants.flat_map(&:stock_locations) + @product.vendor.stock_locations).uniq
-
-        load_inventories unless @product.permanent_stock?
-      end
-
-      def calendar
-        @year = params[:year].present? ? params[:year].to_i : Time.zone.today.year
 
-        from_date = Date.new(@year, 1, 1).beginning_of_year
-        to_date = Date.new(@year, 1, 1).end_of_year
-
-        @inventory_items = @product.inventory_items.includes(:variant).where(inventory_date: from_date..to_date).to_a
-        @events = SpreeCmCommissioner::CalendarEvent.from_inventory_items(@inventory_items)
-      end
-
-      private
+        @stock_locations = (@variants.flat_map(&:stock_locations) + @product.vendor.stock_locations).uniq
 
-      def load_inventories
-        @inventory_items = @product.inventory_items.group_by { |item| item.variant.id }
         @reserved_stocks = Spree::LineItem
                            .complete
                            .where(variant_id: @variants.pluck(:id))

data/app/controllers/spree/api/v2/storefront/accommodations_controller.rb

@@ -5,38 +5,55 @@ module Spree
         class AccommodationsController < ::Spree::Api::V2::ResourceController
           private
 
-          # override
           def collection
-            @collection ||= SpreeCmCommissioner::Accommodations::Find.new(
-              from_date: params[:from_date]&.to_date,
-              to_date: params[:to_date]&.to_date,
-              state_id: params[:state_id],
-              number_of_adults: params[:number_of_adults].to_i,
-              number_of_kids: params[:number_of_kids].to_i
-            ).execute
+            @collection ||= collection_finder.call(params: params).value
+          end
+
+          def paginated_collection
+            return @paginated_collection if defined?(@paginated_collection)
+
+            @paginated_collection = super
+            @paginated_collection = apply_service_availability(@paginated_collection)
           end
 
-          # override
           def resource
-            @resource ||= collection.find(params[:id])
+            resource = resource_finder.call(params: params).value
+            raise ActiveRecord::RecordNotFound if resource.nil?
+
+            apply_service_availability(resource)
+          end
+
+          def apply_service_availability(resource)
+            SpreeCmCommissioner::ApplyServiceAvailability.call(calendarable: resource,
+                                                               from_date: params[:from_date].to_date,
+                                                               to_date: params[:to_date].to_date
+                                                              ).value
           end
 
-          # override
           def allowed_sort_attributes
             super << :min_price << :max_price
           end
 
-          # override
+          def model_class
+            Spree::Vendor
+          end
+
           def resource_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
-          # override
           def collection_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
-          # override
+          def collection_finder
+            SpreeCmCommissioner::AccommodationSearchDetail
+          end
+
+          def resource_finder
+            SpreeCmCommissioner::AccommodationSearchDetail
+          end
+
           def required_schema
             SpreeCmCommissioner::AccommodationRequestSchema
           end

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -25,8 +25,10 @@ module SpreeCmCommissioner
     end
 
     def verify_signature
+      public_key = ENV['VATTANAC_PUBLIC_KEY'].presence || Rails.application.credentials.vattanac.public_key
+
       rsa_service = SpreeCmCommissioner::RsaService.new(
-        public_key: vattanac_public_key
+        public_key: public_key
       )
 
       return if rsa_service.verify(context.encrypted_data, context.signature)
@@ -35,6 +37,8 @@ module SpreeCmCommissioner
     end
 
     def decrypt_payload
+      aes_key = ENV['VATTANAC_AES_SECRET_KEY'].presence || Rails.application.credentials.vattanac.aes_secret_key
+
       context.fail!(message: 'Invalid AES key length', status: :unprocessable_entity) unless aes_key
 
       begin
@@ -95,41 +99,18 @@ module SpreeCmCommissioner
 
     def construct_data
       user = context.user
-
-      raw_data = {
+      context.data = {
         sessionId: session_id,
         name: user.full_name,
         phone: user.phone_number,
         email: user.email,
         webUrl: "#{Spree::Store.default.formatted_url}/vattanac_bank_web_app?session_id=#{session_id}"
       }
-
-      json_data = raw_data.to_json
-
-      encrypted_data = SpreeCmCommissioner::AesEncryptionService.encrypt(json_data, aes_key)
-
-      rsa_service = SpreeCmCommissioner::RsaService.new(private_key: bookmeplus_private_key)
-
-      signed_data = rsa_service.sign(encrypted_data)
-
-      context.data = signed_data
     end
 
     def session_id
       payload = { user_id: context.user.id }
       SpreeCmCommissioner::UserSessionJwtToken.encode(payload, context.user.reload.secure_token)
     end
-
-    def aes_key
-      ENV['VATTANAC_AES_SECRET_KEY'].presence || Rails.application.credentials.vattanac.aes_secret_key
-    end
-
-    def bookmeplus_private_key
-      ENV['BOOKMEPLUS_PRIVATE_KEY'].presence || Rails.application.credentials.bookmeplus.private_key
-    end
-
-    def vattanac_public_key
-      ENV['VATTANAC_PUBLIC_KEY'].presence || Rails.application.credentials.vattanac.public_key
-    end
   end
 end

data/app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb

@@ -20,6 +20,7 @@ module SpreeCmCommissioner
       vehicle_id
       origin
       destination
+      place_id
     ].freeze
 
     RESERVED_OPTIONS = {
@@ -47,8 +48,8 @@ module SpreeCmCommissioner
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
       'seat-number-positions' => 'array',
-      'origin' => 'origin',
-      'destination' => 'destination',
+      'origin' => 'place_id',
+      'destination' => 'place_id',
       'departure-time' => 'time',
       'vehicle' => 'vehicle_id',
       'allow-seat-selection' => 'boolean'

data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb

@@ -13,13 +13,10 @@ module SpreeCmCommissioner
       state_machine.after_transition to: :complete, do: :notify_order_complete_telegram_notification_to_user, unless: :subscription?
       state_machine.after_transition to: :complete, do: :send_order_complete_telegram_alert_to_vendors, unless: :need_confirmation?
       state_machine.after_transition to: :complete, do: :send_order_complete_telegram_alert_to_store, unless: :need_confirmation?
-      state_machine.around_transition to: :complete, do: :handle_unstock_in_redis
 
       state_machine.after_transition to: :resumed, do: :precalculate_conversion
-      state_machine.around_transition to: :resumed, do: :handle_unstock_in_redis
 
       state_machine.after_transition to: :canceled, do: :precalculate_conversion
-      state_machine.after_transition to: :canceled, do: :restock_inventory_in_redis!
 
       scope :accepted, -> { where(request_state: 'accepted') }
 
@@ -69,29 +66,6 @@ module SpreeCmCommissioner
       end
     end
 
-    def handle_unstock_in_redis
-      ActiveRecord::Base.transaction do
-        yield # Equal to block.call
-
-        # After the transition is complete, the following code will execute first before proceeding to other `after_transition` callbacks.
-        # This ensures that if `unstock_inventory_in_redis!` fails, the state will be rolled back,
-        # and neither the `finalize!` method nor any notifications will be triggered.
-        # The payment will be reversed in vPago gem, and `Spree::Checkout::Complete` will be called, which checks `order.reload.complete?`.
-        # This is critical because if the order state is complete, the payment will be marked as paid.
-        CmAppLogger.log(label: 'order_state_machine_before_unstock', data: { order_id: id, state: state })
-        unstock_inventory_in_redis!
-        # We rollback only order state, and we keep payment state as it is.
-        # We implement payment in vPago gem, and it will be reversed in the gem.
-        # Some bank has api for refund, but some don't have the api to refund yet. So we keep the payment state as it is and refund manually.
-        CmAppLogger.log(label: 'order_state_machine_after_unstock', data: { order_id: id, state: state })
-      end
-    rescue StandardError => e
-      CmAppLogger.log(label: 'order_state_machine',
-                      data: { order_id: id, error: e.message, type: e.class.name, backtrace: e.backtrace.first(5).join("\n") }
-                     )
-      raise e
-    end
-
     def generate_bib_number
       line_items.find_each(&:generate_remaining_guests)
 

data/app/models/concerns/spree_cm_commissioner/product_type.rb

@@ -6,20 +6,10 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     PRODUCT_TYPES = %i[accommodation service ecommerce transit].freeze
-    PERMANENT_STOCK_PRODUCT_TYPES = %w[accommodation service transit].freeze
-    PRE_INVENTORY_DAYS = { 'transit' => 90, 'accommodation' => 365, 'service' => 30 }.freeze
 
     included do
       enum product_type: PRODUCT_TYPES if table_exists? && column_names.include?('product_type')
       enum primary_product_type: PRODUCT_TYPES if table_exists? && column_names.include?('primary_product_type')
     end
-
-    def permanent_stock?
-      PERMANENT_STOCK_PRODUCT_TYPES.include?(product_type)
-    end
-
-    def pre_inventory_days
-      PRE_INVENTORY_DAYS[product_type]
-    end
   end
 end

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -9,7 +9,6 @@ module SpreeCmCommissioner
       base.has_one :google_wallet, class_name: 'SpreeCmCommissioner::GoogleWallet', through: :product
 
       base.has_many :option_types, through: :product
-      base.has_many :inventory_items, through: :variant
       base.has_many :taxons, class_name: 'Spree::Taxon', through: :product
       base.has_many :guests, class_name: 'SpreeCmCommissioner::Guest', dependent: :destroy
       base.has_many :pending_guests, pending_guests_query, class_name: 'SpreeCmCommissioner::Guest', dependent: :destroy

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -58,13 +58,6 @@ module SpreeCmCommissioner
       end
     end
 
-    # override
-    # spree use this method to check stock availability & consider whether :order can continue to next state.
-    def insufficient_stock_lines
-      checker = SpreeCmCommissioner::Stock::OrderAvailabilityChecker.new(self)
-      checker.insufficient_stock_lines
-    end
-
     def ticket_seller_user?
       return false if user.nil?
 
@@ -201,14 +194,6 @@ module SpreeCmCommissioner
 
     private
 
-    def unstock_inventory_in_redis!
-      SpreeCmCommissioner::RedisStock::InventoryUpdater.new(line_item_ids).unstock!
-    end
-
-    def restock_inventory_in_redis!
-      SpreeCmCommissioner::RedisStock::InventoryUpdater.new(line_item_ids).restock!
-    end
-
     # override :spree_api
     def webhook_payload_body
       resource_serializer.new(

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -33,7 +33,6 @@ module SpreeCmCommissioner
       base.has_one :google_wallet, class_name: 'SpreeCmCommissioner::GoogleWallet', dependent: :destroy
 
       base.has_many :complete_line_items, through: :classifications, source: :line_items
-      base.has_many :inventory_items, through: :variants
 
       base.has_many :product_places, class_name: 'SpreeCmCommissioner::ProductPlace', dependent: :destroy
       base.has_many :places, through: :product_places

data/app/models/spree_cm_commissioner/stock/availability_checker.rb

@@ -1,49 +1,47 @@
 module SpreeCmCommissioner
   module Stock
     class AvailabilityChecker
-      attr_reader :variant, :options, :error_message
+      attr_reader :variant, :error_message
 
-      def initialize(variant, options = {})
+      def initialize(variant)
         @variant = variant
-        @options = options
         @error_message = nil
       end
 
-      def can_supply?(quantity = 1)
+      def can_supply?(quantity = 1, options = {})
         return false unless variant.available?
         return true unless variant.should_track_inventory?
         return true if variant.backorderable?
         return true if variant.need_confirmation?
 
-        variant_available?(quantity)
-      end
-
-      def variant_available?(quantity = 1)
-        return false if cached_inventory_items.empty?
-
-        cached_inventory_items.all? do |cached_inventory_item|
-          cached_inventory_item.active? && cached_inventory_item.quantity_available >= quantity
-        end
-      end
-
-      def cached_inventory_items
-        return @cached_inventory_items if defined?(@cached_inventory_items)
+        # when delivery required, shipment will dynamically add / remove unit from stock item.
+        # so we can directly check can_supply with stock items directly.
+        return variant.stock_items.sum(:count_on_hand) >= quantity if variant.delivery_required?
 
         if variant.permanent_stock?
-          return [] if options[:from_date].blank? || options[:to_date].blank?
-
-          @cached_inventory_items = builder_klass.new(
-            variant_id: variant.id,
-            from_date: options[:from_date].to_date,
-            to_date: options[:to_date].to_date
-          ).call
+          permanent_stock_variant_available?(quantity, options)
         else
-          @cached_inventory_items = builder_klass.new(variant_id: variant.id).call
+          variant_available?(quantity, options)
         end
       end
 
-      def builder_klass
-        ::SpreeCmCommissioner::RedisStock::VariantCachedInventoryItemsBuilder
+      def variant_available?(quantity = 1, options = {})
+        query = SpreeCmCommissioner::VariantAvailability::NonPermanentStockQuery.new(
+          variant: variant,
+          except_line_item_id: options[:except_line_item_id]
+        )
+        result = query.available?(quantity)
+        @error_message = query.error_message unless result
+        result
+      end
+
+      def permanent_stock_variant_available?(quantity = 1, options = {})
+        SpreeCmCommissioner::VariantAvailability::PermanentStockQuery.new(
+          variant: variant,
+          from_date: options[:from_date].to_date,
+          to_date: options[:to_date].to_date,
+          except_line_item_id: options[:except_line_item_id]
+        ).available?(quantity)
       end
     end
   end

data/app/models/spree_cm_commissioner/stock/availability_validator_decorator.rb

@@ -3,8 +3,7 @@ module SpreeCmCommissioner
     module AvailabilityValidatorDecorator
       # override
       def item_available?(line_item, quantity)
-        SpreeCmCommissioner::Stock::LineItemAvailabilityChecker.new(line_item)
-                                                               .can_supply?(quantity)
+        SpreeCmCommissioner::Stock::LineItemAvailabilityChecker.new(line_item).can_supply?(quantity)
       end
     end
   end

data/app/models/spree_cm_commissioner/stock/line_item_availability_checker.rb

@@ -8,14 +8,14 @@ module SpreeCmCommissioner
       end
 
       def can_supply?(quantity)
-        ::SpreeCmCommissioner::Stock::AvailabilityChecker.new(line_item.variant, options)
-                                                         .can_supply?(quantity)
+        AvailabilityChecker.new(line_item.variant).can_supply?(quantity, options)
       end
 
       def options
         {
           from_date: line_item.from_date,
-          to_date: line_item.to_date
+          to_date: line_item.to_date,
+          except_line_item_id: line_item.id
         }
       end
     end

data/app/models/spree_cm_commissioner/trip_connection.rb

@@ -5,6 +5,7 @@ module SpreeCmCommissioner
 
     validate :both_trip_cannot_be_the_same
     before_validation :calculate_connection_time_minutes
+    validates :from_trip_id, uniqueness: { scope: :to_trip_id }
 
     private
 

data/app/models/spree_cm_commissioner/trip_stop.rb

@@ -13,11 +13,11 @@ module SpreeCmCommissioner
     validates :stop_id, uniqueness: { scope: :trip_id }
 
     def set_stop_name
-      self.stop_name = stop.name
+      self.stop_name = stop.name if stop.present?
     end
 
     def create_vendor_stop
-      vendor.vendor_stops.where(stop_id: stop_id, stop_type: stop_type).first_or_create
+      vendor.vendor_stops.where(stop_id: stop_id, stop_type: stop_type).first_or_create if trip.present?
     end
 
     private

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -1,7 +1,6 @@
 module SpreeCmCommissioner
   module VariantDecorator
     def self.prepended(base)
-      base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::VariantOptionsConcern
 
@@ -22,16 +21,14 @@ module SpreeCmCommissioner
       base.has_many :variant_guest_card_class, class_name: 'SpreeCmCommissioner::VariantGuestCardClass'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variant_guest_card_class
 
-      base.has_many :inventory_items, class_name: 'SpreeCmCommissioner::InventoryItem'
-
       base.scope :subscribable, -> { active.joins(:product).where(product: { subscribable: true, status: :active }) }
-      base.scope :with_permanent_stock, -> { joins(:product).where(product: { product_type: base::PERMANENT_STOCK_PRODUCT_TYPES }) }
-      base.scope :with_non_permanent_stock, -> { joins(:product).where.not(product: { product_type: base::PERMANENT_STOCK_PRODUCT_TYPES }) }
-
       base.has_one :trip,
                    class_name: 'SpreeCmCommissioner::Trip'
+      base.has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy, foreign_key: :trip_id
       base.accepts_nested_attributes_for :option_values
+      base.has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', foreign_key: :trip_id, dependent: :destroy
       base.after_commit :sync_trip, if: -> { product.product_type == 'transit' }
+      base.accepts_nested_attributes_for :trip_stops, allow_destroy: true
     end
 
     def delivery_required?
@@ -47,24 +44,12 @@ module SpreeCmCommissioner
       super || product.discontinued?
     end
 
-    def event
-      taxons.event.first
-    end
-
-    def default_inventory_item_exist?
-      inventory_items.exists?(inventory_date: nil)
+    def permanent_stock?
+      accommodation?
     end
 
-    def create_default_non_permanent_inventory_item!(quantity_available: nil, max_capacity: nil)
-      return if product_type.blank? # handle in case product not exist for variant.
-      return unless should_track_inventory?
-      return if default_inventory_item_exist?
-
-      inventory_items.create!(
-        product_type: product_type,
-        quantity_available: [0, quantity_available || total_on_hand].max,
-        max_capacity: [0, max_capacity || total_on_hand].max
-      )
+    def event
+      taxons.event.first
     end
 
     # override
@@ -87,12 +72,23 @@ module SpreeCmCommissioner
     end
 
     # override
-    def in_stock?(options = {})
-      SpreeCmCommissioner::Stock::AvailabilityChecker.new(self, options).can_supply?
+    def in_stock?
+      available_quantity.positive?
     end
 
     private
 
+    def total_purchases
+      Spree::LineItem.complete.where(variant_id: id).sum(:quantity).to_i
+    end
+
+    def available_quantity
+      stock_count = stock_items.sum(&:count_on_hand)
+      return stock_count if delivery_required?
+
+      stock_count - total_purchases
+    end
+
     def update_vendor_price
       return unless vendor.present? && product&.product_type == vendor&.primary_product_type
 

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -166,19 +166,5 @@ module SpreeCmCommissioner
         Time.zone.parse(time) if time.present?
       end
     end
-
-    def arrival_time
-      @arrival_time ||= departure_time + total_duration_in_minutes.minutes
-    end
-
-    def total_duration_in_minutes
-      total_duration_in_minutes = 0
-
-      total_duration_in_minutes += duration_in_hours * 60 if duration_in_hours.present?
-      total_duration_in_minutes += duration_in_minutes if duration_in_minutes.present?
-      total_duration_in_minutes += duration_in_seconds / 60 if duration_in_seconds.present?
-
-      total_duration_in_minutes
-    end
   end
 end