spree_cm_commissioner 1.9.2 → 1.10.0.pre.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e972e51894bfc4e409d01171c367f576afb90f41d6b1f0dcd71094c5fcf4604b
-  data.tar.gz: 9cac3457deabbcfe0d50b8750c2af67850efa64c13c1edaa44db37862b612af1
+  metadata.gz: f65a106e5b63ad907020c8170440edf6f39855bb166020954b51b9960aa8a052
+  data.tar.gz: f41887bf50e45ed36763177daeeaf433b88c8a41169ca3abcb67d59544f4faee
 SHA512:
-  metadata.gz: d96cfb084a4f81a8f570f1b4c0f12ec0a29299f85afd70ed593282cebf0f6fbf319566fee6808e824e00d1d956725fdac16b4f19efbca4b04781e5ee3b1c633c
-  data.tar.gz: 210063eed0f95f71c7b0fc330d7f2edad404e286d703e5b1f0cfcfd21e538c8af950827245a1a1a63c2a0fa09c79f40b4555eefa7ec08a838b5e90165f5ce93d
+  metadata.gz: 5aa3d6bf790a31b5214d5e043c376288236283a0df96b8251574412530fd7a38b524592036303677bc141c44586ad58dbcb7e35b3f2a66218848036ecb78c82a
+  data.tar.gz: 8ba3abdb4a446e4493bf3369e5a375989e71c03643bfb9298169bf4335774a9189826fbc295c06cfcecf9f5edbb560c6ae9643d7a347cd619bdea7803d23c2c1

data/.github/workflows/test_and_build_gem.yml

@@ -9,7 +9,91 @@ on:
     tags:
       - "*"
 jobs:
+  validate-commits:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check PR title format
+        uses: actions/github-script@v7
+        if: github.event_name == 'pull_request'
+        with:
+          script: |
+            const title = context.payload.pull_request.title.trim();
+
+            console.log("PR title: ", title);
+
+            const pattern = /^Close\s+#\d+\s.+/;
+
+            if (!pattern.test(title)) {
+              core.setFailed(
+                `PR title must start with "Close #issue_number message". Example: Close #123 Add login form`
+              );
+            } else {
+              console.log("PR title format is correct.");
+            }
+      - name: Check commit messages format
+        uses: actions/github-script@v7
+        if: github.event_name == 'pull_request'
+        with:
+          script: |
+            const pr = context.payload.pull_request;
+            const commits_url = pr.commits_url;
+
+            const commits = await github.request(commits_url);
+            const pattern = /^Close\s+#\d+\s.+/;
+
+            let invalidCommits = [];
+
+            for (const commit of commits.data) {
+              const msg = commit.commit.message.trim();
+
+              console.log("commit message: ", msg);
+
+              if (!pattern.test(msg)) {
+                invalidCommits.push(`- ${msg}`);
+              }
+            }
+
+            if (invalidCommits.length > 0) {
+              core.setFailed(
+                `The following commit messages are not in the correct format:\n\n${invalidCommits.join(
+                  '\n'
+                )}\n\nEach commit message must start with "Close #<issue_number> <message>"`
+              );
+            } else {
+              console.log("All commit messages are correctly formatted.");
+            }
+      - name: Check for unresolved review threads
+        uses: actions/github-script@v7
+        if: github.event_name == 'pull_request'
+        with:
+          script: |
+            const pr = context.payload.pull_request;
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+
+            try {
+              const response = await github.rest.pulls.listReviewComments({
+                owner,
+                repo,
+                pull_number: pr.number,
+                per_page: 100
+              });
+
+              const unresolved = response.data.filter(comment => comment.in_reply_to_id && !comment.resolved);
+
+              if (unresolved.length > 0) {
+                core.setFailed(`There are ${unresolved.length} unresolved review comment(s). Please resolve all threads before merging.`);
+              } else {
+                console.log("All review comments are resolved.");
+              }
+            } catch (error) {
+              console.error("Error fetching review comments:", error.message);
+              core.setFailed("Failed to check for unresolved review threads.");
+            }
   test_and_build_gem:
+    needs: [validate-commits]
+    # if: github.head_ref != '2572-enforce-pr-workflow' || github.base_ref != 'develop'
     runs-on: ubuntu-latest
 
     services:
@@ -49,12 +133,14 @@ jobs:
           bundle install --jobs 4 --retry 3
 
       - name: Quality
+        if: github.event_name == 'pull_request'
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
         run: |
           bundle exec rubocop
 
       - name: Security
+        if: github.event_name == 'pull_request'
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
         run: |

data/.gitignore

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

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.9.2)
+    spree_cm_commissioner (1.10.0.pre.pre)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -42,6 +42,7 @@ PATH
       aws-sdk-s3
       blazer (~> 3.0.4)
       byebug
+      connection_pool
       counter_culture (~> 3.2)
       dry-validation (~> 1.10)
       elasticsearch (~> 8.5)
@@ -57,6 +58,8 @@ PATH
       phonelib
       premailer-rails
       rails (~> 7.0.4)
+      redis
+      redis-rails
       rqrcode (~> 2.0)
       searchkick (~> 5.1)
       simple_calendar (~> 2.4)
@@ -617,6 +620,8 @@ 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)
@@ -660,8 +665,24 @@ 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)

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

@@ -0,0 +1,47 @@
+module Spree
+  module Admin
+    class EventsController < Spree::Admin::ResourceController
+      before_action :load_taxonomy, only: [:index]
+
+      def index
+        params[:q] ||= {}
+        @search = taxon_scope.ransack(params[:q])
+        @taxons = fetch_taxons
+        @taxons_for_dropdown = @taxonomy.taxons if @taxonomy
+      end
+
+      private
+
+      def fetch_taxons
+        scope = params[:taxon_id].present? ? filtered_taxons : searched_taxons
+        scope.includes(:taxonomy).page(params[:page]).per(15)
+      end
+
+      def model_class
+        Spree::Taxon
+      end
+
+      def load_taxonomy
+        @taxonomy = Spree::Taxonomy.find_by(name: 'Events')
+        return if @taxonomy
+
+        flash[:error] = Spree.t('admin.events.taxonomy_not_found')
+        redirect_to admin_events_path
+      end
+
+      def taxon_scope
+        @taxonomy ? Spree::Taxon.where(kind: 2, depth: 1) : Spree::Taxon.none
+      end
+
+      def filtered_taxons
+        taxon_scope.where(id: params[:taxon_id]).or(
+          taxon_scope.where(parent_id: params[:taxon_id])
+        ).distinct
+      end
+
+      def searched_taxons
+        @search.result(distinct: true)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Spree
+  module Admin
+    module PrototypesControllerDecorator
+      def self.prepended(base)
+        base.before_action :load_icons
+      end
+
+      # overrided
+      def find_resource
+        Spree::Prototype.friendly.find(params[:id])
+      end
+
+      def load_icons
+        @icons = SpreeCmCommissioner::VectorIcon.all
+      end
+    end
+  end
+end
+
+Spree::Admin::PrototypesController.prepend(Spree::Admin::PrototypesControllerDecorator)

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

@@ -12,9 +12,25 @@ 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 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).where(inventory_date: from_date..to_date).to_a
+        @events = SpreeCmCommissioner::CalendarEvent.from_inventory_items(@inventory_items)
+      end
+
+      private
+
+      def load_inventories
+        @inventory_items = @product.inventory_items.group_by { |item| item.variant.id }
         @reserved_stocks = Spree::LineItem
                            .complete
                            .where(variant_id: @variants.pluck(:id))

data/app/controllers/spree/api/v2/storefront/accommodations/variants_controller.rb

@@ -0,0 +1,42 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class Accommodations::VariantsController < ::Spree::Api::V2::ResourceController
+          private
+
+          # override
+          def collection
+            @collection ||= SpreeCmCommissioner::Accommodations::FindVariant.new(
+              from_date: params[:from_date]&.to_date,
+              to_date: params[:to_date]&.to_date,
+              vendor_id: params[:accommodation_id],
+              number_of_adults: params[:number_of_adults].to_i,
+              number_of_kids: params[:number_of_kids].to_i
+            ).execute
+          end
+
+          # override
+          def resource
+            @resource ||= collection.find(params[:id])
+          end
+
+          # override
+          def resource_serializer
+            Spree::V2::Storefront::VariantSerializer
+          end
+
+          # override
+          def collection_serializer
+            Spree::V2::Storefront::VariantSerializer
+          end
+
+          # override
+          def required_schema
+            SpreeCmCommissioner::VariantRequestSchema
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,55 +5,38 @@ module Spree
         class AccommodationsController < ::Spree::Api::V2::ResourceController
           private
 
+          # override
           def collection
-            @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)
+            @collection ||= SpreeCmCommissioner::Accommodations::Find.new(
+              from_date: params[:from_date]&.to_date,
+              to_date: params[:to_date]&.to_date,
+              state_id: params[:state_id],
+              number_of_adults: params[:number_of_adults].to_i,
+              number_of_kids: params[:number_of_kids].to_i
+            ).execute
           end
 
+          # override
           def resource
-            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
+            @resource ||= collection.find(params[:id])
           end
 
+          # override
           def allowed_sort_attributes
             super << :min_price << :max_price
           end
 
-          def model_class
-            Spree::Vendor
-          end
-
+          # override
           def resource_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
+          # override
           def collection_serializer
             Spree::V2::Storefront::AccommodationSerializer
           end
 
-          def collection_finder
-            SpreeCmCommissioner::AccommodationSearchDetail
-          end
-
-          def resource_finder
-            SpreeCmCommissioner::AccommodationSearchDetail
-          end
-
+          # override
           def required_schema
             SpreeCmCommissioner::AccommodationRequestSchema
           end

data/app/finders/spree_cm_commissioner/accommodations/find.rb

@@ -0,0 +1,40 @@
+module SpreeCmCommissioner
+  module Accommodations
+    class Find
+      attr_reader :from_date, :to_date, :state_id, :number_of_guests
+
+      def initialize(from_date:, to_date:, state_id:, number_of_adults:, number_of_kids:)
+        @from_date = from_date
+        @to_date = to_date
+        @state_id = state_id
+        @number_of_guests = number_of_adults.to_i + number_of_kids.to_i
+      end
+
+      def execute
+        scope
+          .where(default_state_id: state_id)
+          .where(inventory_items: { inventory_date: date_range_excluding_checkout })
+          .where('CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
+                  CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
+          )
+          .where('inventory_items.quantity_available > 0')
+          .distinct
+      end
+
+      private
+
+      def scope
+        Spree::Vendor
+          .joins(variants: :inventory_items)
+          .where(primary_product_type: :accommodation, state: :active)
+      end
+
+      # Why? check_out date is not considered to be charged
+      # For example, if you check in on 2023-10-01 and check out on 2023-10-02,
+      # you will be charged for one night (2023-10-01).
+      def date_range_excluding_checkout
+        from_date..to_date.prev_day
+      end
+    end
+  end
+end

data/app/finders/spree_cm_commissioner/accommodations/find_variant.rb

@@ -0,0 +1,35 @@
+module SpreeCmCommissioner
+  module Accommodations
+    class FindVariant
+      attr_reader :vendor_id, :from_date, :to_date, :number_of_guests
+
+      def initialize(vendor_id:, from_date:, to_date:, number_of_adults:, number_of_kids:)
+        @vendor_id = vendor_id
+        @from_date = from_date
+        @to_date = to_date
+        @number_of_guests = number_of_adults.to_i + number_of_kids.to_i
+      end
+
+      def execute
+        Spree::Variant
+          .joins(:inventory_items)
+          .where(vendor_id: vendor_id)
+          .where(inventory_items: { inventory_date: date_range_excluding_checkout })
+          .where('CAST(public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
+                  CAST(public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
+          )
+          .where('inventory_items.quantity_available > 0')
+          .distinct
+      end
+
+      private
+
+      # Why? check_out date is not considered to be charged
+      # For example, if you check in on 2023-10-01 and check out on 2023-10-02,
+      # you will be charged for one night (2023-10-01).
+      def date_range_excluding_checkout
+        from_date..to_date.prev_day
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/create_event.rb

@@ -0,0 +1,65 @@
+module SpreeCmCommissioner
+  class CreateEvent
+    include Interactor
+    delegate :params, :current_vendor, to: :context
+
+    def call
+      ActiveRecord::Base.transaction do
+        build_parent_taxon
+        assign_vendor
+        assign_prototype
+        create_child_taxon
+        build_home_banner
+      end
+    end
+
+    private
+
+    def build_parent_taxon
+      @parent_taxon = Spree::Taxon.new(
+        name: context.params[:name],
+        description: context.params[:description],
+        from_date: context.params[:from_date],
+        to_date: context.params[:to_date],
+        parent_id: context.params[:parent_id],
+        taxonomy_id: context.params[:taxonomy_id]
+      )
+
+      return if @parent_taxon.save
+
+      context.fail!(message: @parent_taxon.errors.full_messages.join(', '))
+    end
+
+    def assign_vendor
+      @parent_taxon.vendors << context.current_vendor
+    end
+
+    def assign_prototype
+      prototype = Spree::Prototype.find_by(slug: context.params[:prototype_id])
+      @parent_taxon.prototypes << prototype if prototype.present?
+    end
+
+    def create_child_taxon
+      child_taxon = Spree::Taxon.new(
+        name: 'Ticket Type',
+        parent_id: @parent_taxon.id,
+        taxonomy_id: context.params[:taxonomy_id]
+      )
+
+      return if child_taxon.save
+
+      context.fail!(message: child_taxon.errors.full_messages.join(', '))
+    end
+
+    def build_home_banner
+      return if context.params[:home_banner].nil?
+
+      banner = SpreeCmCommissioner::TaxonHomeBanner.create(
+        viewable: @parent_taxon,
+        attachment: context.params[:home_banner]
+      )
+
+      context.fail!(message: 'Home banner upload failed') unless banner.persisted?
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/firebase_email_fetcher.rb

@@ -2,11 +2,37 @@ require 'firebase-admin-sdk'
 
 module SpreeCmCommissioner
   class FirebaseEmailFetcher < BaseInteractor
-    delegate :user_id, to: :context
+    delegate :user_id, :sub, to: :context
+
+    # Firebase response
+    # {
+    #   "localId" => "8AGwn0V88kP7vkticwuYZkNNoIJ2",
+    #   "displayName" => "Sreyleak Deth",
+    #   "photoUrl" => "https://lh3.googleusercontent.com/a/ACg8ocIkL62VaxNb7bOAXV30sZOGQ_Dw7ZYvlBH-Hk2jm3swNg=s96-c",
+    #   "providerUserInfo" => [
+    #     {
+    #       "providerId" => "google.com",
+    #       "displayName" => "Sreyleak Deth",
+    #       "photoUrl" => "https://lh3.googleusercontent.com/a/ACg8ocK88Fm3GhVeCS98vLGE-vmShSi76xZwYYA1QwImuyck7zAqpR0=s96-c",
+    #       "federatedId" => "109192493976909808585",
+    #       "email" => "sreyleak.deth19@gmail.com",
+    #       "rawId" => "109192493976909808585"
+    #     }
+    #   ],
+    #   "validSince" => "1707378937",
+    #   "lastLoginAt" => "1739440924021",
+    #   "createdAt" => "1707378937388",
+    #   "lastRefreshAt" => "2025-04-01T08:54:24.480031Z"
+    # }
 
     def call
-      manager = initialize_firebase_manager
-      user = manager.get_user_by(uid: context.user_id)
+      @manager = initialize_firebase_manager
+
+      if context.user_id.present?
+        user = @manager.get_user_by(uid: context.user_id)
+      elsif context.sub.present?
+        user = @manager.get_user_by_sub(sub: context.sub)
+      end
 
       context.email = user.provider_data.first&.email
     end
@@ -19,7 +45,7 @@ module SpreeCmCommissioner
 
     def initialize_firebase_manager
       @credentials ||= Firebase::Admin::Credentials.from_json(service_account.to_json)
-      @manager ||= Firebase::Admin::Auth::UserManager.new(service_account[:project_id], @credentials)
+      Firebase::Admin::Auth::UserManager.new(service_account[:project_id], @credentials)
     end
   end
 end

data/app/interactors/spree_cm_commissioner/firebase_email_fetcher_cron_executor.rb

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner
+  class FirebaseEmailFetcherCronExecutor < BaseInteractor
+    def call
+      users = Spree::User.includes(:google_user_identity_providers)
+                         .joins(:google_user_identity_providers)
+                         .where(email: nil)
+
+      users.find_each do |user|
+        google_identity = user.google_user_identity_providers.first
+        firebase_user = SpreeCmCommissioner::FirebaseEmailFetcher.call(sub: google_identity.sub)
+        next unless firebase_user.success?
+
+        email = firebase_user.email
+
+        next if email.blank?
+        next if Spree::User.exists?(email: email)
+
+        google_identity.update(email: email)
+        user.update(email: email)
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/inventory_item_syncer.rb

@@ -0,0 +1,25 @@
+module SpreeCmCommissioner
+  class InventoryItemSyncer < BaseInteractor
+    # inventory_id_and_quantities = [{ inventory_id: inventory_item1.id, quantity: 5 } ]
+    delegate :inventory_id_and_quantities, to: :context
+
+    def call
+      ActiveRecord::Base.transaction do
+        inventory_items.each do |inventory_item|
+          quantity = inventory_id_and_quantities.find { |item| item[:inventory_id] == inventory_item.id }&.dig(:quantity) || 0
+          adjust_quantity_available(inventory_item, quantity)
+        end
+      end
+    end
+
+    private
+
+    def adjust_quantity_available(inventory_item, quantity)
+      inventory_item.update!(quantity_available: inventory_item.quantity_available + quantity)
+    end
+
+    def inventory_items
+      @inventory_items ||= InventoryItem.where(id: inventory_id_and_quantities.pluck(:inventory_id))
+    end
+  end
+end