spree_cm_commissioner 1.18.0.pre.pre2 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4397cedd70ecbd2c2b1055e1781ab2cec5e102fc49a026235bc4b343e339e175
-  data.tar.gz: 030cd051f193e3e8f4b235a56bf42a7bfedcb003ecae825224352e79aa72655c
+  metadata.gz: 2c10fd2782b1a1ac7ecab5d27e02a49212f8e816f8f2325fadbcd717fe9882e9
+  data.tar.gz: 3b1b296e3403e5dd040063c19a3ac4952afafb617af17cd2ca924ea8df25de23
 SHA512:
-  metadata.gz: 52d53b06702b30dcf5883997f8414d19f014cde234e3a5800e1590023354778c5b81f55ed3354ce30f922ef6607975dede7d17618432888c51d31d973f464971
-  data.tar.gz: '036259fac1ae8b68277c951da23474ad9332ffee963670149f74789bd6750707f3561b219e802bef0631befc86de3fcfbc9da66ee56b5412c5846277284dee26'
+  metadata.gz: 1f31cf8a9073664246d505c0494b2da2dc6565ec14c57fae06f34320039a478af4d8a1e0ee5eb1e68c42a5de37baf393bee0e791f7d9dfb8fd2b66356f143566
+  data.tar.gz: e29ba3d6d3e2d8343209260edd69117fe67c14ea1c20c13891b6cd9930f044467daa7b2fffaff51ab27db42e98eb7f43a85254e33a4644927e3eb61a1e9d742f

data/Gemfile.lock

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

data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb

@@ -6,9 +6,8 @@ module SpreeCmCommissioner
       after_action :set_cache_control_for_cdn
     end
 
-    # Override This Method based on your UseCase
     def max_age
-      ENV.fetch('CONTENT_CACHE_MAX_AGE', 1.day.to_i).to_i
+      ENV.fetch('CONTENT_CACHE_MAX_AGE', '180')
     end
 
     def set_cache_control_for_cdn

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

@@ -38,7 +38,20 @@ module Spree
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            update_dynamic_fields if guest_params[:guest_dynamic_fields_attributes]
+            if guest_params[:guest_dynamic_fields_attributes]
+              resource.guest_dynamic_fields.destroy_all
+
+              guest_params[:guest_dynamic_fields_attributes].each do |attr|
+                field = resource.guest_dynamic_fields.build(attr.except(:id))
+
+                if field.dynamic_field.requires_dynamic_field_options?
+                  option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
+                  field.dynamic_field_option = option if option
+                end
+
+                field.save!
+              end
+            end
 
             resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
 
@@ -83,26 +96,6 @@ module Spree
               guest_dynamic_fields_attributes: %i[id dynamic_field_id dynamic_field_option_id value _destroy]
             )
           end
-
-          def update_dynamic_fields
-            resource.guest_dynamic_fields.destroy_all
-
-            dynamic_fields_attrs = guest_params[:guest_dynamic_fields_attributes]
-
-            resource.guest_dynamic_fields = dynamic_fields_attrs.map do |attr|
-              build_dynamic_field(attr)
-            end
-          end
-
-          def build_dynamic_field(attr)
-            field = resource.guest_dynamic_fields.build(attr.except(:id))
-
-            if field.dynamic_field.requires_dynamic_field_options?
-              field.dynamic_field_option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
-            end
-
-            field
-          end
         end
       end
     end

data/app/controllers/spree/api/v2/tenant/cart_controller.rb

@@ -48,7 +48,7 @@ module Spree
               quantity: add_item_params[:quantity],
               public_metadata: add_item_params[:public_metadata],
               private_metadata: add_item_params[:private_metadata],
-              options: add_item_params[:options]&.to_h
+              options: add_item_params[:options]
             )
 
             render_order(result)

data/app/controllers/spree_cm_commissioner/well_known_controller.rb

@@ -3,31 +3,19 @@ module SpreeCmCommissioner
     before_action :identify_request_source
     rescue_from StandardError, with: :handle_error
 
-    def assetlinks_json
-      render_universal_link('assetlinks.json')
-    end
-
-    def apple_app_site_association
-      render_universal_link('apple-app-site-association')
-    end
-
-    private
-
-    def render_universal_link(universal_link)
-      result = SpreeCmCommissioner::UniversalLinkFetcher.new(
-        universal_link: universal_link,
-        store: @store,
-        tenant: @tenant,
-        refresh: params[:_refresh].to_s == 'true'
-      ).call
-
-      if result[:success]
-        render json: result[:data]
+    def show
+      case params[:id]
+      when 'assetlinks.json'
+        render_preference(:preferred_assetlinks)
+      when 'apple-app-site-association'
+        render_preference(:preferred_apple_app_site_association)
       else
         render_not_found
       end
     end
 
+    private
+
     def identify_request_source
       host = params[:original_host].presence || request.host.downcase
 
@@ -37,6 +25,16 @@ module SpreeCmCommissioner
       @tenant = result.tenant
     end
 
+    def render_preference(preference_key)
+      if @store&.send(preference_key).present?
+        render json: @store.send(preference_key)
+      elsif @tenant&.send(preference_key).present?
+        render json: @tenant.send(preference_key)
+      else
+        render_not_found
+      end
+    end
+
     def render_not_found
       render json: { error: 'Not found' }, status: :not_found
     end

data/config/routes.rb

@@ -669,6 +669,5 @@ Rails.application.routes.draw do
   get 'o/:id', to: 'spree_cm_commissioner/orders#show', as: 'order'
   get 'li/:id', to: 'spree_cm_commissioner/line_item_qr_images#show', as: 'line_item_qr_image'
   get 'g/:id', to: 'spree_cm_commissioner/guest_cards#show', as: 'guest_cards'
-  get '.well-known/assetlinks.json', to: 'spree_cm_commissioner/well_known#assetlinks_json'
-  get '.well-known/apple-app-site-association', to: 'spree_cm_commissioner/well_known#apple_app_site_association'
+  get '.well-known/:id', to: 'spree_cm_commissioner/well_known#show', constraints: { id: /(assetlinks\.json|apple-app-site-association)/ }
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.18.0-pre2'.freeze
+  VERSION = '1.18.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.18.0.pre.pre2
+  version: 1.18.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-09 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1116,7 +1116,6 @@ files:
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_checker.rb
 - app/interactors/spree_cm_commissioner/transactional_email_sender.rb
 - app/interactors/spree_cm_commissioner/unique_device_token_cron_executor.rb
-- app/interactors/spree_cm_commissioner/universal_link_fetcher.rb
 - app/interactors/spree_cm_commissioner/update_payment_gateway_status.rb
 - app/interactors/spree_cm_commissioner/user_contact_updater.rb
 - app/interactors/spree_cm_commissioner/user_device_token_deregister.rb
@@ -2673,9 +2672,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1

data/app/interactors/spree_cm_commissioner/universal_link_fetcher.rb

@@ -1,54 +0,0 @@
-module SpreeCmCommissioner
-  class UniversalLinkFetcher < BaseInteractor
-    delegate :universal_link, :store, :tenant, :refresh, to: :context
-
-    def call
-      return not_found unless resource
-
-      data = load_cached_preference(resource)
-      return not_found if data.blank?
-
-      { success: true, data: data }
-    end
-
-    private
-
-    def resource
-      @resource ||= store.presence || tenant
-    end
-
-    def load_cached_preference(resource)
-      preference_key = preference_key_for(universal_link)
-      return nil unless preference_key && resource.respond_to?(preference_key)
-
-      updated_at = resource.try(:updated_at)&.to_i || 'no_updated_at'
-      cache_key = build_cache_key(universal_link, resource, updated_at)
-
-      CmAppLogger.log(label: 'LOOKING_UP_CACHE', data: { cache_key: cache_key })
-
-      Rails.cache.delete(cache_key) if refresh
-
-      Rails.cache.fetch(cache_key, expires_in: 1.day, force: refresh) do
-        CmAppLogger.log(label: 'CACHE_MISS', data: { cache_key: cache_key })
-        resource.public_send(preference_key).presence
-      end
-    end
-
-    def build_cache_key(universal_link, resource, updated_at)
-      "well_known:#{universal_link}:#{resource.class.name}:#{resource.id}:#{updated_at}"
-    end
-
-    def preference_key_for(universal_link)
-      case universal_link
-      when 'assetlinks.json'
-        :preferred_assetlinks
-      when 'apple-app-site-association'
-        :preferred_apple_app_site_association
-      end
-    end
-
-    def not_found
-      { success: false, error: 'Not found' }
-    end
-  end
-end