Revert "HOOK-44: Introduce subscriptions"

2024-11-06 18:35:17 +00:00 · 2017-10-19 20:21:48 +03:00 · 2017-10-19 20:21:48 +03:00 · 5d736f4ce1
commit 5d736f4ce1
parent 3cc4b30c56
33 changed files with 9 additions and 320 deletions
--- a/spec/definitions/BankCardDetails.yaml
+++ b/spec/definitions/BankCardDetails.yaml
@ -1,12 +0,0 @@
-required:
-  - cardNumberMask
-  - paymentSystem
-properties:
-  cardNumberMask:
-    description: Маскированый номер карты
-    type: string
-    pattern: '^\d{4}$'
-  paymentSystem:
-    description: Платежная система
-    type: string
-    maxLength: 100
--- a/spec/definitions/ClientInfo.yaml
+++ b/spec/definitions/ClientInfo.yaml
@ -1,15 +0,0 @@
-description: Данные клиентского устройства плательщика
-type: object
-required:
-  - fingerprint
-properties:
-  ip:
-    description: IP-адрес плательщика
-    type: string
-    format: ip-address
-    maxLength: 45
-    readOnly: true
-  fingerprint:
-    description: Уникальный отпечаток user agent'а плательщика
-    type: string
-    maxLength: 1000
--- a/spec/definitions/ContactInfo.yaml
+++ b/spec/definitions/ContactInfo.yaml
@ -1,14 +0,0 @@
-description: Контактные данные плательщика
-type: object
-properties:
-  email:
-    description: Адрес электронной почты
-    type: string
-    format: email
-    maxLength: 100
-  phoneNumber:
-    description: |
-        Номер мобильного телефона с международным префиксом согласно
-        [E.164](https://en.wikipedia.org/wiki/E.164).
-    type: string
-    format: '^\+\d{4,15}$'
--- a/spec/definitions/Customer.yaml
+++ b/spec/definitions/Customer.yaml
@ -1,26 +0,0 @@
-description: Данные плательщика
-type: object
-required:
-  - id
-  - shopID
-  - status
-  - contactInfo
-  - metadata
-properties:
-  id:
-    description: Идентификатор плательщика
-    type: string
-  shopID:
-    description: Идентификатор магазина
-    type: string
-  status:
-    description: Статус плательщика
-    type: string
-    enum:
-      - ready
-      - unready
-  contactInfo:
-    $ref: '#/definitions/ContactInfo'
-  metadata:
-    description: Связанные с плательщиком метаданные
-    type: object
--- a/spec/definitions/CustomerBinding.yaml
+++ b/spec/definitions/CustomerBinding.yaml
@ -1,14 +0,0 @@
-description: Привязка плательщика к платежному средству
-type: object
-allOf:
-  - type: object
-    required:
-      - id
-      - paymentResource
-    properties:
-      id:
-        description: Идентификатор привязки
-        type: string
-      paymentResource:
-        $ref: '#/definitions/PaymentResource'
-  - $ref: '#/definitions/CustomerBindingStatus'
--- a/spec/definitions/CustomerBindingError.yaml
+++ b/spec/definitions/CustomerBindingError.yaml
@ -1,10 +0,0 @@
-description: Описание ошибки, возникшей в процессе привязки
-type: object
-required:
-  - code
-  - message
-properties:
-  code:
-    type: string
-  message:
-    type: string
--- a/spec/definitions/CustomerBindingFailed.yaml
+++ b/spec/definitions/CustomerBindingFailed.yaml
@ -1,12 +0,0 @@
-description: Событие о неуспешной привязке плательщика к платежному средству
-allOf:
-  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - customer
-      - binding
-    properties:
-      customer:
-        $ref: '#/definitions/Customer'
-      binding:
-        $ref: '#/definitions/CustomerBinding'
--- a/spec/definitions/CustomerBindingStarted.yaml
+++ b/spec/definitions/CustomerBindingStarted.yaml
@ -1,12 +0,0 @@
-description: Событие о создании привязки плательщика к платежному средству
-allOf:
-  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - customer
-      - binding
-    properties:
-      customer:
-        $ref: '#/definitions/Customer'
-      binding:
-        $ref: '#/definitions/CustomerBinding'
--- a/spec/definitions/CustomerBindingStatus.yaml
+++ b/spec/definitions/CustomerBindingStatus.yaml
@ -1,14 +0,0 @@
-description: Статус привязки плательщика к платежному средству
-type: object
-required:
-  - status
-properties:
-  status:
-    description: Статус привязки
-    type: string
-    enum:
-      - created
-      - succeeded
-      - failed
-  error:
-    $ref: '#/definitions/CustomerBindingError'
--- a/spec/definitions/CustomerBindingSucceeded.yaml
+++ b/spec/definitions/CustomerBindingSucceeded.yaml
@ -1,12 +0,0 @@
-description: Событие об успешной привязке плательщика к платежному средству
-allOf:
-  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - customer
-      - binding
-    properties:
-      customer:
-        $ref: '#/definitions/Customer'
-      binding:
-        $ref: '#/definitions/CustomerBinding'
--- a/spec/definitions/CustomerCreated.yaml
+++ b/spec/definitions/CustomerCreated.yaml
@ -1,9 +0,0 @@
-description: Событие о создании нового плательщика
-allOf:
-  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - customer
-    properties:
-      customer:
-        $ref: '#/definitions/Customer'
--- a/spec/definitions/CustomerDeleted.yaml
+++ b/spec/definitions/CustomerDeleted.yaml
@ -1,9 +0,0 @@
-description: Событие об удалении плательщика
-allOf:
-  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - customer
-    properties:
-      customer:
-        $ref: '#/definitions/Customer'
--- a/spec/definitions/CustomerPayer.yaml
+++ b/spec/definitions/CustomerPayer.yaml
@ -1,11 +0,0 @@
-type: object
-allOf:
-  - $ref: '#/definitions/Payer'
-  - type: object
-    required:
-      - customerID
-    properties:
-      customerID:
-        description: Идентификатор плательщика
-        type: string
-
--- a/spec/definitions/CustomerReady.yaml
+++ b/spec/definitions/CustomerReady.yaml
@ -1,9 +0,0 @@
-description: Событие о наступлении готовности плательщика к проведению оплаты
-allOf:
-  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - customer
-    properties:
-      customer:
-        $ref: '#/definitions/Customer'
--- a/spec/definitions/Event.yaml
+++ b/spec/definitions/Event.yaml
@ -6,6 +6,7 @@ required:
  - occuredAt
  - topic
  - eventType
+  - invoice
 properties:
  eventID:
    description: Идентификатор события в системе
@ -19,10 +20,9 @@ properties:
    type: string
    enum:
      - InvoicesTopic
-      - CustomersTopic
  eventType:
    type: string
-    description: Тип произошедшего с предметом оповещения события
+    description: Тип произошедшего с инвойсом события
    enum:
      - InvoiceCreated
      - InvoicePaid
@ -34,9 +34,5 @@ properties:
      - PaymentCancelled
      - PaymentRefunded
      - PaymentFailed
-      - CustomerCreated
-      - CustomerDeleted
-      - CustomerReady
-      - CustomerBindingStarted
-      - CustomerBindingSucceeded
-      - CustomerBindingFailed
+  invoice:
+    $ref: '#/definitions/Invoice'
--- a/spec/definitions/InvoiceCancelled.yaml
+++ b/spec/definitions/InvoiceCancelled.yaml
@ -3,9 +3,3 @@ description: |
  жизни
 allOf:
  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - invoice
-    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
--- a/spec/definitions/InvoiceCreated.yaml
+++ b/spec/definitions/InvoiceCreated.yaml
@ -1,9 +1,3 @@
 description: Событие о создании нового инвойса
 allOf:
  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - invoice
-    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
--- a/spec/definitions/InvoiceFulfilled.yaml
+++ b/spec/definitions/InvoiceFulfilled.yaml
@ -1,9 +1,3 @@
 description: Событие о погашении обязательств по инвойсу
 allOf:
  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - invoice
-    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
--- a/spec/definitions/InvoicePaid.yaml
+++ b/spec/definitions/InvoicePaid.yaml
@ -3,9 +3,3 @@ description: |
  плательщику товаров или услуг
 allOf:
  - $ref: '#/definitions/Event'
-  - type: object
-    required:
-      - invoice
-    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
--- a/spec/definitions/Payer.yaml
+++ b/spec/definitions/Payer.yaml
@ -1,11 +0,0 @@
-type: object
-discriminator: payerType
-required:
-  - payerType
-properties:
-  payerType:
-    description: Тип платежного средства
-    type: string
-    enum:
-      - CustomerPayer
-      - PaymentResourcePayer
--- a/spec/definitions/Payment.yaml
+++ b/spec/definitions/Payment.yaml
@ -9,7 +9,6 @@ required:
  - paymentToolToken
  - paymentSession
  - contactInfo
-  - payer
 properties:
  id:
    description: Идентификатор платежа
@ -54,22 +53,13 @@ properties:
      [RFC 4217](http://www.iso.org/iso/home/standards/currency_codes.htm).
    type: string
  paymentToolToken:
-    description: >
-      **Deprecated.** _Используйте свойство `payer`._
-
-      Токен платежного средства, предоставленного плательщиком
+    description: 'Токен платежного средства, предоставленного плательщиком'
    type: string
  paymentSession:
-    description: >
-      **Deprecated.** _Используйте свойство `payer`._
-
-      Идентификатор платежной сессии
+    description: Идентификатор платежной сессии
    type: string
  contactInfo:
-    description: >
-      **Deprecated.** _Используйте свойство `payer`._
-
-      Контактные данные плательщика
+    description: Контактные данные плательщика
    type: object
    properties:
      email:
@ -79,16 +69,8 @@ properties:
        description: Номер мобильного телефона
        type: string
  ip:
-    description: >
-      **Deprecated.** _Используйте свойство `payer`._
-
-      IP-адрес плательщика
+    description: IP-адрес плательщика
    type: string
  fingerprint:
-    description: >
-      **Deprecated.** _Используйте свойство `payer`._
-
-      Уникальный отпечаток user agent'а плательщика
+    description: Уникальный отпечаток user agent'а плательщика
    type: string
-  payer:
-    $ref: '#/definitions/Payer'
--- a/spec/definitions/PaymentCancelled.yaml
+++ b/spec/definitions/PaymentCancelled.yaml
@ -5,10 +5,7 @@ allOf:
  - $ref: '#/definitions/Event'
  - type: object
    required:
-      - invoice
      - payment
    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
      payment:
        $ref: '#/definitions/Payment'
--- a/spec/definitions/PaymentCaptured.yaml
+++ b/spec/definitions/PaymentCaptured.yaml
@ -5,10 +5,7 @@ allOf:
  - $ref: '#/definitions/Event'
  - type: object
    required:
-      - invoice
      - payment
    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
      payment:
        $ref: '#/definitions/Payment'
--- a/spec/definitions/PaymentFailed.yaml
+++ b/spec/definitions/PaymentFailed.yaml
@ -5,10 +5,7 @@ allOf:
  - $ref: '#/definitions/Event'
  - type: object
    required:
-      - invoice
      - payment
    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
      payment:
        $ref: '#/definitions/Payment'
--- a/spec/definitions/PaymentProcessed.yaml
+++ b/spec/definitions/PaymentProcessed.yaml
@ -3,10 +3,7 @@ allOf:
  - $ref: '#/definitions/Event'
  - type: object
    required:
-      - invoice
      - payment
    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
      payment:
        $ref: '#/definitions/Payment'
--- a/spec/definitions/PaymentRefunded.yaml
+++ b/spec/definitions/PaymentRefunded.yaml
@ -3,10 +3,7 @@ allOf:
  - $ref: '#/definitions/Event'
  - type: object
    required:
-      - invoice
      - payment
    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
      payment:
        $ref: '#/definitions/Payment'
--- a/spec/definitions/PaymentResource.yaml
+++ b/spec/definitions/PaymentResource.yaml
@ -1,18 +0,0 @@
-type: object
-description: Данные платежного средства
-required:
-  - paymentSession
-  - paymentToolToken
-properties:
-  paymentToolToken:
-    description: Токен платежного средства, предоставленного плательщиком
-    type: string
-    maxLength: 1000
-  paymentSession:
-    description: Идентификатор платежной сессии
-    type: string
-    maxLength: 1000
-  paymentToolDetails:
-    $ref: '#/definitions/PaymentToolDetails'
-  clientInfo:
-    $ref: '#/definitions/ClientInfo'
--- a/spec/definitions/PaymentResourcePayer.yaml
+++ b/spec/definitions/PaymentResourcePayer.yaml
@ -1,11 +0,0 @@
-type: object
-description: Платежное средство
-allOf:
-  - $ref: '#/definitions/Payer'
-  - $ref: '#/definitions/PaymentResource'
-  - type: object
-    required:
-      - contactInfo
-    properties:
-      contactInfo:
-        $ref: '#/definitions/ContactInfo'
--- a/spec/definitions/PaymentStarted.yaml
+++ b/spec/definitions/PaymentStarted.yaml
@ -3,10 +3,7 @@ allOf:
  - $ref: '#/definitions/Event'
  - type: object
    required:
-      - invoice
      - payment
    properties:
-      invoice:
-        $ref: '#/definitions/Invoice'
      payment:
        $ref: '#/definitions/Payment'
--- a/spec/definitions/PaymentTerminalDetails.yaml
+++ b/spec/definitions/PaymentTerminalDetails.yaml
@ -1,7 +0,0 @@
-required:
-  - provider
-properties:
-  provider:
-    type: string
-    enum:
-      - euroset
--- a/spec/definitions/PaymentToolDetails.yaml
+++ b/spec/definitions/PaymentToolDetails.yaml
@ -1,13 +0,0 @@
-type: object
-discriminator: detailsType
-description: Детали платежного средства
-readOnly: true
-required:
-  - detailsType
-properties:
-  detailsType:
-    description: Тип информации о платежном средстве
-    type: string
-    enum:
-      - PaymentToolDetailsBankCard
-      - PaymentToolDetailsPaymentTerminal
--- a/spec/definitions/PaymentToolDetailsBankCard.yaml
+++ b/spec/definitions/PaymentToolDetailsBankCard.yaml
@ -1,4 +0,0 @@
-type: object
-allOf:
-  - $ref: '#/definitions/PaymentToolDetails'
-  - $ref: '#/definitions/BankCardDetails'
--- a/spec/definitions/PaymentToolDetailsPaymentTerminal.yaml
+++ b/spec/definitions/PaymentToolDetailsPaymentTerminal.yaml
@ -1,4 +0,0 @@
-type: object
-allOf:
-  - $ref: '#/definitions/PaymentToolDetails'
-  - $ref: '#/definitions/PaymentTerminalDetails'