spree_cm_commissioner 2.0.0.pre.pre → 2.0.0.pre.pre1

data/app/queries/spree_cm_commissioner/guest_searcher_query.rb

@@ -8,20 +8,36 @@ module SpreeCmCommissioner
 
     def event_id = params[:event_id]
 
-    def call
+    def call # rubocop:disable Metrics/PerceivedComplexity
       return SpreeCmCommissioner::Guest.none if event_id.blank?
 
-      if params[:qr_data].present?
+      if params[:qr_data].present? && order_qr_data?
+        search_by_order_qr
+      elsif params[:qr_data].present? && line_item_qr_data?
+        search_by_line_item_qr
+      elsif params[:qr_data].present? && guest_qr_data?
         search_by_guest_qr
       elsif params[:term].present?
         search_by_term
+      elsif params[:ids].present?
+        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id, id: params[:ids])
       else
-        SpreeCmCommissioner::Guest.none
+        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id)
       end
     end
 
     private
 
+    def search_by_order_qr
+      order = Spree::Order.complete_or_canceled.search_by_qr_data!(params[:qr_data])
+      order.guests.where(event_id: event_id)
+    end
+
+    def search_by_line_item_qr
+      line_item = Spree::LineItem.complete_or_canceled.search_by_qr_data!(params[:qr_data])
+      line_item.guests.where(event_id: event_id)
+    end
+
     def search_by_guest_qr
       SpreeCmCommissioner::Guest.complete_or_canceled.where(
         token: params[:qr_data],
@@ -29,6 +45,32 @@ module SpreeCmCommissioner
       )
     end
 
+    def order_qr_data?
+      matches = construct_matches
+      matches&.size == 2
+    end
+
+    def line_item_qr_data?
+      matches = construct_matches
+      matches&.size == 3
+    end
+
+    def guest_qr_data?
+      matches = construct_matches
+      matches.nil?
+    end
+
+    def construct_matches
+      qr_data = params[:qr_data]
+      return nil unless qr_data
+
+      if qr_data =~ /-L\d+$/
+        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)-(L\d+)/)&.captures
+      else
+        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)/)&.captures
+      end
+    end
+
     def search_by_term
       terms = params[:term].split.map { |term| "%#{term.downcase}%" }
 

data/app/queries/spree_cm_commissioner/pie_chart_event_queries.rb

@@ -0,0 +1,179 @@
+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/queries/spree_cm_commissioner/trip_query.rb

@@ -2,18 +2,18 @@ module SpreeCmCommissioner
   class TripQuery
     include SpreeCmCommissioner::Transit::TripHelper
 
-    attr_reader :origin_id, :destination_id, :date, :params
+    attr_reader :origin_id, :destination_id, :travel_date, :params
 
-    def initialize(origin_id:, destination_id:, date:, params: {})
+    def initialize(origin_id:, destination_id:, travel_date:, params: {})
       @origin_id = origin_id
       @destination_id = destination_id
-      @date = date
-      @date = Time.zone.now if date.to_date == Time.zone.now.to_date
+      @travel_date = travel_date
+      @travel_date = Time.zone.now if travel_date.to_date == Time.zone.now.to_date
       @params = params
     end
 
     def call
-      return [] if date.to_date < Date.current
+      return [] if travel_date.to_date < Date.current
 
       direct_results = direct_trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
       connected_results = connected_trips || []
@@ -35,18 +35,18 @@ module SpreeCmCommissioner
                         trips.duration AS duration,
                         trips.vehicle_id AS vehicle_id'
                       )
-               .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
-               .joins('INNER JOIN cm_trips AS trips ON trips.product_id = routes.id')
+               .joins('INNER JOIN cm_trips AS trips ON trips.variant_id = spree_variants.id')
                .joins('INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = spree_variants.id AND boarding.stop_type = 0')
                .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = spree_variants.id AND drop_off.stop_type = 1')
                .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_variants.vendor_id')
-
+               .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
       result = result.where(vendors: { id: params[:vendor_id] }) if params[:vendor_id].present?
       result = result.where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
                      .where('trips.departure_time > ? AND trips.departure_time <= ?',
-                            date.strftime('%H:%M:%S'),
-                            date.end_of_day.strftime('%H:%M:%S')
+                            travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
                            )
+
       result.map do |trip|
         trip_result_options = {
           trip_id: trip[:variant_id],
@@ -70,18 +70,20 @@ module SpreeCmCommissioner
     def connected_trips # rubocop:disable Metrics/MethodLength
       result = SpreeCmCommissioner::TripConnection
                .joins('
-                INNER JOIN cm_trips trip1 ON trip1.id = cm_trip_connections.from_trip_id
-                INNER JOIN cm_trips trip2 ON trip2.id = cm_trip_connections.to_trip_id
-                INNER JOIN spree_products AS routes1 ON routes1.id = trip1.product_id
-                INNER JOIN spree_products AS routes2 ON routes2.id = trip2.product_id
-                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = trip1.id AND trip1_origin.stop_type = 0
-                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = trip2.id AND trip2_origin.stop_type = 0
-                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = trip2.id AND trip2_destination.stop_type = 1
-                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = routes1.vendor_id
-                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = routes2.vendor_id'
+                INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
+                INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
+                INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
+                INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
+                INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
+                INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
+                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
+                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
+                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
                      )
                .select('cm_trip_connections.id AS id,
-                        trip1.id AS trip1_id,
+                        trip1.variant_id AS trip1_id,
                         trip1.origin_id AS trip1_origin_id,
                         trip1.destination_id AS trip1_destination_id,
                         trip1.departure_time AS trip1_departure_time,
@@ -90,7 +92,7 @@ module SpreeCmCommissioner
                         routes1.name AS route1_name,
                         trip1.vehicle_id AS trip1_vehicle,
                         vendor1.name AS trip1_vendor_name,
-                        trip2.id AS trip2_id,
+                        trip2.variant_id AS trip2_id,
                         trip2.origin_id AS trip2_origin_id,
                         trip2.destination_id AS trip2_destination_id,
                         trip2.departure_time AS trip2_departure_time,
@@ -104,9 +106,10 @@ module SpreeCmCommissioner
                         vendor2.name AS trip2_vendor_name'
                       ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id)
       result = result.where('vendor1.id = ? OR vendor2.id = ?', params[:vendor_id], params[:vendor_id]) if params[:vendor_id].present?
-      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', date.strftime('%H:%M:%S'),
-                            date.end_of_day.strftime('%H:%M:%S')
+      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
       ).uniq
+
       return [] if result.blank?
 
       build_trip_query_result(result)

data/app/queries/spree_cm_commissioner/trip_search_query.rb

@@ -0,0 +1,76 @@
+module SpreeCmCommissioner
+  class TripSearchQuery
+    attr_reader :origin_id, :destination_id, :vendor_id, :date
+
+    def initialize(origin_id:, destination_id:, date:, vendor_id: nil)
+      @origin_id = origin_id
+      @destination_id = destination_id
+      @vendor_id = vendor_id
+      @date = date
+    end
+
+    def call
+      trips_info.map do |trip|
+        trip_result_options = {
+          trip_id: trip.trip_id,
+          vendor_id: trip.vendor_id,
+          vendor_name: trip.vendor_name,
+          route_name: trip.route_name,
+          short_name: trip.short_name,
+          detail: trip.trip_id,
+          origin_id: trip.origin_id,
+          origin: trip.origin,
+          destination_id: trip.destination_id,
+          destination: trip.destination,
+          total_sold: trip.total_sold,
+          total_seats: trip.total_seats,
+          vehicle_id: trip.vehicle_id,
+          departure_time: trip.departure_time.strftime('%H:%M'),
+          duration: trip.duration
+        }
+        SpreeCmCommissioner::TripResult.new(trip_result_options)
+      end
+    end
+
+    def trips_info
+      result = Spree::Variant.select('spree_variants.id as trip_id,
+                              spree_vendors.id as vendor_id,
+                              spree_vendors.name as vendor_name,
+                              routes.name as route_name,
+                              routes.short_name as short_name,
+                              details.id as detail_id,
+                              boarding.stop_id as origin_id,
+                              drop_off.stop_id as destination_id,
+                              details.departure_time as departure_time,
+                              details.duration as duration,
+                              boarding.stop_name as origin,
+                              drop_off.stop_name as destination,
+                              COALESCE(ts.total_sold, 0) as total_sold,
+                              cm_vehicles.number_of_seats as total_seats,
+                              cm_vehicles.id as vehicle_id
+                            '
+                                    )
+                             .joins('INNER JOIN spree_products routes ON routes.id = spree_variants.product_id')
+                             .joins('INNER JOIN cm_trips details on details.product_id = routes.id')
+                             .joins('INNER JOIN cm_vehicles ON cm_vehicles.id = details.vehicle_id')
+                             .joins("INNER JOIN cm_trip_stops boarding ON boarding.trip_id = details.id AND boarding.stop_type = '0'")
+                             .joins("INNER JOIN cm_trip_stops drop_off ON drop_off.trip_id = details.id AND drop_off.stop_type = '1'")
+                             .joins('INNER JOIN spree_vendors ON spree_vendors.id = spree_variants.vendor_id')
+                             .joins("LEFT JOIN (#{total_sold.to_sql}) ts ON spree_variants.id = ts.trip_id")
+
+      # TODO: migrat to new table: vehicle, orign and destination
+      result = result.where(boarding: { stop_id: origin_id }, drop_off: { stop_id: destination_id })
+      result = result.where(vendor_id: vendor_id) if vendor_id.present?
+      result
+    end
+
+    def total_sold
+      Spree::Variant.select('spree_variants.id as trip_id, SUM(spree_line_items.quantity) as total_sold')
+                    .joins('INNER JOIN spree_line_items ON spree_line_items.variant_id = spree_variants.id')
+                    .joins('INNER JOIN spree_orders ON spree_orders.id = spree_line_items.order_id')
+                    .where(spree_orders: { state: 'complete' })
+                    .where(spree_line_items: { date: date })
+                    .group('spree_variants.id')
+    end
+  end
+end

data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb

@@ -0,0 +1,45 @@
+module SpreeCmCommissioner
+  module VariantAvailability
+    class NonPermanentStockQuery
+      attr_reader :variant, :except_line_item_id, :error_message
+
+      def initialize(variant:, except_line_item_id: nil)
+        @variant = variant
+        @except_line_item_id = except_line_item_id
+        @error_message = nil
+      end
+
+      def available?(quantity)
+        reserve_variants =
+          Spree::LineItem
+          .complete
+          .select('(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity')
+          .joins(variant: :stock_items)
+          .where(variant_id: variant.id)
+          .where.not(id: except_line_item_id)
+          .group(:variant_id)
+
+        # there is a case when variant does not have any purchaces yet, it will return empty & always available true.
+        # in this case, we check with stock items directly.
+
+        available_quantity = if reserve_variants.any?
+                               reserve_variants.sum(&:available_quantity)
+                             else
+                               variant.stock_items.sum(:count_on_hand)
+                             end
+        if available_quantity >= quantity
+          true
+        elsif available_quantity == 1
+          @error_message = I18n.t('variant_availability.item_available_instock')
+          false
+        elsif available_quantity <= 0
+          @error_message = I18n.t('variant_availability.items_out_of_stock')
+          false
+        else
+          @error_message = I18n.t('variant_availability.items_available_instock', available_quantity: available_quantity)
+          false
+        end
+      end
+    end
+  end
+end

data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb

@@ -0,0 +1,55 @@
+module SpreeCmCommissioner
+  module VariantAvailability
+    class PermanentStockQuery
+      attr_reader :variant, :from_date, :to_date, :except_line_item_id
+
+      def initialize(variant:, from_date:, to_date:, except_line_item_id: nil)
+        @variant = variant
+        @from_date = from_date
+        @to_date = to_date
+        @except_line_item_id = except_line_item_id
+      end
+
+      def available?(quantity)
+        (from_date..from_date).all? do |booking_date|
+          booked_date_quantity[booking_date].nil? ||
+            (booked_date_quantity[booking_date] - quantity) >= 0
+        end
+      end
+
+      def booked_date_quantity
+        dates_sql = ApplicationRecord.sanitize_sql_array(
+          [
+            'SELECT date FROM generate_series(?::date, ?::date, ?) AS date',
+            from_date,
+            to_date,
+            date_interval
+          ]
+        )
+
+        @booked_variants ||=
+          Spree::LineItem
+          .complete
+          .select(
+            '(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity',
+            'dates.date AS reservation_date'
+          )
+          .joins(variant: :stock_items)
+          .where(variant_id: variant.id)
+          .where.not(id: except_line_item_id)
+          .joins("INNER JOIN (#{dates_sql}) dates ON dates.date >= spree_line_items.from_date AND dates.date < spree_line_items.to_date")
+          .group(:variant_id, :reservation_date)
+          .order(:reservation_date)
+          .each_with_object({}) do |record, hash|
+            hash[record.reservation_date.to_date] = record.available_quantity
+          end
+      end
+
+      # override this for product that have
+      # different date time interval than 1 day.
+      def date_interval
+        '1 day'
+      end
+    end
+  end
+end

data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb

@@ -3,9 +3,6 @@ module SpreeCmCommissioner
     params do
       required(:from_date).value(:date)
       required(:to_date).value(:date)
-      required(:province_id).value(:integer)
-      required(:adult).value(:integer)
-      required(:children).value(:integer)
     end
 
     rule(:from_date, :to_date) do

data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb

@@ -11,7 +11,7 @@ module SpreeCmCommissioner
     end
 
     def error_message
-      errors.map { |error| "#{error.path.join(', ')}: #{error.text}" }.to_sentence
+      errors.map(&:text).join(', ')
     end
 
     private

data/app/serializables/spree_cm_commissioner/pie_chart_event.rb

@@ -0,0 +1,11 @@
+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/v2/organizer/invite_crews_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Organizer
+      class InviteCrewsSerializer < BaseSerializer
+        attributes :token, :expires_at
+        belongs_to :taxon, serializer: Spree::V2::Organizer::TaxonSerializer
+        belongs_to :inviter, serializer: Spree::V2::Organizer::UserSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/accommodation_serializer.rb

@@ -9,12 +9,10 @@ module Spree
 
         attributes :total_inventory, :service_availabilities
 
-        # Deprecated
         attribute :total_booking do |vendor|
           vendor.respond_to?(:total_booking) ? vendor.total_booking : 0
         end
 
-        # Deprecated
         attribute :remaining do |vendor|
           vendor.respond_to?(:remaining) ? vendor.remaining : vendor.total_inventory
         end

data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb

@@ -4,7 +4,6 @@ module Spree
       module LineItemSerializerDecorator
         def self.prepended(base)
           base.attributes :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount, :display_amount,
-                          :checkin_date, :checkout_date,
                           :number, :qr_data,
                           :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
                           :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,

data/app/serializers/spree/v2/tenant/user_serializer.rb

@@ -11,6 +11,7 @@ module Spree
         has_one :profile, serializer: Spree::V2::Tenant::AssetSerializer
         has_many :device_tokens, serializer: Spree::V2::Tenant::UserDeviceTokenSerializer
         has_many :spree_roles, serializer: Spree::V2::Tenant::RoleSerializer
+        has_many :user_identity_providers, serializer: Spree::V2::Tenant::UserIdentityProviderSerializer
 
         attribute :store_credits, &:total_available_store_credit
 

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

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

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

@@ -2,7 +2,10 @@ module SpreeCmCommissioner
   module V2
     module Operator
       class DashboardCrewEventSerializer < BaseSerializer
-        attributes :id, :name, :permalink, :from_date, :to_date, :updated_at
+        attributes :id, :name, :permalink,
+                   :from_date, :to_date,
+                   :check_in_flows,
+                   :updated_at
 
         has_many :children_classifications, serializer: :classification
         has_one :category_icon, serializer: SpreeCmCommissioner::V2::Storefront::AssetSerializer

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_option_serializer.rb

@@ -2,9 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldOptionSerializer < BaseSerializer
-        set_type :dynamic_field_option
-
-        attributes :id, :value, :dynamic_field_id, :created_at, :updated_at
+        attributes :id, :value, :dynamic_field_id, :status, :created_at, :updated_at, :position
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb

@@ -2,9 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        set_type :dynamic_field
-
-        attributes :id, :label, :data_type, :vendor_id, :created_at, :updated_at
+        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at, :position, :data_fill_stage
 
         has_many :dynamic_field_options, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end