spree_cm_commissioner 2.5.1 → 2.5.2.pre.pre1

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

@@ -1,48 +0,0 @@
-module SpreeCmCommissioner
-  module RouteTripCountCallbacks
-    extend ActiveSupport::Concern
-
-    included do
-      after_create :increase_trip_count
-      before_destroy :decrease_trip_count
-
-      # When route context may change, enqueue an async job after commit that
-      # reads the previous values from `previous_changes` to decrement counts
-      # on the old route/vendor. This avoids keeping in-memory state and keeps
-      # the Trip update fast.
-      after_commit :enqueue_decrement_previous_route_trip_counts, on: :update
-
-      after_commit :increment_new_route_trip_counts, on: :update, if: :changed_route_context?
-    end
-
-    private
-
-    def decrease_trip_count
-      SpreeCmCommissioner::Transit::RouteTripCountDecrementerJob.perform_now(trip_id: id)
-    end
-
-    def increase_trip_count
-      SpreeCmCommissioner::Transit::RouteTripCountIncrementerJob.perform_later(trip_id: id)
-    end
-
-    # Read previous_changes to find prior route context and enqueue the job.
-    def enqueue_decrement_previous_route_trip_counts
-      prev_route_id = previous_changes['route_id']&.first
-      prev_origin_id = previous_changes['origin_place_id']&.first
-      prev_destination_id = previous_changes['destination_place_id']&.first
-
-      return unless prev_route_id.present? && prev_origin_id.present? && prev_destination_id.present?
-
-      SpreeCmCommissioner::Transit::RoutePreviousTripCountDecrementerJob.perform_later(
-        previous_route_id: prev_route_id
-      )
-    end
-
-    # Safely increment the trip_count for the trip's (new) route after update.
-    def increment_new_route_trip_counts
-      return if origin_place_id.blank? || destination_place_id.blank? || route_id.blank?
-
-      SpreeCmCommissioner::Transit::RouteTripCountIncrementerJob.perform_later(trip_id: id)
-    end
-  end
-end

data/app/models/spree_cm_commissioner/trip_connection.rb

@@ -1,36 +0,0 @@
-module SpreeCmCommissioner
-  class TripConnection < Base
-    belongs_to :from_trip, class_name: 'SpreeCmCommissioner::Trip'
-    belongs_to :to_trip, class_name: 'SpreeCmCommissioner::Trip'
-
-    validate :both_trip_cannot_be_the_same
-    before_validation :calculate_connection_time_minutes
-    validates :from_trip_id, uniqueness: { scope: :to_trip_id }
-
-    private
-
-    def calculate_connection_time_minutes
-      return if from_trip.nil? || to_trip.nil?
-
-      arrival_seconds   = from_trip.arrival_time.seconds_since_midnight
-      departure_seconds = to_trip.departure_time.seconds_since_midnight
-
-      layover_seconds = departure_seconds - arrival_seconds
-      layover_seconds += 86_400 if layover_seconds.negative?
-
-      connection_time_in_minutes = layover_seconds / 60
-
-      if connection_time_in_minutes.between?(0, 180)
-        self.connection_time_minutes = connection_time_in_minutes.to_i
-      else
-        errors.add(:base, 'Connection time must be less than 3 hours')
-      end
-    end
-
-    def both_trip_cannot_be_the_same
-      return unless from_trip.id == to_trip.id
-
-      errors.add(:base, 'Both trip cannot be the same')
-    end
-  end
-end

data/app/models/spree_cm_commissioner/vendor_route.rb

@@ -1,9 +0,0 @@
-module SpreeCmCommissioner
-  class VendorRoute < Base
-    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
-    belongs_to :route, class_name: 'SpreeCmCommissioner::Route', optional: false
-
-    has_many :trips, -> (vr) { where(vendor_id: vr.vendor_id, route_id: vr.route_id) }, class_name: 'SpreeCmCommissioner::Trip'
-    validates :vendor_id, uniqueness: { scope: :route_id }
-  end
-end

data/app/services/spree_cm_commissioner/routes/decrement_previous_trip_count.rb

@@ -1,30 +0,0 @@
-module SpreeCmCommissioner
-  module Routes
-    class DecrementPreviousTripCount
-      prepend ::Spree::ServiceModule::Base
-
-      def call(previous_route_id:)
-        previous_route = SpreeCmCommissioner::Route.find_by(id: previous_route_id)
-        return failure(nil, 'Route not found') unless previous_route
-
-        if previous_route.vendors.exists?
-
-          # Build a trip-like object that responds to :route and :vendor so the delegated
-          # service can locate vendor routes correctly.
-          trip_like = Struct.new(:route, :vendor).new(previous_route, previous_route.vendors.first)
-          result = SpreeCmCommissioner::Routes::DecrementTripCount.call(trip: trip_like)
-          return result if result.failure?
-        else
-          previous_route.with_lock do
-            new_count = [previous_route.trip_count.to_i - 1, 0].max
-            previous_route.update!(trip_count: new_count)
-          end
-        end
-
-        success(previous_route: previous_route)
-      rescue StandardError => e
-        failure(nil, e.message)
-      end
-    end
-  end
-end

data/app/services/spree_cm_commissioner/routes/decrement_trip_count.rb

@@ -1,33 +0,0 @@
-module SpreeCmCommissioner
-  module Routes
-    class DecrementTripCount
-      prepend ::Spree::ServiceModule::Base
-
-      def call(trip:)
-        return failure(nil, 'Trip not found') unless trip
-
-        vendor = trip.vendor
-        return failure(nil, 'Vendor not found') unless vendor
-
-        ActiveRecord::Base.transaction do
-          route = trip.route
-
-          route.update!(trip_count: [route.trip_count - 1, 0].max)
-
-          vendor_route = locate_vendor_route(vendor: vendor, route: route)
-          vendor_route&.update!(trip_count: [vendor_route.trip_count - 1, 0].max)
-        end
-
-        success(trip: trip)
-      rescue StandardError => e
-        failure(nil, e.message)
-      end
-
-      private
-
-      def locate_vendor_route(vendor:, route:)
-        vendor.vendor_routes.find_by(route_id: route.id)
-      end
-    end
-  end
-end

data/app/services/spree_cm_commissioner/routes/increment_trip_count.rb

@@ -1,33 +0,0 @@
-module SpreeCmCommissioner
-  module Routes
-    class IncrementTripCount
-      prepend ::Spree::ServiceModule::Base
-
-      def call(trip:)
-        return failure(nil, 'Trip not found') unless trip
-
-        vendor = trip.vendor
-        return failure(nil, 'Vendor not found') unless vendor
-
-        ActiveRecord::Base.transaction do
-          route = trip.route
-
-          route.update!(trip_count: route.trip_count + 1)
-
-          vendor_route = find_or_create_vendor_route(vendor: vendor, route: route)
-          vendor_route.update!(trip_count: vendor_route.trip_count + 1)
-        end
-
-        success(trip: trip)
-      rescue StandardError => e
-        failure(nil, e.message)
-      end
-
-      private
-
-      def find_or_create_vendor_route(vendor:, route:)
-        vendor.vendor_routes.find_or_create_by!(route_id: route.id)
-      end
-    end
-  end
-end

data/app/views/spree/admin/inventory_items/show.html.erb

@@ -1,72 +0,0 @@
-<%= turbo_frame_tag "inventory_item" do %>
-  <div>
-    <h5 class="modal-title">Inventory</h5>
-    <p>
-      <% if @inventory_item.inventory_date.present? %>
-        <span><%= @inventory_item.inventory_date %></span><br>
-      <% end %>
-      <%= @inventory_item.variant.options_text %>
-    </p>
-
-    <ul class="list-group mb-1">
-      <li class="list-group-item d-flex justify-content-between align-items-center">
-        Max capacity
-        <span class="badge badge-primary badge-pill"><%= @inventory_item.max_capacity %></span>
-      </li>
-      <li class="list-group-item d-flex justify-content-between align-items-center">
-        Quantity available
-        <span class="badge badge-primary badge-pill"><%= @inventory_item.quantity_available %></span>
-      </li>
-    </ul>
-
-    <small class="text-muted">
-      <%= inventory_item_message(@inventory_item, @cached_inventory_item) %>
-    </small>
-
-    <%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", reset_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id),
-      method: :patch,
-      remote: false,
-      class: 'icon_link btn btn-sm outline text-dark',
-      data: { confirm: "Only reset if stock is incorrect. Are you sure?" }, no_text: true
-    ) %>
-  </div>
-
-  <hr />
-
-  <div class="mt-2">
-    <h6 class="modal-title mb-1 d-flex flex-row justify-content-between">
-      Custom Prices
-      <%= link_to_with_icon('delete.svg', Spree.t(:remove),
-        delete_prices_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id),
-        method: :delete, remote: false, class: 'icon_link btn btn-sm text-danger', data: { action: :remove, confirm: "Are you sure to remove these prices & use base price?" }, no_text: true
-      ) if @prices.any?(&:persisted?) %>
-    </h6>
-
-    <%= form_with url: update_prices_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id), method: :patch, local: true, html: { class: 'inventory-item-prices-form' } do |form| %>
-      <table class="table">
-        <tbody>
-          <% @prices.each do |price| %>
-            <% currency = price.currency %>
-            <% default_price = @default_prices[currency] || Spree::Price.new %>
-            <tr id="inventory-item_prices_row_<%= currency %>" data-hook="inventory-item_prices_row">
-              <td><%= form.label "price_#{currency}", currency, class: 'form-label' %></td>
-              <td>
-                <%= form.hidden_field "prices[#{currency}][currency]", value: currency %>
-                <%= form.text_field "prices[#{currency}][price]", value: price.amount, placeholder: "Default: #{default_price.amount || 'N/A'}", class: 'form-control' %>
-              </td>
-              <td>
-                <%= form.text_field "prices[#{currency}][compare_at_price]", value: price.compare_at_price, placeholder: "Default: #{default_price.compare_at_price || 'N/A'}", class: 'form-control' %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-
-      <div class="d-flex flex-row justify-content-end mt-2">
-        <div class="form-actions" data-hook="buttons">
-          <%= button Spree.t('actions.save'), 'save.svg', 'submit', { class: 'btn-outline-success', data: { disable_with: "#{ Spree.t(:saving) }...", turbo_frame: "_top" } } %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-<% end %>

data/lib/spree_cm_commissioner/test_helper/factories/trip_connection_factory.rb

@@ -1,6 +0,0 @@
-FactoryBot.define do
-  factory :cm_trip_connection, class: SpreeCmCommissioner::TripConnection do
-    from_trip_id { create(:cm_trip) }
-    to_trip_id { create(:cm_trip) }
-  end
-end