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.

Add missing serializers.

Sebastian Palma274f8c164935
diff --git a/api/app/models/spree/webhooks/subscriber.rb b/api/app/models/spree/webhooks/subscriber.rb
index 5636059ea1..ced0423150 100644
--- a/api/app/models/spree/webhooks/subscriber.rb
+++ b/api/app/models/spree/webhooks/subscriber.rb
@@ -14,7 +14,7 @@ module Spree
when 'PostgreSQL'
["subscriptions @> '[\"*\"]' OR subscriptions @> ?", [event].to_json]
end
- active.where(where_condition).pluck(:url)
+ where(where_condition).pluck(:url)
end
private
diff --git a/api/app/serializers/spree/api/v2/platform/asset_serializer.rb b/api/app/serializers/spree/api/v2/platform/asset_serializer.rb
new file mode 100644
index 0000000000..f6e7bc05d8
--- /dev/null
+++ b/api/app/serializers/spree/api/v2/platform/asset_serializer.rb
@@ -0,0 +1,11 @@
+module Spree
+ module Api
+ module V2
+ module Platform
+ class AssetSerializer < BaseSerializer
+ include ResourceSerializerConcern
+ end
+ end
+ end
+ end
+end
diff --git a/api/app/serializers/spree/api/v2/platform/property_serializer.rb b/api/app/serializers/spree/api/v2/platform/property_serializer.rb
new file mode 100644
index 0000000000..ebf9767a77
--- /dev/null
+++ b/api/app/serializers/spree/api/v2/platform/property_serializer.rb
@@ -0,0 +1,11 @@
+module Spree
+ module Api
+ module V2
+ module Platform
+ class PropertySerializer < BaseSerializer
+ include ResourceSerializerConcern
+ end
+ end
+ end
+ end
+end
diff --git a/api/app/serializers/spree/api/v2/platform/prototype_serializer.rb b/api/app/serializers/spree/api/v2/platform/prototype_serializer.rb
new file mode 100644
index 0000000000..abd05c34f1
--- /dev/null
+++ b/api/app/serializers/spree/api/v2/platform/prototype_serializer.rb
@@ -0,0 +1,11 @@
+module Spree
+ module Api
+ module V2
+ module Platform
+ class PrototypeSerializer < BaseSerializer
+ include ResourceSerializerConcern
+ end
+ end
+ end
+ end
+end
diff --git a/api/app/serializers/spree/api/v2/platform/role_serializer.rb b/api/app/serializers/spree/api/v2/platform/role_serializer.rb
new file mode 100644
index 0000000000..b747813aa0
--- /dev/null
+++ b/api/app/serializers/spree/api/v2/platform/role_serializer.rb
@@ -0,0 +1,11 @@
+module Spree
+ module Api
+ module V2
+ module Platform
+ class RoleSerializer < BaseSerializer
+ include ResourceSerializerConcern
+ end
+ end
+ end
+ end
+end
diff --git a/api/app/serializers/spree/api/v2/platform/stock_transfer_serializer.rb b/api/app/serializers/spree/api/v2/platform/stock_transfer_serializer.rb
new file mode 100644
index 0000000000..0524ba7acb
--- /dev/null
+++ b/api/app/serializers/spree/api/v2/platform/stock_transfer_serializer.rb
@@ -0,0 +1,11 @@
+module Spree
+ module Api
+ module V2
+ module Platform
+ class StockTransferSerializer < BaseSerializer
+ include ResourceSerializerConcern
+ end
+ end
+ end
+ end
+end
diff --git a/api/app/services/spree/webhooks/subscribers/queue_requests.rb b/api/app/services/spree/webhooks/subscribers/queue_requests.rb
index ec8b3ace89..5aaa94e180 100644
--- a/api/app/services/spree/webhooks/subscribers/queue_requests.rb
+++ b/api/app/services/spree/webhooks/subscribers/queue_requests.rb
@@ -5,7 +5,7 @@ module Spree
prepend Spree::ServiceModule::Base
def call(body:, event:)
- Spree::Webhooks::Subscriber.urls_for(event).each do |url|
+ Spree::Webhooks::Subscriber.active.urls_for(event).each do |url|
Spree::Webhooks::Subscribers::MakeRequestJob.perform_later(body, event, url)
end
end
diff --git a/api/spec/models/spree/webhooks/subscriber_spec.rb b/api/spec/models/spree/webhooks/subscriber_spec.rb
index 779a08a87c..36241c4f09 100644
--- a/api/spec/models/spree/webhooks/subscriber_spec.rb
+++ b/api/spec/models/spree/webhooks/subscriber_spec.rb
@@ -26,10 +26,9 @@ describe Spree::Webhooks::Subscriber do
describe '.urls_for' do
subject { described_class.urls_for(event) }
- let(:active) { true }
let(:event) { 'order.complete' }
let(:subscriptions) { ['order.complete'] }
- let!(:subscriber) { described_class.create(url: url, subscriptions: subscriptions, active: active) }
+ let!(:subscriber) { described_class.create(url: url, subscriptions: subscriptions, active: true) }
let(:url) { 'https://url1.com/' }
context 'with subscriptions for the given event' do
@@ -41,11 +40,5 @@ describe Spree::Webhooks::Subscriber do
it { expect(subject).to eq([url]) }
end
-
- context 'without active subscriptions' do
- let(:active) { false }
-
- it { expect(subject).to eq([]) }
- end
end
end
diff --git a/api/spec/serializers/spree/api/v2/platform/asset_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/asset_serializer_spec.rb
new file mode 100644
index 0000000000..6e46dbfbe8
--- /dev/null
+++ b/api/spec/serializers/spree/api/v2/platform/asset_serializer_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Spree::Api::V2::Platform::AssetSerializer do
+ include_context 'API v2 serializers params'
+
+ subject { described_class.new(asset, params: serializer_params).serializable_hash }
+
+ let(:type) { :asset }
+ let(:asset) { create(type) }
+
+ it do
+ expect(subject).to eq(
+ data: {
+ id: asset.id.to_s,
+ type: type,
+ attributes: {
+ viewable_type: asset.viewable_type,
+ attachment_height: asset.attachment_height,
+ attachment_file_size: asset.attachment_file_size,
+ position: asset.position,
+ attachment_content_type: asset.attachment_content_type,
+ attachment_file_name: asset.attachment_file_name,
+ type: asset.type,
+ attachment_updated_at: asset.attachment_updated_at,
+ alt: asset.alt,
+ created_at: asset.created_at,
+ updated_at: asset.updated_at
+ }
+ }
+ )
+ end
+end
diff --git a/api/spec/serializers/spree/api/v2/platform/property_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/property_serializer_spec.rb
new file mode 100644
index 0000000000..2672c55568
--- /dev/null
+++ b/api/spec/serializers/spree/api/v2/platform/property_serializer_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Spree::Api::V2::Platform::PropertySerializer do
+ include_context 'API v2 serializers params'
+
+ subject { described_class.new(resource, params: serializer_params).serializable_hash }
+
+ let(:type) { :property }
+ let(:resource) { create(type) }
+
+ it do
+ expect(subject).to eq(
+ data: {
+ id: resource.id.to_s,
+ type: type,
+ attributes: {
+ name: resource.name,
+ presentation: resource.presentation,
+ created_at: resource.created_at,
+ updated_at: resource.updated_at,
+ filterable: resource.filterable,
+ filter_param: resource.filter_param
+ }
+ }
+ )
+ end
+end
diff --git a/api/spec/serializers/spree/api/v2/platform/prototype_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/prototype_serializer_spec.rb
new file mode 100644
index 0000000000..b594447a79
--- /dev/null
+++ b/api/spec/serializers/spree/api/v2/platform/prototype_serializer_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Spree::Api::V2::Platform::PrototypeSerializer do
+ include_context 'API v2 serializers params'
+
+ subject { described_class.new(resource, params: serializer_params).serializable_hash }
+
+ let(:type) { :prototype }
+ let(:resource) { create(type) }
+
+ it do
+ expect(subject).to eq(
+ data: {
+ id: resource.id.to_s,
+ type: type,
+ attributes: {
+ name: resource.name,
+ created_at: resource.created_at,
+ updated_at: resource.updated_at
+ }
+ }
+ )
+ end
+end
diff --git a/api/spec/serializers/spree/api/v2/platform/role_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/role_serializer_spec.rb
new file mode 100644
index 0000000000..531b625276
--- /dev/null
+++ b/api/spec/serializers/spree/api/v2/platform/role_serializer_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Spree::Api::V2::Platform::RoleSerializer do
+ include_context 'API v2 serializers params'
+
+ subject { described_class.new(resource, params: serializer_params).serializable_hash }
+
+ let(:type) { :role }
+ let(:resource) { create(type) }
+
+ it do
+ expect(subject).to eq(
+ data: {
+ id: resource.id.to_s,
+ type: type,
+ attributes: {
+ name: resource.name,
+ created_at: resource.created_at,
+ updated_at: resource.updated_at
+ }
+ }
+ )
+ end
+end
diff --git a/api/spec/serializers/spree/api/v2/platform/stock_transfer_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/stock_transfer_serializer_spec.rb
new file mode 100644
index 0000000000..62a404e775
--- /dev/null
+++ b/api/spec/serializers/spree/api/v2/platform/stock_transfer_serializer_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Spree::Api::V2::Platform::StockTransferSerializer do
+ include_context 'API v2 serializers params'
+
+ subject { described_class.new(resource, params: serializer_params).serializable_hash }
+
+ let(:type) { :stock_transfer }
+ let(:resource) { create(type) }
+
+ it do
+ expect(subject).to eq(
+ data: {
+ id: resource.id.to_s,
+ type: type,
+ attributes: {
+ type: resource.type,
+ reference: resource.reference,
+ created_at: resource.created_at,
+ updated_at: resource.updated_at,
+ number: resource.number
+ }
+ }
+ )
+ end
+end
diff --git a/api/spec/services/spree/webhooks/subscribers/queue_requests_spec.rb b/api/spec/services/spree/webhooks/subscribers/queue_requests_spec.rb
index 5e8c309c04..99bf120ef1 100644
--- a/api/spec/services/spree/webhooks/subscribers/queue_requests_spec.rb
+++ b/api/spec/services/spree/webhooks/subscribers/queue_requests_spec.rb
@@ -52,12 +52,12 @@ describe Spree::Webhooks::Subscribers::QueueRequests, :job, :spree_webhooks do
end
end
- context 'when subscriber subscriptions are not enabled' do
- let(:subscriber) do
+ context 'when subscriber subscriptions are not active' do
+ let!(:subscriber) do
Spree::Webhooks::Subscriber.create(
url: 'https://url3.com/',
subscriptions: [event],
- enabled: false
+ active: false
)
end
@@ -67,7 +67,7 @@ describe Spree::Webhooks::Subscribers::QueueRequests, :job, :spree_webhooks do
end
context 'when subscriber subscriptions do not include the event or "*"' do
- let(:subscriber) do
+ let!(:subscriber) do
Spree::Webhooks::Subscriber.create(
url: 'https://url4.com/',
subscriptions: ['order.resume'],
diff --git a/core/lib/spree/testing_support/factories/asset_factory.rb b/core/lib/spree/testing_support/factories/asset_factory.rb
new file mode 100644
index 0000000000..e08b6142db
--- /dev/null
+++ b/core/lib/spree/testing_support/factories/asset_factory.rb
@@ -0,0 +1,15 @@
+FactoryBot.define do
+ factory :asset, class: Spree::Asset do
+ viewable_type {}
+ viewable_id {}
+ attachment_width { 340 }
+ attachment_height { 280 }
+ attachment_file_size { 128 }
+ position { 1 }
+ attachment_content_type { '.jpg' }
+ attachment_file_name { 'attachment.jpg' }
+ type {}
+ attachment_updated_at {}
+ alt {}
+ end
+end
diff --git a/core/lib/spree/testing_support/factories/stock_transfer_factory.rb b/core/lib/spree/testing_support/factories/stock_transfer_factory.rb
new file mode 100644
index 0000000000..68c85e3772
--- /dev/null
+++ b/core/lib/spree/testing_support/factories/stock_transfer_factory.rb
@@ -0,0 +1,9 @@
+FactoryBot.define do
+ factory :stock_transfer, class: Spree::StockTransfer do
+ destination_location {}
+ number {}
+ reference {}
+ source_location {}
+ type {}
+ end
+end