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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
move updating user to account controller
KacperMekarski07c0171027d7
diff --git a/api/app/controllers/spree/api/v2/storefront/account/users_controller.rb b/api/app/controllers/spree/api/v2/storefront/account/users_controller.rbdeleted file mode 100644index 69805b145a..0000000000--- a/api/app/controllers/spree/api/v2/storefront/account/users_controller.rb+++ /dev/null@@ -1,41 +0,0 @@-module Spree- module Api- module V2- module Storefront- module Account- class UsersController < ::Spree::Api::V2::ResourceController- before_action :require_spree_current_user-- def update- spree_authorize! :update, resource- result = update_service.call(user: resource, user_params: user_params)- render_result(result)- end-- private-- def scope- model_class.all- end-- def model_class- Spree.user_class- end-- def update_service- Spree::Api::Dependencies.storefront_account_update_user_service.constantize- end-- def user_params- params.require(:user).permit(permitted_user_attributes)- end-- def resource_serializer- Spree::Api::Dependencies.storefront_user_serializer.constantize- end- end- end- end- end- end-enddiff --git a/api/app/controllers/spree/api/v2/storefront/account_controller.rb b/api/app/controllers/spree/api/v2/storefront/account_controller.rbindex 019718d201..0de67ce535 100644--- a/api/app/controllers/spree/api/v2/storefront/account_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/account_controller.rb@@ -5,6 +5,12 @@ module Spreeclass AccountController < ::Spree::Api::V2::ResourceControllerbefore_action :require_spree_current_user+ def update+ spree_authorize! :update, resource+ result = update_service.call(user: resource, user_params: user_params)+ render_result(result)+ end+privatedef resource@@ -14,6 +20,26 @@ module Spreedef resource_serializerSpree::Api::Dependencies.storefront_user_serializer.constantizeend++ def scope+ model_class.all+ end++ def model_class+ Spree.user_class+ end++ def update_service+ Spree::Api::Dependencies.storefront_account_update_service.constantize+ end++ def user_params+ params.require(:user).permit(permitted_user_attributes)+ end++ def resource_serializer+ Spree::Api::Dependencies.storefront_user_serializer.constantize+ endendendenddiff --git a/api/app/models/spree/api_dependencies.rb b/api/app/models/spree/api_dependencies.rbindex d014288710..a262fd934b 100644--- a/api/app/models/spree/api_dependencies.rb+++ b/api/app/models/spree/api_dependencies.rb@@ -16,7 +16,7 @@ module Spree:storefront_cart_update_service, :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer,:storefront_store_serializer, :storefront_address_serializer, :storefront_order_serializer,:storefront_account_create_address_service, :storefront_account_update_address_service, :storefront_address_finder,- :storefront_account_update_user_service, :storefront_collection_sorter, :error_handler+ :storefront_account_update_service, :storefront_collection_sorter, :error_handler].freezeattr_accessor *INJECTION_POINTS@@ -52,9 +52,9 @@ module Spree@storefront_checkout_get_shipping_rates_service = Spree::Dependencies.checkout_get_shipping_rates_service# account services+ @storefront_account_update_service = Spree::Dependencies.account_update_service@storefront_account_create_address_service = Spree::Dependencies.account_create_address_service@storefront_account_update_address_service = Spree::Dependencies.account_update_address_service- @storefront_account_update_user_service = Spree::Dependencies.account_update_user_service# serializers@storefront_address_serializer = 'Spree::V2::Storefront::AddressSerializer'diff --git a/api/config/routes.rb b/api/config/routes.rbindex 0aed175633..b4fddb4038 100644--- a/api/config/routes.rb+++ b/api/config/routes.rb@@ -149,13 +149,12 @@ Spree::Core::Engine.add_routes doget :shipping_ratesend- resource :account, controller: :account, only: %i[show]+ resource :account, controller: :account, only: %i[show update]namespace :account doresources :addresses, controller: :addressesresources :credit_cards, controller: :credit_cards, only: %i[index show]resources :orders, controller: :orders, only: %i[index show]- resources :users, controller: :users, only: %i[update]endresources :countries, only: %i[index]diff --git a/api/docs/v2/storefront/index.yaml b/api/docs/v2/storefront/index.yamlindex e02be7f86f..35e973c525 100644--- a/api/docs/v2/storefront/index.yaml+++ b/api/docs/v2/storefront/index.yaml@@ -172,6 +172,12 @@ paths:email:type: stringexample: [email protected]+ bill_address_id:+ type: integer+ example: 1+ ship_address_id:+ type: integer+ example: 1password:type: stringexample: spree123diff --git a/api/spec/requests/spree/api/v2/storefront/account/users_spec.rb b/api/spec/requests/spree/api/v2/storefront/account/users_spec.rbdeleted file mode 100644index b2808648ee..0000000000--- a/api/spec/requests/spree/api/v2/storefront/account/users_spec.rb+++ /dev/null@@ -1,65 +0,0 @@-require 'spec_helper'--describe 'Storefront API v2 User spec', type: :request do- include_context 'API v2 tokens'-- let!(:user) { create(:user_with_addresses) }- let(:headers) { headers_bearer }-- describe 'users#update' do- context 'valid request' do- let(:new_default_bill_address) { create(:address, user: user) }- let(:new_default_ship_address) { create(:address, user: user) }-- let(:new_attributes) do- {- bill_address_id: new_default_bill_address.id,- ship_address_id: new_default_ship_address.id- }- end- let(:params) { { user: new_attributes } }-- before { patch "/api/v2/storefront/account/users/#{user.id}", params: params, headers: headers }-- it_behaves_like 'returns 200 HTTP status'-- it 'updates and returns address' do- expect(json_response['data']).to have_id(user.id.to_s)- expect(json_response['data']).to have_relationship(:default_billing_address)- .with_data({ 'id' => new_default_bill_address.id.to_s, 'type' => 'address' })- expect(json_response['data']).to have_relationship(:default_shipping_address)- .with_data({ 'id' => new_default_ship_address.id.to_s, 'type' => 'address' })- expect(json_response.size).to eq(1)- end- end-- context 'invalid request' do- let!(:other_user) { create(:user_with_addresses) }- let(:new_default_bill_address) { create(:address, user: other_user) }- let(:new_default_ship_address) { create(:address, user: other_user) }-- let(:new_attributes) do- {- bill_address_id: new_default_bill_address.id,- ship_address_id: new_default_ship_address.id- }- end- let(:params) { { user: new_attributes } }-- before { patch "/api/v2/storefront/account/users/#{user.id}", params: params, headers: headers }-- it 'returns errors' do- expect(json_response['errors']).to eq(- 'bill_address_id' => ["belongs to other user"],- 'ship_address_id' => ["belongs to other user"]- )- end- end-- context 'with missing authorization token' do- before { patch "/api/v2/storefront/account/users/#{user.id}" }-- it_behaves_like 'returns 403 HTTP status'- end- end-enddiff --git a/api/spec/requests/spree/api/v2/storefront/account_spec.rb b/api/spec/requests/spree/api/v2/storefront/account_spec.rbindex 21425011cb..55c7993986 100644--- a/api/spec/requests/spree/api/v2/storefront/account_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/account_spec.rb@@ -55,4 +55,56 @@ describe 'Storefront API v2 Account spec', type: :request doit_behaves_like 'returns 403 HTTP status'endend++ describe 'users#update' do+ let(:new_attributes) do+ {+ bill_address_id: new_default_bill_address.id,+ ship_address_id: new_default_ship_address.id+ }+ end+ let(:params) { { user: new_attributes } }++ context 'valid request' do+ let(:new_default_bill_address) { create(:address, user: user) }+ let(:new_default_ship_address) { create(:address, user: user) }++ before { patch "/api/v2/storefront/account", params: params, headers: headers }++ it_behaves_like 'returns 200 HTTP status'++ it 'updates and returns user' do+ expect(json_response['data']).to have_id(user.id.to_s)+ expect(json_response['data']).to have_relationship(:default_billing_address)+ .with_data({ 'id' => new_default_bill_address.id.to_s, 'type' => 'address' })+ expect(json_response['data']).to have_relationship(:default_shipping_address)+ .with_data({ 'id' => new_default_ship_address.id.to_s, 'type' => 'address' })+ expect(json_response.size).to eq(1)+ end+ end++ context 'invalid request' do+ let!(:other_user) { create(:user_with_addresses) }+ let(:new_default_bill_address) { create(:address, user: other_user) }+ let(:new_default_ship_address) { create(:address, user: other_user) }++ before { patch "/api/v2/storefront/account", params: params, headers: headers }++ it 'returns errors' do+ expect(json_response['errors']).to eq(+ 'bill_address_id' => ["belongs to other user"],+ 'ship_address_id' => ["belongs to other user"]+ )+ end+ end++ context 'with missing authorization token' do+ let(:new_default_bill_address) { create(:address, user: user) }+ let(:new_default_ship_address) { create(:address, user: user) }++ before { patch "/api/v2/storefront/account", params: params }++ it_behaves_like 'returns 403 HTTP status'+ end+ endenddiff --git a/core/app/models/spree/app_dependencies.rb b/core/app/models/spree/app_dependencies.rbindex a284dc3388..6c69622b39 100644--- a/core/app/models/spree/app_dependencies.rb+++ b/core/app/models/spree/app_dependencies.rb@@ -12,7 +12,7 @@ module Spree:coupon_handler, :country_finder, :current_order_finder, :credit_card_finder,:completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,:products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,- :account_create_address_service, :account_update_address_service, :account_update_user_service, :address_finder,+ :account_create_address_service, :account_update_address_service, :account_update_service, :address_finder,:collection_sorter, :error_handler].freeze@@ -64,9 +64,9 @@ module Spree@coupon_handler = 'Spree::PromotionHandler::Coupon'# account+ @account_update_service = 'Spree::Account::Update'@account_create_address_service = 'Spree::Account::Addresses::Create'@account_update_address_service = 'Spree::Account::Addresses::Update'- @account_update_user_service = 'Spree::Account::Users::Update'@error_handler = 'Spree::ErrorReporter'enddiff --git a/core/app/services/spree/account/update.rb b/core/app/services/spree/account/update.rbnew file mode 100644index 0000000000..905107a91f--- /dev/null+++ b/core/app/services/spree/account/update.rb@@ -0,0 +1,15 @@+module Spree+ module Account+ class Update+ prepend Spree::ServiceModule::Base++ def call(user:, user_params:)+ if user.update(user_params)+ success(user)+ else+ failure(user)+ end+ end+ end+ end+enddiff --git a/core/app/services/spree/account/users/update.rb b/core/app/services/spree/account/users/update.rbdeleted file mode 100644index a588872720..0000000000--- a/core/app/services/spree/account/users/update.rb+++ /dev/null@@ -1,17 +0,0 @@-module Spree- module Account- module Users- class Update- prepend Spree::ServiceModule::Base-- def call(user:, user_params:)- if user.update(user_params)- success(user)- else- failure(user)- end- end- end- end- end-end