modulr-api 0.0.25 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c622f4bb224ae3aa56fcf4bdb541c7685647652c839fb3dbfac5de5cb0cbb2
-  data.tar.gz: 0b400b25d04689905dcbbbf0794008c5d592739d729eae06e28e7fbd07693004
+  metadata.gz: 0d095d43ccee60d099ae8d7ac57d86cd8104259577ff908fb5cfcd6f33d260a5
+  data.tar.gz: a5a1e05cda5006f6397baa5460e67b7986ef537d742f9a2eeae7b4d69869e087
 SHA512:
-  metadata.gz: 99a99459d32a6574236d7e2382060ae22b7619b0a665a88aef30a7d223afc7102d3fa6d8e82251cbb0e40e9a7a56fb3d037b7cdecba5f8d69af3009209fad92e
-  data.tar.gz: c5c58c43b9be20d922dbcd43baa41056d4760756e268f486822e8f29eaf7d9fa4126eaf59e6e0aaf10dcbaeb3c2993b811d5791f291074abee055ff5136d2807
+  metadata.gz: 9befecbaa71d544887fefab95c0d677fa4134abdf2964fee2a275c006ac534d929dd55ccf37c783624ad646b93a888ff03fe9ae93314f2db037533eb9ed6661a
+  data.tar.gz: 9cd97815ad18668bba5fc12d72721c46d742466086afaf95cb26cc81eb05e54caa1c9498a31d0e6476eb5690e81a63d1e77317d090e00cddaabaa9b17d2a24b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modulr-api (0.0.25)
+    modulr-api (0.0.28)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
 

data/lib/modulr/api/payments_service.rb

@@ -3,10 +3,10 @@
 module Modulr
   module API
     class PaymentsService < Service
-      def find(id:)
+      def find(id:, **opts)
         response = client.get("/payments", { id: id })
         payment_attributes = response.body[:content]&.first
-        raise NotFoundError, "Payment #{id} not found" unless payment_attributes
+        payment_attributes_with_type(id, payment_attributes) if include_transaction?(opts)
 
         Resources::Payments::Payment.new(response.env[:raw_body], payment_attributes)
       end
@@ -15,7 +15,15 @@ module Modulr
         return find(id: opts[:id]) if opts[:id]
 
         response = client.get("/payments", build_query_params(opts))
-        Resources::Payments::Collection.new(response.env[:raw_body], response.body[:content])
+        payments_attributes = response.body[:content]
+
+        if include_transaction?(opts)
+          payments_attributes.each do |payment_attributes|
+            payment_attributes_with_type(payment_attributes[:id], payment_attributes)
+          end
+        end
+
+        Resources::Payments::Collection.new(response.env[:raw_body], payments_attributes)
       end
 
       # rubocop:disable Metrics/ParameterLists
@@ -52,6 +60,47 @@ module Modulr
         end
       end
       # rubocop:enable Metrics/AbcSize
+
+      private def include_transaction?(opts)
+        return true if opts[:include_transaction].nil?
+
+        opts[:include_transaction]
+      end
+
+      private def payment_attributes_with_type(id, attrs)
+        raise NotFoundError, "Payment #{id} not found" unless attrs
+
+        @details = attrs[:details]
+        type = if outgoing && !internal
+                 fetch_transaction_type
+               elsif incoming
+                 @details[:type]
+               elsif internal
+                 @details[:destinationType]
+               end
+
+        attrs[:type] = type
+        attrs
+      end
+
+      private def fetch_transaction_type
+        client.transactions.list(
+          account_id: @details[:sourceAccountId],
+          source_id: @details[:id]
+        )&.first&.type
+      end
+
+      private def incoming
+        @details[:sourceAccountId].nil?
+      end
+
+      private def internal
+        @details[:sourceAccountId] && @details[:destinationId]
+      end
+
+      private def outgoing
+        !@details[:sourceAccountId].nil? && @details[:destinationId].nil?
+      end
     end
   end
 end

data/lib/modulr/api/services.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "service"
-require_relative "accounts_service"
-require_relative "payments_service"
-require_relative "transactions_service"
 
 module Modulr
   module API

data/lib/modulr/resources/payments/payment.rb

@@ -4,7 +4,7 @@ module Modulr
   module Resources
     module Payments
       class Payment < Base
-        attr_reader :details
+        attr_reader :details, :end_to_end_id, :network, :scheme
 
         map :id, [:id, :payment_reference_id]
         map :status
@@ -12,24 +12,111 @@ module Modulr
         map :externalReference, :external_reference
         map :createdDate, :created_at
         map :approvalStatus, :approval_status
+        map :message, :message
+        map :type
 
         def initialize(raw_response, attributes = {})
           super(raw_response, attributes)
-          @details = parse_details(attributes)
+          parse_attributes(attributes)
+          @end_to_end_id = if incoming_sepa?(attributes)
+                             sepa_end_to_end_id(attributes)
+                           elsif incoming_faster_payments?(attributes)
+                             faster_payments_end_to_end_id(attributes)
+                           end
+        end
+
+        private def incoming_sepa?(attributes)
+          %w[PI_SECT PI_SEPA_INST].include?(attributes[:details]&.dig(:type))
+        end
+
+        private def incoming_faster_payments?(attributes)
+          attributes[:details]&.dig(:type) == "PI_FAST"
+        end
+
+        private def sepa_end_to_end_id(attributes)
+          doc = attributes[:details].dig(:details, :payload, :docs, :doc)
+          return unless doc
+
+          doc_type = doc.dig(:header, :type)
+          key = doc_type.downcase.to_sym
+
+          case doc_type
+          when "IFCCTRNS" # SEPA instant
+            doc.dig(key, :document, :fitoFICstmrCdtTrf, :cdtTrfTxInf, :pmtId, :endToEndId)
+          when "FFCCTRNS" # SEPA regular
+            doc.dig(key, :document, :fitoFICstmrCdtTrf, :cdtTrfTxInf).first&.dig(:pmtId, :endToEndId)
+          end
+        end
+
+        private def faster_payments_end_to_end_id(attributes)
+          attributes[:details].dig(:details, :fpsTransaction, :paymentInfo, :endToEndId)
+        end
+
+        private def parse_attributes(attributes)
+          parse_details(attributes)
+          parse_scheme if type
         end
 
         private def parse_details(attributes)
           details = attributes[:details]
+          detail_type = details&.dig(:type) || details&.dig(:destinationType)
 
-          case details&.dig(:type) || details&.dig(:destinationType)
+          case detail_type
           when "PI_SECT", "PI_SEPA_INST", "PI_FAST", "PI_REV"
-            Details::Incoming::General.new(nil, details)
+            incoming_detail(details)
           when "ACCOUNT"
-            Details::Incoming::Internal.new(nil, details)
+            incoming_internal_details(details)
           else
-            Details::Outgoing::General.new(nil, details)
+            outgoing_detail(details)
           end
         end
+
+        private def parse_scheme
+          case type
+          when "PI_SECT", "PO_SECT"
+            sepa_regular
+          when "PI_SEPA_INST", "PO_SEPA_INST"
+            sepa_instant
+          when "PI_FAST", "PO_FAST"
+            faster_payments
+          when "ACCOUNT", "INT_INTERC"
+            internal
+          else
+            raise "Unable to find network and scheme for payment with ID: #{id} and Type: #{type}"
+          end
+        end
+
+        private def sepa_regular
+          @network = "SEPA"
+          @scheme = "SEPA Credit Transfers"
+        end
+
+        private def sepa_instant
+          @network = "SEPA"
+          @scheme = "SEPA Instant Credit Transfers"
+        end
+
+        private def faster_payments
+          @network = "FPS"
+          @scheme = "Faster Payments"
+        end
+
+        private def internal
+          @network = "INTERNAL"
+          @scheme = "INTERNAL"
+        end
+
+        private def incoming_detail(details)
+          @details = Details::Incoming::General.new(nil, details)
+        end
+
+        private def outgoing_detail(details)
+          @details = Details::Outgoing::General.new(nil, details)
+        end
+
+        private def incoming_internal_details(details)
+          @details = Details::Incoming::Internal.new(nil, details)
+        end
       end
     end
   end

data/lib/modulr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modulr
-  VERSION = "0.0.25"
+  VERSION = "0.0.28"
 end

data/lib/modulr.rb

@@ -8,8 +8,9 @@ require_relative "modulr/api/service"
 require_relative "modulr/api/services"
 require_relative "modulr/api/accounts_service"
 require_relative "modulr/api/customers_service"
-require_relative "modulr/api/payments_service"
 require_relative "modulr/api/notifications_service"
+require_relative "modulr/api/payments_service"
+require_relative "modulr/api/transactions_service"
 
 require_relative "modulr/resources/base"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulr-api
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.28
 platform: ruby
 authors:
 - Aitor García Rey
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -242,7 +242,7 @@ metadata:
   source_code_uri: https://github.com/devengoapp/modulr-ruby
   changelog_uri: https://github.com/devengoapp/modulr-ruby/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby client for Modulr Finance API.
 test_files: []