modulr-api 0.0.28 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d095d43ccee60d099ae8d7ac57d86cd8104259577ff908fb5cfcd6f33d260a5
-  data.tar.gz: a5a1e05cda5006f6397baa5460e67b7986ef537d742f9a2eeae7b4d69869e087
+  metadata.gz: dfee429f389323b1d5272e26a6dd289ac0accfafa4364af2634d90596ff5bc04
+  data.tar.gz: df4e737338758aa5ec2a00dff6dfa66751da635d61e53f4b6f6b2973d8dc965f
 SHA512:
-  metadata.gz: 9befecbaa71d544887fefab95c0d677fa4134abdf2964fee2a275c006ac534d929dd55ccf37c783624ad646b93a888ff03fe9ae93314f2db037533eb9ed6661a
-  data.tar.gz: 9cd97815ad18668bba5fc12d72721c46d742466086afaf95cb26cc81eb05e54caa1c9498a31d0e6476eb5690e81a63d1e77317d090e00cddaabaa9b17d2a24b6
+  metadata.gz: f4f43fbc7f0817edf67cff3d576fbf964b916fca83297c7dae1c60fb367be0b173c273c89a9fd67088a335fa9cb05478fc6bc955518e27406237928b407db714
+  data.tar.gz: 7bd2779a0bc733012a84598fc4492fb9ce8b3e4e62f54c15f81f442a5fb6afcc7b4bd67a129393751252e7f2d990ce6698c3bfde5ebaa510e33e8733d2ab1eaf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modulr-api (0.0.28)
+    modulr-api (0.0.30)
       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

@@ -3,10 +3,10 @@
 module Modulr
   module API
     class PaymentsService < Service
-      def find(id:, **opts)
+      def find(id:)
         response = client.get("/payments", { id: id })
         payment_attributes = response.body[:content]&.first
-        payment_attributes_with_type(id, payment_attributes) if include_transaction?(opts)
+        raise NotFoundError, "Payment #{id} not found" unless payment_attributes
 
         Resources::Payments::Payment.new(response.env[:raw_body], payment_attributes)
       end
@@ -15,19 +15,10 @@ module Modulr
         return find(id: opts[:id]) if opts[:id]
 
         response = client.get("/payments", build_query_params(opts))
-        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)
+        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,
@@ -40,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 = {
@@ -59,48 +48,6 @@ module Modulr
           mapped_params.each { |original, mapped| params[mapped] = opts[original] if opts[original] }
         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/resources/payments/payment.rb

@@ -15,26 +15,28 @@ module Modulr
         map :message, :message
         map :type
 
-        def initialize(raw_response, attributes = {})
+        def initialize(raw_response, attributes = {}, opts = { network_scheme: true })
           super(raw_response, 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)
+          @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)
@@ -48,44 +50,66 @@ 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_attributes(attributes)
-          parse_details(attributes)
-          parse_scheme if type
+        private def parse_attributes
+          parse_details
+          parse_scheme if @opts[:network_scheme]
         end
 
-        private def parse_details(attributes)
-          details = attributes[:details]
-          detail_type = details&.dig(:type) || details&.dig(:destinationType)
+        private def parse_details
+          @attr_details = @attributes[:details]
+          detail_type = @attr_details&.dig(:type) || @attr_details&.dig(:destinationType)
 
           case detail_type
           when "PI_SECT", "PI_SEPA_INST", "PI_FAST", "PI_REV"
-            incoming_detail(details)
+            incoming_detail
           when "ACCOUNT"
-            incoming_internal_details(details)
+            incoming_internal_details
           else
-            outgoing_detail(details)
+            outgoing_detail
           end
         end
 
+        private def payment_type
+          @type = if incoming?
+                    @attr_details[:type]
+                  elsif internal?
+                    "INT_INTERC"
+                  else
+                    outgoing_type
+                  end
+          @type
+        end
+
         private def parse_scheme
-          case type
+          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", "INT_INTERC"
+          when "INT_INTERC"
             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"
@@ -106,16 +130,25 @@ module Modulr
           @scheme = "INTERNAL"
         end
 
-        private def incoming_detail(details)
-          @details = Details::Incoming::General.new(nil, details)
+        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 outgoing_detail(details)
-          @details = Details::Outgoing::General.new(nil, details)
+        private def incoming?
+          !@attr_details.key?(:sourceAccountId)
         end
 
-        private def incoming_internal_details(details)
-          @details = Details::Incoming::Internal.new(nil, details)
+        private def internal?
+          (@attr_details[:sourceAccountId] && @attr_details.key?(:destinationId)) ||
+          @attributes[:schemeInfo].empty?
         end
       end
     end

data/lib/modulr/version.rb

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

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modulr-api
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.30
 platform: ruby
 authors:
 - Aitor García Rey
@@ -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