spree_cm_commissioner 2.0.3.pre.pre → 2.0.3.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3a09bcc91fdaec54ad8514c242efe83109f6e361f4afa843ad4c8fdd04ca7c7
-  data.tar.gz: d302883898e3dd6fe75a6021be5313e31178cf8557d41a76966ce5f7fea22056
+  metadata.gz: e5b077c1732065a3ce11bbb056bed4070543a0221910fd7515fe1efdae3d40b5
+  data.tar.gz: d44e36d1a0bc7a6883ec17bcc359373d998677eefcaa2bc2330f8385e0371892
 SHA512:
-  metadata.gz: e864e312cf23fc7fffc23f3767abafe3e40ac399c078daefe6d169ac3003cff5a0c2d03880ec2485bffe6c834460bc374a781b928daffae448877ab0643ea4ed
-  data.tar.gz: 6a036dac2ca9648753ee544e53db906b84e08c84bab8203b84b492c99e93adb03ba8e5e0343f1c9a8b9834a98c2f03348ccfe0e1b453f704f333308165acc4cc
+  metadata.gz: 9bd2928390be100bf71340a748e17108c5d7d2ec6236bd1c699d2b5a7fa384ccb9beef3e59761790723c7dd7da6929c73e00fb24817b7ee0d6f47936e16feb94
+  data.tar.gz: 4f3f3b8ff22b612764c95e2d6ac4a2a7841e300a5085f2c8ec1f78191cee067a72d2b16c7d7a7de7db7b08ef70d20b08f779c6084b8f04cadd172abe678473b2

data/.github/workflows/test_and_build_gem.yml

@@ -10,7 +10,6 @@ on:
       - reopened
     branches:
       - develop
-      - milestone-77-scalable-design
   push:
     tags:
       - "*"
@@ -38,8 +37,7 @@ jobs:
               console.log("PR title format is correct.");
             }
       - name: Check commit messages format
-        # skip validation if the PR is from the milestone-77-scalable-design branch for temporary
-        if: github.event_name == 'pull_request' && github.head_ref != 'milestone-77-scalable-design'
+        if: github.event_name == 'pull_request'
         uses: actions/github-script@v7
         with:
           script: |
@@ -138,17 +136,6 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
-      redis:
-        image: redis
-        # Set health checks to wait until redis has started
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 6379:6379 # Maps port 6379 on service container to the host
-
     steps:
       - uses: actions/checkout@v3
 
@@ -184,9 +171,8 @@ jobs:
       - name: Run test
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-          REDIS_URL: redis://localhost:6379/0
 
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'develop'
         run: |
           bundle exec rake
 

data/.gitignore

@@ -28,5 +28,4 @@ node_modules
 # VScode
 .vscode
 !.vscode/.settings.json
-.env
-vendor/bundle/
+.env

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.0.3.pre.pre)
+    spree_cm_commissioner (2.0.3.pre.pre1)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -42,7 +42,6 @@ PATH
       aws-sdk-s3
       blazer (~> 3.0.4)
       byebug
-      connection_pool
       counter_culture (~> 3.2)
       dry-validation (~> 1.10)
       elasticsearch (~> 8.5)
@@ -55,12 +54,9 @@ PATH
       interactor (~> 3.1)
       jwt (>= 2.5.0)
       noticed (~> 1.6)
-      paper_trail (~> 16.0)
       phonelib
       premailer-rails
       rails (~> 7.0.4)
-      redis
-      redis-rails
       rqrcode (~> 2.0)
       searchkick (~> 5.1)
       simple_calendar (~> 2.4)
@@ -588,9 +584,6 @@ GEM
       sawyer (~> 0.9)
     orm_adapter (0.5.0)
     os (1.1.4)
-    paper_trail (16.0.0)
-      activerecord (>= 6.1)
-      request_store (~> 1.4)
     parallel (1.23.0)
     paranoia (2.6.3)
       activerecord (>= 5.1, < 7.2)
@@ -626,8 +619,6 @@ GEM
       activesupport (>= 2.3.14)
     racc (1.7.1)
     rack (2.2.8)
-    rack-session (1.0.2)
-      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)
@@ -671,31 +662,13 @@ GEM
     rbtree (0.4.6)
     redis (5.0.7)
       redis-client (>= 0.9.0)
-    redis-actionpack (5.5.0)
-      actionpack (>= 5)
-      redis-rack (>= 2.1.0, < 4)
-      redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.3.0)
-      activesupport (>= 3, < 8)
-      redis-store (>= 1.3, < 2)
     redis-client (0.17.0)
       connection_pool
-    redis-rack (3.0.0)
-      rack-session (>= 0.2.0)
-      redis-store (>= 1.2, < 2)
-    redis-rails (5.0.2)
-      redis-actionpack (>= 5.0, < 6)
-      redis-activesupport (>= 5.0, < 6)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.11.0)
-      redis (>= 4, < 6)
     regexp_parser (2.8.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    request_store (1.7.0)
-      rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
@@ -14,37 +14,8 @@ task :default do
   Rake::Task[:spec].invoke
 end
 
-# Copied from:
-# spree_core:lib/spree/testing_support/common_rake.rb
-# But refactored to skip frontend & backend setup.
 desc 'Generates a dummy app for testing'
-task :test_app do |_t, args|
-  require 'spree_cm_commissioner'
-  require "generators/spree_cm_commissioner/install/install_generator"
-
-  Rails.env = ENV['RAILS_ENV'] = 'test'
-
-  Spree::DummyGeneratorHelper.inject_extension_requirements = true
-  Spree::DummyGenerator.start ["--lib_name=spree_cm_commissioner", '--quiet']
-  Spree::InstallGenerator.start [
-    "--lib_name=spree_cm_commissioner",
-    '--auto-accept',
-    '--migrate=false',
-    '--seed=false',
-    '--sample=false',
-    '--quiet',
-    '--copy_storefront=false',
-    "--install_storefront=false",
-    "--install_admin=false",
-    "--user_class=Spree::User"
-  ]
-
-  puts 'Setting up dummy database...'
-  system('bin/rails db:environment:set RAILS_ENV=test')
-  system('bundle exec rake db:drop db:create')
-  Spree::DummyModelGenerator.start
-  system('bundle exec rake db:migrate')
-
-  puts 'Running extension installation generator...'
-  SpreeCmCommissioner::Generators::InstallGenerator.start(['--auto-run-migrations'])
+task :test_app do
+  ENV['LIB_NAME'] = 'spree_cm_commissioner'
+  Rake::Task['extension:test_app'].invoke
 end

data/app/assets/stylesheets/spree_cm_commissioner/backend/calendar.scss

@@ -55,9 +55,8 @@ $day-background: theme-color("light");
     }
   }
 
-  .wday-0 {
-    background-color: darken($day-background, 5%);
-  }
+  // .wday-0 {
+  // }
 
   // .wday-1 {
   // }
@@ -74,9 +73,8 @@ $day-background: theme-color("light");
   // .wday-5 {
   // }
 
-  .wday-6 {
-    background-color: darken($day-background, 5%);
-  }
+  // .wday-6 {
+  // }
 
   // .today {
   // }
@@ -88,7 +86,9 @@ $day-background: theme-color("light");
   // }
 
   // known as active-date
-  // .start-date {}
+  .start-date {
+    background-color: darken($day-background, 5%);
+  }
 
   // .prev-month {
   // }
@@ -159,8 +159,11 @@ $day-background: theme-color("light");
 
     // .current-month {}
     .has-events {
+      background-color: lighten(theme-color("warning"), 30%);
+      color: darken(theme-color("warning"), 50%);
+
       @include hover {
-        background-color: rgba($dark, 0.1);
+        background-color: theme-color("warning");
       }
     }
 

data/app/controllers/blazer/queries_controller_decorator.rb

@@ -0,0 +1,11 @@
+module Blazer
+  module QueriesControllerDecorator
+    def query_params
+      params.require(:query).permit(:name, :description, :statement, :data_source, :preset)
+    end
+  end
+end
+
+unless Blazer::QueriesController.ancestors.include?(Blazer::QueriesControllerDecorator)
+  Blazer::QueriesController.prepend(Blazer::QueriesControllerDecorator)
+end

data/app/controllers/concerns/spree_cm_commissioner/transit/taxon_bitwise.rb

@@ -0,0 +1,44 @@
+module SpreeCmCommissioner
+  module Transit
+    module TaxonBitwise
+      extend ActiveSupport::Concern
+
+      BIT_STOP = 0b001
+      BIT_STATION = 0b010
+      BIT_BRANCH = 0b100
+      BIT_LOCATION = 0b1000
+
+      included do
+        attr_accessor :stop, :station, :branch, :location
+
+        before_validation :at_least_one_checkbox_selected
+      end
+
+      def stop?
+        data_type & BIT_STOP != 0
+      end
+
+      def station?
+        data_type & BIT_STATION != 0
+      end
+
+      def branch?
+        data_type & BIT_BRANCH != 0
+      end
+
+      def location?
+        data_type & BIT_LOCATION != 0
+      end
+
+      private
+
+      def at_least_one_checkbox_selected
+        if stop.nil? && station.nil? && branch.nil? && location.nil?
+          nil
+        elsif stop.to_i.zero? && station.to_i.zero? && branch.to_i.zero? && location.to_i.zero?
+          errors.add(:base, 'At least one checkbox (stop, branch, or location) must be selected')
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/stock_managements_controller.rb

@@ -5,8 +5,6 @@ module Spree
 
       before_action :load_parent
 
-      helper_method :inventory_item_message
-
       def load_parent
         @product = Spree::Product.find_by(slug: params[:product_id])
       end
@@ -14,59 +12,9 @@ module Spree
       def index
         @variants = @product.variants.includes(:images, stock_items: :stock_location, option_values: :option_type)
         @variants = [@product.master] if @variants.empty?
-        @stock_locations = (@variants.flat_map(&:stock_locations) + @product.vendor.stock_locations).uniq
-
-        load_inventories unless @product.permanent_stock?
-      end
-
-      def create
-        result = SpreeCmCommissioner::Stock::StockMovementCreator.call(
-          variant_id: params[:variant_id],
-          stock_location_id: params[:stock_location_id],
-          current_store: current_store,
-          stock_movement_params: stock_movement_params
-        )
-
-        if result.success?
-          flash[:success] = flash_message_for(result.stock_movement, :successfully_created)
-        else
-          flash[:error] = result.message
-        end
-
-        redirect_back fallback_location: admin_product_stock_managements_path(@product)
-      end
-
-      # GET /products/:slug/stock_managements/calendar?year=
-      def calendar
-        @year = params[:year].present? ? params[:year].to_i : Time.zone.today.year
 
-        from_date = Date.new(@year, 1, 1).beginning_of_year
-        to_date = Date.new(@year, 1, 1).end_of_year
-
-        @inventory_items = @product.inventory_items.includes(:variant, :prices).where(inventory_date: from_date..to_date).to_a
-        @cached_inventory_items = ::SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(@inventory_items)
-                                                                                                .call
-                                                                                                .index_by(&:inventory_item_id)
-        @events = SpreeCmCommissioner::CalendarEvent.from_inventory_items(@inventory_items)
-      end
-
-      def inventory_item_message(inventory_item, cached_inventory_item)
-        synced = inventory_item.quantity_available == cached_inventory_item.quantity_available
-
-        if synced
-          "Synced: Quantity available matches in both DB and Redis (#{cached_inventory_item.quantity_available})."
-        else
-          "Out of sync: Redis shows #{cached_inventory_item.quantity_available} available, which doesn't match the database."
-        end
-      end
-
-      private
+        @stock_locations = (@variants.flat_map(&:stock_locations) + @product.vendor.stock_locations).uniq
 
-      def load_inventories
-        @inventory_items = @product.inventory_items.group_by { |item| item.variant.id }
-        @cached_inventory_items = ::SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(@product.inventory_items)
-                                                                                                .call
-                                                                                                .index_by(&:inventory_item_id)
         @reserved_stocks = Spree::LineItem
                            .complete
                            .where(variant_id: @variants.pluck(:id))
@@ -77,16 +25,6 @@ module Spree
       def model_class
         Spree::StockItem
       end
-
-      # This method processes the parameters for stock movement creation.
-      # Expected attributes for `stock_movement` include:
-      # - :quantity (Integer): The quantity of stock to move.
-      # - :action (String): The type of stock movement (e.g., "add" or "remove").
-      # - :originator_id, :originator_ty (String, optional): The ID and type of the entity creating the stock movement.
-      # Ensure that `permitted_stock_movement_attributes` is updated to reflect any changes.
-      def stock_movement_params
-        params.require(:stock_movement).permit(permitted_stock_movement_attributes)
-      end
     end
   end
 end

data/app/controllers/spree/api/v2/operator/event_charts_controller.rb

@@ -0,0 +1,59 @@
+module Spree
+  module Api
+    module V2
+      module Operator
+        class EventChartsController < ::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 do |type|
+              event_chart = SpreeCmCommissioner::EventChartQueries.new(
+                taxon_id: params[:taxon_id],
+                chart_type: type,
+                refreshed: params[:refreshed] || false
+              ).call
+
+              # Create unique ID by using chart_type as the identifier
+              SpreeCmCommissioner::EventChart.new(
+                id: type.to_s,
+                chart_type: event_chart.chart_type,
+                product_charts: event_chart.product_charts
+              )
+            end
+
+            render json: SpreeCmCommissioner::V2::Operator::PieChartEventAggregatorSerializer.new(resources).serializable_hash
+          end
+
+          def resource
+            @resource = event_chart_aggregator_queries.call
+          end
+
+          def resource_serializer
+            SpreeCmCommissioner::V2::Operator::PieChartEventAggregatorSerializer
+          end
+
+          private
+
+          def event_chart_aggregator_queries
+            SpreeCmCommissioner::EventChartQueries.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/controllers/spree/api/v2/organizer/invite_guests_controller.rb

@@ -20,7 +20,7 @@ module Spree
 
             if guest.save
               @invite_guest.update(claimed_status: :claimed) if @line_item.guests.count == @invite_guest.quantity
-              send_guest_claimed_invitation_telegram_alert_to_vendor(guest)
+              send_guest_claimed_invitation_telegram_alert_to_vendor(guest) if guest.event.vendor.preferred_telegram_chat_id.present?
 
               render json: SpreeCmCommissioner::V2::Storefront::GuestSerializer.new(guest.reload).serializable_hash
             else

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

@@ -5,38 +5,55 @@ module Spree
         class AccommodationsController < ::Spree::Api::V2::ResourceController
           private
 
-          # override
           def collection
-            @collection ||= SpreeCmCommissioner::Accommodations::Find.new(
-              from_date: params[:from_date]&.to_date,
-              to_date: params[:to_date]&.to_date,
-              state_id: params[:province_id],
-              number_of_adults: params[:adult].to_i,
-              number_of_kids: params[:children].to_i
-            ).execute
+            @collection ||= collection_finder.call(params: params).value
+          end
+
+          def paginated_collection
+            return @paginated_collection if defined?(@paginated_collection)
+
+            @paginated_collection = super
+            @paginated_collection = apply_service_availability(@paginated_collection)
           end
 
-          # override
           def resource
-            @resource ||= collection.find_by!(slug: params[:id])
+            resource = resource_finder.call(params: params).value
+            raise ActiveRecord::RecordNotFound if resource.nil?
+
+            apply_service_availability(resource)
+          end
+
+          def apply_service_availability(resource)
+            SpreeCmCommissioner::ApplyServiceAvailability.call(calendarable: resource,
+                                                               from_date: params[:from_date].to_date,
+                                                               to_date: params[:to_date].to_date
+                                                              ).value
           end
 
-          # override
           def allowed_sort_attributes
             super << :min_price << :max_price
           end
 
-          # override
+          def model_class
+            Spree::Vendor
+          end
+
           def resource_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
-          # override
           def collection_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
-          # override
+          def collection_finder
+            SpreeCmCommissioner::AccommodationSearchDetail
+          end
+
+          def resource_finder
+            SpreeCmCommissioner::AccommodationSearchDetail
+          end
+
           def required_schema
             SpreeCmCommissioner::AccommodationRequestSchema
           end

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

@@ -39,22 +39,22 @@ module Spree
             spree_authorize! :update, spree_current_order, order_token
 
             begin
-              if guest_params[:guest_dynamic_fields_attributes]
-                resource.guest_dynamic_fields.destroy_all
-
-                guest_params[:guest_dynamic_fields_attributes].each do |attr|
-                  field = build_dynamic_field(attr)
-                  field.save!
+              ActiveRecord::Base.transaction do
+                if guest_params[:guest_dynamic_fields_attributes]
+                  dynamic_field_ids = guest_params[:guest_dynamic_fields_attributes].pluck(:dynamic_field_id)
+                  resource.guest_dynamic_fields.where(dynamic_field_id: dynamic_field_ids).destroy_all
+
+                  guest_params[:guest_dynamic_fields_attributes].each do |attr|
+                    field = build_dynamic_field(attr)
+                    field.save!
+                  end
                 end
-              end
 
-              resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
-
-              if resource.save
-                render_serialized_payload { serialize_resource(resource) }
-              else
-                render_error_payload(resource.errors, 400)
+                resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
+                resource.save!
               end
+
+              render_serialized_payload { serialize_resource(resource) }
             rescue ActiveRecord::RecordInvalid => e
               render_error_payload(e.record.errors, 400)
             end

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

@@ -12,9 +12,9 @@ module Spree
               spree_authorize! :update, spree_current_order, order_token
               spree_authorize! :show, @variant
 
-              availability_checker = SpreeCmCommissioner::Stock::AvailabilityChecker.new(@variant, add_item_params[:options])
+              availability_checker = SpreeCmCommissioner::Stock::AvailabilityChecker.new(@variant)
 
-              unless availability_checker.can_supply?(add_item_params[:quantity].to_i)
+              unless availability_checker.can_supply?(add_item_params[:quantity].to_i, add_item_params[:options])
                 return render_error_payload(availability_checker.error_message || I18n.t('variant_availability.items_out_of_stock'))
               end