introduce-booking-project-and-nested-booking-items #57

Merged
hsh-michaelhoennig merged 6 commits from introduce-booking-project-and-nested-booking-items into master 2024-06-03 14:45:29 +02:00
No description provided.
hsh-michaelhoennig added 5 commits 2024-06-03 10:12:20 +02:00
hsh-marcsandlus reviewed 2024-06-03 10:26:57 +02:00
@ -0,0 +25,4 @@
resources jsonb not null,
constraint chk_hs_booking_item_has_project_or_parent_asset
check (type in ('CLOUD_SERVER', 'MANAGED_SERVER') or projectUuid is not null or parentItemUuid is not null)

"type in" entfernen

"type in" entfernen
hsh-michaelhoennig marked this conversation as resolved
hsh-marcsandlus reviewed 2024-06-03 10:30:13 +02:00
@ -33,2 +33,3 @@
constraint chk_hs_hosting_asset_has_booking_item_or_parent_asset check (bookingItemUuid is not null or parentAssetUuid is not null)
constraint chk_hs_hosting_asset_has_booking_item_or_parent_asset
check (type in ('CLOUD_SERVER', 'MANAGED_SERVER') or bookingItemUuid is not null or parentAssetUuid is not null)

"type in" entfernen

"type in" entfernen
hsh-michaelhoennig marked this conversation as resolved
hsh-marcsandlus reviewed 2024-06-03 10:45:41 +02:00
@ -222,3 +225,1 @@
}
""".formatted(givenParentAsset.getUuid()))
.port(port)
//.header("current-user", "superuser-alex@hostsharing.net", "hs_hosting_asset#"+givenParentAsset.getIdentifier()+":ADMIN")

kann weg

kann weg
hsh-michaelhoennig marked this conversation as resolved
hsh-marcsandlus reviewed 2024-06-03 10:49:37 +02:00
@ -41,6 +41,11 @@ public class RawRbacRoleEntity {
@NotNull
public static List<String> distinctRoleNamesOf(@NotNull final List<RawRbacRoleEntity> roles) {
// TODO: remove .distinct() once partner.person + partner.contract are removed
roles.forEach(r -> {

remove

remove
hsh-michaelhoennig marked this conversation as resolved
hsh-marcsandlus approved these changes 2024-06-03 10:49:48 +02:00
hsh-michaelhoennig added 1 commit 2024-06-03 14:45:05 +02:00
hsh-michaelhoennig merged commit c23baca47a into master 2024-06-03 14:45:29 +02:00
hsh-michaelhoennig deleted branch introduce-booking-project-and-nested-booking-items 2024-06-03 14:45:29 +02:00
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: hostsharing/hs.hsadmin.ng#57
No description provided.