yoomoney 0.4.0 → 0.5.0

data/lib/yoomoney/resources/personal_data.rb

@@ -3,25 +3,14 @@
 module Yoomoney
   module Resources
     class PersonalData
-      # Some parameter documentations has been truncated, see
-      # {Yoomoney::Models::PersonalDataCreateParams} for more details.
-      #
       # Создание персональных данных
       #
-      # @overload create(first_name:, last_name:, type:, idempotence_key:, metadata: nil, middle_name: nil, request_options: {})
-      #
-      # @param first_name [String] Body param: Имя.
-      #
-      # @param last_name [String] Body param: Фамилия.
+      # @overload create(body:, idempotence_key:, request_options: {})
       #
-      # @param type [Symbol, Yoomoney::Models::PersonalDataType] Body param: Тип персональных данных.
+      # @param body [Yoomoney::Models::PersonalDataCreateParams::Body::SbpPayoutRecipientPersonalDataRequest, Yoomoney::Models::PersonalDataCreateParams::Body::PayoutStatementRecipientPersonalDataRequest] Body param
       #
       # @param idempotence_key [String] Header param
       #
-      # @param metadata [Hash{Symbol=>String}] Body param: Любые дополнительные данные, которые нужны вам для работы (например,
-      #
-      # @param middle_name [String] Body param: Отчество.
-      #
       # @param request_options [Yoomoney::RequestOptions, Hash{Symbol=>Object}, nil]
       #
       # @return [Yoomoney::Models::PersonalDataAPI]
@@ -29,12 +18,11 @@ module Yoomoney
       # @see Yoomoney::Models::PersonalDataCreateParams
       def create(params)
         parsed, options = Yoomoney::PersonalDataCreateParams.dump_request(params)
-        header_params = {idempotence_key: "idempotence-key"}
         @client.request(
           method: :post,
           path: "personal_data",
-          headers: parsed.slice(*header_params.keys).transform_keys(header_params),
-          body: parsed.except(*header_params.keys),
+          headers: parsed.except(:body).transform_keys(idempotence_key: "idempotence-key"),
+          body: parsed[:body],
           model: Yoomoney::PersonalDataAPI,
           options: options
         )

data/lib/yoomoney/resources/receipts.rb

@@ -91,10 +91,11 @@ module Yoomoney
       # @see Yoomoney::Models::ReceiptListParams
       def list(params = {})
         parsed, options = Yoomoney::ReceiptListParams.dump_request(params)
+        query = Yoomoney::Internal::Util.encode_query_params(parsed)
         @client.request(
           method: :get,
           path: "receipts",
-          query: parsed,
+          query: query,
           model: Yoomoney::Models::ReceiptListResponse,
           options: options
         )

data/lib/yoomoney/resources/refunds.rb

@@ -81,10 +81,11 @@ module Yoomoney
       # @see Yoomoney::Models::RefundListParams
       def list(params = {})
         parsed, options = Yoomoney::RefundListParams.dump_request(params)
+        query = Yoomoney::Internal::Util.encode_query_params(parsed)
         @client.request(
           method: :get,
           path: "refunds",
-          query: parsed,
+          query: query,
           model: Yoomoney::Models::RefundListResponse,
           options: options
         )

data/lib/yoomoney/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yoomoney
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/yoomoney.rb

@@ -63,6 +63,7 @@ require_relative "yoomoney/models/payment_method_data"
 require_relative "yoomoney/models/confirmation_data"
 require_relative "yoomoney/models/payout_destination"
 require_relative "yoomoney/models/payout_destination_data"
+require_relative "yoomoney/models/personal_data_request"
 require_relative "yoomoney/models/receipt_item_supplier"
 require_relative "yoomoney/models/refund_method"
 require_relative "yoomoney/models/airline"
@@ -118,7 +119,6 @@ require_relative "yoomoney/models/payouts_list"
 require_relative "yoomoney/models/payout_status"
 require_relative "yoomoney/models/personal_data"
 require_relative "yoomoney/models/personal_data_create_params"
-require_relative "yoomoney/models/personal_data_request"
 require_relative "yoomoney/models/personal_data_retrieve_params"
 require_relative "yoomoney/models/personal_data_type"
 require_relative "yoomoney/models/receipt"

data/rbi/yoomoney/internal/util.rbi

@@ -148,12 +148,20 @@ module Yoomoney
         end
       end
 
+      # https://www.rfc-editor.org/rfc/rfc3986.html#section-3.3
+      RFC_3986_NOT_PCHARS = T.let(/[^A-Za-z0-9\-._~!$&'()*+,;=:@]+/, Regexp)
+
       class << self
         # @api private
         sig { params(uri: URI::Generic).returns(String) }
         def uri_origin(uri)
         end
 
+        # @api private
+        sig { params(path: T.any(String, Integer)).returns(String) }
+        def encode_path(path)
+        end
+
         # @api private
         sig { params(path: T.any(String, T::Array[String])).returns(String) }
         def interpolate_path(path)
@@ -301,6 +309,26 @@ module Yoomoney
         T.let(%r{^application/(:?x-(?:n|l)djson)|(:?(?:x-)?jsonl)}, Regexp)
 
       class << self
+        # @api private
+        sig do
+          params(query: Yoomoney::Internal::AnyHash).returns(
+            Yoomoney::Internal::AnyHash
+          )
+        end
+        def encode_query_params(query)
+        end
+
+        # @api private
+        sig do
+          params(
+            collection: Yoomoney::Internal::AnyHash,
+            key: String,
+            element: T.anything
+          ).void
+        end
+        private def write_query_param_element!(collection, key, element)
+        end
+
         # @api private
         sig do
           params(

data/rbi/yoomoney/models/deal_retrieve_params.rbi

@@ -11,15 +11,23 @@ module Yoomoney
           T.any(Yoomoney::DealRetrieveParams, Yoomoney::Internal::AnyHash)
         end
 
+      sig { returns(String) }
+      attr_accessor :deal_id
+
       sig do
-        params(request_options: Yoomoney::RequestOptions::OrHash).returns(
-          T.attached_class
-        )
+        params(
+          deal_id: String,
+          request_options: Yoomoney::RequestOptions::OrHash
+        ).returns(T.attached_class)
       end
-      def self.new(request_options: {})
+      def self.new(deal_id:, request_options: {})
       end
 
-      sig { override.returns({ request_options: Yoomoney::RequestOptions }) }
+      sig do
+        override.returns(
+          { deal_id: String, request_options: Yoomoney::RequestOptions }
+        )
+      end
       def to_hash
       end
     end

data/rbi/yoomoney/models/invoice_retrieve_params.rbi

@@ -11,15 +11,23 @@ module Yoomoney
           T.any(Yoomoney::InvoiceRetrieveParams, Yoomoney::Internal::AnyHash)
         end
 
+      sig { returns(String) }
+      attr_accessor :invoice_id
+
       sig do
-        params(request_options: Yoomoney::RequestOptions::OrHash).returns(
-          T.attached_class
-        )
+        params(
+          invoice_id: String,
+          request_options: Yoomoney::RequestOptions::OrHash
+        ).returns(T.attached_class)
       end
-      def self.new(request_options: {})
+      def self.new(invoice_id:, request_options: {})
       end
 
-      sig { override.returns({ request_options: Yoomoney::RequestOptions }) }
+      sig do
+        override.returns(
+          { invoice_id: String, request_options: Yoomoney::RequestOptions }
+        )
+      end
       def to_hash
       end
     end

data/rbi/yoomoney/models/payment_cancel_params.rbi

@@ -11,21 +11,29 @@ module Yoomoney
           T.any(Yoomoney::PaymentCancelParams, Yoomoney::Internal::AnyHash)
         end
 
+      sig { returns(String) }
+      attr_accessor :payment_id
+
       sig { returns(String) }
       attr_accessor :idempotence_key
 
       sig do
         params(
+          payment_id: String,
           idempotence_key: String,
           request_options: Yoomoney::RequestOptions::OrHash
         ).returns(T.attached_class)
       end
-      def self.new(idempotence_key:, request_options: {})
+      def self.new(payment_id:, idempotence_key:, request_options: {})
       end
 
       sig do
         override.returns(
-          { idempotence_key: String, request_options: Yoomoney::RequestOptions }
+          {
+            payment_id: String,
+            idempotence_key: String,
+            request_options: Yoomoney::RequestOptions
+          }
         )
       end
       def to_hash

data/rbi/yoomoney/models/payment_capture_params.rbi

@@ -11,6 +11,9 @@ module Yoomoney
           T.any(Yoomoney::PaymentCaptureParams, Yoomoney::Internal::AnyHash)
         end
 
+      sig { returns(String) }
+      attr_accessor :payment_id
+
       sig { returns(String) }
       attr_accessor :idempotence_key
 
@@ -51,6 +54,7 @@ module Yoomoney
 
       sig do
         params(
+          payment_id: String,
           idempotence_key: String,
           airline: Yoomoney::Airline::OrHash,
           amount: Yoomoney::MonetaryAmount::OrHash,
@@ -61,6 +65,7 @@ module Yoomoney
         ).returns(T.attached_class)
       end
       def self.new(
+        payment_id:,
         idempotence_key:,
         # Данные для продажи авиабилетов.
         airline: nil,
@@ -79,6 +84,7 @@ module Yoomoney
       sig do
         override.returns(
           {
+            payment_id: String,
             idempotence_key: String,
             airline: Yoomoney::Airline,
             amount: Yoomoney::MonetaryAmount,

data/rbi/yoomoney/models/payment_method_retrieve_params.rbi

@@ -14,15 +14,26 @@ module Yoomoney
           )
         end
 
+      sig { returns(String) }
+      attr_accessor :payment_method_id
+
       sig do
-        params(request_options: Yoomoney::RequestOptions::OrHash).returns(
-          T.attached_class
-        )
+        params(
+          payment_method_id: String,
+          request_options: Yoomoney::RequestOptions::OrHash
+        ).returns(T.attached_class)
       end
-      def self.new(request_options: {})
+      def self.new(payment_method_id:, request_options: {})
       end
 
-      sig { override.returns({ request_options: Yoomoney::RequestOptions }) }
+      sig do
+        override.returns(
+          {
+            payment_method_id: String,
+            request_options: Yoomoney::RequestOptions
+          }
+        )
+      end
       def to_hash
       end
     end

data/rbi/yoomoney/models/payment_retrieve_params.rbi

@@ -11,15 +11,23 @@ module Yoomoney
           T.any(Yoomoney::PaymentRetrieveParams, Yoomoney::Internal::AnyHash)
         end
 
+      sig { returns(String) }
+      attr_accessor :payment_id
+
       sig do
-        params(request_options: Yoomoney::RequestOptions::OrHash).returns(
-          T.attached_class
-        )
+        params(
+          payment_id: String,
+          request_options: Yoomoney::RequestOptions::OrHash
+        ).returns(T.attached_class)
       end
-      def self.new(request_options: {})
+      def self.new(payment_id:, request_options: {})
       end
 
-      sig { override.returns({ request_options: Yoomoney::RequestOptions }) }
+      sig do
+        override.returns(
+          { payment_id: String, request_options: Yoomoney::RequestOptions }
+        )
+      end
       def to_hash
       end
     end

data/rbi/yoomoney/models/payout_retrieve_params.rbi

@@ -11,15 +11,23 @@ module Yoomoney
           T.any(Yoomoney::PayoutRetrieveParams, Yoomoney::Internal::AnyHash)
         end
 
+      sig { returns(String) }
+      attr_accessor :payout_id
+
       sig do
-        params(request_options: Yoomoney::RequestOptions::OrHash).returns(
-          T.attached_class
-        )
+        params(
+          payout_id: String,
+          request_options: Yoomoney::RequestOptions::OrHash
+        ).returns(T.attached_class)
       end
-      def self.new(request_options: {})
+      def self.new(payout_id:, request_options: {})
       end
 
-      sig { override.returns({ request_options: Yoomoney::RequestOptions }) }
+      sig do
+        override.returns(
+          { payout_id: String, request_options: Yoomoney::RequestOptions }
+        )
+      end
       def to_hash
       end
     end

data/rbi/yoomoney/models/personal_data_create_params.rbi

@@ -11,83 +11,168 @@ module Yoomoney
           T.any(Yoomoney::PersonalDataCreateParams, Yoomoney::Internal::AnyHash)
         end
 
-      # Имя.
-      sig { returns(String) }
-      attr_accessor :first_name
-
-      # Фамилия.
-      sig { returns(String) }
-      attr_accessor :last_name
-
-      # Тип персональных данных.
-      sig { returns(Yoomoney::PersonalDataType::OrSymbol) }
-      attr_accessor :type
+      sig do
+        returns(
+          T.any(
+            Yoomoney::PersonalDataCreateParams::Body::SbpPayoutRecipientPersonalDataRequest,
+            Yoomoney::PersonalDataCreateParams::Body::PayoutStatementRecipientPersonalDataRequest
+          )
+        )
+      end
+      attr_accessor :body
 
       sig { returns(String) }
       attr_accessor :idempotence_key
 
-      # Любые дополнительные данные, которые нужны вам для работы (например, номер
-      # заказа). Передаются в виде набора пар «ключ-значение» и возвращаются в ответе от
-      # ЮKassa. Ограничения: максимум 16 ключей, имя ключа не больше 32 символов,
-      # значение ключа не больше 512 символов, тип данных — строка в формате UTF-8.
-      sig { returns(T.nilable(T::Hash[Symbol, String])) }
-      attr_reader :metadata
-
-      sig { params(metadata: T::Hash[Symbol, String]).void }
-      attr_writer :metadata
-
-      # Отчество.
-      sig { returns(T.nilable(String)) }
-      attr_reader :middle_name
-
-      sig { params(middle_name: String).void }
-      attr_writer :middle_name
-
       sig do
         params(
-          first_name: String,
-          last_name: String,
-          type: Yoomoney::PersonalDataType::OrSymbol,
+          body:
+            T.any(
+              Yoomoney::PersonalDataCreateParams::Body::SbpPayoutRecipientPersonalDataRequest::OrHash,
+              Yoomoney::PersonalDataCreateParams::Body::PayoutStatementRecipientPersonalDataRequest::OrHash
+            ),
           idempotence_key: String,
-          metadata: T::Hash[Symbol, String],
-          middle_name: String,
           request_options: Yoomoney::RequestOptions::OrHash
         ).returns(T.attached_class)
       end
-      def self.new(
-        # Имя.
-        first_name:,
-        # Фамилия.
-        last_name:,
-        # Тип персональных данных.
-        type:,
-        idempotence_key:,
-        # Любые дополнительные данные, которые нужны вам для работы (например, номер
-        # заказа). Передаются в виде набора пар «ключ-значение» и возвращаются в ответе от
-        # ЮKassa. Ограничения: максимум 16 ключей, имя ключа не больше 32 символов,
-        # значение ключа не больше 512 символов, тип данных — строка в формате UTF-8.
-        metadata: nil,
-        # Отчество.
-        middle_name: nil,
-        request_options: {}
-      )
+      def self.new(body:, idempotence_key:, request_options: {})
       end
 
       sig do
         override.returns(
           {
-            first_name: String,
-            last_name: String,
-            type: Yoomoney::PersonalDataType::OrSymbol,
+            body:
+              T.any(
+                Yoomoney::PersonalDataCreateParams::Body::SbpPayoutRecipientPersonalDataRequest,
+                Yoomoney::PersonalDataCreateParams::Body::PayoutStatementRecipientPersonalDataRequest
+              ),
             idempotence_key: String,
-            metadata: T::Hash[Symbol, String],
-            middle_name: String,
             request_options: Yoomoney::RequestOptions
           }
         )
       end
       def to_hash
       end
+
+      module Body
+        extend Yoomoney::Internal::Type::Union
+
+        Variants =
+          T.type_alias do
+            T.any(
+              Yoomoney::PersonalDataCreateParams::Body::SbpPayoutRecipientPersonalDataRequest,
+              Yoomoney::PersonalDataCreateParams::Body::PayoutStatementRecipientPersonalDataRequest
+            )
+          end
+
+        class SbpPayoutRecipientPersonalDataRequest < Yoomoney::Models::PersonalDataRequest
+          OrHash =
+            T.type_alias do
+              T.any(
+                Yoomoney::PersonalDataCreateParams::Body::SbpPayoutRecipientPersonalDataRequest,
+                Yoomoney::Internal::AnyHash
+              )
+            end
+
+          # Имя.
+          sig { returns(String) }
+          attr_accessor :first_name
+
+          # Фамилия.
+          sig { returns(String) }
+          attr_accessor :last_name
+
+          # Отчество.
+          sig { returns(T.nilable(String)) }
+          attr_reader :middle_name
+
+          sig { params(middle_name: String).void }
+          attr_writer :middle_name
+
+          sig do
+            params(
+              first_name: String,
+              last_name: String,
+              middle_name: String
+            ).returns(T.attached_class)
+          end
+          def self.new(
+            # Имя.
+            first_name:,
+            # Фамилия.
+            last_name:,
+            # Отчество.
+            middle_name: nil
+          )
+          end
+
+          sig do
+            override.returns(
+              { first_name: String, last_name: String, middle_name: String }
+            )
+          end
+          def to_hash
+          end
+        end
+
+        class PayoutStatementRecipientPersonalDataRequest < Yoomoney::Models::PersonalDataRequest
+          OrHash =
+            T.type_alias do
+              T.any(
+                Yoomoney::PersonalDataCreateParams::Body::PayoutStatementRecipientPersonalDataRequest,
+                Yoomoney::Internal::AnyHash
+              )
+            end
+
+          # Имя.
+          sig { returns(String) }
+          attr_accessor :first_name
+
+          # Фамилия.
+          sig { returns(String) }
+          attr_accessor :last_name
+
+          # Отчество.
+          sig { returns(T.nilable(String)) }
+          attr_reader :middle_name
+
+          sig { params(middle_name: String).void }
+          attr_writer :middle_name
+
+          sig do
+            params(
+              first_name: String,
+              last_name: String,
+              middle_name: String
+            ).returns(T.attached_class)
+          end
+          def self.new(
+            # Имя.
+            first_name:,
+            # Фамилия.
+            last_name:,
+            # Отчество.
+            middle_name: nil
+          )
+          end
+
+          sig do
+            override.returns(
+              { first_name: String, last_name: String, middle_name: String }
+            )
+          end
+          def to_hash
+          end
+        end
+
+        sig do
+          override.returns(
+            T::Array[Yoomoney::PersonalDataCreateParams::Body::Variants]
+          )
+        end
+        def self.variants
+        end
+      end
     end
   end
 end

data/rbi/yoomoney/models/personal_data_retrieve_params.rbi

@@ -14,15 +14,26 @@ module Yoomoney
           )
         end
 
+      sig { returns(String) }
+      attr_accessor :personal_data_id
+
       sig do
-        params(request_options: Yoomoney::RequestOptions::OrHash).returns(
-          T.attached_class
-        )
+        params(
+          personal_data_id: String,
+          request_options: Yoomoney::RequestOptions::OrHash
+        ).returns(T.attached_class)
       end
-      def self.new(request_options: {})
+      def self.new(personal_data_id:, request_options: {})
       end
 
-      sig { override.returns({ request_options: Yoomoney::RequestOptions }) }
+      sig do
+        override.returns(
+          {
+            personal_data_id: String,
+            request_options: Yoomoney::RequestOptions
+          }
+        )
+      end
       def to_hash
       end
     end

data/rbi/yoomoney/models/receipt_retrieve_params.rbi

@@ -11,15 +11,23 @@ module Yoomoney
           T.any(Yoomoney::ReceiptRetrieveParams, Yoomoney::Internal::AnyHash)
         end
 
+      sig { returns(String) }
+      attr_accessor :receipt_id
+
       sig do
-        params(request_options: Yoomoney::RequestOptions::OrHash).returns(
-          T.attached_class
-        )
+        params(
+          receipt_id: String,
+          request_options: Yoomoney::RequestOptions::OrHash
+        ).returns(T.attached_class)
       end
-      def self.new(request_options: {})
+      def self.new(receipt_id:, request_options: {})
       end
 
-      sig { override.returns({ request_options: Yoomoney::RequestOptions }) }
+      sig do
+        override.returns(
+          { receipt_id: String, request_options: Yoomoney::RequestOptions }
+        )
+      end
       def to_hash
       end
     end

data/rbi/yoomoney/models/refund_retrieve_params.rbi

@@ -11,15 +11,23 @@ module Yoomoney
           T.any(Yoomoney::RefundRetrieveParams, Yoomoney::Internal::AnyHash)
         end
 
+      sig { returns(String) }
+      attr_accessor :refund_id
+
       sig do
-        params(request_options: Yoomoney::RequestOptions::OrHash).returns(
-          T.attached_class
-        )
+        params(
+          refund_id: String,
+          request_options: Yoomoney::RequestOptions::OrHash
+        ).returns(T.attached_class)
       end
-      def self.new(request_options: {})
+      def self.new(refund_id:, request_options: {})
       end
 
-      sig { override.returns({ request_options: Yoomoney::RequestOptions }) }
+      sig do
+        override.returns(
+          { refund_id: String, request_options: Yoomoney::RequestOptions }
+        )
+      end
       def to_hash
       end
     end