spree_cm_commissioner 2.3.0.pre.pre16 → 2.3.0.pre.pre18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 654baee3237bba36ebcc85458b09f73b076c6d1ffb782351cf697fa7ab287c7d
-  data.tar.gz: ef9275e9c3d748cdd7947780dca206ea2ae75b4362731e9d9d1b04b2eab04aee
+  metadata.gz: 31d13343c99ba15786dc8ea2706e64fd79ada05ce505f06fea9dfdffd24f1313
+  data.tar.gz: 2638b1befd6df8abbc2ed8bcabfd447bb15bb2006336e2ff894662c58c07e933
 SHA512:
-  metadata.gz: b35dd2fe6fc1815f72f0c1e33a88eb629437040de5ea73fc48f8cb249b6f322aedfe2be423847b74ef609a78783f62de13399b0c17c6fdebdf0c54c4a826cdf8
-  data.tar.gz: 11131275c0fc9afec3d0ed082e10ac0471490e07fc04ebbc64ccb10d01ac1442acb102fd4178bfedad3a0e685939df1ad42459f5c62494dd168c699cbb105b57
+  metadata.gz: 487aa62c3894d83cd38036169a677ab79633f9792654e4d87e59c61fdbbe6a6bb60cd303f69727e093fc37fcf41c361ad43fbb2f60e79f84e5cd6e830aa05ed2
+  data.tar.gz: 608a5d18e523889840e11a31f2686d357636de604fb360abb0c5074c1f3eda129c33012e779f5dc5ce025aed2842eb605cb051014217fccf4fa36361b8315fb5

data/Gemfile.lock

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

data/README.md

@@ -32,6 +32,39 @@ If your server was running, restart it so that it can find the assets properly.
 
 Update the semantic version number in `lib/spree_cm_commissioner/version.rb`, then create and push a new tag to GitHub. When the tag is pushed, the GitHub Actions workflow will automatically build the gem and publish it to RubyGems.
 
+Here's a cleaner and more polished version of your section:
+
+## PostgreSQL Configuration
+
+By default, this Rails engine uses your current system login to connect to the PostgreSQL database. To allow passwordless connections, you need to configure PostgreSQL to trust local connections by editing `pg_hba.conf`:
+
+```conf
+# pg_hba.conf
+local   all             all                                     trust
+```
+
+With this `trust` configuration, PostgreSQL expects a role that matches your current system username.
+
+To check your system username:
+
+```sh
+whoami  # e.g., superdev
+```
+
+Then create a matching PostgreSQL role:
+
+```sh
+createuser -U postgres -s superdev
+```
+
+Or simply run the following to create a role matching your current system user:
+
+```sh
+createuser -U postgres -s $(whoami)
+```
+
+> 💡 We recommend using [Postgres.app](https://postgresapp.com) for local development. It supports multiple PostgreSQL versions and provides a developer-friendly setup out of the box.
+
 ## Config
 
 ### Rake tasks

data/app/controllers/blazer/base_controller_decorator.rb

@@ -12,11 +12,30 @@ module Blazer
     end
 
     def restrict_organizer_access
-      return unless spree_current_user.organizer? && !spree_current_user.admin?
+      return if spree_current_user.admin?
+
+      return unless spree_current_user.organizer? || vendor_permissions?
       return if controller_name == 'queries' && %w[show run].include?(action_name)
 
       raise ActionController::RoutingError, 'Unauthorized'
     end
+
+    private
+
+    def current_vendor
+      @current_vendor ||= vendors&.find_by(id: session[:vendor_id]) || vendors&.first
+    end
+
+    def vendors
+      @vendors ||= spree_current_user&.vendors
+    end
+
+    def vendor_permissions?
+      return false unless current_vendor
+
+      permissions = spree_current_user.permissions_for_vendor(current_vendor.id)
+      permissions.exists?(entry: 'shared_console/reports', action: 'view_reports')
+    end
   end
 end
 

data/app/controllers/spree/api/v2/storefront/intercity_taxi/draft_orders_controller.rb

@@ -0,0 +1,40 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module IntercityTaxi
+          class DraftOrdersController < ::Spree::Api::V2::ResourceController
+            def create
+              order = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
+                trip_id: params[:trip_id],
+                from_date: params[:from_date],
+                to_date: params[:to_date],
+                user_id: params[:user_id],
+                quantity: params[:quantity]
+              )
+
+              render_serialized_payload { serialize_resource(order) }
+            rescue StandardError => e
+              render_error_payload(e.message)
+            end
+
+            def update
+              order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
+                order_number: params[:id],
+                params: params
+              )
+
+              render_serialized_payload { serialize_resource(order) }
+            rescue StandardError => e
+              render_error_payload(e.message)
+            end
+
+            def resource_serializer
+              SpreeCmCommissioner::V2::Storefront::IntercityTaxiCartSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -61,6 +61,7 @@ module Spree
 
             Spree::LineItem.joins(:order)
                            .where(spree_orders: { token: order_tokens, state: 'complete', user_id: nil })
+                           .includes(:guests, :saved_guests)
                            .filter_by_event(event)
                            .page(params[:page])
                            .per(params[:per_page])

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

@@ -3,21 +3,59 @@ module Spree
     module V2
       module Storefront
         class TripSearchController < ::Spree::Api::V2::ResourceController
+          CACHE_EXPIRES_IN = 5.minutes
+
           def index
-            trips = SpreeCmCommissioner::TripQuery.new(
-              origin_id: params[:origin_id],
-              destination_id: params[:destination_id],
-              date: params[:date],
-              vendor_id: params[:vendor_id],
-              number_of_guests: params[:number_of_guests],
-              params: params
-            ).call
+            render_serialized_payload do
+              Rails.cache.fetch(collection_cache_key, collection_cache_opts) do
+                trips = SpreeCmCommissioner::TripQuery.new(
+                  origin_id: params[:origin_id],
+                  destination_id: params[:destination_id],
+                  date: params[:date],
+                  vendor_id: params[:vendor_id],
+                  number_of_guests: params[:number_of_guests],
+                  params: params
+                ).call
 
-            render_serialized_payload { serialize_collection(trips) }
+                serialize_collection(trips)
+              end
+            end
           end
 
           private
 
+          # override from ContentCacheable
+          def max_age
+            CACHE_EXPIRES_IN.to_i
+          end
+
+          # override
+          def collection_cache_key
+            cache_key_parts = [
+              'trip_search',
+              params[:origin_id],
+              params[:destination_id],
+              params[:date],
+              params[:vendor_id],
+              params[:number_of_guests],
+              resource_includes&.sort&.join(','),
+              sparse_fields&.sort&.join(','),
+              serializer_params.to_json,
+              params[:page]&.to_s&.strip,
+              params[:per_page]&.to_s&.strip
+            ].compact.join('-')
+
+            Digest::MD5.hexdigest(cache_key_parts)
+          end
+
+          # override
+          def collection_cache_opts
+            {
+              namespace: Spree::Api::Config[:api_v2_collection_cache_namespace],
+              expires_in: CACHE_EXPIRES_IN
+            }
+          end
+
           # override
           def default_resource_includes
             [

data/app/controllers/spree_cm_commissioner/admin/variants_controller_decorator.rb

@@ -17,7 +17,7 @@ module SpreeCmCommissioner
       end
 
       # construct option values base on name & create new option value when not exist.
-      # then set to variant.
+      # then set to variant. Empty values will remove the option value from variant.
       def build_option_values
         option_values = permitted_resource_params.delete(:option_values_attributes).to_h.values
         return if option_values.blank?

data/app/factory/spree_cm_commissioner/vendor_telegram_message_factory.rb

@@ -0,0 +1,65 @@
+# 📋 ---[New Vendor]---
+#
+# 📝 Name: {{vendor.name}}
+#
+# ✉️ Email: <code>{{vendor.notification_email || vendor.support_email}}</code>
+# 📱 Phone Number: {{vendor.phone_number}}
+#
+# 👤 Created by: {{first_user.name || 'Admin'}}
+# 🗓️ Created at: {{vendor.created_at}}
+#
+# 🔗 URL: {{vendor.organizer_url}}
+module SpreeCmCommissioner
+  class VendorTelegramMessageFactory < TelegramMessageFactory
+    attr_reader :vendor
+
+    def initialize(vendor:)
+      @vendor = vendor
+
+      title = '✨ New Vendor ✨'
+
+      super(title: title)
+    end
+
+    def body
+      [
+        "📝 Name: #{vendor.name}",
+        '',
+        email_line,
+        phone_line,
+        '',
+        creator_line,
+        created_at_line,
+        '',
+        url_line
+      ].compact.join("\n")
+    end
+
+    private
+
+    def email_line
+      return unless vendor.notification_email.present? || vendor.support_email.present?
+
+      "✉️ Email: #{inline_code(vendor.notification_email || vendor.support_email)}"
+    end
+
+    def phone_line
+      return if vendor.contact_us.blank?
+
+      "📱 Phone Number: #{vendor.contact_us}"
+    end
+
+    def creator_line
+      creator_email = vendor.users.first&.email
+      "👤 Created by: #{creator_email}" if creator_email.present?
+    end
+
+    def created_at_line
+      "🗓️ Created at: #{pretty_date(vendor.created_at)}" if vendor.created_at.present?
+    end
+
+    def url_line
+      "🔗 URL: #{vendor.organizer_url}" if vendor.organizer_url.present?
+    end
+  end
+end

data/app/helpers/spree/base_helper_decorator.rb

@@ -20,25 +20,8 @@ module Spree
       end
     end
 
-    def custom_product_line_item_url(line_item, options = {})
-      if defined?(locale_param) && locale_param.present?
-        options.merge!(locale: locale_param)
-      end
-
-      localize = if options[:locale].present?
-                   "/#{options[:locale]}"
-                 else
-                   ''
-                 end
-
-      line_item = Spree::LineItem.find(line_item.id)
-      payload = { order_number: line_item.order.number, line_item_id: line_item.id }
-
-      jwt_token = SpreeCmCommissioner::LineItemJwtToken.encode(payload, line_item.order.token)
-
-      return if line_item.number.blank? && jwt_token.blank?
-
-      "#{current_store.formatted_url + localize}/a/#{line_item.qr_data}"
+    def custom_product_line_item_url(line_item)
+      main_app.url_for("/a/#{line_item.qr_data}")
     end
   end
 end

data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb

@@ -2,26 +2,54 @@ module SpreeCmCommissioner
   class UserRegistrationWithIdToken < BaseInteractor
     # :id_token
     def call
+      firebase_context = validate_firebase_token!
+      return if firebase_context.nil?
+
+      ActiveRecord::Base.transaction do
+        find_or_register_user!(firebase_context.provider[:name], firebase_context.provider[:email])
+        link_user_account!(firebase_context.provider)
+      end
+    end
+
+    private
+
+    def validate_firebase_token!
       firebase_context = SpreeCmCommissioner::FirebaseIdTokenProvider.call(id_token: context.id_token)
+      return firebase_context if firebase_context.success?
 
-      if firebase_context.success?
-        ActiveRecord::Base.transaction do
-          register_user!(firebase_context.provider[:name], firebase_context.provider[:email])
-          link_user_account!(firebase_context.provider)
-        end
+      context.fail!(message: firebase_context.message)
+      nil
+    end
+
+    def find_or_register_user!(name, email)
+      if email.present?
+        register_user_with_email!(name, email)
       else
-        context.fail!(message: firebase_context.message)
+        register_user_without_email!(name)
       end
     end
 
-    def register_user!(name, email)
-      user = Spree.user_class.new(
-        password: SecureRandom.base64(16),
-        email: email,
-        tenant_id: context.tenant_id,
-        **name_attributes(name)
-      )
-      user.confirmed_at = Time.zone.now
+    def register_user_with_email!(name, email)
+      user = Spree.user_class.find_by(email: email, tenant_id: context.tenant_id)
+      return context.user = ensure_user_confirmed!(user) if user.present?
+
+      begin
+        context.user = Spree.user_class.find_or_create_by!(email: email, tenant_id: context.tenant_id) do |u|
+          assign_user_attributes(u, name)
+        end
+      # Handle potential race condition: Another request might have created the user
+      # between our find_by and find_or_create_by calls. If we get a RecordNotUnique,
+      # it means the user was created by another process, so we find and return it.
+      rescue ActiveRecord::RecordNotUnique
+        user = Spree.user_class.find_by!(email: email, tenant_id: context.tenant_id)
+        context.user = ensure_user_confirmed!(user)
+      end
+    end
+
+    def register_user_without_email!(name)
+      user = Spree.user_class.new(email: nil, tenant_id: context.tenant_id)
+      assign_user_attributes(user, name)
+
       if user.save(validate: false)
         context.user = user
       else
@@ -29,39 +57,32 @@ module SpreeCmCommissioner
       end
     end
 
+    def assign_user_attributes(user, name)
+      user.password = SecureRandom.base64(16)
+      user.confirmed_at = Time.zone.now
+      user.assign_attributes(name_attributes(name))
+    end
+
     def name_attributes(name)
       full_name = name&.strip
       return {} if full_name.blank?
 
-      split = full_name.split
-      first_name = split[0]
-      last_name = split[1..].join(' ')
-
-      attributes = {}
-      attributes[:first_name] = first_name if first_name.present?
-      attributes[:last_name] = last_name if last_name.present?
+      parts = full_name.split
+      attributes = { first_name: parts[0] }
+      attributes[:last_name] = parts[1..].join(' ') if parts.size > 1
 
       attributes
     end
 
-    # provider object
-
-    # {
-    #   identity_type: identity_type,
-    #   sub: sub
-    # }
-
     def link_user_account!(provider)
       identity_type = SpreeCmCommissioner::UserIdentityProvider.identity_types[provider[:identity_type]]
+      user_identity_provider = find_or_initialize_identity_provider(identity_type)
 
-      user_identity_provider = SpreeCmCommissioner::UserIdentityProvider.where(
-        user_id: context.user,
-        identity_type: identity_type
-      ).first_or_initialize
-
-      user_identity_provider.sub = provider[:sub]
-      user_identity_provider.email = provider[:email]
-      user_identity_provider.name = provider[:name]
+      user_identity_provider.assign_attributes(
+        sub: provider[:sub],
+        email: provider[:email],
+        name: provider[:name]
+      )
 
       if user_identity_provider.save
         context.user_identity_provider = user_identity_provider
@@ -69,5 +90,20 @@ module SpreeCmCommissioner
         context.fail!(message: user_identity_provider.errors.full_messages)
       end
     end
+
+    def find_or_initialize_identity_provider(identity_type)
+      SpreeCmCommissioner::UserIdentityProvider.where(
+        user_id: context.user,
+        identity_type: identity_type
+      ).first_or_initialize
+    end
+
+    # Ensure user is confirmed when linking with identity provider.
+    # Users created via OAuth should be auto-confirmed since they've proven
+    # their identity through the OAuth provider.
+    def ensure_user_confirmed!(user)
+      user.update(confirmed_at: Time.zone.now) if user.confirmed_at.nil?
+      user
+    end
   end
 end

data/app/interactors/spree_cm_commissioner/vendor_creation_telegram_alert_sender.rb

@@ -0,0 +1,28 @@
+module SpreeCmCommissioner
+  class VendorCreationTelegramAlertSender < BaseInteractor
+    delegate :vendor, to: :context
+
+    def call
+      return if admin_chat_id.blank?
+
+      send_alert
+    end
+
+    def send_alert
+      TelegramNotificationSender.call(
+        chat_id: admin_chat_id,
+        message: alert_message,
+        parse_mode: 'HTML'
+      )
+    end
+
+    def alert_message
+      factory = SpreeCmCommissioner::VendorTelegramMessageFactory.new(vendor: vendor)
+      factory.message
+    end
+
+    def admin_chat_id
+      ENV.fetch('EXCEPTION_NOTIFIER_TELEGRAM_CHANNEL_ID', nil)
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/transit/route_fulfilled_order_count_incrementer_job.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     class RouteFulfilledOrderCountIncrementerJob < ApplicationUniqueJob
       def perform(order_id:)
         order = Spree::Order.find(order_id)
-        SpreeCmCommissioner::Transit::RouteFulfilledOrderCountIncrementerService.call(order: order)
+        SpreeCmCommissioner::Routes::IncrementFulfilledOrderCount.call(order: order)
       end
     end
   end

data/app/jobs/spree_cm_commissioner/transit/route_order_count_incrementer_job.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     class RouteOrderCountIncrementerJob < ApplicationUniqueJob
       def perform(order_id:)
         order = Spree::Order.find(order_id)
-        SpreeCmCommissioner::Transit::RouteOrderCountIncrementerService.call(order: order)
+        SpreeCmCommissioner::Routes::IncrementOrderCount.call(order: order)
       end
     end
   end

data/app/jobs/spree_cm_commissioner/transit/route_previous_trip_count_decrementer_job.rb

@@ -6,7 +6,7 @@ module SpreeCmCommissioner
       queue_as :default
 
       def perform(previous_route_id:)
-        SpreeCmCommissioner::Transit::RoutePreviousTripCountDecrementerService.call(previous_route_id: previous_route_id)
+        SpreeCmCommissioner::Routes::DecrementPreviousTripCount.call(previous_route_id: previous_route_id)
       end
     end
   end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_decrementer_job.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     class RouteTripCountDecrementerJob < ApplicationUniqueJob
       def perform(trip_id:)
         trip = SpreeCmCommissioner::Trip.find(trip_id)
-        SpreeCmCommissioner::Transit::RouteTripCountDecrementerService.call(trip: trip)
+        SpreeCmCommissioner::Routes::DecrementTripCount.call(trip: trip)
       end
     end
   end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_incrementer_job.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     class RouteTripCountIncrementerJob < ApplicationUniqueJob
       def perform(trip_id:)
         trip = SpreeCmCommissioner::Trip.find(trip_id)
-        SpreeCmCommissioner::Transit::RouteTripCountIncrementerService.call(trip: trip)
+        SpreeCmCommissioner::Routes::IncrementTripCount.call(trip: trip)
       end
     end
   end

data/app/jobs/spree_cm_commissioner/vendor_creation_telegram_alert_sender_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  class VendorCreationTelegramAlertSenderJob < ApplicationUniqueJob
+    queue_as :telegram_bot
+
+    def perform(vendor_id)
+      vendor = Spree::Vendor.find(vendor_id)
+      SpreeCmCommissioner::VendorCreationTelegramAlertSender.call(vendor: vendor)
+    end
+  end
+end

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

@@ -63,11 +63,22 @@ module SpreeCmCommissioner
 
     def pickup_place_name = public_metadata['pickup_place_name']
     def drop_off_place_name = public_metadata['drop_off_place_name']
+
     def pickup_lat = public_metadata['pickup_lat']&.to_f
     def pickup_lng = public_metadata['pickup_lng']&.to_f
     def drop_off_lat = public_metadata['drop_off_lat']&.to_f
     def drop_off_lng = public_metadata['drop_off_lng']&.to_f
     def passenger_count = public_metadata['passenger_count']&.to_i
+    def distance_km = public_metadata['distance_km']&.to_f
+    def ordered_points = public_metadata['ordered_points']
+    def base_km = public_metadata['base_km']&.to_f
+    def detour_pickup_km = public_metadata['detour_pickup_km']&.to_f
+    def detour_dropoff_km = public_metadata['detour_dropoff_km']&.to_f
+    def extra_pickup_km = public_metadata['extra_pickup_km']&.to_f
+    def extra_dropoff_km = public_metadata['extra_dropoff_km']&.to_f
+    def extra_pickup_charge_usd = public_metadata['extra_pickup_charge_usd']&.to_f
+    def extra_dropoff_charge_usd = public_metadata['extra_dropoff_charge_usd']&.to_f
+    def estimated_time_minutes = public_metadata['estimated_time_minutes']&.to_i
     def pickup_oob_confirmed = private_metadata['pickup_oob_confirmed']
     def drop_off_oob_confirmed = private_metadata['drop_off_oob_confirmed']
 
@@ -123,6 +134,46 @@ module SpreeCmCommissioner
       set_public_metadata_value('passenger_count', value)
     end
 
+    def distance_km=(value)
+      set_public_metadata_value('distance_km', value)
+    end
+
+    def ordered_points=(value)
+      set_public_metadata_value('ordered_points', value)
+    end
+
+    def base_km=(value)
+      set_public_metadata_value('base_km', value)
+    end
+
+    def detour_pickup_km=(value)
+      set_public_metadata_value('detour_pickup_km', value)
+    end
+
+    def detour_dropoff_km=(value)
+      set_public_metadata_value('detour_dropoff_km', value)
+    end
+
+    def extra_pickup_km=(value)
+      set_public_metadata_value('extra_pickup_km', value)
+    end
+
+    def extra_dropoff_km=(value)
+      set_public_metadata_value('extra_dropoff_km', value)
+    end
+
+    def extra_pickup_charge_usd=(value)
+      set_public_metadata_value('extra_pickup_charge_usd', value)
+    end
+
+    def extra_dropoff_charge_usd=(value)
+      set_public_metadata_value('extra_dropoff_charge_usd', value)
+    end
+
+    def estimated_time_minutes=(value)
+      set_public_metadata_value('estimated_time_minutes', value)
+    end
+
     private
 
     def set_public_metadata_value(key, value)

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

@@ -10,6 +10,7 @@ module SpreeCmCommissioner
       array
       date
       time
+      color
       coordinate
       state_selection
       payment_option
@@ -41,6 +42,8 @@ module SpreeCmCommissioner
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
       'seat-number-positions' => 'array',
+      'color' => 'color',
+      'ticket-type' => 'string',
       'seat-type' => 'string',
       'intercity-taxi' => 'string'
     }.freeze
@@ -71,6 +74,10 @@ module SpreeCmCommissioner
       name.in?(RESERVED_OPTIONS.keys)
     end
 
+    def ticket_type?
+      name == 'ticket-type'
+    end
+
     def set_reverved_options_attributes
       self.attr_type = RESERVED_OPTIONS[name]
       self.kind = :variant