yoomoney 0.3.0 → 0.4.1

data/lib/yoomoney/models/receipt_data.rb

@@ -5,8 +5,8 @@ module Yoomoney
     class ReceiptData < Yoomoney::Internal::Type::BaseModel
       # @!attribute items
       #
-      #   @return [Array<Yoomoney::Models::ReceiptDataItem>]
-      required :items, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::ReceiptDataItem] }
+      #   @return [Array<Yoomoney::Models::ReceiptData::Item>]
+      required :items, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::ReceiptData::Item] }
 
       # @!attribute customer
       #
@@ -39,13 +39,133 @@ module Yoomoney
       optional :timezone, String
 
       # @!method initialize(items:, customer: nil, internet: nil, receipt_industry_details: nil, receipt_operational_details: nil, tax_system_code: nil, timezone: nil)
-      #   @param items [Array<Yoomoney::Models::ReceiptDataItem>]
+      #   @param items [Array<Yoomoney::Models::ReceiptData::Item>]
       #   @param customer [Yoomoney::Models::ReceiptDataCustomer]
       #   @param internet [Boolean]
       #   @param receipt_industry_details [Array<Yoomoney::Models::IndustryDetails>]
       #   @param receipt_operational_details [Yoomoney::Models::OperationalDetails]
       #   @param tax_system_code [Integer]
       #   @param timezone [String]
+
+      class Item < Yoomoney::Internal::Type::BaseModel
+        # @!attribute amount
+        #   Сумма.
+        #
+        #   @return [Yoomoney::Models::MonetaryAmount]
+        required :amount, -> { Yoomoney::MonetaryAmount }
+
+        # @!attribute description
+        #   Название товара.
+        #
+        #   @return [String]
+        required :description, String
+
+        # @!attribute quantity
+        #   Количество.
+        #
+        #   @return [Float]
+        required :quantity, Float
+
+        # @!attribute vat_code
+        #   Ставка НДС.
+        #
+        #   @return [Integer]
+        required :vat_code, Integer
+
+        # @!attribute country_of_origin_code
+        #
+        #   @return [String, nil]
+        optional :country_of_origin_code, String
+
+        # @!attribute customs_declaration_number
+        #
+        #   @return [String, nil]
+        optional :customs_declaration_number, String
+
+        # @!attribute excise
+        #
+        #   @return [String, nil]
+        optional :excise, String
+
+        # @!attribute mark_code_info
+        #
+        #   @return [Yoomoney::Models::MarkCodeInfo, nil]
+        optional :mark_code_info, -> { Yoomoney::MarkCodeInfo }
+
+        # @!attribute mark_mode
+        #
+        #   @return [String, nil]
+        optional :mark_mode, String
+
+        # @!attribute mark_quantity
+        #
+        #   @return [Yoomoney::Models::MarkQuantity, nil]
+        optional :mark_quantity, -> { Yoomoney::MarkQuantity }
+
+        # @!attribute measure
+        #
+        #   @return [Symbol, Yoomoney::Models::ReceiptItemMeasure, nil]
+        optional :measure, enum: -> { Yoomoney::ReceiptItemMeasure }
+
+        # @!attribute payment_mode
+        #
+        #   @return [Symbol, Yoomoney::Models::ReceiptItemPaymentMode, nil]
+        optional :payment_mode, enum: -> { Yoomoney::ReceiptItemPaymentMode }
+
+        # @!attribute payment_subject
+        #
+        #   @return [Symbol, Yoomoney::Models::ReceiptItemPaymentSubject, nil]
+        optional :payment_subject, enum: -> { Yoomoney::ReceiptItemPaymentSubject }
+
+        # @!attribute payment_subject_industry_details
+        #
+        #   @return [Array<Yoomoney::Models::IndustryDetails>, nil]
+        optional :payment_subject_industry_details,
+                 -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::IndustryDetails] }
+
+        # @!attribute planned_status
+        #
+        #   @return [Integer, nil]
+        optional :planned_status, Integer
+
+        # @!attribute product_code
+        #
+        #   @return [String, nil]
+        optional :product_code, String
+
+        # @!method initialize(amount:, description:, quantity:, vat_code:, country_of_origin_code: nil, customs_declaration_number: nil, excise: nil, mark_code_info: nil, mark_mode: nil, mark_quantity: nil, measure: nil, payment_mode: nil, payment_subject: nil, payment_subject_industry_details: nil, planned_status: nil, product_code: nil)
+        #   @param amount [Yoomoney::Models::MonetaryAmount] Сумма.
+        #
+        #   @param description [String] Название товара.
+        #
+        #   @param quantity [Float] Количество.
+        #
+        #   @param vat_code [Integer] Ставка НДС.
+        #
+        #   @param country_of_origin_code [String]
+        #
+        #   @param customs_declaration_number [String]
+        #
+        #   @param excise [String]
+        #
+        #   @param mark_code_info [Yoomoney::Models::MarkCodeInfo]
+        #
+        #   @param mark_mode [String]
+        #
+        #   @param mark_quantity [Yoomoney::Models::MarkQuantity]
+        #
+        #   @param measure [Symbol, Yoomoney::Models::ReceiptItemMeasure]
+        #
+        #   @param payment_mode [Symbol, Yoomoney::Models::ReceiptItemPaymentMode]
+        #
+        #   @param payment_subject [Symbol, Yoomoney::Models::ReceiptItemPaymentSubject]
+        #
+        #   @param payment_subject_industry_details [Array<Yoomoney::Models::IndustryDetails>]
+        #
+        #   @param planned_status [Integer]
+        #
+        #   @param product_code [String]
+      end
     end
   end
 end

data/lib/yoomoney/models/receipt_retrieve_params.rb

@@ -7,7 +7,13 @@ module Yoomoney
       extend Yoomoney::Internal::Type::RequestParameters::Converter
       include Yoomoney::Internal::Type::RequestParameters
 
-      # @!method initialize(request_options: {})
+      # @!attribute receipt_id
+      #
+      #   @return [String]
+      required :receipt_id, String
+
+      # @!method initialize(receipt_id:, request_options: {})
+      #   @param receipt_id [String]
       #   @param request_options [Yoomoney::RequestOptions, Hash{Symbol=>Object}]
     end
   end

data/lib/yoomoney/models/refund_retrieve_params.rb

@@ -7,7 +7,13 @@ module Yoomoney
       extend Yoomoney::Internal::Type::RequestParameters::Converter
       include Yoomoney::Internal::Type::RequestParameters
 
-      # @!method initialize(request_options: {})
+      # @!attribute refund_id
+      #
+      #   @return [String]
+      required :refund_id, String
+
+      # @!method initialize(refund_id:, request_options: {})
+      #   @param refund_id [String]
       #   @param request_options [Yoomoney::RequestOptions, Hash{Symbol=>Object}]
     end
   end

data/lib/yoomoney/models/webhook_delete_params.rb

@@ -7,7 +7,13 @@ module Yoomoney
       extend Yoomoney::Internal::Type::RequestParameters::Converter
       include Yoomoney::Internal::Type::RequestParameters
 
-      # @!method initialize(request_options: {})
+      # @!attribute webhook_id
+      #
+      #   @return [String]
+      required :webhook_id, String
+
+      # @!method initialize(webhook_id:, request_options: {})
+      #   @param webhook_id [String]
       #   @param request_options [Yoomoney::RequestOptions, Hash{Symbol=>Object}]
     end
   end

data/lib/yoomoney/models.rb

@@ -41,10 +41,6 @@ module Yoomoney
 
   Airline = Yoomoney::Models::Airline
 
-  AirlineLeg = Yoomoney::Models::AirlineLeg
-
-  AirlinePassenger = Yoomoney::Models::AirlinePassenger
-
   B2bSberbankCalculatedVatData = Yoomoney::Models::B2bSberbankCalculatedVatData
 
   B2bSberbankMixedVatData = Yoomoney::Models::B2bSberbankMixedVatData
@@ -175,8 +171,6 @@ module Yoomoney
 
   ReceiptDataCustomer = Yoomoney::Models::ReceiptDataCustomer
 
-  ReceiptDataItem = Yoomoney::Models::ReceiptDataItem
-
   ReceiptItemAgentType = Yoomoney::Models::ReceiptItemAgentType
 
   ReceiptItemMeasure = Yoomoney::Models::ReceiptItemMeasure

data/lib/yoomoney/resources/deals.rb

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

data/lib/yoomoney/resources/me.rb

@@ -15,10 +15,11 @@ module Yoomoney
       # @see Yoomoney::Models::MeRetrieveParams
       def retrieve(params = {})
         parsed, options = Yoomoney::MeRetrieveParams.dump_request(params)
+        query = Yoomoney::Internal::Util.encode_query_params(parsed)
         @client.request(
           method: :get,
           path: "me",
-          query: parsed,
+          query: query,
           model: Yoomoney::Models::MeRetrieveResponse,
           options: options
         )

data/lib/yoomoney/resources/payments.rb

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

data/lib/yoomoney/resources/payouts.rb

@@ -81,10 +81,11 @@ module Yoomoney
       # @see Yoomoney::Models::PayoutListParams
       def list(params = {})
         parsed, options = Yoomoney::PayoutListParams.dump_request(params)
+        query = Yoomoney::Internal::Util.encode_query_params(parsed)
         @client.request(
           method: :get,
           path: "payouts",
-          query: parsed,
+          query: query,
           model: Yoomoney::PayoutsList,
           options: options
         )
@@ -104,10 +105,11 @@ module Yoomoney
       # @see Yoomoney::Models::PayoutSearchParams
       def search(params = {})
         parsed, options = Yoomoney::PayoutSearchParams.dump_request(params)
+        query = Yoomoney::Internal::Util.encode_query_params(parsed)
         @client.request(
           method: :get,
           path: "payouts/search",
-          query: parsed,
+          query: query,
           model: Yoomoney::PayoutsList,
           options: options
         )

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.3.0"
+  VERSION = "0.4.1"
 end

data/lib/yoomoney.rb

@@ -63,12 +63,10 @@ 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/receipt_data_item"
 require_relative "yoomoney/models/refund_method"
 require_relative "yoomoney/models/airline"
-require_relative "yoomoney/models/airline_leg"
-require_relative "yoomoney/models/airline_passenger"
 require_relative "yoomoney/models/b2b_sberbank_calculated_vat_data"
 require_relative "yoomoney/models/b2b_sberbank_mixed_vat_data"
 require_relative "yoomoney/models/b2b_sberbank_untaxed_vat_data"
@@ -121,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

@@ -301,6 +301,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/airline.rbi

@@ -12,17 +12,17 @@ module Yoomoney
       sig { params(booking_reference: String).void }
       attr_writer :booking_reference
 
-      sig { returns(T.nilable(T::Array[Yoomoney::AirlineLeg])) }
+      sig { returns(T.nilable(T::Array[Yoomoney::Airline::Leg])) }
       attr_reader :legs
 
-      sig { params(legs: T::Array[Yoomoney::AirlineLeg::OrHash]).void }
+      sig { params(legs: T::Array[Yoomoney::Airline::Leg::OrHash]).void }
       attr_writer :legs
 
-      sig { returns(T.nilable(T::Array[Yoomoney::AirlinePassenger])) }
+      sig { returns(T.nilable(T::Array[Yoomoney::Airline::Passenger])) }
       attr_reader :passengers
 
       sig do
-        params(passengers: T::Array[Yoomoney::AirlinePassenger::OrHash]).void
+        params(passengers: T::Array[Yoomoney::Airline::Passenger::OrHash]).void
       end
       attr_writer :passengers
 
@@ -35,8 +35,8 @@ module Yoomoney
       sig do
         params(
           booking_reference: String,
-          legs: T::Array[Yoomoney::AirlineLeg::OrHash],
-          passengers: T::Array[Yoomoney::AirlinePassenger::OrHash],
+          legs: T::Array[Yoomoney::Airline::Leg::OrHash],
+          passengers: T::Array[Yoomoney::Airline::Passenger::OrHash],
           ticket_number: String
         ).returns(T.attached_class)
       end
@@ -52,14 +52,90 @@ module Yoomoney
         override.returns(
           {
             booking_reference: String,
-            legs: T::Array[Yoomoney::AirlineLeg],
-            passengers: T::Array[Yoomoney::AirlinePassenger],
+            legs: T::Array[Yoomoney::Airline::Leg],
+            passengers: T::Array[Yoomoney::Airline::Passenger],
             ticket_number: String
           }
         )
       end
       def to_hash
       end
+
+      class Leg < Yoomoney::Internal::Type::BaseModel
+        OrHash =
+          T.type_alias do
+            T.any(Yoomoney::Airline::Leg, Yoomoney::Internal::AnyHash)
+          end
+
+        sig { returns(String) }
+        attr_accessor :departure_airport
+
+        sig { returns(String) }
+        attr_accessor :departure_date
+
+        sig { returns(String) }
+        attr_accessor :destination_airport
+
+        sig { returns(T.nilable(String)) }
+        attr_reader :carrier_code
+
+        sig { params(carrier_code: String).void }
+        attr_writer :carrier_code
+
+        sig do
+          params(
+            departure_airport: String,
+            departure_date: String,
+            destination_airport: String,
+            carrier_code: String
+          ).returns(T.attached_class)
+        end
+        def self.new(
+          departure_airport:,
+          departure_date:,
+          destination_airport:,
+          carrier_code: nil
+        )
+        end
+
+        sig do
+          override.returns(
+            {
+              departure_airport: String,
+              departure_date: String,
+              destination_airport: String,
+              carrier_code: String
+            }
+          )
+        end
+        def to_hash
+        end
+      end
+
+      class Passenger < Yoomoney::Internal::Type::BaseModel
+        OrHash =
+          T.type_alias do
+            T.any(Yoomoney::Airline::Passenger, Yoomoney::Internal::AnyHash)
+          end
+
+        sig { returns(String) }
+        attr_accessor :first_name
+
+        sig { returns(String) }
+        attr_accessor :last_name
+
+        sig do
+          params(first_name: String, last_name: String).returns(
+            T.attached_class
+          )
+        end
+        def self.new(first_name:, last_name:)
+        end
+
+        sig { override.returns({ first_name: String, last_name: String }) }
+        def to_hash
+        end
+      end
     end
   end
 end

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,