Complete updates to handle subscription product slugs

lib/custom_wizard/subscription.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 class CustomWizard::Subscription
-  STANDARD_PRODUCT_ID = 'prod_MH11woVoZU5AWb'
-  BUSINESS_PRODUCT_ID = 'prod_MH0wT627okh3Ef'
-  COMMUNITY_PRODUCT_ID = 'prod_MU7l9EjxhaukZ7'
+  PRODUCT_HIERARCHY = %w[
+    community
+    standard
+    business
+  ]
 
   def self.attributes
     {
@@ -99,8 +101,30 @@ class CustomWizard::Subscription
     }
   end
 
+  attr_accessor :product_id,
+                :product_slug
+
   def initialize
-    @subscription = find_subscription
+    if CustomWizard::Subscription.client_installed?
+      result = DiscourseSubscriptionClient.find_subscriptions("discourse-custom-wizard")
+
+      if result&.any?
+        slugs = result.supplier.product_slugs
+
+        if slugs.present?
+          ids_and_slugs = result.subscriptions.map do |subscription|
+            { id: subscription.product_id, slug: slugs[subscription.product_id] }
+          end
+
+          id_and_slug = ids_and_slugs.sort do |a, b|
+            PRODUCT_HIERARCHY[a[:slug]] - PRODUCT_HIERARCHY[b[:slug]]
+          end.first
+
+          @product_id = id_and_slug[:id]
+          @product_slug = id_and_slug[:slug]
+        end
+      end
+    end
   end
 
   def includes?(feature, attribute, value = nil)
@@ -140,36 +164,19 @@ class CustomWizard::Subscription
   end
 
   def standard?
-    @subscription.product_id === STANDARD_PRODUCT_ID
+    product_slug === "standard"
   end
 
   def business?
-    @subscription.product_id === BUSINESS_PRODUCT_ID
+    product_slug === "business"
   end
 
   def community?
-    @subscription.product_id === COMMUNITY_PRODUCT_ID
+    product_slug === "community"
   end
 
-  def client_installed?
-    defined?(SubscriptionClient) == 'constant' && SubscriptionClient.class == Module
-  end
-
-  def find_subscription
-    subscription = nil
-
-    if client_installed?
-      subscription = SubscriptionClientSubscription.active
-        .where(product_id: [STANDARD_PRODUCT_ID, BUSINESS_PRODUCT_ID, COMMUNITY_PRODUCT_ID])
-        .order("product_id = '#{BUSINESS_PRODUCT_ID}' DESC")
-        .first
-    end
-
-    unless subscription
-      subscription = OpenStruct.new(product_id: nil)
-    end
-
-    subscription
+  def self.client_installed?
+    defined?(DiscourseSubscriptionClient) == 'constant' && DiscourseSubscriptionClient.class == Module
   end
 
   def self.subscribed?
@@ -192,10 +199,6 @@ class CustomWizard::Subscription
     new.type
   end
 
-  def self.client_installed?
-    new.client_installed?
-  end
-
   def self.includes?(feature, attribute, value)
     new.includes?(feature, attribute, value)
   end

spec/components/custom_wizard/subscription_spec.rb

@@ -2,9 +2,19 @@
 
 describe CustomWizard::Subscription do
   let(:guests_permitted) { get_wizard_fixture("wizard/guests_permitted") }
+  let!(:business_product_id) { SecureRandom.hex(8) }
+  let!(:standard_product_id) { SecureRandom.hex(8) }
+  let!(:community_product_id) { SecureRandom.hex(8) }
+  let!(:product_slugs) {
+    {
+      "#{business_product_id}" => "business",
+      "#{standard_product_id}" => "standard",
+      "#{community_product_id}" => "community"
+    }
+  }
 
   def undefine_client_classes
-    Object.send(:remove_const, :SubscriptionClient) if Object.constants.include?(:SubscriptionClient)
+    Object.send(:remove_const, :DiscourseSubscriptionClient) if Object.constants.include?(:DiscourseSubscriptionClient)
     Object.send(:remove_const, :SubscriptionClientSubscription) if Object.constants.include?(:SubscriptionClientSubscription)
   end
 
@@ -12,14 +22,6 @@ describe CustomWizard::Subscription do
     load File.expand_path("#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/subscription_client.rb", __FILE__)
   end
 
-  def stub_client_methods
-    [:active, :where, :order, :first].each do |method|
-      SubscriptionClientSubscription.stubs(method)
-        .returns(SubscriptionClientSubscription)
-    end
-    SubscriptionClientSubscription.stubs(:product_id).returns(SecureRandom.hex(8))
-  end
-
   after do
     undefine_client_classes
   end
@@ -50,7 +52,6 @@ describe CustomWizard::Subscription do
   context "with subscription client" do
     before do
       define_client_classes
-      stub_client_methods
     end
 
     it "detects the subscription client" do
@@ -58,6 +59,10 @@ describe CustomWizard::Subscription do
     end
 
     context "without a subscription" do
+      before do
+        DiscourseSubscriptionClient.stubs(:find_subscriptions).returns(nil)
+      end
+
       it "has none type" do
         expect(described_class.type).to eq(:none)
       end
@@ -71,59 +76,70 @@ describe CustomWizard::Subscription do
       end
     end
 
-    context "with a subscription" do
+    context "with subscriptions" do
+      def get_subscription_result(product_id)
+        result = DiscourseSubscriptionClient::Subscriptions::Result.new
+        result.supplier = SubscriptionClientSupplier.new(product_slugs)
+        result.resource = SubscriptionClientResource.new
+        result.subscriptions = [SubscriptionClientSubscription.new(product_id)]
+        result
+      end
+      let!(:business_subscription_result) { get_subscription_result(business_product_id) }
+      let!(:standard_subscription_result) { get_subscription_result(standard_product_id) }
+      let!(:community_subscription_result) { get_subscription_result(community_product_id) }
+
       it "handles mapped values" do
-        SubscriptionClientSubscription.stubs(:product_id).returns(CustomWizard::Subscription::STANDARD_PRODUCT_ID)
+        DiscourseSubscriptionClient.stubs(:find_subscriptions).returns(standard_subscription_result)
         expect(described_class.includes?(:wizard, :permitted, guests_permitted["permitted"])).to eq(true)
 
-        SubscriptionClientSubscription.stubs(:product_id).returns(CustomWizard::Subscription::COMMUNITY_PRODUCT_ID)
+        DiscourseSubscriptionClient.stubs(:find_subscriptions).returns(community_subscription_result)
         expect(described_class.includes?(:wizard, :permitted, guests_permitted["permitted"])).to eq(false)
       end
-    end
 
-    context "with standard subscription" do
-      before do
-        SubscriptionClientSubscription.stubs(:product_id).returns(CustomWizard::Subscription::STANDARD_PRODUCT_ID)
+      context "with a standard subscription" do
+        before do
+          DiscourseSubscriptionClient.stubs(:find_subscriptions).returns(standard_subscription_result)
+        end
+
+        it "detects standard type" do
+          expect(described_class.type).to eq(:standard)
+        end
+
+        it "standard features are included" do
+          expect(described_class.includes?(:wizard, :type, 'send_message')).to eq(true)
+        end
+
+        it "business features are not included" do
+          expect(described_class.includes?(:action, :type, 'create_category')).to eq(false)
+        end
       end
 
-      it "detects standard type" do
-        expect(described_class.type).to eq(:standard)
+      context "with a business subscription" do
+        before do
+          DiscourseSubscriptionClient.stubs(:find_subscriptions).returns(business_subscription_result)
+        end
+
+        it "detects business type" do
+          expect(described_class.type).to eq(:business)
+        end
+
+        it "business features are included" do
+          expect(described_class.includes?(:action, :type, 'create_category')).to eq(true)
+        end
       end
 
-      it "standard features are included" do
-        expect(described_class.includes?(:wizard, :type, 'send_message')).to eq(true)
-      end
+      context "with a community subscription" do
+        before do
+          DiscourseSubscriptionClient.stubs(:find_subscriptions).returns(community_subscription_result)
+        end
 
-      it "business features are not included" do
-        expect(described_class.includes?(:action, :type, 'create_category')).to eq(false)
-      end
-    end
+        it "detects community type" do
+          expect(described_class.type).to eq(:community)
+        end
 
-    context "with business subscription" do
-      before do
-        SubscriptionClientSubscription.stubs(:product_id).returns(CustomWizard::Subscription::BUSINESS_PRODUCT_ID)
-      end
-
-      it "detects business type" do
-        expect(described_class.type).to eq(:business)
-      end
-
-      it "business features are included" do
-        expect(described_class.includes?(:action, :type, 'create_category')).to eq(true)
-      end
-    end
-
-    context "with community subscription" do
-      before do
-        SubscriptionClientSubscription.stubs(:product_id).returns(CustomWizard::Subscription::COMMUNITY_PRODUCT_ID)
-      end
-
-      it "detects community type" do
-        expect(described_class.type).to eq(:community)
-      end
-
-      it "community features are included" do
-        expect(described_class.includes?(:action, :type, 'create_category')).to eq(true)
+        it "community features are included" do
+          expect(described_class.includes?(:action, :type, 'create_category')).to eq(true)
+        end
       end
     end
   end

spec/fixtures/subscription_client.rb

@@ -1,4 +1,39 @@
 # frozen_string_literal: true
 
-module SubscriptionClient; end
-class SubscriptionClientSubscription; end
+module DiscourseSubscriptionClient
+  def self.find_subscriptions(resource_name)
+  end
+end
+
+class SubscriptionClientSupplier
+  attr_reader :product_slugs
+
+  def initialize(product_slugs)
+    @product_slugs = product_slugs
+  end
+end
+
+class SubscriptionClientResource
+end
+
+class SubscriptionClientSubscription
+  attr_reader :product_id
+
+  def initialize(product_id)
+    @product_id = product_id
+  end
+end
+
+module DiscourseSubscriptionClient
+  class Subscriptions
+    class Result
+      attr_accessor :supplier,
+                    :resource,
+                    :subscriptions
+
+      def any?
+        supplier.present? && resource.present? && subscriptions.present?
+      end
+    end
+  end
+end

spec/plugin_helper.rb

@@ -9,7 +9,6 @@ def get_wizard_fixture(path)
 end
 
 def enable_subscription(type)
-  CustomWizard::Subscription.stubs(:client_installed?).returns(true)
   CustomWizard::Subscription.stubs("#{type}?".to_sym).returns(true)
   CustomWizard::Subscription.any_instance.stubs("#{type}?".to_sym).returns(true)
 end