diff options
author | Alessandro Desantis <desa.alessandro@gmail.com> | 2020-10-05 17:46:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-05 17:46:16 +0200 |
commit | fb0777566944c9deef6cbacd7a7eac335838746a (patch) | |
tree | 7bb6d0ad0cad20a8315583ccbd62285b83a4d4c4 | |
parent | 26c3495544dd8a534bbe410279b70b42dba310c8 (diff) | |
parent | 4771ca1605e35e89408537b6b44e70e11bd26933 (diff) |
Merge pull request #157 from solidusio-contrib/aldesantis/remove-repopulated-event
Remove subscription_repopulated event
-rw-r--r-- | app/models/solidus_subscriptions/line_item.rb | 10 | ||||
-rw-r--r-- | app/subscribers/solidus_subscriptions/event_storage_subscriber.rb | 8 | ||||
-rw-r--r-- | spec/models/solidus_subscriptions/line_item_spec.rb | 42 |
3 files changed, 0 insertions, 60 deletions
diff --git a/app/models/solidus_subscriptions/line_item.rb b/app/models/solidus_subscriptions/line_item.rb index d2e3b77..64e6fb0 100644 --- a/app/models/solidus_subscriptions/line_item.rb +++ b/app/models/solidus_subscriptions/line_item.rb @@ -39,10 +39,6 @@ module SolidusSubscriptions validates :quantity, numericality: { greater_than: 0 } validates :interval_length, numericality: { greater_than: 0 }, unless: -> { subscription } - after_create :emit_event_for_repopulation - after_update :emit_event_for_repopulation - after_destroy :emit_event_for_repopulation - def as_json(**options) options[:methods] ||= [:dummy_line_item] super(options) @@ -71,11 +67,5 @@ module SolidusSubscriptions order.freeze end - - def emit_event_for_repopulation - return unless subscription - - ::Spree::Event.fire('solidus_subscriptions.subscription_repopulated', subscription: subscription) - end end end diff --git a/app/subscribers/solidus_subscriptions/event_storage_subscriber.rb b/app/subscribers/solidus_subscriptions/event_storage_subscriber.rb index 93b5ba5..487139c 100644 --- a/app/subscribers/solidus_subscriptions/event_storage_subscriber.rb +++ b/app/subscribers/solidus_subscriptions/event_storage_subscriber.rb @@ -8,7 +8,6 @@ module SolidusSubscriptions event_action :track_subscription_activated, event_name: 'solidus_subscriptions.subscription_activated' event_action :track_subscription_canceled, event_name: 'solidus_subscriptions.subscription_canceled' event_action :track_subscription_ended, event_name: 'solidus_subscriptions.subscription_ended' - event_action :track_subscription_repopulated, event_name: 'solidus_subscriptions.subscription_repopulated' event_action :track_subscription_shipping_address_changed, event_name: 'solidus_subscriptions.subscription_shipping_address_changed' event_action :track_subscription_billing_address_changed, event_name: 'solidus_subscriptions.subscription_billing_address_changed' event_action :track_subscription_frequency_changed, event_name: 'solidus_subscriptions.subscription_frequency_changed' @@ -41,13 +40,6 @@ module SolidusSubscriptions ) end - def track_subscription_repopulated(event) - event.payload.fetch(:subscription).events.create!( - event_type: 'subscription_repopulated', - details: event.payload.fetch(:subscription).as_json, - ) - end - def track_subscription_shipping_address_changed(event) event.payload.fetch(:subscription).events.create!( event_type: 'subscription_shipping_address_changed', diff --git a/spec/models/solidus_subscriptions/line_item_spec.rb b/spec/models/solidus_subscriptions/line_item_spec.rb index 5b93e03..ad80384 100644 --- a/spec/models/solidus_subscriptions/line_item_spec.rb +++ b/spec/models/solidus_subscriptions/line_item_spec.rb @@ -6,48 +6,6 @@ RSpec.describe SolidusSubscriptions::LineItem, type: :model do it { is_expected.to validate_numericality_of(:quantity).is_greater_than(0) } it { is_expected.to validate_numericality_of(:interval_length).is_greater_than(0) } - describe '#save!' do - context 'when the line item is new' do - it 'tracks a subscription_repopulated event' do - line_item = build(:subscription_line_item, :with_subscription) - - line_item.save! - - expect(line_item.subscription.events.last).to have_attributes( - event_type: 'subscription_repopulated', - details: a_hash_including('id' => line_item.subscription.id), - ) - end - end - - context 'when the line item is persisted' do - it 'tracks a subscription_repopulated event' do - line_item = create(:subscription_line_item, :with_subscription) - - line_item.quantity = 2 - line_item.save! - - expect(line_item.subscription.events.last).to have_attributes( - event_type: 'subscription_repopulated', - details: a_hash_including('id' => line_item.subscription.id), - ) - end - end - end - - describe '#destroy!' do - it 'tracks a subscription_repopulated event' do - line_item = create(:subscription_line_item, :with_subscription) - - line_item.destroy! - - expect(line_item.subscription.events.last).to have_attributes( - event_type: 'subscription_repopulated', - details: a_hash_including('id' => line_item.subscription.id), - ) - end - end - describe "#interval" do subject { line_item.interval } |