Swagger format multiple fixes

2024-11-06 09:15:17 +00:00 · 2021-09-02 12:41:42 +03:00 · 2021-09-02 12:41:42 +03:00 · 1bee61313f
commit 1bee61313f
parent 3fef5fb0a2
24 changed files with 44 additions and 64 deletions
--- a/spec/components/responses/DefaultLogicError.yaml
+++ b/spec/components/responses/DefaultLogicError.yaml
@ -1,5 +1,5 @@
 description: Неверные данные
 content:
-  application/json:
+  application/json; charset=utf-8:
    schema:
      $ref: '#/components/schemas/DefaultLogicError'
--- a/spec/components/responses/NotFound.yaml
+++ b/spec/components/responses/NotFound.yaml
@ -1,5 +1,5 @@
 description: Заданный ресурс не найден
 content:
-  application/json:
+  application/json; charset=utf-8:
    schema:
      $ref: '#/components/schemas/GeneralError'
--- a/spec/components/schemas/AmountResult.yaml
+++ b/spec/components/schemas/AmountResult.yaml
@ -13,5 +13,4 @@ allOf:
        type: integer
        format: int64
      currency:
-        x-merge-obj:
-          - $ref: '#/components/schemas/Currency'
+        $ref: '#/components/schemas/Currency'
--- a/spec/components/schemas/BankCardDetails.yaml
+++ b/spec/components/schemas/BankCardDetails.yaml
@ -15,8 +15,6 @@ properties:
    type: string
    pattern: '^\d{2,4}$'
  paymentSystem:
-    x-merge-obj:
-      - $ref: '#/components/schemas/BankCardPaymentSystem'
+    $ref: '#/components/schemas/BankCardPaymentSystem'
  tokenProvider:
-    x-merge-obj:
-      - $ref: '#/components/schemas/BankCardTokenProvider'
+    $ref: '#/components/schemas/BankCardTokenProvider'
--- a/spec/components/schemas/Chargeback.yaml
+++ b/spec/components/schemas/Chargeback.yaml
@ -35,16 +35,14 @@ properties:
    format: int64
    minimum: 1
  levyCurrency:
-    x-merge-obj:
-      - $ref: '#/components/schemas/Currency'
+    $ref: '#/components/schemas/Currency'
  bodyAmount:
    description: Сумма чарджбэка
    type: integer
    format: int64
    minimum: 1
  bodyCurrency:
-    x-merge-obj:
-      - $ref: '#/components/schemas/Currency'
+    $ref: '#/components/schemas/Currency'
  fee:
    description: 'Комиссия системы, в минорных денежных единицах'
    type: integer
@ -61,11 +59,9 @@ properties:
    format: int64
    minimum: 0
  status:
-    x-merge-obj:
-      - $ref: '#/components/schemas/ChargebackStatus'
+    $ref: '#/components/schemas/ChargebackStatus'
  stage:
-    x-merge-obj:
-      - $ref: '#/components/schemas/ChargebackStage'
+    $ref: '#/components/schemas/ChargebackStage'
  chargebackReason:
    $ref: '#/components/schemas/ChargebackReason'
  content:
--- a/spec/components/schemas/CountResult.yaml
+++ b/spec/components/schemas/CountResult.yaml
@ -11,5 +11,4 @@ allOf:
        format: int64
        minimum: 0
      currency:
-        x-merge-obj:
-          - $ref: '#/components/schemas/Currency'
+        $ref: '#/components/schemas/Currency'
--- a/spec/components/schemas/CryptoWalletDetails.yaml
+++ b/spec/components/schemas/CryptoWalletDetails.yaml
@ -2,5 +2,4 @@ required:
  - cryptoCurrency
 properties:
  cryptoCurrency:
-    x-merge-obj:
-      - $ref: '#/components/schemas/CryptoCurrency'
+    $ref: '#/components/schemas/CryptoCurrency'
--- a/spec/components/schemas/DigitalWalletDetails.yaml
+++ b/spec/components/schemas/DigitalWalletDetails.yaml
@ -1,4 +1,3 @@
-discriminator: digitalWalletDetailsType
 required:
  - digitalWalletDetailsType
 properties:
@ -6,3 +5,5 @@ properties:
    type: string
    enum:
      - DigitalWalletDetailsQIWI
+discriminator:
+  propertyName: digitalWalletDetailsType
--- a/spec/components/schemas/Invoice.yaml
+++ b/spec/components/schemas/Invoice.yaml
@ -36,8 +36,7 @@ allOf:
        format: int64
        minimum: 1
      currency:
-        x-merge-obj:
-          - $ref: '#/components/schemas/Currency'
+        $ref: '#/components/schemas/Currency'
      product:
        description: Наименование предлагаемых товаров или услуг
        type: string
--- a/spec/components/schemas/InvoiceLineTaxMode.yaml
+++ b/spec/components/schemas/InvoiceLineTaxMode.yaml
@ -3,7 +3,6 @@ description: |

  Указывается, только если предлагаемый товар или услуга облагается налогом.
 type: object
-discriminator: type
 required:
  - type
 properties:
@ -12,3 +11,5 @@ properties:
    type: string
    enum:
      - InvoiceLineTaxVAT
+discriminator:
+  propertyName: type
--- a/spec/components/schemas/Payer.yaml
+++ b/spec/components/schemas/Payer.yaml
@ -1,5 +1,4 @@
 type: object
-discriminator: payerType
 properties:
  payerType:
    description: Тип платежного средства
@ -10,3 +9,5 @@ properties:
      - RecurrentPayer
 required:
  - payerType
+discriminator:
+  propertyName: payerType
--- a/spec/components/schemas/PaymentFlow.yaml
+++ b/spec/components/schemas/PaymentFlow.yaml
@ -1,5 +1,4 @@
 type: object
-discriminator: type
 default:
  type: PaymentFlowInstant
 required:
@ -11,3 +10,5 @@ properties:
    enum:
      - PaymentFlowInstant
      - PaymentFlowHold
+discriminator:
+  propertyName: type
--- a/spec/components/schemas/PaymentSearchResult.yaml
+++ b/spec/components/schemas/PaymentSearchResult.yaml
@ -44,8 +44,7 @@ allOf:
        format: int64
        minimum: 0
      currency:
-        x-merge-obj:
-          - $ref: '#/components/schemas/Currency'
+        $ref: '#/components/schemas/Currency'
      payer:
        $ref: '#/components/schemas/Payer'
      flow:
@ -60,7 +59,6 @@ allOf:
        type: string
        format: date-time
      transactionInfo:
-        description: 'Информация о транзакции'
        $ref: '#/components/schemas/TransactionInfo'
      makeRecurrent:
        $ref: '#/components/schemas/PaymentMakeRecurrent'
--- a/spec/components/schemas/PaymentTerminalDetails.yaml
+++ b/spec/components/schemas/PaymentTerminalDetails.yaml
@ -2,5 +2,4 @@ required:
  - provider
 properties:
  provider:
-    x-merge-obj:
-      - $ref: '#/components/schemas/PaymentTerminalProvider'
+    $ref: '#/components/schemas/PaymentTerminalProvider'
--- a/spec/components/schemas/PaymentToolDetails.yaml
+++ b/spec/components/schemas/PaymentToolDetails.yaml
@ -1,5 +1,4 @@
 type: object
-discriminator: detailsType
 description: Детали платежного средства
 required:
  - detailsType
@ -7,3 +6,5 @@ properties:
  detailsType:
    description: Тип информации о платежном средстве
    type: string
+discriminator:
+  propertyName: detailsType
--- a/spec/components/schemas/PaymentsSubErrorsDistributionResult.yaml
+++ b/spec/components/schemas/PaymentsSubErrorsDistributionResult.yaml
@ -6,7 +6,6 @@ allOf:
      - percents
    properties:
      error:
-        description: Тип ошибки
        $ref: '#/components/schemas/SubError'
      percents:
        description: Относительное колличество ошибок в процентах
--- a/spec/components/schemas/Payout.yaml
+++ b/spec/components/schemas/Payout.yaml
@ -35,8 +35,7 @@ properties:
    format: int64
    minimum: 0
  currency:
-    x-merge-obj:
-      - $ref: '#/components/schemas/Currency'
+    $ref: '#/components/schemas/Currency'
  payoutToolDetails:
    $ref: '#/components/schemas/PayoutToolDetails'
  status:
--- a/spec/components/schemas/PayoutToolDetails.yaml
+++ b/spec/components/schemas/PayoutToolDetails.yaml
@ -1,9 +1,10 @@
 description: Данные средства вывода
 type: object
-discriminator: detailsType
 properties:
   detailsType:
    description: Тип средства вывода
    type: string
 required:
  - detailsType
+discriminator:
+  propertyName: detailsType
--- a/spec/components/schemas/Refund.yaml
+++ b/spec/components/schemas/Refund.yaml
@ -27,8 +27,7 @@ allOf:
        format: int64
        minimum: 1
      currency:
-        x-merge-obj:
-          - $ref: '#/components/schemas/Currency'
+        $ref: '#/components/schemas/Currency'
      reason:
        description: Причина осуществления возврата
        type: string
--- a/spec/components/schemas/ShopAccount.yaml
+++ b/spec/components/schemas/ShopAccount.yaml
@ -6,8 +6,7 @@ required:
  - settlementID
 properties:
  currency:
-    x-merge-obj:
-      - $ref: '#/components/schemas/Currency'
+    $ref: '#/components/schemas/Currency'
  guaranteeID:
    type: integer
    format: int64
--- a/spec/components/schemas/ShopLocation.yaml
+++ b/spec/components/schemas/ShopLocation.yaml
@ -1,6 +1,5 @@
 description: Местоположение магазина, по которому можно его найти
 type: object
-discriminator: locationType
 required:
  - locationType
 properties:
@ -9,3 +8,5 @@ properties:
    type: string
    enum:
      - ShopLocationUrl
+discriminator:
+  propertyName: locationType
--- a/spec/components/schemas/SplitAmountResult.yaml
+++ b/spec/components/schemas/SplitAmountResult.yaml
@ -5,11 +5,9 @@ required:
  - offsetAmounts
 properties:
  splitUnit:
-    x-merge-obj:
-      - $ref: '#/components/schemas/SplitUnit'
+    $ref: '#/components/schemas/SplitUnit'
  currency:
-    x-merge-obj:
-      - $ref: '#/components/schemas/Currency'
+    $ref: '#/components/schemas/Currency'
  offsetAmounts:
    type: array
    items:
--- a/spec/components/schemas/SplitCountResult.yaml
+++ b/spec/components/schemas/SplitCountResult.yaml
@ -5,11 +5,9 @@ required:
  - splitUnit
 properties:
  splitUnit:
-    x-merge-obj:
-      - $ref: '#/components/schemas/SplitUnit'
+    $ref: '#/components/schemas/SplitUnit'
  currency:
-    x-merge-obj:
-      - $ref: '#/components/schemas/Currency'
+    $ref: '#/components/schemas/Currency'
  statusOffsetCounts:
    type: array
    items:
--- a/spec/paths/reports.yaml
+++ b/spec/paths/reports.yaml
@ -66,18 +66,12 @@ get:
    - $ref: '#/components/parameters/paymentInstitutionRealm'
    - $ref: '#/components/parameters/fromTime'
    - $ref: '#/components/parameters/toTime'
-    - name: limit
-      description: Лимит выборки
-      in: query
-      required: false
-      type: integer
-      format: int32
-      minimum: 1
-      maximum: 1000
+    - $ref: '#/components/parameters/limit'
    - name: reportTypes
      description: Типы отчетов
      in: query
      required: true
+      schema:
        type: array
        items:
          type: string