corporation transactions + cleanup

2026-06-06 23:44:09 +02:00
parent cd1965acc4
commit 7e0ea10d68
6 changed files with 150 additions and 153 deletions
@@ -309,9 +309,7 @@ paths:
              schema:
                type: array
                items:
-                  oneOf:
-                  - $ref: "#/components/schemas/CombinedLedgerResponse"
-                  - $ref: "#/components/schemas/MainLedgerResponse"
+                  $ref: "#/components/schemas/LedgerResponse"
  /ledgers/{ledgerId}:
    get:
      tags:
@@ -332,9 +330,7 @@ paths:
          content:
            '*/*':
              schema:
-                oneOf:
-                - $ref: "#/components/schemas/CombinedLedgerResponse"
-                - $ref: "#/components/schemas/MainLedgerResponse"
+                $ref: "#/components/schemas/LedgerResponse"
        "400":
          description: The ledger cannot be exposed (system ledger)
        "404":
@@ -419,27 +415,57 @@ paths:
                  $ref: "#/components/schemas/AcquisitionResponse"
 components:
  schemas:
-    RuleClauseResponse:
-      type: object
-      properties:
-        rate:
-          type: string
-          enum:
-          - NONE
-          - VALUE
-          - JITA_BUY
-          - JITA_SELL
-          - EVE_ESTIMATE
-        fromLedgerRef:
-          type: string
-          pattern: "[a-z]+(-[a-z]+)*"
-        toLedgerRef:
-          type: string
-          pattern: "[a-z]+(-[a-z]+)*"
+    IskRuleClauseResponse:
+      allOf:
+      - $ref: "#/components/schemas/RuleClauseResponse"
+      - type: object
+        properties:
+          fromLedgerRef:
+            type: string
+            pattern: "[a-z]+(-[a-z]+)*"
+          toLedgerRef:
+            type: string
+            pattern: "[a-z]+(-[a-z]+)*"
+      required:
+      - fromLedgerRef
+      - toLedgerRef
+    ItemExchangeRuleClauseResponse:
+      allOf:
+      - $ref: "#/components/schemas/RuleClauseResponse"
+      - type: object
+        properties:
+          rate:
+            type: string
+            enum:
+            - NONE
+            - VALUE
+            - JITA_BUY
+            - JITA_SELL
+            - EVE_ESTIMATE
+          fromLedgerRef:
+            type: string
+            pattern: "[a-z]+(-[a-z]+)*"
+          toLedgerRef:
+            type: string
+            pattern: "[a-z]+(-[a-z]+)*"
      required:
      - fromLedgerRef
      - rate
      - toLedgerRef
+    RuleClauseResponse:
+      discriminator:
+        propertyName: type
+        mapping:
+          ISK: "#/components/schemas/IskRuleClauseResponse"
+          ITEM_EXCHANGE: "#/components/schemas/ItemExchangeRuleClauseResponse"
+      oneOf:
+      - $ref: "#/components/schemas/IskRuleClauseResponse"
+      - $ref: "#/components/schemas/ItemExchangeRuleClauseResponse"
+      properties:
+        type:
+          type: string
+      required:
+      - type
    RuleResponse:
      type: object
      properties:
@@ -454,6 +480,8 @@ components:
      properties:
        name:
          type: string
+        usedForAcquisitions:
+          type: boolean
        ledgerRefs:
          type: array
          items:
@@ -467,6 +495,7 @@ components:
      - ledgerRefs
      - name
      - rules
+      - usedForAcquisitions
    RuleBookResponse:
      type: object
      properties:
@@ -475,6 +504,8 @@ components:
          format: uuid
        name:
          type: string
+        usedForAcquisitions:
+          type: boolean
        ledgerRefs:
          type: array
          items:
@@ -489,6 +520,7 @@ components:
      - name
      - ruleBookId
      - rules
+      - usedForAcquisitions
    UpdateMainLedgerRequest:
      type: object
      properties:
@@ -508,10 +540,6 @@ components:
            type: string
          balance:
            type: number
-          type:
-            type: string
-            enum:
-            - MAIN
      required:
      - balance
      - ledgerId
@@ -546,10 +574,6 @@ components:
            items:
              type: string
              format: uuid
-          type:
-            type: string
-            enum:
-            - COMBINED
      required:
      - balance
      - ledgerId
@@ -592,6 +616,8 @@ components:
      properties:
        name:
          type: string
+        usedForAcquisitions:
+          type: boolean
        ledgerRefs:
          type: array
          items:
@@ -605,6 +631,7 @@ components:
      - ledgerRefs
      - name
      - rules
+      - usedForAcquisitions
    CreateMainLedgerRequest:
      type: object
      properties:
@@ -626,15 +653,19 @@ components:
      - memberLedgerIds
      - name
    LedgerResponse:
-      type: object
      discriminator:
        propertyName: type
+        mapping:
+          MAIN: "#/components/schemas/MainLedgerResponse"
+          COMBINED: "#/components/schemas/CombinedLedgerResponse"
+      oneOf:
+      - $ref: "#/components/schemas/MainLedgerResponse"
+      - $ref: "#/components/schemas/CombinedLedgerResponse"
      properties:
        type:
          type: string
-          enum:
-          - MAIN
-          - COMBINED
+      required:
+      - type
    IskTransferResponse:
      allOf:
      - $ref: "#/components/schemas/TransferResponse"
@@ -648,10 +679,6 @@ components:
            format: uuid
          amount:
            type: number
-          type:
-            type: string
-            enum:
-            - ISK
      required:
      - amount
      - fromLedgerId
@@ -673,10 +700,6 @@ components:
          quantity:
            type: integer
            format: int64
-          type:
-            type: string
-            enum:
-            - ITEM
      required:
      - fromLedgerId
      - marketTypeId
@@ -699,9 +722,7 @@ components:
        transfers:
          type: array
          items:
-            oneOf:
-            - $ref: "#/components/schemas/IskTransferResponse"
-            - $ref: "#/components/schemas/ItemTransferResponse"
+            $ref: "#/components/schemas/TransferResponse"
      required:
      - characterId
      - datetime
@@ -709,15 +730,19 @@ components:
      - transactionId
      - transfers
    TransferResponse:
-      type: object
      discriminator:
        propertyName: type
+        mapping:
+          ISK: "#/components/schemas/IskTransferResponse"
+          ITEM: "#/components/schemas/ItemTransferResponse"
+      oneOf:
+      - $ref: "#/components/schemas/IskTransferResponse"
+      - $ref: "#/components/schemas/ItemTransferResponse"
      properties:
        type:
          type: string
-          enum:
-          - ISK
-          - ITEM
+      required:
+      - type
    BalanceResponse:
      type: object
      properties: