moneta-api 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af4476441703fca93af4bf5f1e5d36459150144
-  data.tar.gz: e94ffe9d99272fcf29ae6df357af4999bad1c2f8
+  metadata.gz: ed87fefe013e706b8b712df7434f836787ff53e0
+  data.tar.gz: 943705b31f53d4fa4cf01e52c15fa24f5d4c72e1
 SHA512:
-  metadata.gz: 537387b573b5f96846b2d1c1439de4620c8efc7a6866eadbaa715eaf666b585037803214001ed57f2b57135d15829ff78ad13d73d9c814d44ea5b31c5706a2f6
-  data.tar.gz: 700216e219143634cc3a67d078731c08bef9af092725cf4a803971d351e244d1291dffda5e7ce9e07da4ddd094009ed4f9ed9ae89b49cc383db80a7b3c96369c
+  metadata.gz: 37c9f4a0c2882d0c4e4b7c7f07a2eca49a908acdedf6300f82b706b85f44d4050cfbd19ad3bc0434d006ce3596f30e411d734f36dd1a4dcc621f57d8596300a6
+  data.tar.gz: 9083e6b6e54a2fc37acc9ee5360cb0414194d442ffc8136669295d19a92360897cdee38f87b63ec3e3298d28bafcec5f21d704fb381d31a567a1aa42d0e76790

data/lib/moneta/api/data_mapper.rb

@@ -3,51 +3,9 @@ module Moneta
     module DataMapper
       def self.included(base)
         base.extend ClassMethods
-
-        base.class_eval do
-          def fill(data)
-            properties.each do |property, type|
-              value = data[ property ]
-              if value
-                property_value = type.nil? ? value : build_complex_value(type, value)
-                instance_variable_set("@#{ property }", property_value)
-              end
-            end
-
-            self
-          end
-
-          def to_hash
-            properties.each_with_object({}) do |(property, _), hash|
-              value = send(property)
-              unless value.nil?
-                hash[ property.to_s.classify_with_lower ] = to_hash_complex_value(value)
-              end
-            end
-          end
-
-          private
-
-          def build_complex_value(type, value)
-            value.kind_of?(Array) ?
-              value.map { |v| type.build(v) } :
-              type.build(value)
-          end
-
-          def to_hash_complex_value(value)
-            if value.kind_of?(Array)
-              value.map(&:to_hash)
-            elsif value.respond_to?(:to_hash)
-              value.to_hash
-            else
-              value
-            end
-          end
-        end
       end
 
       module ClassMethods
-
         def property(name, type: nil, read_only: false)
           generate_accessors(name, read_only)
 
@@ -81,6 +39,45 @@ module Moneta
           attr_writer(name) unless read_only
         end
       end
+
+      def fill(data)
+        properties.each do |property, type|
+          value = data[ property ]
+          if value
+            property_value = type.nil? ? value : build_complex_value(type, value)
+            instance_variable_set("@#{ property }", property_value)
+          end
+        end
+
+        self
+      end
+
+      def to_hash
+        properties.each_with_object({}) do |(property, _), hash|
+          value = send(property)
+          unless value.nil?
+            hash[ property.to_s.classify_with_lower ] = to_hash_complex_value(value)
+          end
+        end
+      end
+
+      private
+
+      def build_complex_value(type, value)
+        value.kind_of?(Array) ?
+            value.map { |v| type.build(v) } :
+            type.build(value)
+      end
+
+      def to_hash_complex_value(value)
+        if value.kind_of?(Array)
+          value.map(&:to_hash)
+        elsif value.respond_to?(:to_hash)
+          value.to_hash
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/moneta/api/key_value_serializer.rb

@@ -1,15 +1,23 @@
 module Moneta
   module Api
     class KeyValueSerializer
-      def self.serialize(entity)
-        attributes = entity.properties
+      class << self
+        def serialize(entity)
+          attributes = entity.properties
 
-        attributes.collect do |property, _|
-          value = entity.public_send(property)
-          key = property.to_s.swapcase
+          attributes.collect do |property, _|
+            value = entity.public_send(property)
+            key = property.to_s.swapcase
 
-          { 'key' => key, 'value' => value } unless value.nil?
-        end.compact
+            { 'key' => key, 'value' => value } unless value.nil?
+          end.compact
+        end
+
+        def deserialize(attributes)
+          attributes.each_with_object({}) do |attribute, hash|
+            hash[attribute[:key].to_sym] = attribute.tap { |a| a.delete(:key) }
+          end
+        end
       end
     end
   end

data/lib/moneta/api/requests/find_bank_accounts_request.rb

@@ -0,0 +1,16 @@
+module Moneta
+  module Api
+    module Requests
+
+      # Запрос на получение банковских реквизитов по ID пользователя. Если данные не найдены, возвращается пустой список.
+      # Request for bank account details by a user ID. MONETA.RU returns an empty list if it cannot find bank account details.
+      class FindBankAccountsRequest
+        include Moneta::Api::DataMapper
+
+        # @return [Integer] ID пользователя в системе МОНЕТА.РУ. Если это поле не задано, то используется текущий пользователь.
+        #   User ID. If you omit this element, MONETA.RU uses the ID of the user who sends the request.
+        property :unit_id
+      end
+    end
+  end
+end

data/lib/moneta/api/requests/get_profile_info_request.rb

@@ -0,0 +1,19 @@
+module Moneta
+  module Api
+    module Requests
+      # Запрос на получение данных пользователя по ID пользователя.
+      # Если данные не найдены, возникает Exception.
+      # Request for profile information by a MONETA.RU user ID.
+      # If MONETA.RU finds no information about the specified user, an error occurs.
+      class GetProfileInfoRequest
+        include Moneta::Api::DataMapper
+
+        # @return [Integer] ID пользователя в системе МОНЕТА.РУ.
+        #    Если это поле не задано, то используется текущий пользователь.
+        #    MONETA.RU user ID.
+        #    If you omit this element, MONETA.RU uses the ID of the user who sends this request.
+        property :unit_id
+      end
+    end
+  end
+end

data/lib/moneta/api/responses/bank_account_info.rb

@@ -0,0 +1,12 @@
+module Moneta
+  module Api
+    module Responses
+      class BankAccountInfo < KeyValueResponse
+
+        # @return [Integer] ID счета.
+        #   Bank account ID.
+        property :id
+      end
+    end
+  end
+end

data/lib/moneta/api/responses/find_bank_accounts_response.rb

@@ -0,0 +1,17 @@
+module Moneta
+  module Api
+    module Responses
+      class FindBankAccountsResponse
+        include Moneta::Api::DataMapper
+
+        # Ответ, который содержит список банковских счетов.
+        # Bank Accounts searching response containing the list of bank accounts.
+        property :bank_account, type: BankAccountInfo
+
+        def get_account(number)
+          bank_account.detect { |account| account.id == number.to_s }
+        end
+      end
+    end
+  end
+end

data/lib/moneta/api/responses/get_profile_info_response.rb

@@ -0,0 +1,7 @@
+module Moneta
+  module Api
+    module Responses
+      class GetProfileInfoResponse < KeyValueResponse; end
+    end
+  end
+end

data/lib/moneta/api/responses/key_value_response.rb

@@ -0,0 +1,17 @@
+module Moneta
+  module Api
+    module Responses
+      class KeyValueResponse
+        include Moneta::Api::DataMapper
+
+        property :attribute, read_only: true
+
+        def fill(attributes)
+          @attribute = KeyValueSerializer.deserialize(attributes.delete(:attribute))
+          super
+          self
+        end
+      end
+    end
+  end
+end

data/lib/moneta/api/service_methods.rb

@@ -163,6 +163,18 @@ module Moneta
         call(__method__, request)
       end
 
+      # @param [Moneta::Api::Requests::GetProfileInfoRequest]
+      # @return [Moneta::Api::Responses::GetProfileInfoResponse]
+      def get_profile_info(request)
+        call(__method__, request)
+      end
+
+      # @param [Moneta::Api::Requests::FindBankAccountsRequest]
+      # @return [Moneta::Api::Responses::FindBankAccountsResponse]
+      def find_bank_accounts(request)
+        call(__method__, request)
+      end
+
       private
 
       def call(method, request)

data/lib/moneta/api/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   module Api
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/moneta/api.rb

@@ -7,93 +7,99 @@ require 'moneta/api/service'
 require 'moneta/api/data_mapper'
 require 'moneta/api/key_value_serializer'
 
-require 'moneta/api/types/account_access_info.rb'
-require 'moneta/api/types/account_info.rb'
-require 'moneta/api/types/authorise_transaction_batch_request_type.rb'
-require 'moneta/api/types/authorise_transaction_request_type.rb'
-require 'moneta/api/types/cancel_transaction_batch_request_type.rb'
-require 'moneta/api/types/cancel_transaction_batch_response_type.rb'
-require 'moneta/api/types/cancel_transaction_request_type.rb'
-require 'moneta/api/types/cancel_transaction_response_type.rb'
-require 'moneta/api/types/confirm_transaction_batch_request_type.rb'
-require 'moneta/api/types/confirm_transaction_request_type.rb'
-require 'moneta/api/types/entity.rb'
-require 'moneta/api/types/hash_entity.rb'
-require 'moneta/api/types/key_value_entity.rb'
-require 'moneta/api/types/find_operations_list_request_filter.rb'
-require 'moneta/api/types/forecast_transaction_response_type.rb'
-require 'moneta/api/types/invoice_batch_request_type.rb'
-require 'moneta/api/types/invoice_request_type.rb'
-require 'moneta/api/types/key_value_attribute.rb'
-require 'moneta/api/types/operation_info.rb'
-require 'moneta/api/types/operation_info_batch_response_type.rb'
-require 'moneta/api/types/operation_info_list.rb'
-require 'moneta/api/types/pager.rb'
-require 'moneta/api/types/payment_request_type.rb'
-require 'moneta/api/types/transaction_batch_response_type.rb'
-require 'moneta/api/types/transaction_request_type.rb'
-require 'moneta/api/types/transaction_response_type.rb'
-require 'moneta/api/types/verify_transaction_response_type.rb'
-require 'moneta/api/types/verify_transfer_response_type.rb'
+require 'moneta/api/types/account_access_info'
+require 'moneta/api/types/account_info'
+require 'moneta/api/types/authorise_transaction_batch_request_type'
+require 'moneta/api/types/authorise_transaction_request_type'
+require 'moneta/api/types/cancel_transaction_batch_request_type'
+require 'moneta/api/types/cancel_transaction_batch_response_type'
+require 'moneta/api/types/cancel_transaction_request_type'
+require 'moneta/api/types/cancel_transaction_response_type'
+require 'moneta/api/types/confirm_transaction_batch_request_type'
+require 'moneta/api/types/confirm_transaction_request_type'
+require 'moneta/api/types/entity'
+require 'moneta/api/types/hash_entity'
+require 'moneta/api/types/key_value_entity'
+require 'moneta/api/types/find_operations_list_request_filter'
+require 'moneta/api/types/forecast_transaction_response_type'
+require 'moneta/api/types/invoice_batch_request_type'
+require 'moneta/api/types/invoice_request_type'
+require 'moneta/api/types/key_value_attribute'
+require 'moneta/api/types/operation_info'
+require 'moneta/api/types/operation_info_batch_response_type'
+require 'moneta/api/types/operation_info_list'
+require 'moneta/api/types/pager'
+require 'moneta/api/types/payment_request_type'
+require 'moneta/api/types/transaction_batch_response_type'
+require 'moneta/api/types/transaction_request_type'
+require 'moneta/api/types/transaction_response_type'
+require 'moneta/api/types/verify_transaction_response_type'
+require 'moneta/api/types/verify_transfer_response_type'
 require 'moneta/api/types/bank_account_type'
 require 'moneta/api/types/profile/client'
 require 'moneta/api/types/profile/organization'
 
-require 'moneta/api/requests/authorise_transaction_batch_request.rb'
-require 'moneta/api/requests/authorise_transaction_request.rb'
-require 'moneta/api/requests/cancel_transaction_batch_request.rb'
-require 'moneta/api/requests/cancel_transaction_request.rb'
-require 'moneta/api/requests/confirm_transaction_batch_request.rb'
-require 'moneta/api/requests/confirm_transaction_request.rb'
-require 'moneta/api/requests/create_account_request.rb'
-require 'moneta/api/requests/find_accounts_list_request.rb'
-require 'moneta/api/requests/find_last_operations_list_request.rb'
-require 'moneta/api/requests/find_operations_list_request.rb'
-require 'moneta/api/requests/forecast_transaction_request.rb'
-require 'moneta/api/requests/get_account_payment_password_challenge_request.rb'
-require 'moneta/api/requests/invoice_batch_request.rb'
-require 'moneta/api/requests/invoice_request.rb'
-require 'moneta/api/requests/payment_request.rb'
-require 'moneta/api/requests/refund_request.rb'
-require 'moneta/api/requests/transfer_request.rb'
-require 'moneta/api/requests/verify_payment_request.rb'
-require 'moneta/api/requests/verify_transaction_request.rb'
-require 'moneta/api/requests/verify_transfer_request.rb'
+require 'moneta/api/requests/authorise_transaction_batch_request'
+require 'moneta/api/requests/authorise_transaction_request'
+require 'moneta/api/requests/cancel_transaction_batch_request'
+require 'moneta/api/requests/cancel_transaction_request'
+require 'moneta/api/requests/confirm_transaction_batch_request'
+require 'moneta/api/requests/confirm_transaction_request'
+require 'moneta/api/requests/create_account_request'
+require 'moneta/api/requests/find_accounts_list_request'
+require 'moneta/api/requests/find_last_operations_list_request'
+require 'moneta/api/requests/find_operations_list_request'
+require 'moneta/api/requests/forecast_transaction_request'
+require 'moneta/api/requests/get_account_payment_password_challenge_request'
+require 'moneta/api/requests/invoice_batch_request'
+require 'moneta/api/requests/invoice_request'
+require 'moneta/api/requests/payment_request'
+require 'moneta/api/requests/refund_request'
+require 'moneta/api/requests/transfer_request'
+require 'moneta/api/requests/verify_payment_request'
+require 'moneta/api/requests/verify_transaction_request'
+require 'moneta/api/requests/verify_transfer_request'
 require 'moneta/api/requests/create_profile_request'
 require 'moneta/api/requests/edit_profile_request'
 require 'moneta/api/requests/create_bank_account_request'
 require 'moneta/api/requests/edit_bank_account_request'
+require 'moneta/api/requests/get_profile_info_request'
+require 'moneta/api/requests/find_bank_accounts_request'
 require 'moneta/api/requests/profile/create_client_profile_request'
 require 'moneta/api/requests/profile/edit_client_profile_request'
 require 'moneta/api/requests/profile/create_organization_profile_request'
 require 'moneta/api/requests/profile/edit_organization_profile_request'
 
-require 'moneta/api/responses/authorise_transaction_batch_response.rb'
-require 'moneta/api/responses/authorise_transaction_response.rb'
-require 'moneta/api/responses/cancel_transaction_batch_response.rb'
-require 'moneta/api/responses/cancel_transaction_response.rb'
-require 'moneta/api/responses/confirm_transaction_batch_response.rb'
-require 'moneta/api/responses/confirm_transaction_response.rb'
-require 'moneta/api/responses/create_account_response.rb'
-require 'moneta/api/responses/find_account_by_alias_response.rb'
-require 'moneta/api/responses/find_account_by_id_response.rb'
-require 'moneta/api/responses/find_accounts_list_response.rb'
-require 'moneta/api/responses/find_last_operations_list_response.rb'
-require 'moneta/api/responses/find_operations_list_response.rb'
-require 'moneta/api/responses/forecast_transaction_response.rb'
-require 'moneta/api/responses/get_account_payment_password_challenge_response.rb'
-require 'moneta/api/responses/get_operation_details_by_id_response.rb'
-require 'moneta/api/responses/invoice_batch_response.rb'
-require 'moneta/api/responses/invoice_response.rb'
-require 'moneta/api/responses/payment_response.rb'
-require 'moneta/api/responses/refund_response.rb'
-require 'moneta/api/responses/transfer_response.rb'
-require 'moneta/api/responses/verify_payment_response.rb'
-require 'moneta/api/responses/verify_transaction_response.rb'
-require 'moneta/api/responses/verify_transfer_response.rb'
-require 'moneta/api/responses/create_profile_response.rb'
-require 'moneta/api/responses/edit_profile_response.rb'
-require 'moneta/api/responses/create_bank_account_response.rb'
-require 'moneta/api/responses/edit_bank_account_response.rb'
+require 'moneta/api/responses/key_value_response'
+require 'moneta/api/responses/bank_account_info'
+require 'moneta/api/responses/authorise_transaction_batch_response'
+require 'moneta/api/responses/authorise_transaction_response'
+require 'moneta/api/responses/cancel_transaction_batch_response'
+require 'moneta/api/responses/cancel_transaction_response'
+require 'moneta/api/responses/confirm_transaction_batch_response'
+require 'moneta/api/responses/confirm_transaction_response'
+require 'moneta/api/responses/create_account_response'
+require 'moneta/api/responses/find_account_by_alias_response'
+require 'moneta/api/responses/find_account_by_id_response'
+require 'moneta/api/responses/find_accounts_list_response'
+require 'moneta/api/responses/find_last_operations_list_response'
+require 'moneta/api/responses/find_operations_list_response'
+require 'moneta/api/responses/forecast_transaction_response'
+require 'moneta/api/responses/get_account_payment_password_challenge_response'
+require 'moneta/api/responses/get_operation_details_by_id_response'
+require 'moneta/api/responses/invoice_batch_response'
+require 'moneta/api/responses/invoice_response'
+require 'moneta/api/responses/payment_response'
+require 'moneta/api/responses/refund_response'
+require 'moneta/api/responses/transfer_response'
+require 'moneta/api/responses/verify_payment_response'
+require 'moneta/api/responses/verify_transaction_response'
+require 'moneta/api/responses/verify_transfer_response'
+require 'moneta/api/responses/create_profile_response'
+require 'moneta/api/responses/edit_profile_response'
+require 'moneta/api/responses/create_bank_account_response'
+require 'moneta/api/responses/edit_bank_account_response'
+require 'moneta/api/responses/get_profile_info_response'
+require 'moneta/api/responses/find_bank_accounts_response'
 
 require 'moneta/api/response_factory'

data/spec/lib/moneta/api/requests/find_bank_accounts_request_spec.rb

@@ -0,0 +1,29 @@
+describe Moneta::Api::Requests::FindBankAccountsRequest, vcr: true do
+  include_context 'moneta'
+
+  let(:request) { described_class.new }
+  let(:response) { service.find_bank_accounts(request) }
+
+  before { request.fill({}) }
+
+  subject { response.bank_account }
+
+  its(:count) { is_expected.to eq 2 }
+
+  describe 'first account' do
+    let(:bank_account) { response.get_account(1182) }
+    subject { bank_account }
+
+    its(:id) { is_expected.to eq '1182' }
+
+    describe '.attribute' do
+      subject { bank_account.attribute }
+
+      its([:bank]) { is_expected.to eq(value: 'ФИЛИАЛ "БАЙКОНУР" ОАО "СОБИНБАНК"', approved: false) }
+      its([:account]) { is_expected.to eq(value: '30301810000006000001', approved: false) }
+      its([:bik]) { is_expected.to eq(value: '044525225', approved: false) }
+      its([:corr_account]) { is_expected.to eq(value: '30101810400000000225', approved: false) }
+      its([:is_international]) { is_expected.to eq(value: false, approved: false) }
+    end
+  end
+end

data/spec/lib/moneta/api/requests/get_profile_info_request_spec.rb

@@ -0,0 +1,19 @@
+describe Moneta::Api::Requests::GetProfileInfoRequest, vcr: true do
+  include_context 'moneta'
+
+  let(:unit_id) { 42868 }
+  let(:request) { described_class.new }
+  let(:response) { service.get_profile_info(request) }
+  let(:params) { { unit_id: unit_id } }
+
+  before { request.fill(params) }
+
+  subject { response.attribute }
+
+  its([:last_name]) { is_expected.to eq(value: 'Мономах', approved: false) }
+  its([:first_name]) { is_expected.to eq(value: 'Владимир', approved: false) }
+  its([:timezone]) { is_expected.to eq(value: 'Europe/Moscow', approved: false) }
+  its([:profileType]) { is_expected.to eq(value: 'client', approved: false) }
+  its([:name]) { is_expected.to eq(value: 'Мономах Владимир', approved: false) }
+  its([:unitid]) { is_expected.to eq(value: '42868', approved: false) }
+end