spree_cm_commissioner 2.12.6 → 2.12.7.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed84dcf2382e8d3720366acd62551189adfa4edba9533d8ca5e94b0704942836
-  data.tar.gz: aa37bf6b43593f7f7ff91d71d1839b1ceeeb8c9271d5db371451f94958399366
+  metadata.gz: 4f4e6fad42b4e85ffc7259488c4594acea3dd6949dfbbd5dca113cff65740f7f
+  data.tar.gz: 81a670727506c0b79c5b18789c0b88bd042cc7a5b94318d49616251389b88129
 SHA512:
-  metadata.gz: a5b89052a82aedeed1144cf9a5892e3d8ec2428c3a4cd26cc5806010c1bbcc3ad353a768e6854c3fdaf69a2ae2fdb5f6f049616b7cac1b2a9d3cd532344708d3
-  data.tar.gz: 7842ce22211f5e072e308efda5f4f5a0b95625729d18388ec6c3c22406fd76b4e5577daca6d5a9f717fd28990639d3897b3a0d58c1d18bebd2c1959f152b7b80
+  metadata.gz: 16e72d5ccf30ad000ba4377824ce84a8245104f55835a8e298ca5d93117fdaf06f0a1f6adeef544dae996e5cf527980669129f6230068f7eb6a445d021dcd2b2
+  data.tar.gz: 1688cbabe227af883abc06175772c009ecf138433ff180a197f668010db60298c49ac113eb33027c9c63bd14a2d7b80e403ab246961b8c3af94381d40763b668

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.12.6)
+    spree_cm_commissioner (2.12.7.pre.pre1)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/blazer/queries_controller_decorator.rb

@@ -1,7 +1,7 @@
 module Blazer
   module QueriesControllerDecorator
     def query_params
-      params.require(:query).permit(:name, :description, :statement, :data_source, :preset)
+      params.require(:query).permit(:name, :description, :statement, :data_source)
     end
   end
 end

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

@@ -0,0 +1,43 @@
+module Spree
+  module Admin
+    class BlazerQueriesController < Spree::Admin::ResourceController
+      STATEMENT_PLACEHOLDER = '-- write your SQL for this query in Blazer'.freeze
+
+      def index
+        @search = model_class.ransack(params[:q])
+        @collection = @search.result
+                             .order(created_at: :desc)
+                             .page(params[:page])
+                             .per(25)
+      end
+
+      private
+
+      def model_class
+        Blazer::Query
+      end
+
+      def object_name
+        'blazer_query'
+      end
+
+      def collection_url
+        admin_blazer_queries_url
+      end
+
+      def location_after_save
+        return blazer.edit_query_path(@object) if action_name == 'create'
+
+        edit_admin_blazer_query_path(@object)
+      end
+
+      def build_resource
+        model_class.new(statement: STATEMENT_PLACEHOLDER, data_source: Blazer.data_sources.keys.first)
+      end
+
+      def permitted_resource_params
+        params.require(:blazer_query).permit(:name, :description, :data_source, :preset)
+      end
+    end
+  end
+end

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

@@ -14,6 +14,8 @@ module Spree
       end
 
       def update_telegram_chat
+        @vendor.update(preferred_telegram_alert_channels: submitted_alert_channels_mask)
+
         context = ::SpreeCmCommissioner::TelegramChatsFinder.call(
           telegram_chat_name: params['vendor']['preferred_telegram_chat_name'],
           telegram_chat_type: params['vendor']['preferred_telegram_chat_type']
@@ -34,6 +36,19 @@ module Spree
         redirect_to collection_url(@vendor)
       end
 
+      # OR the bits, never sum them. Sum is not idempotent: if the same bit arrives twice
+      # (duplicated checkbox, double-submit, hand-crafted post) 1 + 1 = 2, which silently means
+      # google_form instead of spree. ["0","1","1","16"].sum => 18 => [google_form, offline_sell];
+      # the same input OR'd => 17 => [spree, offline_sell].
+      #
+      # Masking against the known bits also drops junk from a crafted post (999 => 7).
+      def submitted_alert_channels_mask
+        known = SpreeCmCommissioner::OrderChannelBitwise::CHANNEL_ALERT_BITS.values.reduce(:|)
+
+        Array(params.dig(:vendor, :telegram_alert_channels))
+          .reduce(0) { |acc, value| acc | value.to_i } & known
+      end
+
       # @overrided
       def model_class
         Spree::User

data/app/factory/spree_cm_commissioner/order_telegram_message_factory.rb

@@ -22,7 +22,7 @@
 # Delivery Address: #123, St. 456, Phnom Penh
 
 module SpreeCmCommissioner
-  class OrderTelegramMessageFactory < TelegramMessageFactory
+  class OrderTelegramMessageFactory < TelegramMessageFactory # rubocop:disable Metrics/ClassLength
     attr_reader :order, :vendor, :show_details_link
 
     def initialize(title:, order:, subtitle: nil, show_details_link: nil, vendor: nil)
@@ -57,10 +57,20 @@ module SpreeCmCommissioner
       text << italic("👉 #{line_item.options_text}") if line_item.options_text.present?
       text << italic(pretty_date_for(line_item)) if pretty_date_for(line_item).present?
       text << italic("🏪 #{line_item.vendor.name}") if line_item.vendor&.name.present? && vendor.blank?
+      text << seat_labels_text(line_item) if seat_labels_text(line_item).present?
 
       text.compact.join("\n")
     end
 
+    def seat_labels_text(line_item)
+      return nil unless line_item.required_seat_selection?
+
+      labels = line_item.guests_with_blocks.includes(:block).map { |guest| guest.block&.label }.compact
+      return nil if labels.empty?
+
+      "Seat: #{labels.join(', ')}"
+    end
+
     def pretty_date_for(line_item)
       return nil unless line_item.date_present?
 
@@ -150,11 +160,14 @@ module SpreeCmCommissioner
     def transit_line_item_content(line_item)
       text = []
       route_text = transit_route_text(line_item)
+      vehicle_text = transit_vehicle_text(line_item)
       departure_text = transit_departure_text(line_item)
       text << bold('🚗 Trip Details')
       text << "Route: #{route_text}" if route_text.present?
+      text << "Vehicle: #{vehicle_text}" if vehicle_text.present?
       text << "Passengers: #{line_item.passenger_count || line_item.quantity}"
       text << "Departure: #{departure_text}" if departure_text.present?
+      text << seat_labels_text(line_item) if seat_labels_text(line_item).present?
 
       text.compact.join("\n")
     end
@@ -165,10 +178,12 @@ module SpreeCmCommissioner
 
       origin = trip.origin_place&.name
       destination = trip.destination_place&.name
-      vehicle = trip.vehicle_type&.name
 
-      parts = [origin, destination].compact_blank.join(' → ')
-      vehicle.present? ? "#{parts} (#{vehicle})" : parts
+      [origin, destination].compact_blank.join(' → ')
+    end
+
+    def transit_vehicle_text(line_item)
+      trip_for(line_item)&.vehicle_type&.name
     end
 
     def transit_departure_text(line_item)

data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_job.rb

@@ -23,13 +23,14 @@ module SpreeCmCommissioner
         "line_item:#{options[:line_item_ids].compact.uniq.sort.join(':')}"
       end
 
-      # :line_item_ids, :inventory_id_and_quantities, :caller_source
+      # :line_item_ids, :inventory_id_and_quantities, :caller_source, :correlation_id
       #
       # :caller_source is a string like "ClassName#method" identifying who enqueued the job.
       def bulk_adjust_quantities!(options = {})
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantities.call!(
           inventory_id_and_quantities: options[:inventory_id_and_quantities],
-          caller_source: options[:caller_source]
+          caller_source: options[:caller_source],
+          correlation_id: options[:correlation_id]
         )
       end
     end

data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_convert_job.rb

@@ -32,14 +32,15 @@ module SpreeCmCommissioner
           .join(',')
       end
 
-      # :order_id, :inventory_id_and_quantities, :caller_source
+      # :order_id, :inventory_id_and_quantities, :caller_source, :correlation_id
       def bulk_adjust_quantities_on_convert(options = {})
         raise ArgumentError, 'order_id is required' if options[:order_id].blank?
         raise ArgumentError, 'inventory_id_and_quantities is required' if options[:inventory_id_and_quantities].blank?
 
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnConvert.call(
           inventory_id_and_quantities: options[:inventory_id_and_quantities],
-          caller_source: options[:caller_source]
+          caller_source: options[:caller_source],
+          correlation_id: options[:correlation_id]
         )
       end
     end

data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_hold_job.rb

@@ -38,7 +38,7 @@ module SpreeCmCommissioner
           .join(',')
       end
 
-      # :order_id, :inventory_id_and_quantities, :caller_source
+      # :order_id, :inventory_id_and_quantities, :caller_source, :correlation_id
       #
       # :order_id is used for unique idempotency key generation to prevent duplicate
       # processing, though it's not used in the adjustment itself.
@@ -49,7 +49,8 @@ module SpreeCmCommissioner
 
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnHold.call(
           inventory_id_and_quantities: options[:inventory_id_and_quantities],
-          caller_source: options[:caller_source]
+          caller_source: options[:caller_source],
+          correlation_id: options[:correlation_id]
         )
       end
     end

data/app/models/blazer/query_decorator.rb

@@ -0,0 +1,9 @@
+module Blazer
+  module QueryDecorator
+    def ransackable_attributes(auth_object = nil)
+      super & %w[name description data_source preset created_at updated_at]
+    end
+  end
+end
+
+Blazer::Query.singleton_class.prepend(Blazer::QueryDecorator) unless Blazer::Query.singleton_class.ancestors.include?(Blazer::QueryDecorator)

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

@@ -0,0 +1,70 @@
+# Owns everything about an order's `channel`: the allowed values, how a stored value
+# resolves back to one of them, and the bitmask vendors use to choose which channels
+# may alert their Telegram group.
+#
+# `channel` is validated by PREFIX, not equality, because the CSV importer stores
+# "google_form-<import_order_id>-<slug>". Always compare via #channel_key, never `==`.
+module SpreeCmCommissioner
+  module OrderChannelBitwise
+    extend ActiveSupport::Concern
+
+    SPREE_CHANNEL = 'spree'.freeze
+    GOOGLE_FORM_CHANNEL = 'google_form'.freeze
+    TELEGRAM_CHANNEL = 'telegram'.freeze
+    TICKET_TRANSFER_CHANNEL = 'ticket_transfer'.freeze
+    OFFLINE_SELL_CHANNEL = 'offline_sell'.freeze
+
+    ALLOWED_CHANNEL_PREFIXES = [
+      SPREE_CHANNEL, GOOGLE_FORM_CHANNEL, TELEGRAM_CHANNEL, TICKET_TRANSFER_CHANNEL, OFFLINE_SELL_CHANNEL
+    ].freeze
+
+    # Matched longest-first so a future 'spree_x' can never be swallowed by 'spree'.
+    SORTED_CHANNEL_PREFIXES = ALLOWED_CHANNEL_PREFIXES.sort_by { |prefix| -prefix.length }.freeze
+
+    # Bit values are PERSISTED in vendor preferences and are a permanent contract.
+    # Never renumber, reorder, or reuse a bit. To retire a channel, leave its bit
+    # burned and take the next free power of two.
+    #
+    # Deliberately literal, never derived from ALLOWED_CHANNEL_PREFIXES.index —
+    # reordering that array would silently remap every vendor's saved setting.
+    CHANNEL_ALERT_BITS = {
+      SPREE_CHANNEL => 1,            # 1 << 0
+      GOOGLE_FORM_CHANNEL => 2,      # 1 << 1
+      TELEGRAM_CHANNEL => 4,         # 1 << 2
+      TICKET_TRANSFER_CHANNEL => 8,  # 1 << 3
+      OFFLINE_SELL_CHANNEL => 16     # 1 << 4
+    }.freeze
+
+    # Every bit currently in use, for masking untrusted input down to known channels.
+    KNOWN_CHANNEL_ALERT_BITS = CHANNEL_ALERT_BITS.values.reduce(:|).freeze
+
+    # Only online orders alert by default. google_form & ticket_transfer set the state column
+    # directly instead of firing the state machine, so they have never sent an alert; this
+    # default therefore encodes today's real behaviour rather than changing it.
+    DEFAULT_TELEGRAM_ALERT_CHANNELS = CHANNEL_ALERT_BITS[SPREE_CHANNEL]
+
+    included do
+      validate :validate_channel_prefix, if: :channel_changed?
+    end
+
+    # The stored channel may carry a suffix — the importer writes
+    # "google_form-<import_order_id>-<slug>" — so the prefix, not the whole
+    # string, is the channel's identity. Returns nil for an unrecognized channel.
+    def channel_key
+      SORTED_CHANNEL_PREFIXES.find { |prefix| channel&.start_with?(prefix) }
+    end
+
+    # Order was created by an operator through the back-office Sell Ticket console.
+    def offline_sell?
+      channel_key == OFFLINE_SELL_CHANNEL
+    end
+
+    private
+
+    def validate_channel_prefix
+      return if channel_key.present?
+
+      errors.add(:channel, "must start with one of the following: #{ALLOWED_CHANNEL_PREFIXES.join(', ')}")
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 # Make sure to put this concern below other concern or methods that generating additional order info like guests, seat number, etc.
 # This will ensure that when each notification is sent with neccessary data.
 module SpreeCmCommissioner
-  module OrderStateMachine
+  module OrderStateMachine # rubocop:disable Metrics/ModuleLength
     extend ActiveSupport::Concern
 
     included do # rubocop:disable Metrics/BlockLength
@@ -271,15 +271,30 @@ module SpreeCmCommissioner
       return unless telegram_alert_enabled?
 
       vendor_list.each do |vendor|
-        title = '🎫 --- [NEW ORDER FROM BOOKME+] ---'
+        # `next`, not `return`: the mask is per-vendor, so one opted-out vendor on a
+        # multi-vendor order must not suppress the others.
+        next unless vendor.alerts_telegram_for_channel?(channel_key)
+
         chat_id = vendor.preferred_telegram_chat_id
-        if chat_id.present?
-          factory = OrderTelegramMessageFactory.new(title: title, order: self, vendor: vendor)
-          TelegramNotificationSenderJob.perform_later(chat_id: chat_id, message: factory.message, parse_mode: factory.parse_mode)
-        end
+        next if chat_id.blank?
+
+        factory = OrderTelegramMessageFactory.new(title: vendor_alert_title(vendor), order: self, vendor: vendor)
+        TelegramNotificationSenderJob.perform_later(chat_id: chat_id, message: factory.message, parse_mode: factory.parse_mode)
       end
     end
 
+    # White-label vendors announce their own brand; platform vendors stay BookMe+.
+    #
+    # vendor.name is operator-supplied data interpolated into an HTML parse_mode message
+    # (TelegramMessageFactory#header wraps the title in <b>), so it MUST be escaped —
+    # Telegram rejects unescaped &, < and > with "400 can't parse entities", and
+    # TelegramNotificationSender swallows that error, so the alert would vanish silently.
+    def vendor_alert_title(vendor)
+      return '🎫 --- [NEW ORDER FROM BOOKME+] ---' unless vendor.tenant_present?
+
+      "🎫 --- [NEW ORDER FROM #{CGI.escapeHTML(vendor.name.to_s)}] ---"
+    end
+
     def notify_order_complete_app_notification_to_user
       return if products.all?(&:vote_package?) # disable app push notification for vote package orders
 

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

@@ -5,11 +5,11 @@ module SpreeCmCommissioner
     included do
       has_one :ticket_transfer, class_name: 'SpreeCmCommissioner::TicketTransfer'
 
-      scope :not_ticket_transfer, -> { where.not(channel: SpreeCmCommissioner::OrderDecorator::TICKET_TRANSFER_CHANNEL) }
+      scope :not_ticket_transfer, -> { where.not(channel: SpreeCmCommissioner::OrderChannelBitwise::TICKET_TRANSFER_CHANNEL) }
     end
 
     def ticket_transfer?
-      channel == SpreeCmCommissioner::OrderDecorator::TICKET_TRANSFER_CHANNEL
+      channel == SpreeCmCommissioner::OrderChannelBitwise::TICKET_TRANSFER_CHANNEL
     end
 
     # Completes an accepted ticket transfer for this order. Called from

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

@@ -8,6 +8,25 @@ module SpreeCmCommissioner
       preference :telegram_chat_id, :string
       preference :telegram_chat_name, :string
       preference :telegram_chat_type, :string
+      preference :telegram_alert_channels, :integer, default: 1
+    end
+
+    # Should this vendor's Telegram group be alerted for an order on this channel?
+    # An unmapped channel alerts — a stray message is a better failure than silence.
+    def alerts_telegram_for_channel?(channel_key)
+      bit = SpreeCmCommissioner::OrderChannelBitwise::CHANNEL_ALERT_BITS[channel_key]
+      return true if bit.nil?
+
+      telegram_alert_channels_mask.anybits?(bit)
+    end
+
+    # Spree's getter is `preferences.fetch(name) { default }`, which falls back only when the
+    # key is ABSENT. A key present with a nil value returns nil, and nil.to_i == 0 would mute
+    # EVERY channel silently. Fall back to the default instead; a deliberate 0 survives
+    # because 0 is truthy in Ruby.
+    def telegram_alert_channels_mask
+      (preferred_telegram_alert_channels ||
+        SpreeCmCommissioner::OrderChannelBitwise::DEFAULT_TELEGRAM_ALERT_CHANNELS).to_i
     end
   end
 end

data/app/models/spree_cm_commissioner/inventory_item.rb

@@ -107,7 +107,10 @@ module SpreeCmCommissioner
     end
 
     # This method is only used when admin update stock
-    def adjust_quantity!(quantity)
+    def adjust_quantity!(quantity, correlation_id: nil)
+      correlation_id ||= SecureRandom.uuid
+      quantity_available_before = redis_quantity_after = nil
+
       with_lock do
         # IMPORTANT: Apply quantity changes directly without defensive clamping.
         # The model validation will catch any attempts to go negative, surfacing bugs
@@ -118,6 +121,8 @@ module SpreeCmCommissioner
         #
         # Why? Clamping masks bugs. Validation errors are better than silent data loss.
         # See: /docs/lessons-learned/inventory-consistency-issues.md#lesson-learned-async-job-validation-strategy
+        quantity_available_before = quantity_available
+
         self.max_capacity = max_capacity + quantity
         self.quantity_available = quantity_available + quantity
         save!
@@ -127,8 +132,23 @@ module SpreeCmCommissioner
         # high-contention hot path, so keeping it in the same transaction as `save!` means a
         # Redis failure rolls the DB change back too, instead of leaving the DB and Redis counts
         # out of sync with nothing to reconcile them.
-        adjust_quantity_in_redis(quantity)
+        redis_quantity_after = adjust_quantity_in_redis(quantity)
       end
+
+      # Logged after with_lock releases: I/O here would otherwise extend how long the row's
+      # SELECT ... FOR UPDATE is held under high-traffic contention — same reasoning as the other
+      # Bulk* adjusters in this gem.
+      CmAppLogger.log(
+        label: "#{self.class.name}#adjust_quantity!",
+        data: {
+          correlation_id: correlation_id,
+          inventory_item_id: id,
+          delta: quantity,
+          quantity_available_before: quantity_available_before,
+          quantity_available_after: quantity_available,
+          redis_quantity_after: redis_quantity_after
+        }
+      )
     end
 
     # Stock and hold keys. `locked: true` addresses the withheld pool — see LineItem#locked_stock?,

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -1,12 +1,7 @@
 module SpreeCmCommissioner
   module OrderDecorator
-    SPREE_CHANNEL = 'spree'.freeze
-    GOOGLE_FORM_CHANNEL = 'google_form'.freeze
-    TELEGRAM_CHANNEL = 'telegram'.freeze
-    TICKET_TRANSFER_CHANNEL = 'ticket_transfer'.freeze
-    ALLOWED_CHANNEL_PREFIXES = [SPREE_CHANNEL, GOOGLE_FORM_CHANNEL, TELEGRAM_CHANNEL, TICKET_TRANSFER_CHANNEL].freeze
-
     def self.prepended(base) # rubocop:disable Metrics/MethodLength
+      base.include SpreeCmCommissioner::OrderChannelBitwise
       base.include SpreeCmCommissioner::StoreMetadata
       base.include SpreeCmCommissioner::PhoneNumberSanitizer
       base.include SpreeCmCommissioner::OrderIntegration
@@ -27,7 +22,6 @@ module SpreeCmCommissioner
       base.store_public_metadata :order_options, :array, default: []
 
       base.validates :promo_total, base::MONEY_VALIDATION
-      base.validate :validate_channel_prefix, if: :channel_changed?
       base.validates :phone_number, presence: true, if: :require_phone_number
 
       base.has_one :invoice, dependent: :destroy, class_name: 'SpreeCmCommissioner::Invoice'
@@ -363,12 +357,6 @@ module SpreeCmCommissioner
       self.ship_address ||= customer.ship_address.try(:clone)
     end
 
-    def validate_channel_prefix
-      return if ALLOWED_CHANNEL_PREFIXES.any? { |prefix| channel&.start_with?(prefix) }
-
-      errors.add(:channel, "must start with one of the following: #{ALLOWED_CHANNEL_PREFIXES.join(', ')}")
-    end
-
     def set_tenant_id
       self.tenant_id = MultiTenant.current_tenant_id
     end

data/app/overrides/spree/admin/shared/sub_menu/_configuration/blazer_queries_tab.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_bottom "[data-hook='admin_configurations_sidebar_menu']" -->
+
+<%= tab :blazer_queries, match_path: '/blazer_queries', label: 'Blazer Queries' if can? :manage, Blazer::Query %>

data/app/services/spree_cm_commissioner/api_caches/invalidate.rb

@@ -70,7 +70,12 @@ module SpreeCmCommissioner
             '/api/v2/storefront/menus/:id*',
             '/api/v2/storefront/homepage_data*'
           ],
-          'Spree::Taxon' => ['/api/v2/storefront/taxons/:id*'],
+          'Spree::Taxon' => [
+            '/api/v2/tenant/taxons/:id*',
+            '/api/v2/tenant/taxons/:permalink*',
+            '/api/v2/storefront/taxons/:id*',
+            '/api/v2/storefront/taxons/:permalink*'
+          ],
           'Spree::Product' => [
             '/api/v2/tenant/products/:id*',
             '/api/v2/tenant/products/:slug*',

data/app/services/spree_cm_commissioner/intercity_taxi_order/create.rb

@@ -3,7 +3,9 @@ module SpreeCmCommissioner
     class Create
       prepend ::Spree::ServiceModule::Base
 
-      def call(trip_id:, from_date:, to_date:, user: nil, quantity: 1)
+      def call(trip_id:, from_date:, to_date:, user: nil, quantity: 1, created_by: nil, # rubocop:disable Metrics/ParameterLists
+               channel: SpreeCmCommissioner::OrderChannelBitwise::SPREE_CHANNEL
+      )
         validate!(trip_id: trip_id, from_date: from_date, to_date: to_date, quantity: quantity)
 
         quantity = quantity.to_i
@@ -13,7 +15,7 @@ module SpreeCmCommissioner
           variant = trip.product.variants.first
           raise ArgumentError, 'No variant found for trip' if variant.blank?
 
-          order = Spree::Order.new(state: 'cart', use_billing: true, user: user)
+          order = Spree::Order.new(state: 'cart', use_billing: true, user: user, created_by: created_by, channel: channel)
 
           metadata = {
             trip_id: trip.id,