hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

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
Conversation 0 Commits 6 Files Changed 54 +2 -8
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 60bddf7878 - Show all commits

2
src/main/resources/db/changelog/6-hs-booking/620-booking-item/6200-hs-booking-item.sql
View File

@ -25,7 +25,7 @@ create table if not exists hs_booking_item
resources jsonb not null, resources jsonb not null,
constraint chk_hs_booking_item_has_project_or_parent_asset 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) check (projectUuid is not null or parentItemUuid is not null)
); );
--// --//

2
src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql
View File

@ -32,7 +32,7 @@ create table if not exists hs_hosting_asset
config jsonb not null, config jsonb not null,
constraint chk_hs_hosting_asset_has_booking_item_or_parent_asset 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) check (bookingItemUuid is not null or parentAssetUuid is not null)
); );
--// --//

1
src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java
View File

@ -222,7 +222,6 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
final var location = RestAssured // @formatter:off final var location = RestAssured // @formatter:off
.given() .given()
//.header("current-user", "superuser-alex@hostsharing.net", "hs_hosting_asset#"+givenParentAsset.getIdentifier()+":ADMIN")
.header("current-user", "superuser-alex@hostsharing.net") .header("current-user", "superuser-alex@hostsharing.net")
hsh-michaelhoennig marked this conversation as resolved
hsh-marcsandlus commented 2024-06-03 10:45:41 +02:00
Review
Copy Link

kann weg

kann weg
.header("assumed-roles", "hs_hosting_asset#vm1011:ADMIN") .header("assumed-roles", "hs_hosting_asset#vm1011:ADMIN")
.contentType(ContentType.JSON) .contentType(ContentType.JSON)

5
src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/RawRbacRoleEntity.java
View File

@ -41,11 +41,6 @@ public class RawRbacRoleEntity {
@NotNull @NotNull
public static List<String> distinctRoleNamesOf(@NotNull final List<RawRbacRoleEntity> roles) { public static List<String> distinctRoleNamesOf(@NotNull final List<RawRbacRoleEntity> roles) {
// TODO: remove .distinct() once partner.person + partner.contract are removed // TODO: remove .distinct() once partner.person + partner.contract are removed
roles.forEach(r -> {
if (r.getRoleName() == null) {
r.toString();
}
});
return roles.stream().map(RawRbacRoleEntity::getRoleName).sorted().distinct().toList(); return roles.stream().map(RawRbacRoleEntity::getRoleName).sorted().distinct().toList();
} }