spree_cm_commissioner 2.14.7 → 2.14.9
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb +9 -1
- data/app/controllers/concerns/spree_cm_commissioner/guest_owner_authorization.rb +30 -0
- data/app/controllers/spree/admin/stock_managements_controller.rb +12 -1
- data/app/controllers/spree/api/v2/organizer/invites_controller.rb +5 -1
- data/app/controllers/spree/api/v2/storefront/guests_controller.rb +13 -7
- data/app/controllers/spree/api/v2/storefront/id_cards_controller.rb +6 -4
- data/app/controllers/spree/api/v2/storefront/products_controller_decorator.rb +1 -1
- data/app/controllers/spree/api/v2/storefront/s3_signed_urls_controller.rb +4 -3
- data/app/controllers/spree/api/v2/tenant/base_controller.rb +23 -3
- data/app/controllers/spree/api/v2/tenant/cart_controller.rb +1 -1
- data/app/controllers/spree/api/v2/tenant/id_cards_controller.rb +6 -4
- data/app/controllers/spree/api/v2/tenant/payment_methods_controller.rb +1 -2
- data/app/controllers/spree/api/v2/tenant/products_controller.rb +1 -1
- data/app/controllers/spree/api/v2/tenant/s3_signed_urls_controller.rb +4 -3
- data/app/interactors/spree_cm_commissioner/guest_id_card_manager.rb +18 -9
- data/app/interactors/spree_cm_commissioner/id_card_image_updater.rb +6 -3
- data/app/interactors/spree_cm_commissioner/image_saver.rb +4 -3
- data/app/interactors/spree_cm_commissioner/profile_image_updater.rb +6 -3
- data/app/jobs/concerns/spree_cm_commissioner/idempotent_job.rb +7 -6
- data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_job.rb +4 -13
- data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_convert_job.rb +2 -21
- data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_hold_job.rb +3 -29
- data/app/models/concerns/spree_cm_commissioner/firestore_connection.rb +7 -9
- data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb +1 -9
- data/app/models/concerns/spree_cm_commissioner/sales_channel_bitwise.rb +44 -0
- data/app/models/concerns/spree_cm_commissioner/user_uploaded_image.rb +17 -0
- data/app/models/spree_cm_commissioner/back_image.rb +2 -0
- data/app/models/spree_cm_commissioner/front_image.rb +2 -0
- data/app/models/spree_cm_commissioner/inventory_hold.rb +5 -0
- data/app/models/spree_cm_commissioner/order_decorator.rb +11 -0
- data/app/models/spree_cm_commissioner/product_decorator.rb +4 -0
- data/app/models/spree_cm_commissioner/s3_presigned_url.rb +8 -7
- data/app/models/spree_cm_commissioner/s3_presigned_url_builder.rb +9 -3
- data/app/models/spree_cm_commissioner/tenant.rb +3 -0
- data/app/models/spree_cm_commissioner/user_profile.rb +2 -0
- data/app/overrides/spree/admin/products/_form/enable_confirmation_email.html.erb.deface +13 -0
- data/app/overrides/spree/admin/products/_form/sellable_on_platform.html.erb.deface +12 -0
- data/app/serializers/spree/v2/storefront/taxon_serializer_decorator.rb +4 -1
- data/app/services/spree_cm_commissioner/api_caches/invalidate.rb +28 -17
- data/app/services/spree_cm_commissioner/api_caches/invalidate_all.rb +5 -7
- data/app/services/spree_cm_commissioner/draft_orders/create.rb +6 -3
- data/app/services/spree_cm_commissioner/events/publish_stock_statuses_to_firestore.rb +30 -4
- data/app/services/spree_cm_commissioner/inventory_holds/acquire.rb +28 -17
- data/app/services/spree_cm_commissioner/inventory_holds/convert.rb +1 -0
- data/app/services/spree_cm_commissioner/inventory_holds/release.rb +1 -0
- data/app/services/spree_cm_commissioner/queue_draft_orders/publish_status.rb +8 -8
- data/app/services/spree_cm_commissioner/redis_stock/base.rb +7 -1
- data/app/services/spree_cm_commissioner/waiting_room/publish_lobby_path.rb +1 -8
- data/app/services/spree_cm_commissioner/waiting_room_system_metadata_fetcher.rb +2 -8
- data/config/initializers/firestore.rb +19 -0
- data/config/initializers/spree_permitted_attributes.rb +4 -0
- data/config/locales/en.yml +2 -0
- data/config/locales/km.yml +1 -0
- data/config/routes.rb +14 -6
- data/db/migrate/20261103000001_add_sales_channel_to_spree_products.rb +14 -0
- data/lib/spree_cm_commissioner/firestore_clients.rb +49 -0
- data/lib/spree_cm_commissioner/s3_url_generator.rb +13 -1
- data/lib/spree_cm_commissioner/tenant_slug_constraint.rb +23 -0
- data/lib/spree_cm_commissioner/version.rb +1 -1
- data/lib/spree_cm_commissioner.rb +2 -0
- metadata +11 -9
- data/app/controllers/spree/api/v2/organizer/images_controller.rb +0 -56
- data/app/controllers/spree/api/v2/organizer/s3_signed_urls_controller.rb +0 -29
- data/app/controllers/spree/api/v2/organizer/ticket_images_controller.rb +0 -27
- data/app/controllers/spree/api/v2/organizer/tickets_controller.rb +0 -97
- data/app/serializers/spree/v2/organizer/image_serializer.rb +0 -11
- data/app/serializers/spree/v2/organizer/s3_signed_url_serializer.rb +0 -10
- data/app/serializers/spree/v2/organizer/ticket_serializer.rb +0 -9
|
@@ -128,6 +128,7 @@ module SpreeCmCommissioner
|
|
|
128
128
|
|
|
129
129
|
SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnHoldJob.perform_later(
|
|
130
130
|
order_id: order.id,
|
|
131
|
+
idempotency_key: SecureRandom.uuid,
|
|
131
132
|
caller_source: "#{self.class.name}#enqueue_sync_inventory_on_hold",
|
|
132
133
|
inventory_id_and_quantities: inventory_id_and_quantities
|
|
133
134
|
)
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
module SpreeCmCommissioner
|
|
2
2
|
module QueueDraftOrders
|
|
3
3
|
# Writes a queue-draft-order status document's current state and appends a `histories` entry
|
|
4
|
-
# in
|
|
4
|
+
# in one batch commit, so no call site can update one without the other — and the request
|
|
5
|
+
# path (QueueDraftOrders::Enqueue) pays a single Firestore round trip, not two.
|
|
5
6
|
#
|
|
6
7
|
# Firestore layout:
|
|
7
8
|
# statuses/draft_orders/{date}/{document_id} — current status + terminal fields
|
|
@@ -21,13 +22,12 @@ module SpreeCmCommissioner
|
|
|
21
22
|
|
|
22
23
|
now = Time.zone.now
|
|
23
24
|
document = firestore.doc(document_path)
|
|
24
|
-
document.
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
message: message,
|
|
29
|
-
|
|
30
|
-
)
|
|
25
|
+
history = document.col('histories').doc
|
|
26
|
+
|
|
27
|
+
firestore.batch do |batch|
|
|
28
|
+
batch.set(document, fields.merge(status: status, updated_at: now), merge: true)
|
|
29
|
+
batch.create(history, { previous_status: previous_status, next_status: status, message: message, created_at: now })
|
|
30
|
+
end
|
|
31
31
|
|
|
32
32
|
success(document_path)
|
|
33
33
|
rescue StandardError => e
|
|
@@ -28,11 +28,17 @@ module SpreeCmCommissioner
|
|
|
28
28
|
SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(inventory_items).call
|
|
29
29
|
end
|
|
30
30
|
|
|
31
|
+
# One key per Redis mutation, minted here rather than derived from line_item_ids: the same line
|
|
32
|
+
# items are legitimately synced several times (unstock on complete, restock on cancel, unstock
|
|
33
|
+
# again on resume), and a shared key made every sync after the first a silent no-op, leaving
|
|
34
|
+
# the DB behind Redis until a later sale tripped the quantity_available >= 0 validation.
|
|
35
|
+
# Carried in the job args, so a retry or re-delivery of this same job still dedups.
|
|
31
36
|
def schedule_sync_inventory(inventory_id_and_quantities)
|
|
32
37
|
SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesJob.perform_later(
|
|
33
38
|
inventory_id_and_quantities: inventory_id_and_quantities,
|
|
34
39
|
line_item_ids: @line_item_ids,
|
|
35
|
-
caller_source: "#{self.class.name}#schedule_sync_inventory"
|
|
40
|
+
caller_source: "#{self.class.name}#schedule_sync_inventory",
|
|
41
|
+
idempotency_key: SecureRandom.uuid
|
|
36
42
|
)
|
|
37
43
|
end
|
|
38
44
|
end
|
|
@@ -15,6 +15,7 @@ module SpreeCmCommissioner
|
|
|
15
15
|
class PublishLobbyPath
|
|
16
16
|
prepend ::Spree::ServiceModule::Base
|
|
17
17
|
extend SpreeCmCommissioner::ServiceModuleThrowable
|
|
18
|
+
include SpreeCmCommissioner::FirestoreConnection
|
|
18
19
|
|
|
19
20
|
def call
|
|
20
21
|
# merge: true so we never clobber the lobby's `full` / `available_slots` fields.
|
|
@@ -40,14 +41,6 @@ module SpreeCmCommissioner
|
|
|
40
41
|
def logs_document
|
|
41
42
|
@logs_document ||= lobby_document.col('logs').doc('publish_lobby_path_job')
|
|
42
43
|
end
|
|
43
|
-
|
|
44
|
-
def firestore
|
|
45
|
-
@firestore ||= Google::Cloud::Firestore.new(project_id: service_account[:project_id], credentials: service_account)
|
|
46
|
-
end
|
|
47
|
-
|
|
48
|
-
def service_account
|
|
49
|
-
@service_account ||= Rails.application.credentials.cloud_firestore_service_account
|
|
50
|
-
end
|
|
51
44
|
end
|
|
52
45
|
end
|
|
53
46
|
end
|
|
@@ -2,6 +2,8 @@ require 'google/cloud/firestore'
|
|
|
2
2
|
|
|
3
3
|
module SpreeCmCommissioner
|
|
4
4
|
class WaitingRoomSystemMetadataFetcher
|
|
5
|
+
include SpreeCmCommissioner::FirestoreConnection
|
|
6
|
+
|
|
5
7
|
attr_reader :document_data
|
|
6
8
|
|
|
7
9
|
def initialize(firestore: nil)
|
|
@@ -56,13 +58,5 @@ module SpreeCmCommissioner
|
|
|
56
58
|
def document
|
|
57
59
|
@document ||= firestore.col('metadata').doc('system')
|
|
58
60
|
end
|
|
59
|
-
|
|
60
|
-
def firestore
|
|
61
|
-
@firestore ||= Google::Cloud::Firestore.new(project_id: service_account[:project_id], credentials: service_account)
|
|
62
|
-
end
|
|
63
|
-
|
|
64
|
-
def service_account
|
|
65
|
-
@service_account ||= Rails.application.credentials.cloud_firestore_service_account
|
|
66
|
-
end
|
|
67
61
|
end
|
|
68
62
|
end
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
require 'google/cloud/firestore'
|
|
2
|
+
|
|
3
|
+
# The generated defaults give point reads/writes a 60s–300s deadline and keep retrying
|
|
4
|
+
# RESOURCE_EXHAUSTED/UNAVAILABLE until it expires, so on a slow Firestore a request-path write
|
|
5
|
+
# (QueueDraftOrders::PublishStatus) outlives Rack::Timeout's 30s and ends as a
|
|
6
|
+
# RequestTimeoutException (an Exception, so no `rescue StandardError` sees it) instead of a clean
|
|
7
|
+
# failure. The deadline covers retries too, so this is the most one call can block.
|
|
8
|
+
#
|
|
9
|
+
# Set on the class-level config because it is every client instance's parent config, so it also
|
|
10
|
+
# reaches services that build their own client. `Google::Cloud::Firestore.new(timeout:)` would not
|
|
11
|
+
# work: the per-RPC defaults take precedence over the client-wide timeout.
|
|
12
|
+
#
|
|
13
|
+
# Queries and streams (run_query, listen, write, ...) keep their defaults — they legitimately page
|
|
14
|
+
# through large result sets and only run from jobs/dashboard reads.
|
|
15
|
+
Google::Cloud::Firestore::V1::Firestore::Client.configure do |config|
|
|
16
|
+
%i[get_document batch_get_documents create_document update_document delete_document commit batch_write].each do |rpc|
|
|
17
|
+
config.rpcs.public_send(rpc).timeout = 10.0
|
|
18
|
+
end
|
|
19
|
+
end
|
|
@@ -16,8 +16,12 @@ module Spree
|
|
|
16
16
|
# store_accessor key (public_metadata), not a DB column, so it must be permitted explicitly
|
|
17
17
|
@@product_attributes << :enable_telegram_alert unless @@product_attributes.include?(:enable_telegram_alert)
|
|
18
18
|
@@product_attributes << :enable_send_receipt unless @@product_attributes.include?(:enable_send_receipt)
|
|
19
|
+
@@product_attributes << :enable_confirmation_email unless @@product_attributes.include?(:enable_confirmation_email)
|
|
19
20
|
@@product_attributes << :enable_social_sharing_email unless @@product_attributes.include?(:enable_social_sharing_email)
|
|
20
21
|
|
|
22
|
+
# Virtual writer toggling the platform bit of sales_channel (SalesChannelBitwise)
|
|
23
|
+
@@product_attributes << :sellable_on_platform unless @@product_attributes.include?(:sellable_on_platform)
|
|
24
|
+
|
|
21
25
|
# Permitted all guest attributes for now as permitting only some guest attributes is not working by design
|
|
22
26
|
# of spree add_item service, if we want to only permit some guest attributes,
|
|
23
27
|
# we need to override most part of add_item service.
|
data/config/locales/en.yml
CHANGED
|
@@ -320,6 +320,7 @@ en:
|
|
|
320
320
|
preset: "Preset"
|
|
321
321
|
enable_telegram_alert: "Enable Telegram Alert"
|
|
322
322
|
enable_send_receipt: "Enable Send Receipt"
|
|
323
|
+
enable_confirmation_email: "Enable Confirmation Email"
|
|
323
324
|
enable_social_sharing_email: "Enable Social Sharing Email"
|
|
324
325
|
telegram_alert_channels: "Telegram Alert Channels"
|
|
325
326
|
telegram_chat_name: "Telegram Chat Name"
|
|
@@ -1342,6 +1343,7 @@ en:
|
|
|
1342
1343
|
failed: "Failed"
|
|
1343
1344
|
draft_order:
|
|
1344
1345
|
line_items_missing: "Line items are missing"
|
|
1346
|
+
variant_not_available: "This item is not available for purchase here"
|
|
1345
1347
|
inventory_item:
|
|
1346
1348
|
variant_taken_on: "The variant is taken on %{date}"
|
|
1347
1349
|
topup_draft_order:
|
data/config/locales/km.yml
CHANGED
|
@@ -919,6 +919,7 @@ km:
|
|
|
919
919
|
failed: "បរាជ័យ"
|
|
920
920
|
draft_order:
|
|
921
921
|
line_items_missing: "គ្មានទំនិញនៅក្នុងកន្ត្រកទេ"
|
|
922
|
+
variant_not_available: "ទំនិញនេះមិនអាចទិញនៅទីនេះបានទេ"
|
|
922
923
|
inventory_item:
|
|
923
924
|
variant_taken_on: "វ៉ារ្យ៉ង់នេះមានរួចហើយនៅថ្ងៃ %{date}"
|
|
924
925
|
topup_draft_order:
|
data/config/routes.rb
CHANGED
|
@@ -513,17 +513,15 @@ Spree::Core::Engine.add_routes do
|
|
|
513
513
|
end
|
|
514
514
|
|
|
515
515
|
namespace :organizer do
|
|
516
|
-
resources :tickets do
|
|
517
|
-
resources :ticket_images
|
|
518
|
-
end
|
|
519
|
-
resources :images
|
|
520
|
-
resource :s3_signed_urls
|
|
521
516
|
resources :invites
|
|
522
517
|
resources :invite_guests, only: %i[show update]
|
|
523
518
|
resources :invite_crews, only: %i[show update]
|
|
524
519
|
end
|
|
525
520
|
|
|
526
|
-
|
|
521
|
+
# Drawn twice below: legacy /api/v2/tenant/... (tenant from the OAuth token) and
|
|
522
|
+
# /api/v2/:tenant_slug/... (tenant from the URL). Tenant APIs are CDN-cached by URL, so only the
|
|
523
|
+
# slug form gives each tenant its own cache key; see Spree::Api::V2::Tenant::BaseController.
|
|
524
|
+
concern :tenant_api do
|
|
527
525
|
resource :token, controller: :access_tokens, only: [:create]
|
|
528
526
|
resource :telegram_oauth_token, controller: :telegram_oauth_tokens, only: [:create]
|
|
529
527
|
resources :vendors
|
|
@@ -665,6 +663,10 @@ Spree::Core::Engine.add_routes do
|
|
|
665
663
|
resources :pricing_previews, only: [:index]
|
|
666
664
|
end
|
|
667
665
|
|
|
666
|
+
namespace :tenant do
|
|
667
|
+
concerns :tenant_api
|
|
668
|
+
end
|
|
669
|
+
|
|
668
670
|
namespace :storefront do
|
|
669
671
|
resource :token, controller: :access_tokens, only: [:create]
|
|
670
672
|
resource :telegram_oauth_token, controller: :telegram_oauth_tokens, only: [:create]
|
|
@@ -869,6 +871,12 @@ Spree::Core::Engine.add_routes do
|
|
|
869
871
|
resources :event_charts, only: %i[index show]
|
|
870
872
|
end
|
|
871
873
|
end
|
|
874
|
+
|
|
875
|
+
# Keep last in v2: the slug segment overlaps every literal namespace above, which
|
|
876
|
+
# TenantSlugConstraint reserves.
|
|
877
|
+
scope ':tenant_slug', module: :tenant, as: :tenant_scoped, constraints: SpreeCmCommissioner::TenantSlugConstraint.new do
|
|
878
|
+
concerns :tenant_api
|
|
879
|
+
end
|
|
872
880
|
end
|
|
873
881
|
|
|
874
882
|
namespace :json_ld do
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
class AddSalesChannelToSpreeProducts < ActiveRecord::Migration[7.0]
|
|
2
|
+
def up
|
|
3
|
+
# Default 3 (direct + platform) backfills every existing row with today's behaviour:
|
|
4
|
+
# tenant products stay visible on both their tenant storefront and BookMe+.
|
|
5
|
+
add_column :spree_products, :sales_channel, :integer, default: 0b11, null: false
|
|
6
|
+
|
|
7
|
+
# BookMe+'s own products have no tenant storefront to sell on.
|
|
8
|
+
execute 'UPDATE spree_products SET sales_channel = 2 WHERE tenant_id IS NULL'
|
|
9
|
+
end
|
|
10
|
+
|
|
11
|
+
def down
|
|
12
|
+
remove_column :spree_products, :sales_channel
|
|
13
|
+
end
|
|
14
|
+
end
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
require 'google/cloud/firestore'
|
|
2
|
+
|
|
3
|
+
module SpreeCmCommissioner
|
|
4
|
+
# Process-wide registry of Cloud Firestore clients, one per Firebase project (`project_id`), so
|
|
5
|
+
# a service that talks to a second project just passes that project's service account and still
|
|
6
|
+
# gets a shared client.
|
|
7
|
+
#
|
|
8
|
+
# Shared rather than built per service instance: each new client opens its own gRPC channel, TLS
|
|
9
|
+
# handshake and OAuth token fetch, which on request paths like QueueDraftOrders::Enqueue was paid
|
|
10
|
+
# on every request. Clients are dropped when the PID changes so a forked worker (Puma runs with
|
|
11
|
+
# preload_app!) never reuses its parent's client; checking here instead of in a puma
|
|
12
|
+
# on_worker_boot hook also covers Sidekiq, rake and any other fork. That only works while the
|
|
13
|
+
# parent has made no Firestore RPC before forking — gRPC itself refuses to run in a child after
|
|
14
|
+
# the parent used it (unless GRPC_ENABLE_FORK_SUPPORT, Linux only) — so never call Firestore
|
|
15
|
+
# during app boot. RPC deadlines are set in config/initializers/firestore.rb.
|
|
16
|
+
module FirestoreClients
|
|
17
|
+
MUTEX = Mutex.new
|
|
18
|
+
|
|
19
|
+
class << self
|
|
20
|
+
# service_account: [Hash] a Firebase service-account credential; defaults to
|
|
21
|
+
# `cloud_firestore_service_account`.
|
|
22
|
+
def fetch(service_account = default_service_account)
|
|
23
|
+
project_id = service_account[:project_id]
|
|
24
|
+
|
|
25
|
+
MUTEX.synchronize do
|
|
26
|
+
reset_unlocked! if @pid != Process.pid
|
|
27
|
+
@clients[project_id] ||= Google::Cloud::Firestore.new(project_id: project_id, credentials: service_account)
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
|
|
31
|
+
def default_service_account
|
|
32
|
+
Rails.application.credentials.cloud_firestore_service_account
|
|
33
|
+
end
|
|
34
|
+
|
|
35
|
+
# Specs stub Google::Cloud::Firestore.new per example; without this the first example's
|
|
36
|
+
# double would be served to every later one.
|
|
37
|
+
def reset!
|
|
38
|
+
MUTEX.synchronize { reset_unlocked! }
|
|
39
|
+
end
|
|
40
|
+
|
|
41
|
+
private
|
|
42
|
+
|
|
43
|
+
def reset_unlocked!
|
|
44
|
+
@clients = {}
|
|
45
|
+
@pid = Process.pid
|
|
46
|
+
end
|
|
47
|
+
end
|
|
48
|
+
end
|
|
49
|
+
end
|
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
module SpreeCmCommissioner
|
|
2
2
|
class S3UrlGenerator
|
|
3
|
+
# Only keys S3PresignedUrlBuilder hands out to API callers. Without this, a client-supplied
|
|
4
|
+
# URL could point at any object in the bucket (e.g. another guest's ID card) and have it
|
|
5
|
+
# copied into their own attachment.
|
|
6
|
+
UPLOAD_KEY_FORMAT = %r{\Auploads/[\w-]+/[^/]+\z}
|
|
7
|
+
|
|
3
8
|
# https://docs.aws.amazon.com/sdk-for-ruby/v1/api/AWS/S3/S3Object.html
|
|
4
9
|
# The bucket is private, ie all the public access is blocked
|
|
5
10
|
# key = "uploads/5f31/1697038252270.jpg"
|
|
11
|
+
# Returns nil for any other key; callers treat that as a failed fetch.
|
|
6
12
|
def self.s3_presigned_url(url)
|
|
7
|
-
key = url
|
|
13
|
+
key = upload_key(url)
|
|
14
|
+
return nil if key.nil?
|
|
8
15
|
|
|
9
16
|
s3 = Aws::S3::Resource.new(region: ENV.fetch('AWS_REGION'),
|
|
10
17
|
access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
|
|
@@ -16,5 +23,10 @@ module SpreeCmCommissioner
|
|
|
16
23
|
object = bucket.object(key)
|
|
17
24
|
object.presigned_url(:get, expires_in: 3600)
|
|
18
25
|
end
|
|
26
|
+
|
|
27
|
+
def self.upload_key(url)
|
|
28
|
+
key = url.to_s.split('amazonaws.com/').last
|
|
29
|
+
key if key&.match?(UPLOAD_KEY_FORMAT)
|
|
30
|
+
end
|
|
19
31
|
end
|
|
20
32
|
end
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
module SpreeCmCommissioner
|
|
2
|
+
# Guards the `/api/v2/:tenant_slug/...` routes, which share their first path segment with every
|
|
3
|
+
# literal v2 namespace. Without it `/api/v2/storefront/products` could resolve as tenant
|
|
4
|
+
# "storefront" depending on which engine draws its routes first. A pure string check, so routing
|
|
5
|
+
# never hits the DB; an unknown but well-formed slug still routes and 404s in
|
|
6
|
+
# Spree::Api::V2::Tenant::BaseController.
|
|
7
|
+
#
|
|
8
|
+
# RESERVED_SLUGS lives here rather than on SpreeCmCommissioner::Tenant so routes don't load an
|
|
9
|
+
# ActiveRecord model at boot. The routing spec fails when a new v2 namespace is missing from it.
|
|
10
|
+
class TenantSlugConstraint
|
|
11
|
+
RESERVED_SLUGS = %w[storefront platform tenant organizer operator].freeze
|
|
12
|
+
SLUG_FORMAT = /\A[a-z0-9][a-z0-9_-]*\z/
|
|
13
|
+
|
|
14
|
+
def self.valid_slug?(slug)
|
|
15
|
+
slug = slug.to_s
|
|
16
|
+
SLUG_FORMAT.match?(slug) && RESERVED_SLUGS.exclude?(slug)
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
def matches?(request)
|
|
20
|
+
self.class.valid_slug?(request.path_parameters[:tenant_slug])
|
|
21
|
+
end
|
|
22
|
+
end
|
|
23
|
+
end
|
|
@@ -10,6 +10,7 @@ require 'spree_vpago'
|
|
|
10
10
|
|
|
11
11
|
require 'spree_cm_commissioner/engine'
|
|
12
12
|
require 'spree_cm_commissioner/version'
|
|
13
|
+
require 'spree_cm_commissioner/tenant_slug_constraint'
|
|
13
14
|
require 'spree_cm_commissioner/passenger_option'
|
|
14
15
|
require 'spree_cm_commissioner/payment_method_group'
|
|
15
16
|
require 'spree_cm_commissioner/calendar_event'
|
|
@@ -20,6 +21,7 @@ require 'spree_cm_commissioner/rate'
|
|
|
20
21
|
require 'spree_cm_commissioner/rate_closings'
|
|
21
22
|
require 'spree_cm_commissioner/rates_availability_grid'
|
|
22
23
|
require 'spree_cm_commissioner/s3_url_generator'
|
|
24
|
+
require 'spree_cm_commissioner/firestore_clients'
|
|
23
25
|
require 'spree_cm_commissioner/service_module_throwable'
|
|
24
26
|
require 'spree_cm_commissioner/serializable_transaction'
|
|
25
27
|
require 'spree_cm_commissioner/jwt_token'
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: spree_cm_commissioner
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.14.
|
|
4
|
+
version: 2.14.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- You
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2026-11-
|
|
11
|
+
date: 2026-11-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: spree
|
|
@@ -815,6 +815,7 @@ files:
|
|
|
815
815
|
- app/controllers/concerns/spree_cm_commissioner/anonymous_booking_guard.rb
|
|
816
816
|
- app/controllers/concerns/spree_cm_commissioner/content_cachable.rb
|
|
817
817
|
- app/controllers/concerns/spree_cm_commissioner/exception_notificable.rb
|
|
818
|
+
- app/controllers/concerns/spree_cm_commissioner/guest_owner_authorization.rb
|
|
818
819
|
- app/controllers/concerns/spree_cm_commissioner/load_test_account_management.rb
|
|
819
820
|
- app/controllers/concerns/spree_cm_commissioner/load_test_account_scope.rb
|
|
820
821
|
- app/controllers/concerns/spree_cm_commissioner/load_test_bypassable.rb
|
|
@@ -954,13 +955,9 @@ files:
|
|
|
954
955
|
- app/controllers/spree/api/v2/operator/recalculate_tickets_controller.rb
|
|
955
956
|
- app/controllers/spree/api/v2/operator/taxons_controller.rb
|
|
956
957
|
- app/controllers/spree/api/v2/organizer/base_controller.rb
|
|
957
|
-
- app/controllers/spree/api/v2/organizer/images_controller.rb
|
|
958
958
|
- app/controllers/spree/api/v2/organizer/invite_crews_controller.rb
|
|
959
959
|
- app/controllers/spree/api/v2/organizer/invite_guests_controller.rb
|
|
960
960
|
- app/controllers/spree/api/v2/organizer/invites_controller.rb
|
|
961
|
-
- app/controllers/spree/api/v2/organizer/s3_signed_urls_controller.rb
|
|
962
|
-
- app/controllers/spree/api/v2/organizer/ticket_images_controller.rb
|
|
963
|
-
- app/controllers/spree/api/v2/organizer/tickets_controller.rb
|
|
964
961
|
- app/controllers/spree/api/v2/platform/homepage_section_relatable_options_controller.rb
|
|
965
962
|
- app/controllers/spree/api/v2/platform/option_types_controller_decorator.rb
|
|
966
963
|
- app/controllers/spree/api/v2/platform/places_controller.rb
|
|
@@ -1517,6 +1514,7 @@ files:
|
|
|
1517
1514
|
- app/models/concerns/spree_cm_commissioner/reschedule_request_state_machine.rb
|
|
1518
1515
|
- app/models/concerns/spree_cm_commissioner/route_order_countable.rb
|
|
1519
1516
|
- app/models/concerns/spree_cm_commissioner/route_type.rb
|
|
1517
|
+
- app/models/concerns/spree_cm_commissioner/sales_channel_bitwise.rb
|
|
1520
1518
|
- app/models/concerns/spree_cm_commissioner/scoped_fee_rule.rb
|
|
1521
1519
|
- app/models/concerns/spree_cm_commissioner/service_calendar_type.rb
|
|
1522
1520
|
- app/models/concerns/spree_cm_commissioner/service_origin.rb
|
|
@@ -1531,6 +1529,7 @@ files:
|
|
|
1531
1529
|
- app/models/concerns/spree_cm_commissioner/user_identity.rb
|
|
1532
1530
|
- app/models/concerns/spree_cm_commissioner/user_notification.rb
|
|
1533
1531
|
- app/models/concerns/spree_cm_commissioner/user_preference.rb
|
|
1532
|
+
- app/models/concerns/spree_cm_commissioner/user_uploaded_image.rb
|
|
1534
1533
|
- app/models/concerns/spree_cm_commissioner/variant_metadata.rb
|
|
1535
1534
|
- app/models/concerns/spree_cm_commissioner/variant_options_concern.rb
|
|
1536
1535
|
- app/models/concerns/spree_cm_commissioner/variant_rate_plannable.rb
|
|
@@ -1913,6 +1912,7 @@ files:
|
|
|
1913
1912
|
- app/overrides/spree/admin/products/_form/allow_transfer.html.erb.deface
|
|
1914
1913
|
- app/overrides/spree/admin/products/_form/available_on.html.erb.deface
|
|
1915
1914
|
- app/overrides/spree/admin/products/_form/discontinue_on.html.erb.deface
|
|
1915
|
+
- app/overrides/spree/admin/products/_form/enable_confirmation_email.html.erb.deface
|
|
1916
1916
|
- app/overrides/spree/admin/products/_form/enable_inventory_hold.html.erb.deface
|
|
1917
1917
|
- app/overrides/spree/admin/products/_form/enable_send_receipt.html.erb.deface
|
|
1918
1918
|
- app/overrides/spree/admin/products/_form/enable_social_sharing_email.html.erb.deface
|
|
@@ -1928,6 +1928,7 @@ files:
|
|
|
1928
1928
|
- app/overrides/spree/admin/products/_form/replace_vendor_label.html.erb.deface
|
|
1929
1929
|
- app/overrides/spree/admin/products/_form/required_self_check_in_location.html.erb.deface
|
|
1930
1930
|
- app/overrides/spree/admin/products/_form/reveal_description_to_user.html.erb.deface
|
|
1931
|
+
- app/overrides/spree/admin/products/_form/sellable_on_platform.html.erb.deface
|
|
1931
1932
|
- app/overrides/spree/admin/products/_form/subscribable_checkbox.html.erb.deface
|
|
1932
1933
|
- app/overrides/spree/admin/products/_form/taxons.html.erb.deface
|
|
1933
1934
|
- app/overrides/spree/admin/products/_form/use_video_as_default.html.erb.deface
|
|
@@ -2106,13 +2107,10 @@ files:
|
|
|
2106
2107
|
- app/serializers/spree/api/v2/platform/service_fee_rule_serializer.rb
|
|
2107
2108
|
- app/serializers/spree/v2/organizer/asset_serializer.rb
|
|
2108
2109
|
- app/serializers/spree/v2/organizer/base_serializer.rb
|
|
2109
|
-
- app/serializers/spree/v2/organizer/image_serializer.rb
|
|
2110
2110
|
- app/serializers/spree/v2/organizer/invite_crews_serializer.rb
|
|
2111
2111
|
- app/serializers/spree/v2/organizer/invite_guest_serializer.rb
|
|
2112
2112
|
- app/serializers/spree/v2/organizer/invite_serializer.rb
|
|
2113
|
-
- app/serializers/spree/v2/organizer/s3_signed_url_serializer.rb
|
|
2114
2113
|
- app/serializers/spree/v2/organizer/taxon_serializer.rb
|
|
2115
|
-
- app/serializers/spree/v2/organizer/ticket_serializer.rb
|
|
2116
2114
|
- app/serializers/spree/v2/organizer/user_serializer.rb
|
|
2117
2115
|
- app/serializers/spree/v2/storefront/accommodation_serializer.rb
|
|
2118
2116
|
- app/serializers/spree/v2/storefront/active_homepage_event_serializer.rb
|
|
@@ -3178,6 +3176,7 @@ files:
|
|
|
3178
3176
|
- config/initializers/assets.rb
|
|
3179
3177
|
- config/initializers/doorkeeper.rb
|
|
3180
3178
|
- config/initializers/exception_notification.rb
|
|
3179
|
+
- config/initializers/firestore.rb
|
|
3181
3180
|
- config/initializers/google_map.rb
|
|
3182
3181
|
- config/initializers/paper_trail.rb
|
|
3183
3182
|
- config/initializers/phonelib.rb
|
|
@@ -3776,6 +3775,7 @@ files:
|
|
|
3776
3775
|
- db/migrate/20261013000002_move_hidden_from_spree_option_types_to_product_option_types.rb
|
|
3777
3776
|
- db/migrate/20261016000001_add_index_to_spree_line_items_number.rb
|
|
3778
3777
|
- db/migrate/20261021000001_add_section_type_to_cm_homepage_sections.rb
|
|
3778
|
+
- db/migrate/20261103000001_add_sales_channel_to_spree_products.rb
|
|
3779
3779
|
- docker-compose.yml
|
|
3780
3780
|
- docs/api/scoped-access-token-endpoints.md
|
|
3781
3781
|
- docs/option_types/attr_types.md
|
|
@@ -3809,6 +3809,7 @@ files:
|
|
|
3809
3809
|
- lib/spree_cm_commissioner/distance.rb
|
|
3810
3810
|
- lib/spree_cm_commissioner/engine.rb
|
|
3811
3811
|
- lib/spree_cm_commissioner/factories.rb
|
|
3812
|
+
- lib/spree_cm_commissioner/firestore_clients.rb
|
|
3812
3813
|
- lib/spree_cm_commissioner/intercity_taxi/map_place.rb
|
|
3813
3814
|
- lib/spree_cm_commissioner/jwt_token.rb
|
|
3814
3815
|
- lib/spree_cm_commissioner/line_item_jwt_token.rb
|
|
@@ -3833,6 +3834,7 @@ files:
|
|
|
3833
3834
|
- lib/spree_cm_commissioner/stay_prices.rb
|
|
3834
3835
|
- lib/spree_cm_commissioner/store_credit_currency_summary.rb
|
|
3835
3836
|
- lib/spree_cm_commissioner/store_credit_summary.rb
|
|
3837
|
+
- lib/spree_cm_commissioner/tenant_slug_constraint.rb
|
|
3836
3838
|
- lib/spree_cm_commissioner/test_helper/factories/address_factory.rb
|
|
3837
3839
|
- lib/spree_cm_commissioner/test_helper/factories/agency_factory.rb
|
|
3838
3840
|
- lib/spree_cm_commissioner/test_helper/factories/asset_factory.rb
|
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
module Spree
|
|
2
|
-
module Api
|
|
3
|
-
module V2
|
|
4
|
-
module Organizer
|
|
5
|
-
class ImagesController < ::Spree::Api::V2::Organizer::BaseController
|
|
6
|
-
def show
|
|
7
|
-
image = Spree::Image.find(params[:id])
|
|
8
|
-
if image
|
|
9
|
-
render_serialized_payload { serialize_resource(image) }
|
|
10
|
-
else
|
|
11
|
-
render_error_payload(image.errors)
|
|
12
|
-
end
|
|
13
|
-
end
|
|
14
|
-
|
|
15
|
-
def create
|
|
16
|
-
context = SpreeCmCommissioner::ImageSaver.call(
|
|
17
|
-
viewable_type: params[:viewable_type],
|
|
18
|
-
viewable_id: params[:viewable_id],
|
|
19
|
-
url: params[:url]
|
|
20
|
-
)
|
|
21
|
-
if context.success?
|
|
22
|
-
render_serialized_payload { serialize_resource(context.result) }
|
|
23
|
-
else
|
|
24
|
-
render_error_payload(context.message)
|
|
25
|
-
end
|
|
26
|
-
end
|
|
27
|
-
|
|
28
|
-
def update
|
|
29
|
-
context = SpreeCmCommissioner::ImageSaver.call(
|
|
30
|
-
id: params[:id],
|
|
31
|
-
url: params[:url]
|
|
32
|
-
)
|
|
33
|
-
if context.success?
|
|
34
|
-
render_serialized_payload { serialize_resource(context.result) }
|
|
35
|
-
else
|
|
36
|
-
render_error_payload(context.message)
|
|
37
|
-
end
|
|
38
|
-
end
|
|
39
|
-
|
|
40
|
-
def destroy
|
|
41
|
-
image = Spree::Image.find_by(id: params[:id])
|
|
42
|
-
if image.destroy
|
|
43
|
-
render_serialized_payload { serialize_resource(image) }
|
|
44
|
-
else
|
|
45
|
-
render_error_payload(image.errors.full_messages.to_sentence, 400)
|
|
46
|
-
end
|
|
47
|
-
end
|
|
48
|
-
|
|
49
|
-
def resource_serializer
|
|
50
|
-
::Spree::V2::Organizer::ImageSerializer
|
|
51
|
-
end
|
|
52
|
-
end
|
|
53
|
-
end
|
|
54
|
-
end
|
|
55
|
-
end
|
|
56
|
-
end
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
module Spree
|
|
2
|
-
module Api
|
|
3
|
-
module V2
|
|
4
|
-
module Organizer
|
|
5
|
-
class S3SignedUrlsController < ::Spree::Api::V2::Organizer::BaseController
|
|
6
|
-
def show
|
|
7
|
-
if resource.error_message.blank?
|
|
8
|
-
render_serialized_payload { serialize_resource(resource) }
|
|
9
|
-
else
|
|
10
|
-
render_error_payload(resource.error_message)
|
|
11
|
-
end
|
|
12
|
-
end
|
|
13
|
-
|
|
14
|
-
def resource
|
|
15
|
-
SpreeCmCommissioner::S3PresignedUrlBuilder.call(
|
|
16
|
-
bucket_name: params[:bucket_name],
|
|
17
|
-
object_key: params[:object_key],
|
|
18
|
-
file_name: params[:file_name]
|
|
19
|
-
)
|
|
20
|
-
end
|
|
21
|
-
|
|
22
|
-
def resource_serializer
|
|
23
|
-
Spree::V2::Organizer::S3SignedUrlSerializer
|
|
24
|
-
end
|
|
25
|
-
end
|
|
26
|
-
end
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
end
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
module Spree
|
|
2
|
-
module Api
|
|
3
|
-
module V2
|
|
4
|
-
module Organizer
|
|
5
|
-
class TicketImagesController < ::Spree::Api::V2::Organizer::BaseController
|
|
6
|
-
before_action :load_ticket
|
|
7
|
-
|
|
8
|
-
def index
|
|
9
|
-
images = @ticket.images
|
|
10
|
-
|
|
11
|
-
render_serialized_payload do
|
|
12
|
-
collection_serializer.new(images).serializable_hash
|
|
13
|
-
end
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
def collection_serializer
|
|
17
|
-
::Spree::V2::Organizer::ImageSerializer
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
def load_ticket
|
|
21
|
-
@ticket ||= Spree::Product.find(params[:ticket_id])
|
|
22
|
-
end
|
|
23
|
-
end
|
|
24
|
-
end
|
|
25
|
-
end
|
|
26
|
-
end
|
|
27
|
-
end
|