src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorEntity.java

@@ -1,55 +0,0 @@
-package net.hostsharing.hsadminng.hs.booking.debitor;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import net.hostsharing.hsadminng.errors.DisplayName;
-import net.hostsharing.hsadminng.stringify.Stringify;
-import net.hostsharing.hsadminng.stringify.Stringifyable;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import java.util.UUID;
-
-import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
-
-// a partial HsOfficeDebitorEntity to reduce the number of SQL queries to load the entity
-@Entity
-@Table(name = "hs_office_debitor_rv") // TODO.impl: create a readonly view for this, which also joins the partner-number?
-@Getter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@DisplayName("BookingDebitor")
-public class HsBookingDebitorEntity implements Stringifyable {
-
-    public static final String DEBITOR_NUMBER_TAG = "D-";
-
-    private static Stringify<HsBookingDebitorEntity> stringify =
-            stringify(HsBookingDebitorEntity.class, "booking-debitor")
-                    .withIdProp(HsBookingDebitorEntity::toShortString)
-                    .withProp(HsBookingDebitorEntity::getDefaultPrefix)
-                    .quotedValues(false);
-
-    @Id
-    private UUID uuid;
-
-    @Column(name = "debitornumbersuffix", length = 2)
-    private String debitorNumberSuffix;
-
-    @Column(name = "defaultprefix", columnDefinition = "char(3) not null")
-    private String defaultPrefix;
-
-    @Override
-    public String toString() {
-        return stringify.apply(this);
-    }
-
-    @Override
-    public String toShortString() {
-        return DEBITOR_NUMBER_TAG + defaultPrefix;
-    }
-}

src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemEntity.java

@@ -160,10 +160,6 @@ public class HsBookingItemEntity implements Stringifyable, RbacObject, Validatab
         return resources;
     }
 
-    public HsBookingProjectEntity getRelatedProject() {
-        return project != null ? project : parentItem.getRelatedProject();
-    }
-
     public static RbacView rbac() {
         return rbacViewFor("bookingItem", HsBookingItemEntity.class)
                 .withIdentityView(SQL.projection("caption"))

src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRepository.java

@@ -8,10 +8,9 @@ import java.util.UUID;
 
 public interface HsBookingItemRepository extends Repository<HsBookingItemEntity, UUID> {
 
+    List<HsBookingItemEntity> findAll();
     Optional<HsBookingItemEntity> findByUuid(final UUID bookingItemUuid);
 
-    List<HsBookingItemEntity> findByCaption(String bookingItemCaption);
-
     List<HsBookingItemEntity> findAllByProjectUuid(final UUID projectItemUuid);
 
     HsBookingItemEntity save(HsBookingItemEntity current);

src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectEntity.java

@@ -1,7 +1,6 @@
 package net.hostsharing.hsadminng.hs.booking.project;
 
 import lombok.*;
-import net.hostsharing.hsadminng.hs.booking.debitor.HsBookingDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationEntity;
 import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
@@ -50,7 +49,7 @@ public class HsBookingProjectEntity implements Stringifyable, RbacObject {
 
     @ManyToOne(optional = false)
     @JoinColumn(name = "debitoruuid")
-    private HsBookingDebitorEntity debitor;
+    private HsOfficeDebitorEntity debitor;
 
     @Column(name = "caption")
     private String caption;
@@ -62,7 +61,7 @@ public class HsBookingProjectEntity implements Stringifyable, RbacObject {
 
     @Override
     public String toShortString() {
-        return ofNullable(debitor).map(HsBookingDebitorEntity::toShortString).orElse("D-???????") +
+        return ofNullable(debitor).map(HsOfficeDebitorEntity::toShortString).orElse("D-???????") +
                 ":" + caption;
     }
 

src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRepository.java

@@ -8,8 +8,8 @@ import java.util.UUID;
 
 public interface HsBookingProjectRepository extends Repository<HsBookingProjectEntity, UUID> {
 
+    List<HsBookingProjectEntity> findAll();
     Optional<HsBookingProjectEntity> findByUuid(final UUID bookingProjectUuid);
-    List<HsBookingProjectEntity> findByCaption(final String projectCaption);
 
     List<HsBookingProjectEntity> findAllByDebitorUuid(final UUID bookingProjectUuid);
 

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetEntity.java

@@ -33,7 +33,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.MANAGED_SERVER;
 import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingCase;
 import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
 import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
 import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NULLABLE;
@@ -63,7 +65,6 @@ public class HsHostingAssetEntity implements Stringifyable, RbacObject, Validata
             .withProp(HsHostingAssetEntity::getIdentifier)
             .withProp(HsHostingAssetEntity::getCaption)
             .withProp(HsHostingAssetEntity::getParentAsset)
-            .withProp(HsHostingAssetEntity::getAssignedToAsset)
             .withProp(HsHostingAssetEntity::getBookingItem)
             .withProp(HsHostingAssetEntity::getConfig)
             .quotedValues(false);
@@ -83,10 +84,6 @@ public class HsHostingAssetEntity implements Stringifyable, RbacObject, Validata
     @JoinColumn(name = "parentassetuuid")
     private HsHostingAssetEntity parentAsset;
 
-    @ManyToOne
-    @JoinColumn(name = "assignedtoassetuuid")
-    private HsHostingAssetEntity assignedToAsset;
-
     @Column(name = "type")
     @Enumerated(EnumType.STRING)
     private HsHostingAssetType type;
@@ -147,17 +144,12 @@ public class HsHostingAssetEntity implements Stringifyable, RbacObject, Validata
                     NULLABLE)
                 .toRole("bookingItem", AGENT).grantPermission(INSERT)
 
-                .importEntityAlias("parentAsset", HsHostingAssetEntity.class, usingDefaultCase(),
+                .importEntityAlias("parentAsset", HsHostingAssetEntity.class, usingCase(MANAGED_SERVER),
                         dependsOnColumn("parentAssetUuid"),
                         directlyFetchedByDependsOnColumn(),
                         NULLABLE)
                 .toRole("parentAsset", ADMIN).grantPermission(INSERT)
 
-                .importEntityAlias("assignedToAsset", HsHostingAssetEntity.class, usingDefaultCase(),
-                        dependsOnColumn("assignedToAssetUuid"),
-                        directlyFetchedByDependsOnColumn(),
-                        NULLABLE)
-
                 .createRole(OWNER, (with) -> {
                     with.incomingSuperRole("bookingItem", ADMIN);
                     with.incomingSuperRole("parentAsset", ADMIN);
@@ -168,15 +160,13 @@ public class HsHostingAssetEntity implements Stringifyable, RbacObject, Validata
                     with.incomingSuperRole("parentAsset", AGENT);
                     with.permission(UPDATE);
                 })
-                .createSubRole(AGENT, (with) -> {
-                    with.outgoingSubRole("assignedToAsset", TENANT);
-                })
+                .createSubRole(AGENT)
                 .createSubRole(TENANT, (with) -> {
                     with.outgoingSubRole("bookingItem", TENANT);
                     with.outgoingSubRole("parentAsset", TENANT);
                     with.permission(SELECT);
                 })
-                .limitDiagramTo("asset", "bookingItem", "bookingItem.debitorRel", "parentAsset", "assignedToAsset", "global");
+                .limitDiagramTo("asset", "bookingItem", "bookingItem.debitorRel", "parentServer", "global");
     }
 
     public static void main(String[] args) throws IOException {

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRepository.java

@@ -10,10 +10,9 @@ import java.util.UUID;
 
 public interface HsHostingAssetRepository extends Repository<HsHostingAssetEntity, UUID> {
 
+    List<HsHostingAssetEntity> findAll();
     Optional<HsHostingAssetEntity> findByUuid(final UUID serverUuid);
 
-    List<HsHostingAssetEntity> findByIdentifier(String assetIdentifier);
-
     @Query("""
         SELECT asset FROM HsHostingAssetEntity asset
             WHERE (:projectUuid IS NULL OR asset.bookingItem.project.uuid = :projectUuid)

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java

@@ -6,13 +6,11 @@ public enum HsHostingAssetType {
     MANAGED_SERVER, // named e.g. vm1234
     MANAGED_WEBSPACE(MANAGED_SERVER), // named eg. xyz00
     UNIX_USER(MANAGED_WEBSPACE), // named e.g. xyz00-abc
-    DOMAIN_DNS_SETUP(MANAGED_WEBSPACE), // named e.g. example.org
-    DOMAIN_HTTP_SETUP(MANAGED_WEBSPACE), // named e.g. example.org
-    DOMAIN_EMAIL_SETUP(MANAGED_WEBSPACE), // named e.g. example.org
+    DOMAIN_SETUP(UNIX_USER), // named e.g. example.org
 
     // TODO.spec: SECURE_MX
     EMAIL_ALIAS(MANAGED_WEBSPACE), // named e.g. xyz00-abc
-    EMAIL_ADDRESS(DOMAIN_EMAIL_SETUP), // named e.g. sample@example.org
+    EMAIL_ADDRESS(DOMAIN_SETUP), // named e.g. sample@example.org
     PGSQL_USER(MANAGED_WEBSPACE), // named e.g. xyz00_abc
     PGSQL_DATABASE(MANAGED_WEBSPACE), // named e.g. xyz00_abc, TODO.spec: or PGSQL_USER?
     MARIADB_USER(MANAGED_WEBSPACE), // named e.g. xyz00_abc

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsCloudServerHostingAssetValidator.java

@@ -0,0 +1,20 @@
+package net.hostsharing.hsadminng.hs.hosting.asset.validators;
+
+import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetEntity;
+import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType;
+import net.hostsharing.hsadminng.hs.validation.HsEntityValidator;
+
+import static net.hostsharing.hsadminng.hs.validation.IntegerPropertyValidator.integerProperty;
+
+class HsCloudServerHostingAssetValidator extends HsEntityValidator<HsHostingAssetEntity, HsHostingAssetType> {
+
+    public HsCloudServerHostingAssetValidator() {
+        super(
+                integerProperty("CPUs").min(1).max(32).required(),
+                integerProperty("RAM").unit("GB").min(1).max(128).required(),
+                integerProperty("SSD").unit("GB").min(25).max(1000).step(25).required(),
+                integerProperty("HDD").unit("GB").min(0).max(4000).step(250).optional(),
+                integerProperty("Traffic").unit("GB").min(250).max(10000).step(250).required()
+        );
+    }
+}

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidators.java

@@ -20,7 +20,7 @@ public class HsHostingAssetEntityValidators {
 
     private static final Map<Enum<HsHostingAssetType>, HsEntityValidator<HsHostingAssetEntity, HsHostingAssetType>> validators = new HashMap<>();
     static {
-        register(CLOUD_SERVER, new HsEntityValidator<>());
+        register(CLOUD_SERVER, new HsCloudServerHostingAssetValidator());
         register(MANAGED_SERVER, new HsManagedServerHostingAssetValidator());
         register(MANAGED_WEBSPACE, new HsManagedWebspaceHostingAssetValidator());
     }

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsManagedServerHostingAssetValidator.java

@@ -10,13 +10,11 @@ class HsManagedServerHostingAssetValidator extends HsEntityValidator<HsHostingAs
 
     public HsManagedServerHostingAssetValidator() {
         super(
-                integerProperty("monit_min_free_ssd").min(1).max(1000).optional(),
-                integerProperty("monit_min_free_hdd").min(1).max(4000).optional(),
-                integerProperty("monit_max_ssd_usage").unit("%").min(10).max(100).required(),
-                integerProperty("monit_max_hdd_usage").unit("%").min(10).max(100).optional(),
-                integerProperty("monit_max_cpu_usage").unit("%").min(10).max(100).required(),
-                integerProperty("monit_max_ram_usage").unit("%").min(10).max(100).required()
-                // TODO: stringProperty("monit_alarm_email").unit("GB").optional()
+                integerProperty("CPUs").min(1).max(32).required(),
+                integerProperty("RAM").unit("GB").min(1).max(128).required(),
+                integerProperty("SSD").unit("GB").min(25).max(1000).step(25).required(),
+                integerProperty("HDD").unit("GB").min(0).max(4000).step(250).optional(),
+                integerProperty("Traffic").unit("GB").min(250).max(10000).step(250).required()
         );
     }
 }

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsManagedWebspaceHostingAssetValidator.java

@@ -6,9 +6,15 @@ import net.hostsharing.hsadminng.hs.validation.HsEntityValidator;
 
 import java.util.List;
 
+import static net.hostsharing.hsadminng.hs.validation.IntegerPropertyValidator.integerProperty;
 
 class HsManagedWebspaceHostingAssetValidator extends HsEntityValidator<HsHostingAssetEntity, HsHostingAssetType> {
     public HsManagedWebspaceHostingAssetValidator() {
+        super(
+            integerProperty("SSD").unit("GB").min(1).max(100).step(1).required(),
+            integerProperty("HDD").unit("GB").min(0).max(250).step(10).optional(),
+            integerProperty("Traffic").unit("GB").min(10).max(1000).step(10).required()
+        );
     }
 
     @Override

src/main/resources/api-definition/hs-hosting/hs-hosting-asset-schemas.yaml

@@ -10,9 +10,7 @@ components:
                 - MANAGED_SERVER
                 - MANAGED_WEBSPACE
                 - UNIX_USER
-                - DOMAIN_DNS_SETUP
-                - DOMAIN_HTTP_SETUP
-                - DOMAIN_EMAIL_SETUP
+                - DOMAIN_SETUP
                 - EMAIL_ALIAS
                 - EMAIL_ADDRESS
                 - PGSQL_USER

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

@@ -9,9 +9,7 @@ create type HsHostingAssetType as enum (
     'MANAGED_SERVER',
     'MANAGED_WEBSPACE',
     'UNIX_USER',
-    'DOMAIN_DNS_SETUP',
-    'DOMAIN_HTTP_SETUP',
-    'DOMAIN_EMAIL_SETUP',
+    'DOMAIN_SETUP',
     'EMAIL_ALIAS',
     'EMAIL_ADDRESS',
     'PGSQL_USER',
@@ -29,7 +27,6 @@ create table if not exists hs_hosting_asset
     bookingItemUuid     uuid null references hs_booking_item(uuid),
     type                HsHostingAssetType not null,
     parentAssetUuid     uuid null references hs_hosting_asset(uuid) initially deferred,
-    assignedToAssetUuid uuid null references hs_hosting_asset(uuid) initially deferred,
     identifier          varchar(80) not null,
     caption             varchar(80),
     config              jsonb not null,
@@ -62,11 +59,9 @@ begin
         when 'MANAGED_SERVER' then null
         when 'MANAGED_WEBSPACE' then 'MANAGED_SERVER'
         when 'UNIX_USER' then 'MANAGED_WEBSPACE'
-        when 'DOMAIN_DNS_SETUP' then 'MANAGED_WEBSPACE'
-        when 'DOMAIN_HTTP_SETUP' then 'MANAGED_WEBSPACE'
-        when 'DOMAIN_EMAIL_SETUP' then 'MANAGED_WEBSPACE'
+        when 'DOMAIN_SETUP' then 'UNIX_USER'
         when 'EMAIL_ALIAS' then 'MANAGED_WEBSPACE'
-        when 'EMAIL_ADDRESS' then 'DOMAIN_EMAIL_SETUP'
+        when 'EMAIL_ADDRESS' then 'DOMAIN_SETUP'
         when 'PGSQL_USER' then 'MANAGED_WEBSPACE'
         when 'PGSQL_DATABASE' then 'MANAGED_WEBSPACE'
         when 'MARIADB_USER' then 'MANAGED_WEBSPACE'

src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac.md

@@ -25,30 +25,40 @@ subgraph asset["`**asset**`"]
         perm:asset:INSERT{{asset:INSERT}}
         perm:asset:DELETE{{asset:DELETE}}
         perm:asset:UPDATE{{asset:UPDATE}}
+        perm:asset:SELECT{{asset:SELECT}}
     end
 end
 
-subgraph assignedToAsset["`**assignedToAsset**`"]
+subgraph bookingItem["`**bookingItem**`"]
     direction TB
-    style assignedToAsset fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+    style bookingItem fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph assignedToAsset:roles[ ]
-        style assignedToAsset:roles fill:#99bcdb,stroke:white
+    subgraph bookingItem:roles[ ]
+        style bookingItem:roles fill:#99bcdb,stroke:white
 
-        role:assignedToAsset:TENANT[[assignedToAsset:TENANT]]
+        role:bookingItem:OWNER[[bookingItem:OWNER]]
+        role:bookingItem:ADMIN[[bookingItem:ADMIN]]
+        role:bookingItem:AGENT[[bookingItem:AGENT]]
+        role:bookingItem:TENANT[[bookingItem:TENANT]]
     end
 end
 
 %% granting roles to roles
+role:bookingItem:OWNER -.-> role:bookingItem:ADMIN
+role:bookingItem:ADMIN -.-> role:bookingItem:AGENT
+role:bookingItem:AGENT -.-> role:bookingItem:TENANT
+role:bookingItem:ADMIN ==> role:asset:OWNER
 role:asset:OWNER ==> role:asset:ADMIN
+role:bookingItem:AGENT ==> role:asset:ADMIN
 role:asset:ADMIN ==> role:asset:AGENT
-role:asset:AGENT ==> role:assignedToAsset:TENANT
 role:asset:AGENT ==> role:asset:TENANT
-role:assignedToAsset:TENANT ==> role:asset:TENANT
+role:asset:TENANT ==> role:bookingItem:TENANT
 
 %% granting permissions to roles
 role:global:ADMIN ==> perm:asset:INSERT
+role:bookingItem:AGENT ==> perm:asset:INSERT
 role:asset:OWNER ==> perm:asset:DELETE
 role:asset:ADMIN ==> perm:asset:UPDATE
+role:asset:TENANT ==> perm:asset:SELECT
 
 ```

src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac.sql

@@ -31,7 +31,6 @@ create or replace procedure buildRbacSystemForHsHostingAsset(
 
 declare
     newBookingItem hs_booking_item;
-    newAssignedToAsset hs_hosting_asset;
     newParentAsset hs_hosting_asset;
 
 begin
@@ -39,8 +38,6 @@ begin
 
     SELECT * FROM hs_booking_item WHERE uuid = NEW.bookingItemUuid    INTO newBookingItem;
 
-    SELECT * FROM hs_hosting_asset WHERE uuid = NEW.assignedToAssetUuid    INTO newAssignedToAsset;
-
     SELECT * FROM hs_hosting_asset WHERE uuid = NEW.parentAssetUuid    INTO newParentAsset;
 
     perform createRoleWithGrants(
@@ -62,15 +59,13 @@ begin
 
     perform createRoleWithGrants(
         hsHostingAssetAGENT(NEW),
-            incomingSuperRoles => array[hsHostingAssetADMIN(NEW)],
-            outgoingSubRoles => array[hsHostingAssetTENANT(newAssignedToAsset)]
+            incomingSuperRoles => array[hsHostingAssetADMIN(NEW)]
     );
 
     perform createRoleWithGrants(
         hsHostingAssetTENANT(NEW),
-            incomingSuperRoles => array[
-            	hsHostingAssetAGENT(NEW),
-            	hsHostingAssetTENANT(newAssignedToAsset)],
+            permissions => array['SELECT'],
+            incomingSuperRoles => array[hsHostingAssetAGENT(NEW)],
             outgoingSubRoles => array[
             	hsBookingItemTENANT(newBookingItem),
             	hsHostingAssetTENANT(newParentAsset)]
@@ -202,11 +197,11 @@ create or replace function new_hs_hosting_asset_grants_insert_to_hs_hosting_asse
     language plpgsql
     strict as $$
 begin
-    -- unconditional for all rows in that table
+    if NEW.type = 'MANAGED_SERVER' then
         call grantPermissionToRole(
             createPermission(NEW.uuid, 'INSERT', 'hs_hosting_asset'),
             hsHostingAssetADMIN(NEW));
-    -- end.
+    end if;
     return NEW;
 end; $$;
 

src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7018-hs-hosting-asset-test-data.sql

@@ -16,11 +16,7 @@ declare
     relatedDebitor                  hs_office_debitor;
     relatedPrivateCloudBookingItem  hs_booking_item;
     relatedManagedServerBookingItem hs_booking_item;
-    debitorNumberSuffix             varchar;
-    defaultPrefix                   varchar;
     managedServerUuid               uuid;
-    managedWebspaceUuid             uuid;
-    webUnixUserUuid                 uuid;
 begin
     currentTask := 'creating hosting-asset test-data ' || givenProjectCaption;
     call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN');
@@ -49,18 +45,12 @@ begin
     assert relatedManagedServerBookingItem.uuid is not null, 'relatedManagedServerBookingItem for "' || givenProjectCaption|| '" must not be null';
 
     select uuid_generate_v4() into managedServerUuid;
-    select uuid_generate_v4() into managedWebspaceUuid;
-    select uuid_generate_v4() into webUnixUserUuid;
-    debitorNumberSuffix := relatedDebitor.debitorNumberSuffix;
-    defaultPrefix := relatedDebitor.defaultPrefix;
 
     insert into hs_hosting_asset
-           (uuid,                bookingitemuuid,                      type,                parentAssetUuid,     assignedToAssetUuid,   identifier,                      caption,                     config)
-    values (managedServerUuid,   relatedPrivateCloudBookingItem.uuid,  'MANAGED_SERVER',    null,                null,                  'vm10' || debitorNumberSuffix,   'some ManagedServer',        '{ "extra": 42 }'::jsonb),
-           (uuid_generate_v4(),  relatedPrivateCloudBookingItem.uuid,  'CLOUD_SERVER',      null,                null,                  'vm20' || debitorNumberSuffix,   'another CloudServer',       '{ "extra": 42 }'::jsonb),
-           (managedWebspaceUuid, relatedManagedServerBookingItem.uuid, 'MANAGED_WEBSPACE',  managedServerUuid,   null,                  defaultPrefix || '01',           'some Webspace',             '{ "extra": 42 }'::jsonb),
-           (webUnixUserUuid,     null,                                 'UNIX_USER',         managedWebspaceUuid, null,                  defaultPrefix || '01-web',       'some UnixUser for Website', '{ "SSD-soft-quota": "128", "SSD-hard-quota": "256", "HDD-soft-quota": "512", "HDD-hard-quota": "1024", "extra": 42 }'::jsonb),
-           (uuid_generate_v4(),  null,                                 'DOMAIN_HTTP_SETUP', managedWebspaceUuid, webUnixUserUuid,       defaultPrefix || '.example.org', 'some Domain-HTTP-Setup',    '{ "option-htdocsfallback": true, "use-fcgiphpbin": "/usr/lib/cgi-bin/php", "validsubdomainnames": "*", "extra": 42 }'::jsonb);
+           (uuid,               bookingitemuuid,                      type,               parentAssetUuid,   identifier,                                    caption,                config)
+    values (managedServerUuid,  relatedPrivateCloudBookingItem.uuid,  'MANAGED_SERVER',   null,             'vm10' || relatedDebitor.debitorNumberSuffix,   'some ManagedServer',   '{ "CPU": 2, "SDD": 512, "extra": 42 }'::jsonb),
+           (uuid_generate_v4(), relatedPrivateCloudBookingItem.uuid,  'CLOUD_SERVER',     null,              'vm20' || relatedDebitor.debitorNumberSuffix,  'another CloudServer',  '{ "CPU": 2, "HDD": 1024, "extra": 42 }'::jsonb),
+           (uuid_generate_v4(), relatedManagedServerBookingItem.uuid, 'MANAGED_WEBSPACE', managedServerUuid, relatedDebitor.defaultPrefix || '01',          'some Webspace',        '{ "RAM": 1, "SDD": 512, "HDD": 2048, "extra": 42 }'::jsonb);
 end; $$;
 --//
 

src/test/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorEntityTest.java

@@ -1,33 +0,0 @@
-package net.hostsharing.hsadminng.hs.booking.debitor;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class HsBookingDebitorEntityTest {
-
-    @Test
-    void toStringContainsDebitorNumberAndDefaultPrefix() {
-        final var given = HsBookingDebitorEntity.builder()
-                .debitorNumberSuffix("67")
-                .defaultPrefix("som")
-                .build();
-
-        final var result = given.toString();
-
-        assertThat(result).isEqualTo("booking-debitor(D-som: som)"); // FIXME: I want "booking-debitor(D-1000167: som)"
-    }
-
-    @Test
-    void toShortStringContainsDefaultPrefix() {
-        final var given = HsBookingDebitorEntity.builder()
-                .debitorNumberSuffix("67")
-                .defaultPrefix("som")
-                .build();
-
-        final var result = given.toShortString();
-
-        assertThat(result).isEqualTo("D-som"); // FIXME: I want "booking-debitor(D-1000167: som)"
-    }
-
-}

src/test/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorRepository.java

@@ -1,16 +0,0 @@
-package net.hostsharing.hsadminng.hs.booking.debitor;
-
-import org.springframework.data.repository.Repository;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-public interface HsBookingDebitorRepository extends Repository<HsBookingDebitorEntity, UUID> {
-
-    Optional<HsBookingDebitorEntity> findByUuid(UUID id);
-
-    List<HsBookingDebitorEntity> findByDefaultPrefix(String defaultPrefix);
-
-    long count();
-}

src/test/java/net/hostsharing/hsadminng/hs/booking/debitor/TestHsBookingDebitor.java

@@ -1,15 +0,0 @@
-package net.hostsharing.hsadminng.hs.booking.debitor;
-
-import lombok.experimental.UtilityClass;
-
-
-@UtilityClass
-public class TestHsBookingDebitor {
-
-    public String DEFAULT_DEBITOR_SUFFIX = "00";
-
-    public static final HsBookingDebitorEntity TEST_BOOKING_DEBITOR = HsBookingDebitorEntity.builder()
-            .debitorNumberSuffix(DEFAULT_DEBITOR_SUFFIX)
-            .defaultPrefix("abc")
-            .build();
-}

src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemControllerAcceptanceTest.java

@@ -6,6 +6,7 @@ import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectEntity;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRepository;
+import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
 import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
@@ -16,6 +17,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.transaction.annotation.Transactional;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
@@ -50,6 +53,9 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
     @Autowired
     JpaAttempt jpaAttempt;
 
+    @PersistenceContext
+    EntityManager em;
+
     @Nested
     class ListBookingItems {
 
@@ -174,10 +180,10 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
         @Test
         void globalAdmin_canGetArbitraryBookingItem() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenBookingItemUuid = bookingItemRepo.findByCaption("some ManagedWebspace").stream()
-                            .filter(bi -> belongsToDebitorWithDefaultPrefix(bi, "fir"))
-                            .map(HsBookingItemEntity::getUuid)
-                            .findAny().orElseThrow();
+            final var givenBookingItemUuid = bookingItemRepo.findAll().stream()
+                            .filter(bi -> belongsToDebitorNumber(bi, 1000111))
+                            .filter(item -> item.getCaption().equals("some ManagedWebspace"))
+                            .findAny().orElseThrow().getUuid();
 
             RestAssured // @formatter:off
                 .given()
@@ -207,8 +213,8 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
         @Test
         void normalUser_canNotGetUnrelatedBookingItem() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenBookingItemUuid = bookingItemRepo.findByCaption("separate ManagedServer").stream()
-                    .filter(bi -> belongsToDebitorWithDefaultPrefix(bi, "sec"))
+            final var givenBookingItemUuid = bookingItemRepo.findAll().stream()
+                    .filter(bi -> belongsToDebitorNumber(bi, 1000212))
                     .map(HsBookingItemEntity::getUuid)
                     .findAny().orElseThrow();
 
@@ -223,17 +229,16 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
         }
 
         @Test
-        void projectAdmin_canGetRelatedBookingItem() {
+        void debitorAgentUser_canGetRelatedBookingItem() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenBookingItemUuid = bookingItemRepo.findByCaption("separate ManagedServer").stream()
-                    .filter(bi -> belongsToDebitorWithDefaultPrefix(bi, "thi"))
-                    .map(HsBookingItemEntity::getUuid)
-                    .findAny().orElseThrow();
+            final var givenBookingItemUuid = bookingItemRepo.findAll().stream()
+                    .filter(bi -> belongsToDebitorNumber(bi, 1000313))
+                    .filter(item -> item.getCaption().equals("separate ManagedServer"))
+                    .findAny().orElseThrow().getUuid();
 
             RestAssured // @formatter:off
                 .given()
-                    .header("current-user", "superuser-alex@hostsharing.net")
-                    .header("assumend-roles", "hs_booking_project#D-1000212-D-1000212defaultproject")
+                    .header("current-user", "person-TuckerJack@example.com")
                     .port(port)
                 .when()
                     .get("http://localhost/api/hs/booking/items/" + givenBookingItemUuid)
@@ -256,11 +261,12 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
                     """)); // @formatter:on
         }
 
-        private static boolean belongsToDebitorWithDefaultPrefix(final HsBookingItemEntity bi, final String defaultPrefix) {
+        private static boolean belongsToDebitorNumber(final HsBookingItemEntity bi, final int i) {
             return ofNullable(bi)
                     .map(HsBookingItemEntity::getProject)
                     .map(HsBookingProjectEntity::getDebitor)
-                    .map(bd -> bd.getDefaultPrefix().equals(defaultPrefix))
+                    .map(HsOfficeDebitorEntity::getDebitorNumber)
+                    .filter(debitorNumber -> debitorNumber == i)
                     .isPresent();
         }
     }
@@ -311,7 +317,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
             context.define("superuser-alex@hostsharing.net");
             assertThat(bookingItemRepo.findByUuid(givenBookingItem.getUuid())).isPresent().get()
                     .matches(mandate -> {
-                        assertThat(mandate.getProject().getDebitor().toString()).isEqualTo("booking-debitor(D-fir: fir)");
+                        assertThat(mandate.getProject().getDebitor().toString()).isEqualTo("debitor(D-1000111: rel(anchor='LP First GmbH', type='DEBITOR', holder='LP First GmbH'), fir)");
                         assertThat(mandate.getValidFrom()).isEqualTo("2022-11-01");
                         assertThat(mandate.getValidTo()).isEqualTo("2022-12-31");
                         return true;

src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemEntityUnitTest.java

@@ -29,14 +29,14 @@ class HsBookingItemEntityUnitTest {
     void toStringContainsAllPropertiesAndResourcesSortedByKey() {
         final var result = givenBookingItem.toString();
 
-        assertThat(result).isEqualTo("HsBookingItemEntity(D-abc:test project, CLOUD_SERVER, [2020-01-01,2031-01-01), some caption, { CPUs: 2, HDD-storage: 2048, SSD-storage: 512 })");
+        assertThat(result).isEqualTo("HsBookingItemEntity(D-1000100:test project, CLOUD_SERVER, [2020-01-01,2031-01-01), some caption, { CPUs: 2, HDD-storage: 2048, SSD-storage: 512 })");
     }
 
     @Test
     void toShortStringContainsOnlyMemberNumberAndCaption() {
         final var result = givenBookingItem.toShortString();
 
-        assertThat(result).isEqualTo("D-abc:test project:some caption");
+        assertThat(result).isEqualTo("D-1000100:test project:some caption");
     }
 
     @Test

src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRepositoryIntegrationTest.java

@@ -174,9 +174,9 @@ class HsBookingItemRepositoryIntegrationTest extends ContextBasedTestWithCleanup
             // then
             allTheseBookingItemsAreReturned(
                     result,
-                    "HsBookingItemEntity(D-sec:D-1000212 default project, MANAGED_WEBSPACE, [2022-10-01,), some ManagedWebspace, { Daemons: 2, Multi: 4, SDD: 512, Traffic: 12 })",
-                    "HsBookingItemEntity(D-sec:D-1000212 default project, MANAGED_SERVER, [2022-10-01,), separate ManagedServer, { CPUs: 2, RAM: 8, SDD: 512, Traffic: 42 })",
-                    "HsBookingItemEntity(D-sec:D-1000212 default project, PRIVATE_CLOUD, [2024-04-01,), some PrivateCloud, { CPUs: 10, HDD: 10240, SDD: 10240, Traffic: 42 })");
+                    "HsBookingItemEntity(D-1000212:D-1000212 default project, MANAGED_SERVER, [2022-10-01,), separate ManagedServer, { CPUs: 2, RAM: 8, SDD: 512, Traffic: 42 })",
+                    "HsBookingItemEntity(D-1000212:D-1000212 default project, MANAGED_WEBSPACE, [2022-10-01,), some ManagedWebspace, { Daemons: 2, Multi: 4, SDD: 512, Traffic: 12 })",
+                    "HsBookingItemEntity(D-1000212:D-1000212 default project, PRIVATE_CLOUD, [2024-04-01,), some PrivateCloud, { CPUs: 10, HDD: 10240, SDD: 10240, Traffic: 42 })");
         }
 
         @Test
@@ -194,9 +194,9 @@ class HsBookingItemRepositoryIntegrationTest extends ContextBasedTestWithCleanup
             // then:
             exactlyTheseBookingItemsAreReturned(
                     result,
-                    "HsBookingItemEntity(D-fir:D-1000111 default project, MANAGED_SERVER, [2022-10-01,), separate ManagedServer, { CPUs: 2, RAM: 8, SDD: 512, Traffic: 42 })",
-                    "HsBookingItemEntity(D-fir:D-1000111 default project, MANAGED_WEBSPACE, [2022-10-01,), some ManagedWebspace, { Daemons: 2, Multi: 4, SDD: 512, Traffic: 12 })",
-                    "HsBookingItemEntity(D-fir:D-1000111 default project, PRIVATE_CLOUD, [2024-04-01,), some PrivateCloud, { CPUs: 10, HDD: 10240, SDD: 10240, Traffic: 42 })");
+                    "HsBookingItemEntity(D-1000111:D-1000111 default project, MANAGED_SERVER, [2022-10-01,), separate ManagedServer, { CPUs: 2, RAM: 8, SDD: 512, Traffic: 42 })",
+                    "HsBookingItemEntity(D-1000111:D-1000111 default project, MANAGED_WEBSPACE, [2022-10-01,), some ManagedWebspace, { Daemons: 2, Multi: 4, SDD: 512, Traffic: 12 })",
+                    "HsBookingItemEntity(D-1000111:D-1000111 default project, PRIVATE_CLOUD, [2024-04-01,), some PrivateCloud, { CPUs: 10, HDD: 10240, SDD: 10240, Traffic: 42 })");
         }
     }
 
@@ -326,7 +326,8 @@ class HsBookingItemRepositoryIntegrationTest extends ContextBasedTestWithCleanup
     private HsBookingItemEntity givenSomeTemporaryBookingItem(final String projectCaption) {
         return jpaAttempt.transacted(() -> {
             context("superuser-alex@hostsharing.net");
-            final var givenProject = projectRepo.findByCaption(projectCaption).stream()
+            final var givenProject = projectRepo.findAll().stream()
+                    .filter(p -> p.getCaption().equals(projectCaption))
                     .findAny().orElseThrow();
             final var newBookingItem = HsBookingItemEntity.builder()
                     .project(givenProject)

src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectControllerAcceptanceTest.java

@@ -3,7 +3,7 @@ package net.hostsharing.hsadminng.hs.booking.project;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
-import net.hostsharing.hsadminng.hs.booking.debitor.HsBookingDebitorRepository;
+import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
 import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
 import org.junit.jupiter.api.Nested;
@@ -40,7 +40,7 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
     HsBookingProjectRepository projectRepo;
 
     @Autowired
-    HsBookingDebitorRepository debitorRepo;
+    HsOfficeDebitorRepository debitorRepo;
 
     @Autowired
     JpaAttempt jpaAttempt;
@@ -56,7 +56,7 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
 
             // given
             context("superuser-alex@hostsharing.net");
-            final var givenDebitor = debitorRepo.findByDefaultPrefix("fir").stream()
+            final var givenDebitor = debitorRepo.findDebitorByDebitorNumber(1000111).stream()
                             .findFirst()
                             .orElseThrow();
 
@@ -87,7 +87,7 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
         void globalAdmin_canAddBookingProject() {
 
             context.define("superuser-alex@hostsharing.net");
-            final var givenDebitor = debitorRepo.findByDefaultPrefix("fir").stream()
+            final var givenDebitor = debitorRepo.findDebitorByDebitorNumber(1000111).stream()
                     .findFirst()
                     .orElseThrow();
 
@@ -128,7 +128,8 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
         @Test
         void globalAdmin_canGetArbitraryBookingProject() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenBookingProjectUuid = bookingProjectRepo.findByCaption("D-1000111 default project").stream()
+            final var givenBookingProjectUuid = bookingProjectRepo.findAll().stream()
+                            .filter(project -> project.getDebitor().getDebitorNumber() == 1000111)
                             .findAny().orElseThrow().getUuid();
 
             RestAssured // @formatter:off
@@ -150,7 +151,8 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
         @Test
         void normalUser_canNotGetUnrelatedBookingProject() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenBookingProjectUuid = bookingProjectRepo.findByCaption("D-1000212 default project").stream()
+            final var givenBookingProjectUuid = bookingProjectRepo.findAll().stream()
+                    .filter(project -> project.getDebitor().getDebitorNumber() == 1000212)
                     .map(HsBookingProjectEntity::getUuid)
                     .findAny().orElseThrow();
 
@@ -167,7 +169,8 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
         @Test
         void debitorAgentUser_canGetRelatedBookingProject() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenBookingProjectUuid = bookingProjectRepo.findByCaption("D-1000313 default project").stream()
+            final var givenBookingProjectUuid = bookingProjectRepo.findAll().stream()
+                    .filter(project -> project.getDebitor().getDebitorNumber() == 1000313)
                     .findAny().orElseThrow().getUuid();
 
             RestAssured // @formatter:off
@@ -193,7 +196,7 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
         @Test
         void globalAdmin_canPatchAllUpdatablePropertiesOfBookingProject() {
 
-            final var givenBookingProject = givenSomeBookingProject("fir", "some project");
+            final var givenBookingProject = givenSomeBookingProject(1000111, "some project");
 
             RestAssured // @formatter:off
                 .given()
@@ -232,7 +235,7 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
         @Test
         void globalAdmin_canDeleteArbitraryBookingProject() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenBookingProject = givenSomeBookingProject("fir", "some project");
+            final var givenBookingProject = givenSomeBookingProject(1000111, "some project");
 
             RestAssured // @formatter:off
                 .given()
@@ -250,7 +253,7 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
         @Test
         void normalUser_canNotDeleteUnrelatedBookingProject() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenBookingProject = givenSomeBookingProject("fir", "some project");
+            final var givenBookingProject = givenSomeBookingProject(1000111, "some project");
 
             RestAssured // @formatter:off
                 .given()
@@ -266,10 +269,10 @@ class HsBookingProjectControllerAcceptanceTest extends ContextBasedTestWithClean
         }
     }
 
-    private HsBookingProjectEntity givenSomeBookingProject(final String defaultPrefix, final String caption) {
+    private HsBookingProjectEntity givenSomeBookingProject(final int debitorNumber, final String caption) {
         return jpaAttempt.transacted(() -> {
             context.define("superuser-alex@hostsharing.net");
-            final var givenDebitor = debitorRepo.findByDefaultPrefix(defaultPrefix).stream().findAny().orElseThrow();
+            final var givenDebitor = debitorRepo.findDebitorByDebitorNumber(debitorNumber).stream().findAny().orElseThrow();
             final var newBookingProject = HsBookingProjectEntity.builder()
                     .uuid(UUID.randomUUID())
                     .debitor(givenDebitor)

src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectEntityPatcherUnitTest.java

@@ -13,7 +13,7 @@ import jakarta.persistence.EntityManager;
 import java.util.UUID;
 import java.util.stream.Stream;
 
-import static net.hostsharing.hsadminng.hs.booking.debitor.TestHsBookingDebitor.TEST_BOOKING_DEBITOR;
+import static net.hostsharing.hsadminng.hs.office.debitor.TestHsOfficeDebitor.TEST_DEBITOR;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -46,7 +46,7 @@ class HsBookingProjectEntityPatcherUnitTest extends PatchUnitTestBase<
     protected HsBookingProjectEntity newInitialEntity() {
         final var entity = new HsBookingProjectEntity();
         entity.setUuid(INITIAL_BOOKING_PROJECT_UUID);
-        entity.setDebitor(TEST_BOOKING_DEBITOR);
+        entity.setDebitor(TEST_DEBITOR);
         entity.setCaption(INITIAL_CAPTION);
         return entity;
     }

src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectEntityUnitTest.java

@@ -2,12 +2,12 @@ package net.hostsharing.hsadminng.hs.booking.project;
 
 import org.junit.jupiter.api.Test;
 
-import static net.hostsharing.hsadminng.hs.booking.debitor.TestHsBookingDebitor.TEST_BOOKING_DEBITOR;
+import static net.hostsharing.hsadminng.hs.office.debitor.TestHsOfficeDebitor.TEST_DEBITOR;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class HsBookingProjectEntityUnitTest {
     final HsBookingProjectEntity givenBookingProject = HsBookingProjectEntity.builder()
-            .debitor(TEST_BOOKING_DEBITOR)
+            .debitor(TEST_DEBITOR)
             .caption("some caption")
             .build();
 

src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRepositoryIntegrationTest.java

@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.booking.project;
 
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.hs.booking.debitor.HsBookingDebitorRepository;
+import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
 import net.hostsharing.hsadminng.rbac.test.Array;
@@ -38,7 +38,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
     HsBookingProjectRepository projectRepo;
 
     @Autowired
-    HsBookingDebitorRepository debitorRepo;
+    HsOfficeDebitorRepository debitorRepo;
 
     @Autowired
     RawRbacRoleRepository rawRoleRepo;
@@ -63,7 +63,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
             // given
             context("superuser-alex@hostsharing.net");
             final var count = bookingProjectRepo.count();
-            final var givenDebitor = debitorRepo.findByDefaultPrefix("fir").get(0);
+            final var givenDebitor = debitorRepo.findDebitorByOptionalNameLike("First").get(0);
 
             // when
             final var result = attempt(em, () -> {
@@ -92,7 +92,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
 
             // when
             attempt(em, () -> {
-                final var givenDebitor = debitorRepo.findByDefaultPrefix("fir").get(0);
+                final var givenDebitor = debitorRepo.findDebitorByOptionalNameLike("First").get(0);
                 final var newBookingProject = HsBookingProjectEntity.builder()
                         .debitor(givenDebitor)
                         .caption("some new booking project")
@@ -148,7 +148,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
         public void globalAdmin_withoutAssumedRole_canViewAllBookingProjectsOfArbitraryDebitor() {
             // given
             context("superuser-alex@hostsharing.net");
-            final var debitorUuid = debitorRepo.findByDefaultPrefix("sec").stream()
+            final var debitorUuid = debitorRepo.findDebitorByDebitorNumber(1000212).stream()
                     .findAny().orElseThrow().getUuid();
 
             // when
@@ -164,7 +164,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
         public void normalUser_canViewOnlyRelatedBookingProjects() {
             // given:
             context("person-FirbySusan@example.com");
-            final var debitorUuid = debitorRepo.findByDefaultPrefix("fir").stream()
+            final var debitorUuid = debitorRepo.findDebitorByDebitorNumber(1000111).stream()
                     .findAny().orElseThrow().getUuid();
 
             // when:
@@ -183,7 +183,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
         @Test
         public void hostsharingAdmin_canUpdateArbitraryBookingProject() {
             // given
-            final var givenBookingProjectUuid = givenSomeTemporaryBookingProject("fir").getUuid();
+            final var givenBookingProjectUuid = givenSomeTemporaryBookingProject(1000111).getUuid();
 
             // when
             final var result = jpaAttempt.transacted(() -> {
@@ -214,7 +214,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
         public void globalAdmin_withoutAssumedRole_canDeleteAnyBookingProject() {
             // given
             context("superuser-alex@hostsharing.net", null);
-            final var givenBookingProject = givenSomeTemporaryBookingProject("fir");
+            final var givenBookingProject = givenSomeTemporaryBookingProject(1000111);
 
             // when
             final var result = jpaAttempt.transacted(() -> {
@@ -234,7 +234,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
         public void nonGlobalAdmin_canNotDeleteTheirRelatedBookingProject() {
             // given
             context("superuser-alex@hostsharing.net", null);
-            final var givenBookingProject = givenSomeTemporaryBookingProject("fir");
+            final var givenBookingProject = givenSomeTemporaryBookingProject(1000111);
 
             // when
             final var result = jpaAttempt.transacted(() -> {
@@ -260,7 +260,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
             context("superuser-alex@hostsharing.net");
             final var initialRoleNames = Array.from(distinctRoleNamesOf(rawRoleRepo.findAll()));
             final var initialGrantNames = Array.from(distinctGrantDisplaysOf(rawGrantRepo.findAll()));
-            final var givenBookingProject = givenSomeTemporaryBookingProject("fir");
+            final var givenBookingProject = givenSomeTemporaryBookingProject(1000111);
 
             // when
             final var result = jpaAttempt.transacted(() -> {
@@ -295,10 +295,10 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
                 "[creating booking-project test-data 1000313, hs_booking_project, INSERT]");
     }
 
-    private HsBookingProjectEntity givenSomeTemporaryBookingProject(final String defaultPrefix) {
+    private HsBookingProjectEntity givenSomeTemporaryBookingProject(final int debitorNumber) {
         return jpaAttempt.transacted(() -> {
             context("superuser-alex@hostsharing.net");
-            final var givenDebitor = debitorRepo.findByDefaultPrefix(defaultPrefix).get(0);
+            final var givenDebitor = debitorRepo.findDebitorByDebitorNumber(debitorNumber).get(0);
             final var newBookingProject = HsBookingProjectEntity.builder()
                     .debitor(givenDebitor)
                     .caption("some temp project")
@@ -312,7 +312,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
             final List<HsBookingProjectEntity> actualResult,
             final String... bookingProjectNames) {
         assertThat(actualResult)
-                .extracting(HsBookingProjectEntity::toString)
+                .extracting(bookingProjectEntity -> bookingProjectEntity.toString())
                 .containsExactlyInAnyOrder(bookingProjectNames);
     }
 
@@ -320,7 +320,7 @@ class HsBookingProjectRepositoryIntegrationTest extends ContextBasedTestWithClea
             final List<HsBookingProjectEntity> actualResult,
             final String... bookingProjectNames) {
         assertThat(actualResult)
-                .extracting(HsBookingProjectEntity::toString)
+                .extracting(bookingProjectEntity -> bookingProjectEntity.toString())
                 .contains(bookingProjectNames);
     }
 }

src/test/java/net/hostsharing/hsadminng/hs/booking/project/TestHsBookingProject.java

@@ -2,14 +2,14 @@ package net.hostsharing.hsadminng.hs.booking.project;
 
 import lombok.experimental.UtilityClass;
 
-import static net.hostsharing.hsadminng.hs.booking.debitor.TestHsBookingDebitor.TEST_BOOKING_DEBITOR;
+import static net.hostsharing.hsadminng.hs.office.debitor.TestHsOfficeDebitor.TEST_DEBITOR;
 
 @UtilityClass
 public class TestHsBookingProject {
 
 
     public static final HsBookingProjectEntity TEST_PROJECT = HsBookingProjectEntity.builder()
-            .debitor(TEST_BOOKING_DEBITOR)
+            .debitor(TEST_DEBITOR)
             .caption("test project")
             .build();
 }

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

@@ -5,6 +5,7 @@ import io.restassured.http.ContentType;
 import net.hostsharing.hsadminng.HsadminNgApplication;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRepository;
+import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectEntity;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRepository;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
 import net.hostsharing.hsadminng.rbac.test.ContextBasedTestWithCleanup;
@@ -20,6 +21,8 @@ import java.util.Map;
 import java.util.UUID;
 
 import static java.util.Map.entry;
+import static java.util.Optional.ofNullable;
+import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.CLOUD_SERVER;
 import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.MANAGED_SERVER;
 import static net.hostsharing.hsadminng.rbac.test.JsonMatcher.lenientlyEquals;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -58,7 +61,8 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
 
             // given
             context("superuser-alex@hostsharing.net");
-            final var givenProject = projectRepo.findByCaption("D-1000111 default project").stream()
+            final var givenProject = projectRepo.findAll().stream()
+                            .filter(p -> p.getCaption().equals("D-1000111 default project"))
                             .findAny().orElseThrow();
 
             RestAssured // @formatter:off
@@ -77,6 +81,9 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                             "identifier": "sec01",
                              "caption": "some Webspace",
                             "config": {
+                                "HDD": 2048,
+                                "RAM": 1,
+                                "SDD": 512,
                                 "extra": 42
                             }
                         },
@@ -85,6 +92,9 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                             "identifier": "fir01",
                             "caption": "some Webspace",
                             "config": {
+                                "HDD": 2048,
+                                "RAM": 1,
+                                "SDD": 512,
                                 "extra": 42
                             }
                         },
@@ -93,6 +103,9 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                             "identifier": "thi01",
                             "caption": "some Webspace",
                             "config": {
+                                "HDD": 2048,
+                                "RAM": 1,
+                                "SDD": 512,
                                 "extra": 42
                             }
                         }
@@ -123,14 +136,8 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                             "identifier": "vm1011",
                             "caption": "some ManagedServer",
                             "config": {
-                                "extra": 42
-                            }
-                        },
-                        {
-                            "type": "MANAGED_SERVER",
-                            "identifier": "vm1012",
-                            "caption": "some ManagedServer",
-                            "config": {
+                                "CPU": 2,
+                                "SDD": 512,
                                 "extra": 42
                             }
                         },
@@ -139,6 +146,18 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                             "identifier": "vm1013",
                             "caption": "some ManagedServer",
                             "config": {
+                                "CPU": 2,
+                                "SDD": 512,
+                                "extra": 42
+                            }
+                        },
+                        {
+                            "type": "MANAGED_SERVER",
+                            "identifier": "vm1012",
+                            "caption": "some ManagedServer",
+                            "config": {
+                                "CPU": 2,
+                                "SDD": 512,
                                 "extra": 42
                             }
                         }
@@ -167,7 +186,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                                 "type": "MANAGED_SERVER",
                                 "identifier": "vm1400",
                                 "caption": "some new ManagedServer",
-                                "config": { "monit_max_ssd_usage": 80, "monit_max_cpu_usage": 90, "monit_max_ram_usage": 70 }
+                                "config": { "CPUs": 2, "RAM": 100, "SSD": 300, "Traffic": 250 }
                             }
                             """.formatted(givenBookingItem.getUuid()))
                         .port(port)
@@ -181,7 +200,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                                 "type": "MANAGED_SERVER",
                                 "identifier": "vm1400",
                                 "caption": "some new ManagedServer",
-                                "config": { "monit_max_ssd_usage": 80, "monit_max_cpu_usage": 90, "monit_max_ram_usage": 70 }
+                                "config": { "CPUs": 2, "RAM": 100, "SSD": 300, "Traffic": 250 }
                             }
                             """))
                         .header("Location", matchesRegex("http://localhost:[1-9][0-9]*/api/hs/hosting/assets/[^/]*"))
@@ -197,7 +216,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
         void parentAssetAgent_canAddSubAsset() {
 
             context.define("superuser-alex@hostsharing.net");
-            final var givenParentAsset = givenParentAsset(MANAGED_SERVER, "vm1011");
+            final var givenParentAsset = givenParentAsset("D-1000111 default project", MANAGED_SERVER);
 
             context.define("person-FirbySusan@example.com");
 
@@ -212,7 +231,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                                     "type": "MANAGED_WEBSPACE",
                                     "identifier": "fir90",
                                     "caption": "some new ManagedWebspace in client's ManagedServer",
-                                    "config": {}
+                                    "config": { "SSD": 100, "Traffic": 250 }
                                 }
                                 """.formatted(givenParentAsset.getUuid()))
                         .port(port)
@@ -226,7 +245,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                                 "type": "MANAGED_WEBSPACE",
                                 "identifier": "fir90",
                                 "caption": "some new ManagedWebspace in client's ManagedServer",
-                                "config": {}
+                                "config": { "SSD": 100, "Traffic": 250 }
                             }
                             """))
                     .header("Location", matchesRegex("http://localhost:[1-9][0-9]*/api/hs/hosting/assets/[^/]*"))
@@ -244,7 +263,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
             context.define("superuser-alex@hostsharing.net");
             final var givenBookingItem = givenBookingItem("D-1000111 default project", "some PrivateCloud");
 
-            RestAssured // @formatter:off
+            final var location = RestAssured // @formatter:off
                     .given()
                     .header("current-user", "superuser-alex@hostsharing.net")
                     .contentType(ContentType.JSON)
@@ -254,7 +273,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                                 "type": "MANAGED_SERVER",
                                 "identifier": "vm1400",
                                 "caption": "some new ManagedServer",
-                                "config": {  "monit_max_ssd_usage": 0, "monit_max_cpu_usage": 101, "extra": 42 }
+                                "config": { "CPUs": 0, "extra": 42 }
                             }
                             """.formatted(givenBookingItem.getUuid()))
                     .port(port)
@@ -266,7 +285,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                     .body("", lenientlyEquals("""
                             {
                                 "statusPhrase": "Bad Request",
-                                "message": "['config.extra' is not expected but is set to '42', 'config.monit_max_ssd_usage' is expected to be >= 10 but is 0, 'config.monit_max_cpu_usage' is expected to be <= 100 but is 101, 'config.monit_max_ram_usage' is required but missing]"
+                                "message": "['config.extra' is not expected but is set to '42', 'config.CPUs' is expected to be >= 1 but is 0, 'config.RAM' is required but missing, 'config.SSD' is required but missing, 'config.Traffic' is required but missing]"
                             }
                             """));  // @formatter:on
         }
@@ -278,8 +297,9 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
         @Test
         void globalAdmin_canGetArbitraryAsset() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenAssetUuid = assetRepo.findByIdentifier("vm1011").stream()
-                            .filter(bi -> bi.getBookingItem().getProject().getCaption().equals("D-1000111 default project"))
+            final var givenAssetUuid = assetRepo.findAll().stream()
+                            .filter(bi -> bi.getBookingItem().getProject().getDebitor().getDebitorNumber() == 1000111)
+                            .filter(item -> item.getCaption().equals("some ManagedServer"))
                             .findAny().orElseThrow().getUuid();
 
             RestAssured // @formatter:off
@@ -295,6 +315,8 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                         {
                             "caption": "some ManagedServer",
                             "config": {
+                                 "CPU": 2,
+                                 "SDD": 512,
                                  "extra": 42
                              }
                         }
@@ -304,8 +326,8 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
         @Test
         void normalUser_canNotGetUnrelatedAsset() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenAssetUuid = assetRepo.findByIdentifier("vm1012").stream()
-                    .filter(bi -> bi.getBookingItem().getProject().getCaption().equals("D-1000212 default project"))
+            final var givenAssetUuid = assetRepo.findAll().stream()
+                    .filter(bi -> bi.getBookingItem().getProject().getDebitor().getDebitorNumber() == 1000212)
                     .map(HsHostingAssetEntity::getUuid)
                     .findAny().orElseThrow();
 
@@ -322,8 +344,9 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
         @Test
         void debitorAgentUser_canGetRelatedAsset() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenAssetUuid = assetRepo.findByIdentifier("vm1013").stream()
-                    .filter(bi -> bi.getBookingItem().getProject().getCaption().equals("D-1000313 default project"))
+            final var givenAssetUuid = assetRepo.findAll().stream()
+                    .filter(bi -> bi.getBookingItem().getProject().getDebitor().getDebitorNumber() == 1000313)
+                    .filter(bi -> bi.getCaption().equals("some ManagedServer"))
                     .findAny().orElseThrow().getUuid();
 
             RestAssured // @formatter:off
@@ -340,6 +363,8 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                             "identifier": "vm1013",
                             "caption": "some ManagedServer",
                             "config": {
+                                "CPU": 2,
+                                "SDD": 512,
                                 "extra": 42
                             }
                         }
@@ -353,8 +378,8 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
         @Test
         void globalAdmin_canPatchAllUpdatablePropertiesOfAsset() {
 
-            final var givenAsset = givenSomeTemporaryHostingAsset("2001", MANAGED_SERVER,
-                    config("monit_max_ssd_usage", 80), config("monit_max_hdd_usage", 90), config("monit_max_cpu_usage", 90), config("monit_max_ram_usage", 70));
+            final var givenAsset = givenSomeTemporaryHostingAsset("2001", CLOUD_SERVER,
+                    config("CPUs", 4), config("RAM", 100), config("HDD", 100), config("Traffic", 2000));
 
             RestAssured // @formatter:off
                 .given()
@@ -363,9 +388,9 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                     .body("""
                         {
                             "config": {
-                                "monit_max_ssd_usage": 85,
-                                "monit_max_hdd_usage": null,
-                                "monit_min_free_ssd": 5
+                                "CPUs": 2,
+                                "HDD": null,
+                                "SSD": 250
                             }
                         }
                         """)
@@ -377,14 +402,13 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
                     .contentType(ContentType.JSON)
                     .body("", lenientlyEquals("""
                         {
-                            "type": "MANAGED_SERVER",
+                            "type": "CLOUD_SERVER",
                             "identifier": "vm2001",
                             "caption": "some test-asset",
                             "config": {
-                                "monit_max_cpu_usage": 90,
-                                "monit_max_ram_usage": 70,
-                                "monit_max_ssd_usage": 85,
-                                "monit_min_free_ssd": 5
+                                "CPUs": 2,
+                                "RAM": 100,
+                                "SSD": 250
                             }
                          }
                     """)); // @formatter:on
@@ -393,8 +417,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
             context.define("superuser-alex@hostsharing.net");
             assertThat(assetRepo.findByUuid(givenAsset.getUuid())).isPresent().get()
                     .matches(asset -> {
-                        assertThat(asset.toString()).isEqualTo(
-                                "HsHostingAssetEntity(MANAGED_SERVER, vm2001, some test-asset, D-1000111:D-1000111 default project:some ManagedServer, { monit_max_cpu_usage: 90, monit_max_ram_usage: 70, monit_max_ssd_usage: 85, monit_min_free_ssd: 5 })");
+                        assertThat(asset.toString()).isEqualTo("HsHostingAssetEntity(CLOUD_SERVER, vm2001, some test-asset, D-1000111:D-1000111 default project:test CloudServer, { CPUs: 2, RAM: 100, SSD: 250, Traffic: 2000 })");
                         return true;
                     });
         }
@@ -406,7 +429,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
         @Test
         void globalAdmin_canDeleteArbitraryAsset() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenAsset = givenSomeTemporaryHostingAsset("2002", MANAGED_SERVER,
+            final var givenAsset = givenSomeTemporaryHostingAsset("2002", CLOUD_SERVER,
                     config("CPUs", 4), config("RAM", 100), config("HDD", 100), config("Traffic", 2000));
 
             RestAssured // @formatter:off
@@ -425,7 +448,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
         @Test
         void normalUser_canNotDeleteUnrelatedAsset() {
             context.define("superuser-alex@hostsharing.net");
-            final var givenAsset = givenSomeTemporaryHostingAsset("2003", MANAGED_SERVER,
+            final var givenAsset = givenSomeTemporaryHostingAsset("2003", CLOUD_SERVER,
                     config("CPUs", 4), config("RAM", 100), config("HDD", 100), config("Traffic", 2000));
 
             RestAssured // @formatter:off
@@ -443,14 +466,22 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
     }
 
     HsBookingItemEntity givenBookingItem(final String projectCaption, final String bookingItemCaption) {
-        return bookingItemRepo.findByCaption(bookingItemCaption).stream()
-                .filter(bi -> bi.getRelatedProject().getCaption().contains(projectCaption))
+        return bookingItemRepo.findAll().stream()
+                .filter(a -> ofNullable(a)
+                        .filter(bi -> bi.getCaption().equals(bookingItemCaption))
+                        .isPresent())
                 .findAny().orElseThrow();
     }
 
-    HsHostingAssetEntity givenParentAsset(final HsHostingAssetType assetType, final String assetIdentifier) {
-        final var givenAsset = assetRepo.findByIdentifier(assetIdentifier).stream()
+    HsHostingAssetEntity givenParentAsset(final String projectCaption, final HsHostingAssetType assetType) {
+        final var givenAsset = assetRepo.findAll().stream()
                 .filter(a -> a.getType() == assetType)
+                .filter(a -> ofNullable(a)
+                                .map(HsHostingAssetEntity::getBookingItem)
+                                .map(HsBookingItemEntity::getProject)
+                                .map(HsBookingProjectEntity::getCaption)
+                                .filter(c -> c.equals(projectCaption))
+                                .isPresent())
                 .findAny().orElseThrow();
         return givenAsset;
     }
@@ -463,7 +494,7 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
             context.define("superuser-alex@hostsharing.net");
             final var newAsset = HsHostingAssetEntity.builder()
                     .uuid(UUID.randomUUID())
-                    .bookingItem(givenBookingItem("D-1000111 default project", "some ManagedServer"))
+                    .bookingItem(givenBookingItem("D-1000111 default project", "test CloudServer"))
                     .type(hostingAssetType)
                     .identifier("vm" + identifierSuffix)
                     .caption("some test-asset")

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetEntityUnitTest.java

@@ -20,7 +20,7 @@ class HsHostingAssetEntityUnitTest {
                     entry("SSD-storage", 512),
                     entry("HDD-storage", 2048)))
             .build();
-    final HsHostingAssetEntity givenWebspace = HsHostingAssetEntity.builder()
+    final HsHostingAssetEntity givenServer = HsHostingAssetEntity.builder()
             .bookingItem(TEST_BOOKING_ITEM)
             .type(HsHostingAssetType.MANAGED_WEBSPACE)
             .parentAsset(givenParentAsset)
@@ -31,47 +31,19 @@ class HsHostingAssetEntityUnitTest {
                     entry("SSD-storage", 512),
                     entry("HDD-storage", 2048)))
             .build();
-    final HsHostingAssetEntity givenUnixUser = HsHostingAssetEntity.builder()
-            .type(HsHostingAssetType.UNIX_USER)
-            .parentAsset(givenWebspace)
-            .identifier("xyz00-web")
-            .caption("some unix-user")
-            .config(Map.ofEntries(
-                    entry("SSD-soft-quota", 128),
-                    entry("SSD-hard-quota", 256),
-                    entry("HDD-soft-quota", 256),
-                    entry("HDD-hard-quota", 512)))
-            .build();
-    final HsHostingAssetEntity givenDomainHttpSetup = HsHostingAssetEntity.builder()
-            .type(HsHostingAssetType.DOMAIN_HTTP_SETUP)
-            .parentAsset(givenWebspace)
-            .identifier("example.org")
-            .assignedToAsset(givenUnixUser)
-            .caption("some domain setup")
-            .config(Map.ofEntries(
-                    entry("option-htdocsfallback", true),
-                    entry("use-fcgiphpbin", "/usr/lib/cgi-bin/php"),
-                    entry("validsubdomainnames", "*")))
-            .build();
 
     @Test
     void toStringContainsAllPropertiesAndResourcesSortedByKey() {
+        final var result = givenServer.toString();
 
-        assertThat(givenWebspace.toString()).isEqualTo(
+        assertThat(result).isEqualTo(
                 "HsHostingAssetEntity(MANAGED_WEBSPACE, xyz00, some managed webspace, MANAGED_SERVER:vm1234, D-1000100:test project:test booking item, { CPUs: 2, HDD-storage: 2048, SSD-storage: 512 })");
-
-        assertThat(givenUnixUser.toString()).isEqualTo(
-                "HsHostingAssetEntity(UNIX_USER, xyz00-web, some unix-user, MANAGED_WEBSPACE:xyz00, { HDD-hard-quota: 512, HDD-soft-quota: 256, SSD-hard-quota: 256, SSD-soft-quota: 128 })");
-
-        assertThat(givenDomainHttpSetup.toString()).isEqualTo(
-                "HsHostingAssetEntity(DOMAIN_HTTP_SETUP, example.org, some domain setup, MANAGED_WEBSPACE:xyz00, UNIX_USER:xyz00-web, { option-htdocsfallback: true, use-fcgiphpbin: /usr/lib/cgi-bin/php, validsubdomainnames: * })");
     }
 
     @Test
     void toShortStringContainsOnlyMemberNumberAndCaption() {
+        final var result = givenServer.toShortString();
 
-        assertThat(givenWebspace.toShortString()).isEqualTo("MANAGED_WEBSPACE:xyz00");
-        assertThat(givenUnixUser.toShortString()).isEqualTo("UNIX_USER:xyz00-web");
-        assertThat(givenDomainHttpSetup.toShortString()).isEqualTo("DOMAIN_HTTP_SETUP:example.org");
+        assertThat(result).isEqualTo("MANAGED_WEBSPACE:xyz00");
     }
 }

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsControllerAcceptanceTest.java

@@ -54,57 +54,48 @@ class HsHostingAssetPropsControllerAcceptanceTest {
                         [
                             {
                                 "type": "integer",
-                                "propertyName": "monit_min_free_ssd",
-                                "required": false,
+                                "propertyName": "CPUs",
+                                "required": true,
                                 "unit": null,
                                 "min": 1,
+                                "max": 32,
+                                "step": null
+                            },
+                            {
+                                "type": "integer",
+                                "propertyName": "RAM",
+                                "required": true,
+                                "unit": "GB",
+                                "min": 1,
+                                "max": 128,
+                                "step": null
+                            },
+                            {
+                                "type": "integer",
+                                "propertyName": "SSD",
+                                "required": true,
+                                "unit": "GB",
+                                "min": 25,
                                 "max": 1000,
-                                "step": null
+                                "step": 25
                             },
                             {
                                 "type": "integer",
-                                "propertyName": "monit_min_free_hdd",
+                                "propertyName": "HDD",
                                 "required": false,
-                                "unit": null,
-                                "min": 1,
+                                "unit": "GB",
+                                "min": 0,
                                 "max": 4000,
-                                "step": null
+                                "step": 250
                             },
                             {
                                 "type": "integer",
-                                "propertyName": "monit_max_ssd_usage",
+                                "propertyName": "Traffic",
                                 "required": true,
-                                "unit": "%",
-                                "min": 10,
-                                "max": 100,
-                                "step": null
-                            },
-                            {
-                                "type": "integer",
-                                "propertyName": "monit_max_hdd_usage",
-                                "required": false,
-                                "unit": "%",
-                                "min": 10,
-                                "max": 100,
-                                "step": null
-                            },
-                            {
-                                "type": "integer",
-                                "propertyName": "monit_max_cpu_usage",
-                                "required": true,
-                                "unit": "%",
-                                "min": 10,
-                                "max": 100,
-                                "step": null
-                            },
-                            {
-                                "type": "integer",
-                                "propertyName": "monit_max_ram_usage",
-                                "required": true,
-                                "unit": "%",
-                                "min": 10,
-                                "max": 100,
-                                "step": null
+                                "unit": "GB",
+                                "min": 250,
+                                "max": 10000,
+                                "step": 250
                             }
                         ]
                         """));

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRepositoryIntegrationTest.java

@@ -4,6 +4,7 @@ import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRepository;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRepository;
+import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorRepository;
 import net.hostsharing.hsadminng.rbac.rbacgrant.RawRbacGrantRepository;
 import net.hostsharing.hsadminng.rbac.rbacrole.RawRbacRoleRepository;
 import net.hostsharing.hsadminng.rbac.test.Array;
@@ -47,6 +48,9 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
     @Autowired
     HsBookingProjectRepository projectRepo;
 
+    @Autowired
+    HsOfficeDebitorRepository debitorRepo;
+
     @Autowired
     RawRbacRoleRepository rawRoleRepo;
 
@@ -139,6 +143,7 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
                             "{ grant role:hs_hosting_asset#vm9000:AGENT to role:hs_hosting_asset#vm9000:ADMIN by system and assume }",
 
                             // tenant
+                            "{ grant perm:hs_hosting_asset#vm9000:SELECT to role:hs_hosting_asset#vm9000:TENANT by system and assume }",
                             "{ grant role:hs_booking_item#somePrivateCloud:TENANT to role:hs_hosting_asset#vm9000:TENANT by system and assume }",
 
                             null));
@@ -164,16 +169,17 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
             // then
             allTheseServersAreReturned(
                     result,
-                    "HsHostingAssetEntity(MANAGED_WEBSPACE, sec01, some Webspace, MANAGED_SERVER:vm1012, D-1000212:D-1000212 default project:separate ManagedServer, { extra: 42 })",
-                    "HsHostingAssetEntity(MANAGED_WEBSPACE, thi01, some Webspace, MANAGED_SERVER:vm1013, D-1000313:D-1000313 default project:separate ManagedServer, { extra: 42 })",
-                    "HsHostingAssetEntity(MANAGED_WEBSPACE, fir01, some Webspace, MANAGED_SERVER:vm1011, D-1000111:D-1000111 default project:separate ManagedServer, { extra: 42 })");
+                    "HsHostingAssetEntity(MANAGED_WEBSPACE, sec01, some Webspace, MANAGED_SERVER:vm1012, D-1000212:D-1000212 default project:separate ManagedServer, { HDD: 2048, RAM: 1, SDD: 512, extra: 42 })",
+                    "HsHostingAssetEntity(MANAGED_WEBSPACE, thi01, some Webspace, MANAGED_SERVER:vm1013, D-1000313:D-1000313 default project:separate ManagedServer, { HDD: 2048, RAM: 1, SDD: 512, extra: 42 })",
+                    "HsHostingAssetEntity(MANAGED_WEBSPACE, fir01, some Webspace, MANAGED_SERVER:vm1011, D-1000111:D-1000111 default project:separate ManagedServer, { HDD: 2048, RAM: 1, SDD: 512, extra: 42 })");
         }
 
         @Test
         public void normalUser_canViewOnlyRelatedAsset() {
             // given:
             context("person-FirbySusan@example.com");
-            final var projectUuid = projectRepo.findByCaption("D-1000111 default project").stream()
+            final var projectUuid = projectRepo.findAll().stream()
+                    .filter(p -> p.getCaption().equals("D-1000111 default project"))
                     .findAny().orElseThrow().getUuid();
 
             // when:
@@ -182,9 +188,9 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
             // then:
             exactlyTheseAssetsAreReturned(
                     result,
-                    "HsHostingAssetEntity(MANAGED_WEBSPACE, fir01, some Webspace, MANAGED_SERVER:vm1011, D-1000111:D-1000111 default project:separate ManagedServer, { extra: 42 })",
-                    "HsHostingAssetEntity(MANAGED_SERVER, vm1011, some ManagedServer, D-1000111:D-1000111 default project:some PrivateCloud, { extra: 42 })",
-                    "HsHostingAssetEntity(CLOUD_SERVER, vm2011, another CloudServer, D-1000111:D-1000111 default project:some PrivateCloud, { extra: 42 })");
+                    "HsHostingAssetEntity(MANAGED_WEBSPACE, fir01, some Webspace, MANAGED_SERVER:vm1011, D-1000111:D-1000111 default project:separate ManagedServer, { HDD: 2048, RAM: 1, SDD: 512, extra: 42 })",
+                    "HsHostingAssetEntity(MANAGED_SERVER, vm1011, some ManagedServer, D-1000111:D-1000111 default project:some PrivateCloud, { CPU: 2, SDD: 512, extra: 42 })",
+                    "HsHostingAssetEntity(CLOUD_SERVER, vm2011, another CloudServer, D-1000111:D-1000111 default project:some PrivateCloud, { CPU: 2, HDD: 1024, extra: 42 })");
         }
 
         @Test
@@ -200,7 +206,7 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
             // then
             allTheseServersAreReturned(
                     result,
-                    "HsHostingAssetEntity(MANAGED_WEBSPACE, thi01, some Webspace, MANAGED_SERVER:vm1013, D-1000313:D-1000313 default project:separate ManagedServer, { extra: 42 })");
+                    "HsHostingAssetEntity(MANAGED_WEBSPACE, thi01, some Webspace, MANAGED_SERVER:vm1013, D-1000313:D-1000313 default project:separate ManagedServer, { HDD: 2048, RAM: 1, SDD: 512, extra: 42 })");
         }
 
     }
@@ -367,7 +373,8 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
     }
 
     HsBookingItemEntity givenBookingItem(final String projectCaption, final String bookingItemCaption) {
-        final var givenProject = projectRepo.findByCaption(projectCaption).stream()
+        final var givenProject = projectRepo.findAll().stream()
+                .filter(p -> p.getCaption().equals(projectCaption))
                 .findAny().orElseThrow();
         return bookingItemRepo.findAllByProjectUuid(givenProject.getUuid()).stream()
                 .filter(i -> i.getCaption().equals(bookingItemCaption))
@@ -375,7 +382,8 @@ class HsHostingAssetRepositoryIntegrationTest extends ContextBasedTestWithCleanu
     }
 
     HsHostingAssetEntity givenManagedServer(final String projectCaption, final HsHostingAssetType type) {
-        final var givenProject = projectRepo.findByCaption(projectCaption).stream()
+        final var givenProject = projectRepo.findAll().stream()
+                .filter(p -> p.getCaption().equals(projectCaption))
                 .findAny().orElseThrow();
         return assetRepo.findAllByCriteria(givenProject.getUuid(), null, type).stream()
                 .findAny().orElseThrow();

src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorControllerAcceptanceTest.java

@@ -745,7 +745,7 @@ class HsOfficeDebitorControllerAcceptanceTest extends ContextBasedTestWithCleanu
         jpaAttempt.transacted(() -> {
             context.define("superuser-alex@hostsharing.net");
             final var count = em.createQuery(
-                            "DELETE FROM HsBookingDebitorEntity d WHERE d.debitorNumberSuffix >= " + LOWEST_TEMP_DEBITOR_SUFFIX)
+                            "DELETE FROM HsOfficeDebitorEntity d WHERE d.debitorNumberSuffix >= " + LOWEST_TEMP_DEBITOR_SUFFIX)
                     .executeUpdate();
             System.out.printf("deleted %d entities%n", count);
         });