modulr-api 0.0.24 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c1dc8aa140f6be1d96ad9b068a6d9a1020b3c1e553aa332598915699e657f99
-  data.tar.gz: af067bdb4a8cd588b71e86e43aa6f0bf5f1a2c9af22fe6792a6a3c6055875c05
+  metadata.gz: 3a8dc5b6d30c7a03695474663299d7144939699e1c02a95d2a7cf99137142912
+  data.tar.gz: 92f676165aff5e801db76c001da6373a56454a97dbd18901dd53a07ac0656ef3
 SHA512:
-  metadata.gz: 34cada4ed145c82954fd8e9d2206eb7814d1fb3d4c49de1a5949ad99783c7a7dd8f47626c8a11b7a2cf6feee2b1c3c3cb548d0fd8df6e24ef3a98a98f101a07e
-  data.tar.gz: b455c299a24441b12d3cbe79fe4c3b2d34e845a0fe32db391a1592ad60d29b77a5b51271969e4d767b7007420874eb46cd818309e59fb79f34cef2099f6552b0
+  metadata.gz: 93df6c1115b144cf48b6483873a336deb266698067b7cb2bb68934757bf8a81cb4ff44f67af0447fd5039708f93b1da7899989e6243d26e158bfb12aadebecb1
+  data.tar.gz: 684f71d53386979cfb5840d468b9d461e8f373960a06a76e961fcaa3f052d72bc4a2626c28c345e0fd30e4938b33b4de35ff3c475ac49ad217626f668519c989

data/Gemfile.lock

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

data/lib/modulr/resources/accounts/identifier.rb

@@ -5,6 +5,7 @@ module Modulr
     module Accounts
       class Identifier < Base
         map :type
+        map :id
         map :iban
         map :bic
         map :currency

data/lib/modulr/resources/base.rb

@@ -37,6 +37,7 @@ require_relative "notifications/collection"
 require_relative "payments/payment"
 require_relative "payments/counterparty"
 require_relative "payments/details/incoming/general"
+require_relative "payments/details/incoming/internal"
 require_relative "payments/details/outgoing/general"
 require_relative "payments/destination"
 require_relative "payments/collection"

data/lib/modulr/resources/payments/details/incoming/internal.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Modulr
+  module Resources
+    module Payments
+      module Details
+        module Incoming
+          class Internal < Base
+            attr_reader :destination
+
+            map :sourceAccountId, :source_account_id
+            map :currency
+            map :amount
+            map :reference
+
+            def initialize(raw_response, attributes = {})
+              super(raw_response, attributes)
+              @destination = Destination.new(nil, attributes[:destination])
+            end
+          end
+        end
+      end
+    end
+  end
+end

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
 
         map :id, [:id, :payment_reference_id]
         map :status
@@ -12,18 +12,53 @@ module Modulr
         map :externalReference, :external_reference
         map :createdDate, :created_at
         map :approvalStatus, :approval_status
+        map :message, :message
 
         def initialize(raw_response, attributes = {})
           super(raw_response, attributes)
           @details = parse_details(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_details(attributes)
           details = attributes[:details]
 
-          case details&.dig(:type)
+          case details&.dig(:type) || details&.dig(:destinationType)
           when "PI_SECT", "PI_SEPA_INST", "PI_FAST", "PI_REV"
             Details::Incoming::General.new(nil, details)
+          when "ACCOUNT"
+            Details::Incoming::Internal.new(nil, details)
           else
             Details::Outgoing::General.new(nil, details)
           end

data/lib/modulr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulr-api
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.27
 platform: ruby
 authors:
 - Aitor García Rey
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -226,6 +226,7 @@ files:
 - lib/modulr/resources/payments/counterparty.rb
 - lib/modulr/resources/payments/destination.rb
 - lib/modulr/resources/payments/details/incoming/general.rb
+- lib/modulr/resources/payments/details/incoming/internal.rb
 - lib/modulr/resources/payments/details/outgoing/general.rb
 - lib/modulr/resources/payments/payment.rb
 - lib/modulr/resources/transactions/collection.rb
@@ -241,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
@@ -257,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: []