solidus_subscriptions 1.0.0 → 1.1.0

data/spec/models/spree/wallet_payment_source_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe Spree::WalletPaymentSource do
   describe 'setting it as the default' do
     it 'reports a payment method changed event for subscriptions that use the default payment source' do
-      stub_const('Spree::Event', class_spy(Spree::Event))
+      stub_const('SolidusSupport::LegacyEventCompat::Bus', class_spy(SolidusSupport::LegacyEventCompat::Bus))
       user = create(:user)
       subscription = create(:subscription, user: user)
       payment_source = create(:credit_card, user: user)
@@ -11,8 +11,8 @@ RSpec.describe Spree::WalletPaymentSource do
 
       user.wallet.default_wallet_payment_source = wallet_payment_source
 
-      expect(Spree::Event).to have_received(:fire).with(
-        'solidus_subscriptions.subscription_payment_method_changed',
+      expect(SolidusSupport::LegacyEventCompat::Bus).to have_received(:publish).with(
+        :'solidus_subscriptions.subscription_payment_method_changed',
         subscription: subscription,
       )
     end

data/spec/requests/api/v1/subscriptions_spec.rb

@@ -163,6 +163,235 @@ RSpec.describe '/api/v1/subscriptions' do
     end
   end
 
+  describe 'POST /:id/pause' do
+    context 'when the subscription is active and belongs to the user' do
+      context 'with an actionable_date' do
+        it 'pauses the subscription and updates the actionable_date' do
+          user = create(:user, &:generate_spree_api_key!)
+          subscription = create(
+            :subscription,
+            user: user,
+            paused: false,
+            state: 'active'
+          )
+          date = Time.zone.tomorrow + 1.day
+          params = {
+            subscription: {
+              actionable_date: date
+            }
+          }
+
+          post(
+            pause_api_v1_subscription_path(subscription),
+            headers: { 'Authorization' => "Bearer #{user.spree_api_key}" },
+            params: params
+          )
+
+          aggregate_failures do
+            expect(response).to be_ok
+            expect(subscription.reload.actionable_date).to eq(date)
+            expect(subscription.paused).to eq(true)
+          end
+        end
+      end
+
+      context 'without an actionable_date' do
+        it 'pauses the subscription indefinitely' do
+          user = create(:user, &:generate_spree_api_key!)
+          subscription = create(
+            :subscription,
+            :with_shipping_address,
+            user: user,
+            paused: false,
+            state: 'active'
+          )
+          params = nil
+
+          post(
+            pause_api_v1_subscription_path(subscription),
+            headers: { 'Authorization' => "Bearer #{user.spree_api_key}" },
+            params: params
+          )
+
+          aggregate_failures do
+            expect(response).to be_ok
+            expect(subscription.reload.actionable_date).to be_nil
+            expect(subscription.paused).to eq(true)
+          end
+        end
+      end
+    end
+
+    context 'when the subscription is not active and belongs to the user' do
+      it 'is an unprocessable entity' do
+        user = create(:user, &:generate_spree_api_key!)
+        subscription = create(
+          :subscription,
+          :with_shipping_address,
+          user: user,
+          paused: false,
+          state: 'canceled'
+        )
+        params = nil
+
+        post(
+          pause_api_v1_subscription_path(subscription),
+          headers: { 'Authorization' => "Bearer #{user.spree_api_key}" },
+          params: params
+        )
+
+        aggregate_failures do
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(JSON.parse(response.body)["paused"]).to include('cannot pause/resume a subscription which is not active')
+          expect(subscription.reload.paused).to eq(false)
+        end
+      end
+    end
+
+    context('when the subscription is active but does not belong to the user') do
+      it 'responds with 401 Unauthorized' do
+        user = create(:user, &:generate_spree_api_key!)
+        subscription = create(
+          :subscription,
+          paused: false,
+          state: 'active'
+        )
+        date = Time.zone.tomorrow + 1.day
+        params = {
+          subscription: {
+            actionable_date: date
+          }
+        }
+
+        post(
+          pause_api_v1_subscription_path(subscription),
+          headers: { 'Authorization' => "Bearer #{user.spree_api_key}" },
+          params: params
+        )
+
+        expect(response.status).to eq(401)
+      end
+    end
+  end
+
+  describe '#resume' do
+    context 'when the subscription is active and belongs to the user' do
+      context 'with an actionable_date' do
+        it 'resumes the subscription and updates the actionable_date' do
+          user = create(:user, &:generate_spree_api_key!)
+          subscription = create(
+            :subscription,
+            user: user,
+            paused: true,
+            state: 'active'
+          )
+          date = Time.zone.tomorrow + 1.day
+          params = {
+            subscription: {
+              actionable_date: date
+            }
+          }
+
+          post(
+            resume_api_v1_subscription_path(subscription),
+            headers: { 'Authorization' => "Bearer #{user.spree_api_key}" },
+            params: params
+          )
+
+          aggregate_failures do
+            expect(response).to be_ok
+            expect(subscription.reload.actionable_date).to eq(date)
+            expect(subscription.paused).to eq(false)
+          end
+        end
+      end
+
+      context 'without an actionable_date' do
+        it 'resumes the subscription on the next day' do
+          user = create(:user, &:generate_spree_api_key!)
+          subscription = create(
+            :subscription,
+            user: user,
+            paused: true,
+            state: 'active'
+          )
+          params = {
+            subscription: {
+              actionable_date: nil
+            }
+          }
+
+          post(
+            resume_api_v1_subscription_path(subscription),
+            headers: { 'Authorization' => "Bearer #{user.spree_api_key}" },
+            params: params
+          )
+
+          aggregate_failures do
+            expect(response).to be_ok
+            expect(subscription.reload.actionable_date).to eq(Time.zone.tomorrow)
+            expect(subscription.paused).to eq(false)
+          end
+        end
+      end
+    end
+
+    context 'when the subscription is not active and belongs to the user' do
+      it 'is an unprocessable entity' do
+        user = create(:user, &:generate_spree_api_key!)
+        subscription = create(
+          :subscription,
+          user: user,
+          paused: true,
+          state: 'canceled'
+        )
+        params = {
+          subscription: {
+            actionable_date: nil
+          }
+        }
+
+        post(
+          resume_api_v1_subscription_path(subscription),
+          headers: { 'Authorization' => "Bearer #{user.spree_api_key}" },
+          params: params
+        )
+
+        aggregate_failures do
+          expect(response.status).to eq(422)
+          expect(JSON.parse(response.body)["paused"]).to include('cannot pause/resume a subscription which is not active')
+        end
+      end
+    end
+
+    context 'when the subscription is active but does not belong to the user' do
+      it 'responds with 401 Unauthorized' do
+        user = create(:user, &:generate_spree_api_key!)
+        subscription = create(
+          :subscription,
+          paused: true,
+          state: 'active'
+        )
+        params = {
+          subscription: {
+            actionable_date: nil
+          }
+        }
+
+        post(
+          resume_api_v1_subscription_path(subscription),
+          headers: { 'Authorization' => "Bearer #{user.spree_api_key}" },
+          params: params
+        )
+
+        aggregate_failures do
+          expect(response.status).to eq(401)
+          expect(subscription.paused).to eq(true)
+        end
+      end
+    end
+  end
+
   describe 'POST /:id/skip' do
     context 'when the subscription belongs to the user' do
       it 'responds with 200 OK' do

data/spec/subscribers/solidus_subscriptions/churn_buster_subscriber_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe SolidusSubscriptions::ChurnBusterSubscriber do
       allow(SolidusSubscriptions).to receive(:churn_buster).and_return(churn_buster)
 
       subscription = create(:subscription)
-      Spree::Event.fire('solidus_subscriptions.subscription_canceled', subscription: subscription)
+      SolidusSupport::LegacyEventCompat::Bus.publish(:'solidus_subscriptions.subscription_canceled', subscription: subscription)
 
       expect(churn_buster).to have_received(:report_subscription_cancellation).with(subscription)
     end
@@ -19,7 +19,7 @@ RSpec.describe SolidusSubscriptions::ChurnBusterSubscriber do
       allow(SolidusSubscriptions).to receive(:churn_buster).and_return(churn_buster)
 
       subscription = create(:subscription)
-      Spree::Event.fire('solidus_subscriptions.subscription_ended', subscription: subscription)
+      SolidusSupport::LegacyEventCompat::Bus.publish(:'solidus_subscriptions.subscription_ended', subscription: subscription)
 
       expect(churn_buster).to have_received(:report_subscription_cancellation).with(subscription)
     end
@@ -32,8 +32,8 @@ RSpec.describe SolidusSubscriptions::ChurnBusterSubscriber do
 
       order = build_stubbed(:order)
       installment = build_stubbed(:installment)
-      Spree::Event.fire(
-        'solidus_subscriptions.installment_succeeded',
+      SolidusSupport::LegacyEventCompat::Bus.publish(
+        :'solidus_subscriptions.installment_succeeded',
         installment: installment,
         order: order,
       )
@@ -49,8 +49,8 @@ RSpec.describe SolidusSubscriptions::ChurnBusterSubscriber do
 
       order = build_stubbed(:order)
       installment = build_stubbed(:installment)
-      Spree::Event.fire(
-        'solidus_subscriptions.installment_failed_payment',
+      SolidusSupport::LegacyEventCompat::Bus.publish(
+        :'solidus_subscriptions.installment_failed_payment',
         installment: installment,
         order: order,
       )
@@ -65,8 +65,8 @@ RSpec.describe SolidusSubscriptions::ChurnBusterSubscriber do
       allow(SolidusSubscriptions).to receive(:churn_buster).and_return(churn_buster)
 
       subscription = create(:subscription)
-      Spree::Event.fire(
-        'solidus_subscriptions.subscription_payment_method_changed',
+      SolidusSupport::LegacyEventCompat::Bus.publish(
+        :'solidus_subscriptions.subscription_payment_method_changed',
         subscription: subscription,
       )
 

data/spec/subscribers/solidus_subscriptions/order_subscriber_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+RSpec.describe SolidusSubscriptions::OrderSubscriber do
+  describe 'on order completion' do
+    it 'enqueues the CreateSubscriptionJob' do
+      order = create(:order_ready_to_complete, :with_subscription_line_items)
+
+      order.complete!
+
+      expect(SolidusSubscriptions::CreateSubscriptionJob).to have_been_enqueued.with(order).once
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_subscriptions
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-16 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.11'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.11'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: state_machines
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gem_release.yml"
+- ".github/dependabot.yml"
 - ".github/stale.yml"
 - ".github_changelog_generator"
 - ".gitignore"
@@ -243,7 +244,6 @@ files:
 - app/controllers/spree/admin/users/subscriptions_controller.rb
 - app/decorators/models/solidus_subscriptions/spree/line_item/subscription_line_items_association.rb
 - app/decorators/models/solidus_subscriptions/spree/order/after_create.rb
-- app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb
 - app/decorators/models/solidus_subscriptions/spree/order/installment_details_association.rb
 - app/decorators/models/solidus_subscriptions/spree/order/subscription_association.rb
 - app/decorators/models/solidus_subscriptions/spree/order/subscription_line_items_association.rb
@@ -252,6 +252,7 @@ files:
 - app/decorators/models/solidus_subscriptions/spree/variant/auto_delete_from_subscriptions.rb
 - app/decorators/models/solidus_subscriptions/spree/variant/variant_pretty_name.rb
 - app/decorators/models/solidus_subscriptions/spree/wallet_payment_source/report_default_change_to_subscriptions.rb
+- app/jobs/solidus_subscriptions/create_subscription_job.rb
 - app/jobs/solidus_subscriptions/process_installment_job.rb
 - app/jobs/solidus_subscriptions/process_subscription_job.rb
 - app/models/solidus_subscriptions/installment.rb
@@ -269,6 +270,7 @@ files:
 - app/overrides/views/subscription_line_item_fields.rb
 - app/subscribers/solidus_subscriptions/churn_buster_subscriber.rb
 - app/subscribers/solidus_subscriptions/event_storage_subscriber.rb
+- app/subscribers/solidus_subscriptions/order_subscriber.rb
 - app/views/spree/admin/installments/_state_pill.html.erb
 - app/views/spree/admin/installments/index.html.erb
 - app/views/spree/admin/products/_subscribable_checkbox.html.erb
@@ -291,7 +293,6 @@ files:
 - app/views/spree/admin/users/_subscription_tab.html.erb
 - app/views/spree/admin/users/subscriptions/index.html.erb
 - app/views/spree/admin/variants/_subscribable_checkbox.html.erb
-- app/views/spree/frontend/products/_subscription_line_item_fields.html.erb
 - bin/console
 - bin/rails
 - bin/rails-engine
@@ -300,7 +301,6 @@ files:
 - bin/sandbox
 - bin/setup
 - config/initializers/permission_sets.rb
-- config/initializers/subscribers.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20160825164850_create_solidus_subscriptions_subscriptions.rb
@@ -334,9 +334,12 @@ files:
 - db/migrate/20201123171026_change_actionable_date_to_date.rb
 - db/migrate/20210205140422_add_currency_to_subscription.rb
 - db/migrate/20210323165714_update_promotion_rule_names.rb
+- db/migrate/20210905145955_add_paused_to_subscriptions.rb
 - lib/decorators/api/controllers/solidus_subscriptions/spree/api/line_items_controller/create_subscription_line_items.rb
 - lib/decorators/frontend/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items.rb
 - lib/generators/solidus_subscriptions/install/install_generator.rb
+- lib/generators/solidus_subscriptions/install/templates/app/controllers/concerns/create_subscription.rb
+- lib/generators/solidus_subscriptions/install/templates/app/views/cart_line_items/_subscription_fields.html.erb
 - lib/generators/solidus_subscriptions/install/templates/initializer.rb
 - lib/solidus_subscriptions.rb
 - lib/solidus_subscriptions/checkout.rb
@@ -357,6 +360,7 @@ files:
 - lib/solidus_subscriptions/permission_sets/default_customer.rb
 - lib/solidus_subscriptions/permission_sets/subscription_management.rb
 - lib/solidus_subscriptions/permitted_attributes.rb
+- lib/solidus_subscriptions/processing_error_handlers/rails_logger.rb
 - lib/solidus_subscriptions/processor.rb
 - lib/solidus_subscriptions/subscription_generator.rb
 - lib/solidus_subscriptions/subscription_line_item_builder.rb
@@ -370,6 +374,7 @@ files:
 - lib/solidus_subscriptions/testing_support/factories/subscription_factory.rb
 - lib/solidus_subscriptions/version.rb
 - lib/tasks/process_subscriptions.rake
+- lib/views/spree/frontend/products/_subscription_line_item_fields.html.erb
 - reference/solidus_subscriptions.v1.yaml
 - solidus_subscriptions.gemspec
 - spec/controllers/spree/admin/subscriptions_controller_spec.rb
@@ -378,7 +383,6 @@ files:
 - spec/controllers/spree/api/users_controller_spec.rb
 - spec/decorators/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items_spec.rb
 - spec/decorators/models/solidus_subscriptions/spree/line_item/subscription_line_items_association_spec.rb
-- spec/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions_spec.rb
 - spec/decorators/models/solidus_subscriptions/spree/order/installment_details_association_spec.rb
 - spec/decorators/models/solidus_subscriptions/spree/order/subscription_line_items_association_spec.rb
 - spec/decorators/models/solidus_subscriptions/spree/user/have_many_subscriptions_spec.rb
@@ -387,6 +391,7 @@ files:
 - spec/features/admin/subscriptions_spec.rb
 - spec/features/admin_users_subscription_tabs_spec.rb
 - spec/fixtures/cassettes/churn_buster.yml
+- spec/jobs/solidus_subscriptions/create_subscription_job_spec.rb
 - spec/jobs/solidus_subscriptions/process_installment_job_spec.rb
 - spec/jobs/solidus_subscriptions/process_subscription_job_spec.rb
 - spec/lib/solidus_subscriptions/checkout_spec.rb
@@ -412,6 +417,7 @@ files:
 - spec/requests/api/v1/subscriptions_spec.rb
 - spec/spec_helper.rb
 - spec/subscribers/solidus_subscriptions/churn_buster_subscriber_spec.rb
+- spec/subscribers/solidus_subscriptions/order_subscriber_spec.rb
 - spec/support/active_model_mocks.rb
 - spec/support/cancancan.rb
 - spec/support/factories.rb
@@ -421,20 +427,20 @@ files:
 - spec/support/timecop.rb
 - spec/support/vcr.rb
 - spec/support/version_cake.rb
-homepage: https://github.com/solidusio-contrib/solidus_subscriptions
+homepage: https://github.com/solidusio/solidus_subscriptions
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/solidusio-contrib/solidus_subscriptions
-  source_code_uri: https://github.com/solidusio-contrib/solidus_subscriptions
-  changelog_uri: https://github.com/solidusio-contrib/solidus_subscriptions/blob/master/CHANGELOG.md
+  homepage_uri: https://github.com/solidusio/solidus_subscriptions
+  source_code_uri: https://github.com/solidusio/solidus_subscriptions
+  changelog_uri: https://github.com/solidusio/solidus_subscriptions/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -443,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Add subscription support to Solidus
@@ -454,7 +460,6 @@ test_files:
 - spec/controllers/spree/api/users_controller_spec.rb
 - spec/decorators/controllers/solidus_subscriptions/spree/orders_controller/create_subscription_line_items_spec.rb
 - spec/decorators/models/solidus_subscriptions/spree/line_item/subscription_line_items_association_spec.rb
-- spec/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions_spec.rb
 - spec/decorators/models/solidus_subscriptions/spree/order/installment_details_association_spec.rb
 - spec/decorators/models/solidus_subscriptions/spree/order/subscription_line_items_association_spec.rb
 - spec/decorators/models/solidus_subscriptions/spree/user/have_many_subscriptions_spec.rb
@@ -463,6 +468,7 @@ test_files:
 - spec/features/admin/subscriptions_spec.rb
 - spec/features/admin_users_subscription_tabs_spec.rb
 - spec/fixtures/cassettes/churn_buster.yml
+- spec/jobs/solidus_subscriptions/create_subscription_job_spec.rb
 - spec/jobs/solidus_subscriptions/process_installment_job_spec.rb
 - spec/jobs/solidus_subscriptions/process_subscription_job_spec.rb
 - spec/lib/solidus_subscriptions/checkout_spec.rb
@@ -488,6 +494,7 @@ test_files:
 - spec/requests/api/v1/subscriptions_spec.rb
 - spec/spec_helper.rb
 - spec/subscribers/solidus_subscriptions/churn_buster_subscriber_spec.rb
+- spec/subscribers/solidus_subscriptions/order_subscriber_spec.rb
 - spec/support/active_model_mocks.rb
 - spec/support/cancancan.rb
 - spec/support/factories.rb

data/app/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-# Once an order is finalized its subscriptions line items should be converted
-# into active subscriptions. This hooks into Spree::Order#finalize! and
-# passes all subscription_line_items present on the order to the Subscription
-# generator which will build and persist the subscriptions
-module SolidusSubscriptions
-  module Spree
-    module Order
-      module FinalizeCreatesSubscriptions
-        def finalize!
-          SolidusSubscriptions::SubscriptionGenerator.group(subscription_line_items).each do |line_items|
-            SolidusSubscriptions::SubscriptionGenerator.activate(line_items)
-          end
-
-          reload
-
-          super
-        end
-      end
-    end
-  end
-end
-
-Spree::Order.prepend(SolidusSubscriptions::Spree::Order::FinalizeCreatesSubscriptions)

data/config/initializers/subscribers.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-if Spree.solidus_gem_version < Gem::Version.new('2.11.0')
-  require SolidusSubscriptions::Engine.root.join('app/subscribers/solidus_subscriptions/event_storage_subscriber')
-  require SolidusSubscriptions::Engine.root.join('app/subscribers/solidus_subscriptions/churn_buster_subscriber')
-
-  SolidusSubscriptions::ChurnBusterSubscriber.subscribe!
-  SolidusSubscriptions::EventStorageSubscriber.subscribe!
-end

data/spec/decorators/models/solidus_subscriptions/spree/order/finalize_creates_subscriptions_spec.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe SolidusSubscriptions::Spree::Order::FinalizeCreatesSubscriptions do
-  describe '#finalize!' do
-    subject(:finalize) { order.finalize! }
-
-    let(:order) { create :order, :with_subscription_line_items }
-    let(:subscription_line_item) { order.subscription_line_items.last }
-    let(:expected_actionable_date) { Time.zone.today + subscription_line_item.subscription.interval }
-
-    around { |e| Timecop.freeze { e.run } }
-
-    it 'creates new subscriptions' do
-      expect { finalize }.
-        to change { SolidusSubscriptions::Subscription.count }.
-        by(order.subscription_line_items.count)
-    end
-
-    it 'creates a subscription with the correct values' do
-      finalize
-      subscription = SolidusSubscriptions::Subscription.last
-
-      expect(subscription).to have_attributes(
-        user_id: order.user_id,
-        actionable_date: expected_actionable_date,
-        line_items: [subscription_line_item]
-      )
-    end
-  end
-end