spree_cm_commissioner 2.0.0.pre.pre1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b85b4b7a446688bc4aed2974e7150a9155a2d919b998188fc7e575ccea0d2714
-  data.tar.gz: 134a3e165301c382a7e48016e768755420d32003a31cf3b3dac79f33b7a0d5a6
+  metadata.gz: f153e6dedc0923e77cd5fb9e53f99fb8b5f18f1289acc2961df248054621bbc8
+  data.tar.gz: efc85b32c83368f26e02db04b67c14e71c430baafcedcf997ee5961a6217d7d4
 SHA512:
-  metadata.gz: fd91cb46cb05faec83d0978df8312e272265ad03d1d14c1319ea0303081521dac9468a4e9e6fd4e72698e61c175fcddfc3bed53527e7f0ebe1a23f81062bf9c3
-  data.tar.gz: 1d04b75c972c6cff71fa6e95ca3882411a8a54b6b0b226183369a97b1360fa00c2c334e728203f647405313da8deec7298e4662dedfb068cc51540e4caf548d7
+  metadata.gz: 9f13f470efb8892b55fac8bdbb0e6f180dd08ebc12a3d6639ded76855526849890cc02f17d7bcdc592e4528eaad619da94f82b403084a1e697afd7e2fd0100b2
+  data.tar.gz: a6646ac4739b414ffab2890f2230f0e07c6401d78ed77482e394303234a6d67e102132ca0ad589a879c6370eac0d1efc947f0fba4a115ebc10622950c09ecbfe

data/Gemfile.lock

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

data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb

@@ -38,10 +38,9 @@ module SpreeCmCommissioner
       text << "Tel: #{inline_code(guest.phone_number)}"
       text << ''
 
-      # Each invitation_link leads to one order with one line_item, claimed by one guest so quantity is always 1.
       selected_line_items.each do |item|
         text << bold(item.product.name.to_s)
-        text << '🎟️ Quantity: 1'
+        text << "🎟️ Quantity: #{item.quantity}"
         text << italic("👉 #{item.options_text}") if item.options_text.present?
         text << italic(pretty_date_for(item)) if item.date_present?
         text << ''

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

@@ -55,24 +55,6 @@ module SpreeCmCommissioner
     def set_duration
       self.from_date ||= variant.start_date_time || event&.from_date
       self.to_date ||= variant.end_date_time || event&.to_date
-
-      return if persisted?
-
-      apply_variant_time(:from_date, variant.start_date_time)
-      apply_variant_time(:to_date, variant.end_date_time)
-    end
-
-    def apply_variant_time(field, variant_time)
-      field_value = send(field)
-
-      return unless field_value.present? && field_value.hour.zero? && variant_time.present?
-
-      send("#{field}=", field_value.change(
-                          hour: variant_time.hour,
-                          min: variant_time.min,
-                          sec: variant_time.sec
-                        )
-      )
     end
   end
 end

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

@@ -53,9 +53,8 @@ module SpreeCmCommissioner
     # No need to fallback to event start date to avoid n+1.
     # To get end_time duration of event, include event when needed instead.
     def start_date_time
-      return nil if start_date.blank? && start_time.blank?
+      return nil if start_date.blank?
       return start_date if start_time.blank?
-      return start_time if start_date.blank?
 
       start_date.change(hour: start_time.hour, min: start_time.min, sec: start_time.sec)
     end
@@ -63,9 +62,8 @@ module SpreeCmCommissioner
     # No need to fallback to event end date to avoid n+1.
     # To get end_time duration of event, include event when needed instead.
     def end_date_time
-      return nil if end_date.blank? && end_time.blank?
+      return nil if end_date.blank?
       return end_date if end_time.blank?
-      return end_time if end_date.blank?
 
       end_date.change(hour: end_time.hour, min: end_time.min, sec: end_time.sec)
     end

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -88,12 +88,6 @@ module SpreeCmCommissioner
       has_spree_role?('operator')
     end
 
-    def vendor_organizer?(vendor)
-      spree_roles.any? do |role|
-        role.name == "#{vendor.name.downcase.parameterize(separator: '-')}-organizer"
-      end
-    end
-
     def full_name
       [first_name, last_name].compact_blank.join(' ')
     end

data/config/routes.rb

@@ -644,7 +644,6 @@ Spree::Core::Engine.add_routes do
         resources :taxons, only: %i[show] do
           resource :event_ticket_aggregators, only: %i[show]
           resource :pie_chart_event_aggregators, only: %i[show]
-          resources :pie_chart_events, only: %i[index show]
         end
       end
     end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.0.0-pre1'.freeze
+  VERSION = '2.0.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.pre1
+  version: 2.0.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-31 00:00:00.000000000 Z
+date: 2025-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -819,7 +819,6 @@ files:
 - app/controllers/spree/api/v2/operator/guests_controller.rb
 - app/controllers/spree/api/v2/operator/line_items_controller.rb
 - app/controllers/spree/api/v2/operator/pie_chart_event_aggregators_controller.rb
-- app/controllers/spree/api/v2/operator/pie_chart_events_controller.rb
 - app/controllers/spree/api/v2/operator/recalculate_tickets_controller.rb
 - app/controllers/spree/api/v2/operator/taxons_controller.rb
 - app/controllers/spree/api/v2/organizer/base_controller.rb
@@ -1056,7 +1055,6 @@ files:
 - app/interactors/spree_cm_commissioner/conversion_pre_calculator.rb
 - app/interactors/spree_cm_commissioner/create_event.rb
 - app/interactors/spree_cm_commissioner/create_ticket.rb
-- app/interactors/spree_cm_commissioner/create_vendor.rb
 - app/interactors/spree_cm_commissioner/crew_invite_link_handler.rb
 - app/interactors/spree_cm_commissioner/crew_inviter.rb
 - app/interactors/spree_cm_commissioner/customer_content_notification_creator.rb
@@ -1235,7 +1233,6 @@ files:
 - app/models/spree_cm_commissioner/base.rb
 - app/models/spree_cm_commissioner/blazer_queryable.rb
 - app/models/spree_cm_commissioner/branch.rb
-- app/models/spree_cm_commissioner/chart_type.rb
 - app/models/spree_cm_commissioner/check_in.rb
 - app/models/spree_cm_commissioner/check_in_ability.rb
 - app/models/spree_cm_commissioner/check_in_record.rb
@@ -1557,7 +1554,6 @@ files:
 - app/queries/spree_cm_commissioner/line_item_searcher_query.rb
 - app/queries/spree_cm_commissioner/organizer_profile_event_query.rb
 - app/queries/spree_cm_commissioner/pie_chart_event_aggregator_queries.rb
-- app/queries/spree_cm_commissioner/pie_chart_event_queries.rb
 - app/queries/spree_cm_commissioner/reservation_query.rb
 - app/queries/spree_cm_commissioner/subscription_orders_query.rb
 - app/queries/spree_cm_commissioner/subscription_revenue_overview_query.rb
@@ -1575,7 +1571,6 @@ files:
 - app/request_schemas/spree_cm_commissioner/user_account_linkage_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/user_profile_request_schema.rb
 - app/serializables/spree_cm_commissioner/event_ticket_aggregator.rb
-- app/serializables/spree_cm_commissioner/pie_chart_event.rb
 - app/serializables/spree_cm_commissioner/pie_chart_event_aggregator.rb
 - app/serializables/spree_cm_commissioner/queue_item.rb
 - app/serializers/.gitkeep
@@ -1665,7 +1660,6 @@ files:
 - app/serializers/spree_cm_commissioner/json_ld/vendor_image_serializer.rb
 - app/serializers/spree_cm_commissioner/json_ld/vendor_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/base_serializer.rb
-- app/serializers/spree_cm_commissioner/v2/operator/chart_type_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/check_in_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/classification_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/dashboard_crew_event_serializer.rb
@@ -2705,9 +2699,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/controllers/spree/api/v2/operator/pie_chart_events_controller.rb

@@ -1,46 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Operator
-        class PieChartEventsController < ::Spree::Api::V2::ResourceController
-          ACCEPTED_KYC_FIELDS = %i[guest_gender guest_occupation guest_nationality].freeze
-          ADDITIONAL_FIELDS = %i[participation entry_type].freeze
-
-          def index
-            kyc_fields = fetch_filtered_kyc_fields
-            types = ADDITIONAL_FIELDS + kyc_fields
-
-            resources = types.map { |type| SpreeCmCommissioner::ChartType.new(type) }
-
-            render json: SpreeCmCommissioner::V2::Operator::ChartTypeSerializer.new(resources).serializable_hash
-          end
-
-          def resource
-            @resource = pie_chart_event_aggregator_queries.call
-          end
-
-          def resource_serializer
-            SpreeCmCommissioner::V2::Operator::PieChartEventAggregatorSerializer
-          end
-
-          private
-
-          def pie_chart_event_aggregator_queries
-            SpreeCmCommissioner::PieChartEventQueries.new(
-              taxon_id: params[:taxon_id],
-              chart_type: params[:id] || 'participation',
-              refreshed: params[:refreshed] || false
-            )
-          end
-
-          def fetch_filtered_kyc_fields
-            Spree::Product
-              .where(event_id: params[:taxon_id])
-              .flat_map(&:kyc_fields)
-              .uniq & ACCEPTED_KYC_FIELDS
-          end
-        end
-      end
-    end
-  end
-end

data/app/interactors/spree_cm_commissioner/create_vendor.rb

@@ -1,44 +0,0 @@
-module SpreeCmCommissioner
-  class CreateVendor
-    include Interactor
-
-    def call
-      validate_context!
-
-      ActiveRecord::Base.transaction do
-        create_vendor
-        assign_vendor_to_user
-        create_role
-      end
-    end
-
-    private
-
-    def validate_context!
-      context.fail!(message: 'User is missing') unless context.user
-      context.fail!(message: 'Vendor parameters are missing') unless context.vendor_params
-    end
-
-    def create_vendor
-      @vendor = Spree::Vendor.new(context.vendor_params)
-      return if @vendor.save
-
-      context.fail!(message: @vendor.errors.full_messages.join(', '))
-    end
-
-    def assign_vendor_to_user
-      context.user.vendors << @vendor
-    end
-
-    def create_role
-      role = context.user.spree_roles.create(
-        name: "#{@vendor.name.downcase.parameterize(separator: '-')}-organizer",
-        vendor_id: @vendor.id,
-        presentation: 'Organizer'
-      )
-      return if role.persisted?
-
-      context.fail!(message: role.errors.full_messages.to_sentence)
-    end
-  end
-end

data/app/models/spree_cm_commissioner/chart_type.rb

@@ -1,10 +0,0 @@
-module SpreeCmCommissioner
-  class ChartType
-    attr_reader :chart_type, :name
-
-    def initialize(chart_type)
-      @chart_type = chart_type.to_s
-      @name = @chart_type.humanize
-    end
-  end
-end

data/app/queries/spree_cm_commissioner/pie_chart_event_queries.rb

@@ -1,179 +0,0 @@
-module SpreeCmCommissioner
-  class PieChartEventQueries
-    attr_reader :taxon_id, :chart_type, :refreshed
-
-    # chart_type: 'participation | gender | entry_type' taxon_id: taxon_id, refreshed: false
-    def initialize(taxon_id:, chart_type:, refreshed: false)
-      @taxon_id = taxon_id
-      @chart_type = chart_type || 'participation'
-      @refreshed = refreshed
-    end
-
-    def call
-      cache_key = "#{chart_type}-#{taxon_id}"
-      Rails.cache.delete(cache_key) if refreshed
-
-      product_charts = Rails.cache.fetch(cache_key, expires_in: 30.minutes) do
-        pie_chart || []
-      end
-
-      SpreeCmCommissioner::PieChartEvent.new(
-        id: taxon_id,
-        chart_type: chart_type,
-        product_charts: product_charts
-      )
-    end
-
-    def pie_chart
-      case chart_type
-      when 'participation' then participation_pie_chart
-      when 'entry_type' then entry_type_pie_chart
-      when 'guest_gender' then gender_pie_chart
-      when 'guest_occupation' then occupation_pie_chart
-      when 'guest_nationality' then nationality_pie_chart
-      end
-    end
-
-    private
-
-    def base_joins
-      query = SpreeCmCommissioner::Guest
-      join_type = chart_type.in?(%w[participation occupation nationality]) ? 'LEFT' : 'INNER'
-
-      query
-        .joins("#{join_type} JOIN cm_check_ins ON cm_check_ins.guest_id = cm_guests.id")
-        .joins('INNER JOIN spree_line_items ON spree_line_items.id = cm_guests.line_item_id')
-        .joins('INNER JOIN spree_variants ON spree_variants.id = spree_line_items.variant_id')
-        .joins('INNER JOIN spree_orders ON spree_orders.id = spree_line_items.order_id')
-        .joins('INNER JOIN spree_products ON spree_products.id = spree_variants.product_id')
-        .joins('INNER JOIN spree_products_taxons ON spree_products.id = spree_products_taxons.product_id')
-        .joins('INNER JOIN spree_taxons ON spree_taxons.id = spree_products_taxons.taxon_id')
-        .where(spree_orders: { state: 'complete' }, spree_taxons: { parent_id: taxon_id })
-    end
-
-    def participation_pie_chart
-      grouped_data = base_joins
-                     .select("spree_products.id AS product_id,
-             spree_products.name AS product_name,
-             CASE
-               WHEN cm_check_ins.id IS NOT NULL THEN 'show'
-               ELSE 'no_show'
-             END AS name,
-             COUNT(*) AS total"
-                            )
-                     .group('spree_products.id, CASE WHEN cm_check_ins.id IS NOT NULL THEN \'show\' ELSE \'no_show\' END')
-                     .group_by(&:product_id)
-
-      product_charts = build_product_charts(grouped_data)
-
-      add_overall_summary(product_charts)
-    end
-
-    def gender_pie_chart
-      data = base_joins.select(
-        "spree_products.id AS product_id,
-         spree_products.name AS product_name,
-         CASE
-           WHEN cm_guests.gender = 0 THEN 'other'
-           WHEN cm_guests.gender = 1 THEN 'male'
-           WHEN cm_guests.gender = 2 THEN 'female'
-         END AS name,
-         COUNT(DISTINCT cm_guests.id) AS total"
-      )
-                       .group('spree_products.id, cm_guests.gender')
-                       .group_by(&:product_id)
-
-      product_charts = build_product_charts(data)
-
-      add_overall_summary(product_charts)
-    end
-
-    def entry_type_pie_chart
-      data = base_joins
-             .where.not(cm_check_ins: { id: nil })
-             .select(
-               "spree_products.id AS product_id,
-           spree_products.name AS product_name,
-           CASE
-             WHEN cm_check_ins.entry_type = 0 THEN 'normal'
-             WHEN cm_check_ins.entry_type = 1 THEN 'VIP'
-           END AS name,
-           COUNT(cm_check_ins.id) AS total"
-             )
-             .group('spree_products.id, cm_check_ins.entry_type')
-             .group_by(&:product_id)
-
-      product_charts = build_product_charts(data)
-
-      add_overall_summary(product_charts)
-    end
-
-    def occupation_pie_chart
-      data = base_joins
-             .joins('LEFT JOIN spree_taxons AS occupation_taxons ON occupation_taxons.id = cm_guests.occupation_id')
-             .where.not(cm_guests: { occupation_id: nil })
-             .select(
-               'spree_products.id AS product_id,
-           spree_products.name AS product_name,
-           occupation_taxons.name AS name,
-           COUNT(DISTINCT cm_guests.id) AS total,
-           COUNT(DISTINCT cm_check_ins.id) AS show'
-             )
-             .group('spree_products.id, spree_products.name, occupation_taxons.name')
-             .group_by(&:product_id)
-
-      product_charts = build_product_charts(data, keys: %i[name total show])
-
-      add_overall_summary(product_charts, keys: %i[total show])
-    end
-
-    def nationality_pie_chart
-      data = base_joins
-             .joins('LEFT JOIN spree_taxons AS nationality_taxons ON nationality_taxons.id = cm_guests.nationality_id')
-             .where.not(cm_guests: { nationality_id: nil })
-             .select(
-               'spree_products.id AS product_id,
-           spree_products.name AS product_name,
-           nationality_taxons.name AS name,
-           COUNT(DISTINCT cm_guests.id) AS total,
-           COUNT(DISTINCT cm_check_ins.id) AS show'
-             )
-             .group('spree_products.id, spree_products.name, nationality_taxons.name')
-             .group_by(&:product_id)
-
-      product_charts = build_product_charts(data, keys: %i[name total show])
-
-      add_overall_summary(product_charts, keys: %i[total show])
-    end
-
-    def build_product_charts(grouped_data, keys: %i[name total])
-      grouped_data.map do |product_id, records|
-        {
-          product_id: product_id,
-          product_name: records.first.product_name,
-          pies: records.map { |r| r.slice(*keys) }
-        }
-      end
-    end
-
-    def add_overall_summary(product_charts, keys: %i[total])
-      totals = Hash.new { |hash, key| hash[key] = keys.index_with { |_k| 0 } }
-
-      product_charts.each do |chart|
-        chart[:pies].each do |pie|
-          keys.each { |k| totals[pie[:name]][k] += pie[k] }
-        end
-      end
-
-      overall = {
-        product_id: 'all',
-        product_name: 'Overall',
-        pies: totals.map do |name, values|
-          { name: name }.merge(values)
-        end
-      }
-
-      [overall] + product_charts
-    end
-  end
-end

data/app/serializables/spree_cm_commissioner/pie_chart_event.rb

@@ -1,11 +0,0 @@
-module SpreeCmCommissioner
-  class PieChartEvent
-    attr_reader :id, :chart_type, :product_charts
-
-    def initialize(id:, chart_type:, product_charts:)
-      @id = id
-      @chart_type = chart_type
-      @product_charts = product_charts
-    end
-  end
-end

data/app/serializers/spree_cm_commissioner/v2/operator/chart_type_serializer.rb

@@ -1,10 +0,0 @@
-module SpreeCmCommissioner
-  module V2
-    module Operator
-      class ChartTypeSerializer < BaseSerializer
-        set_id :chart_type
-        attributes :chart_type, :name
-      end
-    end
-  end
-end