Architecture/SEPA-TIS-Specs.md

@@ -108,99 +108,53 @@ definitions:
   PaymentRequestParams:
     type: object
     required:
-      - doc_id
-      - type
-      - date_time
-      - priority
-      - bussiness_area
-      - date
-      - mtd
-      - prtry
-      - instr_id
-      - end_to_end_id
-      - cd
-      - amount
-      - currency
-      - tx_id
+      - header
+      - payment_data
       - chrg_br
-      - creditor
-      - debtor
     properties:
-      doc_id:
-        type: string
-        example: D118091001045732
-      type:
-        type: string
-        example: FFCCTRNS
-      date_time:
-        type: string
-        format: date-time
-      priority:
-        type: integer
-        example: 51
-      bussiness_area:
-        type: string
-        example: SEAPSCT
-      date:
-        type: string
-        format: date
-      mtd:
-        type: string
-        example: CLRG
-      prtry:
-        type: string
-        example: LITAS-MIG
-      instr_id:
-        type: string
-        example: D118091001048175
-      end_to_end_id:
-        type: string
-        example: NOTPROVIDED
-      cd:
-        type: string
-        example: SEPA
-      amount:
-        type: number
-        format: double
-        example: 13.31
-      currency:
-        type: string
-        example: EUR
-      tx_id:
-        type: string
-        example: 8e7070743da24402a7fc290bc62fbcd0
+      header:
+        $ref: '#/definitions/DocumentHeader'
+      payment_data:
+        $ref: '#/definitions/PaymentData'
       chrg_br:
         type: string
         example: SLEV
-      creditor:
-        $ref: '#/definitions/Participant'
-      debtor:
-        $ref: '#/definitions/Participant'
   PaymentReturnRequestParams:
     type: object
     required:
-      - doc_id
-      - type
-      - date_time
-      - priority
-      - bussiness_area
-      - assignment_id
+      - header
       - assigner_bic
       - assignee_bic
       - cancellation_id
-      - original_message_id
-      - original_end_to_end_id
-      - original_amount
-      - original_currency
-      - original_date
-      - original_transfer_mtd
-      - original_transfer_prtry
-      - original_transfer_cd
-      - original_tx_id
-      - creditor
-      - debtor
+      - payment_data
       - cancellation_reason
       - cancelling_party
+    properties:
+      header:
+        $ref: '#/definitions/DocumentHeader'
+      assigner_bic:
+        type: string
+        example: PCTULT21XXX
+      assignee_bic:
+        type: string
+        example: LIABLT2XMSD
+      cancellation_id:
+        type: string
+        example: D118100301085772
+      cancelling_party:
+        $ref: '#/definitions/CancellingParty'
+      cancellation_reason:
+        $ref: '#/definitions/CancellationReason'
+      payment_data:
+        $ref: '#/definitions/PaymentData'
+  DocumentHeader:
+    type: object
+    required:
+      - doc_id
+      - type
+      - date_time
+      - priority
+      - business_area
     properties:
       doc_id:
         type: string
@@ -214,57 +168,56 @@ definitions:
       priority:
         type: integer
         example: 51
-      bussiness_area:
+      business_area:
         type: string
         example: SEAPSCT
-      assignment_id:
-        type: string
-        example: Cx00003
-      assigner_bic:
-        type: string
-        example: PCTULT21XXX
-      assignee_bic:
-        type: string
-        example: LIABLT2XMSD
-      cancellation_id:
-        type: string
-        example: Cx00003
-      original_message_id:
+  PaymentData:
+    type: object
+    required:
+      - instr_id
+      - end_to_end_id
+      - tx_id
+      - amount
+      - currency
+      - date
+      - mtd
+      - prty
+      - cd
+      - debtor
+      - creditor
+    properties:
+      instr_id:
         type: string
-        example: D118091001045732
-      original_end_to_end_id:
+        example: D118091001048175
+      end_to_end_id:
         type: string
         example: NOTPROVIDED
-      original_tx_id:
+      tx_id:
         type: string
-        example: 3
-      original_amount:
+        example: 8e7070743da24402a7fc290bc62fbcd0
+      amount:
         type: number
         format: double
         example: 13.31
-      original_currency:
+      currency:
         type: string
         example: EUR
-      original_date:
+      date:
         type: string
         format: date
-      cancelling_party:
-        $ref: '#/definitions/CancellingParty'
-      cancellation_reason:
-        $ref: '#/definitions/CancellationReason'
-      original_transfer_mtd:
+      mtd:
         type: string
         example: CLRG
-      original_transfer_prtry:
+      prtry:
         type: string
         example: LITAS-MIG
-      original_transfer_cd:
+      cd:
         type: string
         example: SEPA
-      creditor:
-        $ref: '#/definitions/Participant'
       debtor:
         $ref: '#/definitions/Participant'
+      creditor:
+        $ref: '#/definitions/Participant'
   CancellingParty:
     type: object
     properties: