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.

Added soft deletion to CmsPage and some more DB indexes

Damian Legawiec735c6f8741df
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index ec32f20223..8504164e0a 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -1,7 +1,9 @@
module Spree
- class CmsPage < Spree::Base
+ class CmsPage < Base
include SingleStoreResource
- include Spree::DisplayLink
+ include DisplayLink
+
+ acts_as_paranoid
TYPES = ['Spree::Cms::Pages::StandardPage',
'Spree::Cms::Pages::FeaturePage',
@@ -9,13 +11,13 @@ module Spree
belongs_to :store, touch: true
- has_many :cms_sections, dependent: :destroy, class_name: 'Spree::CmsSection'
+ has_many :cms_sections, class_name: 'Spree::CmsSection'
has_many :menu_items, as: :linked_resource
before_validation :handle_slug
validates :title, :store, :locale, presence: true
- validates :slug, uniqueness: { scope: :store, allow_nil: true, case_sensitive: true }
+ validates :slug, uniqueness: { scope: :store_id, allow_nil: true, case_sensitive: true }
scope :visible, -> { where(visible: true) }
scope :by_locale, ->(locale) { where(locale: locale) }
diff --git a/core/db/migrate/20210512191732_create_spree_cms_pages.rb b/core/db/migrate/20210512191732_create_spree_cms_pages.rb
index 14489460e3..90c101dc09 100644
--- a/core/db/migrate/20210512191732_create_spree_cms_pages.rb
+++ b/core/db/migrate/20210512191732_create_spree_cms_pages.rb
@@ -5,17 +5,19 @@ class CreateSpreeCmsPages < ActiveRecord::Migration[5.2]
t.column :meta_title, :string
t.column :content, :text
t.column :meta_description, :text
- t.column :visible, :boolean, default: true
+ t.column :visible, :boolean, default: true, index: true
t.column :slug, :string
t.column :type, :string
t.column :locale, :string
+ t.column :deleted_at, :datetime, index: true
t.belongs_to :store
t.timestamps
end
- add_index :spree_cms_pages, [:slug, :store_id]
+ add_index :spree_cms_pages, [:slug, :store_id], unique: true
+ add_index :spree_cms_pages, [:slug, :store_id, :deleted_at]
add_index :spree_cms_pages, [:title, :type, :store_id]
add_index :spree_cms_pages, [:store_id, :locale, :type]
end