misc(PaymentProviders): Refact Webhooks folder structure

getlago · Nov 15, 2024 · 3e0dd92 · 3e0dd92
1 parent 5abc45b
commit 3e0dd92
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 61 deletions.
diff --git a/app/services/payment_providers/adyen/webhooks/base_service.rb b/app/services/payment_providers/adyen/webhooks/base_service.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module PaymentProviders
+  module Adyen
+    module Webhooks
+      class BaseService < BaseService
+        def initialize(organization_id:, event_json:)
+          @organization = Organization.find(organization_id)
+          @event_json = event_json
+
+          super
+        end
+
+        private
+
+        attr_reader :organization, :event_json
+
+        def event
+          @event ||= JSON.parse(event_json)['notificationItems'].first&.dig('NotificationRequestItem')
+        end
+      end
+    end
+  end
+end
diff --git a/...ders/webhooks/adyen/chargeback_service.rb → ...ders/adyen/webhooks/chargeback_service.rb b/...ders/webhooks/adyen/chargeback_service.rb → ...ders/adyen/webhooks/chargeback_service.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module PaymentProviders
-  module Webhooks
-    module Adyen
+  module Adyen
+    module Webhooks
       class ChargebackService < BaseService
         def call
           status = event['additionalData']['disputeStatus']
@@ -21,10 +21,6 @@ def call
 
         private
 
-        def event
-          @event ||= JSON.parse(event_json)['notificationItems'].first&.dig('NotificationRequestItem')
-        end
-
         def payment_dispute_lost_at
           Time.zone.parse(event['eventDate'])
         end

diff --git a/app/services/payment_providers/adyen_service.rb b/app/services/payment_providers/adyen_service.rb
@@ -82,7 +82,7 @@ def handle_event(organization:, event_json:)
         result = service.update_status(provider_refund_id:, status:)
         result.raise_if_error!
       when 'CHARGEBACK'
-        PaymentProviders::Webhooks::Adyen::ChargebackService.call(
+        PaymentProviders::Adyen::Webhooks::ChargebackService.call(
           organization_id: organization.id,
           event_json:
         )

diff --git a/app/services/payment_providers/stripe/webhooks/base_service.rb b/app/services/payment_providers/stripe/webhooks/base_service.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module PaymentProviders
+  module Stripe
+    module Webhooks
+      class BaseService < BaseService
+        def initialize(organization_id:, event_json:)
+          @organization = Organization.find(organization_id)
+          @event_json = event_json
+
+          super
+        end
+
+        private
+
+        attr_reader :organization, :event_json
+
+        def event
+          @event ||= ::Stripe::Event.construct_from(JSON.parse(event_json))
+        end
+
+        def metadata
+          @metadata ||= event.data.object.metadata.to_h.symbolize_keys
+        end
+
+        def handle_missing_customer
+          # NOTE: Stripe customer was not created from lago
+          return result unless metadata&.key?(:lago_customer_id)
+
+          # NOTE: Customer does not belong to this lago instance or
+          #       exists but does not belong to the organizations
+          #       (Happens when the Stripe API key is shared between organizations)
+          return result if Customer.find_by(id: metadata[:lago_customer_id], organization_id: organization.id).nil?
+
+          result.not_found_failure!(resource: 'stripe_customer')
+        end
+      end
+    end
+  end
+end
diff --git a/...s/stripe/charge_dispute_closed_service.rb → ...webhooks/charge_dispute_closed_service.rb b/...s/stripe/charge_dispute_closed_service.rb → ...webhooks/charge_dispute_closed_service.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module PaymentProviders
-  module Webhooks
-    module Stripe
+  module Stripe
+    module Webhooks
       class ChargeDisputeClosedService < BaseService
         def call
           status = event.data.object.status

diff --git a/...bhooks/stripe/customer_updated_service.rb → ...ripe/webhooks/customer_updated_service.rb b/...bhooks/stripe/customer_updated_service.rb → ...ripe/webhooks/customer_updated_service.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module PaymentProviders
-  module Webhooks
-    module Stripe
+  module Stripe
+    module Webhooks
       class CustomerUpdatedService < BaseService
         def call
           return handle_missing_customer unless stripe_customer

diff --git a/.../stripe/setup_intent_succeeded_service.rb → ...ebhooks/setup_intent_succeeded_service.rb b/.../stripe/setup_intent_succeeded_service.rb → ...ebhooks/setup_intent_succeeded_service.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module PaymentProviders
-  module Webhooks
     module Stripe
+      module Webhooks
       class SetupIntentSucceededService < BaseService
         include Customers::PaymentProviderFinder
 

diff --git a/app/services/payment_providers/stripe_service.rb b/app/services/payment_providers/stripe_service.rb
@@ -93,12 +93,12 @@ def handle_event(organization:, event_json:)
 
       case event.type
       when 'setup_intent.succeeded'
-        PaymentProviders::Webhooks::Stripe::SetupIntentSucceededService.call(
+        PaymentProviders::Stripe::Webhooks::SetupIntentSucceededService.call(
           organization_id: organization.id,
           event_json:
         ).raise_if_error!
       when 'customer.updated'
-        PaymentProviders::Webhooks::Stripe::CustomerUpdatedService.call(
+        PaymentProviders::Stripe::Webhooks::CustomerUpdatedService.call(
           organization_id: organization.id,
           event_json:
         ).raise_if_error!
@@ -111,7 +111,7 @@ def handle_event(organization:, event_json:)
             metadata: event.data.object.metadata.to_h.symbolize_keys
           ).raise_if_error!
       when 'charge.dispute.closed'
-        PaymentProviders::Webhooks::Stripe::ChargeDisputeClosedService.call(
+        PaymentProviders::Stripe::Webhooks::ChargeDisputeClosedService.call(
           organization_id: organization.id,
           event_json:
         ).raise_if_error!

diff --git a/app/services/payment_providers/webhooks/base_service.rb b/app/services/payment_providers/webhooks/base_service.rb
diff --git a/...webhooks/adyen/chargeback_service_spec.rb → ...adyen/webhooks/chargeback_service_spec.rb b/...webhooks/adyen/chargeback_service_spec.rb → ...adyen/webhooks/chargeback_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PaymentProviders::Webhooks::Adyen::ChargebackService, type: :service do
+RSpec.describe PaymentProviders::Adyen::Webhooks::ChargebackService, type: :service do
   subject(:service) { described_class.new(organization_id:, event_json:) }
 
   let(:organization_id) { organization.id }

diff --git a/...ipe/charge_dispute_closed_service_spec.rb → ...oks/charge_dispute_closed_service_spec.rb b/...ipe/charge_dispute_closed_service_spec.rb → ...oks/charge_dispute_closed_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PaymentProviders::Webhooks::Stripe::ChargeDisputeClosedService, type: :service do
+RSpec.describe PaymentProviders::Stripe::Webhooks::ChargeDisputeClosedService, type: :service do
   subject(:service) { described_class.new(organization_id:, event_json:) }
 
   let(:organization_id) { organization.id }

diff --git a/...s/stripe/customer_updated_service_spec.rb → ...webhooks/customer_updated_service_spec.rb b/...s/stripe/customer_updated_service_spec.rb → ...webhooks/customer_updated_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PaymentProviders::Webhooks::Stripe::CustomerUpdatedService, type: :service do
+RSpec.describe PaymentProviders::Stripe::Webhooks::CustomerUpdatedService, type: :service do
   subject(:webhook_service) { described_class.new(organization_id: organization.id, event_json:) }
 
   let(:organization) { create(:organization) }

diff --git a/...pe/setup_intent_succeeded_service_spec.rb → ...ks/setup_intent_succeeded_service_spec.rb b/...pe/setup_intent_succeeded_service_spec.rb → ...ks/setup_intent_succeeded_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PaymentProviders::Webhooks::Stripe::SetupIntentSucceededService, type: :service do
+RSpec.describe PaymentProviders::Stripe::Webhooks::SetupIntentSucceededService, type: :service do
   subject(:webhook_service) { described_class.new(organization_id: organization.id, event_json:) }
 
   let(:organization) { create(:organization) }

diff --git a/spec/services/payment_providers/stripe_service_spec.rb b/spec/services/payment_providers/stripe_service_spec.rb
@@ -397,7 +397,7 @@
       end
 
       before do
-        allow(PaymentProviders::Webhooks::Stripe::SetupIntentSucceededService).to receive(:call)
+        allow(PaymentProviders::Stripe::Webhooks::SetupIntentSucceededService).to receive(:call)
           .and_return(service_result)
       end
 
@@ -409,7 +409,7 @@
 
         expect(result).to be_success
 
-        expect(PaymentProviders::Webhooks::Stripe::SetupIntentSucceededService).to have_received(:call)
+        expect(PaymentProviders::Stripe::Webhooks::SetupIntentSucceededService).to have_received(:call)
       end
     end
 
@@ -420,7 +420,7 @@
       end
 
       before do
-        allow(PaymentProviders::Webhooks::Stripe::CustomerUpdatedService).to receive(:call)
+        allow(PaymentProviders::Stripe::Webhooks::CustomerUpdatedService).to receive(:call)
           .and_return(service_result)
       end
 
@@ -432,7 +432,7 @@
 
         expect(result).to be_success
 
-        expect(PaymentProviders::Webhooks::Stripe::CustomerUpdatedService).to have_received(:call)
+        expect(PaymentProviders::Stripe::Webhooks::CustomerUpdatedService).to have_received(:call)
       end
     end