From e38ccc9d83706d19c5585fad5aaee648fd429537 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Sat, 9 Nov 2024 14:17:13 +0100 Subject: [PATCH] use .uuid in API instead of a directly attached Uuid --- .../hs-booking/hs-booking-item-schemas.yaml | 6 ++--- .../hs-booking-project-schemas.yaml | 4 +-- .../hs-hosting/hs-hosting-asset-schemas.yaml | 18 ++++++------- .../hs-office-coopassets-schemas.yaml | 6 ++--- .../hs-office-coopshares-schemas.yaml | 6 ++--- .../hs-office/hs-office-debitor-schemas.yaml | 8 +++--- .../hs-office-membership-schemas.yaml | 4 +-- .../hs-office/hs-office-partner-schemas.yaml | 14 +++++----- .../hs-office/hs-office-relation-schemas.yaml | 26 +++++++++---------- .../hs-office-sepamandate-schemas.yaml | 8 +++--- .../rbac/rbac-grant-schemas.yaml | 10 +++---- .../rbac/rbac-role-schemas.yaml | 2 +- .../rbac/rbac-subject-schemas.yaml | 6 ++--- 13 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/main/resources/api-definition/hs-booking/hs-booking-item-schemas.yaml b/src/main/resources/api-definition/hs-booking/hs-booking-item-schemas.yaml index ef0ac307..97ed69f6 100644 --- a/src/main/resources/api-definition/hs-booking/hs-booking-item-schemas.yaml +++ b/src/main/resources/api-definition/hs-booking/hs-booking-item-schemas.yaml @@ -52,11 +52,11 @@ components: HsBookingItemInsert: type: object properties: - projectUuid: + project.uuid: type: string format: uuid nullable: false - parentItemUuid: + parentItem.uuid: type: string format: uuid nullable: false @@ -77,7 +77,7 @@ components: $ref: '../hs-hosting/hs-hosting-asset-schemas.yaml#/components/schemas/HsHostingAssetAutoInsert' required: - caption - - projectUuid + - project.uuid - validFrom - resources additionalProperties: false diff --git a/src/main/resources/api-definition/hs-booking/hs-booking-project-schemas.yaml b/src/main/resources/api-definition/hs-booking/hs-booking-project-schemas.yaml index de95203d..56626290 100644 --- a/src/main/resources/api-definition/hs-booking/hs-booking-project-schemas.yaml +++ b/src/main/resources/api-definition/hs-booking/hs-booking-project-schemas.yaml @@ -25,7 +25,7 @@ components: HsBookingProjectInsert: type: object properties: - debitorUuid: + debitor.uuid: type: string format: uuid nullable: false @@ -35,6 +35,6 @@ components: maxLength: 80 nullable: false required: - - debitorUuid + - debitor.uuid - caption additionalProperties: false diff --git a/src/main/resources/api-definition/hs-hosting/hs-hosting-asset-schemas.yaml b/src/main/resources/api-definition/hs-hosting/hs-hosting-asset-schemas.yaml index 44813162..39fafaeb 100644 --- a/src/main/resources/api-definition/hs-hosting/hs-hosting-asset-schemas.yaml +++ b/src/main/resources/api-definition/hs-hosting/hs-hosting-asset-schemas.yaml @@ -54,7 +54,7 @@ components: caption: type: string nullable: true - alarmContactUuid: + alarmContact.uuid: type: string format: uuid nullable: true @@ -64,11 +64,11 @@ components: HsHostingAssetInsert: type: object properties: - bookingItemUuid: + bookingItem.uuid: type: string format: uuid nullable: true - parentAssetUuid: + parentAsset.uuid: type: string format: uuid nullable: true @@ -84,7 +84,7 @@ components: minLength: 3 maxLength: 80 nullable: false - alarmContactUuid: + alarmContact.uuid: type: string format: uuid nullable: true @@ -99,11 +99,11 @@ components: HsHostingAssetAutoInsert: type: object properties: - parentAssetUuid: + parentAsset.uuid: type: string format: uuid nullable: true - assignedToAssetUuid: + assignedToAsset.uuid: type: string format: uuid type: @@ -118,7 +118,7 @@ components: minLength: 3 maxLength: 80 nullable: false - alarmContactUuid: + alarmContact.uuid: type: string format: uuid nullable: true @@ -147,10 +147,10 @@ components: minLength: 3 maxLength: 80 nullable: false - assignedToAssetUuid: + assignedToAsset.uuid: type: string format: uuid - alarmContactUuid: + alarmContact.uuid: type: string format: uuid nullable: true diff --git a/src/main/resources/api-definition/hs-office/hs-office-coopassets-schemas.yaml b/src/main/resources/api-definition/hs-office/hs-office-coopassets-schemas.yaml index 0c937767..16f4806b 100644 --- a/src/main/resources/api-definition/hs-office/hs-office-coopassets-schemas.yaml +++ b/src/main/resources/api-definition/hs-office/hs-office-coopassets-schemas.yaml @@ -62,7 +62,7 @@ components: HsOfficeCoopAssetsTransactionInsert: type: object properties: - membershipUuid: + membership.uuid: type: string format: uuid nullable: false @@ -80,11 +80,11 @@ components: maxLength: 48 comment: type: string - reverseEntryUuid: + reverseEntry.uuid: type: string format: uuid required: - - membershipUuid + - membership.uuid - transactionType - assetValue - valueDate diff --git a/src/main/resources/api-definition/hs-office/hs-office-coopshares-schemas.yaml b/src/main/resources/api-definition/hs-office/hs-office-coopshares-schemas.yaml index 680321be..50ea65a5 100644 --- a/src/main/resources/api-definition/hs-office/hs-office-coopshares-schemas.yaml +++ b/src/main/resources/api-definition/hs-office/hs-office-coopshares-schemas.yaml @@ -56,7 +56,7 @@ components: HsOfficeCoopSharesTransactionInsert: type: object properties: - membershipUuid: + membership.uuid: type: string format: uuid nullable: false @@ -73,11 +73,11 @@ components: maxLength: 48 comment: type: string - adjustedShareTxUuid: + adjustedShareTx.uuid: type: string format: uuid required: - - membershipUuid + - membership.uuid - transactionType - shareCount - valueDate diff --git a/src/main/resources/api-definition/hs-office/hs-office-debitor-schemas.yaml b/src/main/resources/api-definition/hs-office/hs-office-debitor-schemas.yaml index ed4d8c26..bc3d402e 100644 --- a/src/main/resources/api-definition/hs-office/hs-office-debitor-schemas.yaml +++ b/src/main/resources/api-definition/hs-office/hs-office-debitor-schemas.yaml @@ -41,7 +41,7 @@ components: HsOfficeDebitorPatch: type: object properties: - debitorRelUuid: + debitorRel.uuid: type: string format: uuid nullable: true @@ -61,7 +61,7 @@ components: vatReverseCharge: type: boolean nullable: false - refundBankAccountUuid: + refundBankAccount.uuid: type: string format: uuid nullable: true @@ -75,7 +75,7 @@ components: properties: debitorRel: $ref: 'hs-office-relation-schemas.yaml#/components/schemas/HsOfficeRelationSubInsert' - debitorRelUuid: + debitorRel.uuid: type: string format: uuid debitorNumberSuffix: @@ -92,7 +92,7 @@ components: type: boolean vatReverseCharge: type: boolean - refundBankAccountUuid: + refundBankAccount.uuid: type: string format: uuid defaultPrefix: diff --git a/src/main/resources/api-definition/hs-office/hs-office-membership-schemas.yaml b/src/main/resources/api-definition/hs-office/hs-office-membership-schemas.yaml index 7132cff4..20459f4e 100644 --- a/src/main/resources/api-definition/hs-office/hs-office-membership-schemas.yaml +++ b/src/main/resources/api-definition/hs-office/hs-office-membership-schemas.yaml @@ -62,7 +62,7 @@ components: HsOfficeMembershipInsert: type: object properties: - partnerUuid: + partner.uuid: type: string format: uuid nullable: false @@ -86,7 +86,7 @@ components: nullable: false type: boolean required: - - partnerUuid + - partner.uuid - memberNumberSuffix - validFrom - membershipFeeBillable diff --git a/src/main/resources/api-definition/hs-office/hs-office-partner-schemas.yaml b/src/main/resources/api-definition/hs-office/hs-office-partner-schemas.yaml index 0e5952e1..bd327e10 100644 --- a/src/main/resources/api-definition/hs-office/hs-office-partner-schemas.yaml +++ b/src/main/resources/api-definition/hs-office/hs-office-partner-schemas.yaml @@ -50,7 +50,7 @@ components: HsOfficePartnerPatch: type: object properties: - partnerRelUuid: + partnerRel.uuid: type: string format: uuid nullable: true @@ -103,19 +103,19 @@ components: type: object nullable: false properties: - anchorUuid: + anchor.uuid: type: string format: uuid - holderUuid: + holder.uuid: type: string format: uuid - contactUuid: + contact.uuid: type: string format: uuid required: - - anchorUuid - - holderUuid - - relContactUuid + - anchor.uuid + - holder.uuid + - relContact.uuid HsOfficePartnerDetailsInsert: type: object diff --git a/src/main/resources/api-definition/hs-office/hs-office-relation-schemas.yaml b/src/main/resources/api-definition/hs-office/hs-office-relation-schemas.yaml index cbad776c..16ba6070 100644 --- a/src/main/resources/api-definition/hs-office/hs-office-relation-schemas.yaml +++ b/src/main/resources/api-definition/hs-office/hs-office-relation-schemas.yaml @@ -36,7 +36,7 @@ components: HsOfficeRelationPatch: type: object properties: - contactUuid: + contact.uuid: type: string format: uuid nullable: true @@ -45,10 +45,10 @@ components: HsOfficeRelationInsert: type: object properties: - anchorUuid: + anchor.uuid: type: string format: uuid - holderUuid: + holder.uuid: type: string format: uuid type: @@ -57,32 +57,32 @@ components: mark: type: string nullable: true - contactUuid: + contact.uuid: type: string format: uuid required: - - anchorUuid - - holderUuid + - anchor.uuid + - holder.uuid - type - - contactUuid + - contact.uuid # relation created as a sub-element with implicitly known type HsOfficeRelationSubInsert: type: object properties: - anchorUuid: + anchor.uuid: type: string format: uuid - holderUuid: + holder.uuid: type: string format: uuid mark: type: string nullable: true - contactUuid: + contact.uuid: type: string format: uuid required: - - anchorUuid - - holderUuid - - contactUuid + - anchor.uuid + - holder.uuid + - contact.uuid diff --git a/src/main/resources/api-definition/hs-office/hs-office-sepamandate-schemas.yaml b/src/main/resources/api-definition/hs-office/hs-office-sepamandate-schemas.yaml index 80668ba8..2afd4127 100644 --- a/src/main/resources/api-definition/hs-office/hs-office-sepamandate-schemas.yaml +++ b/src/main/resources/api-definition/hs-office/hs-office-sepamandate-schemas.yaml @@ -48,11 +48,11 @@ components: HsOfficeSepaMandateInsert: type: object properties: - debitorUuid: + debitor.uuid: type: string format: uuid nullable: false - bankAccountUuid: + bankAccount.uuid: type: string format: uuid nullable: false @@ -72,8 +72,8 @@ components: format: date nullable: true required: - - debitorUuid - - bankAccountUuid + - debitor.uuid + - bankAccount.uuid - reference - agreement - validFrom diff --git a/src/main/resources/api-definition/rbac/rbac-grant-schemas.yaml b/src/main/resources/api-definition/rbac/rbac-grant-schemas.yaml index 90700354..c713ebc6 100644 --- a/src/main/resources/api-definition/rbac/rbac-grant-schemas.yaml +++ b/src/main/resources/api-definition/rbac/rbac-grant-schemas.yaml @@ -8,21 +8,21 @@ components: properties: grantedByRoleIdName: type: string - grantedByRoleUuid: + grantedByRole.uuid: type: string format: uuid assumed: type: boolean grantedRoleIdName: type: string - grantedRoleUuid: + grantedRole.uuid: type: string format: uuid granteeSubjectName: type: string - granteeSubjectUuid: + granteeSubject.uuid: type: string format: uuid required: - - grantedRoleUuid - - granteeSubjectUuid + - grantedRole.uuid + - granteeSubject.uuid diff --git a/src/main/resources/api-definition/rbac/rbac-role-schemas.yaml b/src/main/resources/api-definition/rbac/rbac-role-schemas.yaml index 4e5b5f4d..bf72a8e5 100644 --- a/src/main/resources/api-definition/rbac/rbac-role-schemas.yaml +++ b/src/main/resources/api-definition/rbac/rbac-role-schemas.yaml @@ -9,7 +9,7 @@ components: uuid: type: string format: uuid - objectUuid: + object.uuid: type: string format: uuid objectTable: diff --git a/src/main/resources/api-definition/rbac/rbac-subject-schemas.yaml b/src/main/resources/api-definition/rbac/rbac-subject-schemas.yaml index 9cb8ec0f..b907093a 100644 --- a/src/main/resources/api-definition/rbac/rbac-subject-schemas.yaml +++ b/src/main/resources/api-definition/rbac/rbac-subject-schemas.yaml @@ -14,7 +14,7 @@ components: RbacSubjectPermission: type: object properties: - objectUuid: + object.uuid: type: string format: uuid objectTable: @@ -23,10 +23,10 @@ components: type: string roleName: type: string - roleUuid: + role.uuid: type: string format: uuid - permissionUuid: + permission.uuid: type: string format: uuid op: