From 42517c094e3613da6374603a78160593dde41977 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Thu, 4 May 2023 17:16:11 +0200 Subject: [PATCH] Minor tweaks to subscription loading logic --- lib/custom_wizard/subscription.rb | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/custom_wizard/subscription.rb b/lib/custom_wizard/subscription.rb index e9218479..02627f07 100644 --- a/lib/custom_wizard/subscription.rb +++ b/lib/custom_wizard/subscription.rb @@ -109,20 +109,19 @@ class CustomWizard::Subscription result = SubscriptionClient.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] + ids_and_slugs = result.subscriptions.map do |subscription| + { + id: subscription.product_id, + slug: result.products[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