discourse_subscription_client 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e9c613aa210fef7c5beacc341e3f704e131d67c5b79af85857458b0386c14a1
-  data.tar.gz: 99cd4b1e1f61ad63f1f8d96ecf81091442cea1e4141c9b41a0c3f02da3018418
+  metadata.gz: ea189a1e70964148ffbcad4fb0ee45b8274c77d84b0dedf06f785108666090eb
+  data.tar.gz: d275e4c8551df79ebace036fbc1550715f1b7220bc4c9c6cb1cb552b7b9cfe25
 SHA512:
-  metadata.gz: 0d2b1d5314c41feaeda861642cd459466861945a9596990353db26c5124ea7f758215bf1b2f9d6beee810ca0400f9fadb3b4da3b8bfe6ec3b609093090bb5339
-  data.tar.gz: 8c412d3337fe1c7f6790ada74217bd678d50ab411a20bb908ac829c39ad086d9776880bfc921ecfdd3f250d0511a59c9dbdf96814dff767370a3f6f0dd58c804
+  metadata.gz: 5c5dd6fe8540cc4644e8e35d2f22b61f91c9f3ae5286c4b7a33e99f2a4c5be8facd9dd260f88c2da92b0d869e090d7cb440a990f87db1330634dd0a4327b8364
+  data.tar.gz: 0f8e839f5c58e48c10850917154f7febcec84a3f004f098c672776521889fa29fb8e05d6366664ba9a3326d0816862bb71f70553258c050da016463e9bd3f59d

data/app/controllers/discourse_subscription_client/suppliers_controller.rb

@@ -47,7 +47,7 @@ module DiscourseSubscriptionClient
 
     def destroy
       if @supplier.destroy_authorization
-        render json: success_json.merge(supplier: @supplier.reload)
+        render json: success_json.merge(supplier_id: @supplier.id)
       else
         render json: failed_json
       end

data/app/models/subscription_client_resource.rb

@@ -4,15 +4,21 @@ class SubscriptionClientResource < ActiveRecord::Base
   belongs_to :supplier, class_name: "SubscriptionClientSupplier"
   has_many :notices, class_name: "SubscriptionClientNotice", as: :notice_subject, dependent: :destroy
   has_many :subscriptions, foreign_key: "resource_id", class_name: "SubscriptionClientSubscription", dependent: :destroy
+
+  def source_url(bucket)
+    "s3://#{access_key_id}:#{secret_access_key}@#{bucket}"
+  end
 end
 
 # == Schema Information
 #
 # Table name: subscription_client_resources
 #
-#  id          :bigint           not null, primary key
-#  supplier_id :bigint
-#  name        :string           not null
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
+#  id                :bigint           not null, primary key
+#  supplier_id       :bigint
+#  name              :string           not null
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#  access_key_id     :string
+#  secret_access_key :string
 #

data/db/migrate/20240917131841_add_keys_to_subscription_client_resource.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddKeysToSubscriptionClientResource < ActiveRecord::Migration[7.0]
+  def change
+    add_column :subscription_client_resources, :access_key_id, :string, if_not_exists: true
+    add_column :subscription_client_resources, :secret_access_key, :string, if_not_exists: true
+  end
+end

data/lib/discourse_subscription_client/subscriptions/update_result.rb

@@ -3,16 +3,21 @@
 module ::DiscourseSubscriptionClient
   class Subscriptions
     class UpdateResult
-      REQUIRED_KEYS ||= %i[
+      REQUIRED_SUBSCRIPTION_KEYS ||= %i[
         resource_id
         product_id
         price_id
       ].freeze
-      OPTIONAL_KEYS ||= %i[
+      OPTIONAL_SUBSCRIPTION_KEYS ||= %i[
         product_name
         price_name
       ].freeze
-      KEYS = REQUIRED_KEYS + OPTIONAL_KEYS
+      SUBSCRIPTION_KEYS = REQUIRED_SUBSCRIPTION_KEYS + OPTIONAL_SUBSCRIPTION_KEYS
+      REQUIRED_RESOURCE_KEYS ||= %i[
+        resource
+        access_key_id
+        secret_access_key
+      ]
 
       attr_reader :errors,
                   :errored_suppliers,
@@ -35,16 +40,10 @@ module ::DiscourseSubscriptionClient
           return []
         end
 
-        # subscriptions must be properly formed
-
-        subscriptions_data =
-          subscriptions_data
-          .map(&:symbolize_keys)
-          .each { |data| data[:resource_id] = data[:resource] }
-          .select { |data| REQUIRED_KEYS.all? { |key| data.key?(key) } }
+        subscriptions_data = format_subscriptions_data(subscriptions_data)
+        resources_data = format_resources_data(raw_data[:resources])
 
         # we only care about subscriptions for resources on this instance
-
         resources = SubscriptionClientResource.where(
           supplier_id: supplier.id,
           name: subscriptions_data.map { |data| data[:resource] }
@@ -56,9 +55,11 @@ module ::DiscourseSubscriptionClient
           if resource.present?
             data[:resource_id] = resource.id
             result << OpenStruct.new(
-              required: data.slice(*REQUIRED_KEYS),
-              create: data.slice(*KEYS),
-              subscription: nil
+              required: data.slice(*REQUIRED_SUBSCRIPTION_KEYS),
+              create: data.slice(*SUBSCRIPTION_KEYS),
+              subscription: nil,
+              resource: resource,
+              resource_data: resources_data[resource.name]
             )
           else
             info("no_resource", supplier, resource: data[:resource])
@@ -66,6 +67,25 @@ module ::DiscourseSubscriptionClient
         end
       end
 
+      def format_subscriptions_data(subscriptions_data)
+        subscriptions_data
+          .map(&:symbolize_keys)
+          .each { |data| data[:resource_id] = data[:resource] }
+          .select { |data| REQUIRED_SUBSCRIPTION_KEYS.all? { |key| data.key?(key) } }
+      end
+
+      def format_resources_data(resources_data)
+        return {} unless resources_data
+
+        resources_data
+          .compact
+          .map(&:symbolize_keys)
+          .select { |data| REQUIRED_RESOURCE_KEYS.all? { |key| data.key?(key) } }
+          .each_with_object({}) do |data, result|
+            result[data[:resource]] = data.slice(:access_key_id, :secret_access_key)
+          end
+      end
+
       def connection_error(supplier)
         error("supplier_connection", supplier)
       end

data/lib/discourse_subscription_client/subscriptions.rb

@@ -37,6 +37,8 @@ module DiscourseSubscriptionClient
         end
       end
 
+      DiscourseEvent.trigger(:subscription_client_subscriptions_updated, @result)
+
       @result.errors.blank?
     end
 
@@ -85,6 +87,8 @@ module DiscourseSubscriptionClient
             @result.failed_to_create_subscription(supplier, subscription_ids: data.required)
           end
         end
+
+        data.resource.update(data.resource_data) if data.resource.present? && data.resource_data.present?
       end
     end
 

data/lib/discourse_subscription_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DiscourseSubscriptionClient
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_subscription_client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Angus McLeod
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-23 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -258,6 +258,7 @@ files:
 - db/migrate/20230221100535_create_subscription_client_subscriptions.rb
 - db/migrate/20230221100540_create_subscription_client_requests.rb
 - db/migrate/20230223135957_add_products_to_subscription_client_suppliers.rb
+- db/migrate/20240917131841_add_keys_to_subscription_client_resource.rb
 - extensions/discourse_subscription_client/current_user_serializer.rb
 - extensions/discourse_subscription_client/guardian.rb
 - extensions/discourse_subscription_client/site_serializer.rb