spree_cm_commissioner 2.0.1.pre.pre → 2.0.1.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df566cd09596e4c650becdc82fc0811b70d88212de9360a167657dee601e86a
-  data.tar.gz: 4f1e946fba7f81c360e83ea7a711c8732bb85e7c9e9d3119fc7fd90149a71467
+  metadata.gz: 7cb237ccbb89eff38f6f352d80a50e7781d192a7b7c91deaff7c1cc2fdde1cb6
+  data.tar.gz: 23f952b4117071337e59ef78ed2433cd3a42b3342641ba96fa6d92f5b53c956e
 SHA512:
-  metadata.gz: f4b42ff8956579cd7b32be8d151089f0b9e5ba52df63de5064425d281952c39eef3162d790492d9c1b199f05dea62a22cd056165cd0081b1ca81893e883eb54b
-  data.tar.gz: eda744ec6cba88fbac6ad868bfcf1d4f1ddb7d66fce896e701808f68d51222c5988fe6987ccba58fa0d0ff723631dfb0b48cb0cad2e6751a8a7cab1ad340ed4b
+  metadata.gz: 65193980063e11cd4260cde2e71df6b9f07bc140386b21d0c705fabf01da1f0568a644f8d2b3876e899cf446e2d56d2f1088651c6be3c884e22d248fde0ee16e
+  data.tar.gz: 2a9e233bde6dabe293be7f891c89d021a025b9c56170b0f1c3dc9dfdbe04a463562e67ab71319b05c181591efb8a272ce9a086daff435706777f30685b02fcc2

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.1.pre.pre)
+    spree_cm_commissioner (2.0.1.pre.pre2)
       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/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/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/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
 

data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb

@@ -1,26 +1,16 @@
-# 🎟️ --- [TICKET CLAIMED] ---
+# 🎫 --- [NEW INVITATION CLAIMED] ---
 #
-# Order Number:
-# <code>R621016753</code>
-#
-# ✅ <b>Ticket Successfully Claimed!</b>
-#
-# [ x1 ]
-# <b>5km Running Ticket</b>
-# <i>👉 Distance: 5km, T-shirt: M</i>
-# <i>🗓️ Nov 15, 2023</i>
-# <i>🏪 Temple Run with Sai</i>
+# <b>🙍 Claimed By</b>
+# Name: Orng SreyMoch
+# Tel: <code>+85570760548</code>
 #
-# [ x2 ]
 # <b>5km Running Ticket</b>
+# Quantity: 1
 # <i>👉 Distance: 5km, T-shirt: S</i>
 # <i>🗓️ Nov 15, 2023 -> Nov 17, 2023</i>
-# <i>🏪 Temple Run with Sai</i>
 #
-# <b>🙍 Claimed By</b>
-# Name: Vaneath Awesome
-# Tel: <code>+85570760548</code>
-# Email: <code>admin_dev@cm.com</code>
+# Order Number:
+# <code>R621016753</code>
 
 module SpreeCmCommissioner
   class InviteGuestClaimedTelegramMessageFactory < TelegramMessageFactory
@@ -36,85 +26,37 @@ module SpreeCmCommissioner
     end
 
     def selected_line_items
-      return order.line_items.for_vendor(vendor) if vendor.present?
-
-      order.line_items
+      vendor.present? ? order.line_items.for_vendor(vendor) : order.line_items
     end
 
     # override
     def body
       text = []
-      text << "Order Number:\n<code>#{order.number}</code>\n"
-      text << "\n✅ <b>Ticket Successfully Claimed!</b>\n"
-      text << selected_line_items.map { |item| line_item_content(item) }.compact.join("\n\n")
+
+      text << bold('🙍 Claimed By')
+      text << "Name: #{guest.first_name} #{guest.last_name}"
+      text << "Tel: #{inline_code(guest.phone_number)}"
       text.compact.join("\n")
-    end
 
-    def line_item_content(line_item)
-      text = []
+      selected_line_items.each do |item|
+        text << bold(item.product.name.to_s)
+        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 << ''
+      end
 
-      text << bold(line_item.product.name.to_s)
-      text << "Quantity: #{line_item.quantity}"
-      text << italic("👉 #{line_item.options_text}") if line_item.options_text.present?
-      text << italic(pretty_date_for(line_item)) if pretty_date_for(line_item).present?
-      text << italic("🏪 #{line_item.vendor.name}") if line_item.vendor&.name.present? && vendor.blank?
+      text << bold('Order Number:')
+      text << inline_code(order.number)
 
       text.compact.join("\n")
     end
 
     def pretty_date_for(line_item)
-      return nil unless line_item.date_present?
-
       from_date = pretty_date(line_item.from_date)
       to_date = pretty_date(line_item.to_date)
 
-      if from_date == to_date
-        "🗓️ #{from_date}"
-      else
-        "🗓️ #{from_date} -> #{to_date}"
-      end
-    end
-
-    # override
-    def footer
-      text = []
-
-      text << bold('🙍 Claimed By')
-      text << "Name: #{guest.first_name} #{guest.last_name}" if guest.first_name.present? || guest.last_name.present?
-      text << "Tel: #{inline_code(guest.intel_phone_number)}" if guest.intel_phone_number.present?
-
-      if show_details_link && order.guests.any?
-        text << ''
-        text << 'View Tickets:'
-        text += generate_guests_links(order.guests)
-      end
-
-      text.compact.join("\n")
-    end
-
-    # Result:
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 | No. A24 |
-    # | No. A24 |
-    def generate_guests_links(guests, guests_per_row = 2)
-      rows = (guests.size.to_f / guests_per_row).ceil
-      formatted_rows = []
-
-      rows.times do |i|
-        row_guests = guests.slice(i * guests_per_row, guests_per_row)
-        formatted_row = row_guests.map do |guest|
-          button_label = guest.seat_number.present? ? "No. #{guest.seat_number}" : "No. #{guest.formatted_bib_number || 'N/A'}"
-          link = Rails.application.routes.url_helpers.guest_cards_url(guest.token)
-          "| <a href='#{link}'>#{button_label}</a>"
-        end.join(' ')
-
-        formatted_rows << ("#{formatted_row} |")
-      end
-
-      formatted_rows
+      from_date == to_date ? "🗓️ #{from_date}" : "🗓️ #{from_date} -> #{to_date}"
     end
   end
 end

data/app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb

@@ -0,0 +1,20 @@
+module SpreeCmCommissioner
+  module LineItems
+    module FindByVariantDecorator
+      # ovveride
+      def execute(order:, variant:, options: {})
+        return super unless variant.product.product_type == 'transit'
+
+        order.line_items.detect do |line_item|
+          next if options[:date].present? && !(line_item.variant_id == variant.id && line_item.date == options[:date])
+
+          Spree::Dependencies.cart_compare_line_items_service.constantize.call(order: order, line_item: line_item, options: options).value
+        end
+      end
+    end
+  end
+end
+
+unless Spree::LineItems::FindByVariant.included_modules.include?(SpreeCmCommissioner::LineItems::FindByVariantDecorator)
+  Spree::LineItems::FindByVariant.prepend(SpreeCmCommissioner::LineItems::FindByVariantDecorator)
+end

data/app/interactors/spree_cm_commissioner/create_ticket.rb

@@ -9,7 +9,8 @@ module SpreeCmCommissioner
         set_option_value
         create_variant
         create_stock_item
-        upload_image
+        upload_image_to(@ticket.master)
+        upload_image_to(@variant)
         create_place
       end
     end
@@ -77,13 +78,13 @@ module SpreeCmCommissioner
       context.fail!(message: @stock_item.errors.full_messages.join(', '))
     end
 
-    def upload_image
+    def upload_image_to(target)
       return if context.params[:ticket_image].blank?
 
-      @image = @ticket.master.images.new(attachment: context.params[:ticket_image])
-      return if @image.save
+      image = target.images.new(attachment: context.params[:ticket_image])
+      return if image.save
 
-      context.fail!(message: @image.errors.full_messages.join(', '))
+      context.fail!(message: image.errors.full_messages.join(', '))
     end
 
     def create_place

data/app/interactors/spree_cm_commissioner/pin_code_sender.rb

@@ -18,7 +18,6 @@ module  SpreeCmCommissioner
 
     def send_sms
       options = {
-        from: sender_name(context.tenant),
         to: context.pin_code.contact,
         body: I18n.t('pincode_sender.sms.body', code: context.pin_code.code, readable_type: context.pin_code.readable_type)
       }