modulr-api 0.0.27 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8dc5b6d30c7a03695474663299d7144939699e1c02a95d2a7cf99137142912
-  data.tar.gz: 92f676165aff5e801db76c001da6373a56454a97dbd18901dd53a07ac0656ef3
+  metadata.gz: c8c9dbb9dd8e49d7371b05d2e68e7222d5e37c654ffe46e389d6d5d113ebffbd
+  data.tar.gz: 37a5c32437eaedaad272ae831543be0626b2334438692a6a483ba78af6cdd6fa
 SHA512:
-  metadata.gz: 93df6c1115b144cf48b6483873a336deb266698067b7cb2bb68934757bf8a81cb4ff44f67af0447fd5039708f93b1da7899989e6243d26e158bfb12aadebecb1
-  data.tar.gz: 684f71d53386979cfb5840d468b9d461e8f373960a06a76e961fcaa3f052d72bc4a2626c28c345e0fd30e4938b33b4de35ff3c475ac49ad217626f668519c989
+  metadata.gz: 7626340f7c17049a55fce43f692b69309427327d16e6b23d4419201c73eeee433520732847ebcd0060c8c1970ac88c58b79bc92faf7436a6d3c2a0d35b1e1075
+  data.tar.gz: '078b0409afa38715e68dbc9421df171f8068595f90cddc70776bf36d682f2c03545c0cf8e22ee7a45793501d9ec9d6723df4390b155cab08c50bc0a48dfca26e'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modulr-api (0.0.27)
+    modulr-api (0.0.29)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
 
@@ -11,6 +11,7 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
+    byebug (9.1.0)
     coderay (1.1.3)
     crack (0.4.5)
       rexml
@@ -133,6 +134,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  byebug (~> 9.0)
   guard (~> 2.0)
   guard-rspec (~> 4.0)
   modulr-api!

data/lib/modulr/api/payments_service.rb

@@ -18,8 +18,7 @@ module Modulr
         Resources::Payments::Collection.new(response.env[:raw_body], response.body[:content])
       end
 
-      # rubocop:disable Metrics/ParameterLists
-      def create(account_id:, destination:, reference:, currency:, amount:, **opts)
+      def create(account_id:, destination:, reference:, currency:, amount:, **opts) # rubocop:disable Metrics/ParameterLists
         payload = {
           sourceAccountId: account_id,
           destination: destination,
@@ -32,12 +31,10 @@ module Modulr
         payload[:endToEndReference] = opts[:e2e_reference] if opts[:e2e_reference]
 
         response = client.post("/payments", payload)
-        Resources::Payments::Payment.new(response.env[:raw_body], response.body)
+        Resources::Payments::Payment.new(response.env[:raw_body], response.body, { network_scheme: false })
       end
-      # rubocop:enable Metrics/ParameterLists
 
-      # rubocop:disable Metrics/AbcSize
-      private def build_query_params(opts)
+      private def build_query_params(opts) # rubocop:disable Metrics/AbcSize
         same_name_params = [:type, :status]
         date_params = { to: :toCreatedDate, from: :fromCreatedDate, updated_since: :modifiedSince }
         mapped_params = {
@@ -51,7 +48,6 @@ module Modulr
           mapped_params.each { |original, mapped| params[mapped] = opts[original] if opts[original] }
         end
       end
-      # rubocop:enable Metrics/AbcSize
     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, :end_to_end_id
+        attr_reader :details, :end_to_end_id, :network, :scheme
 
         map :id, [:id, :payment_reference_id]
         map :status
@@ -13,27 +13,30 @@ module Modulr
         map :createdDate, :created_at
         map :approvalStatus, :approval_status
         map :message, :message
+        map :type
 
-        def initialize(raw_response, attributes = {})
+        def initialize(raw_response, attributes = {}, opts = { network_scheme: true })
           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)
+          @attributes = attributes
+          @opts = opts
+          parse_attributes
+          @end_to_end_id = if incoming_sepa?
+                             sepa_end_to_end_id
+                           elsif incoming_faster_payments?
+                             faster_payments_end_to_end_id
                            end
         end
 
-        private def incoming_sepa?(attributes)
-          %w[PI_SECT PI_SEPA_INST].include?(attributes[:details]&.dig(:type))
+        private def incoming_sepa?
+          %w[PI_SECT PI_SEPA_INST].include?(@attributes[:details]&.dig(:type))
         end
 
-        private def incoming_faster_payments?(attributes)
-          attributes[:details]&.dig(:type) == "PI_FAST"
+        private def incoming_faster_payments?
+          @attributes[:details]&.dig(:type) == "PI_FAST"
         end
 
-        private def sepa_end_to_end_id(attributes)
-          doc = attributes[:details].dig(:details, :payload, :docs, :doc)
+        private def sepa_end_to_end_id
+          doc = @attributes[:details].dig(:details, :payload, :docs, :doc)
           return unless doc
 
           doc_type = doc.dig(:header, :type)
@@ -47,22 +50,104 @@ module Modulr
           end
         end
 
-        private def faster_payments_end_to_end_id(attributes)
-          attributes[:details].dig(:details, :fpsTransaction, :paymentInfo, :endToEndId)
+        private def faster_payments_end_to_end_id
+          @attr_details.dig(:details, :fpsTransaction, :paymentInfo, :endToEndId)
         end
 
-        private def parse_details(attributes)
-          details = attributes[:details]
+        private def parse_attributes
+          parse_details
+          parse_scheme if @opts[:network_scheme]
+        end
+
+        private def parse_details
+          @attr_details = @attributes[:details]
+          detail_type = @attr_details&.dig(:type) || @attr_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
           when "ACCOUNT"
-            Details::Incoming::Internal.new(nil, details)
+            incoming_internal_details
           else
-            Details::Outgoing::General.new(nil, details)
+            outgoing_detail
           end
         end
+
+        private def payment_type
+          if incoming?
+            @attr_details[:type]
+          elsif internal?
+            @attr_details[:destinationType]
+          else
+            outgoing_type
+          end
+        end
+
+        private def parse_scheme
+          case payment_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"
+            internal
+          else
+            raise "Unable to find network and scheme for payment with ID: #{id} and Type: #{type}"
+          end
+        end
+
+        private def outgoing_type
+          return "PO_FAST" if @attributes.dig(:schemeInfo, :id)&.include?("MODULO")
+
+          case @attributes.dig(:schemeInfo, :name)
+          when "SEPA_INSTANT"
+            "PO_SEPA_INST"
+          when "SEPA_CREDIT_TRANSFER"
+            "PO_SECT"
+          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::Incoming::General.new(nil, @attr_details)
+        end
+
+        private def outgoing_detail
+          @details = Details::Outgoing::General.new(nil, @attr_details)
+        end
+
+        private def incoming_internal_details
+          @details = Details::Incoming::Internal.new(nil, @attr_details)
+        end
+
+        private def incoming?
+          !@attr_details.key?(:sourceAccountId)
+        end
+
+        private def internal?
+          @attr_details[:sourceAccountId] && @attr_details[:destinationId]
+        end
       end
     end
   end

data/lib/modulr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modulr
-  VERSION = "0.0.27"
+  VERSION = "0.0.29"
 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"
 

data/modulr.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday", "~> 1.0"
   spec.add_dependency "faraday_middleware", "~> 1.0"
+  spec.add_development_dependency "byebug", "~> 9.0"
   spec.add_development_dependency "guard", "~> 2.0"
   spec.add_development_dependency "guard-rspec", "~> 4.0"
   spec.add_development_dependency "rake", "~> 12.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulr-api
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.29
 platform: ruby
 authors:
 - Aitor García Rey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement