Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Remove the dead API v2 service layer

Damian Legawiecae78e71bf597
diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rb
index ccd5dac452..6e725b6f5b 100644
--- a/spree/core/app/models/spree/order.rb
+++ b/spree/core/app/models/spree/order.rb
@@ -781,13 +781,6 @@ module Spree
end
end
- def empty!
- raise Spree.t(:cannot_empty_completed_order) if completed?
-
- result = Spree.cart_empty_service.call(order: self)
- result.value
- end
-
def use_all_coupon_codes
Spree::CouponCodes::CouponCodesHandler.new(order: self).use_all_codes
end
diff --git a/spree/core/app/services/spree/line_items/create.rb b/spree/core/app/services/spree/line_items/create.rb
deleted file mode 100644
index 3adbd97906..0000000000
--- a/spree/core/app/services/spree/line_items/create.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Spree
- module LineItems
- class Create
- prepend Spree::ServiceModule::Base
- include Helper
-
- def call(order:, line_item_attributes: {}, options: {})
- line_item = order.line_items.new(line_item_attributes)
-
- ActiveRecord::Base.transaction do
- return failure(line_item) unless line_item.save
-
- recalculate_service.call(order: order, line_item: line_item, options: options)
- end
-
- success(line_item)
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/line_items/destroy.rb b/spree/core/app/services/spree/line_items/destroy.rb
deleted file mode 100644
index 722e3684b1..0000000000
--- a/spree/core/app/services/spree/line_items/destroy.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module Spree
- module LineItems
- class Destroy
- prepend Spree::ServiceModule::Base
- include Helper
-
- def call(line_item:, options: {})
- order = line_item.order
-
- ActiveRecord::Base.transaction do
- order.line_items.destroy(line_item)
- recalculate_service.call(order: order, line_item: line_item, options: options)
- end
- success(line_item)
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/line_items/helper.rb b/spree/core/app/services/spree/line_items/helper.rb
deleted file mode 100644
index c598dad332..0000000000
--- a/spree/core/app/services/spree/line_items/helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Spree
- module LineItems
- module Helper
- protected
-
- def recalculate_service
- Spree.cart_recalculate_service
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/line_items/update.rb b/spree/core/app/services/spree/line_items/update.rb
deleted file mode 100644
index c1933885f0..0000000000
--- a/spree/core/app/services/spree/line_items/update.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Spree
- module LineItems
- class Update
- prepend Spree::ServiceModule::Base
- include Helper
-
- def call(line_item:, line_item_attributes: {}, options: {})
- ActiveRecord::Base.transaction do
- return failure(line_item) unless line_item.update(line_item_attributes)
-
- recalculate_service.call(order: line_item.order, line_item: line_item, options: options)
- end
- success(line_item)
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/orders/update_contact_information.rb b/spree/core/app/services/spree/orders/update_contact_information.rb
deleted file mode 100644
index caab0958c8..0000000000
--- a/spree/core/app/services/spree/orders/update_contact_information.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module Spree
- module Orders
- class UpdateContactInformation
- prepend ::Spree::ServiceModule::Base
-
- def call(order:, order_params:)
- ActiveRecord::Base.transaction do
- order.update_columns(email: order_params[:email], updated_at: Time.current)
-
- if order.respond_to?(:vendor_orders) && order.vendor_orders.any?
- order.vendor_orders.update_all(email: order_params[:email], updated_at: Time.current)
- end
- end
-
- success(order.reload)
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/shipments/add_item.rb b/spree/core/app/services/spree/shipments/add_item.rb
deleted file mode 100644
index 44db493a57..0000000000
--- a/spree/core/app/services/spree/shipments/add_item.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# adds item to an existing shipment
-# if this variant is already added to the cart it will increase the quantity
-# if not it will create new line item
-module Spree
- module Shipments
- class AddItem
- prepend Spree::ServiceModule::Base
- include Helper
-
- def call(shipment:, variant_id:, quantity: nil)
- ActiveRecord::Base.transaction do
- run :prepare_arguments
- run :add_or_update_line_item
- end
- end
-
- protected
-
- def prepare_arguments(shipment:, variant_id:, quantity: nil)
- order = shipment.order
- store = order.store
-
- variant = store.variants.find_by(id: variant_id)
- return failure(nil, :variant_not_found) if variant.nil?
-
- quantity = quantity&.to_i || 1
-
- success(order: order, shipment: shipment, variant: variant, quantity: quantity)
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/shipments/change_state.rb b/spree/core/app/services/spree/shipments/change_state.rb
deleted file mode 100644
index dd8b9c3137..0000000000
--- a/spree/core/app/services/spree/shipments/change_state.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module Spree
- module Shipments
- class ChangeState
- prepend Spree::ServiceModule::Base
-
- def call(shipment:, state:)
- shipment.send("#{state}!")
- success(shipment.reload)
- rescue ActiveRecord::Rollback, ActiveRecord::RecordInvalid, StateMachines::InvalidTransition
- failure(shipment)
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/shipments/create.rb b/spree/core/app/services/spree/shipments/create.rb
deleted file mode 100644
index d941b01d4d..0000000000
--- a/spree/core/app/services/spree/shipments/create.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# creates new shipment record
-# if selected item (variant) is already added to order it will update line item
-# if not - it will create new line item record
-module Spree
- module Shipments
- class Create
- prepend Spree::ServiceModule::Base
- include Helper
-
- def call(store:, shipment_attributes:)
- ActiveRecord::Base.transaction do
- run :prepare_arguments
- run :create_shipment
- run :add_or_update_line_item
- end
- end
-
- protected
-
- def prepare_arguments(store:, shipment_attributes:)
- order_id_or_number = shipment_attributes[:order_id]
- order = store.orders.find_by(number: order_id_or_number) || store.orders.find_by(id: order_id_or_number)
-
- return failure(nil, :order_not_found) if order.nil?
-
- variant = store.variants.find_by(id: shipment_attributes[:variant_id])
- return failure(nil, :variant_not_found) if variant.nil?
-
- stock_location = Spree::StockLocation.find_by(id: shipment_attributes[:stock_location_id])
- return failure(nil, :stock_location_not_found) if stock_location.nil?
-
- quantity = shipment_attributes[:quantity]&.to_i || 1
-
- success(order: order, stock_location: stock_location, variant: variant, quantity: quantity)
- end
-
- def create_shipment(order:, stock_location:, variant:, quantity:)
- shipment = order.fulfillments.create(
- order_id: order.id,
- stock_location_id: stock_location.id
- )
- return failure(shipment) unless shipment.persisted?
-
- success(order: order, variant: variant, quantity: quantity, shipment: shipment)
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/shipments/helper.rb b/spree/core/app/services/spree/shipments/helper.rb
deleted file mode 100644
index 079480a845..0000000000
--- a/spree/core/app/services/spree/shipments/helper.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module Spree
- module Shipments
- module Helper
- def add_or_update_line_item(order:, variant:, quantity:, shipment:)
- result = add_item_service.call(order: order, variant: variant, quantity: quantity, options: { shipment: shipment })
-
- if result.success?
- success(shipment.reload)
- else
- failure(result.value, result.error)
- end
- end
-
- def add_item_service
- Spree.cart_add_item_service
- end
-
- def remove_item_service
- Spree.cart_remove_item_service
- end
- end
- end
-end
diff --git a/spree/core/app/services/spree/shipments/remove_item.rb b/spree/core/app/services/spree/shipments/remove_item.rb
deleted file mode 100644
index 737383305c..0000000000
--- a/spree/core/app/services/spree/shipments/remove_item.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# removes an item (variant) from shipment
-# quantity can be passed
-# if there is no quantity left for this item for this shipent, shipment itself will be removed
-module Spree
- module Shipments
- class RemoveItem
- prepend Spree::ServiceModule::Base
- include Helper
-
- def call(shipment:, variant_id:, quantity: nil)
- ActiveRecord::Base.transaction do
- run :prepare_arguments
- run :remove_item
- end
- end
-
- protected
-
- def prepare_arguments(shipment:, variant_id:, quantity: nil)
- variant = Spree::Variant.find_by(id: variant_id)
- return failure(nil, :variant_not_found) if variant.nil? || !shipment.include?(variant)
-
- # if quantity isn't passed let's remove all added qty of this variant
- quantity = quantity&.to_i || shipment.inventory_units_for(variant).sum(:quantity)
-
- success(shipment: shipment, variant: variant, quantity: quantity)
- end
-
- # if the removed variant was the only one shipped via this shipment
- # we need to remove the shipment itself
- def remove_item(shipment:, variant:, quantity:)
- result = remove_item_service.call(order: shipment.order,
- variant: variant,
- quantity: quantity,
- options: { shipment: shipment })
-
- if result.success?
- line_item = result.value
- line_item.destroy if line_item.quantity.zero?
-
- # `OrderInventory#remove_from_shipment` is called in `remove_item_service`
- # which will delete the shipment if all inventory units were removed
- if shipment.fulfillment_items.any?
- success(shipment)
- else
- shipment.destroy!
- success(:shipment_deleted)
- end
- else
- failure(result.value, result.error)
- end
- end
- end
- end
-end
diff --git a/spree/core/spec/services/spree/line_items/create_spec.rb b/spree/core/spec/services/spree/line_items/create_spec.rb
deleted file mode 100644
index 6bf9afd025..0000000000
--- a/spree/core/spec/services/spree/line_items/create_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-module Spree
- describe LineItems::Create do
- subject { described_class }
-
- let(:order) { create :order }
- let(:variant) { create :variant, price: 20 }
- let(:execute) { subject.call(order: order, line_item_attributes: attributes_for(:line_item, variant: variant, currency: order.currency)) }
- let(:value) { execute.value }
- let(:line_item_attributes) { { quantity: 11 } }
-
- context 'creates a line item' do
- it 'with any quantity' do
- expect(order.amount).to eq(0)
- expect(order.quantity).to eq(0)
- expect { execute }.to change(order, :quantity).by(1)
- expect(execute).to be_success
- expect(value).to be_kind_of(Spree::LineItem)
- end
- end
- end
-end
diff --git a/spree/core/spec/services/spree/line_items/destroy_spec.rb b/spree/core/spec/services/spree/line_items/destroy_spec.rb
deleted file mode 100644
index d2ea08d174..0000000000
--- a/spree/core/spec/services/spree/line_items/destroy_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-module Spree
- describe LineItems::Destroy do
- subject { described_class }
-
- let(:order) { create :order, line_items: [line_item] }
- let(:line_item) { create :line_item, variant: variant, price: nil, quantity: 10 }
- let(:variant) { create :variant, price: 20 }
- let(:execute) { subject.call(line_item: line_item) }
- let(:value) { execute.value }
-
- context 'remove line item' do
- it 'with any quantity' do
- expect(order.amount).to eq 200
- expect { execute }.to change { order.line_items.count }.by(-1)
- expect(execute).to be_success
- expect(value).to eq line_item
- order.reload
- expect(order.amount).to eq 0
- end
- end
-
- context 'not given a shipment' do
- let(:execute) { subject.call(line_item: line_item) }
-
- it 'ensures updated shipments' do
- expect(order).to receive(:ensure_updated_fulfillments)
- expect(execute).to be_success
- end
- end
- end
-end
diff --git a/spree/core/spec/services/spree/line_items/update_spec.rb b/spree/core/spec/services/spree/line_items/update_spec.rb
deleted file mode 100644
index 7bd00ad36e..0000000000
--- a/spree/core/spec/services/spree/line_items/update_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-module Spree
- describe LineItems::Update do
- subject { described_class }
-
- let(:order) { create :order, line_items: [line_item] }
- let!(:line_item) { create :line_item, variant: variant, price: nil, quantity: 10 }
- let(:variant) { create :variant, price: 20 }
- let(:execute) { subject.call(line_item: line_item, line_item_attributes: line_item_attributes) }
- let(:value) { execute.value }
- let(:line_item_attributes) { { quantity: 11 } }
-
- context 'updates line item' do
- it 'with any quantity' do
- expect(order.amount).to eq(200)
- expect(order.quantity).to eq(10)
- expect { execute }.to change(order, :quantity).by(1)
- expect(order.item_count).to eq(11)
- expect(execute).to be_success
- expect(value).to eq line_item
- end
- end
-
- context 'not given a shipment' do
- let(:execute) { subject.call(line_item: line_item, line_item_attributes: line_item_attributes) }
-
- it 'ensures updated shipments' do
- expect(order).to receive(:ensure_updated_fulfillments)
- expect(execute).to be_success
- end
- end
- end
-end
diff --git a/spree/core/spec/services/spree/shipments/add_item_spec.rb b/spree/core/spec/services/spree/shipments/add_item_spec.rb
deleted file mode 100644
index 07d0d9a0ac..0000000000
--- a/spree/core/spec/services/spree/shipments/add_item_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'spec_helper'
-
-module Spree
- describe Shipments::AddItem do
- subject { described_class }
-
- let(:store) { @default_store }
- let(:order) { create(:order_with_totals, store: store, user: nil, email: '[email protected]') }
- let(:product) { create(:product_in_stock) }
- let(:variant) { product.default_variant }
-
- let(:execute) { subject.call(params) }
- let(:value) { execute.value }
-
- let(:params) do
- {
- shipment: shipment,
- variant_id: variant.id,
- quantity: 2
- }
- end
-
- let(:shipment) { create(:shipment, order: order) }
- let(:line_item) { shipment.line_items.last }
-
- context 'valid attributes' do
- shared_context 'creates a line item' do
- it { expect(execute.success?).to eq(true) }
-
- it 'creates new line item record' do
- expect { execute }.to change(order.line_items, :count).by(1)
- expect(line_item.variant).to eq(variant)
- expect(line_item.quantity).to eq(2)
- end
- end
-
- context 'without pre-existing line item' do
- it_behaves_like 'creates a line item'
- end
-
- context 'without quantity passed' do
- let(:params) do
- {
- shipment: shipment,
- variant_id: variant.id
- }
- end
-
- it { expect(execute.success?).to eq(true) }
-
- it 'creates new line item record' do
- expect { execute }.to change(order.line_items, :count).by(1)
- expect(line_item.variant).to eq(variant)
- expect(line_item.quantity).to eq(1)
- end
- end
-
- context 'with existing line item' do
- let!(:old_line_item) { create(:line_item, order: order, variant: variant, quantity: 2) }
-
- it 'does not create a new line item' do
- expect { execute }.not_to change(order.line_items, :count)
- end
-
- it 'adds quantity to the existing line item' do
- expect(old_line_item.quantity).to eq(2)
- execute
- expect(old_line_item.reload.quantity).to eq(4)
- end
-
- it 'updates line item totals' do
- # Initial: 2 * 10.00 (factory default price)
- expect(old_line_item.total).to eq(20)
- execute
- # After quantity change, price is recalculated from variant (19.99)
- # 4 * 19.99 = 79.96
- expect(old_line_item.reload.total).to eq(BigDecimal('79.96'))
- end
- end
- end
-
- context 'missing variant' do
- let(:params) do
- {
- shipment: shipment,
- variant_id: 141223453,
- quantity: 2
- }
- end
-
- it { expect(execute.success?).to eq(false) }
- it { expect(execute.error.to_s).to eq('variant_not_found') }
- end
-
- xcontext 'invalid attributes' do
- let(:params) do
- {
- order_id: order.id,
- variant_id: variant.id,
- quantity: 'invalid', # this will not work as we're doing `to_i` casting
- stock_location_id: stock_location.id
- }
- end
-
- it { expect(execute.success?).to eq(false) }
- it { expect(execute.error.value).to be_kind_of(ActiveModel::Errors) }
- end
- end
-end
diff --git a/spree/core/spec/services/spree/shipments/create_spec.rb b/spree/core/spec/services/spree/shipments/create_spec.rb
deleted file mode 100644
index 4fa7597007..0000000000
--- a/spree/core/spec/services/spree/shipments/create_spec.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-require 'spec_helper'
-
-module Spree
- describe Shipments::Create do
- subject { described_class }
-
- let(:store) { @default_store }
- let(:order) { create(:order_with_totals, store: store, user: nil, email: '[email protected]') }
- let(:product) { create(:product_in_stock) }
- let(:variant) { product.default_variant }
- let(:stock_location) { product.stock_items.first.stock_location }
-
- let(:execute) { subject.call(store: store, shipment_attributes: shipment_attributes) }
- let(:value) { execute.value }
-
- let(:shipment_attributes) do
- {
- order_id: order.id,
- variant_id: variant.id,
- quantity: 2,
- stock_location_id: stock_location.id
- }
- end
-
- let(:shipment) { order.shipments.last }
- let(:line_item) { shipment.line_items.last }
-
- context 'valid attributes' do
- shared_context 'creates a shipment' do
- it 'creates new shipment record' do
- expect { execute }.to change(order.shipments, :count).by(1)
- expect(shipment.stock_location).to eq(stock_location)
- end
-
- it { expect(execute.success?).to eq(true) }
- it { expect(execute.value).to be_kind_of(Spree::Shipment) }
- end
-
- shared_context 'creates a line item' do
- it 'creates new line item record' do
- expect { execute }.to change(order.line_items, :count).by(1)
- expect(line_item.variant).to eq(variant)
- expect(line_item.quantity).to eq(2)
- end
- end
-
- context 'without pre-existing line item' do
- it_behaves_like 'creates a shipment'
- it_behaves_like 'creates a line item'
- end
-
- context 'with existing line item' do
- let!(:old_line_item) { create(:line_item, order: order, variant: variant, quantity: 2) }
-
- it_behaves_like 'creates a shipment'
-
- it 'does not create a new line item' do
- expect { execute }.not_to change(order.line_items, :count)
- end
-
- it 'adds quantity to the existing line item' do
- expect(old_line_item.quantity).to eq(2)
- execute
- expect(old_line_item.reload.quantity).to eq(4)
- end
-
- it 'updates line item totals' do
- # Initial: 2 * 10.00 (factory default price)
- expect(old_line_item.total).to eq(20)
- execute
- # After quantity change, price is recalculated from variant (19.99)
- # 4 * 19.99 = 79.96
- expect(old_line_item.reload.total).to eq(BigDecimal('79.96'))
- end
- end
- end
-
- context 'missing variant' do
- let(:shipment_attributes) do
- {
- order_id: order.id,
- variant_id: 1312415,
- quantity: 1,
- stock_location_id: stock_location.id
- }
- end
-
- it { expect(execute.success?).to eq(false) }
- it { expect(execute.error.to_s).to eq('variant_not_found') }
- end
-
- context 'missing order' do
- let(:shipment_attributes) do
- {
- order_id: 1231243,
- variant_id: variant.id,
- quantity: 1,
- stock_location_id: stock_location.id
- }
- end
-
- it { expect(execute.success?).to eq(false) }
- it { expect(execute.error.to_s).to eq('order_not_found') }
- end
-
- context 'missing stock location' do
- let(:shipment_attributes) do
- {
- order_id: order.id,
- variant_id: variant.id,
- quantity: 1,
- stock_location_id: 1341234
- }
- end
-
- it { expect(execute.success?).to eq(false) }
- it { expect(execute.error.to_s).to eq('stock_location_not_found') }
- end
-
- xcontext 'invalid attributes' do
- let(:shipment_attributes) do
- {
- order_id: order.id,
- variant_id: variant.id,
- quantity: 'invalid', # this will not work as we're doing `to_i` casting
- stock_location_id: stock_location.id
- }
- end
-
- it { expect(execute.success?).to eq(false) }
- it { expect(execute.error.value).to be_kind_of(ActiveModel::Errors) }
- end
- end
-end
diff --git a/spree/core/spec/services/spree/shipments/remove_item_spec.rb b/spree/core/spec/services/spree/shipments/remove_item_spec.rb
deleted file mode 100644
index 6ea6ce7676..0000000000
--- a/spree/core/spec/services/spree/shipments/remove_item_spec.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require 'spec_helper'
-
-module Spree
- describe Shipments::RemoveItem do
- subject { described_class }
-
- let(:store) { @default_store }
- let(:order) { create(:order_ready_to_ship, store: store, user: nil, email: '[email protected]') }
- let(:variant) { shipment.line_items.first.variant }
- let(:shipment) { order.shipments.first }
- let(:line_item) { shipment.line_items.last }
-
- let(:execute) { subject.call(params) }
- let(:value) { execute.value }
-
- let(:params) do
- {
- shipment: shipment,
- variant_id: variant.id,
- quantity: line_item.quantity
- }
- end
-
- context 'valid attributes' do
- shared_examples 'successful' do
- it { expect(execute.success?).to eq(true) }
- end
-
- shared_examples 'removes line item' do
- it { expect { execute }.to change(order.line_items, :count).by(-1) }
- end
-
- shared_examples 'removes shipment' do
- it { expect { execute }.to change(order.shipments, :count).by(-1) }
- it { expect(execute.value).to eq(:shipment_deleted) }
- end
-
- context 'part of the line item qty removed' do
- before { line_item.update!(quantity: 2) }
-
- let(:params) do
- {
- shipment: shipment,
- variant_id: variant.id,
- quantity: 1
- }
- end
-
- it_behaves_like 'successful'
-
- it { expect { execute }.not_to change(order.shipments, :count) }
- it { expect { execute }.not_to change(order.line_items, :count) }
-
- it 'decreases line item quantity' do
- expect(line_item.quantity).to eq(2)
- execute
- expect(line_item.reload.quantity).to eq(1)
- end
-
- it { expect(execute.value).to be_kind_of(Spree::Shipment) }
- it { expect(execute.value.id).to eq(shipment.id) }
- end
-
- context 'entire shipment & line item qty removed' do
- it_behaves_like 'successful'
- it_behaves_like 'removes line item'
- it_behaves_like 'removes shipment'
- end
-
- context 'no quantity is passed' do
- let(:params) do
- {
- shipment: shipment,
- variant_id: variant.id
- }
- end
-
- it_behaves_like 'successful'
- it_behaves_like 'removes line item'
- it_behaves_like 'removes shipment'
- end
- end
-
- context 'missing variant' do
- let(:params) do
- {
- shipment: shipment,
- variant_id: 141223453,
- quantity: 2
- }
- end
-
- it { expect(execute.success?).to eq(false) }
- it { expect(execute.error.to_s).to eq('variant_not_found') }
- end
- end
-end