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
Refactor services to be clearer.
wjwiteka26e56915b29
diff --git a/api/app/controllers/spree/api/v2/storefront/stores_controller.rb b/api/app/controllers/spree/api/v2/storefront/stores_controller.rbindex fb480b110e..009e68678f 100644--- a/api/app/controllers/spree/api/v2/storefront/stores_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/stores_controller.rb@@ -3,23 +3,22 @@ module Spreemodule V2module Storefrontclass StoresController < ::Spree::Api::V2::ResourceController- before_action :update_options-def currentrender_serialized_payload { serialize_resource(current_store) }enddef export_google_rss_feed- send_data export_google_rss, filename: 'products.rss', type: 'text/xml'+ send_data export_google_rss_service.value[:file], filename: 'products.rss', type: 'text/xml'endprivate- def update_options+ def update_settings@settings = Spree::GoogleFeedSetting.find_by(spree_store_id: current_store)end- def export_google_rss+ def export_google_rss_service+ update_settingsSpree::Dependencies.export_google_rss_service.constantize.new.call(@settings)enddiff --git a/api/spec/controllers/spree/api/v2/storefront/store_controller_spec.rb b/api/spec/controllers/spree/api/v2/storefront/store_controller_spec.rbdeleted file mode 100644index 07e8df11f8..0000000000--- a/api/spec/controllers/spree/api/v2/storefront/store_controller_spec.rb+++ /dev/null@@ -1,2 +0,0 @@-# frozen_string_literal: true-diff --git a/core/app/models/spree/google_feed_setting.rb b/core/app/models/spree/google_feed_setting.rbindex ce312be93c..ede387c2c5 100644--- a/core/app/models/spree/google_feed_setting.rb+++ b/core/app/models/spree/google_feed_setting.rb@@ -8,7 +8,7 @@ module Spreekeys = []attributes.each do |key, value|- if value.instance_of?(TrueClass)+ if value == truekeys.append(key.to_sym)endenddiff --git a/core/app/services/spree/export/google_rss.rb b/core/app/services/spree/export/google_rss.rbindex b0886eb7c0..6529f48110 100644--- a/core/app/services/spree/export/google_rss.rb+++ b/core/app/services/spree/export/google_rss.rb@@ -3,15 +3,18 @@ require 'nokogiri'module Spreemodule Exportclass GoogleRss- def call(options)- @store = Spree::Store.find(options.spree_store_id)- @options = options+ prepend Spree::ServiceModule::Base++ def call(settings)+ @settings = settings++ return failure(store, error: "Store with id: #{settings.spree_store_id} does not exist.") if store.nil?builder = Nokogiri::XML::Builder.new do |xml|xml.rss('xmlns:g' => 'http://base.google.com/ns/1.0', 'version' => '2.0') doxml.channel doadd_store_information_to_xml(xml)- Spree::Product.find_each do |product|+ store.products.active.each do |product|product.variants.active.each do |variant|add_variant_information_to_xml(xml, product, variant)end@@ -20,15 +23,21 @@ module Spreeendend- builder.to_xml+ success(file: builder.to_xml)endprivate+ def store+ return @store if defined? @store++ @store ||= Spree::Store.find_by(id: @settings.spree_store_id)+ end+def add_store_information_to_xml(xml)- xml.title @store.name- xml.link @store.url- xml.description @store.meta_description+ xml.title store.name+ xml.link store.url+ xml.description store.meta_descriptionenddef add_variant_information_to_xml(xml, product, variant)@@ -38,7 +47,7 @@ module Spreexml['g'].id variant.idxml['g'].title format_title(product, variant)xml['g'].description get_description(product, variant)- xml['g'].link "#{@store.url}/#{product.slug}"+ xml['g'].link "#{store.url}/#{product.slug}"xml['g'].image_link get_image_link(variant, product)xml['g'].price format_price(variant)xml['g'].availability get_availability(product)@@ -88,14 +97,14 @@ module Spreeenddef add_optional_information(xml, product)- @options.enabled_keys.each do |key|- if @options.send(key) && !product.property(key.to_s).nil?+ @settings.enabled_keys.each do |key|+ if @settings.send(key) && !product.property(key.to_s).nil?xml['g'].send(key, product.property(key.to_s))endendend- # example of modifing optional information+ # example of modifying optional information## By default, this code assumes that any information that is not required by Google# (see https://support.google.com/merchants/answer/160589?hl=en) is stored in Spree::Products's properties.diff --git a/core/spec/services/spree/export/google_rss_spec.rb b/core/spec/services/spree/export/google_rss_spec.rbindex 0e12f04cde..7e3b9ba4e6 100644--- a/core/spec/services/spree/export/google_rss_spec.rb+++ b/core/spec/services/spree/export/google_rss_spec.rb@@ -16,16 +16,16 @@ module Spreeallow(subject).to receive(:store).and_return(store)end- it 'store name' do- expect(result).to include("<title>#{store.name}</title>").once+ it 'include store name' do+ expect(result.value[:file]).to include("<title>#{store.name}</title>").onceend- it 'store url' do- expect(result).to include("<link>#{store.url}</link>").once+ it 'includes store url' do+ expect(result.value[:file]).to include("<link>#{store.url}</link>").onceend- it 'store description' do- expect(result).to include("<description>#{store.meta_description}</description>").once+ it 'includes store description' do+ expect(result.value[:file]).to include("<description>#{store.meta_description}</description>").onceendend@@ -34,57 +34,57 @@ module Spreeallow(subject).to receive(:store).and_return(store)end- it 'id' do- expect(result).to include("<g:id>#{variant.id}</g:id>").once+ it 'includes id' do+ expect(result.value[:file]).to include("<g:id>#{variant.id}</g:id>").onceend- it 'title' do- expect(result).to include("<g:title>#{product.name} - #{variant.option_values.first.name}</g:title>").once+ it 'includes title' do+ expect(result.value[:file]).to include("<g:title>#{product.name} - #{variant.option_values.first.name}</g:title>").onceend- it 'description' do- expect(result).to include("<g:description>#{product.description}</g:description>").once+ it 'includes description' do+ expect(result.value[:file]).to include("<g:description>#{product.description}</g:description>").onceend- it 'link' do- expect(result).to include("<g:link>#{store.url}/#{product.slug}</g:link>").once+ it 'includes link' do+ expect(result.value[:file]).to include("<g:link>#{store.url}/#{product.slug}</g:link>").onceend- it 'image link' do- expect(result).to include("<g:image_link>#{variant.images.first.plp_url}</g:image_link>").once+ it 'includes image link' do+ expect(result.value[:file]).to include("<g:image_link>#{variant.images.first.plp_url}</g:image_link>").onceend- it 'price' do- expect(result).to include("<g:price>#{variant.price} #{variant.cost_currency}</g:price>").once+ it 'includes price' do+ expect(result.value[:file]).to include("<g:price>#{variant.price} #{variant.cost_currency}</g:price>").onceendcontext 'availability date is in the past' do- it 'product is in stock' do- expect(result).to include('<g:availability>in stock</g:availability>')+ it 'shows that product is in stock' do+ expect(result.value[:file]).to include('<g:availability>in stock</g:availability>')end- it 'product availability date is the same' do- expect(result).to include("<g:availability_date>#{product.available_on.xmlschema}</g:availability_date>")+ it 'shows that product availability date is the same' do+ expect(result.value[:file]).to include("<g:availability_date>#{product.available_on.xmlschema}</g:availability_date>")endendcontext 'availability date is in the future' dolet(:product) { create(:product, stores: [store], available_on: 1.year.from_now) }- it 'product is on backorder' do- expect(result).to include('<g:availability>backorder</g:availability>')+ it 'shows that product is on backorder' do+ expect(result.value[:file]).to include('<g:availability>backorder</g:availability>')endendcontext 'availability date is nil' dolet(:product) { create(:product, stores: [store], available_on: nil) }- it 'product is out of stock' do- expect(result).to include('<g:availability>out of stock</g:availability>')+ it 'shows that product is out of stock' do+ expect(result.value[:file]).to include('<g:availability>out of stock</g:availability>')end- it 'product availability date is nil' do- expect(result).not_to include('<g:availability_date>')+ it 'shows that product availability date is nil' do+ expect(result.value[:file]).not_to include('<g:availability_date>')endendend@@ -97,14 +97,14 @@ module Spreeendit 'adds brand to item attributes' do- expect(result).to include("<g:brand>#{product.property('brand')}</g:brand>")+ expect(result.value[:file]).to include("<g:brand>#{product.property('brand')}</g:brand>")endcontext 'brand option is set to false' dolet(:setting) { create(:google_feed_setting, store: store, brand: false) }it 'does not add brand to item attributes' do- expect(result).not_to include('<g:brand>')+ expect(result.value[:file]).not_to include('<g:brand>')endendend