stripe_model_callbacks 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e42a27077a6efe3f89ef606f9cd40fc107ac4a84f96c75953c12fb42066d9a
-  data.tar.gz: 6904a23f07770ab9fcd00dfce19293e878294fd1d2651fd46f7b917868b74f43
+  metadata.gz: 00d4ab8c0fd0b78be1ebca4dae1507afacb17d06812e3cf76d62f1999cee23eb
+  data.tar.gz: 77e3fd6aa86bea4217294b30a8a570747c7688f9e3bf583a21adbe7b3524780e
 SHA512:
-  metadata.gz: c77cb2e07d248973a8f8b7a675fbecf49c65488d8870f8e63955c4e4f72b871d0336d293b4340d430c7d6a9e1a8617cd8c51ac36ced43116b96df2ad60f16493
-  data.tar.gz: 743908583a4e1f124a9462c2e78903768da48750aea8a6c0c7f752c0c0b6eb5b26d35c6163e3617be861661030fcf4f3adc7dd73b17d02741f11ef0a7ac1ad3f
+  metadata.gz: c60062b0347c8c843ea108dda2d871925afd5b644cc0affc2ff8db6945f51b4014c3f82c930be7057dbcc1fb0b37780806188fc407ea257333e6b9adb1e0ef3e
+  data.tar.gz: 93a37540a9c8f7a3ebc1e087a6d777e71a28f977433bb2861828afa63b2120ec4fb55ef56472fa968a96ce936f9a06fc4884a14fca9a279336811bf95d96f5c8

data/app/models/stripe_model_callbacks/application_record.rb

@@ -6,6 +6,19 @@ class StripeModelCallbacks::ApplicationRecord < ActiveRecord::Base
   def self.inherited(child)
     super
     child.include ActiveRecordAuditable::Audited
+    apply_json_attribute_types(child)
+  end
+
+  def self.apply_json_attribute_types(model_class)
+    json_columns = StripeModelCallbacks::AttributesAssignerService::JSON_COLUMNS_BY_TABLE.fetch(
+      model_class.table_name,
+      []
+    )
+    return if json_columns.empty?
+
+    json_columns.each do |column_name|
+      model_class.attribute(column_name, :json)
+    end
   end
 
   def self.check_object_is_stripe_class(object, allowed = nil)
@@ -52,13 +65,10 @@ class StripeModelCallbacks::ApplicationRecord < ActiveRecord::Base
     super
   end
 
-  def update_on_stripe(attributes)
-    attributes.each do |key, value|
-      to_stripe.__send__(:"#{key}=", value)
-    end
-
-    to_stripe.save
-    reload_from_stripe!
+  def update_on_stripe(attributes) # rubocop:disable Naming/PredicateMethod
+    updated_object = self.class.stripe_class.update(stripe_id, attributes)
+    assign_from_stripe(updated_object)
+    save!
     true
   end
 
@@ -66,7 +76,7 @@ class StripeModelCallbacks::ApplicationRecord < ActiveRecord::Base
     raise ActiveRecord::RecordInvalid, self unless update_on_stripe(attributes)
   end
 
-  def destroy_on_stripe
+  def destroy_on_stripe # rubocop:disable Naming/PredicateMethod
     raise "Can't delete #{self.class.name} on Stripe because it isn't supported" unless to_stripe.respond_to?(:delete)
 
     to_stripe.delete

data/app/services/stripe_model_callbacks/attributes_assigner_service.rb

@@ -1,6 +1,31 @@
 class StripeModelCallbacks::AttributesAssignerService < ServicePattern::Service
   attr_reader :attributes, :model, :stripe_model
 
+  SKIP_VALUE = Object.new
+  JSON_COLUMNS_BY_TABLE = {
+    "audits" => %w[audited_changes params],
+    "stripe_payment_intents" => %w[
+      amount_details
+      automatic_payment_methods
+      last_payment_error
+      metadata
+      next_action
+      payment_method_options
+      payment_method_types
+      processing
+      shipping
+      transfer_data
+    ],
+    "stripe_payment_methods" => %w[billing_details card metadata],
+    "stripe_setup_intents" => %w[
+      flow_directions
+      mandate
+      payment_method_old
+      payment_method_options
+      payment_method_types
+    ]
+  }.freeze
+
   def initialize(attributes:, model:, stripe_model:)
     @attributes = attributes
     @model = model
@@ -9,15 +34,10 @@ class StripeModelCallbacks::AttributesAssignerService < ServicePattern::Service
 
   def perform
     attributes.each do |attribute|
-      next unless stripe_model.respond_to?(attribute)
-
-      value = stripe_model.__send__(attribute)
+      value = value_for_attribute(attribute)
+      next if value == SKIP_VALUE
 
-      if attribute == "metadata"
-        value = JSON.generate(value)
-      elsif attribute == "created" && value
-        value = Time.zone.at(value)
-      end
+      value = normalize_value(attribute, value)
 
       model.__send__(setter_method(attribute), value)
     end
@@ -25,6 +45,132 @@ class StripeModelCallbacks::AttributesAssignerService < ServicePattern::Service
     succeed!
   end
 
+  def value_for_attribute(attribute)
+    return value_from_stripe(attribute) if stripe_model.respond_to?(attribute)
+
+    return nil if allow_nil_attribute?(attribute)
+    return SKIP_VALUE unless model_value(attribute).nil?
+
+    default_value = default_value_for(attribute)
+    return SKIP_VALUE if default_value.nil?
+
+    default_value
+  end
+
+  def value_from_stripe(attribute)
+    return nil if allow_nil_attribute?(attribute) && stripe_attribute_missing?(attribute)
+
+    value = stripe_model.__send__(attribute)
+    return nil if value.nil? && allow_nil_attribute?(attribute)
+    return default_value_for(attribute) if value.nil?
+
+    value
+  end
+
+  def stripe_attribute_missing?(attribute)
+    return false unless stripe_model.respond_to?(:to_hash)
+
+    values = stripe_model.instance_variable_get(:@values)
+    return !values.key?(attribute.to_sym) && !values.key?(attribute.to_s) if values.is_a?(Hash)
+
+    stripe_values = stripe_model.to_hash
+    !stripe_values.key?(attribute.to_sym) && !stripe_values.key?(attribute.to_s)
+  end
+
+  def normalize_value(attribute, value)
+    if attribute == "created" && value
+      Time.zone.at(value)
+    elsif (converted_value = datetime_column_value(attribute, value))
+      converted_value
+    elsif json_column?(attribute)
+      normalize_json_value(value)
+    elsif attribute == "metadata"
+      JSON.generate(normalize_json_value(value))
+    else
+      value
+    end
+  end
+
+  def model_value(attribute)
+    model.__send__(column_name_for(attribute))
+  end
+
+  def default_value_for(attribute)
+    default_value = model.class.column_defaults[column_name_for(attribute)]
+
+    return default_value unless default_value.nil?
+
+    nil
+  end
+
+  def allow_nil_attribute?(attribute)
+    attribute == "auto_advance"
+  end
+
+  def json_column?(attribute)
+    column_name = column_name_for(attribute)
+    return true if json_columns_for_table.include?(column_name)
+
+    column = model.class.columns_hash[column_name]
+    return false unless column
+    return true if column.type == :json
+
+    false
+  end
+
+  def json_columns_for_table
+    JSON_COLUMNS_BY_TABLE.fetch(model.class.table_name, [])
+  end
+
+  def datetime_column_value(attribute, value)
+    return false unless value
+
+    column = model.class.columns_hash[column_name_for(attribute)]
+    return false unless column&.type == :datetime
+
+    timestamp = numeric_timestamp_value(value)
+    return Time.zone.at(timestamp) if timestamp
+
+    value
+  end
+
+  def numeric_timestamp_value(value)
+    return value.to_i if value.is_a?(Integer) || value.is_a?(Float)
+
+    value.to_i if value.is_a?(String) && value.match?(/\A\d+\z/)
+  end
+
+  def normalize_json_value(value)
+    return value if value.nil?
+
+    return normalize_json_string(value) if value.is_a?(String)
+
+    return value.map { |item| normalize_json_value(item) } if value.is_a?(Array)
+
+    return value.transform_values { |item| normalize_json_value(item) } if value.is_a?(Hash)
+
+    return normalize_json_value(value.to_hash) if value.respond_to?(:to_hash)
+
+    value
+  end
+
+  def normalize_json_string(value)
+    sanitized_value = value.tr("\u00A0", " ")
+    stripped_value = sanitized_value.strip
+    return value unless stripped_value.start_with?("{", "[")
+
+    begin
+      parsed_value = JSON.parse(sanitized_value)
+      normalize_json_value(parsed_value)
+    rescue JSON::ParserError
+      value
+    end
+  end
+
+  def column_name_for(attribute)
+    attribute == "id" ? "stripe_id" : attribute
+  end
+
   def setter_method(attribute)
     if attribute == "id"
       "stripe_id="

data/app/services/stripe_model_callbacks/base_service.rb

@@ -30,7 +30,10 @@ class StripeModelCallbacks::BaseService < ServicePattern::Service
     # we will prevent from creating duplicated objects due to race condition.
     # https://stripe.com/docs/webhooks/best-practices#event-ordering
     with_exception_notifications do
-      StripeModelCallbacks::ApplicationRecord.with_advisory_lock(advisory_lock_name(*, **)) do
+      StripeModelCallbacks::ApplicationRecord.with_advisory_lock!(
+        advisory_lock_name(*, **),
+        timeout_seconds: 10
+      ) do
         response = execute(*, **, &)
         raise response.errors.join(". ") unless response.success?
 

data/app/services/stripe_model_callbacks/configure_service.rb

@@ -237,6 +237,10 @@ private
         StripeModelCallbacks::Source::UpdatedService.execute_with_advisory_lock!(event:)
       end
     end
+
+    subscribe "source.transaction.created" do |event|
+      StripeModelCallbacks::Source::TransactionCreatedService.execute_with_advisory_lock!(event:)
+    end
   end
 
   def subscribe(event_name)

data/app/services/stripe_model_callbacks/source/transaction_created_service.rb

@@ -0,0 +1,17 @@
+class StripeModelCallbacks::Source::TransactionCreatedService < StripeModelCallbacks::BaseEventService
+  def perform
+    return succeed! unless source
+
+    source.create_audit!(action: :transaction_created)
+    succeed!
+  end
+
+private
+
+  def source
+    @source ||= begin
+      source_id = object.respond_to?(:source) ? object.source : nil
+      source_id ? StripeSource.find_by(stripe_id: source_id) : nil
+    end
+  end
+end

data/lib/stripe_model_callbacks/factories/stripe_coupons.rb

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :stripe_coupon do
     sequence(:stripe_id) { |n| "stripe-coupon-#{n}" }
+    livemode { false }
 
     trait :with_conditional_stripe_mock do
       duration { "repeating" }

data/lib/stripe_model_callbacks/factories/stripe_invoice_items.rb

@@ -5,6 +5,7 @@ FactoryBot.define do
     stripe_invoice
     currency { "usd" }
     discountable { false }
+    livemode { false }
     proration { false }
     sequence(:description) { |n| "Test #{n}" }
   end

data/lib/stripe_model_callbacks/factories/stripe_invoices.rb

@@ -10,6 +10,7 @@ FactoryBot.define do
     currency { "usd" }
     forgiven { false }
     livemode { false }
+    auto_advance { nil }
     paid { false }
     stripe_customer
   end

data/lib/stripe_model_callbacks/factories/stripe_products.rb

@@ -2,6 +2,9 @@ FactoryBot.define do
   factory :stripe_product do
     sequence(:name) { |n| "Stripe product #{n}" }
     sequence(:stripe_id) { |n| "stripe-product-#{n}" }
+    active { false }
+    livemode { false }
+    shippable { false }
 
     trait :with_conditional_stripe_mock do
       after :create do |stripe_product|

data/lib/stripe_model_callbacks/factories/stripe_recipients.rb

@@ -1,5 +1,7 @@
 FactoryBot.define do
   factory :stripe_recipient do
     sequence(:stripe_id) { |n| "stripe-recipient-#{n}" }
+    livemode { false }
+    verified { false }
   end
 end

data/lib/stripe_model_callbacks/factories/stripe_reviews.rb

@@ -2,5 +2,7 @@ FactoryBot.define do
   factory :stripe_review do
     sequence(:stripe_id) { |n| "stripe-review-#{n}" }
     stripe_charge
+    livemode { false }
+    open { true }
   end
 end

data/lib/stripe_model_callbacks/factories/stripe_skus.rb

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :stripe_sku do
     sequence(:stripe_id) { |n| "stripe-sku-#{n}" }
+    active { false }
     price { Money.new(10_000, "USD") }
     currency { "usd" }
   end

data/lib/stripe_model_callbacks/factories/stripe_subscription_items.rb

@@ -4,6 +4,7 @@ FactoryBot.define do
     stripe_subscription
     stripe_plan
     quantity { 1 }
+    deleted { false }
 
     trait :with_conditional_stripe_mock do
       after :build do |item|

data/lib/stripe_model_callbacks/factories/stripe_transfers.rb

@@ -4,5 +4,7 @@ FactoryBot.define do
     amount { Money.new(10_000, "USD") }
     amount_reversed { Money.new(0, "USD") }
     currency { "usd" }
+    livemode { false }
+    reversed { false }
   end
 end

data/lib/stripe_model_callbacks/fixtures/stripe_events/invoice/invoice.upcoming.json

@@ -17,7 +17,6 @@
       "application_fee_amount": null,
       "attempt_count": 1,
       "attempted": true,
-      "auto_advance": false,
       "billing": "charge_automatically",
       "billing_reason": "subscription_create",
       "charge": "ch_00000000000000",

data/lib/stripe_model_callbacks/fixtures/stripe_events/source/{source.transaction_created.json → source.transaction.created.json}

@@ -15,7 +15,8 @@
       "bitcoin_amount": 3000000,
       "created": 1517906694,
       "currency": "usd",
-      "receiver": "btcrcv_1B2J9N2eZvKYlo2C9nVfoiuu"
+      "receiver": "btcrcv_1B2J9N2eZvKYlo2C9nVfoiuu",
+      "source": "src_00000000000000"
     }
   }
 }

data/lib/stripe_model_callbacks/models/stripe_charge.rb

@@ -84,11 +84,14 @@ class StripeCharge < StripeModelCallbacks::ApplicationRecord
 private
 
   def assign_amounts_from_stripe(object)
+    amount_captured_value = object.try(:amount_captured)
+    amount_captured_value = object.amount if amount_captured_value.nil? && object.respond_to?(:amount)
+
     assign_attributes(
       amount: Money.new(object.amount, object.currency),
-      amount_captured: object.try(:amount_captured) ? Money.new(object.amount_captured, object.currency) : nil,
-      amount_refunded: object.amount_refunded ? Money.new(object.amount_refunded, object.currency) : nil,
-      application: object.try(:application) ? Money.new(object.application, object.currency) : nil
+      amount_captured: amount_captured_value.nil? ? nil : Money.new(amount_captured_value, object.currency),
+      amount_refunded: object.amount_refunded.nil? ? nil : Money.new(object.amount_refunded, object.currency),
+      application: object.try(:application).nil? ? nil : Money.new(object.application, object.currency)
     )
   end
 end

data/lib/stripe_model_callbacks/models/stripe_coupon.rb

@@ -11,6 +11,7 @@ class StripeCoupon < StripeModelCallbacks::ApplicationRecord
     check_object_is_stripe_class(object)
     assign_attributes(
       amount_off: object.amount_off ? Money.new(object.amount_off, object.currency) : nil,
+      livemode: object.respond_to?(:livemode) ? object.livemode == true : false,
       stripe_valid: object.valid
     )
 

data/lib/stripe_model_callbacks/models/stripe_invoice.rb

@@ -61,6 +61,7 @@ class StripeInvoice < StripeModelCallbacks::ApplicationRecord
 
 private
 
+
   def assign_amounts(object)
     assign_attributes(
       amount_due: Money.new(object.amount_due, object.currency),

data/lib/stripe_model_callbacks/models/stripe_payment_intent.rb

@@ -22,8 +22,6 @@ class StripePaymentIntent < StripeModelCallbacks::ApplicationRecord
   def assign_from_stripe(object)
     check_object_is_stripe_class(object)
 
-    self.metadata = object.metadata
-
     StripeModelCallbacks::AttributesAssignerService.execute!(
       model: self,
       stripe_model: object,
@@ -49,6 +47,7 @@ class StripePaymentIntent < StripeModelCallbacks::ApplicationRecord
         last_payment_error
         latest_charge
         livemode
+        metadata
         next_action
         on_behalf_of
         payment_method

data/lib/stripe_model_callbacks/models/stripe_payment_method.rb

@@ -11,7 +11,6 @@ class StripePaymentMethod < StripeModelCallbacks::ApplicationRecord
   def assign_from_stripe(object)
     check_object_is_stripe_class(object)
 
-    self.metadata = object.metadata
     self.stripe_id = object.id
     self.stripe_type = object.type
 
@@ -19,7 +18,7 @@ class StripePaymentMethod < StripeModelCallbacks::ApplicationRecord
       model: self,
       stripe_model: object,
       attributes: %w[
-        billing_details card created customer livemode
+        billing_details card created customer livemode metadata
       ]
     )
   end

data/lib/stripe_model_callbacks/models/stripe_recipient.rb

@@ -11,7 +11,7 @@ class StripeRecipient < StripeModelCallbacks::ApplicationRecord
 
     StripeModelCallbacks::AttributesAssignerService.execute!(
       model: self, stripe_model: object,
-      attributes: %w[active_account description email name migrated_to verified]
+      attributes: %w[active_account description email livemode name migrated_to verified]
     )
   end
 end

data/lib/stripe_model_callbacks/models/stripe_subscription_item.rb

@@ -15,10 +15,11 @@ class StripeSubscriptionItem < StripeModelCallbacks::ApplicationRecord
     self.stripe_plan_id = object.plan.id if object.try(:plan).respond_to?(:id)
 
     assign_price_from_stripe(object)
+    assign_deleted_from_stripe(object)
 
     StripeModelCallbacks::AttributesAssignerService.execute!(
       model: self, stripe_model: object,
-      attributes: %w[id created metadata quantity]
+      attributes: %w[id created deleted metadata quantity]
     )
   end
 
@@ -60,4 +61,20 @@ private
     # Set stripe ID on the subscription item
     self.stripe_price_id = object.price.id
   end
+
+  def assign_deleted_from_stripe(object)
+    return if stripe_attribute_missing?(object, "deleted")
+
+    self.deleted = object.deleted == true
+  end
+
+  def stripe_attribute_missing?(object, attribute)
+    return false unless object.respond_to?(:to_hash)
+
+    values = object.instance_variable_get(:@values)
+    return !values.key?(attribute.to_sym) && !values.key?(attribute.to_s) if values.is_a?(Hash)
+
+    stripe_values = object.to_hash
+    !stripe_values.key?(attribute.to_sym) && !stripe_values.key?(attribute.to_s)
+  end
 end

data/lib/stripe_model_callbacks/models/stripe_subscription_schedule.rb

@@ -39,7 +39,7 @@ class StripeSubscriptionSchedule < StripeModelCallbacks::ApplicationRecord
     assign_subscription_schedule_phases(object)
   end
 
-  def cancel_on_stripe
+  def cancel_on_stripe # rubocop:disable Naming/PredicateMethod
     to_stripe.cancel
     update!(canceled_at: Time.zone.now) if respond_to?(:canceled_at)
     reload_from_stripe!

data/lib/stripe_model_callbacks/version.rb

@@ -1,3 +1,3 @@
 module StripeModelCallbacks
-  VERSION = "0.1.8".freeze
+  VERSION = "0.1.9".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe_model_callbacks
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - kaspernj
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 2026-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,7 @@ files:
 - app/services/stripe_model_callbacks/review/updated_service.rb
 - app/services/stripe_model_callbacks/setup_intent/updated_service.rb
 - app/services/stripe_model_callbacks/sku/updated_service.rb
+- app/services/stripe_model_callbacks/source/transaction_created_service.rb
 - app/services/stripe_model_callbacks/source/updated_service.rb
 - app/services/stripe_model_callbacks/subscription/state_checker_service.rb
 - app/services/stripe_model_callbacks/subscription_schedule/updated_service.rb
@@ -361,7 +362,7 @@ files:
 - lib/stripe_model_callbacks/fixtures/stripe_events/source/source.chargeable.json
 - lib/stripe_model_callbacks/fixtures/stripe_events/source/source.failed.json
 - lib/stripe_model_callbacks/fixtures/stripe_events/source/source.mandate_notification.json
-- lib/stripe_model_callbacks/fixtures/stripe_events/source/source.transaction_created.json
+- lib/stripe_model_callbacks/fixtures/stripe_events/source/source.transaction.created.json
 - lib/stripe_model_callbacks/fixtures/stripe_events/subscription_schedule/subscription_schedule.canceled.json
 - lib/stripe_model_callbacks/fixtures/stripe_events/subscription_schedule/subscription_schedule.created.json
 - lib/stripe_model_callbacks/fixtures/stripe_events/subscription_schedule/subscription_schedule.updated.json