improve setup documentation

Merge remote-tracking branch 'refs/remotes/origin/master' into java-for-gradlew
# Conflicts: # README.md
2024-09-13 06:29:37 +02:00 · 2024-09-12 14:14:48 +02:00 · 2024-01-30 13:55:03 +01:00
561 changed files with 9055 additions and 23527 deletions
--- a/.aliases
+++ b/.aliases
@ -8,20 +8,12 @@ gradleWrapper () {
        return 1
    fi

-    if command -v unbuffer >/dev/null 2>&1; then
-        # if `unbuffer` is available in PATH, use it to print report file-URIs at the end
-        TEMPFILE=$(mktemp /tmp/gw.XXXXXX)
-        unbuffer ./gradlew "$@" | tee $TEMPFILE
-        echo
-        grep --color=never "Report:" $TEMPFILE
-        rm $TEMPFILE
-    else
-        # if `unbuffer` is not in PATH, simply run gradle
-        ./gradlew "$@"
-        echo "HINT: it's suggested to install 'unbuffer' to print report URIs at the end of a gradle run"
-    fi
-
+    TEMPFILE=$(mktemp /tmp/gw.XXXXXX)
+    unbuffer ./gradlew "$@" | tee $TEMPFILE

+    echo
+    grep --color=never "Report:" $TEMPFILE
+    rm $TEMPFILE
 }

 postgresAutodoc () {
@ -38,13 +30,13 @@ postgresAutodoc () {
    fi
 	postgresql_autodoc -d postgres -f build/postgres-autodoc -h localhost -u postgres --password=password \
 		-m '(rbacobject|hs).*' \
-		-l /usr/share/postgresql-autodoc -t neato &&
+		-l /usr/share/postgresql-autodoc -t neato && 
 	dot -Tsvg build/postgres-autodoc.neato >build/postgres-autodoc-hs.svg && \
 	echo "generated: $PWD/build/postgres-autodoc-hs.svg"

 	postgresql_autodoc -d postgres -f build/postgres-autodoc -h localhost -u postgres --password=password \
 		-m '(global|rbac).*' \
-		-l /usr/share/postgresql-autodoc -t neato &&
+		-l /usr/share/postgresql-autodoc -t neato && 
 	dot -Tsvg build/postgres-autodoc.neato >build/postgres-autodoc-rbac.svg && \
 	echo "generated $PWD/build/postgres-autodoc-rbac.svg"
 }
@ -90,51 +82,8 @@ alias pg-sql-restore='gunzip --stdout | docker exec -i hsadmin-ng-postgres psql
 alias fp='grep -r '@Accepts' src | sed -e 's/^.*@/@/g' | sort -u | wc -l'

 alias gw-spotless='./gradlew spotlessApply -x pitest -x test -x :processResources'
-alias gw-check='. .aliases; . .tc-environment; gw test check -x pitest'
-
-# HOWTO: run all 'normal' tests (no scenario+import-tests): `gw-test`
-#   You can also mention specific targets: `gw-test importOfficeData`.
-#   This will always use the environment from `.tc-environment`.
-#
-# HOWTO: re-run tests even if no changed can be detected: `gw-test --rerun`
-#   You can also mention specific targets: `gw-test scenarioTest --rerun`.
-#   This will always use the environment from `.tc-environment`.
-#
-# HOWTO: run all tests (unit, integration+acceptance, import and scenario): `gw-test --all`
-#   You can also re-run all these tests, which will take ~20min: `gw-test --all --rerun`
-#   This will always use the environment from `.tc-environment`.
-#
-function _gwTest1() {
-    echo
-    printf -- '=%0.s' {1..80}; echo
-    echo "RUNNING gw $@"
-    printf -- '-%0.s' {1..80}; echo
-    ./gradlew "$@"
-    printf -- '-%0.s' {1..80}; echo
-    echo "DONE gw $@"
-}
-function _gwTest() {
-  . .aliases;
-  . .tc-environment;
-  rm /tmp/gwTest.tmp
-  if [ "$1" == "--all" ]; then
-    shift # to remove the --all from $@
-    # delierately in separate gradlew-calls to avoid Testcontains-PostgreSQL problem spillover
-    time (_gwTest1 unitTest "$@" &&
-        _gwTest1 officeIntegrationTest bookingIntegrationTest hostingIntegrationTest "$@" &&
-        _gwTest1 scenarioTest "$@" &&
-        _gwTest1 importOfficeData importHostingAssets "$@");
-  elif [ $# -eq 0 ] || [[ $1 == -* ]]; then
-    time _gwTest1 test "$@";
-  else
-    time _gwTest1 "$@";
-  fi
-  printf -- '=%0.s' {1..80}; echo
-}
-alias gw-test=_gwTest
-
-alias howto=bin/howto
-alias cas-curl=bin/cas-curl
+alias gw-test='. .aliases; ./gradlew test'
+alias gw-check='. .aliases; gw test importOfficeData check -x pitest -x :dependencyCheckAnalyze'

 # etc/docker-compose.yml limits CPUs+MEM and includes a PostgreSQL config for analysing slow queries
 alias gw-importOfficeData-in-docker-compose='
@ -146,7 +95,3 @@ if [ ! -f .environment ]; then
    cp .tc-environment .environment
 fi
 source .environment
-
-alias scenario-reports-upload='./gradlew scenarioTest convertMarkdownToHtml && ssh hsh03-hsngdev@h50.hostsharing.net "rm -f doms/hsngdev.hs-example.de/htdocs-ssl/scenarios/office/*.html" && scp build/doc/scenarios/*.html hsh03-hsngdev@h50.hostsharing.net:doms/hsngdev.hs-example.de/htdocs-ssl/scenarios/office'
-alias scenario-reports-open='open https://hsngdev.hs-example.de/scenarios/office'
-
--- a/.tc-environment
+++ b/.tc-environment
@ -4,4 +4,5 @@ export HSADMINNG_POSTGRES_ADMIN_PASSWORD=
 export HSADMINNG_POSTGRES_RESTRICTED_USERNAME=restricted
 export HSADMINNG_SUPERUSER=superuser-alex@hostsharing.net
 export HSADMINNG_MIGRATION_DATA_PATH=migration
+export LIQUIBASE_CONTEXT=
 export LANG=en_US.UTF-8
--- a/.unset-environment
+++ b/.unset-environment
@ -4,4 +4,5 @@ unset HSADMINNG_POSTGRES_ADMIN_PASSWORD
 unset HSADMINNG_POSTGRES_RESTRICTED_USERNAME
 unset HSADMINNG_SUPERUSER
 unset HSADMINNG_MIGRATION_DATA_PATH
+unset LIQUIBASE_CONTEXT

--- a/103
+++ b/103
@ -1,103 +0,0 @@
-pipeline {
-    agent {
-        dockerfile {
-            filename 'etc/jenkinsAgent.Dockerfile'
-            // additionalBuildArgs  ...
-            args '--network=bridge --user root -v $PWD:$PWD \
-                    -v /var/run/docker.sock:/var/run/docker.sock --group-add 984 \
-                    --memory=6g --cpus=3'
-       }
-    }
-
-    environment {
-        DOCKER_HOST = 'unix:///var/run/docker.sock'
-        HSADMINNG_POSTGRES_ADMIN_USERNAME = 'admin'
-        HSADMINNG_POSTGRES_RESTRICTED_USERNAME = 'restricted'
-        HSADMINNG_MIGRATION_DATA_PATH = 'migration'
-    }
-
-    triggers {
-        pollSCM('H/1 * * * *')
-    }
-
-    stages {
-        stage('Checkout') {
-            steps {
-                checkout scm
-            }
-        }
-
-        stage ('Compile') {
-            steps {
-                sh './gradlew clean processSpring compileJava compileTestJava --no-daemon'
-            }
-        }
-
-        stage ('Tests') {
-            parallel {
-                stage('Unit-Tests') {
-                    steps {
-                        sh './gradlew unitTest  --no-daemon'
-                    }
-                }
-                stage('General-Tests') {
-                    steps {
-                        sh './gradlew generalTest --no-daemon'
-                    }
-                }
-                stage('Office-Tests') {
-                    steps {
-                        sh './gradlew officeIntegrationTest --no-daemon'
-                    }
-                }
-                stage('Booking+Hosting-Tests') {
-                    steps {
-                        sh './gradlew bookingIntegrationTest hostingIntegrationTest --no-daemon'
-                    }
-                }
-                stage('Import-Tests') {
-                    steps {
-                        sh './gradlew importOfficeData importHostingAssets --no-daemon'
-                    }
-                }
-                stage ('Scenario-Tests') {
-                    steps {
-                        sh './gradlew scenarioTest --no-daemon'
-                    }
-                }
-            }
-        }
-
-        stage ('Check') {
-            steps {
-                sh './gradlew check -x pitest -x dependencyCheckAnalyze --no-daemon'
-            }
-        }
-    }
-
-    post {
-        always {
-            // archive test results
-            junit 'build/test-results/test/*.xml'
-
-            // archive the JaCoCo coverage report in XML and HTML format
-            jacoco(
-                execPattern: 'build/jacoco/*.exec',
-                classPattern: 'build/classes/java/main',
-                sourcePattern: 'src/main/java'
-            )
-
-            // archive scenario-test reports in HTML format
-            sh '''
-                ./gradlew convertMarkdownToHtml
-            '''
-            archiveArtifacts artifacts:
-                    'build/doc/scenarios/*.html, ' +
-                    'build/reports/dependency-license/dependencies-without-allowed-license.json',
-                allowEmptyArchive: true
-
-            // cleanup workspace
-            cleanWs()
-        }
-    }
-}
--- a/README.md
+++ b/README.md
@ -5,48 +5,41 @@ For architecture consider the files in the `doc` and `adr` folder.

 <!-- generated TOC begin: -->
 - [Setting up the Development Environment](#setting-up-the-development-environment)
-    - [PostgreSQL Server](#postgresql-server)
-    - [Markdown](#markdown)
-        - [Render Markdown embedded PlantUML](#render-markdown-embedded-plantuml)
-        - [Render Markdown Embedded Mermaid Diagrams](#render-markdown-embedded-mermaid-diagrams)
-    - [IDE Specific Settings](#ide-specific-settings)
-        - [IntelliJ IDEA](#intellij-idea)
-    - [Other Tools](#other-tools)
+  - [PostgreSQL Server](#postgresql-server)
+  - [Markdown](#markdown)
+    - [Render Markdown embedded PlantUML](#render-markdown-embedded-plantuml)
+    - [Render Markdown Embedded Mermaid Diagrams](#render-markdown-embedded-mermaid-diagrams)
+  - [IDE Specific Settings](#ide-specific-settings)
+    - [IntelliJ IDEA](#intellij-idea)
+  - [Other Tools](#other-tools)
 - [Running the SQL files](#running-the-sql-files)
-    - [For RBAC](#for-rbac)
-    - [For Historization](#for-historization)
+  - [For RBAC](#for-rbac)
+  - [For Historization](#for-historization)
 - [Coding Guidelines](#coding-guidelines)
-    - [Directory and Package Structure](#directory-and-package-structure)
-        - [General Directory Structure](#general-directory-structure)
-        - [Source Code Package Structure](#source-code-package-structure)
-    - [Run Tests from Command Line](#run-tests-from-command-line)
-    - [Spotless Code Formatting](#spotless-code-formatting)
-    - [JaCoCo Test Code Coverage Check](#jacoco-test-code-coverage-check)
-    - [PiTest Mutation Testing](#pitest-mutation-testing)
-        - [Remark](#remark)
-    - [OWASP Security Vulnerability Check](#owasp-security-vulnerability-check)
-    - [Dependency-License-Compatibility](#dependency-license-compatibility)
-    - [Dependency Version Upgrade](#dependency-version-upgrade)
- [Biggest Flaws in our Architecture](#biggest-flaws-in-our-architecture)
-    - [The RBAC System is too Complicated](#the-rbac-system-is-too-complicated)
-    - [The Mapper is Error-Prone](#the-mapper-is-error-prone)
-    - [Too Many Business-Rules Implemented in Controllers](#too-many-business-rules-implemented-in-controllers)
+  - [Directory and Package Structure](#directory-and-package-structure)
+    - [General Directory Structure](#general-directory-structure)
+    - [Source Code Package Structure](#source-code-package-structure)
+  - [Run Tests from Command Line](#run-tests-from-command-line)
+  - [Spotless Code Formatting](#spotless-code-formatting)
+  - [JaCoCo Test Code Coverage Check](#jacoco-test-code-coverage-check)
+  - [PiTest Mutation Testing](#pitest-mutation-testing)
+    - [Remark](#remark)
+  - [OWASP Security Vulnerability Check](#owasp-security-vulnerability-check)
+  - [Dependency-License-Compatibility](#dependency-license-compatibility)
+  - [Dependency Version Upgrade](#dependency-version-upgrade)
 - [How To ...](#how-to-...)
-    - [How to Run the Application With Other Profiles, e.g. production](#)
-    - [How to Do a Clean Run of the Application](#how-to-do-a-clean-run-of-the-application)
-    - [How to Configure .pgpass for the Default PostgreSQL Database?](#how-to-configure-.pgpass-for-the-default-postgresql-database?)
-    - [How to Run the Tests Against a Local User-Space Podman Daemon?](#how-to-run-the-tests-against-a-local-user-space-podman-daemon?)
-        - [Install and Run Podman](#install-and-run-podman)
-        - [Use the Command Line to Run the Tests Against the Podman Daemon ](#use-the-command-line-to-run-the-tests-against-the-podman-daemon-)
-        - [Use IntelliJ IDEA Run the Tests Against the Podman Daemon](#use-intellij-idea-run-the-tests-against-the-podman-daemon)
-        - [~/.testcontainers.properties](#~/.testcontainers.properties)
-    - [How to Run the Tests Against a Remote Podman or Docker Daemon?](#how-to-run-the-tests-against-a-remote-podman-or-docker-daemon?)
-    - [How to Run the Application on a Different Port?](#how-to-run-the-application-on-a-different-port?)
-    - [How to Use a Persistent Database for Integration Tests?](#how-to-use-a-persistent-database-for-integration-tests?)
-    - [How to Amend Liquibase SQL Changesets?](#how-to-amend-liquibase-sql-changesets?)
-    - [How to Re-Generate Spring-Controller-Interfaces from OpenAPI specs?](#how-to-re-generate-spring-controller-interfaces-from-openapi-specs?)
-    - [How to Generate Database Table Diagrams?](#how-to-generate-database-table-diagrams?)
-    - [How to Add (Real) Admin Users](#how-to-add-(real)-admin-users)
+  - [How to Configure .pgpass for the Default PostgreSQL Database?](#how-to-configure-.pgpass-for-the-default-postgresql-database?)
+  - [How to Run the Tests Against a Local User-Space Podman Daemon?](#how-to-run-the-tests-against-a-local-user-space-podman-daemon?)
+    - [Install and Run Podman](#install-and-run-podman)
+    - [Use the Command Line to Run the Tests Against the Podman Daemon ](#use-the-command-line-to-run-the-tests-against-the-podman-daemon-)
+    - [Use IntelliJ IDEA Run the Tests Against the Podman Daemon](#use-intellij-idea-run-the-tests-against-the-podman-daemon)
+    - [~/.testcontainers.properties](#~/.testcontainers.properties)
+  - [How to Run the Tests Against a Remote Podman or Docker Daemon?](#how-to-run-the-tests-against-a-remote-podman-or-docker-daemon?)
+  - [How to Run the Application on a Different Port?](#how-to-run-the-application-on-a-different-port?)
+  - [How to Use a Persistent Database for Integration Tests?](#how-to-use-a-persistent-database-for-integration-tests?)
+  - [How to Amend Liquibase SQL Changesets?](#how-to-amend-liquibase-sql-changesets?)
+  - [How to Re-Generate Spring-Controller-Interfaces from OpenAPI specs?](#how-to-re-generate-spring-controller-interfaces-from-openapi-specs?)
+  - [How to Generate Database Table Diagrams?](#how-to-generate-database-table-diagrams?)
 - [Further Documentation](#further-documentation)
 <!-- generated TOC end. -->

@ -58,73 +51,51 @@ Everything is tested on _Ubuntu Linux 22.04_ and _MacOS Monterey (12.4)_.
 To be able to build and run the Java Spring Boot application, you need the following tools:

 - Docker 20.x (on MacOS you also need *Docker Desktop* or similar) or Podman
- optionally: PostgreSQL Server 15.5-bookworm, if you want to use the database directly, not just via Docker
+- if you use Podman, explicitly fetch the Docker-image for PostgreSQL Server 15.5-bookworm:
+  `podman pull docker.io/postgres:15.5-bookworm` 
  (see instructions below to install and run in Docker)
 - The matching Java JDK at will be automatically installed by Gradle toolchain support to `~/.gradle/jdks/`.
+- named-checkzone needs to be installed for some tests and to run fully the application:
+    `sudo apt install bind9-utils`
 - You also might need an IDE (e.g. *IntelliJ IDEA* or *Eclipse* or *VS Code* with *[STS](https://spring.io/tools)* and a GUI Frontend for *PostgreSQL* like *Postbird*.
- Python 3 is expected in /usr/bin/python3 if you want to run the `howto` tool (see `bin/howto`)

 If you have at least Docker and the Java JDK installed in appropriate versions and in your `PATH`, then you can start like this:

    cd your-hsadmin-ng-directory
    
-    source .aliases     # creates some comfortable bash aliases, e.g. 'gw'='./gradlew'
-    gw                  # initially downloads the configured Gradle version into the project
-
-    gw test             # compiles and runs unit- and integration-tests - takes >10min even on a fast machine
-                        # `gw test` does NOT run import- and scenario-tests.
-                        # Use `gw-test` instead to make sure .tc-environment is sourced.
-    gw scenarioTest     # compiles and scenario-tests - takes ~1min on a decent machine
-                        # Use `gw-test scenarioTest` instead to make sure .tc-environment is sourced.
-                        
-    howto test          # shows more test information about how to run tests
-    
+    source .aliases # creates some comfortable bash aliases, e.g. 'gw'='./gradlew'
+    gw              # initially downloads the configured Gradle version into the project
+     
    # if the container has not been built yet, run this:
-    pg-sql-run          # downloads + runs PostgreSQL in a Docker container on localhost:5432
-
-    # if the container has been built already and you want to keep the data, run this:
+    pg-sql-run      # downloads + runs PostgreSQL in a Docker container on localhost:5432
+    # if the container has been built already, run this:
    pg-sql-start
+    # this step was mostly to test if Docker/Podman wirks (and introduce these aliases), so you can stop PostgreSQL again:
+    pg-sql-stop

-Next, compile and run the application on `localhost:8080` and the management server on `localhost:8081`:
-
-    # this disables CAS-authentication, for using the REST-API with CAS-authentication, see `bin/cas-curl`.
-    export HSADMINNG_CAS_SERVER=
-
-    # this runs the application with test-data and all modules:
-    gw bootRun --args='--spring.profiles.active=dev,complete,test-data'
-
-The meaning of these profiles is:
-
- **dev**: the PostgreSQL users are created via Liquibase
- **complete**: all modules are started
- **test-data**: some test data inserted 
-
-Running just `gw bootRun` would just run the *office* module, not insert any test-data and
-require the PostgreSQL users created in the database (see env-vars in `.aliases`).
-
-Now we can access the REST API, e.g. using curl:
+    gw-test         # compiles and runs unit- and integration-tests
+   
+    
+    gw bootRun      # compiles and runs the application on localhost:8080

    # the following command should reply with "pong":
-    curl -f -s http://localhost:8080/api/ping
+    curl http://localhost:8080/api/ping

    # the following command should return a JSON array with just all customers:
-    curl -f -s\
-        -H 'current-subject: superuser-alex@hostsharing.net' \
-        http://localhost:8080/api/test/customers \
-    | jq # just if `jq` is installed, to prettyprint the output
+    curl \
+        -H 'current-user: superuser-alex@hostsharing.net' \
+        http://localhost:8080/api/test/customers

    # the following command should return a JSON array with just all packages visible for the admin of the customer yyy:
-    curl -f -s\
-        -H 'current-subject: superuser-alex@hostsharing.net' -H 'assumed-roles: rbactest.customer#yyy:ADMIN' \
-        http://localhost:8080/api/test/packages \
-    | jq
+    curl \
+        -H 'current-user: superuser-alex@hostsharing.net' -H 'assumed-roles: test_customer#yyy:ADMIN' \
+        http://localhost:8080/api/test/packages

    # add a new customer
-    curl -f -s\
-        -H 'current-subject: superuser-alex@hostsharing.net' -H "Content-Type: application/json" \
+    curl \
+        -H 'current-user: superuser-alex@hostsharing.net' -H "Content-Type: application/json" \
        -d '{ "prefix":"ttt", "reference":80001, "adminUserName":"admin@ttt.example.com" }' \
-        -X POST http://localhost:8080/api/test/customers \
-    | jq
+        -X POST http://localhost:8080/api/test/customers

 If you wonder who 'superuser-alex@hostsharing.net' and 'superuser-fran@hostsharing.net' are and where the data comes from:
 Mike and Sven are just example global admin accounts as part of the example data which is automatically inserted in Testcontainers and Development environments.
@ -132,7 +103,7 @@ Also try for example 'admin@xxx.example.com' or 'unknown@example.org'.

 If you want a formatted JSON output, you can pipe the result to `jq` or similar.

-And to see the full, currently implemented, API, open http://localhost:8081/actuator/swagger-ui/index.html (uses management-port and thus bypasses authentication).
+And to see the full, currently implemented, API, open http://localhost:8080/swagger-ui/index.html.

 If you still need to install some of these tools, find some hints in the next chapters. 

@ -146,7 +117,7 @@ But the easiest way to run PostgreSQL is via Docker.

 Initially, pull an image compatible to current PostgreSQL version of Hostsharing:

-    docker pull postgres:15.5-bookworm 
+    

 <big>**&#9888;**</big>
 If we switch the version, please also amend the documentation as well as the aliases file. Thanks! 
@ -212,7 +183,7 @@ To generate the TOC (Table of Contents), a little bash script from a
 Given this is in PATH as `md-toc`, use:

 ```shell
-md-toc <README.md 2 4 | cut -c5-
+md-toc <README.md 2 4 | cut -c5-'
 ```

 To render the Markdown files, especially to watch embedded PlantUML diagrams, you can use one of the following methods:
@ -291,7 +262,7 @@ If not, you need to install some tooling.

 ##### for IntelliJ IDEA (or derived products)

-1. Activate the bundled Jebrains Markdown PlantUML Extension via
+1. Activate the bundled Jetbrains Markdown PlantUML Extension via
    [File | Settings | Languages & Frameworks | Markdown](jetbrains://idea/settings?name=Languages+%26+Frameworks--Markdown)  
 2. Install the Jetbrains Mermaid plugin: https://plugins.jetbrains.com/plugin/20146-mermaid, it also works embedded in Markdown files.

@ -339,15 +310,6 @@ To increase the amount of test data, increase the number of generated customers

 If you already have data, e.g. for customers 0..999 (thus with reference numbers 10000..10999) and want to add another 1000 customers, amend the for loop to 1000...1999 and also uncomment and amend the `CONTINUE WHEN` or `WHERE` conditions in the other test data generators, using the first new customer reference number (in the example that's 11000).

-### For Historization
-
-The historization is not yet integrated into the *Liquibase*-scripts.
-You can explore the prototype as follows:
-
- start with an empty database
-  (the example tables are currently not compatible with RBAC),
- then run `historization.sql` in the database,
- finally run `examples.sql` in the database.

 ## Coding Guidelines

@ -450,42 +412,36 @@ Some of these rules are checked with *ArchUnit* unit tests.

 ### Run Tests from Command Line

-Run all unit-, integration- and acceptance-tests which have not yet been passed with the current source code:
+Run all tests which have not yet been passed with the current source code:

 ```shell
-gw test # uses the current environment, especially HSADMINNG_POSTGRES_JDBC_URL
-```
-
-If the referenced database is not empty, the tests might fail.
-
-To explicitly use the Testcontainers-environment, run:
-
-```shell
-gw-test # uses the environment from .tc-environment
+gw test 
 ```

 Force running all tests:

 ```shell
-gw-test --rerun 
+gw cleanTest test 
 ```

-To find more options about running tests, try `howto test`.
-

 ### Spotless Code Formatting

 Code formatting for Java is checked via *spotless*.
+The formatting style can be checked with this command:
+
+```shell
+gw spotlessCheck
+```
+
+This task is also included in `gw build` and `gw check`.
+
 To apply formatting rules, use:

 ```shell
-gw-spotless
+gw spotlessApply
 ```

-The gradle task spotlessCheck is also included in `gw build` and `gw check`,
-thus if the formatting is not compliant to the rules, the build is going to fail. 
-
-
 ### JaCoCo Test Code Coverage Check

 This project uses the JaCoCo test code coverage report with limit checks.
@ -527,8 +483,9 @@ This task is also executed as part of `gw check`.

 #### Remark

-In this project, there is a large amount of code is in *plsql*, especially for RBAC. 
-*Java* ist mostly used for mapping and validating REST calls to database queries.
+In this project, there is little business logic in *Java* code;
+most business code is in *plsql* 
+and *Java* ist mostly used for mapping REST calls to database queries.
 This mapping ist mostly done through *Spring* annotations and other implicit code.

 Therefore, there are only few unit tests and thus mutation testing has limited value.
@ -537,19 +494,9 @@ We'll see if this changes when the project progresses and more validations are a

 ### OWASP Security Vulnerability Check

-An OWASP security vulnerability is configured, but you need an API key.
-Fetch it from https://nvd.nist.gov/developers/request-an-api-key.
-
-Then add it to your `~/.gradle/gradle.properties` file:
-
-```
-OWASP_API_KEY=........-....-....-....-............
-```
-
-Now you can run the dependency vulnerability check:
+An OWASP security vulnerability is configured and can be utilized by running:

 ```shell
-gw dependencyCheckUpdate
 gw dependencyCheckAnalyze
 ```

@ -600,82 +547,14 @@ Dependency versions can be automatically upgraded to the latest available versio
 gw useLatestVersions
 ```

-Afterward, `gw check` is automatically started.
+Afterwards, `gw check` is automatically started.
 Please only commit+push to master if the check run shows no errors.

 More infos, e.g. on blacklists see on the [project's website](https://github.com/patrikerdes/gradle-use-latest-versions-plugin).


-## Biggest Flaws in our Architecture
-
-### The RBAC System is too Complicated
-
-Now, where we have a better experience with what we really need from the RBAC system, we have learned
-that and creates too many (grant- and role-) rows and too even tables which could be avoided completely.
-
-The basic idea is always to always have a fixed set of ordered role-types which apply for all DB-tables under RBAC,
-e.g. OWNER>ADMIN>AGENT\[>PROXY?\]>TENENT>REFERRER.
-Grants between these for the same DB-row would be implicit by order comparison.
-This way we would get rid of all explicit grants within the same DB-row
-and would not need the `rbac.role` table anymore.
-We would also reduce the depth of the expensive recursive CTE-query.
-
-This has to be explored further.
-For now, we just keep it in mind and FIXME
-
-
-### The Mapper is Error-Prone
-
-Where `org.modelmapper.ModelMapper` reduces bloat-code a lot and has some nice features about recursive data-structure mappings,
-it often causes strange errors which are hard to fix.
-E.g. the uuid of the target main object is often taken from an uuid of a sub-subject.
-(For now, use `StrictMapper` to avoid this, for the case it happens.)
-
-
-### Too Many Business-Rules Implemented in Controllers
-
-Some REST-Controllers implement too much code for business-roles.
-This should be extracted to services.
-
-
 ## How To ...

-Besides the following *How Tos* you can also find several *How Tos* in the source code:
-
-```sh
-grep -r HOWTO src
-```
-
-also try this (assumed you've sourced .aliases):
-```sh
-howto 
-```
-
-### How to Run the Application With Other Profiles, e.g. production:
-
-Add `--args='--spring.profiles.active=...` with the wanted profile selector:
-
-```sh
-gw bootRun --args='--spring.profiles.active=external-db,only -office,without-test-data'
-```
-
-These profiles mean:
-
- **external-db**: an external PostgreSQL database is used with the PostgreSQL users already created as specified in the environment
- **only-office**: only the Office module is started, but neither the Booking nor the Hosting modules
- **without-test-data**: no test-data is inserted
-
-
-### How to Do a Clean Run of the Application
-
-If you frequently need to run with a fresh database and a clean build, you can use this:
-
-```sh
-export HSADMINNG_CAS_SERVER=
-gw clean && pg-sql-reset && sleep 5 && gw bootRun' 2>&1 | tee log
-```
-
-
 ### How to Configure .pgpass for the Default PostgreSQL Database?

 To access the default database schema as used during development, add this line to your `.pgpass` file in your users home directory:
@ -707,7 +586,8 @@ sudo apt-get -y install podman
 It is possible to move the storage directory to /tmp, e.g. to increase performance or to avoid issues with NFS mounted home directories:

 ```shell
-cat .config/containers/storage.conf
+mkdir -p ~/.config/containers/
+cat ~/.config/containers/storage.conf
 [storage]
 driver = "vfs"
 graphRoot = "/tmp/containers/storage"
@ -729,7 +609,10 @@ These commands are also available in `.aliases` as `podman-start`.
 1. In a local shell. in which you want to run the tests, set some environment variables:

 ```shell
+# sudo ln -s $HOME/.docker/run/docker.sock /var/run/docker.sock
+# or:
 export DOCKER_HOST="unix:///run/user/$UID/podman/podman.sock"
+# and:
 export TESTCONTAINERS_RYUK_DISABLED=true
 ```

@ -874,29 +757,6 @@ postgres-autodoc
 The output will list the generated files.


-### How to Add (Real) Admin Users
-
-```sql
-DO $$
-DECLARE
-    -- replace with your admin account names
-    admin_users TEXT[] := ARRAY['admin-1', 'admin-2', 'admin-3'];
-    admin TEXT;
-BEGIN
-    -- run as superuser
-    call base.defineContext('adding real admin users', null, null, null);
-    
-    -- for all new admin accounts
-    FOREACH admin IN ARRAY admin_users LOOP
-        call rbac.grantRoleToSubjectUnchecked(
-                rbac.findRoleId(rbac.global_ADMIN()), -- granted by role
-                rbac.findRoleId(rbac.global_ADMIN()), -- role to grant
-                rbac.create_subject(admin)); -- creates the new admin account
-        END LOOP;
-END $$;
-```
-
-
 ## Further Documentation

 - the `doc` directory contains architecture concepts and a glossary
--- a/bin/cas-curl
+++ b/bin/cas-curl
@ -1,249 +0,0 @@
-#!/bin/bash
-
-if [ "$2" == "--show-password" ]; then
-  HSADMINNG_CAS_SHOW_PASSWORD=yes
-  shift
-else
-  HSADMINNG_CAS_SHOW_PASSWORD=
-fi
-
-if [ "$1" == "--trace" ]; then
-  function trace() {
-    echo "$*" >&2
-  }
-  function doCurl() {
-    set -x
-    if [ -z "$HSADMINNG_CAS_ASSUME" ]; then
-      curl --fail-with-body \
-           --header "Authorization: $HSADMINNG_CAS_TICKET" \
-           "$@"
-    else
-      curl --fail-with-body \
-           --header "Authorization: $HSADMINNG_CAS_TICKET" \
-           --header "assumed-roles: $HSADMINNG_CAS_ASSUME" \
-           "$@"
-    fi
-    set +x
-  }
-  shift
-else
-  function trace() {
-    : # noop
-  }
-  function doCurl() {
-    curl --fail-with-body --header "Authorization: $HSADMINNG_CAS_TICKET" "$@"
-  }
-fi
-
-export HSADMINNG_CAS_ASSUME_HEADER
-if [ -f ~/.cas-curl-assume ]; then
-  HSADMINNG_CAS_ASSUME="$(cat ~/.cas-curl-assume)"
-else
-  HSADMINNG_CAS_ASSUME=
-fi
-
-if [ -z "$HSADMINNG_CAS_LOGIN" ] || [ -z "$HSADMINNG_CAS_VALIDATE" ] || \
-   [ -z "$HSADMINNG_CAS_SERVICE_ID" ]; then
-  cat >&2 <<EOF
-  ERROR: environment incomplete
-
-  please set the following environment variables:
-  export HSADMINNG_CAS_LOGIN=https://login.hostsharing.net/cas/v1/tickets
-  export HSADMINNG_CAS_VALIDATE=https://login.hostsharing.net/cas/proxyValidate
-  export HSADMINNG_CAS_USERNAME=<<optionally, your username, or leave empty after '='>>
-  export HSADMINNG_CAS_PASSWORD=<<optionally, your password, or leave empty after '='>>
-  export HSADMINNG_CAS_SERVICE_ID=https://hsadminng.hostsharing.net:443/
-EOF
-  exit 1
-fi
-
-function casCurlDocumentation() {
-  cat <<EOF
-  curl-wrapper utilizing CAS-authentication for hsadmin-ng
-  usage: $0 [--trace] [--show-password] <<command>> [parameters]
-
-  commands:
-EOF
-  # filters out help texts (containing double-# and following lines with leading single-#) from the commands itself
-  # (the '' makes sure that this line is not found, just the lines with actual help texts)
-  sed -n '/#''#/ {x; p; x; s/#''#//; p; :a; n; /^[[:space:]]*#/!b; s/^[[:space:]]*#//; p; ba}' <$0
-}
-
-function casLogin() {
-  # ticket granting ticket exists and not expired?
-  if find ~/.cas-login-tgt -type f -size +0c -mmin -60 2>/dev/null | grep -q .; then
-    return
-  fi
-
-  if [ -z "$HSADMINNG_CAS_USERNAME" ]; then
-    read -e -p "Username: " HSADMINNG_CAS_USERNAME
-  fi
-
-  if [ -z "$HSADMINNG_CAS_PASSWORD" ]; then
-    read -s -e -p "Password: " HSADMINNG_CAS_PASSWORD
-  fi
-
-  if [ "$HSADMINNG_CAS_SHOW_PASSWORD" == "--show-password" ]; then
-    HSADMINNG_CAS_PASSWORD_DISPLAY=$HSADMINNG_CAS_PASSWORD
-  else
-    HSADMINNG_CAS_PASSWORD_DISPLAY="<<password hidden - use --show-password to show>>"
-  fi
-
-  # Do NOT use doCurl here! We do neither want to print the password nor pass a CAS service ticket.
-  trace "+ curl --fail-with-body -s -i -X POST \
-        -H 'Content-Type: application/x-www-form-urlencoded' \
-        -d \"username=$HSADMINNG_CAS_USERNAME&password=$HSADMINNG_CAS_PASSWORD_DISPLAY\" \
-        $HSADMINNG_CAS_LOGIN -o ~/.cas-login-tgt.response -D -"
-  HSADMINNG_CAS_TGT=`curl --fail-with-body -s -i -X POST \
-        -H 'Content-Type: application/x-www-form-urlencoded' \
-        -d "username=$HSADMINNG_CAS_USERNAME&password=$HSADMINNG_CAS_PASSWORD" \
-        $HSADMINNG_CAS_LOGIN -o ~/.cas-login-tgt.response -D - \
-        | grep -i "^Location: " |  sed -e 's/^Location: //' -e 's/\\r//'`
-  if [ -z "$HSADMINNG_CAS_TGT" ]; then
-    echo "ERROR: could not get ticket granting ticket" >&2
-    cat ~/.cas-login-tgt.response >&2
-    exit 1
-  fi
-  echo "$HSADMINNG_CAS_TGT" >~/.cas-login-tgt
-  trace "$HSADMINNG_CAS_TGT"
-}
-
-function casLogout() {
-  rm -f ~/.cas-login-tgt
-}
-
-function casTicket() {
-  HSADMINNG_CAS_TGT=$(<~/.cas-login-tgt)
-  if [[ -z "$HSADMINNG_CAS_TGT" ]]; then
-    echo "ERROR: cannot get CAS ticket granting ticket for $HSADMINNG_CAS_USERNAME" >&2
-    exit 1
-  fi
-  trace "CAS-TGT: $HSADMINNG_CAS_TGT"
-
-  trace "fetching CAS service ticket"
-  trace "curl -s -d \"service=$HSADMINNG_CAS_SERVICE_ID\" $HSADMINNG_CAS_TGT"
-  HSADMINNG_CAS_TICKET=$(curl -s -d "service=$HSADMINNG_CAS_SERVICE_ID" $HSADMINNG_CAS_TGT)
-  if [[ -z "$HSADMINNG_CAS_TICKET" ]]; then
-    echo "ERROR: cannot get CAS service ticket" >&2
-    exit 1
-  fi
-
-  echo $HSADMINNG_CAS_TICKET
-}
-
-function casValidate() {
-  HSADMINNG_CAS_TICKET=`casTicket`
-
-  trace "validating CAS-TICKET: $HSADMINNG_CAS_TICKET"
-  # Do NOT use doCurl here! We do not pass a CAS service ticket.
-  trace curl -i -s $HSADMINNG_CAS_VALIDATE?ticket=${HSADMINNG_CAS_TICKET}\&service=${HSADMINNG_CAS_SERVICE_ID}
-  HSADMINNG_CAS_USER=`curl -i -s $HSADMINNG_CAS_VALIDATE?ticket=${HSADMINNG_CAS_TICKET}\&service=${HSADMINNG_CAS_SERVICE_ID} | grep -oPm1 "(?<=<cas:user>)[^<]+"`
-  if [ -z "$HSADMINNG_CAS_USER" ]; then
-    echo "validation failed" >&2
-    exit 1
-  fi
-  echo "CAS-User: $HSADMINNG_CAS_USER"
-}
-
-case "${1,,}" in
-
-  # -- generic commands --------------------------------------------------------------------------
-
-  ""|"-h"|"--help"|"help") ## prints documentation about commands and options
-      casCurlDocumentation
-      exit
-    ;;
-
-  "env") ## prints all related HSADMINNG_CAS_... environment variables; use '--show-password' to show the password as well
-  #       example: cas-curl env --show-password
-    echo "HSADMINNG_CAS_LOGIN: $HSADMINNG_CAS_LOGIN"
-    echo "HSADMINNG_CAS_VALIDATE: $HSADMINNG_CAS_VALIDATE"
-    echo "HSADMINNG_CAS_USERNAME: $HSADMINNG_CAS_USERNAME"
-    if [ "$2" == "--show-password" ]; then
-      echo "HSADMINNG_CAS_PASSWORD: $HSADMINNG_CAS_PASSWORD"
-    elif [ -z "$HSADMINNG_CAS_PASSWORD" ]; then
-      echo "HSADMINNG_CAS_PASSWORD: <<not given>>"
-    else
-      echo "HSADMINNG_CAS_PASSWORD: <<given, but hidden - add --show-password to show>>"
-    fi
-    echo "HSADMINNG_CAS_SERVICE_ID: $HSADMINNG_CAS_SERVICE_ID"
-    ;;
-
-  # --- authentication-related commands ------------------------------------------------------------
-
-  "login") ## reads username+password and fetches ticket granting ticket (bypasses HSADMINNG_CAS_USERNAME+HSADMINNG_CAS_PASSWORD)
-  #       example: cas-curl login
-    casLogout
-    export HSADMINNG_CAS_USERNAME=
-    export HSADMINNG_CAS_PASSWORD=
-    casLogin
-    ;;
-  "assume") ## assumes the given comma-separated roles
-  #       example using object-id-name: cas-curl assume 'hs_office.relation#ExampleMandant-with-PARTNER-ExamplePartner:AGENT'
-  #       example using object-uuid:    cas-curl assume 'hs_office.relation#1d3bc468-c5c8-11ef-9d0d-4751ecfda2b7:AGENT'
-    shift
-    if [ -z "$1" ]; then
-      echo "ERROR: requires comma-separated list of roles to assume" >&2
-      exit 1
-    fi
-    echo "$1" >~/.cas-curl-assume
-    ;;
-  "unassume") ## do not assume any particular role anymore, use the plain user as RBAC subject
-    rm ~/.cas-curl-assume
-    ;;
-  "validate") ## validates current ticket granting ticket and prints currently logged in user
-    casValidate
-    ;;
-  "logout") ## logout, deletes ticket granting ticket
-    casLogout
-    ;;
-
-  # --- HTTP-commands ----------------------------------------------------------------------
-
-  "get") ## HTTP GET, add URL as parameter
-  #       example: cas-curl GET http://localhost:8080/api/hs/office/partners/P-10003 | jq
-  #       hint: '| jq' is just for human-readable formatted JSON output
-    shift
-    casLogin
-    HSADMINNG_CAS_TICKET=`casTicket`
-    doCurl "$*"
-    ;;
-  "post") ## HTTP POST, add curl options to specify the request body and the URL as last parameter
-  #       example: cas-curl POST \
-  #                   -d '{ "prefix":"ttt", "reference":80001, "adminUserName":"admin@ttt.example.com" }' \
-  #                   http://localhost:8080/api/test/customers | jq
-  #       hint: '| jq' is just for human-readable formatted JSON output
-    shift
-    casLogin
-    HSADMINNG_CAS_TICKET=`casTicket`
-    doCurl --header "Content-Type: application/json" -X POST "$@"
-    ;;
-  "patch") ## HTTP PATCH, add curl options to specify the request body and the URL as last parameterparameter
-  #       example: cas-curl PATCH \
-  #                   -d '{ "reference":80002 }' \
-  #                   http://localhost:8080/api/test/customers/ae90ac2a-4728-4ca9-802e-a0d0108b2324 | jq
-  #       hint: '| jq' is just for human-readable formatted JSON output
-    shift
-    casLogin
-    HSADMINNG_CAS_TICKET=`casTicket`
-    doCurl --header "Content-Type: application/json" -X POST "$*"
-    ;;
-  "delete") ## HTTP DELETE, add curl options to specify the request body and the URL as last parameter
-  #     example: cas-curl DELETE http://localhost:8080/api/hs/office/persons/ae90ac2a-4728-4ca9-802e-a0d0108b2324
-    shift
-    casLogin
-    HSADMINNG_CAS_TICKET=`casTicket`
-    curl -X POST "$@"
-    ;;
-  *)
-    cat >&2 <<EOF
-    unknown command: '$1'
-    valid commands: help, login, logout, validate, get, post, patch, delete
-EOF
-    exit 1
-    ;;
-esac
-
-
-
-
--- a/bin/git-pull-and-if-origin-changed-run-tests
+++ b/bin/git-pull-and-if-origin-changed-run-tests
@ -1,38 +0,0 @@
-#!/bin/bash
-# waits for commits on any branch on origin, checks it out and builds it
-
-. .aliases
-
-while true; do
-    git fetch origin >/dev/null
-    branch_with_new_commits=`git fetch origin >/dev/null; git for-each-ref --format='%(refname:short) %(upstream:track)' refs/heads | grep '\[behind' | cut -d' ' -f1 | head -n1`
-
-    if [ -n "$branch_with_new_commits" ]; then
-          echo "checking out branch: $branch_with_new_commits"
-          if git show-ref --quiet --heads "$branch_with_new_commits"; then
-              echo "Branch $branch_with_new_commits already exists. Checking it out and pulling latest changes."
-              git checkout "$branch_with_new_commits"
-              git pull origin "$branch_with_new_commits"
-          else
-              echo "Creating and checking out new branch: $branch_with_new_commits"
-              git checkout -b "$branch_with_new_commits" "origin/$branch_with_new_commits"
-          fi
-
-          echo "building ..."
-          ./gradlew gw clean test check -x pitest
-    fi
-
-    # wait 10s with a little animation
-    echo -e -n "\r\033[K waiting for changes (/) ..."
-    sleep 2
-    echo -e -n "\r\033[K waiting for changes (-) ..."
-    sleep 2
-    echo -e -n "\r\033[K waiting for changes (\) ..."
-    sleep 2
-    echo -e -n "\r\033[K waiting for changes (|) ..."
-    sleep 2
-    echo -e -n "\r\033[K waiting for changes ( ) ... "
-    sleep 2
-    echo -e -n "\r\033[K checking for changes"
-done
-
--- a/bin/howto
+++ b/bin/howto
@ -1,86 +0,0 @@
-#!/usr/bin/python3
-import os
-import sys
-from urllib.parse import urljoin, quote
-
-def path_to_file_uri(path):
-    """
-    Converts a file path to a file URI.
-    Handles absolute and relative paths.
-    """
-    abs_path = os.path.abspath(path)
-    return urljoin("file://", quote(abs_path))
-
-def is_binary_file(filepath, chunk_size=1024):
-    """
-    Prüft, ob eine Datei binär ist, indem sie den Inhalt der Datei auf nicht-druckbare Zeichen untersucht.
-    """
-    try:
-        with open(filepath, "rb") as file:
-            chunk = file.read(chunk_size)
-            if b"\0" in chunk:  # Nullbyte ist ein typisches Zeichen für Binärdateien
-                return True
-        return False
-    except Exception as e:
-        print(f"Fehler beim Prüfen, ob Datei binär ist: {filepath}: {e}")
-        return True
-
-def search_keywords_in_files(keywords):
-    if not keywords:
-        print("Bitte geben Sie mindestens ein Stichwort an.")
-        sys.exit(1)
-
-    # Allowed comment symbols
-    comment_symbols = {"//", "#", ";"}
-
-    for root, dirs, files in os.walk("."):
-        # Ausschließen bestimmter Verzeichnisse
-        dirs[:] = [d for d in dirs if d not in {".git", "build"}]
-
-        for file in files:
-            filepath = os.path.join(root, file)
-
-            # Überspringen von Binärdateien
-            if is_binary_file(filepath):
-                continue
-
-            try:
-                with open(filepath, "r", encoding="utf-8") as f:
-                    lines = f.readlines()
-
-                for line_number, line in enumerate(lines, start=1):
-                    stripped_line = line.lstrip()  # Entfernt führende Leerzeichen
-                    for symbol in comment_symbols:
-                        if stripped_line.startswith(symbol):
-                            # Entfernt das Kommentarzeichen und nachfolgende Leerzeichen
-                            howtoMatch = stripped_line[len(symbol):].lstrip()
-                            if howtoMatch.startswith(("HOWTO ", "HOWTO: ", "How to ")):
-                                if all(keyword in howtoMatch.lower() for keyword in keywords):
-
-                                    # Titelzeile ohne Kommentarzeichen
-                                    print(howtoMatch.rstrip())
-
-                                    # Ausgabe nachfolgender Zeilen mit dem gleichen Kommentar-Präfix
-                                    for subsequent_line in lines[line_number:]:
-                                        subsequent_line = subsequent_line.lstrip()
-                                        if subsequent_line.startswith(symbol):
-                                            # Entfernt Kommentarzeichen aus Folgezeilen
-                                            print("\t" + subsequent_line[len(symbol):].strip())
-                                        else:
-                                            break
-
-                                    # Link mit Zeilennummer
-                                    print(f"--> {path_to_file_uri(filepath)}:{line_number}")
-
-                                    # Abstand zwischen Matches
-                                    print()
-                                    break
-            except Exception as e:
-                print(f"Fehler beim Lesen der Datei {filepath}: {e}")
-
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("Verwendung: bin/howto <Stichwort1> <Stichwort2> ...")
-        sys.exit(1)
-
-    search_keywords_in_files([arg.lower() for arg in sys.argv[1:]])
--- a/build.gradle
+++ b/build.gradle
@ -1,20 +1,17 @@
 plugins {
    id 'java'
-    id 'org.springframework.boot' version '3.4.1'
-    id 'io.spring.dependency-management' version '1.1.7'
+    id 'org.springframework.boot' version '3.2.4'
+    id 'io.spring.dependency-management' version '1.1.4'
    id 'io.openapiprocessor.openapi-processor' version '2023.2'
-    id 'com.github.jk1.dependency-license-report' version '2.9'
-    id "org.owasp.dependencycheck" version "12.0.0"
-    id "com.diffplug.spotless" version "7.0.2"
+    id 'com.github.jk1.dependency-license-report' version '2.6'
+    id "org.owasp.dependencycheck" version "9.0.10"
+    id "com.diffplug.spotless" version "6.25.0"
    id 'jacoco'
    id 'info.solidsoft.pitest' version '1.15.0'
    id 'se.patrikerdes.use-latest-versions' version '0.2.18'
    id 'com.github.ben-manes.versions' version '0.51.0'
 }

-// HOWTO: find out which dependency versions are managed by Spring Boot:
-//  https://docs.spring.io/spring-boot/appendix/dependency-versions/coordinates.html
-
 group = 'net.hostsharing'
 version = '0.0.1-SNAPSHOT'

@ -23,9 +20,6 @@ wrapper {
    gradleVersion = '8.5'
 }

-// TODO.impl: self-attaching is deprecated, see:
-//  https://javadoc.io/doc/org.mockito/mockito-core/latest/org/mockito/Mockito.html#0.3
-
 configurations {
    compileOnly {
        extendsFrom annotationProcessor
@ -64,27 +58,24 @@ dependencies {
    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
    implementation 'org.springframework.boot:spring-boot-starter-web'
    implementation 'org.springframework.boot:spring-boot-starter-validation'
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'com.github.gavlyukovskiy:datasource-proxy-spring-boot-starter:1.10.0'
-    implementation 'org.springdoc:springdoc-openapi:2.8.3'
-    implementation 'org.postgresql:postgresql'
-    implementation 'org.liquibase:liquibase-core'
-    implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.9.0'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
+    implementation 'com.github.gavlyukovskiy:datasource-proxy-spring-boot-starter:1.9.1'
+    implementation 'org.springdoc:springdoc-openapi:2.4.0'
+    implementation 'org.postgresql:postgresql:42.7.3'
+    implementation 'org.liquibase:liquibase-core:4.27.0'
+    implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.7.3'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0'
    implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
-    implementation 'org.apache.commons:commons-text:1.13.0'
-    implementation 'net.java.dev.jna:jna:5.16.0'
-    implementation 'org.modelmapper:modelmapper:3.2.2'
-    implementation 'org.iban4j:iban4j:3.2.10-RELEASE'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.3'
-    implementation 'org.reflections:reflections:0.10.2'
+    implementation 'org.apache.commons:commons-text:1.11.0'
+    implementation 'net.java.dev.jna:jna:5.8.0'
+    implementation 'org.modelmapper:modelmapper:3.2.0'
+    implementation 'org.iban4j:iban4j:3.2.7-RELEASE'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0'
+    implementation 'org.reflections:reflections:0.9.12'

    compileOnly 'org.projectlombok:lombok'
    testCompileOnly 'org.projectlombok:lombok'

-    // TODO.impl: version conflict with SpringDoc, check later and re-enable if fixed
-    // developmentOnly 'org.springframework.boot:spring-boot-devtools'
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'

    annotationProcessor 'org.projectlombok:lombok'
    testAnnotationProcessor 'org.projectlombok:lombok'
@ -94,12 +85,11 @@ dependencies {
    testImplementation 'org.testcontainers:junit-jupiter'
    testImplementation 'org.junit.jupiter:junit-jupiter'
    testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'com.tngtech.archunit:archunit-junit5:1.3.0'
+    testImplementation 'com.tngtech.archunit:archunit-junit5:1.2.1'
    testImplementation 'io.rest-assured:spring-mock-mvc'
-    testImplementation 'org.hamcrest:hamcrest-core'
+    testImplementation 'org.hamcrest:hamcrest-core:2.2'
    testImplementation 'org.pitest:pitest-junit5-plugin:1.2.1'
    testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.wiremock:wiremock-standalone:3.10.0'
 }

 dependencyManagement {
@ -127,8 +117,8 @@ openapiProcessor {
    springRoot {
        processorName 'spring'
        processor 'io.openapiprocessor:openapi-processor-spring:2022.5'
-        apiPath "$projectDir/src/main/resources/api-definition/api-definition.yaml"
-        mapping "$projectDir/src/main/resources/api-definition/api-mappings.yaml"
+        apiPath "$projectDir/src/main/resources/api-definition.yaml"
+        mapping "$projectDir/src/main/resources/api-mappings.yaml"
        targetDir "$buildDir/generated/sources/openapi-javax"
        showWarnings true
        openApiNullable true
@ -180,9 +170,7 @@ openapiProcessor {
    }
 }
 sourceSets.main.java.srcDir 'build/generated/sources/openapi'
-
 abstract class ProcessSpring extends DefaultTask {}
-
 tasks.register('processSpring', ProcessSpring)
 ['processSpringRoot',
 'processSpringRbac',
@ -213,7 +201,7 @@ openApiGenerate.dependsOn processSpring
 spotless {
    java {
        removeUnusedImports()
-        leadingTabsToSpaces(4)
+        indentWithSpaces(4)
        endWithNewline()
        toggleOffOn()

@ -256,21 +244,19 @@ licenseReport {
 }
 project.tasks.check.dependsOn(checkLicense)

-// HOWTO: run all tests except import- and scenario-tests: gw test
+// JaCoCo Test Code Coverage
+jacoco {
+    toolVersion = "0.8.10"
+}
 test {
    finalizedBy jacocoTestReport // generate report after tests
    excludes = [
            'net.hostsharing.hsadminng.**.generated.**',
    ]
    useJUnitPlatform {
-        excludeTags 'importOfficeData', 'importHostingAssets', 'scenarioTest'
+        excludeTags 'import'
    }
 }
-
-// JaCoCo Test Code Coverage for unit-tests
-jacoco {
-    toolVersion = "0.8.10"
-}
 jacocoTestReport {
    dependsOn test
    afterEvaluate {
@ -290,7 +276,7 @@ jacocoTestCoverageVerification {
    violationRules {
        rule {
            limit {
-                minimum = 0.80 // TODO.test: improve instruction coverage
+                minimum = 0.92
            }
        }

@ -302,20 +288,15 @@ jacocoTestCoverageVerification {
            element = 'CLASS'
            excludes = [
                    'net.hostsharing.hsadminng.**.generated.**',
-                    'net.hostsharing.hsadminng.rbac.test.dom.TestDomainEntity',
                    'net.hostsharing.hsadminng.HsadminNgApplication',
                    'net.hostsharing.hsadminng.ping.PingController',
-                    'net.hostsharing.hsadminng.rbac.generator.*',
-                    'net.hostsharing.hsadminng.rbac.grant.RbacGrantsDiagramService',
-                    'net.hostsharing.hsadminng.rbac.grant.RbacGrantsDiagramService.Node',
-                    'net.hostsharing.hsadminng.**.*Repository',
                    'net.hostsharing.hsadminng.mapper.Mapper'
            ]

            limit {
                counter = 'LINE'
                value = 'COVEREDRATIO'
-                minimum = 0.75 // TODO.test: improve line coverage
+                minimum = 0.98
            }
        }
        rule {
@ -329,73 +310,12 @@ jacocoTestCoverageVerification {
            limit {
                counter = 'BRANCH'
                value = 'COVEREDRATIO'
-                minimum = 0.00 // TODO.test: improve branch coverage
+                minimum = 1.00
            }
        }
    }
 }

-// HOWTO: run all unit-tests which don't need a database: gw unitTest
-tasks.register('unitTest', Test) {
-    useJUnitPlatform {
-        excludeTags 'importOfficeData', 'importHostingAssets', 'scenarioTest', 'generalIntegrationTest',
-                'officeIntegrationTest', 'bookingIntegrationTest', 'hostingIntegrationTest'
-    }
-
-    group 'verification'
-    description 'runs all unit-tests which do not need a database'
-
-    mustRunAfter spotlessJava
-}
-
-// HOWTO: run all integration tests which are not specific to a module, like base, rbac, config etc.
-tasks.register('generalIntegrationTest', Test) {
-    useJUnitPlatform {
-        includeTags 'generalIntegrationTest'
-    }
-
-    group 'verification'
-    description 'runs integration tests which are not specific to a module, like base, rbac, config etc.'
-
-    mustRunAfter spotlessJava
-}
-
-// HOWTO: run all integration tests of the office module: gw officeIntegrationTest
-tasks.register('officeIntegrationTest', Test) {
-    useJUnitPlatform {
-        includeTags 'officeIntegrationTest'
-    }
-
-    group 'verification'
-    description 'runs integration tests of the office module'
-
-    mustRunAfter spotlessJava
-}
-
-// HOWTO: run all integration tests of the booking module: gw bookingIntegrationTest
-tasks.register('bookingIntegrationTest', Test) {
-    useJUnitPlatform {
-        includeTags 'bookingIntegrationTest'
-    }
-
-    group 'verification'
-    description 'runs integration tests of the office module'
-
-    mustRunAfter spotlessJava
-}
-
-// HOWTO: run all integration tests of the hosting module: gw hostingIntegrationTest
-tasks.register('hostingIntegrationTest', Test) {
-    useJUnitPlatform {
-        includeTags 'hostingIntegrationTest'
-    }
-
-    group 'verification'
-    description 'runs integration tests of the office module'
-
-    mustRunAfter spotlessJava
-}
-
 tasks.register('importOfficeData', Test) {
    useJUnitPlatform {
        includeTags 'importOfficeData'
@ -418,30 +338,19 @@ tasks.register('importHostingAssets', Test) {
    mustRunAfter spotlessJava
 }

-tasks.register('scenarioTest', Test) {
-    useJUnitPlatform {
-        includeTags 'scenarioTest'
-    }
-
-    group 'verification'
-    description 'run the import jobs as tests'
-
-    mustRunAfter spotlessJava
-}
-
 // pitest mutation testing
 pitest {
    targetClasses = ['net.hostsharing.hsadminng.**']
    excludedClasses = [
            'net.hostsharing.hsadminng.config.**',
-            // 'net.hostsharing.hsadminng.**.*Controller',
+            'net.hostsharing.hsadminng.**.*Controller',
            'net.hostsharing.hsadminng.**.generated.**'
    ]

    targetTests = ['net.hostsharing.hsadminng.**.*UnitTest', 'net.hostsharing.hsadminng.**.*RestTest']
-    excludedTestClasses = ['**AcceptanceTest*', '**IntegrationTest*', '**ImportOfficeData', '**ImportHostingAssets']
+    excludedTestClasses = ['**AcceptanceTest*', '**IntegrationTest*']

-    pitestVersion = '1.17.0'
+    pitestVersion = '1.15.3'
    junit5PluginVersion = '1.1.0'

    threads = 4
@ -476,51 +385,3 @@ tasks.named("dependencyUpdates").configure {
        isNonStable(it.candidate.version)
    }
 }
-
-
-// Generate HTML from Markdown scenario-test-reports using Pandoc:
-tasks.register('convertMarkdownToHtml') {
-    description = 'Generates HTML from Markdown scenario-test-reports using Pandoc.'
-    group = 'Conversion'
-
-    // Define the template file and input directory
-    def templateFile = file('doc/scenarios/.template.html')
-
-    // Task configuration and execution
-    doFirst {
-        // Check if pandoc is installed
-        try {
-            exec {
-                commandLine 'pandoc', '--version'
-            }
-        } catch (Exception) {
-            throw new GradleException("Pandoc is not installed or not found in the system path.")
-        }
-
-        // Check if the template file exists
-        if (!templateFile.exists()) {
-            throw new GradleException("Template file 'doc/scenarios/.template.html' not found.")
-        }
-    }
-
-    doLast {
-        // Gather all Markdown files in the current directory
-        fileTree(dir: '.', include: 'build/doc/scenarios/*.md').each { file ->
-            // Corrected way to create the output file path
-            def outputFile = new File(file.parent, file.name.replaceAll(/\.md$/, '.html'))
-
-            // Execute pandoc for each markdown file
-            exec {
-                commandLine 'pandoc', file.absolutePath, '--template', templateFile.absolutePath, '-o', outputFile.absolutePath
-            }
-
-            println "Converted ${file.name} to ${outputFile.name}"
-        }
-    }
-}
-convertMarkdownToHtml.dependsOn scenarioTest
-
-// shortcut for compiling all files
-tasks.register('compile') {
-    dependsOn 'compileJava', 'compileTestJava'
-}
--- a/doc/adr/2022-07-18.row-level-security-mechanism.md
+++ b/doc/adr/2022-07-18.row-level-security-mechanism.md
@ -14,9 +14,9 @@ The core problem here is, that in our RBAC system, determining the permissions o

 ### Technical Background

-The session variable `hsadminng.currentSubject` contains the accessing (domain-level) user, which is unrelated to the PostgreSQL user).
+The session variable `hsadminng.currentUser` contains the accessing (domain-level) user, which is unrelated to the PostgreSQL user).

-Given is a stored function `isPermissionGrantedToSubject` which detects if the accessing subject has a given permission (e.g. 'view').
+Given is a stored function `isPermissionGrantedToSubject` which detects if the accessing user has a given permission (e.g. 'view').

 Given is also a stored function `queryAllPermissionsOfSubjectId` which returns the flattened view to all permissions assigned to the given accessing user.

@ -38,7 +38,7 @@ In this solution, the database ignores row level visibility and returns all rows

 Very flexible access, programmatic, rules could be implemented.

-The role-hierarchy and permissions for current subjects (e.g. logged-in users) could be cached in the backend.
+The role-hierarchy and permissions for currently logged-in users user could be cached in the backend.

 The access logic can be tested in pure Java unit tests.

@ -74,11 +74,11 @@ For restricted DB-users, which are used by the backend, access to rows is filter
        FOR SELECT
        TO restricted
        USING (
-            rbac.isPermissionGrantedToSubject(rbac.findEffectivePermissionId('customer', id, 'view'), currentSubjectUuid())
+            isPermissionGrantedToSubject(findEffectivePermissionId('customer', id, 'view'), currentUserUuid())
        );
    
    SET SESSION AUTHORIZATION restricted;
-    SET hsadminng.currentSubject TO 'alex@example.com';
+    SET hsadminng.currentUser TO 'alex@example.com';
    SELECT * from customer; -- will only return visible rows

 #### Advantages
@ -101,10 +101,10 @@ We are bound to PostgreSQL, including integration tests and testing the RBAC sys
    CREATE OR REPLACE RULE "_RETURN" AS
        ON SELECT TO cust_view
        DO INSTEAD
-            SELECT * FROM customer WHERE rbac.isPermissionGrantedToSubject(rbac.findEffectivePermissionId('customer', id, 'view'), currentSubjectUuid());
+            SELECT * FROM customer WHERE isPermissionGrantedToSubject(findEffectivePermissionId('customer', id, 'view'), currentUserUuid());

    SET SESSION AUTHORIZATION restricted;
-    SET hsadminng.currentSubject TO 'alex@example.com';
+    SET hsadminng.currentUser TO 'alex@example.com';
    SELECT * from customer; -- will only return visible rows

 #### Advantages
@ -130,12 +130,12 @@ We do not access the tables directly from the backend, but via views which join
    CREATE OR REPLACE VIEW cust_view AS
        SELECT c.id, c.reference, c.prefix
          FROM customer AS c
-          JOIN queryAllPermissionsOfSubjectId(currentSubjectUuid()) AS p
+          JOIN queryAllPermissionsOfSubjectId(currentUserUuid()) AS p
               ON p.tableName='customer' AND p.rowId=c.id AND p.op='view';
    GRANT ALL PRIVILEGES ON cust_view TO restricted;
    
    SET SESSION SESSION AUTHORIZATION restricted;
-    SET hsadminng.currentSubject TO 'alex@example.com';
+    SET hsadminng.currentUser TO 'alex@example.com';
    SELECT * from cust_view; -- will only return visible rows

 Alternatively the JOIN could also be applied in a "ON SELECT DO INSTEAD"-RULE, if there is any advantage for later features.
--- a/doc/adr/2024-09-27-automatic-hosting-asset-creation-for-new-booking-items.md
+++ b/doc/adr/2024-09-27-automatic-hosting-asset-creation-for-new-booking-items.md
@ -1,119 +0,0 @@
-# Handling Automatic Creation of Hosting Assets for New Booking Items
-
-**Status:**
- [x] proposed by (Michael Hönnig)
- [ ] accepted by (Participants)
- [ ] rejected by (Participants)
- [ ] superseded by (superseding ADR)
-
-
-## Context and Problem Statement
-
-When a customer creates a new booking item (e.g., `MANAGED_WEBSPACE`), the system must automatically create the related hosting asset.
-This process can sometimes fail or require additional data from the user, e.g. installing a DNS verification key, or a hostmaster, e.g. the target server to use.
-
-The challenge is how to handle this automatic creation process while dealing with missing data, asynchronicity and failures while ensuring system consistency and proper user notification.
-
-
-### Technical Background
-
-The creation of hosting assets can occur synchronously (in simple cases) or asynchronously (when additional steps like manual verification are needed).
-For example, a `DOMAIN_SETUP` hosting asset may require DNS verification from the user, and until this is provided, the related domain cannot be fully set up.
-
-Additionally, not all data needed for creating the hosting asset is stored in the booking item.
-It's part of the HTTP request and later stored in the hosting asset, but we also need to store it before the hosting asset can be created asynchronously.
-
-Current system behavior involves returning HTTP 201 upon booking item creation, but the automatic hosting asset creation might fail due to missing information.
-The system needs to manage the creation process in a way that ensures valid hosting assets are created and informs the user of any actions required while still returning a 201 HTTP code, not an error code.
-
-
-## Considered Options
-
-For storing the data needed for the hosting-asset creation:
-
-* STORAGE-1: Store temporary asset data in the `BookingItemEntity`, e.g. a JSON column.
-    And delete the value of that column, once the hosting assets got successfully created.
-* STORAGE-2: Create hosting assets immediately, even if invalid, but mark them as "inactive" until completed and fully validated.
-* STORAGE-3: Store the asset data in a kind of event- or job-queue, which get deleted once the hosting-asset got successfully created.
-
-For the user-notification status:
-
-* STATUS-1: Introduce a status field in the booking-items.
-* STATUS-2: Store the status in the event-/job-queue entries.
-
-### STORAGE-1: Temporary Data Storage in `BookingItemEntity`
-
-Store asset-related data (e.g., domain name) in a temporary column or JSON field in the `BookingItemEntity` until the hosting assets are successfully created.
-Once assets are created, the temporary data is deleted to avoid inconsistencies.
-
-#### Advantages
- Easy to implement.
-
-#### Disadvantages
- Needs either a separate map of properties in the booking-item.
- Or, if stored as a JSON field in the booking-item-resources, these are misused. 
- Requires additional cleanup logic to remove stale data.
-
-### STORAGE-2: Inactive Hosting Assets Until Validation
-
-Create the hosting assets immediately upon booking item creation but mark them as "inactive" until all required information (e.g., verification code) is provided and validation is complete.
-
-#### Advantages
- Avoids temporary external data storage for the hosting-assets.
-
-#### Disadvantages
- Validation becomes more complex as some properties need to be validated, others not.
-    And some properties even need special treatment for new entities, which then becomes vague.
- Inactive assets have to be filtered from operational assets.
- Potential risk of incomplete or inconsistent assets being created, which may require correction.
- Difficult to write tests for all possible combinations of validations.
-
-### STORAGE-3: Event-Based Approach
-
-The hosting asset data required for creation us passed to the API and stored in a `BookingItemCreatedEvent`.
-If hosting asset creation cannot happen synchronously, the event is stored and processed asynchronously in batches, retrying failed asset creation as needed.
-
-#### Advantages
- Clean-data-structure (separation of concerns).
- Clear separation between booking item creation and hosting asset creation.
- Only valid assets in the database.
- Can handle complex asynchronous processes (like waiting for external verification) in a clean and structured manner.
- Easier to manage retries and failures in asset creation without complicating the booking item structure.
-
-#### Disadvantages
- At the Spring controller level, the whole JSON is already converted into Java objects,
-    but for storing the asset data in the even, we need JSON again.
-    This could is not just a performance-overhead but could also lead to inconsistencies.
-
-### STATUS-1: Store hosting-asset-creation-status in the `BookingItemEntity`
-
-A status field would be added to booking-items to track the creation state of related hosting assets.
-The users could check their booking-items for the status of the hosting-asset creation, error messages and further instructions.
-
-#### Advantages
- Easy to implement.
-
-#### Disadvantages
- Adds a field to the booking-item which is makes no sense anymore once the related hosting asset is created.
-
-
-### Status-2: Store hosting-asset-creation-status in the `BookingItemCreateEvent`
-
-A status field would be added to the booking-item-created event and get updated with the latest messages any time we try to create the hosting-asset. 
-
-#### Advantages
- Clean-data-structure (separation of concerns)
-
-#### Disadvantages
- Accessing the status requires querying the event queue.
-
-
-## Decision Outcome
-
-**Chosen Option: STORAGE-3 with STATUS-2 (Event-Based Approach with `BookingItemCreatedEvent`)**
-
-The event-based approach was selected as the best solution for handling automatic hosting asset creation. This option provides a clear separation between booking item creation and hosting asset creation, ensuring that no invalid or incomplete assets are created. The asynchronous nature of the event system allows for retries and external validation steps (such as user-entered verification codes) without disrupting the overall flow.
-
-By using `BookingItemCreatedEvent` to store the hosting-asset data and the status,
-we don't need to misuse other data structures for temporary data
-and therefore hava a clean separation of concerns.
--- a/doc/business-glossary-de.md
+++ b/doc/business-glossary-de.md
@ -1,124 +0,0 @@
-### hsadminNg fachliches Glossar
-
-<!--
-Currently, this business glossary is only available in German because in many cases, 
-the German terms are important for comprehensibility for those using this software.
-->
-
-Dieses ist eine Sammlung von Fachbegriffen, die in diesem Projekt benutzt werden.
-Ebenfalls aufgenommen sind technische Begriffe, die für Benutzer für das Verständnis der Schnittstellen nötig sind.
-
-Falls etwas fehlt, bitte Bescheid geben.
-
-
-#### Partner
-
-In diesem System ist ein _Partner_ grundsätzlich jeglicher Geschäftspartner der _Hostsharing eG_.
-Dies können grundsätzlich Kunden, siehe [Debitor](#Debitor), wie Lieferanten sein.
-Derzeit sind aber nur Debitoren implementiert.
-
-Des Weiteren gibt es für jeden _Partner_ eine fünfstellige Partnernummer mit dem Prefix 'P-' (z.B. `P-123454`)
-sowie Zusatzinformationen (z.B. Registergerichtnummer oder Geburtsdatum), die zur genauen Identifikation benötigt werden.
-
-Für einen _Partner_ kann es gleichzeitig mehrere [Debitoren](#Debitor) 
-und zeitlich nacheinander mehrere [Mitgliedschaften](#Mitgliedschaft) geben.
-
-Partner sind grundsätzlich als ist [Relation](#Relation) der Vertragsperson mit der Person _Hostsharing eG_ implementiert.
-
-
-### Debitor
-
-Ein `Debitor` ist quasi ein Rechnungsempfänger für einen [Partner](#Partner).
-
-Für einen _Partner_ kann es gleichzeitig mehrere [Debitoren](#Debitor) geben, 
-z.B. für spezielle Projekte des Kunden oder verbundene Organisationen.
-
-Des Weiteren gibt es für jeden _Partner_ eine fünfstellige Partnernummer mit dem Prefix 'P-' (z.B. `P-123454`)
-sowie Zusatzinformationen (z.B. Registergerichtsnummer oder Geburtsdatum), die zur genauen Identifikation benötigt werden.
-
-Debitoren sind grundsätzlich als ist [Relation](#Relation) der Vertragsperson mit der Person des Vertragspartners implementiert.
-
-
-#### Relation
-
-Eine _Relation_ ist eine typisierte und mit Kontaktdaten versehene Beziehung einer (_Holder_)-Person zu einer _Anchor_-Person.
-
-Eine Relation ist eine Art Geschäftsrolle, wir haben hier aber keinen Begriff mit 'Rolle' verwendet,
-weil 'Role' (engl.) zu leicht mit der [RBAC-Rolle](#RBAC-Role) verwechselt werden könnte.
-
-Die _Relation_ ist auch ein technisches Konzept und gehört nicht zur Domänensprache.
-Dieses Konzept ist jedoch für das Verständnis der ([API](#API)) notwendig.
-
-
-#### Ex-Partner
-
-Ex-Partner bilden [Personen](#Person) ab, die vormals [Partner](#Partner) waren.
-Diese bleiben dadurch informationshalber im System verfügbar.
-
-Implementiert ist der _Ex-Partner_ als eine besondere Form der [Relation](#Relation)
-der Person des Ex-Partner (_Holder_) zum neuen Partner (_Anchor_) dargestellt.
-Dieses kann zu einer Kettenbildung führen.
-
-
-#### Representative-Contact (ehemals _contractual_)
-
-Ein _Representative_ ist eine natürliche Person, die für eine nicht-natürliche Person vertretungsberechtigt ist.
-
-Implementiert ist der _Representative_ als eine besondere Form der [Relation](#Relation) 
-der Person des Repräsentanten (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-
-
-### VIP-Contact
-
-Ein _VIP-Contact_ ist eine natürliche Person, die für einen Geschäftspartner eine wichtige Funktion übernimmt, 
-nicht aber deren offizieller Repräsentant ist. 
-
-Implementiert ist der _VIP-Contact_ als eine besondere Form der [Relation](#Relation)
-der Person des VIP-Contact (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-
-
-### Operations-Contact
-
-Ein _Operations-_Contact_ ist_ eine natürliche Person, die für einen Geschäftspartner technischer Ansprechpartner ist.
-
-Ein Seiteneffekt ist, dass diese Person im Ticketsystem Znuny direkt dem Geschäftspartner zugeordnet werden kann.
-
-Im Legacy System waren das die Kontakte mit der Rolle `operation` und `silent`.
-
-Implementiert ist der _Operations-Contact_ als eine besondere Form der [Relation](#Relation)
-der Person des _Operations-Contact_ (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-
-
-### OperationsAlert-Contact
-
-Ein _OperationsAlert-_Contact_ ist_ eine natürliche Person, die für einen Geschäftspartner bei technischen Probleme kontaktiert werden soll.
-
-Im Legacy System waren das die Kontakte mit der Rolle `operation`.
-
-Implementiert ist der _OperationsAlert-Contact_ als eine besondere Form der [Relation](#Relation)
-der Person des _OperationsAlert-Contact_ (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-
-
-### Subscriber-Contact
-
-Ein _Subscriber-_Contact_ ist_ eine natürliche Person, die für einen Geschäftspartner eine bestimmte Mailingliste abonniert.
-
-Implementiert ist der _Subscriber-Contact_ als eine besondere Form der [Relation](#Relation)
-der Person des _Subscriber-Contact_ (_Holder_) zur repräsentierten Person (_Anchor_) dargestellt.
-Zusätzlich wird diese Relation mit dem Kurznamen der abonnierten Mailingliste markiert.  
-
-
-#### Anchor / Relation-Anchor
-
-siehe [Relation](#Relation)
-
-
-#### Holder / Relation-Holder
-
-siehe [Relation](#Relation)
-
-
-#### API
-
-Und API (Application-Programming-Interface) verstehen wir eine über HTTPS angesprochene programmatisch bedienbare Schnittstell 
-zur Funktionalität des hsAdmin-NG-Systems.
--- a/doc/hs-office-data-structure.md
+++ b/doc/hs-office-data-structure.md
@ -50,7 +50,6 @@ classDiagram
            UNKNOWN: nur für Import
            NATURAL_PERSON: natürliche Person
            LEGAL_PERSON: z.B. GmbH, e.K., eG, e.V.
-            ORGANIZATIONAL_UNIT: z.B. "Admin-Team", "Buchhaltung"
            INCORORATED_FIRM: z.B. OHG, Partnerschaftsgesellschaft
            UNINCORPORATED_FIRM: z.B. GbR, ARGE, Erbengemeinschaft
            PUBLIC_INSTITUTION: KdöR, AöR [ohne Registergericht/Registernummer]
@ -65,7 +64,7 @@ classDiagram
    }

    class partner-MeierGmbH {
-        +Numeric partnerNumber: P-12345
+        +Numeric partnerNumber: 12345
        +Relation partnerRel
    }
    partner-MeierGmbH *-- rel-MeierGmbH
--- a/doc/rbac-performance-analysis.md
+++ b/doc/rbac-performance-analysis.md
@ -199,21 +199,21 @@ Limit  (cost=6549.08..6549.35 rows=54 width=16)
                                        Group Key: grants.descendantuuid
                                        ->  CTE Scan on grants  (cost=0.00..22.06 rows=1103 width=16)
                    ->  Index Only Scan using rbacobject_objecttable_uuid_key on rbacobject obj  (cost=0.28..0.31 rows=1 width=16)
-                            Index Cond: ((objecttable = 'hs_hosting.asset'::text) AND (uuid = perm.objectuuid))
+                            Index Cond: ((objecttable = 'hs_hosting_asset'::text) AND (uuid = perm.objectuuid))
 ```

 ### Office-Relation-Query

 ```SQL
 SELECT hore1_0.uuid,a1_0.uuid,a1_0.familyname,a1_0.givenname,a1_0.persontype,a1_0.salutation,a1_0.title,a1_0.tradename,a1_0.version,c1_0.uuid,c1_0.caption,c1_0.emailaddresses,c1_0.phonenumbers,c1_0.postaladdress,c1_0.version,h1_0.uuid,h1_0.familyname,h1_0.givenname,h1_0.persontype,h1_0.salutation,h1_0.title,h1_0.tradename,h1_0.version,hore1_0.mark,hore1_0.type,hore1_0.version 
-    FROM hs_office.relation_rv hore1_0
-    LEFT JOIN hs_office.person_rv a1_0 ON a1_0.uuid=hore1_0.anchoruuid 
-    LEFT JOIN hs_office.contact_rv c1_0 ON c1_0.uuid=hore1_0.contactuuid
-    LEFT JOIN hs_office.person_rv h1_0 ON h1_0.uuid=hore1_0.holderuuid
+    FROM hs_office_relation_rv hore1_0
+    LEFT JOIN hs_office_person_rv a1_0 ON a1_0.uuid=hore1_0.anchoruuid 
+    LEFT JOIN hs_office_contact_rv c1_0 ON c1_0.uuid=hore1_0.contactuuid
+    LEFT JOIN hs_office_person_rv h1_0 ON h1_0.uuid=hore1_0.holderuuid
    WHERE hore1_0.uuid=$1
 ```

-That query on the `hs_office.relation_rv`-table joins the three references anchor-person, holder-person and contact.
+That query on the `hs_office_relation_rv`-table joins the three references anchor-person, holder-person and contact.


 ### Total-Query-Time > Total-Import-Runtime
@ -239,7 +239,7 @@ This did not improve the performance.
 We were suspicious about the sequential scan over all `rbacpermission` rows which was done by PostgreSQL to execute a HashJoin strategy. Turning off that strategy by

 ```SQL
-ALTER FUNCTION rbac.queryAccessibleObjectUuidsOfSubjectIds SET enable_hashjoin = off;
+ALTER FUNCTION queryAccessibleObjectUuidsOfSubjectIds SET enable_hashjoin = off;
 ```

 did not improve the performance though. The HashJoin was actually still applied, but no full table scan anymore:
@ -270,21 +270,21 @@ At this point, the import took 21mins with these statistics:

 | query | calls | total_m | mean_ms |
 |-------|-------|---------|---------|
-| select hore1_0.uuid,a1_0.uuid,a1_0.familyname,a1_0.givenname,a1_0.persontype,a1_0.salutation,a1_0.title,a1_0.tradename,a1_0.version,c1_0.uuid,c1_0.caption,c1_0.emailaddresses,c1_0.phonenumbers,c1_0.postaladdress, c1_0.version,h1_0.uuid,h1_0.familyname,h1_0.givenname,h1_0.persontype,h1_0.salutation,h1_0.title,h1_0.tradename,h1_0.version,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office.relation_rv hore1_0 left join public.hs_office.person_rv a1_0 on a1_0.uuid=hore1_0.anchoruuid left join public.hs_office.contact_rv c1_0 on c1_0.uuid=hore1_0.contactuuid left join public.hs_office.person_rv h1_0 on h1_0.uuid=hore1_0.holderuuid where hore1_0.uuid=$1 | 517 | 11 | 1282 |
-| select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office.person_rv hope1_0 where hope1_0.uuid=$1 | 973 | 4 | 254 |
-| select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office.contact_rv hoce1_0 where hoce1_0.uuid=$1 | 973 | 4 | 253 |
-| call rbac.grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed) | 31316 | 0 | 1 |
+| select hore1_0.uuid,a1_0.uuid,a1_0.familyname,a1_0.givenname,a1_0.persontype,a1_0.salutation,a1_0.title,a1_0.tradename,a1_0.version,c1_0.uuid,c1_0.caption,c1_0.emailaddresses,c1_0.phonenumbers,c1_0.postaladdress, c1_0.version,h1_0.uuid,h1_0.familyname,h1_0.givenname,h1_0.persontype,h1_0.salutation,h1_0.title,h1_0.tradename,h1_0.version,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office_relation_rv hore1_0 left join public.hs_office_person_rv a1_0 on a1_0.uuid=hore1_0.anchoruuid left join public.hs_office_contact_rv c1_0 on c1_0.uuid=hore1_0.contactuuid left join public.hs_office_person_rv h1_0 on h1_0.uuid=hore1_0.holderuuid where hore1_0.uuid=$1 | 517 | 11 | 1282 |
+| select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office_person_rv hope1_0 where hope1_0.uuid=$1 | 973 | 4 | 254 |
+| select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office_contact_rv hoce1_0 where hoce1_0.uuid=$1 | 973 | 4 | 253 |
+| call grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed) | 31316 | 0 | 1 |
 | call buildRbacSystemForHsHostingAsset(NEW) | 2258 | 0 | 7 |
-| select * from rbac.isGranted(array[granteeId], grantedId) | 44613 | 0 | 0 |
-| insert into public.hs_hosting.asset_rv (alarmcontactuuid,assignedtoassetuuid,bookingitemuuid,caption,config,identifier,parentassetuuid,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10) | 2207 | 0 | 7 |
-| insert into hs_hosting.asset (alarmcontactuuid, version, bookingitemuuid, type, parentassetuuid, assignedtoassetuuid, config, uuid, identifier, caption) values (new.alarmcontactuuid, new. version, new. bookingitemuuid, new. type, new. parentassetuuid, new. assignedtoassetuuid, new. config, new. uuid, new. identifier, new. caption) returning * | 2207 | 0 | 7 |
-| insert into public.hs_office.relation_rv (anchoruuid,contactuuid,holderuuid,mark,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7) | 1261 | 0 | 9 |
-| insert into hs_office.relation (uuid, version, anchoruuid, holderuuid, contactuuid, type, mark) values (new.uuid, new. version, new. anchoruuid, new. holderuuid, new. contactuuid, new. type, new. mark) returning * | 1261 | 0 | 9 |
+| select * from isGranted(array[granteeId], grantedId) | 44613 | 0 | 0 |
+| insert into public.hs_hosting_asset_rv (alarmcontactuuid,assignedtoassetuuid,bookingitemuuid,caption,config,identifier,parentassetuuid,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10) | 2207 | 0 | 7 |
+| insert into hs_hosting_asset (alarmcontactuuid, version, bookingitemuuid, type, parentassetuuid, assignedtoassetuuid, config, uuid, identifier, caption) values (new.alarmcontactuuid, new. version, new. bookingitemuuid, new. type, new. parentassetuuid, new. assignedtoassetuuid, new. config, new. uuid, new. identifier, new. caption) returning * | 2207 | 0 | 7 |
+| insert into public.hs_office_relation_rv (anchoruuid,contactuuid,holderuuid,mark,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7) | 1261 | 0 | 9 |
+| insert into hs_office_relation (uuid, version, anchoruuid, holderuuid, contactuuid, type, mark) values (new.uuid, new. version, new. anchoruuid, new. holderuuid, new. contactuuid, new. type, new. mark) returning * | 1261 | 0 | 9 |
 | call buildRbacSystemForHsOfficeRelation(NEW) | 1276 | 0 | 8 |
 | with recursive grants as ( select descendantUuid, ascendantUuid from RbacGrants where descendantUuid = grantedId union all select ""grant"".descendantUuid, ""grant"".ascendantUuid from RbacGrants ""grant"" inner join grants recur on recur.ascendantUuid = ""grant"".descendantUuid ) select exists ( select $3 from grants where ascendantUuid = any(granteeIds) ) or grantedId = any(granteeIds) | 47540 | 0 | 0 |
 | insert into RbacGrants (grantedByTriggerOf, ascendantuuid, descendantUuid, assumed) values (currentTriggerObjectUuid(), superRoleId, subRoleId, doAssume) on conflict do nothing" | 40472 | 0 | 0 |
-| insert into public.hs_booking.item_rv (caption,parentitemuuid,projectuuid,resources,type,validity,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8) | 926 | 0 | 7 |
-| insert into hs_booking.item (resources, version, projectuuid, type, parentitemuuid, validity, uuid, caption) values (new.resources, new. version, new. projectuuid, new. type, new. parentitemuuid, new. validity, new. uuid, new. caption) returning * | 926 | 0 | 7 |
+| insert into public.hs_booking_item_rv (caption,parentitemuuid,projectuuid,resources,type,validity,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8) | 926 | 0 | 7 |
+| insert into hs_booking_item (resources, version, projectuuid, type, parentitemuuid, validity, uuid, caption) values (new.resources, new. version, new. projectuuid, new. type, new. parentitemuuid, new. validity, new. uuid, new. caption) returning * | 926 | 0 | 7 |


 The slowest query now was fetching Relations joined with Contact, Anchor-Person and Holder-Person, for all tables using the restricted (RBAC) views (_rv).
@ -294,20 +294,20 @@ We changed these mappings from `EAGER` (default) to `LAZY` to `@ManyToOne(fetch
 :::small
 | query                                                                                                                                                                                                                                                                                                                                                                                                 | calls | total (min) | mean (ms) |
 |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|-------------|----------|
-| select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office.person_rv hope1_0 where hope1_0.uuid=$1                                                                                                                                                                                          | 1015 | 4           | 238 |
-| select hore1_0.uuid,hore1_0.anchoruuid,hore1_0.contactuuid,hore1_0.holderuuid,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office.relation_rv hore1_0 where hore1_0.uuid=$1                                                                                                                                                                                                               | 517 | 4           | 439       |
-| select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office.contact_rv hoce1_0 where hoce1_0.uuid=$1                                                                                                                                                                                                                  | 497 | 2           | 213 |      
-| call rbac.grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed)                                                                                                                                                                                                                                                                                                                                  | 31316 | 0           | 1   |      
-| select * from rbac.isGranted(array[granteeId], grantedId)                                                                                                                                                                                                                                                                                                                                                  | 44613 | 0           | 0     |    
+| select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office_person_rv hope1_0 where hope1_0.uuid=$1                                                                                                                                                                                          | 1015 | 4           | 238 |
+| select hore1_0.uuid,hore1_0.anchoruuid,hore1_0.contactuuid,hore1_0.holderuuid,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office_relation_rv hore1_0 where hore1_0.uuid=$1                                                                                                                                                                                                               | 517 | 4           | 439       |
+| select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office_contact_rv hoce1_0 where hoce1_0.uuid=$1                                                                                                                                                                                                                  | 497 | 2           | 213 |      
+| call grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed)                                                                                                                                                                                                                                                                                                                                  | 31316 | 0           | 1   |      
+| select * from isGranted(array[granteeId], grantedId)                                                                                                                                                                                                                                                                                                                                                  | 44613 | 0           | 0     |    
 | call buildRbacSystemForHsHostingAsset(NEW)                                                                                                                                                                                                                                                                                                                                                            | 2258 | 0           | 7        | 
-| insert into public.hs_hosting.asset_rv (alarmcontactuuid,assignedtoassetuuid,bookingitemuuid,caption,config,identifier,parentassetuuid,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)                                                                                                                                                                                                     | 2207 | 0           | 7         |
-| insert into hs_hosting.asset (alarmcontactuuid, version, bookingitemuuid, type, parentassetuuid, assignedtoassetuuid, config, uuid, identifier, caption) values (new.alarmcontactuuid, new. version, new. bookingitemuuid, new. type, new. parentassetuuid, new. assignedtoassetuuid, new. config, new. uuid, new. identifier, new. caption) returning *                                              | 2207 | 0           | 7 |        
+| insert into public.hs_hosting_asset_rv (alarmcontactuuid,assignedtoassetuuid,bookingitemuuid,caption,config,identifier,parentassetuuid,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)                                                                                                                                                                                                     | 2207 | 0           | 7         |
+| insert into hs_hosting_asset (alarmcontactuuid, version, bookingitemuuid, type, parentassetuuid, assignedtoassetuuid, config, uuid, identifier, caption) values (new.alarmcontactuuid, new. version, new. bookingitemuuid, new. type, new. parentassetuuid, new. assignedtoassetuuid, new. config, new. uuid, new. identifier, new. caption) returning *                                              | 2207 | 0           | 7 |        
 | with recursive grants as ( select descendantUuid, ascendantUuid from RbacGrants where descendantUuid = grantedId union all select ""grant"".descendantUuid, ""grant"".ascendantUuid from RbacGrants ""grant"" inner join grants recur on recur.ascendantUuid = ""grant"".descendantUuid ) select exists ( select $3 from grants where ascendantUuid = any(granteeIds) ) or grantedId = any(granteeIds) | 47538 | 0           | 0 |        
- insert into public.hs_office.relation_rv (anchoruuid,contactuuid,holderuuid,mark,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7)                                                                                                                                                                                                                                                                     | 1261 | 0           | 8         |
-| insert into hs_office.relation (uuid, version, anchoruuid, holderuuid, contactuuid, type, mark) values (new.uuid, new. version, new. anchoruuid, new. holderuuid, new. contactuuid, new. type, new. mark) returning *                                                                                                                                                                                 | 1261 | 0           | 8         |
+ insert into public.hs_office_relation_rv (anchoruuid,contactuuid,holderuuid,mark,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7)                                                                                                                                                                                                                                                                     | 1261 | 0           | 8         |
+| insert into hs_office_relation (uuid, version, anchoruuid, holderuuid, contactuuid, type, mark) values (new.uuid, new. version, new. anchoruuid, new. holderuuid, new. contactuuid, new. type, new. mark) returning *                                                                                                                                                                                 | 1261 | 0           | 8         |
 | call buildRbacSystemForHsOfficeRelation(NEW)                                                                                                                                                                                                                                                                                                                                                          | 1276 | 0           | 7 |        
-| insert into public.hs_booking.item_rv (caption,parentitemuuid,projectuuid,resources,type,validity,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8)                                                                                                                                                                                                                                                      | 926 | 0           | 7 |        
-| insert into hs_booking.item (resources, version, projectuuid, type, parentitemuuid, validity, uuid, caption) values (new.resources, new. version, new. projectuuid, new. type, new. parentitemuuid, new. validity, new. uuid, new. caption) returning *                                                                                                                                               | 926 | 0           | 7         |
+| insert into public.hs_booking_item_rv (caption,parentitemuuid,projectuuid,resources,type,validity,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8)                                                                                                                                                                                                                                                      | 926 | 0           | 7 |        
+| insert into hs_booking_item (resources, version, projectuuid, type, parentitemuuid, validity, uuid, caption) values (new.resources, new. version, new. projectuuid, new. type, new. parentitemuuid, new. validity, new. uuid, new. caption) returning *                                                                                                                                               | 926 | 0           | 7         |
 insert into RbacGrants (grantedByTriggerOf, ascendantuuid, descendantUuid, assumed) values (currentTriggerObjectUuid(), superRoleId, subRoleId, doAssume) on conflict do nothing                                                                                                                                                                                                                      | 40472 | 0           | 0 |

 Now, finally, the total runtime of the import was down to 12 minutes. This is repeatable, where originally, the import took about 25mins in most cases and just rarely -  and for unknown reasons - 10min.
@ -318,7 +318,7 @@ But once UnixUser and EmailAlias assets got added to the import, the total time

 This was not acceptable, especially not, considering that domains, email-addresses and database-assets are almost 10 times that number and thus the import would go up to over 1100min which is 20 hours.

-In a first step, a `HsHostingAssetRawEntity` was created, mapped to the raw table (hs_hosting.asset) not to the RBAC-view (hs_hosting.asset_rv). Unfortunately we did not keep measurements, but that was only part of the problem anyway. 
+In a first step, a `HsHostingAssetRawEntity` was created, mapped to the raw table (hs_hosting_asset) not to the RBAC-view (hs_hosting_asset_rv). Unfortunately we did not keep measurements, but that was only part of the problem anyway. 

 The main problem was, that there is something strange with persisting (`EntityManager.persist`) for EmailAlias assets. Where importing UnixUsers was mostly slow due to RBAC SELECT-permission checks, persisting EmailAliases suddenly created about a million (in numbers 1.000.000) SQL UPDATE statements after the INSERT, all with the same data, just increased version number (used for optimistic locking). We were not able to figure out why this happened.

@ -330,22 +330,22 @@ Now, the longest running queries are these:

 | No.| calls   | total_m | mean_ms | query                                                                                                                                                                                                                                                                                                                                                                                          |
 |---:|---------|--------:|--------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|  1 | 13.093  |       4 |      21 | insert into hs_hosting.asset( uuid, type, bookingitemuuid, parentassetuuid, assignedtoassetuuid, alarmcontactuuid, identifier, caption, config, version) values ( $1, $2, $3, $4, $5, $6, $7, $8, cast($9 as jsonb), $10)                                                                                                                                                                      |
-|  2 | 517     |       4 |     502 | select hore1_0.uuid,hore1_0.anchoruuid,hore1_0.contactuuid,hore1_0.holderuuid,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office.relation_rv hore1_0 where hore1_0.uuid=$1                                                                                                                                                                                                        |
+|  1 | 13.093  |       4 |      21 | insert into hs_hosting_asset( uuid, type, bookingitemuuid, parentassetuuid, assignedtoassetuuid, alarmcontactuuid, identifier, caption, config, version) values ( $1, $2, $3, $4, $5, $6, $7, $8, cast($9 as jsonb), $10)                                                                                                                                                                      |
+|  2 | 517     |       4 |     502 | select hore1_0.uuid,hore1_0.anchoruuid,hore1_0.contactuuid,hore1_0.holderuuid,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office_relation_rv hore1_0 where hore1_0.uuid=$1                                                                                                                                                                                                        |
 |  3 | 13.144  |       4 |      21 | call buildRbacSystemForHsHostingAsset(NEW)                                                                                                                                                                                                                                                                                                                                                     |
-|  4 | 96.632  |       3 |       2 | call rbac.grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed)                                                                                                                                                                                                                                                                                                                           |
-|  5 | 120.815 |       3 |       2 | select * from rbac.isGranted(array[granteeId], grantedId)                                                                                                                                                                                                                                                                                                                                           |
+|  4 | 96.632  |       3 |       2 | call grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed)                                                                                                                                                                                                                                                                                                                           |
+|  5 | 120.815 |       3 |       2 | select * from isGranted(array[granteeId], grantedId)                                                                                                                                                                                                                                                                                                                                           |
 |  6 | 123.740 |       3 |       2 | with recursive grants as ( select descendantUuid, ascendantUuid from RbacGrants where descendantUuid = grantedId union all select "grant".descendantUuid, "grant".ascendantUuid from RbacGrants "grant" inner join grants recur on recur.ascendantUuid = "grant".descendantUuid ) select exists ( select $3 from grants where ascendantUuid = any(granteeIds) ) or grantedId = any(granteeIds) |
-|  7 | 497     |       2 |     259 | select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office.contact_rv hoce1_0 where hoce1_0.uuid=$1                                                                                                                                                                                                           |
-|  8 | 497     |       2 |     255 | select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office.person_rv hope1_0 where hope1_0.uuid=$1                                                                                                                                                                                   |
-|  9 | 13.144  |       1 |       8 | SELECT createRoleWithGrants( hs_hosting.asset_TENANT(NEW), permissions => array[$7], incomingSuperRoles => array[ hs_hosting.asset_AGENT(NEW), hs_office.contact_ADMIN(newAlarmContact)], outgoingSubRoles => array[ hs_booking.item_TENANT(newBookingItem), hs_hosting.asset_TENANT(newParentAsset)] ) |
-| 10 |  13.144 |       1 |       5 |  SELECT createRoleWithGrants( hs_hosting.asset_ADMIN(NEW), permissions => array[$7], incomingSuperRoles => array[ hs_booking.item_AGENT(newBookingItem), hs_hosting.asset_AGENT(newParentAsset), hs_hosting.asset_OWNER(NEW)] ) |
+|  7 | 497     |       2 |     259 | select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office_contact_rv hoce1_0 where hoce1_0.uuid=$1                                                                                                                                                                                                           |
+|  8 | 497     |       2 |     255 | select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office_person_rv hope1_0 where hope1_0.uuid=$1                                                                                                                                                                                   |
+|  9 | 13.144  |       1 |       8 | SELECT createRoleWithGrants( hsHostingAssetTENANT(NEW), permissions => array[$7], incomingSuperRoles => array[ hsHostingAssetAGENT(NEW), hsOfficeContactADMIN(newAlarmContact)], outgoingSubRoles => array[ hsBookingItemTENANT(newBookingItem), hsHostingAssetTENANT(newParentAsset)] ) |
+| 10 |  13.144 |       1 |       5 |  SELECT createRoleWithGrants( hsHostingAssetADMIN(NEW), permissions => array[$7], incomingSuperRoles => array[ hsBookingItemAGENT(newBookingItem), hsHostingAssetAGENT(newParentAsset), hsHostingAssetOWNER(NEW)] ) |

-That the `INSERT into hs_hosting.asset` (No. 1) takes up the most time, seems to be normal, and 21ms for each call is also fine.
+That the `INSERT into hs_hosting_asset` (No. 1) takes up the most time, seems to be normal, and 21ms for each call is also fine.

 It seems that the trigger effects (eg. No. 3 and No. 4) are included in the measure for the causing INSERT, otherwise summing up the totals would exceed the actual total time of the whole import. And it was to be expected that building the RBAC rules for new business objects takes most of the time.

-In production, the `SELECT ... FROM hs_office.relation_rv` (No. 2) with about 0.5 seconds could still be a problem. But once we apply the improvements from the hosting asset area also to the office area, this should not be a problem for the import anymore.
+In production, the `SELECT ... FROM hs_office_relation_rv` (No. 2) with about 0.5 seconds could still be a problem. But once we apply the improvements from the hosting asset area also to the office area, this should not be a problem for the import anymore.

 
 ## Further Options To Explore
@ -392,9 +392,9 @@ We found some solution approaches:

 3. Inverting the recursion of the CTE-query, combined with the type condition.
    
-    Instead of starting the recursion with `currentSubjectOrAssumedRolesUuids()`, 
+    Instead of starting the recursion with `currentsubjectsuuids()`, 
    we could start it with the target table name and row-type,
-    then recurse down to the `currentSubjectOrAssumedRolesUuids()`.
+    then recurse down to the `currentsubjectsuuids()`.

    In the end, we need the object UUIDs, though. 
    But if we start with the join of `rbacObject` with `rbacPermission`, 
@ -408,12 +408,12 @@ We found some solution approaches:
 This optimization idea came from Michael Hierweck and was promising.
 The idea is to reduce the size of the result of the recursive CTE query and maybe even speed up that query itself.

-To evaluate this, I added a type column to the `rbacObject` table, initially as an enum hsHostingAssetType. Then I entered the type there for all rows from hs_hosting.asset. This means that 83,886 of 92,545 rows in `rbacobject` have a type set, leaving 8,659 without.
+To evaluate this, I added a type column to the `rbacObject` table, initially as an enum hsHostingAssetType. Then I entered the type there for all rows from hs_hosting_asset. This means that 83,886 of 92,545 rows in `rbacobject` have a type set, leaving 8,659 without.

 If we do this for other types (we currently have 1,271 relations and 927 booking items), it gets more complicated because they are different enum types. As varchar(16), we could lose performance again due to the higher storage space requirements.

 But the performance gained is not particularly high anyway.
-See the average seconds per recursive CTE select as role 'hs_hosting.asset:<DEBITOR>defaultproject:ADMIN',
+See the average seconds per recursive CTE select as role 'hs_hosting_asset:<DEBITOR>defaultproject:ADMIN',
 joined with business query for all `'EMAIL_ADDRESSES'`:

 |                                                     | D-1000000-hsh    | D-1000300-mih |
--- a/doc/rbac.md
+++ b/doc/rbac.md
@ -29,7 +29,7 @@ skinparam linetype ortho
 package RBAC {

    ' forward declarations    
-    entity RbacSubject
+    entity RbacUser
    
    together {
        
@ -37,8 +37,8 @@ package RBAC {
        entity RbacPermission
 
        
-        RbacSubject -[hidden]> RbacRole
-        RbacRole -[hidden]> RbacSubject
+        RbacUser -[hidden]> RbacRole
+        RbacRole -[hidden]> RbacUser
    }
   
    together {
@ -57,11 +57,11 @@ package RBAC {
    RbacGrant o-u-> RbacReference
    
    enum RbacReferenceType {
-        RbacSubject
+        RbacUser
        RbacRole
        RbacPermission
    }
-    RbacReferenceType ..> RbacSubject
+    RbacReferenceType ..> RbacUser
    RbacReferenceType ..> RbacRole
    RbacReferenceType ..> RbacPermission
    
@ -71,12 +71,12 @@ package RBAC {
        type : RbacReferenceType
    }
    RbacReference o--> RbacReferenceType  
-    entity RbacSubject {
+    entity RbacUser {
        *uuid : uuid <<generated>>
        --
        name : varchar
    }
-    RbacSubject o-- RbacReference
+    RbacUser o-- RbacReference
    
    entity RbacRole {
        *uuid : uuid(RbacReference)
@ -143,20 +143,20 @@ The primary key of the *RbacReference* and its referred object is always identic
 #### RbacReferenceType

 The enum *RbacReferenceType* describes the type of reference.
-It's only needed to make it easier to find the referred object in *RbacSubject*, *RbacRole* or *RbacPermission*.
+It's only needed to make it easier to find the referred object in *RbacUser*, *RbacRole* or *RbacPermission*.

-#### RbacSubject
+#### RbacUser

-An *RbacSubject* is a type of RBAC-subject which references a login account outside this system, identified by a name (usually an email-address).
+An *RbacUser* is a type of RBAC-subject which references a login account outside this system, identified by a name (usually an email-address).

-*RbacSubject*s can be assigned to multiple *RbacRole*s, through which they can get permissions to *RbacObject*s.
+*RbacUser*s can be assigned to multiple *RbacRole*s, through which they can get permissions to *RbacObject*s.

-The primary key of the *RbacSubject* is identical to its related *RbacReference*.
+The primary key of the *RbacUser* is identical to its related *RbacReference*.

 #### RbacRole

 An *RbacRole* represents a collection of directly or indirectly assigned *RbacPermission*s. 
-Each *RbacRole* can be assigned to *RbacSubject*s or to another *RbacRole*.
+Each *RbacRole* can be assigned to *RbacUser*s or to another *RbacRole*.

 Both kinds of assignments are represented via *RbacGrant*.

@ -184,7 +184,7 @@ Only with this rule, the foreign key in *RbacPermission* can be defined as `NOT

 #### RbacGrant

-The *RbacGrant* entities represent the access-rights structure from *RbacSubject*s via hierarchical *RbacRoles* down to *RbacPermission*s.
+The *RbacGrant* entities represent the access-rights structure from *RbacUser*s via hierarchical *RbacRoles* down to *RbacPermission*s.

 The core SQL queries to determine access rights are all recursive queries on the *RbacGrant* table.

@ -284,7 +284,7 @@ hide circle
 ' use right-angled line routing
 ' skinparam linetype ortho

-package RbacSubjects {
+package RbacUsers {
    object UserMike
    object UserSuse
    object UserPaul
@ -296,7 +296,7 @@ package RbacRoles {
    object RoleCustXyz_Admin
    object RolePackXyz00_Owner
 }
-RbacSubjects -[hidden]> RbacRoles
+RbacUsers -[hidden]> RbacRoles

 package RbacPermissions {
    object PermCustXyz_SELECT
@ -364,10 +364,10 @@ This way, each user can only select the data they have 'SELECT'-permission for,

 ### Current User

-The current use is taken from the session variable `hsadminng.currentSubject` which contains the name of the user as stored in the 
-*RbacSubject*s table. Example:
+The current use is taken from the session variable `hsadminng.currentUser` which contains the name of the user as stored in the 
+*RbacUser*s table. Example:

-    SET LOCAL hsadminng.currentSubject = 'mike@hostsharing.net';
+    SET LOCAL hsadminng.currentUser = 'mike@hostsharing.net';

 That user is also used for historicization and audit log, but which is a different topic.

@ -388,7 +388,7 @@ A full example is shown here:

    BEGIN TRANSACTION;
        SET SESSION SESSION AUTHORIZATION restricted;
-        SET LOCAL hsadminng.currentSubject = 'mike@hostsharing.net';
+        SET LOCAL hsadminng.currentUser = 'mike@hostsharing.net';
        SET LOCAL hsadminng.assumedRoles = 'customer#aab:admin;customer#aac:admin';
        
        SELECT c.prefix, p.name as "package", ema.localPart || '@' || dom.name as "email-address"
@ -605,8 +605,8 @@ Find the SQL script here: `28-hs-tests.sql`.
 We have tested two variants of the query for the restricted view,
 both utilizing a PostgreSQL function like this:

-    FUNCTION rbac.queryAccessibleObjectUuidsOfSubjectIds(
-            requiredOp rbac.RbacOp,
+    FUNCTION queryAccessibleObjectUuidsOfSubjectIds(
+            requiredOp RbacOp,
            forObjectTable varchar,
            subjectIds uuid[],
            maxObjects integer = 16000)
@ -623,8 +623,8 @@ Let's have a look at the two view queries:
          FROM customer AS target
         WHERE target.uuid IN (
            SELECT uuid
-              FROM rbac.queryAccessibleObjectUuidsOfSubjectIds( 
-                'SELECT, 'customer', currentSubjectOrAssumedRolesUuids()));
+              FROM queryAccessibleObjectUuidsOfSubjectIds( 
+                'SELECT, 'customer', currentSubjectsUuids()));

 This view should be automatically updatable.
 Where, for updates, we actually have to check for 'UPDATE' instead of 'SELECT' operation, which makes it a bit more complicated.
@ -641,8 +641,8 @@ Looks like the query optimizer needed some statistics to find the best path.
    CREATE OR REPLACE VIEW customer_rv AS
        SELECT DISTINCT target.*
          FROM customer AS target
-          JOIN rbac.queryAccessibleObjectUuidsOfSubjectIds( 
-                'SELECT, 'customer', currentSubjectOrAssumedRolesUuids()) AS allowedObjId
+          JOIN queryAccessibleObjectUuidsOfSubjectIds( 
+                'SELECT, 'customer', currentSubjectsUuids()) AS allowedObjId
            ON target.uuid = allowedObjId;

 This view cannot is not updatable automatically,
@ -671,9 +671,9 @@ Access Control for business objects checked according to the assigned roles.
 But we decided not to create such roles and permissions for the RBAC-Objects itself.
 It would have overcomplicated the system and the necessary information can easily be added to the RBAC-Objects itself, mostly the `RbacGrant`s.

-### RbacSubject
+### RbacUser

-Users can self-register, thus to create a new RbacSubject entity, no login is required.
+Users can self-register, thus to create a new RbacUser entity, no login is required.
 But such a user has no access-rights except viewing itself.

 Users can view themselves.
--- a/doc/scenarios/.template.html
+++ b/doc/scenarios/.template.html
@ -1,124 +0,0 @@
-<!doctype html>
-<html $if(lang)$ lang="$lang$" $endif$>
-<head>
-    
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <!--[if lt IE 9]>
-                <script src="http://css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script>
-        <![endif]-->
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-
-    <!-- <link rel="stylesheet" type="text/css" href="template.css" /> -->
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/template.css" />
-
-    <link href="https://vjs.zencdn.net/5.4.4/video-js.css" rel="stylesheet" />
-
-    <script src="https://code.jquery.com/jquery-2.2.1.min.js"></script>
-    <!-- <script type='text/javascript' src='menu/js/jquery.cookie.js'></script> -->
-    <!-- <script type='text/javascript' src='menu/js/jquery.hoverIntent.minified.js'></script> -->
-    <!-- <script type='text/javascript' src='menu/js/jquery.dcjqaccordion.2.7.min.js'></script> -->
-
-    <!-- <link href="menu/css/skins/blue.css" rel="stylesheet" type="text/css" /> -->
-    <!-- <link href="menu/css/skins/graphite.css" rel="stylesheet" type="text/css" /> -->
-    <!-- <link href="menu/css/skins/grey.css" rel="stylesheet" type="text/css" /> -->
-  
-    <!-- <script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> -->
-        
-  
-    <!-- <script src="script.js"></script> -->
-  
-    <!-- <script src="jquery.sticky-kit.js "></script> -->
-    <script type='text/javascript' src='https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/js/jquery.cookie.js'></script>
-    <script type='text/javascript' src='https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/js/jquery.hoverIntent.minified.js'></script>
-    <script type='text/javascript' src='https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/js/jquery.dcjqaccordion.2.7.min.js'></script>
-
-    <link href="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/css/skins/blue.css" rel="stylesheet" type="text/css" />
-    <link href="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/css/skins/graphite.css" rel="stylesheet" type="text/css" />
-    <link href="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/menu/css/skins/grey.css" rel="stylesheet" type="text/css" />
-    <link href="https://cdn.jsdelivr.net/gh/ryangrose/easy-pandoc-templates@948e28e5/css/elegant_bootstrap.css" rel="stylesheet" type="text/css" />
-  
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-  
-    <script src="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/script.js"></script>
-  
-    <script src="https://cdn.jsdelivr.net/gh/diversen/pandoc-bootstrap-adaptive-template@959c3622/jquery.sticky-kit.js"></script>
-    <meta name="generator" content="pandoc" />
-$for(author-meta)$
-  <meta name="author" content="$author-meta$" />
-$endfor$
-$if(date-meta)$
-  <meta name="date" content="$date-meta$" />
-$endif$
-  <title>$if(title-prefix)$$title-prefix$ - $endif$$pagetitle$</title>
-  <style type="text/css">code{white-space: pre;}</style>
-$if(quotes)$
-  <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
-$endif$
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
-  </style>
-$endif$
-$for(css)$
-  <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/>
-$endfor$
-$if(math)$
-  $math$
-$endif$
-$for(header-includes)$
-  $header-includes$
-$endfor$
-</head>
-<body>
-
-    
-  $if(title)$
-  <div class="navbar navbar-static-top">
-    <div class="navbar-inner">
-      <div class="container">
-        <span class="doc-title">$title$</span>
-        <ul class="nav pull-right doc-info">
-          $for(author)$
-          <li><p class="navbar-text">$author$</p></li>
-          $endfor$
-          $if(date)$
-          <li><p class="navbar-text">$date$</p></li>
-          $endif$
-        </ul>
-      </div>
-    </div>
-  </div>
-  $endif$
-  <div class="container">
-    <div class="row">
-      $if(toc)$
-      <div id="$idprefix$TOC" class="span3">
-        <div class="well toc">
-
-        $toc$
-
-        </div>
-      </div>
-      $endif$
-      <div class="span$if(toc)$9$else$12$endif$">
-
-      $if(abstract)$
-          <H1>$abstract-title$</H1>
-          $abstract$
-      $endif$
-
-      $for(include-before)$
-      $include-before$
-      $endfor$
-$body$
-      $for(include-after)$
-      $include-after$
-      $endfor$
-      </div>
-    </div>
-  </div>
-  <script src="https://vjs.zencdn.net/5.4.4/video.js"></script>
-
-</body>
-</html>
--- a/doc/scenarios/README.txt
+++ b/doc/scenarios/README.txt
@ -1 +0,0 @@
-find the generated ScenarioReports in build/doc/scenarios
--- a/doc/test-concept.md
+++ b/doc/test-concept.md
@ -90,20 +90,6 @@ Acceptance-tests, are blackbox-tests and do <u>not</u> count into test-code-cove
 TODO.test: Complete the Acceptance-Tests test concept.


-#### Scenario-Tests
-
-Our Scenario-tests are induced by business use-cases.
-They test from the REST API all the way down to the database.
-
-Most scenario-tests are positive tests, they test if business scenarios do work.
-But few might be negative tests, which test if specific forbidden data gets rejected.
-
-Our scenario tests also generate test-reports which contain the REST-API calls needed for each scenario.
-These reports can be used as examples for the API usage from a business perspective.
-
-There is an extra document regarding scenario-test, see [Scenario-Tests README](../src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/README.md). 
-
-
 #### Performance-Tests

 Performance-critical scenarios have to be identified and a special performance-test has to be implemented.
--- a/etc/allowed-licenses.json
+++ b/etc/allowed-licenses.json
@ -1,34 +1,16 @@
 {
    "allowedLicenses": [
-        { "moduleLicense": "Apache 2" },
        { "moduleLicense": "Apache 2.0" },
-        { "moduleLicense": "Apache-2.0" },
+        { "moduleLicense": "Apache 2" },
        { "moduleLicense": "Apache License 2.0" },
-        { "moduleLicense": "Apache License v2.0" },
-        { "moduleLicense": "Apache License Version 2.0" },
        { "moduleLicense": "Apache License, Version 2.0" },
-        { "moduleLicense": "The Apache License, Version 2.0" },
        { "moduleLicense": "The Apache Software License, Version 2.0" },

-        {
-            "moduleLicense": null,
-            "#moduleLicense": "Apache License 2.0, see https://github.com/springdoc/springdoc-openapi/blob/main/LICENSE",
-            "moduleVersion": "2.4.0",
-            "moduleName": "org.springdoc:springdoc-openapi"
-        },
-        {
-            "moduleLicense": null,
-            "moduleVersion": "1.0.0",
-            "moduleName": "org.jspecify:jspecify"
-        },
-
        { "moduleLicense": "BSD License" },
        { "moduleLicense": "BSD-2-Clause" },
        { "moduleLicense": "BSD-3-Clause" },
        { "moduleLicense": "The BSD License" },

-        { "moduleLicense": "The New BSD License" },
-
        { "moduleLicense": "CDDL 1.1" },
        { "moduleLicense": "CDDL/GPLv2+CE" },
        { "moduleLicense": "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0" },
@ -47,21 +29,11 @@
        { "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception" },
        { "moduleLicense": "GPL2 w/ CPE" },

-        { "moduleLicense": "LGPL, version 2.1"},
-        { "moduleLicense": "LGPL-2.1-or-later"},
-
        { "moduleLicense": "MIT License" },
        { "moduleLicense": "MIT" },
        { "moduleLicense": "The MIT License (MIT)" },
        { "moduleLicense": "The MIT License" },

-        { "moduleLicense": "WTFPL" },
-
-        {
-            "moduleLicense": "Public Domain, per Creative Commons CC0",
-            "moduleVersion": "2.0.3"
-        }
-
-
+        { "moduleName": "org.springdoc:springdoc-openapi" }
    ]
 }
--- a/etc/jenkinsAgent.Dockerfile
+++ b/etc/jenkinsAgent.Dockerfile
@ -1,6 +0,0 @@
-FROM eclipse-temurin:21-jdk
-RUN apt-get update && \
-    apt-get install -y bind9-utils pandoc && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
--- a/etc/owasp-dependency-check-suppression.xml
+++ b/etc/owasp-dependency-check-suppression.xml
@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+    <suppress>
+        <notes><![CDATA[
+           Cyclic references are not possible if file comes in JSON text format.
+       ]]></notes>
+        <packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
+        <cpe>cpe:/a:fasterxml:jackson-databind</cpe>
+    </suppress>
    <suppress>
        <notes><![CDATA[
           Internal tooling, not exposed to the Internet.
@ -7,14 +14,4 @@
        <packageUrl regex="true">^pkg:maven/org\.pitest/pitest\-command\-line@.*$</packageUrl>
        <cpe>cpe:/a:line:line</cpe>
    </suppress>
-    <suppress>
-        <notes><![CDATA[
-          file name: logback-core-1.5.12.jar
-          A successful attack requires the user to have write access to a configuration file or environment vars.
-        ]]></notes>
-        <packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback-core@.*$</packageUrl>
-        <cpe>cpe:/a:qos:logback</cpe>
-        <cve>CVE-2024-12798</cve>
-    </suppress>
-
 </suppressions>
--- a/sql/historization.sql
+++ b/sql/historization.sql
@ -6,34 +6,34 @@
 rollback;
 begin transaction;
 call defineContext('historization testing', null, 'superuser-alex@hostsharing.net',
--                    'hs_booking.project#D-1000000-hshdefaultproject:ADMIN'); -- prod+test
-                   'hs_booking.project#D-1000313-D-1000313defaultproject:ADMIN'); -- prod+test
--                    'hs_booking.project#D-1000300-mihdefaultproject:ADMIN'); -- prod
--                    'hs_booking.project#D-1000300-mimdefaultproject:ADMIN'); -- test
-- update hs_hosting.asset set caption='lug00 b' where identifier = 'lug00' and type = 'MANAGED_WEBSPACE'; -- prod
-- update hs_hosting.asset set caption='hsh00 A ' || now()::text where identifier = 'hsh00' and type = 'MANAGED_WEBSPACE'; -- test
-- update hs_hosting.asset set caption='hsh00 B ' || now()::text where identifier = 'hsh00' and type = 'MANAGED_WEBSPACE'; -- test
+--                    'hs_booking_project#D-1000000-hshdefaultproject:ADMIN'); -- prod+test
+                   'hs_booking_project#D-1000313-D-1000313defaultproject:ADMIN'); -- prod+test
+--                    'hs_booking_project#D-1000300-mihdefaultproject:ADMIN'); -- prod
+--                    'hs_booking_project#D-1000300-mimdefaultproject:ADMIN'); -- test
+-- update hs_hosting_asset set caption='lug00 b' where identifier = 'lug00' and type = 'MANAGED_WEBSPACE'; -- prod
+-- update hs_hosting_asset set caption='hsh00 A ' || now()::text where identifier = 'hsh00' and type = 'MANAGED_WEBSPACE'; -- test
+-- update hs_hosting_asset set caption='hsh00 B ' || now()::text where identifier = 'hsh00' and type = 'MANAGED_WEBSPACE'; -- test

-- insert into hs_hosting.asset
+-- insert into hs_hosting_asset
 --     (uuid, bookingitemuuid, type, parentassetuuid, assignedtoassetuuid, identifier, caption, config, alarmcontactuuid)
 --     values
 --     (uuid_generate_v4(), null, 'EMAIL_ADDRESS', 'bbda5895-0569-4e20-bb4c-34f3a38f3f63'::uuid, null,
 --         'new@thi.example.org', 'some new E-Mail-Address', '{}'::jsonb, null);

-delete from hs_hosting.asset where uuid='5aea68d2-3b55-464f-8362-b05c76c5a681'::uuid;
+delete from hs_hosting_asset where uuid='5aea68d2-3b55-464f-8362-b05c76c5a681'::uuid;
 commit;

 -- single version at point in time
-- set hsadminng.tx_history_txid to (select max(txid) from base.tx_context where txtimestamp<='2024-08-27 12:13:13.450821');
+-- set hsadminng.tx_history_txid to (select max(txid) from tx_context where txtimestamp<='2024-08-27 12:13:13.450821');
 set hsadminng.tx_history_txid to '';
 set hsadminng.tx_history_timestamp to '2024-08-29 12:42';
 -- all versions
-select base.tx_history_txid(), txc.txtimestamp, txc.currentSubject, txc.currentTask, haex.*
-    from hs_hosting.asset_ex haex
-             join base.tx_context txc on haex.txid=txc.txid
+select tx_history_txid(), txc.txtimestamp, txc.currentUser, txc.currentTask, haex.*
+    from hs_hosting_asset_ex haex
+             join tx_context txc on haex.txid=txc.txid
    where haex.identifier = 'test@thi.example.org';

-select uuid, version, type, identifier, caption from hs_hosting.asset_hv p where identifier = 'test@thi.example.org';
+select uuid, version, type, identifier, caption from hs_hosting_asset_hv p where identifier = 'test@thi.example.org';

 select pg_current_xact_id();

--- a/sql/rbac-tests.sql
+++ b/sql/rbac-tests.sql
@ -3,28 +3,28 @@
 -- --------------------------------------------------------


-select rbac.isGranted(rbac.findRoleId('administrators'), rbac.findRoleId('rbactest.package#aaa00:OWNER'));
-select rbac.isGranted(rbac.findRoleId('rbactest.package#aaa00:OWNER'), rbac.findRoleId('administrators'));
-- call rbac.grantRoleToRole(findRoleId('rbactest.package#aaa00:OWNER'), findRoleId('administrators'));
-- call rbac.grantRoleToRole(findRoleId('administrators'), findRoleId('rbactest.package#aaa00:OWNER'));
+select isGranted(findRoleId('administrators'), findRoleId('test_package#aaa00:OWNER'));
+select isGranted(findRoleId('test_package#aaa00:OWNER'), findRoleId('administrators'));
+-- call grantRoleToRole(findRoleId('test_package#aaa00:OWNER'), findRoleId('administrators'));
+-- call grantRoleToRole(findRoleId('administrators'), findRoleId('test_package#aaa00:OWNER'));

 select count(*)
-FROM rbac.queryAllPermissionsOfSubjectIdForObjectUuids(rbac.findRbacSubject('superuser-fran@hostsharing.net'),
-                                                  ARRAY(select uuid from rbactest.customer where reference < 1100000));
+FROM queryAllPermissionsOfSubjectIdForObjectUuids(findRbacUser('superuser-fran@hostsharing.net'),
+                                                  ARRAY(select uuid from customer where reference < 1100000));
 select count(*)
-FROM rbac.queryAllPermissionsOfSubjectId(findRbacSubject('superuser-fran@hostsharing.net'));
+FROM queryAllPermissionsOfSubjectId(findRbacUser('superuser-fran@hostsharing.net'));
 select *
-FROM rbac.queryAllPermissionsOfSubjectId(findRbacSubject('alex@example.com'));
+FROM queryAllPermissionsOfSubjectId(findRbacUser('alex@example.com'));
 select *
-FROM rbac.queryAllPermissionsOfSubjectId(findRbacSubject('rosa@example.com'));
+FROM queryAllPermissionsOfSubjectId(findRbacUser('rosa@example.com'));

 select *
-FROM rbac.queryAllRbacSubjectsWithPermissionsFor(rbac.findEffectivePermissionId('customer',
-                                                          (SELECT uuid FROM rbac.RbacObject WHERE objectTable = 'customer' LIMIT 1),
+FROM queryAllRbacUsersWithPermissionsFor(findEffectivePermissionId('customer',
+                                                          (SELECT uuid FROM RbacObject WHERE objectTable = 'customer' LIMIT 1),
                                                          'add-package'));
 select *
-FROM rbac.queryAllRbacSubjectsWithPermissionsFor(rbac.findEffectivePermissionId('package',
-                                                          (SELECT uuid FROM rbac.RbacObject WHERE objectTable = 'package' LIMIT 1),
+FROM queryAllRbacUsersWithPermissionsFor(findEffectivePermissionId('package',
+                                                          (SELECT uuid FROM RbacObject WHERE objectTable = 'package' LIMIT 1),
                                                          'DELETE'));

 DO LANGUAGE plpgsql
@ -33,13 +33,13 @@ $$
        userId uuid;
        result bool;
    BEGIN
-        userId = rbac.findRbacSubject('superuser-alex@hostsharing.net');
-        result = (SELECT * FROM rbac.isPermissionGrantedToSubject(rbac.findPermissionId('package', 94928, 'add-package'), userId));
+        userId = findRbacUser('superuser-alex@hostsharing.net');
+        result = (SELECT * FROM isPermissionGrantedToSubject(findPermissionId('package', 94928, 'add-package'), userId));
        IF (result) THEN
            RAISE EXCEPTION 'expected permission NOT to be granted, but it is';
        end if;

-        result = (SELECT * FROM rbac.isPermissionGrantedToSubject(rbac.findPermissionId('package', 94928, 'SELECT'), userId));
+        result = (SELECT * FROM isPermissionGrantedToSubject(findPermissionId('package', 94928, 'SELECT'), userId));
        IF (NOT result) THEN
            RAISE EXCEPTION 'expected permission to be granted, but it is NOT';
        end if;
--- a/sql/rbac-view-option-experiments.sql
+++ b/sql/rbac-view-option-experiments.sql
@ -20,43 +20,43 @@ CREATE POLICY customer_policy ON customer
    TO restricted
    USING (
        -- id=1000
-        rbac.isPermissionGrantedToSubject(rbac.findEffectivePermissionId('rbactest.customer', id, 'SELECT'), rbac.currentSubjectUuid())
+        isPermissionGrantedToSubject(findEffectivePermissionId('test_customer', id, 'SELECT'), currentUserUuid())
    );

 SET SESSION AUTHORIZATION restricted;
-SET hsadminng.currentSubject TO 'alex@example.com';
+SET hsadminng.currentUser TO 'alex@example.com';
 SELECT * from customer;

 -- access control via view-rule and isPermissionGrantedToSubject - way too slow (35 s 580 ms for 1 million rows)
 SET SESSION SESSION AUTHORIZATION DEFAULT;
 DROP VIEW cust_view;
 CREATE VIEW cust_view AS
-SELECT * FROM rbactest.customer;
+SELECT * FROM customer;
 CREATE OR REPLACE RULE "_RETURN" AS
    ON SELECT TO cust_view
    DO INSTEAD
-    SELECT * FROM rbactest.customer WHERE rbac.isPermissionGrantedToSubject(rbac.findEffectivePermissionId('rbactest.customer', id, 'SELECT'), rbac.currentSubjectUuid());
+    SELECT * FROM customer WHERE isPermissionGrantedToSubject(findEffectivePermissionId('test_customer', id, 'SELECT'), currentUserUuid());
 SELECT * from cust_view LIMIT 10;

-select rbac.queryAllPermissionsOfSubjectId(findRbacSubject('superuser-alex@hostsharing.net'));
+select queryAllPermissionsOfSubjectId(findRbacUser('superuser-alex@hostsharing.net'));

 -- access control via view-rule with join to recursive permissions - really fast (38ms for 1 million rows)
 SET SESSION SESSION AUTHORIZATION DEFAULT;
-ALTER TABLE rbactest.customer ENABLE ROW LEVEL SECURITY;
+ALTER TABLE customer ENABLE ROW LEVEL SECURITY;
 DROP VIEW IF EXISTS cust_view;
 CREATE OR REPLACE VIEW cust_view AS
 SELECT *
-FROM rbactest.customer;
+FROM customer;
 CREATE OR REPLACE RULE "_RETURN" AS
    ON SELECT TO cust_view
    DO INSTEAD
-    SELECT c.uuid, c.reference, c.prefix FROM rbactest.customer AS c
-      JOIN rbac.queryAllPermissionsOfSubjectId(rbac.currentSubjectUuid()) AS p
-           ON p.objectTable='rbactest.customer' AND p.objectUuid=c.uuid;
+    SELECT c.uuid, c.reference, c.prefix FROM customer AS c
+      JOIN queryAllPermissionsOfSubjectId(currentUserUuid()) AS p
+           ON p.objectTable='test_customer' AND p.objectUuid=c.uuid;
 GRANT ALL PRIVILEGES ON cust_view TO restricted;

 SET SESSION SESSION AUTHORIZATION restricted;
-SET hsadminng.currentSubject TO 'alex@example.com';
+SET hsadminng.currentUser TO 'alex@example.com';
 SELECT * from cust_view;


@ -67,23 +67,23 @@ DROP VIEW IF EXISTS cust_view;
 CREATE OR REPLACE VIEW cust_view AS
    SELECT c.uuid, c.reference, c.prefix
      FROM customer AS c
-      JOIN queryAllPermissionsOfSubjectId(rbac.currentSubjectUuid()) AS p
+      JOIN queryAllPermissionsOfSubjectId(currentUserUuid()) AS p
           ON p.objectUuid=c.uuid;
 GRANT ALL PRIVILEGES ON cust_view TO restricted;

 SET SESSION SESSION AUTHORIZATION restricted;
-- SET hsadminng.currentSubject TO 'alex@example.com';
-SET hsadminng.currentSubject TO 'superuser-alex@hostsharing.net';
-- SET hsadminng.currentSubject TO 'aaaaouq@example.com';
+-- SET hsadminng.currentUser TO 'alex@example.com';
+SET hsadminng.currentUser TO 'superuser-alex@hostsharing.net';
+-- SET hsadminng.currentUser TO 'aaaaouq@example.com';
 SELECT * from cust_view where reference=1144150;

-select rr.uuid, rr.type from rbac.RbacGrants g
-    join rbac.RbacReference RR on g.ascendantUuid = RR.uuid
+select rr.uuid, rr.type from RbacGrants g
+    join RbacReference RR on g.ascendantUuid = RR.uuid
    where g.descendantUuid in (
-        select uuid from rbac.queryAllPermissionsOfSubjectId(findRbacSubject('alex@example.com'))
-            where objectTable='rbactest.customer');
+        select uuid from queryAllPermissionsOfSubjectId(findRbacUser('alex@example.com'))
+            where objectTable='test_customer');

-call rbac.grantRoleToUser(rbac.findRoleId('rbactest.customer#aaa:ADMIN'), rbac.findRbacSubject('aaaaouq@example.com'));
+call grantRoleToUser(findRoleId('test_customer#aaa:ADMIN'), findRbacUser('aaaaouq@example.com'));

-select rbac.queryAllPermissionsOfSubjectId(findRbacSubject('aaaaouq@example.com'));
+select queryAllPermissionsOfSubjectId(findRbacUser('aaaaouq@example.com'));

--- a/sql/recursive-cte-experiments-for-accessible-uuids.sql
+++ b/sql/recursive-cte-experiments-for-accessible-uuids.sql
@ -1,15 +1,15 @@
 -- just a permanent playground to explore optimization of the central recursive CTE query for RBAC

-select * from hs_statistics_v;
+select * from hs_statistics_view;

 -- ========================================================

 -- This is the extracted recursive CTE query to determine the visible object UUIDs of a single table
 -- (and optionally the hosting-asset-type) as a separate VIEW.
-- In the generated code this is part of the hs_hosting.asset_rv VIEW.
+-- In the generated code this is part of the hs_hosting_asset_rv VIEW.

-drop view if exists hs_hosting.asset_example_gv;
-create view hs_hosting.asset_example_gv as
+drop view if exists hs_hosting_asset_example_gv;
+create view hs_hosting_asset_example_gv as
 with recursive
    recursive_grants as (
        select distinct rbacgrants.descendantuuid,
@ -17,7 +17,7 @@ with recursive
                        1 as level,
                        true
            from rbacgrants
-            where (rbacgrants.ascendantuuid = any (rbac.currentSubjectOrAssumedRolesUuids()))
+            where (rbacgrants.ascendantuuid = any (currentsubjectsuuids()))
              and rbacgrants.assumed
        union all
        select distinct g.descendantuuid,
@ -40,7 +40,7 @@ select distinct perm.objectuuid
             join rbacpermission perm on recursive_grants.descendantuuid = perm.uuid
             join rbacobject obj on obj.uuid = perm.objectuuid
             join count_check cc on cc.valid
-    where obj.objecttable::text = 'hs_hosting.asset'::text
+    where obj.objecttable::text = 'hs_hosting_asset'::text
      -- with/without this type condition
 --       and obj.type = 'EMAIL_ADDRESS'::hshostingassettype
      and obj.type = 'EMAIL_ADDRESS'::hshostingassettype
@ -53,10 +53,10 @@ select distinct perm.objectuuid
 rollback transaction;
 begin transaction;
 CALL defineContext('performance testing', null, 'superuser-alex@hostsharing.net',
-                   'hs_booking.project#D-1000000-hshdefaultproject:ADMIN');
--                        'hs_booking.project#D-1000300-mihdefaultproject:ADMIN');
+                   'hs_booking_project#D-1000000-hshdefaultproject:ADMIN');
+--                        'hs_booking_project#D-1000300-mihdefaultproject:ADMIN');
 SET TRANSACTION READ ONLY;
-EXPLAIN ANALYZE select * from hs_hosting.asset_example_gv;
+EXPLAIN ANALYZE select * from hs_hosting_asset_example_gv;
 end transaction ;

 -- ========================================================
@ -64,15 +64,15 @@ end transaction ;
 -- An example for a restricted view (_rv) similar to the one generated by our RBAC system,
 -- but using the above separate VIEW to determine the visible objects.

-drop view if exists hs_hosting.asset_example_rv;
-create view hs_hosting.asset_example_rv as
-    with accessible_hs_hosting.asset_uuids as (
-        select * from hs_hosting.asset_example_gv
+drop view if exists hs_hosting_asset_example_rv;
+create view hs_hosting_asset_example_rv as
+    with accessible_hs_hosting_asset_uuids as (
+        select * from hs_hosting_asset_example_gv
    )
    select target.*
-        from hs_hosting.asset target
-        where (target.uuid in (select accessible_hs_hosting.asset_uuids.objectuuid
-                                   from accessible_hs_hosting.asset_uuids));
+        from hs_hosting_asset target
+        where (target.uuid in (select accessible_hs_hosting_asset_uuids.objectuuid
+                                   from accessible_hs_hosting_asset_uuids));

 -- -------------------------------------------------------------------------------

@ -89,8 +89,8 @@ BEGIN
    start_time := clock_timestamp();

    CALL defineContext('performance testing', null, 'superuser-alex@hostsharing.net',
-                       'hs_booking.project#D-1000000-hshdefaultproject:ADMIN');
--                        'hs_booking.project#D-1000300-mihdefaultproject:ADMIN');
+                       'hs_booking_project#D-1000000-hshdefaultproject:ADMIN');
+--                        'hs_booking_project#D-1000300-mihdefaultproject:ADMIN');
    SET TRANSACTION READ ONLY;

    FOR i IN 0..25 LOOP
@ -99,7 +99,7 @@ BEGIN

                -- An example for a business query based on the view:
                select type, uuid, identifier, caption
-                  from hs_hosting.asset_example_rv
+                  from hs_hosting_asset_example_rv
                 where type = 'EMAIL_ADDRESS'
                    and identifier like letter || '%'
                 -- end of the business query example.
@ -115,7 +115,7 @@ BEGIN
 END;
 $$;

-- average seconds per recursive CTE select as role 'hs_hosting.asset:<DEBITOR>defaultproject:ADMIN'
+-- average seconds per recursive CTE select as role 'hs_hosting_asset:<DEBITOR>defaultproject:ADMIN'
 --      joined with business query for all 'EMAIL_ADDRESSES':
 --                                              D-1000000-hsh      D-1000300-mih
 --  - without type comparison in rbacobject:    ~3.30 - ~3.49      ~0.23
@ -128,15 +128,15 @@ $$;
 rollback transaction;
 begin transaction;
 CALL defineContext('performance testing', null, 'superuser-alex@hostsharing.net',
-                   'hs_booking.project#D-1000000-hshdefaultproject:ADMIN');
--                        'hs_booking.project#D-1000300-mihdefaultproject:ADMIN');
+                   'hs_booking_project#D-1000000-hshdefaultproject:ADMIN');
+--                        'hs_booking_project#D-1000300-mihdefaultproject:ADMIN');
 SET TRANSACTION READ ONLY;

 EXPLAIN SELECT * from (

                -- An example for a business query based on the view:
                select type, uuid, identifier, caption
-                  from hs_hosting.asset_example_rv
+                  from hs_hosting_asset_example_rv
                 where type = 'EMAIL_ADDRESS'
 --                     and identifier like 'b%'
                 -- end of the business query example.
@ -151,17 +151,17 @@ end transaction;

 alter table rbacobject
    -- just for performance testing, we would need a joined enum or a varchar(16) which would make it slow
-    add column type hs_hosting.AssetType;
+    add column type hshostingassettype;

-- and fill the type column with hs_hosting.asset types:
+-- and fill the type column with hs_hosting_asset types:

 rollback transaction;
 begin transaction;
-call defineContext('setting rbacobject.type from hs_hosting.asset.type', null, 'superuser-alex@hostsharing.net');
+call defineContext('setting rbacobject.type from hs_hosting_asset.type', null, 'superuser-alex@hostsharing.net');

    UPDATE rbacobject
    SET type = hs.type
-        FROM hs_hosting.asset hs
+        FROM hs_hosting_asset hs
        WHERE rbacobject.uuid = hs.uuid;

 end transaction;
--- a/src/main/java/net/hostsharing/hsadminng/config/ActuatorSanitizer.java
+++ b/src/main/java/net/hostsharing/hsadminng/config/ActuatorSanitizer.java
@ -1,105 +0,0 @@
-package net.hostsharing.hsadminng.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.actuate.endpoint.SanitizableData;
-import org.springframework.boot.actuate.endpoint.SanitizingFunction;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-// HOWTO: exclude sensitive values, like passwords and other secrets, from being show by actuator endpoints:
-//  either use: add your custom keys to management.endpoint.additionalKeysToSanitize,
-//  or, if you need more heuristics, amend this code down here.
-@Component
-public class ActuatorSanitizer implements SanitizingFunction {
-
-    private static final String[] REGEX_PARTS = {"*", "$", "^", "+"};
-
-    private static final Set<String> DEFAULT_KEYS_TO_SANITIZE = Set.of(
-            "password", "secret", "token", ".*credentials.*", "vcap_services", "^vcap\\.services.*$", "sun.java.command", "^spring[._]application[._]json$"
-    );
-
-    private static final Set<String> URI_USERINFO_KEYS = Set.of(
-            "uri", "uris", "url", "urls", "address", "addresses"
-    );
-
-    private static final Pattern URI_USERINFO_PATTERN = Pattern.compile("^\\[?[A-Za-z][A-Za-z0-9\\+\\.\\-]+://.+:(.*)@.+$");
-
-    private final List<Pattern> keysToSanitize = new ArrayList<>();
-
-    public ActuatorSanitizer(@Value("${management.endpoint.additionalKeysToSanitize:}") final List<String> additionalKeysToSanitize) {
-        addKeysToSanitize(DEFAULT_KEYS_TO_SANITIZE);
-        addKeysToSanitize(URI_USERINFO_KEYS);
-        addKeysToSanitize(additionalKeysToSanitize);
-    }
-
-    @Override
-    public SanitizableData apply(final SanitizableData data) {
-        if (data.getValue() == null) {
-            return data;
-        }
-
-        for (final Pattern pattern : keysToSanitize) {
-            if (pattern.matcher(data.getKey()).matches()) {
-                if (keyIsUriWithUserInfo(pattern)) {
-                    return data.withValue(sanitizeUris(data.getValue().toString()));
-                }
-
-                return data.withValue(SanitizableData.SANITIZED_VALUE);
-            }
-        }
-
-        return data;
-    }
-
-    private void addKeysToSanitize(final Collection<String> keysToSanitize) {
-        for (final String key : keysToSanitize) {
-            this.keysToSanitize.add(getPattern(key));
-        }
-    }
-
-    private Pattern getPattern(final String value) {
-        if (isRegex(value)) {
-            return Pattern.compile(value, Pattern.CASE_INSENSITIVE);
-        }
-        return Pattern.compile(".*" + value + "$", Pattern.CASE_INSENSITIVE);
-    }
-
-    private boolean isRegex(final String value) {
-        for (final String part : REGEX_PARTS) {
-            if (value.contains(part)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean keyIsUriWithUserInfo(final Pattern pattern) {
-        for (String uriKey : URI_USERINFO_KEYS) {
-            if (pattern.matcher(uriKey).matches()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private Object sanitizeUris(final String value) {
-        return Arrays.stream(value.split(",")).map(this::sanitizeUri).collect(Collectors.joining(","));
-    }
-
-    private String sanitizeUri(final String value) {
-        final var matcher = URI_USERINFO_PATTERN.matcher(value);
-        final var  password = matcher.matches() ? matcher.group(1) : null;
-        if (password != null) {
-            return StringUtils.replace(value, ":" + password + "@", ":" + SanitizableData.SANITIZED_VALUE + "@");
-        }
-        return value;
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/config/AuthenticatedHttpServletRequestWrapper.java
+++ b/src/main/java/net/hostsharing/hsadminng/config/AuthenticatedHttpServletRequestWrapper.java
@ -1,54 +0,0 @@
-package net.hostsharing.hsadminng.config;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletRequestWrapper;
-import java.util.*;
-
-public class AuthenticatedHttpServletRequestWrapper extends HttpServletRequestWrapper {
-
-    private final Map<String, String> customHeaders = new HashMap<>();
-
-    public AuthenticatedHttpServletRequestWrapper(HttpServletRequest request) {
-        super(request);
-    }
-
-    public void addHeader(final String name, final String value) {
-        customHeaders.put(name, value);
-    }
-
-    @Override
-    public String getHeader(final String name) {
-        // Check custom headers first
-        final var customHeaderValue = customHeaders.get(name);
-        if (customHeaderValue != null) {
-            return customHeaderValue;
-        }
-        // Fall back to the original headers
-        return super.getHeader(name);
-    }
-
-    @Override
-    public Enumeration<String> getHeaderNames() {
-        // Combine original headers and custom headers
-        final var headerNames = new HashSet<>(customHeaders.keySet());
-        final var originalHeaderNames = super.getHeaderNames();
-        while (originalHeaderNames.hasMoreElements()) {
-            headerNames.add(originalHeaderNames.nextElement());
-        }
-        return Collections.enumeration(headerNames);
-    }
-
-    @Override
-    public Enumeration<String> getHeaders(final String name) {
-        // Combine original headers and custom header
-        final var values = new HashSet<String>();
-        if (customHeaders.containsKey(name)) {
-            values.add(customHeaders.get(name));
-        }
-        final var originalValues = super.getHeaders(name);
-        while (originalValues.hasMoreElements()) {
-            values.add(originalValues.nextElement());
-        }
-        return Collections.enumeration(values);
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/config/AuthenticationFilter.java
+++ b/src/main/java/net/hostsharing/hsadminng/config/AuthenticationFilter.java
@ -1,39 +0,0 @@
-package net.hostsharing.hsadminng.config;
-
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.SneakyThrows;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.stereotype.Component;
-
-@Component
-public class AuthenticationFilter implements Filter {
-
-    @Autowired
-    private Authenticator authenticator;
-
-    @Override
-    @SneakyThrows
-    public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) {
-        final var httpRequest = (HttpServletRequest) request;
-        final var httpResponse = (HttpServletResponse) response;
-
-        try {
-            final var currentSubject = authenticator.authenticate(httpRequest);
-
-            final var authenticatedRequest = new AuthenticatedHttpServletRequestWrapper(httpRequest);
-            authenticatedRequest.addHeader("current-subject", currentSubject);
-
-            chain.doFilter(authenticatedRequest, response);
-        } catch (final BadCredentialsException exc) {
-            // TODO.impl: should not be necessary if ResponseStatusException worked
-            httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-        }
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/config/Authenticator.java
+++ b/src/main/java/net/hostsharing/hsadminng/config/Authenticator.java
@ -1,8 +0,0 @@
-package net.hostsharing.hsadminng.config;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-public interface Authenticator {
-
-    String authenticate(final HttpServletRequest httpRequest);
-}
--- a/src/main/java/net/hostsharing/hsadminng/config/CasAuthenticator.java
+++ b/src/main/java/net/hostsharing/hsadminng/config/CasAuthenticator.java
@ -1,71 +0,0 @@
-package net.hostsharing.hsadminng.config;
-
-import io.micrometer.core.annotation.Timed;
-import lombok.SneakyThrows;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.client.RestTemplate;
-import org.xml.sax.SAXException;
-
-import jakarta.servlet.http.HttpServletRequest;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-
-public class CasAuthenticator implements Authenticator {
-
-    @Value("${hsadminng.cas.server}")
-    private String casServerUrl;
-
-    @Value("${hsadminng.cas.service}")
-    private String serviceUrl;
-
-    private final RestTemplate restTemplate = new RestTemplate();
-
-    @SneakyThrows
-    @Timed("app.cas.authenticate")
-    public String authenticate(final HttpServletRequest httpRequest) {
-        final var userName = StringUtils.isBlank(casServerUrl)
-                ? bypassCurrentSubject(httpRequest)
-                : casValidation(httpRequest);
-        final var authentication = new UsernamePasswordAuthenticationToken(userName, null, null);
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-        return authentication.getName();
-    }
-
-    private static String bypassCurrentSubject(final HttpServletRequest httpRequest) {
-        final var userName = httpRequest.getHeader("current-subject");
-        System.err.println("CasAuthenticator.bypassCurrentSubject: " + userName);
-        return userName;
-    }
-
-    private String casValidation(final HttpServletRequest httpRequest)
-            throws SAXException, IOException, ParserConfigurationException {
-
-        final var ticket = httpRequest.getHeader("Authorization");
-        final var url = casServerUrl + "/p3/serviceValidate" +
-                "?service=" + serviceUrl +
-                "&ticket=" + ticket;
-
-        System.err.println("CasAuthenticator.casValidation using URL: " + url);
-
-        final var response = restTemplate.getForObject(url, String.class);
-
-        final var doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
-                .parse(new java.io.ByteArrayInputStream(response.getBytes()));
-        if (doc.getElementsByTagName("cas:authenticationSuccess").getLength() == 0) {
-            // TODO.impl: for unknown reasons, this results in a 403 FORBIDDEN
-            // throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "CAS service ticket could not be validated");
-            System.err.println("CAS service ticket could not be validated");
-            System.err.println("CAS-validation-URL: " + url);
-            System.err.println(response);
-            throw new BadCredentialsException("CAS service ticket could not be validated");
-        }
-        final var userName = doc.getElementsByTagName("cas:user").item(0).getTextContent();
-        System.err.println("CAS-user: " + userName);
-        return userName;
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/config/CustomActuatorEndpoint.java
+++ b/src/main/java/net/hostsharing/hsadminng/config/CustomActuatorEndpoint.java
@ -1,44 +0,0 @@
-package net.hostsharing.hsadminng.config;
-
-import lombok.Getter;
-import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-
-import java.util.List;
-
-@Component
-@Endpoint(id="metric-links")
-// BLOG: implement a custom Spring Actuator endpoint to view _clickable_ Spring Actuator (Micrometer) Metrics endpoints
-// HOWTO: implement a custom Spring Actuator endpoint
-public class CustomActuatorEndpoint {
-
-    private final RestTemplate restTemplate = new RestTemplate();
-
-    @ReadOperation
-    public String getMetricsLinks() {
-        final String baseUrl = ServletUriComponentsBuilder.fromCurrentContextPath().build().toUriString();
-        final var metricsEndpoint = baseUrl + "/actuator/metrics";
-
-        final var response = restTemplate.getForObject(metricsEndpoint, ActuatorMetricsEndpointResource.class);
-
-        if (response == null || response.getNames() == null) {
-            throw new IllegalStateException("no metrics available");
-        }
-        return generateJsonLinksToMetricEndpoints(response, metricsEndpoint);
-    }
-
-    private static String generateJsonLinksToMetricEndpoints(final ActuatorMetricsEndpointResource response, final String metricsEndpoint) {
-        final var links = response.getNames().stream()
-                .map(name -> "\"" + name + "\": \"" + metricsEndpoint + "/" + name + "\"")
-                .toList();
-        return "{\n" + String.join(",\n", links) + "\n}";
-    }
-
-    @Getter
-    private static class ActuatorMetricsEndpointResource {
-        private List<String> names;
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/config/JsonObjectMapperConfiguration.java
+++ b/src/main/java/net/hostsharing/hsadminng/config/JsonObjectMapperConfiguration.java
@ -1,8 +1,6 @@
 package net.hostsharing.hsadminng.config;

 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.openapitools.jackson.nullable.JsonNullableModule;
@ -11,24 +9,15 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;

-
@Configuration
 public class JsonObjectMapperConfiguration {

-    public static ObjectMapper build() {
-        return  new JsonObjectMapperConfiguration().customObjectMapper().build();
-    }
-
    @Bean
    @Primary
    public Jackson2ObjectMapperBuilder customObjectMapper() {
-        // HOWTO: add JSON converters and specify other JSON mapping configurations
        return new Jackson2ObjectMapperBuilder()
                .modules(new JsonNullableModule(), new JavaTimeModule())
-                .featuresToEnable(
-                        JsonParser.Feature.ALLOW_COMMENTS,
-                        DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS
-                )
+                .featuresToEnable(JsonParser.Feature.ALLOW_COMMENTS)
                .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
    }
 }
--- a/src/main/java/net/hostsharing/hsadminng/config/WebSecurityConfig.java
+++ b/src/main/java/net/hostsharing/hsadminng/config/WebSecurityConfig.java
@ -1,36 +0,0 @@
-package net.hostsharing.hsadminng.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
-import org.springframework.security.web.SecurityFilterChain;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-    @Bean
-    @Profile("!test")
-    public SecurityFilterChain securityFilterChain(final HttpSecurity http) throws Exception {
-        return http
-                .authorizeHttpRequests(authorize -> authorize
-                        .requestMatchers("/api/**").permitAll() // TODO.impl: implement authentication
-                        .requestMatchers("/swagger-ui/**").permitAll()
-                        .requestMatchers("/v3/api-docs/**").permitAll()
-                        .requestMatchers("/actuator/**").permitAll()
-                        .anyRequest().authenticated()
-                )
-                .csrf(AbstractHttpConfigurer::disable)
-                .build();
-    }
-
-    @Bean
-    @Profile("!test")
-    public Authenticator casServiceTicketValidator() {
-        return new CasAuthenticator();
-    }
-
-}
--- a/src/main/java/net/hostsharing/hsadminng/context/Context.java
+++ b/src/main/java/net/hostsharing/hsadminng/context/Context.java
@ -38,53 +38,53 @@ public class Context {
    private HttpServletRequest request;

    @Transactional(propagation = MANDATORY)
-    public void define(final String currentSubject) {
-        define(currentSubject, null);
+    public void define(final String currentUser) {
+        define(currentUser, null);
    }

    @Transactional(propagation = MANDATORY)
-    public void define(final String currentSubject, final String assumedRoles) {
-        define(toTask(request), toCurl(request), currentSubject, assumedRoles);
+    public void define(final String currentUser, final String assumedRoles) {
+        define(toTask(request), toCurl(request), currentUser, assumedRoles);
    }

    @Transactional(propagation = MANDATORY)
    public void define(
            final String currentTask,
            final String currentRequest,
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles) {
        final var query = em.createNativeQuery("""
-                call base.defineContext(
+                call defineContext(
                    cast(:currentTask as varchar(127)),
                    cast(:currentRequest as text),
-                    cast(:currentSubject as varchar(63)),
-                    cast(:assumedRoles as text));
+                    cast(:currentUser as varchar(63)),
+                    cast(:assumedRoles as varchar(1023)));
                """);
        query.setParameter("currentTask", shortenToMaxLength(currentTask, 127));
        query.setParameter("currentRequest", currentRequest);
-        query.setParameter("currentSubject", currentSubject);
+        query.setParameter("currentUser", currentUser);
        query.setParameter("assumedRoles", assumedRoles != null ? assumedRoles : "");
        query.executeUpdate();
    }

-    public String fetchCurrentTask() {
+    public String getCurrentTask() {
        return (String) em.createNativeQuery("select current_setting('hsadminng.currentTask');").getSingleResult();
    }

-    public String fetchCurrentSubject() {
-        return String.valueOf(em.createNativeQuery("select base.currentSubject()").getSingleResult());
+    public String getCurrentUser() {
+        return String.valueOf(em.createNativeQuery("select currentUser()").getSingleResult());
    }

-    public UUID fetchCurrentSubjectUuid() {
-        return (UUID) em.createNativeQuery("select rbac.currentSubjectUuid()", UUID.class).getSingleResult();
+    public UUID getCurrentUserUUid() {
+        return (UUID) em.createNativeQuery("select currentUserUUid()", UUID.class).getSingleResult();
    }

-    public String[] fetchAssumedRoles() {
-        return (String[]) em.createNativeQuery("select base.assumedRoles() as roles", String[].class).getSingleResult();
+    public String[] getAssumedRoles() {
+        return (String[]) em.createNativeQuery("select assumedRoles() as roles", String[].class).getSingleResult();
    }

-    public UUID[] fetchCurrentSubjectOrAssumedRolesUuids() {
-        return (UUID[]) em.createNativeQuery("select rbac.currentSubjectOrAssumedRolesUuids() as uuids", UUID[].class).getSingleResult();
+    public UUID[] currentSubjectsUuids() {
+        return (UUID[]) em.createNativeQuery("select currentSubjectsUuids() as uuids", UUID[].class).getSingleResult();
    }

    public static String getCallerMethodNameFromStackFrame(final int skipFrames) {
--- a/src/main/java/net/hostsharing/hsadminng/errors/CustomErrorResponse.java
+++ b/src/main/java/net/hostsharing/hsadminng/errors/CustomErrorResponse.java
@ -46,7 +46,6 @@ public class CustomErrorResponse {
        this.path = path;
        this.statusCode = status.value();
        this.statusPhrase = status.getReasonPhrase();
-        // HOWTO: debug serverside error response - set a breakpoint here
        this.message = message.startsWith("ERROR: [") ? message : "ERROR: [" + statusCode + "] " + message;
    }
 }
--- a/src/main/java/net/hostsharing/hsadminng/errors/DisplayAs.java
+++ b/src/main/java/net/hostsharing/hsadminng/errors/DisplayAs.java
@ -9,25 +9,15 @@ import java.lang.annotation.Target;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
 public @interface DisplayAs {
-
    class DisplayName {
-
        public static String of(final Class<?> clazz) {
-            final var displayNameAnnot = getDisplayNameAnnotation(clazz);
+            final var displayNameAnnot = clazz.getAnnotation(DisplayAs.class);
            return displayNameAnnot != null ? displayNameAnnot.value() : clazz.getSimpleName();
        }

        public static String of(@NotNull final Object instance) {
            return of(instance.getClass());
        }
-
-        private static DisplayAs getDisplayNameAnnotation(final Class<?> clazz) {
-            if (clazz == null) {
-                return null;
-            }
-            final var annot = clazz.getAnnotation(DisplayAs.class);
-            return annot != null ? annot : getDisplayNameAnnotation(clazz.getSuperclass());
-        }
    }

    String value() default "";
--- a/src/main/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandler.java
+++ b/src/main/java/net/hostsharing/hsadminng/errors/RestResponseEntityExceptionHandler.java
@ -97,7 +97,6 @@ public class RestResponseEntityExceptionHandler
        return errorResponse(request, HttpStatus.valueOf(statusCode.value()),
                Optional.ofNullable(response.getBody()).map(Object::toString).orElse(firstMessageLine(exc)));
    }
-
    @Override
    @SuppressWarnings("unchecked,rawtypes")
    protected ResponseEntity handleHttpMessageNotReadable(
@ -132,7 +131,7 @@ public class RestResponseEntityExceptionHandler
            final HttpStatusCode status,
            final WebRequest request) {
        final var errorList = exc
-                .getParameterValidationResults()
+                .getAllValidationResults()
                .stream()
                .map(ParameterValidationResult::getResolvableErrors)
                .flatMap(Collection::stream)
--- a/src/main/java/net/hostsharing/hsadminng/errors/Validate.java
+++ b/src/main/java/net/hostsharing/hsadminng/errors/Validate.java
@ -1,31 +0,0 @@
-package net.hostsharing.hsadminng.errors;
-
-import lombok.AllArgsConstructor;
-
-import jakarta.validation.ValidationException;
-
-@AllArgsConstructor
-public class Validate {
-
-    final String variableNames;
-
-    public static Validate validate(final String variableNames) {
-        return new Validate(variableNames);
-    }
-
-    public final void atMaxOne(final Object var1, final Object var2) {
-        if (var1 != null && var2 != null) {
-            throw new ValidationException(
-                    "At maximum one of (" + variableNames + ") must be non-null, " +
-                            "but are (" + var1 + ", " + var2 + ")");
-        }
-    }
-
-    public final void exactlyOne(final Object var1, final Object var2) {
-        if ((var1 != null) == (var2 != null)) {
-            throw new ValidationException(
-                    "Exactly one of (" + variableNames + ") must be non-null, " +
-                            "but are (" + var1 + ", " + var2 + ")");
-        }
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/hash/HashGenerator.java
+++ b/src/main/java/net/hostsharing/hsadminng/hash/HashGenerator.java
@ -27,7 +27,7 @@ public final class HashGenerator {
            "abcdefghijklmnopqrstuvwxyz" +
                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
                    "0123456789/.";
-    private static boolean couldBeHashEnabled; // TODO.legacy: remove after legacy data is migrated
+    private static boolean couldBeHashEnabled; // TODO.impl: remove after legacy data is migrated

    public enum Algorithm {
        LINUX_SHA512(LinuxEtcShadowHashGenerator::hash, "6"),
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorEntity.java
@ -5,9 +5,8 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import net.hostsharing.hsadminng.errors.DisplayAs;
-import net.hostsharing.hsadminng.rbac.role.WithRoleId;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;

 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@ -15,17 +14,17 @@ import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import java.util.UUID;

-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

 // a partial HsOfficeDebitorEntity to reduce the number of SQL queries to load the entity
@Entity
-@Table(schema = "hs_booking", name = "debitor_xv")
+@Table(name = "hs_booking_debitor_xv")
@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@DisplayAs("BookingDebitor")
-public class HsBookingDebitorEntity implements Stringifyable, WithRoleId {
+public class HsBookingDebitorEntity implements Stringifyable {

    public static final String DEBITOR_NUMBER_TAG = "D-";

--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorRepository.java
@ -1,19 +1,14 @@
 package net.hostsharing.hsadminng.hs.booking.debitor;

-import io.micrometer.core.annotation.Timed;
 import org.springframework.data.repository.Repository;
-import org.springframework.context.annotation.Profile;

 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
-public interface HsBookingDebitorRepository  extends Repository<HsBookingDebitorEntity, UUID> {
+public interface HsBookingDebitorRepository extends Repository<HsBookingDebitorEntity, UUID> {

-    @Timed("app.booking.debitor.repo.findByUuid")
    Optional<HsBookingDebitorEntity> findByUuid(UUID id);

-    @Timed("app.booking.debitor.repo.findByDebitorNumber")
    List<HsBookingDebitorEntity> findByDebitorNumber(int debitorNumber);
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/BookingItemCreatedAppEvent.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/BookingItemCreatedAppEvent.java
@ -1,20 +0,0 @@
-package net.hostsharing.hsadminng.hs.booking.item;
-
-import lombok.Getter;
-import org.springframework.context.ApplicationEvent;
-
-import jakarta.validation.constraints.NotNull;
-
-@Getter
-public class BookingItemCreatedAppEvent extends ApplicationEvent {
-
-    private BookingItemCreatedEventEntity entity;
-
-    public BookingItemCreatedAppEvent(
-            @NotNull final Object source,
-            @NotNull final HsBookingItemRealEntity newBookingItem,
-            final String assetJson) {
-        super(source);
-        this.entity = new BookingItemCreatedEventEntity(newBookingItem, assetJson);
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/BookingItemCreatedEventEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/BookingItemCreatedEventEntity.java
@ -1,55 +0,0 @@
-package net.hostsharing.hsadminng.hs.booking.item;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.SuperBuilder;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.MapsId;
-import jakarta.persistence.Table;
-import jakarta.persistence.Version;
-import jakarta.validation.constraints.NotNull;
-import java.util.UUID;
-
-
-
-@Entity
-@Table(schema = "hs_booking", name = "item_created_event")
-@SuperBuilder(toBuilder = true)
-@Getter
-@ToString
-@NoArgsConstructor
-public class BookingItemCreatedEventEntity implements BaseEntity {
-    @Id
-    @Column(name="bookingitemuuid")
-    private UUID uuid;
-
-    @MapsId
-    @ManyToOne(optional = false)
-    @JoinColumn(name = "bookingitemuuid", nullable = false)
-    private HsBookingItemRealEntity bookingItem;
-
-    @Version
-    private int version;
-
-    @Column(name = "assetjson")
-    private String assetJson;
-
-    @Setter
-    @Column(name = "statusmessage")
-    private String statusMessage;
-
-    public BookingItemCreatedEventEntity(
-            @NotNull final HsBookingItemRealEntity newBookingItem,
-            final String assetJson) {
-        this.bookingItem = newBookingItem;
-        this.assetJson = assetJson;
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/BookingItemCreatedEventRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/BookingItemCreatedEventRepository.java
@ -1,17 +0,0 @@
-package net.hostsharing.hsadminng.hs.booking.item;
-
-import io.micrometer.core.annotation.Timed;
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.repository.Repository;
-
-import java.util.UUID;
-
-@Profile("!only-office")
-public interface BookingItemCreatedEventRepository extends Repository<BookingItemCreatedEventEntity, UUID> {
-
-    @Timed("app.booking.items.repo.save")
-    BookingItemCreatedEventEntity save(HsBookingItemRealEntity current);
-
-    @Timed("app.booking.items.repo.findByBookingItem")
-    BookingItemCreatedEventEntity findByBookingItem(HsBookingItemRealEntity newBookingItem);
-}
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItem.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItem.java
@ -14,9 +14,9 @@ import net.hostsharing.hsadminng.hs.booking.project.HsBookingProject;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRealEntity;
 import net.hostsharing.hsadminng.hs.validation.PropertiesProvider;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.Type;

 import jakarta.persistence.CascadeType;
@ -45,7 +45,7 @@ import static java.util.Optional.ofNullable;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.lowerInclusiveFromPostgresDateRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.toPostgresDateRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.upperInclusiveFromPostgresDateRange;
-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

@MappedSuperclass
@Getter
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemController.java
@ -1,128 +1,103 @@
 package net.hostsharing.hsadminng.hs.booking.item;

-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.micrometer.core.annotation.Timed;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.api.HsBookingItemsApi;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingItemInsertResource;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingItemPatchResource;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingItemResource;
-import net.hostsharing.hsadminng.hs.booking.item.validators.BookingItemEntitySaveProcessor;
 import net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidatorRegistry;
-import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRealEntity;
 import net.hostsharing.hsadminng.mapper.KeyValueMap;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
-import net.hostsharing.hsadminng.persistence.EntityManagerWrapper;
+import net.hostsharing.hsadminng.mapper.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;

+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;

-import static java.util.Optional.ofNullable;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.toPostgresDateRange;

@RestController
-@Profile("!only-office")
 public class HsBookingItemController implements HsBookingItemsApi {

    @Autowired
    private Context context;

    @Autowired
-    private StrictMapper mapper;
-
-    @Autowired
-    private ApplicationEventPublisher applicationEventPublisher;
+    private Mapper mapper;

    @Autowired
    private HsBookingItemRbacRepository bookingItemRepo;

-    @Autowired
-    private ObjectMapper jsonMapper;
-
-    @Autowired
-    private EntityManagerWrapper em;
+    @PersistenceContext
+    private EntityManager em;

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.bookingItems.api.getListOfBookingItemsByProjectUuid")
-    public ResponseEntity<List<HsBookingItemResource>> getListOfBookingItemsByProjectUuid(
-            final String currentSubject,
+    public ResponseEntity<List<HsBookingItemResource>> listBookingItemsByProjectUuid(
+            final String currentUser,
            final String assumedRoles,
            final UUID projectUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entities = bookingItemRepo.findAllByProjectUuid(projectUuid);

-        final var resources = mapper.mapList(entities, HsBookingItemResource.class, RBAC_ENTITY_TO_RESOURCE_POSTMAPPER);
+        final var resources = mapper.mapList(entities, HsBookingItemResource.class, ENTITY_TO_RESOURCE_POSTMAPPER);
        return ResponseEntity.ok(resources);
    }

    @Override
    @Transactional
-    @Timed("app.bookingItems.api.postNewBookingItem")
-    public ResponseEntity<HsBookingItemResource> postNewBookingItem(
-            final String currentSubject,
+    public ResponseEntity<HsBookingItemResource> addBookingItem(
+            final String currentUser,
            final String assumedRoles,
            final HsBookingItemInsertResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entityToSave = mapper.map(body, HsBookingItemRbacEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
-        final var saveProcessor = new BookingItemEntitySaveProcessor(em, entityToSave);
-        final var mapped = saveProcessor
-                .preprocessEntity()
-                .validateEntity()
-                .prepareForSave()
-                .save()
-                .validateContext()
-                .mapUsing(e -> mapper.map(e, HsBookingItemResource.class, ITEM_TO_RESOURCE_POSTMAPPER))
-                .revampProperties();
-        publishSavedEvent(saveProcessor, body);
+
+        final var saved = HsBookingItemEntityValidatorRegistry.validated(em, bookingItemRepo.save(entityToSave));

        final var uri =
                MvcUriComponentsBuilder.fromController(getClass())
                        .path("/api/hs/booking/items/{id}")
-                        .buildAndExpand(mapped.getUuid())
+                        .buildAndExpand(saved.getUuid())
                        .toUri();
+        final var mapped = mapper.map(saved, HsBookingItemResource.class, ENTITY_TO_RESOURCE_POSTMAPPER);
        return ResponseEntity.created(uri).body(mapped);
    }

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.bookingItems.api.getSingleBookingItemByUuid")
-    public ResponseEntity<HsBookingItemResource> getSingleBookingItemByUuid(
-            final String currentSubject,
+    public ResponseEntity<HsBookingItemResource> getBookingItemByUuid(
+            final String currentUser,
            final String assumedRoles,
            final UUID bookingItemUuid) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = bookingItemRepo.findByUuid(bookingItemUuid);
        result.ifPresent(entity -> em.detach(entity)); // prevent further LAZY-loading
        return result
                .map(bookingItemEntity -> ResponseEntity.ok(
-                        mapper.map(bookingItemEntity, HsBookingItemResource.class, RBAC_ENTITY_TO_RESOURCE_POSTMAPPER)))
+                        mapper.map(bookingItemEntity, HsBookingItemResource.class, ENTITY_TO_RESOURCE_POSTMAPPER)))
                .orElseGet(() -> ResponseEntity.notFound().build());
    }

    @Override
    @Transactional
-    @Timed("app.bookingItems.api.deleteBookingIemByUuid")
    public ResponseEntity<Void> deleteBookingIemByUuid(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID bookingItemUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = bookingItemRepo.deleteByUuid(bookingItemUuid);
        return result == 0
@ -132,48 +107,31 @@ public class HsBookingItemController implements HsBookingItemsApi {

    @Override
    @Transactional
-    @Timed("app.bookingItems.api.patchBookingItem")
    public ResponseEntity<HsBookingItemResource> patchBookingItem(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID bookingItemUuid,
            final HsBookingItemPatchResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var current = bookingItemRepo.findByUuid(bookingItemUuid).orElseThrow();

        new HsBookingItemEntityPatcher(current).apply(body);

        final var saved = bookingItemRepo.save(HsBookingItemEntityValidatorRegistry.validated(em, current));
-        final var mapped = mapper.map(saved, HsBookingItemResource.class, RBAC_ENTITY_TO_RESOURCE_POSTMAPPER);
+        final var mapped = mapper.map(saved, HsBookingItemResource.class, ENTITY_TO_RESOURCE_POSTMAPPER);
        return ResponseEntity.ok(mapped);
    }

-    private void publishSavedEvent(final BookingItemEntitySaveProcessor saveProcessor, final HsBookingItemInsertResource body) {
-        try {
-            final var bookingItemRealEntity = em.getReference(HsBookingItemRealEntity.class, saveProcessor.getEntity().getUuid());
-            applicationEventPublisher.publishEvent(new BookingItemCreatedAppEvent(
-                    this, bookingItemRealEntity, jsonMapper.writeValueAsString(body.getHostingAsset())));
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    final BiConsumer<HsBookingItem, HsBookingItemResource> ITEM_TO_RESOURCE_POSTMAPPER = (entity, resource) -> {
+    final BiConsumer<HsBookingItemRbacEntity, HsBookingItemResource> ENTITY_TO_RESOURCE_POSTMAPPER = (entity, resource) -> {
        resource.setValidFrom(entity.getValidity().lower());
        if (entity.getValidity().hasUpperBound()) {
            resource.setValidTo(entity.getValidity().upper().minusDays(1));
        }
    };

-    final BiConsumer<HsBookingItemRbacEntity, HsBookingItemResource> RBAC_ENTITY_TO_RESOURCE_POSTMAPPER = ITEM_TO_RESOURCE_POSTMAPPER::accept;
-
    final BiConsumer<HsBookingItemInsertResource, HsBookingItemRbacEntity> RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
-        entity.setProject(em.find(HsBookingProjectRealEntity.class, resource.getProjectUuid()));
-        ofNullable(resource.getParentItemUuid())
-                .map(parentItemUuid -> em.find(HsBookingItemRealEntity.class, parentItemUuid))
-                .ifPresent(entity::setParentItem);
        entity.setValidity(toPostgresDateRange(LocalDate.now(), resource.getValidTo()));
        entity.putResources(KeyValueMap.from(resource.getResources()));
    };
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRbacEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRbacEntity.java
@ -4,9 +4,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRbacEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL;
+import net.hostsharing.hsadminng.hs.booking.project.HsBookingProject;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;

 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.AttributeOverrides;
@ -15,23 +15,22 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import java.io.IOException;

-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Nullable.NULLABLE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.TENANT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NULLABLE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.TENANT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;

@Entity
-@Table(schema = "hs_booking", name = "item_rv")
+@Table(name = "hs_booking_item_rv")
@SuperBuilder(toBuilder = true)
@Getter
@Setter
@ -41,15 +40,15 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
 })
 public class HsBookingItemRbacEntity extends HsBookingItem {

-    public static RbacSpec rbac() {
+    public static RbacView rbac() {
        return rbacViewFor("bookingItem", HsBookingItemRbacEntity.class)
                .withIdentityView(SQL.projection("caption"))
                .withRestrictedViewOrderBy(SQL.expression("validity"))
                .withUpdatableColumns("version", "caption", "validity", "resources")
-                .toRole(GLOBAL, ADMIN).grantPermission(INSERT) // TODO.impl: Why is this necessary to insert test data?
-                .toRole(GLOBAL, ADMIN).grantPermission(DELETE)
+                .toRole("global", ADMIN).grantPermission(INSERT) // TODO.impl: Why is this necessary to insert test data?
+                .toRole("global", ADMIN).grantPermission(DELETE)

-                .importEntityAlias("project", HsBookingProjectRbacEntity.class, usingDefaultCase(),
+                .importEntityAlias("project", HsBookingProject.class, usingDefaultCase(),
                        dependsOnColumn("projectUuid"),
                        directlyFetchedByDependsOnColumn(),
                        NULLABLE)
@ -75,7 +74,7 @@ public class HsBookingItemRbacEntity extends HsBookingItem {
                    with.permission(SELECT);
                })

-                .limitDiagramTo("bookingItem", "project", "rbac.global");
+                .limitDiagramTo("bookingItem", "project", "global");
    }

    public static void main(String[] args) throws IOException {
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRbacRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRbacRepository.java
@ -1,32 +1,23 @@
 package net.hostsharing.hsadminng.hs.booking.item;

-import io.micrometer.core.annotation.Timed;
-import org.springframework.context.annotation.Profile;
 import org.springframework.data.repository.Repository;

 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
 public interface HsBookingItemRbacRepository extends HsBookingItemRepository<HsBookingItemRbacEntity>,
        Repository<HsBookingItemRbacEntity, UUID> {

-    @Timed("app.bookingItems.repo.findByUuid.rbac")
    Optional<HsBookingItemRbacEntity> findByUuid(final UUID bookingItemUuid);

-    @Timed("app.bookingItems.repo.findByCaption.rbac")
    List<HsBookingItemRbacEntity> findByCaption(String bookingItemCaption);

-    @Timed("app.bookingItems.repo.findAllByProjectUuid.rbac")
    List<HsBookingItemRbacEntity> findAllByProjectUuid(final UUID projectItemUuid);

-    @Timed("app.bookingItems.repo.save.rbac")
    HsBookingItemRbacEntity save(HsBookingItemRbacEntity current);

-    @Timed("app.bookingItems.repo.deleteByUuid.rbac")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.bookingItems.repo.count.rbac")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRealEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRealEntity.java
@ -13,7 +13,7 @@ import jakarta.persistence.Table;


@Entity
-@Table(schema = "hs_booking", name = "item")
+@Table(name = "hs_booking_item")
@SuperBuilder(toBuilder = true)
@Getter
@Setter
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRealRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRealRepository.java
@ -1,32 +1,23 @@
 package net.hostsharing.hsadminng.hs.booking.item;

-import io.micrometer.core.annotation.Timed;
-import org.springframework.context.annotation.Profile;
 import org.springframework.data.repository.Repository;

 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
 public interface HsBookingItemRealRepository extends HsBookingItemRepository<HsBookingItemRealEntity>,
        Repository<HsBookingItemRealEntity, UUID> {

-    @Timed("app.bookingItems.repo.findByUuid.real")
    Optional<HsBookingItemRealEntity> findByUuid(final UUID bookingItemUuid);

-    @Timed("app.bookingItems.repo.findByCaption.real")
    List<HsBookingItemRealEntity> findByCaption(String bookingItemCaption);

-    @Timed("app.bookingItems.repo.findAllByProjectUuid.real")
    List<HsBookingItemRealEntity> findAllByProjectUuid(final UUID projectItemUuid);

-    @Timed("app.bookingItems.repo.save.real")
    HsBookingItemRealEntity save(HsBookingItemRealEntity current);

-    @Timed("app.bookingItems.repo.deleteByUuid.real")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.bookingItems.repo.count.real")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRepository.java
@ -1,13 +1,9 @@
 package net.hostsharing.hsadminng.hs.booking.item;

-
-import org.springframework.context.annotation.Profile;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
 public interface HsBookingItemRepository<E extends HsBookingItem> {

    Optional<E> findByUuid(final UUID bookingItemUuid);
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/BookingItemEntitySaveProcessor.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/BookingItemEntitySaveProcessor.java
@ -1,136 +0,0 @@
-package net.hostsharing.hsadminng.hs.booking.item.validators;
-
-import lombok.Getter;
-import net.hostsharing.hsadminng.errors.MultiValidationException;
-import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingItemResource;
-import net.hostsharing.hsadminng.hs.booking.item.HsBookingItem;
-import net.hostsharing.hsadminng.hs.validation.HsEntityValidator;
-
-import jakarta.persistence.EntityManager;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-
-// TODO.refa: introduce common base class with HsHostingAssetEntitySaveProcessor
-/**
- * Wraps the steps of the pararation, validation, mapping and revamp around saving of a HsBookingItem into a readable API.
- */
-public class BookingItemEntitySaveProcessor {
-
-    private final HsEntityValidator<HsBookingItem> validator;
-    private String expectedStep = "preprocessEntity";
-    private final EntityManager em;
-
-    @Getter
-    private HsBookingItem entity;
-
-    @Getter
-    private HsBookingItemResource resource;
-
-    public BookingItemEntitySaveProcessor(final EntityManager em, final HsBookingItem entity) {
-        this.em = em;
-        this.entity = entity;
-        this.validator = HsBookingItemEntityValidatorRegistry.forType(entity.getType());
-    }
-
-    /// initial step allowing to set default values before any validations
-    public BookingItemEntitySaveProcessor preprocessEntity() {
-        step("preprocessEntity", "validateEntity");
-        validator.preprocessEntity(entity);
-        return this;
-    }
-
-    /// validates the entity itself including its properties
-    public BookingItemEntitySaveProcessor validateEntity() {
-        step("validateEntity", "prepareForSave");
-        MultiValidationException.throwIfNotEmpty(validator.validateEntity(entity));
-        return this;
-    }
-
-    // TODO.legacy: remove once the migration of legacy data is done
-    /// validates the entity itself including its properties, but ignoring some error messages for import of legacy data
-    public BookingItemEntitySaveProcessor validateEntityIgnoring(final String... ignoreRegExp) {
-        step("validateEntity", "prepareForSave");
-        final var ignoreRegExpPatterns = Arrays.stream(ignoreRegExp).map(Pattern::compile).toList();
-        MultiValidationException.throwIfNotEmpty(
-                validator.validateEntity(entity).stream()
-                        .filter(error -> ignoreRegExpPatterns.stream().noneMatch(p -> p.matcher(error).matches() ))
-                        .toList()
-        );
-        return this;
-    }
-
-    /// hashing passwords etc.
-    public BookingItemEntitySaveProcessor prepareForSave() {
-        step("prepareForSave", "save");
-        validator.prepareProperties(em, entity);
-        return this;
-    }
-
-    /**
-     * Saves the entity using the given `saveFunction`.
-     *
-     * <p>`validator.postPersist(em, entity)` is NOT called.
-     * If any postprocessing is necessary, the saveFunction has to implement this.</p>
-     * @param saveFunction
-     * @return this
-     */
-    public BookingItemEntitySaveProcessor saveUsing(final Function<HsBookingItem, HsBookingItem> saveFunction) {
-        step("save", "validateContext");
-        entity = saveFunction.apply(entity);
-        return this;
-    }
-
-    /**
-     * Saves the using the `EntityManager`, but does NOT ever merge the entity.
-     *
-     * <p>`validator.postPersist(em, entity)` is called afterwards with the entity guaranteed to be flushed to the database.</p>
-     * @return this
-     */
-    public BookingItemEntitySaveProcessor save() {
-        return saveUsing(e -> {
-            if (!em.contains(entity)) {
-                em.persist(entity);
-            }
-            em.flush(); // makes RbacEntity available as RealEntity if needed
-            validator.postPersist(em, entity);
-            return entity;
-        });
-    }
-
-    /// validates the entity within it's parent and child hierarchy (e.g. totals validators and other limits)
-    public BookingItemEntitySaveProcessor validateContext() {
-        step("validateContext", "mapUsing");
-        return HsEntityValidator.doWithEntityManager(em, () -> {
-            MultiValidationException.throwIfNotEmpty(validator.validateContext(entity));
-            return this;
-        });
-    }
-
-    /// maps entity to JSON resource representation
-    public BookingItemEntitySaveProcessor mapUsing(
-            final Function<HsBookingItem, HsBookingItemResource> mapFunction) {
-        step("mapUsing", "revampProperties");
-        resource = mapFunction.apply(entity);
-        return this;
-    }
-
-    /// removes write-only-properties and ads computed-properties
-    @SuppressWarnings("unchecked")
-    public HsBookingItemResource revampProperties() {
-        step("revampProperties", null);
-        final var revampedProps = validator.revampProperties(em, entity, (Map<String, Object>) resource.getResources());
-        resource.setResources(revampedProps);
-        return resource;
-    }
-
-    // Makes sure that the steps are called in the correct order.
-    // Could also be implemented using an interface per method, but that seems exaggerated.
-    private void step(final String current, final String next) {
-        if (!expectedStep.equals(current)) {
-            throw new IllegalStateException("expected " + expectedStep + " but got " + current);
-        }
-        expectedStep = next;
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidatorRegistry.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidatorRegistry.java
@ -48,11 +48,10 @@ public class HsBookingItemEntityValidatorRegistry {
    }

    public static List<String> doValidate(final EntityManager em, final HsBookingItem bookingItem) {
-        final var bookingItemValidator = HsBookingItemEntityValidatorRegistry.forType(bookingItem.getType());
        return HsEntityValidator.doWithEntityManager(em, () ->
            HsEntityValidator.sequentiallyValidate(
-                    () -> bookingItemValidator.validateEntity(bookingItem),
-                    () -> bookingItemValidator.validateContext(bookingItem))
+                    () -> HsBookingItemEntityValidatorRegistry.forType(bookingItem.getType()).validateEntity(bookingItem),
+                    () -> HsBookingItemEntityValidatorRegistry.forType(bookingItem.getType()).validateContext(bookingItem))
        );
    }

--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsDomainSetupBookingItemValidator.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsDomainSetupBookingItemValidator.java
@ -1,4 +1,3 @@
-
 package net.hostsharing.hsadminng.hs.booking.item.validators;

 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItem;
@ -13,16 +12,13 @@ import static net.hostsharing.hsadminng.hs.hosting.asset.validators.Dns.REGISTRA
 import static net.hostsharing.hsadminng.hs.validation.StringProperty.stringProperty;

 class HsDomainSetupBookingItemValidator extends HsBookingItemEntityValidator {
-    public static final String DOMAIN_NAME_PROPERTY_NAME = "domainName";

    public static final String FQDN_REGEX = "^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,12}";
-    public static final String WEBSPACE_NAME_REGEX = "[a-z][a-z0-9]{2}[0-9]{2}";
-    public static final String TARGET_UNIX_USER_NAME_REGEX = "^"+WEBSPACE_NAME_REGEX+"$|^"+WEBSPACE_NAME_REGEX+"-[a-z0-9\\._-]+$";
+    public static final String DOMAIN_NAME_PROPERTY_NAME = "domainName";
    public static final String VERIFICATION_CODE_PROPERTY_NAME = "verificationCode";

    HsDomainSetupBookingItemValidator() {
        super(
-                // TODO.spec: feels wrong
                stringProperty(DOMAIN_NAME_PROPERTY_NAME).writeOnce()
                        .maxLength(253)
                        .matchesRegEx(FQDN_REGEX).describedAs("is not a (non-top-level) fully qualified domain name")
@ -49,11 +45,6 @@ class HsDomainSetupBookingItemValidator extends HsBookingItemEntityValidator {
    }

    private static String generateVerificationCode(final EntityManager em, final PropertiesProvider propertiesProvider) {
-        final var userDefinedVerificationCode = propertiesProvider.getDirectValue(VERIFICATION_CODE_PROPERTY_NAME, String.class);
-        if (userDefinedVerificationCode != null) {
-            return userDefinedVerificationCode;
-        }
-
        final var alphaNumeric = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
        final var secureRandom = new SecureRandom();
        final var sb = new StringBuilder();
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProject.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProject.java
@ -3,15 +3,30 @@ package net.hostsharing.hsadminng.hs.booking.project;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.hs.booking.debitor.HsBookingDebitorEntity;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
+import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;

 import jakarta.persistence.*;
+import java.io.IOException;
 import java.util.UUID;

 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.DEBITOR;
+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.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.fetchedBySql;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

@MappedSuperclass
@Getter
@ -50,4 +65,50 @@ public abstract class HsBookingProject implements Stringifyable, BaseEntity<HsBo
        return ofNullable(debitor).map(HsBookingDebitorEntity::toShortString).orElse("D-???????") +
                ":" + caption;
    }
+
+    public static RbacView rbac() {
+        return rbacViewFor("project", HsBookingProject.class)
+                .withIdentityView(SQL.query("""
+                        SELECT bookingProject.uuid as uuid, debitorIV.idName || '-' || cleanIdentifier(bookingProject.caption) as idName
+                            FROM hs_booking_project bookingProject
+                            JOIN hs_office_debitor_iv debitorIV ON debitorIV.uuid = bookingProject.debitorUuid
+                        """))
+                .withRestrictedViewOrderBy(SQL.expression("caption"))
+                .withUpdatableColumns("version", "caption")
+
+                .importEntityAlias("debitor", HsOfficeDebitorEntity.class, usingDefaultCase(),
+                        dependsOnColumn("debitorUuid"),
+                        directlyFetchedByDependsOnColumn(),
+                        NOT_NULL)
+
+                .importEntityAlias("debitorRel", HsOfficeRelationRbacEntity.class, usingCase(DEBITOR),
+                        dependsOnColumn("debitorUuid"),
+                        fetchedBySql("""
+                                SELECT ${columns}
+                                    FROM hs_office_relation debitorRel
+                                    JOIN hs_office_debitor debitor ON debitor.debitorRelUuid = debitorRel.uuid
+                                    WHERE debitor.uuid = ${REF}.debitorUuid
+                                """),
+                        NOT_NULL)
+                .toRole("debitorRel", ADMIN).grantPermission(INSERT)
+                .toRole("global", ADMIN).grantPermission(DELETE)
+
+                .createRole(OWNER, (with) -> {
+                    with.incomingSuperRole("debitorRel", AGENT).unassumed();
+                })
+                .createSubRole(ADMIN, (with) -> {
+                    with.permission(UPDATE);
+                })
+                .createSubRole(AGENT)
+                .createSubRole(TENANT, (with) -> {
+                    with.outgoingSubRole("debitorRel", TENANT);
+                    with.permission(SELECT);
+                })
+
+                .limitDiagramTo("project", "debitorRel", "global");
+    }
+
+    public static void main(String[] args) throws IOException {
+        rbac().generateWithBaseFileName("6-hs-booking/620-booking-project/6203-hs-booking-project-rbac");
+    }
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectController.java
@ -1,15 +1,13 @@
 package net.hostsharing.hsadminng.hs.booking.project;

-import io.micrometer.core.annotation.Timed;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.booking.debitor.HsBookingDebitorRepository;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.api.HsBookingProjectsApi;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingProjectInsertResource;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingProjectPatchResource;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingProjectResource;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
+import net.hostsharing.hsadminng.mapper.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
@ -21,14 +19,13 @@ import java.util.UUID;
 import java.util.function.BiConsumer;

@RestController
-@Profile("!only-office")
 public class HsBookingProjectController implements HsBookingProjectsApi {

    @Autowired
    private Context context;

    @Autowired
-    private StrictMapper mapper;
+    private Mapper mapper;

    @Autowired
    private HsBookingProjectRbacRepository bookingProjectRepo;
@ -38,12 +35,11 @@ public class HsBookingProjectController implements HsBookingProjectsApi {

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.bookingProjects.api.getListOfBookingProjectsByDebitorUuid")
-    public ResponseEntity<List<HsBookingProjectResource>> getListOfBookingProjectsByDebitorUuid(
-            final String currentSubject,
+    public ResponseEntity<List<HsBookingProjectResource>> listBookingProjectsByDebitorUuid(
+            final String currentUser,
            final String assumedRoles,
            final UUID debitorUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entities = bookingProjectRepo.findAllByDebitorUuid(debitorUuid);

@ -53,13 +49,12 @@ public class HsBookingProjectController implements HsBookingProjectsApi {

    @Override
    @Transactional
-    @Timed("app.bookingProjects.api.postNewBookingProject")
-    public ResponseEntity<HsBookingProjectResource> postNewBookingProject(
-            final String currentSubject,
+    public ResponseEntity<HsBookingProjectResource> addBookingProject(
+            final String currentUser,
            final String assumedRoles,
            final HsBookingProjectInsertResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entityToSave = mapper.map(body, HsBookingProjectRbacEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);

@ -76,13 +71,12 @@ public class HsBookingProjectController implements HsBookingProjectsApi {

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.bookingProjects.api.getBookingProjectByUuid")
    public ResponseEntity<HsBookingProjectResource> getBookingProjectByUuid(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID bookingProjectUuid) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = bookingProjectRepo.findByUuid(bookingProjectUuid);
        return result
@ -93,12 +87,11 @@ public class HsBookingProjectController implements HsBookingProjectsApi {

    @Override
    @Transactional
-    @Timed("app.bookingProjects.api.deleteBookingIemByUuid")
    public ResponseEntity<Void> deleteBookingIemByUuid(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID bookingProjectUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = bookingProjectRepo.deleteByUuid(bookingProjectUuid);
        return result == 0
@ -108,14 +101,13 @@ public class HsBookingProjectController implements HsBookingProjectsApi {

    @Override
    @Transactional
-    @Timed("app.bookingProjects.api.patchBookingProject")
    public ResponseEntity<HsBookingProjectResource> patchBookingProject(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID bookingProjectUuid,
            final HsBookingProjectPatchResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var current = bookingProjectRepo.findByUuid(bookingProjectUuid).orElseThrow();

--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRbacEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRbacEntity.java
@ -6,45 +6,44 @@ import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;

 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import java.io.IOException;

 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.DEBITOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.ColumnValue.usingCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.TENANT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL.fetchedBySql;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
+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.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.TENANT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.fetchedBySql;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;

@Entity
-@Table(schema = "hs_booking", name = "project_rv")
+@Table(name = "hs_booking_project_rv")
@SuperBuilder(toBuilder = true)
@Getter
@Setter
@NoArgsConstructor
 public class HsBookingProjectRbacEntity extends HsBookingProject {

-    public static RbacSpec rbac() {
+    public static RbacView rbac() {
        return rbacViewFor("project", HsBookingProjectRbacEntity.class)
                .withIdentityView(SQL.query("""
-                        SELECT bookingProject.uuid as uuid, debitorIV.idName || '-' || base.cleanIdentifier(bookingProject.caption) as idName
-                            FROM hs_booking.project bookingProject
-                            JOIN hs_office.debitor_iv debitorIV ON debitorIV.uuid = bookingProject.debitorUuid
+                        SELECT bookingProject.uuid as uuid, debitorIV.idName || '-' || cleanIdentifier(bookingProject.caption) as idName
+                            FROM hs_booking_project bookingProject
+                            JOIN hs_office_debitor_iv debitorIV ON debitorIV.uuid = bookingProject.debitorUuid
                        """))
                .withRestrictedViewOrderBy(SQL.expression("caption"))
                .withUpdatableColumns("version", "caption")
@ -58,13 +57,13 @@ public class HsBookingProjectRbacEntity extends HsBookingProject {
                        dependsOnColumn("debitorUuid"),
                        fetchedBySql("""
                                SELECT ${columns}
-                                    FROM hs_office.relation debitorRel
-                                    JOIN hs_office.debitor debitor ON debitor.debitorRelUuid = debitorRel.uuid
+                                    FROM hs_office_relation debitorRel
+                                    JOIN hs_office_debitor debitor ON debitor.debitorRelUuid = debitorRel.uuid
                                    WHERE debitor.uuid = ${REF}.debitorUuid
                                """),
                        NOT_NULL)
                .toRole("debitorRel", ADMIN).grantPermission(INSERT)
-                .toRole(GLOBAL, ADMIN).grantPermission(DELETE)
+                .toRole("global", ADMIN).grantPermission(DELETE)

                .createRole(OWNER, (with) -> {
                    with.incomingSuperRole("debitorRel", AGENT).unassumed();
@ -78,7 +77,7 @@ public class HsBookingProjectRbacEntity extends HsBookingProject {
                    with.permission(SELECT);
                })

-                .limitDiagramTo("project", "debitorRel", "rbac.global");
+                .limitDiagramTo("project", "debitorRel", "global");
    }

    public static void main(String[] args) throws IOException {
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRbacRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRbacRepository.java
@ -1,32 +1,22 @@
 package net.hostsharing.hsadminng.hs.booking.project;

-import io.micrometer.core.annotation.Timed;
-import org.springframework.context.annotation.Profile;
 import org.springframework.data.repository.Repository;

 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
 public interface HsBookingProjectRbacRepository extends HsBookingProjectRepository<HsBookingProjectRbacEntity>,
        Repository<HsBookingProjectRbacEntity, UUID> {

-    @Timed("app.bookingProjects.repo.findByUuid.rbac")
    Optional<HsBookingProjectRbacEntity> findByUuid(final UUID bookingProjectUuid);
-
-    @Timed("app.bookingProjects.repo.findByCaption.rbac")
    List<HsBookingProjectRbacEntity> findByCaption(final String projectCaption);

-    @Timed("app.bookingProjects.repo.findAllByDebitorUuid.rbac")
    List<HsBookingProjectRbacEntity> findAllByDebitorUuid(final UUID bookingProjectUuid);

-    @Timed("app.bookingProjects.repo.save.rbac")
    HsBookingProjectRbacEntity save(HsBookingProjectRbacEntity current);

-    @Timed("app.bookingProjects.repo.deleteByUuid.rbac")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.bookingProjects.repo.count.rbac")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRealEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRealEntity.java
@ -10,7 +10,7 @@ import jakarta.persistence.Table;


@Entity
-@Table(schema = "hs_booking", name = "project")
+@Table(name = "hs_booking_project")
@SuperBuilder(toBuilder = true)
@Getter
@Setter
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRealRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRealRepository.java
@ -1,32 +1,22 @@
 package net.hostsharing.hsadminng.hs.booking.project;

-import io.micrometer.core.annotation.Timed;
-import org.springframework.context.annotation.Profile;
 import org.springframework.data.repository.Repository;

 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
 public interface HsBookingProjectRealRepository extends HsBookingProjectRepository<HsBookingProjectRealEntity>,
        Repository<HsBookingProjectRealEntity, UUID> {

-    @Timed("app.bookingProjects.repo.findByUuid.real")
    Optional<HsBookingProjectRealEntity> findByUuid(final UUID bookingProjectUuid);
-
-    @Timed("app.bookingProjects.repo.findByCaption.real")
    List<HsBookingProjectRealEntity> findByCaption(final String projectCaption);

-    @Timed("app.bookingProjects.repo.findAllByDebitorUuid.real")
    List<HsBookingProjectRealEntity> findAllByDebitorUuid(final UUID bookingProjectUuid);

-    @Timed("app.bookingProjects.repo.save.real")
    HsBookingProjectRealEntity save(HsBookingProjectRealEntity current);

-    @Timed("app.bookingProjects.repo.deleteByUuid.real")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.bookingProjects.repo.count.real")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRepository.java
@ -1,30 +1,19 @@
 package net.hostsharing.hsadminng.hs.booking.project;

-import io.micrometer.core.annotation.Timed;
-import org.springframework.context.annotation.Profile;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
 public interface HsBookingProjectRepository<E extends HsBookingProject> {

-    @Timed("app.booking.projects.repo.findByUuid")
-    Optional<E> findByUuid(final UUID findByUuid);
-
-    @Timed("app.booking.projects.repo.findByCaption")
+    Optional<E> findByUuid(final UUID bookingProjectUuid);
    List<E> findByCaption(final String projectCaption);

-    @Timed("app.booking.projects.repo.findAllByDebitorUuid")
    List<E> findAllByDebitorUuid(final UUID bookingProjectUuid);

-    @Timed("app.booking.projects.repo.save")
    E save(E current);

-    @Timed("app.booking.projects.repo.deleteByUuid")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.booking.projects.repo.count")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAsset.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAsset.java
@ -14,9 +14,9 @@ import net.hostsharing.hsadminng.hs.booking.project.HsBookingProject;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRealEntity;
 import net.hostsharing.hsadminng.hs.validation.PropertiesProvider;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.Type;

 import jakarta.persistence.CascadeType;
@ -42,7 +42,7 @@ import java.util.Optional;
 import java.util.UUID;

 import static java.util.Collections.emptyMap;
-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

@MappedSuperclass
@Getter
@ -89,9 +89,10 @@ public abstract class HsHostingAsset implements Stringifyable, BaseEntity<HsHost
    @JoinColumn(name = "alarmcontactuuid")
    private HsOfficeContactRealEntity alarmContact;

-    @OneToMany(cascade = { CascadeType.PERSIST, CascadeType.REFRESH }, orphanRemoval = true, fetch = FetchType.LAZY)
+    @Builder.Default
+    @OneToMany(cascade = CascadeType.REFRESH, orphanRemoval = true, fetch = FetchType.LAZY)
    @JoinColumn(name = "parentassetuuid", referencedColumnName = "uuid")
-    private List<HsHostingAssetRealEntity> subHostingAssets;
+    private List<HsHostingAssetRealEntity> subHostingAssets = new ArrayList<>();

    @Column(name = "identifier")
    private String identifier; // e.g. vm1234, xyz00, example.org, xyz00_abc
@ -124,13 +125,6 @@ public abstract class HsHostingAsset implements Stringifyable, BaseEntity<HsHost
        PatchableMapWrapper.of(configWrapper, (newWrapper) -> {configWrapper = newWrapper;}, config).assign(newConfig);
    }

-    public List<HsHostingAssetRealEntity> getSubHostingAssets() {
-        if (subHostingAssets == null) {
-            subHostingAssets = new ArrayList<>();
-        }
-        return subHostingAssets;
-    }
-
    @Override
    public PatchableMapWrapper<Object> directProps() {
        return getConfig();
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetController.java
@ -1,6 +1,5 @@
 package net.hostsharing.hsadminng.hs.hosting.asset;

-import io.micrometer.core.annotation.Timed;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRealRepository;
 import net.hostsharing.hsadminng.hs.hosting.asset.validators.HostingAssetEntitySaveProcessor;
 import net.hostsharing.hsadminng.hs.hosting.asset.validators.HostingAssetEntityValidatorRegistry;
@ -12,10 +11,9 @@ import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.model.HsHostingAsse
 import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.model.HsHostingAssetResource;
 import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.model.HsHostingAssetTypeResource;
 import net.hostsharing.hsadminng.mapper.KeyValueMap;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
+import net.hostsharing.hsadminng.mapper.Mapper;
 import net.hostsharing.hsadminng.persistence.EntityManagerWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
@ -28,7 +26,6 @@ import java.util.UUID;
 import java.util.function.BiConsumer;

@RestController
-@Profile("!only-office")
 public class HsHostingAssetController implements HsHostingAssetsApi {

    @Autowired
@ -38,7 +35,7 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
    private Context context;

    @Autowired
-    private StrictMapper mapper;
+    private Mapper mapper;

    @Autowired
    private HsHostingAssetRbacRepository rbacAssetRepo;
@ -51,14 +48,13 @@ public class HsHostingAssetController implements HsHostingAssetsApi {

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.hosting.assets.api.getListOfHostingAssets")
-    public ResponseEntity<List<HsHostingAssetResource>> getListOfHostingAssets(
-            final String currentSubject,
+    public ResponseEntity<List<HsHostingAssetResource>> listAssets(
+            final String currentUser,
            final String assumedRoles,
            final UUID debitorUuid,
            final UUID parentAssetUuid,
            final HsHostingAssetTypeResource type) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entities = rbacAssetRepo.findAllByCriteria(debitorUuid, parentAssetUuid, HsHostingAssetType.of(type));

@ -69,13 +65,12 @@ public class HsHostingAssetController implements HsHostingAssetsApi {

    @Override
    @Transactional
-    @Timed("app.hosting.assets.api.postNewHostingAsset")
-    public ResponseEntity<HsHostingAssetResource> postNewHostingAsset(
-            final String currentSubject,
+    public ResponseEntity<HsHostingAssetResource> addAsset(
+            final String currentUser,
            final String assumedRoles,
            final HsHostingAssetInsertResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entity = mapper.map(body, HsHostingAssetRbacEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);

@ -98,13 +93,12 @@ public class HsHostingAssetController implements HsHostingAssetsApi {

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.hosting.assets.api.getSingleHostingAssetByUuid")
-    public ResponseEntity<HsHostingAssetResource> getSingleHostingAssetByUuid(
-            final String currentSubject,
+    public ResponseEntity<HsHostingAssetResource> getAssetByUuid(
+            final String currentUser,
            final String assumedRoles,
            final UUID assetUuid) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = rbacAssetRepo.findByUuid(assetUuid);
        return result
@ -115,12 +109,11 @@ public class HsHostingAssetController implements HsHostingAssetsApi {

    @Override
    @Transactional
-    @Timed("app.hosting.assets.api.deleteHostingAssetByUuid")
-    public ResponseEntity<Void> deleteHostingAssetByUuid(
-            final String currentSubject,
+    public ResponseEntity<Void> deleteAssetUuid(
+            final String currentUser,
            final String assumedRoles,
            final UUID assetUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = rbacAssetRepo.deleteByUuid(assetUuid);
        return result == 0
@ -130,14 +123,13 @@ public class HsHostingAssetController implements HsHostingAssetsApi {

    @Override
    @Transactional
-    @Timed("app.hosting.assets.api.patchHostingAsset")
-    public ResponseEntity<HsHostingAssetResource> patchHostingAsset(
-            final String currentSubject,
+    public ResponseEntity<HsHostingAssetResource> patchAsset(
+            final String currentUser,
            final String assumedRoles,
            final UUID assetUuid,
            final HsHostingAssetPatchResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entity = rbacAssetRepo.findByUuid(assetUuid).orElseThrow();

--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsController.java
@ -1,10 +1,8 @@
 package net.hostsharing.hsadminng.hs.hosting.asset;

-import io.micrometer.core.annotation.Timed;
 import net.hostsharing.hsadminng.hs.hosting.asset.validators.HostingAssetEntityValidatorRegistry;
 import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.api.HsHostingAssetPropsApi;
 import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.model.HsHostingAssetTypeResource;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;

@ -13,12 +11,10 @@ import java.util.Map;


@RestController
-@Profile("!only-office")
 public class HsHostingAssetPropsController implements HsHostingAssetPropsApi {

    @Override
-    @Timed("app.hosting.assets.api.getListOfHostingAssetTypes")
-    public ResponseEntity<List<String>> getListOfHostingAssetTypes() {
+    public ResponseEntity<List<String>> listAssetTypes() {
        final var resource = HostingAssetEntityValidatorRegistry.types().stream()
                .map(Enum::name)
                .toList();
@ -26,8 +22,7 @@ public class HsHostingAssetPropsController implements HsHostingAssetPropsApi {
    }

    @Override
-    @Timed("app.hosting.assets.api.getListOfHostingAssetTypeProps")
-    public ResponseEntity<List<Object>> getListOfHostingAssetTypeProps(
+    public ResponseEntity<List<Object>> listAssetTypeProps(
            final HsHostingAssetTypeResource assetType) {

        final Enum<HsHostingAssetType> type = HsHostingAssetType.of(assetType);
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRbacEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRbacEntity.java
@ -4,50 +4,50 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRbacEntity;
+import net.hostsharing.hsadminng.hs.booking.item.HsBookingItem;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;

 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import java.io.IOException;

-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.CaseDef.inCaseOf;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Nullable.NULLABLE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.GUEST;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.REFERRER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.TENANT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.CaseDef.inCaseOf;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+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;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.GUEST;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.REFERRER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.TENANT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;

@Entity
-@Table(schema = "hs_hosting", name = "asset_rv")
+@Table(name = "hs_hosting_asset_rv")
@SuperBuilder(toBuilder = true)
@Getter
@Setter
@NoArgsConstructor
 public class HsHostingAssetRbacEntity extends HsHostingAsset {

-    public static RbacSpec rbac() {
+    public static RbacView rbac() {
        return rbacViewFor("asset", HsHostingAssetRbacEntity.class)
                .withIdentityView(SQL.projection("identifier"))
                .withRestrictedViewOrderBy(SQL.expression("identifier"))
                .withUpdatableColumns("version", "caption", "config", "assignedToAssetUuid", "alarmContactUuid")
                .toRole(GLOBAL, ADMIN).grantPermission(INSERT) // TODO.impl: Why is this necessary to insert test data?

-                .importEntityAlias("bookingItem", HsBookingItemRbacEntity.class, usingDefaultCase(),
+                .importEntityAlias("bookingItem", HsBookingItem.class, usingDefaultCase(),
                        dependsOnColumn("bookingItemUuid"),
                        directlyFetchedByDependsOnColumn(),
                        NULLABLE)
@ -106,7 +106,7 @@ public class HsHostingAssetRbacEntity extends HsHostingAsset {
                        "parentAsset",
                        "assignedToAsset",
                        "alarmContact",
-                        "rbac.global");
+                        "global");
    }

    public static void main(String[] args) throws IOException {
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRbacRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRbacRepository.java
@ -1,7 +1,5 @@
 package net.hostsharing.hsadminng.hs.hosting.asset;

-import io.micrometer.core.annotation.Timed;
-import org.springframework.context.annotation.Profile;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

@ -9,13 +7,11 @@ import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
+
 public interface HsHostingAssetRbacRepository extends HsHostingAssetRepository<HsHostingAssetRbacEntity>, Repository<HsHostingAssetRbacEntity, UUID> {

-    @Timed("app.hostingAsset.repo.findByUuid.rbac")
    Optional<HsHostingAssetRbacEntity> findByUuid(final UUID serverUuid);

-    @Timed("app.hostingAsset.repo.findByIdentifier.rbac")
    List<HsHostingAssetRbacEntity> findByIdentifier(String assetIdentifier);

    @Query(value = """
@ -29,28 +25,23 @@ public interface HsHostingAssetRbacRepository extends HsHostingAssetRepository<H
               ha.parentassetuuid,
               ha.type,
               ha.version
-            from hs_hosting.asset_rv ha
-                left join hs_booking.item bi on bi.uuid = ha.bookingitemuuid
-                left join hs_hosting.asset pha on pha.uuid = ha.parentassetuuid
+            from hs_hosting_asset_rv ha
+                left join hs_booking_item bi on bi.uuid = ha.bookingitemuuid
+                left join hs_hosting_asset pha on pha.uuid = ha.parentassetuuid
            where (:projectUuid is null or bi.projectuuid=:projectUuid)
              and (:parentAssetUuid is null or pha.uuid=:parentAssetUuid)
              and (:type is null or :type=cast(ha.type as text))
    """, nativeQuery = true)
-    @Timed("app.hostingAsset.repo.findAllByCriteriaImpl.rbac")
    // The JPQL query did not generate "left join" but just "join".
-    // I also optimized the query by not using the _rv for hs_booking.item and hs_hosting.asset, only for hs_hosting.asset_rv.
+    // I also optimized the query by not using the _rv for hs_booking_item and hs_hosting_asset, only for hs_hosting_asset_rv.
    List<HsHostingAssetRbacEntity> findAllByCriteriaImpl(UUID projectUuid, UUID parentAssetUuid, String type);
-
    default List<HsHostingAssetRbacEntity> findAllByCriteria(final UUID projectUuid, final UUID parentAssetUuid, final HsHostingAssetType type) {
        return findAllByCriteriaImpl(projectUuid, parentAssetUuid, HsHostingAssetType.asString(type));
    }

-    @Timed("app.hostingAsset.repo.save.rbac")
    HsHostingAssetRbacEntity save(HsHostingAsset current);

-    @Timed("app.hostingAsset.repo.deleteByUuid.rbac")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.hostingAsset.repo.count.rbac")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRealEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRealEntity.java
@ -9,7 +9,7 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.Table;

@Entity
-@Table(schema = "hs_hosting", name = "asset")
+@Table(name = "hs_hosting_asset")
@SuperBuilder(builderMethodName = "genericBuilder", toBuilder = true)
@Getter
@Setter
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRealRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRealRepository.java
@ -1,37 +1,18 @@
 package net.hostsharing.hsadminng.hs.hosting.asset;

-import io.micrometer.core.annotation.Timed;
-import org.springframework.context.annotation.Profile;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

-import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
 public interface HsHostingAssetRealRepository extends HsHostingAssetRepository<HsHostingAssetRealEntity>, Repository<HsHostingAssetRealEntity, UUID> {

-    @Timed("app.hostingAsset.repo.findByUuid.real")
    Optional<HsHostingAssetRealEntity> findByUuid(final UUID serverUuid);

-    @Timed("app.hostingAsset.repo.findByIdentifier.real")
    List<HsHostingAssetRealEntity> findByIdentifier(String assetIdentifier);

-    default List<HsHostingAssetRealEntity> findByTypeAndIdentifier(@NotNull HsHostingAssetType type,  @NotNull String identifier) {
-        return findByTypeAndIdentifierImpl(type.name(), identifier);
-    }
-
-    @Query("""
-            select ha
-              from HsHostingAssetRealEntity ha
-             where cast(ha.type as String) = :type
-               and ha.identifier = :identifier
-            """)
-    @Timed("app.hostingAsset.repo.findByTypeAndIdentifierImpl.real")
-    List<HsHostingAssetRealEntity> findByTypeAndIdentifierImpl(@NotNull String type, @NotNull String identifier);
-
    @Query(value = """
        select ha.uuid,
               ha.alarmcontactuuid,
@ -43,28 +24,23 @@ public interface HsHostingAssetRealRepository extends HsHostingAssetRepository<H
               ha.parentassetuuid,
               ha.type,
               ha.version
-            from hs_hosting.asset_rv ha
-                left join hs_booking.item bi on bi.uuid = ha.bookingitemuuid
-                left join hs_hosting.asset pha on pha.uuid = ha.parentassetuuid
+            from hs_hosting_asset_rv ha
+                left join hs_booking_item bi on bi.uuid = ha.bookingitemuuid
+                left join hs_hosting_asset pha on pha.uuid = ha.parentassetuuid
            where (:projectUuid is null or bi.projectuuid=:projectUuid)
              and (:parentAssetUuid is null or pha.uuid=:parentAssetUuid)
              and (:type is null or :type=cast(ha.type as text))
    """, nativeQuery = true)
    // The JPQL query did not generate "left join" but just "join".
-    // I also optimized the query by not using the _rv for hs_booking.item and hs_hosting.asset, only for hs_hosting.asset_rv.
-    @Timed("app.hostingAsset.repo.findAllByCriteriaImpl.real")
+    // I also optimized the query by not using the _rv for hs_booking_item and hs_hosting_asset, only for hs_hosting_asset_rv.
    List<HsHostingAssetRealEntity> findAllByCriteriaImpl(UUID projectUuid, UUID parentAssetUuid, String type);
-
    default List<HsHostingAssetRealEntity> findAllByCriteria(final UUID projectUuid, final UUID parentAssetUuid, final HsHostingAssetType type) {
        return findAllByCriteriaImpl(projectUuid, parentAssetUuid, HsHostingAssetType.asString(type));
    }

-    @Timed("app.hostingAsset.repo.save.real")
    HsHostingAssetRealEntity save(HsHostingAssetRealEntity current);

-    @Timed("app.hostingAsset.repo.deleteByUuid.real")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.hostingAsset.repo.count.real")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRepository.java
@ -1,34 +1,24 @@
 package net.hostsharing.hsadminng.hs.hosting.asset;

-import io.micrometer.core.annotation.Timed;
-import org.springframework.context.annotation.Profile;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

-@Profile("!only-office")
 public interface HsHostingAssetRepository<E extends HsHostingAsset> {

-    @Timed("app.hosting.assets.repo.findByUuid")
    Optional<E> findByUuid(final UUID serverUuid);

-    @Timed("app.hosting.assets.repo.findByIdentifier")
    List<E> findByIdentifier(String assetIdentifier);

-    @Timed("app.hosting.assets.repo.findAllByCriteriaImpl")
    List<E> findAllByCriteriaImpl(UUID projectUuid, UUID parentAssetUuid, String type);

    default List<E> findAllByCriteria(final UUID projectUuid, final UUID parentAssetUuid, final HsHostingAssetType type) {
        return findAllByCriteriaImpl(projectUuid, parentAssetUuid, HsHostingAssetType.asString(type));
    }

-    @Timed("app.hosting.assets.repo.save")
    E save(HsHostingAsset current);

-    @Timed("app.hosting.assets.repo.deleteByUuid")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.hosting.assets.repo.count")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/DomainSetupHostingAssetFactory.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/DomainSetupHostingAssetFactory.java
@ -1,159 +0,0 @@
-package net.hostsharing.hsadminng.hs.hosting.asset.factories;
-
-import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsHostingAssetAutoInsertResource;
-import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsHostingAssetSubInsertResource;
-import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsHostingAssetTypeResource;
-import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRealEntity;
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAsset;
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetRealEntity;
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRealEntity;
-import net.hostsharing.hsadminng.lambda.Reducer;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
-import net.hostsharing.hsadminng.mapper.ToStringConverter;
-import net.hostsharing.hsadminng.persistence.EntityManagerWrapper;
-
-import jakarta.validation.ValidationException;
-import java.net.IDN;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Function;
-
-import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_DNS_SETUP;
-import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_HTTP_SETUP;
-import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_MBOX_SETUP;
-import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_SMTP_SETUP;
-
-public class DomainSetupHostingAssetFactory extends HostingAssetFactory {
-
-    public DomainSetupHostingAssetFactory(
-            final EntityManagerWrapper emw,
-            final HsBookingItemRealEntity newBookingItemRealEntity,
-            final HsHostingAssetAutoInsertResource asset,
-            final StrictMapper StrictMapper) {
-        super(emw, newBookingItemRealEntity, asset, StrictMapper);
-    }
-
-    @Override
-    protected HsHostingAsset create() {
-        final var domainSetupAsset = createDomainSetupAsset(getDomainName());
-        final var subHostingAssets = domainSetupAsset.getSubHostingAssets();
-
-        // TODO.legacy: as long as we need to be compatible, we always do all technical domain-setups
-
-        final var domainHttpSetupAssetResource = findSubHostingAssetResource(HsHostingAssetTypeResource.DOMAIN_HTTP_SETUP);
-        final var assignedToUnixUserAssetEntity = domainHttpSetupAssetResource
-                .map(HsHostingAssetSubInsertResource::getAssignedToAssetUuid)
-                .map(uuid -> emw.find(HsHostingAssetRealEntity.class, uuid))
-                .orElseThrow(() -> new ValidationException("DOMAIN_HTTP_SETUP subAsset with assignedToAssetUuid required in compatibility mode"));
-
-        subHostingAssets.add(
-                createDomainSubSetupAssetEntity(
-                        domainSetupAsset,
-                        DOMAIN_HTTP_SETUP,
-                        builder -> builder
-                                .assignedToAsset(assignedToUnixUserAssetEntity)
-                                .identifier(getDomainName() + "|HTTP")
-                                .caption("HTTP-Setup für " + IDN.toUnicode(getDomainName())))
-        );
-
-        // Do not add to subHostingAssets in compatibility mode, in this case, DNS setup works via file system.
-        // The entity is created just for validation purposes.
-        createDomainSubSetupAssetEntity(
-                domainSetupAsset,
-                DOMAIN_DNS_SETUP,
-                builder -> builder
-                        .assignedToAsset(assignedToUnixUserAssetEntity.getParentAsset())
-                        .identifier(getDomainName() + "|DNS")
-                        .caption("DNS-Setup für " + IDN.toUnicode(getDomainName())));
-
-        subHostingAssets.add(
-            createDomainSubSetupAssetEntity(
-                    domainSetupAsset,
-                    DOMAIN_MBOX_SETUP,
-                    builder -> builder
-                            .assignedToAsset(assignedToUnixUserAssetEntity.getParentAsset())
-                            .identifier(getDomainName() + "|MBOX")
-                            .caption("MBOX-Setup für " + IDN.toUnicode(getDomainName())))
-        );
-
-        subHostingAssets.add(
-            createDomainSubSetupAssetEntity(
-                    domainSetupAsset,
-                    DOMAIN_SMTP_SETUP,
-                    builder -> builder
-                            .assignedToAsset(assignedToUnixUserAssetEntity.getParentAsset())
-                            .identifier(getDomainName() + "|SMTP")
-                            .caption("SMTP-Setup für " + IDN.toUnicode(getDomainName())))
-        );
-
-        return domainSetupAsset;
-    }
-
-    private HsHostingAssetRealEntity createDomainSetupAsset(final String domainName) {
-        return HsHostingAssetRealEntity.builder()
-                .bookingItem(fromBookingItem)
-                .type(HsHostingAssetType.DOMAIN_SETUP)
-                .identifier(domainName)
-                .caption(asset.getCaption() != null ? asset.getCaption() : domainName)
-                .alarmContact(ref(HsOfficeContactRealEntity.class, asset.getAlarmContactUuid()))
-                // the sub-hosting-assets get added later
-                .build();
-    }
-
-    private HsHostingAssetRealEntity createDomainSubSetupAssetEntity(
-            final HsHostingAssetRealEntity domainSetupAsset,
-            final HsHostingAssetType subAssetType,
-            final Function<HsHostingAssetRealEntity.HsHostingAssetRealEntityBuilder<?, ?>, HsHostingAssetRealEntity.HsHostingAssetRealEntityBuilder<?, ?>> builderTransformer) {
-        final var resourceType = HsHostingAssetTypeResource.valueOf(subAssetType.name());
-
-        final var subAssetResourceOptional = findSubHostingAssetResource(resourceType);
-
-        subAssetResourceOptional.ifPresentOrElse(
-            this::verifyNotOverspecified,
-            () -> { throw new ValidationException("sub-asset of type " + resourceType.name() + " required in legacy mode, but missing"); }
-        );
-
-        return builderTransformer.apply(
-                        HsHostingAssetRealEntity.builder()
-                                .type(subAssetType)
-                                .parentAsset(domainSetupAsset))
-                .build();
-    }
-
-    private Optional<HsHostingAssetSubInsertResource> findSubHostingAssetResource(final HsHostingAssetTypeResource resourceType) {
-        return getSubHostingAssetResources().stream()
-                .filter(ha -> ha.getType() == resourceType)
-                .reduce(Reducer::toSingleElement);
-    }
-
-    // TODO.legacy: while we need to stay compatible, only default values can be used, thus only the type can be specified
-    private void verifyNotOverspecified(final HsHostingAssetSubInsertResource givenSubAssetResource) {
-        final var convert = new ToStringConverter().ignoring("assignedToAssetUuid");
-        final var expectedSubAssetResource = new HsHostingAssetSubInsertResource();
-        expectedSubAssetResource.setType(givenSubAssetResource.getType());
-        if ( !convert.from(givenSubAssetResource).equals(convert.from(expectedSubAssetResource)) ) {
-            throw new ValidationException("sub asset " + givenSubAssetResource.getType() + " is over-specified, in compatibility mode, only default values allowed");
-        }
-
-    }
-
-    private String getDomainName() {
-        return asset.getIdentifier();
-    }
-
-    private List<HsHostingAssetSubInsertResource> getSubHostingAssetResources() {
-        return asset.getSubHostingAssets();
-    }
-
-    @Override
-    protected void persist(final HsHostingAsset newHostingAsset) {
-        super.persist(newHostingAsset);
-        newHostingAsset.getSubHostingAssets().forEach(super::persist);
-    }
-
-    private <T> T ref(final Class<T> entityClass, final UUID uuid) {
-        return uuid != null ? emw.getReference(entityClass, uuid) : null;
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/HostingAssetFactory.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/HostingAssetFactory.java
@ -1,41 +0,0 @@
-package net.hostsharing.hsadminng.hs.hosting.asset.factories;
-
-import jakarta.validation.ValidationException;
-import lombok.RequiredArgsConstructor;
-import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsHostingAssetAutoInsertResource;
-import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRealEntity;
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAsset;
-import net.hostsharing.hsadminng.hs.hosting.asset.validators.HostingAssetEntitySaveProcessor;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
-import net.hostsharing.hsadminng.persistence.EntityManagerWrapper;
-
-
-@RequiredArgsConstructor
-abstract class HostingAssetFactory {
-
-    final EntityManagerWrapper emw;
-    final HsBookingItemRealEntity fromBookingItem;
-    final HsHostingAssetAutoInsertResource asset;
-    final StrictMapper StrictMapper;
-
-    protected abstract HsHostingAsset create();
-
-    public String createAndPersist() {
-        try {
-            final HsHostingAsset newHostingAsset = create();
-            persist(newHostingAsset);
-            return null;
-        } catch (final ValidationException exc) {
-            return exc.getMessage();
-        }
-    }
-
-    protected void persist(final HsHostingAsset newHostingAsset) {
-        new HostingAssetEntitySaveProcessor(emw, newHostingAsset)
-                .preprocessEntity()
-                .validateEntity()
-                .prepareForSave()
-                .save()
-                .validateContext();
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/HsBookingItemCreatedListener.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/HsBookingItemCreatedListener.java
@ -1,78 +0,0 @@
-package net.hostsharing.hsadminng.hs.hosting.asset.factories;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.validation.ValidationException;
-import jakarta.validation.constraints.NotNull;
-import lombok.SneakyThrows;
-import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsHostingAssetAutoInsertResource;
-import net.hostsharing.hsadminng.hs.booking.item.BookingItemCreatedAppEvent;
-import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRealEntity;
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAsset;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
-import net.hostsharing.hsadminng.persistence.EntityManagerWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Component;
-
-@Component
-@Profile("!only-office")
-public class HsBookingItemCreatedListener implements ApplicationListener<BookingItemCreatedAppEvent> {
-
-    @Autowired
-    private EntityManagerWrapper emw;
-
-    @Autowired
-    private ObjectMapper jsonMapper;
-
-    @Autowired
-    private StrictMapper StrictMapper;
-
-    @Override
-    @SneakyThrows
-    public void onApplicationEvent(@NotNull BookingItemCreatedAppEvent bookingItemCreatedAppEvent) {
-        if (containsAssetJson(bookingItemCreatedAppEvent)) {
-            createRelatedHostingAsset(bookingItemCreatedAppEvent);
-        }
-    }
-
-    private static boolean containsAssetJson(final BookingItemCreatedAppEvent bookingItemCreatedAppEvent) {
-        return bookingItemCreatedAppEvent.getEntity().getAssetJson() != null;
-    }
-
-    private void createRelatedHostingAsset(final BookingItemCreatedAppEvent event) throws JsonProcessingException {
-        final var newBookingItemRealEntity = event.getEntity().getBookingItem();
-        final var asset = jsonMapper.readValue(event.getEntity().getAssetJson(), HsHostingAssetAutoInsertResource.class);
-        final var factory = switch (newBookingItemRealEntity.getType()) {
-            case PRIVATE_CLOUD, CLOUD_SERVER, MANAGED_SERVER ->
-                    forNowNoAutomaticHostingAssetCreationPossible(emw, newBookingItemRealEntity, asset, StrictMapper);
-            case MANAGED_WEBSPACE -> new ManagedWebspaceHostingAssetFactory(emw, newBookingItemRealEntity, asset, StrictMapper);
-            case DOMAIN_SETUP -> new DomainSetupHostingAssetFactory(emw, newBookingItemRealEntity, asset, StrictMapper);
-        };
-        if (factory != null) {
-            final var statusMessage = factory.createAndPersist();
-            // TODO.impl: once we implement retry, we need to amend this code (persist/merge/delete)
-            if (statusMessage != null) {
-                event.getEntity().setStatusMessage(statusMessage);
-                emw.persist(event.getEntity());
-            }
-        }
-    }
-
-    private HostingAssetFactory forNowNoAutomaticHostingAssetCreationPossible(
-            final EntityManagerWrapper emw,
-            final HsBookingItemRealEntity fromBookingItem,
-            final HsHostingAssetAutoInsertResource asset,
-            final StrictMapper StrictMapper
-    ) {
-        return new HostingAssetFactory(emw, fromBookingItem, asset, StrictMapper) {
-
-            @Override
-            protected HsHostingAsset create() {
-                // TODO.impl: we should validate the asset JSON, but some violations are un-avoidable at that stage
-                throw new ValidationException("waiting for manual setup of hosting asset for booking item of type " + fromBookingItem.getType());
-            }
-        };
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/ManagedWebspaceHostingAssetFactory.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/factories/ManagedWebspaceHostingAssetFactory.java
@ -1,51 +0,0 @@
-package net.hostsharing.hsadminng.hs.hosting.asset.factories;
-
-import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsHostingAssetAutoInsertResource;
-import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsHostingAssetTypeResource;
-import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRealEntity;
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAsset;
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetRealEntity;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
-import net.hostsharing.hsadminng.persistence.EntityManagerWrapper;
-
-import jakarta.validation.ValidationException;
-
-import java.util.Optional;
-
-
-public class ManagedWebspaceHostingAssetFactory extends HostingAssetFactory {
-
-    public ManagedWebspaceHostingAssetFactory(
-            final EntityManagerWrapper emw,
-            final HsBookingItemRealEntity newBookingItemRealEntity,
-            final HsHostingAssetAutoInsertResource asset,
-            final StrictMapper StrictMapper) {
-        super(emw, newBookingItemRealEntity, asset, StrictMapper);
-    }
-
-    @Override
-    protected HsHostingAsset create() {
-        if (asset.getType() != HsHostingAssetTypeResource.MANAGED_WEBSPACE) {
-            throw new ValidationException("requires MANAGED_WEBSPACE hosting asset, but got " +
-                    Optional.of(asset)
-                            .map(HsHostingAssetAutoInsertResource::getType)
-                            .map(Enum::name)
-                            .orElse(null));
-        }
-        final var managedWebspaceHostingAsset = StrictMapper.map(asset, HsHostingAssetRealEntity.class);
-        managedWebspaceHostingAsset.setBookingItem(fromBookingItem);
-        emw.createQuery(
-                "SELECT asset FROM HsHostingAssetRealEntity asset WHERE asset.bookingItem.uuid=:bookingItemUuid",
-                HsHostingAssetRealEntity.class)
-                .setParameter("bookingItemUuid", fromBookingItem.getParentItem().getUuid())
-                .getResultStream().findFirst()
-                .ifPresent(managedWebspaceHostingAsset::setParentAsset);
-
-        return managedWebspaceHostingAsset;
-    }
-
-    @Override
-    protected void persist(final HsHostingAsset newManagedWebspaceHostingAsset) {
-        super.persist(newManagedWebspaceHostingAsset);
-    }
-}
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntitySaveProcessor.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntitySaveProcessor.java
@ -42,7 +42,7 @@ public class HostingAssetEntitySaveProcessor {
        return this;
    }

-    // TODO.legacy: remove once the migration of legacy data is done
+    // TODO.impl: remove once the migration of legacy data is done
    /// validates the entity itself including its properties, but ignoring some error messages for import of legacy data
    public HostingAssetEntitySaveProcessor validateEntityIgnoring(final String... ignoreRegExp) {
        step("validateEntity", "prepareForSave");
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainDnsSetupHostingAssetValidator.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainDnsSetupHostingAssetValidator.java
@ -15,7 +15,7 @@ import static net.hostsharing.hsadminng.hs.validation.BooleanProperty.booleanPro
 import static net.hostsharing.hsadminng.hs.validation.IntegerProperty.integerProperty;
 import static net.hostsharing.hsadminng.hs.validation.StringProperty.stringProperty;

-// TODO.legacy: make package private once we've migrated the legacy data
+// TODO.impl: make package private once we've migrated the legacy data
 public class HsDomainDnsSetupHostingAssetValidator extends HostingAssetEntityValidator {

    // according to  RFC 1035 (section 5) and RFC 1034
@ -33,7 +33,7 @@ public class HsDomainDnsSetupHostingAssetValidator extends HostingAssetEntityVal
            RR_REGEX_NAME  + RR_REGEX_IN + RR_REGEX_TTL + RR_RECORD_TYPE + RR_RECORD_DATA + RR_COMMENT;
    public static final String IDENTIFIER_SUFFIX = "|DNS";

-    private static List<String> zoneFileErrors = null; // TODO.legacy: remove once legacy data is migrated
+    private static List<String> zoneFileErrors = null; // TODO.impl: remove once legacy data is migrated

    HsDomainDnsSetupHostingAssetValidator() {
        super(
--- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsUnixUserHostingAssetValidator.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsUnixUserHostingAssetValidator.java
@ -53,7 +53,7 @@ class HsUnixUserHostingAssetValidator extends HostingAssetEntityValidator {
    }

    private static Integer computeUserId(final EntityManager em, final PropertiesProvider propertiesProvider) {
-        final Object result = em.createNativeQuery("SELECT nextval('hs_hosting.asset_unixuser_system_id_seq')", Integer.class)
+        final Object result = em.createNativeQuery("SELECT nextval('hs_hosting_asset_unixuser_system_id_seq')", Integer.class)
                .getSingleResult();
        return (Integer) result;
    }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java
@ -1,11 +1,10 @@
 package net.hostsharing.hsadminng.hs.office.bankaccount;

-import io.micrometer.core.annotation.Timed;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeBankAccountsApi;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeBankAccountInsertResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeBankAccountResource;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
+import net.hostsharing.hsadminng.mapper.Mapper;
 import org.iban4j.BicUtil;
 import org.iban4j.IbanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@ -25,19 +24,18 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {
    private Context context;

    @Autowired
-    private StrictMapper mapper;
+    private Mapper mapper;

    @Autowired
    private HsOfficeBankAccountRepository bankAccountRepo;

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.bankAccounts.api.patchDebitor")
-    public ResponseEntity<List<HsOfficeBankAccountResource>> getListOfBankAccounts(
-            final String currentSubject,
+    public ResponseEntity<List<HsOfficeBankAccountResource>> listBankAccounts(
+            final String currentUser,
            final String assumedRoles,
            final String holder) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entities = bankAccountRepo.findByOptionalHolderLike(holder);

@ -47,13 +45,12 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {

    @Override
    @Transactional
-    @Timed("app.office.bankAccounts.api.postNewBankAccount")
-    public ResponseEntity<HsOfficeBankAccountResource> postNewBankAccount(
-            final String currentSubject,
+    public ResponseEntity<HsOfficeBankAccountResource> addBankAccount(
+            final String currentUser,
            final String assumedRoles,
            final HsOfficeBankAccountInsertResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        IbanUtil.validate(body.getIban());
        BicUtil.validate(body.getBic());
@ -74,13 +71,12 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.bankAccounts.api.getSingleBankAccountByUuid")
-    public ResponseEntity<HsOfficeBankAccountResource> getSingleBankAccountByUuid(
-            final String currentSubject,
+    public ResponseEntity<HsOfficeBankAccountResource> getBankAccountByUuid(
+            final String currentUser,
            final String assumedRoles,
            final UUID bankAccountUuid) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = bankAccountRepo.findByUuid(bankAccountUuid);
        if (result.isEmpty()) {
@ -91,12 +87,11 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {

    @Override
    @Transactional
-    @Timed("app.office.bankAccounts.api.deleteBankAccountByUuid")
    public ResponseEntity<Void> deleteBankAccountByUuid(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID BankAccountUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = bankAccountRepo.deleteByUuid(BankAccountUuid);
        if (result == 0) {
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountEntity.java
@ -3,23 +3,23 @@ package net.hostsharing.hsadminng.hs.office.bankaccount;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
 import net.hostsharing.hsadminng.errors.DisplayAs;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;

 import jakarta.persistence.*;
 import java.io.IOException;
 import java.util.UUID;

-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.*;
-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

@Entity
-@Table(schema = "hs_office", name = "bankaccount_rv")
+@Table(name = "hs_office_bankaccount_rv")
@Getter
@Setter
@Builder
@ -57,12 +57,12 @@ public class HsOfficeBankAccountEntity implements BaseEntity<HsOfficeBankAccount
        return holder;
    }

-    public static RbacSpec rbac() {
+    public static RbacView rbac() {
        return rbacViewFor("bankAccount", HsOfficeBankAccountEntity.class)
                .withIdentityView(SQL.projection("iban"))
                .withUpdatableColumns("holder", "iban", "bic")

-                .toRole(GLOBAL, GUEST).grantPermission(INSERT)
+                .toRole("global", GUEST).grantPermission(INSERT)

                .createRole(OWNER, (with) -> {
                    with.owningUser(CREATOR);
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java
@ -1,6 +1,5 @@
 package net.hostsharing.hsadminng.hs.office.bankaccount;

-import io.micrometer.core.annotation.Timed;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

@ -10,31 +9,23 @@ import java.util.UUID;

 public interface HsOfficeBankAccountRepository extends Repository<HsOfficeBankAccountEntity, UUID> {

-    @Timed("app.office.bankAccounts.repo.findByUuid")
    Optional<HsOfficeBankAccountEntity> findByUuid(UUID id);

    @Query("""
            SELECT c FROM HsOfficeBankAccountEntity c
                WHERE lower(c.holder) like lower(concat(:holder, '%'))
                ORDER BY c.holder
-            """)
-    @Timed("app.office.bankAccounts.repo.findByOptionalHolderLikeImpl")
+               """)
    List<HsOfficeBankAccountEntity> findByOptionalHolderLikeImpl(String holder);
-
    default List<HsOfficeBankAccountEntity> findByOptionalHolderLike(String holder) {
        return findByOptionalHolderLikeImpl(holder == null ? "" : holder);
    }

-
-    @Timed("app.office.bankAccounts.repo.findByIbanOrderByIbanAsc")
    List<HsOfficeBankAccountEntity> findByIbanOrderByIbanAsc(String iban);

-    @Timed("app.office.bankAccounts.repo.save")
    <S extends HsOfficeBankAccountEntity> S save(S entity);

-    @Timed("app.office.bankAccounts.repo.deleteByUuid")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.office.bankAccounts.repo.count")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContact.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContact.java
@ -11,10 +11,9 @@ import lombok.experimental.FieldNameConstants;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.rbac.role.WithRoleId;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;

@ -28,7 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;

-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

@MappedSuperclass
@Getter
@ -38,7 +37,7 @@ import static net.hostsharing.hsadminng.repr.Stringify.stringify;
@SuperBuilder(toBuilder = true)
@FieldNameConstants
@DisplayAs("Contact")
-public class HsOfficeContact implements Stringifyable, BaseEntity<HsOfficeContact>, WithRoleId {
+public class HsOfficeContact implements Stringifyable, BaseEntity<HsOfficeContact> {

    private static Stringify<HsOfficeContact> toString = stringify(HsOfficeContact.class, "contact")
            .withProp(Fields.caption, HsOfficeContact::getCaption)
@ -55,14 +54,8 @@ public class HsOfficeContact implements Stringifyable, BaseEntity<HsOfficeContac
    @Column(name = "caption")
    private String caption;

-    @Builder.Default
-    @Setter(AccessLevel.NONE)
-    @Type(JsonType.class)
    @Column(name = "postaladdress")
-    private Map<String, String> postalAddress = new HashMap<>();
-
-    @Transient
-    private PatchableMapWrapper<String> postalAddressWrapper;
+    private String postalAddress; // multiline free-format text

    @Builder.Default
    @Setter(AccessLevel.NONE)
@ -82,17 +75,6 @@ public class HsOfficeContact implements Stringifyable, BaseEntity<HsOfficeContac
    @Transient
    private PatchableMapWrapper<String> phoneNumbersWrapper;

-    public PatchableMapWrapper<String> getPostalAddress() {
-        return PatchableMapWrapper.of(
-                postalAddressWrapper,
-                (newWrapper) -> {postalAddressWrapper = newWrapper;},
-                postalAddress);
-    }
-
-    public void putPostalAddress(Map<String, String> newPostalAddress) {
-        getPostalAddress().assign(newPostalAddress);
-    }
-
    public PatchableMapWrapper<String> getEmailAddresses() {
        return PatchableMapWrapper.of(
                emailAddressesWrapper,
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java
@ -1,7 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.contact;

-import io.micrometer.core.annotation.Timed;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
+import net.hostsharing.hsadminng.mapper.Mapper;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeContactsApi;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeContactInsertResource;
@ -17,7 +16,6 @@ import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;

-import static net.hostsharing.hsadminng.errors.Validate.validate;
 import static net.hostsharing.hsadminng.mapper.KeyValueMap.from;

@RestController
@ -28,25 +26,20 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
    private Context context;

    @Autowired
-    private StrictMapper mapper;
+    private Mapper mapper;

    @Autowired
    private HsOfficeContactRbacRepository contactRepo;

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.contacts.api.getListOfContacts")
-    public ResponseEntity<List<HsOfficeContactResource>> getListOfContacts(
-            final String currentSubject,
+    public ResponseEntity<List<HsOfficeContactResource>> listContacts(
+            final String currentUser,
            final String assumedRoles,
-            final String caption,
-            final String emailAddress) {
-        context.define(currentSubject, assumedRoles);
+            final String caption) {
+        context.define(currentUser, assumedRoles);

-        validate("caption, emailAddress").atMaxOne(caption, emailAddress);
-        final var entities = emailAddress != null
-             ? contactRepo.findContactByEmailAddress(emailAddress)
-             : contactRepo.findContactByOptionalCaptionLike(caption);
+        final var entities = contactRepo.findContactByOptionalCaptionLike(caption);

        final var resources = mapper.mapList(entities, HsOfficeContactResource.class);
        return ResponseEntity.ok(resources);
@ -54,13 +47,12 @@ public class HsOfficeContactController implements HsOfficeContactsApi {

    @Override
    @Transactional
-    @Timed("app.office.contacts.api.postNewContact")
-    public ResponseEntity<HsOfficeContactResource> postNewContact(
-            final String currentSubject,
+    public ResponseEntity<HsOfficeContactResource> addContact(
+            final String currentUser,
            final String assumedRoles,
            final HsOfficeContactInsertResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entityToSave = mapper.map(body, HsOfficeContactRbacEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);

@ -77,13 +69,12 @@ public class HsOfficeContactController implements HsOfficeContactsApi {

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.contacts.api.getSingleContactByUuid")
-    public ResponseEntity<HsOfficeContactResource> getSingleContactByUuid(
-            final String currentSubject,
+    public ResponseEntity<HsOfficeContactResource> getContactByUuid(
+            final String currentUser,
            final String assumedRoles,
            final UUID contactUuid) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = contactRepo.findByUuid(contactUuid);
        if (result.isEmpty()) {
@ -94,12 +85,11 @@ public class HsOfficeContactController implements HsOfficeContactsApi {

    @Override
    @Transactional
-    @Timed("app.office.contacts.api.deleteContactByUuid")
    public ResponseEntity<Void> deleteContactByUuid(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID contactUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = contactRepo.deleteByUuid(contactUuid);
        if (result == 0) {
@ -111,14 +101,13 @@ public class HsOfficeContactController implements HsOfficeContactsApi {

    @Override
    @Transactional
-    @Timed("app.office.contacts.api.patchContact")
    public ResponseEntity<HsOfficeContactResource> patchContact(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID contactUuid,
            final HsOfficeContactPatchResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var current = contactRepo.findByUuid(contactUuid).orElseThrow();

@ -131,7 +120,6 @@ public class HsOfficeContactController implements HsOfficeContactsApi {

    @SuppressWarnings("unchecked")
    final BiConsumer<HsOfficeContactInsertResource, HsOfficeContactRbacEntity> RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
-        entity.putPostalAddress(from(resource.getPostalAddress()));
        entity.putEmailAddresses(from(resource.getEmailAddresses()));
        entity.putPhoneNumbers(from(resource.getPhoneNumbers()));
    };
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactEntityPatcher.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactEntityPatcher.java
@ -18,8 +18,7 @@ class HsOfficeContactEntityPatcher implements EntityPatcher<HsOfficeContactPatch
    @Override
    public void apply(final HsOfficeContactPatchResource resource) {
        OptionalFromJson.of(resource.getCaption()).ifPresent(entity::setCaption);
-        Optional.ofNullable(resource.getPostalAddress())
-                .ifPresent(r -> entity.getPostalAddress().patch(KeyValueMap.from(resource.getPostalAddress())));
+        OptionalFromJson.of(resource.getPostalAddress()).ifPresent(entity::setPostalAddress);
        Optional.ofNullable(resource.getEmailAddresses())
                .ifPresent(r -> entity.getEmailAddresses().patch(KeyValueMap.from(resource.getEmailAddresses())));
        Optional.ofNullable(resource.getPhoneNumbers())
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacEntity.java
@ -3,20 +3,20 @@ package net.hostsharing.hsadminng.hs.office.contact;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.errors.DisplayAs;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;

 import jakarta.persistence.*;
 import java.io.IOException;

-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;

@Entity
-@Table(schema = "hs_office", name = "contact_rv")
+@Table(name = "hs_office_contact_rv")
@Getter
@Setter
@NoArgsConstructor
@ -24,7 +24,7 @@ import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
@DisplayAs("RbacContact")
 public class HsOfficeContactRbacEntity extends HsOfficeContact {

-    public static RbacSpec rbac() {
+    public static RbacView rbac() {
        return rbacViewFor("contact", HsOfficeContactRbacEntity.class)
                .withIdentityView(SQL.projection("caption"))
                .withUpdatableColumns("caption", "postalAddress", "emailAddresses", "phoneNumbers")
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacRepository.java
@ -1,6 +1,5 @@
 package net.hostsharing.hsadminng.hs.office.contact;

-import io.micrometer.core.annotation.Timed;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

@ -10,33 +9,18 @@ import java.util.UUID;

 public interface HsOfficeContactRbacRepository extends Repository<HsOfficeContactRbacEntity, UUID> {

-    @Timed("app.office.contacts.repo.findByUuid.rbac")
    Optional<HsOfficeContactRbacEntity> findByUuid(UUID id);

    @Query("""
            SELECT c FROM HsOfficeContactRbacEntity c
                WHERE :caption is null
                    OR c.caption like concat(cast(:caption as text), '%')
-            """)
-    @Timed("app.office.contacts.repo.findContactByOptionalCaptionLike.rbac")
+               """)
    List<HsOfficeContactRbacEntity> findContactByOptionalCaptionLike(String caption);

-    @Query(value = """
-            select c.* from hs_office.contact_rv c
-                where exists (
-                    SELECT 1 FROM jsonb_each_text(c.emailAddresses) AS kv(key, value)
-                        WHERE kv.value LIKE :emailAddressRegEx
-                )
-            """, nativeQuery = true)
-    @Timed("app.office.contacts.repo.findContactByEmailAddress.rbac")
-    List<HsOfficeContactRbacEntity> findContactByEmailAddress(final String emailAddressRegEx);
-
-    @Timed("app.office.contacts.repo.save.rbac")
    HsOfficeContactRbacEntity save(final HsOfficeContactRbacEntity entity);

-    @Timed("app.office.contacts.repo.deleteByUuid.rbac")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.office.contacts.repo.count.rbac")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRealEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRealEntity.java
@ -10,7 +10,7 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.Table;

@Entity
-@Table(schema = "hs_office", name = "contact")
+@Table(name = "hs_office_contact")
@Getter
@Setter
@NoArgsConstructor
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRealRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRealRepository.java
@ -1,6 +1,5 @@
 package net.hostsharing.hsadminng.hs.office.contact;

-import io.micrometer.core.annotation.Timed;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

@ -10,23 +9,18 @@ import java.util.UUID;

 public interface HsOfficeContactRealRepository extends Repository<HsOfficeContactRealEntity, UUID> {

-    @Timed("app.office.contacts.repo.findByUuid.real")
    Optional<HsOfficeContactRealEntity> findByUuid(UUID id);

    @Query("""
            SELECT c FROM HsOfficeContactRealEntity c
                WHERE :caption is null
                    OR c.caption like concat(cast(:caption as text), '%')
-            """)
-    @Timed("app.office.contacts.repo.findContactByOptionalCaptionLike.real")
+               """)
    List<HsOfficeContactRealEntity> findContactByOptionalCaptionLike(String caption);

-    @Timed("app.office.contacts.repo.save.real")
    HsOfficeContactRealEntity save(final HsOfficeContactRealEntity entity);

-    @Timed("app.office.contacts.repo.deleteByUuid.real")
    int deleteByUuid(final UUID uuid);

-    @Timed("app.office.contacts.repo.count.real")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java
@ -1,16 +1,10 @@
 package net.hostsharing.hsadminng.hs.office.coopassets;

-import io.micrometer.core.annotation.Timed;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.errors.MultiValidationException;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeCoopAssetsApi;
-import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionInsertResource;
-import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionResource;
-import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionTypeResource;
-import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
-import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipRepository;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
-import net.hostsharing.hsadminng.persistence.EntityManagerWrapper;
+import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.*;
+import net.hostsharing.hsadminng.errors.MultiValidationException;
+import net.hostsharing.hsadminng.mapper.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat.ISO;
@ -20,21 +14,13 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;

 import jakarta.persistence.EntityNotFoundException;
-import jakarta.validation.ValidationException;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;

-import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionType.REVERSAL;
-import static net.hostsharing.hsadminng.hs.office.coopassets.HsOfficeCoopAssetsTransactionType.TRANSFER;
-import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionTypeResource.CLEARING;
-import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionTypeResource.DEPOSIT;
-import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionTypeResource.DISBURSAL;
-import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionTypeResource.LOSS;
-import static net.hostsharing.hsadminng.lambda.WithNonNull.withNonNull;
+import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionTypeResource.*;

@RestController
 public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAssetsApi {
@ -43,55 +29,41 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
    private Context context;

    @Autowired
-    private StrictMapper mapper;
-
-    @Autowired
-    private EntityManagerWrapper emw;
+    private Mapper mapper;

    @Autowired
    private HsOfficeCoopAssetsTransactionRepository coopAssetsTransactionRepo;

-    @Autowired
-    private HsOfficeMembershipRepository membershipRepo;
-
    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.coopAssets.api.getListOfCoopAssets")
-    public ResponseEntity<List<HsOfficeCoopAssetsTransactionResource>> getListOfCoopAssets(
-            final String currentSubject,
+    public ResponseEntity<List<HsOfficeCoopAssetsTransactionResource>> listCoopAssets(
+            final String currentUser,
            final String assumedRoles,
            final UUID membershipUuid,
            final @DateTimeFormat(iso = ISO.DATE) LocalDate fromValueDate,
            final @DateTimeFormat(iso = ISO.DATE) LocalDate toValueDate) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entities = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(
                membershipUuid,
                fromValueDate,
                toValueDate);

-        final var resources = mapper.mapList(
-                entities,
-                HsOfficeCoopAssetsTransactionResource.class,
-                ENTITY_TO_RESOURCE_POSTMAPPER);
+        final var resources = mapper.mapList(entities, HsOfficeCoopAssetsTransactionResource.class);
        return ResponseEntity.ok(resources);
    }

    @Override
    @Transactional
-    @Timed("app.office.coopAssets.api.postNewCoopAssetTransaction")
-    public ResponseEntity<HsOfficeCoopAssetsTransactionResource> postNewCoopAssetTransaction(
-            final String currentSubject,
+    public ResponseEntity<HsOfficeCoopAssetsTransactionResource> addCoopAssetsTransaction(
+            final String currentUser,
            final String assumedRoles,
            final HsOfficeCoopAssetsTransactionInsertResource requestBody) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
        validate(requestBody);

-        final var entityToSave = mapper.map(
-                requestBody,
-                HsOfficeCoopAssetsTransactionEntity.class,
-                RESOURCE_TO_ENTITY_POSTMAPPER);
+        final var entityToSave = mapper.map(requestBody, HsOfficeCoopAssetsTransactionEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
        final var saved = coopAssetsTransactionRepo.save(entityToSave);

        final var uri =
@ -99,27 +71,23 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
                        .path("/api/hs/office/coopassetstransactions/{id}")
                        .buildAndExpand(saved.getUuid())
                        .toUri();
-        final var mapped = mapper.map(saved, HsOfficeCoopAssetsTransactionResource.class, ENTITY_TO_RESOURCE_POSTMAPPER);
+        final var mapped = mapper.map(saved, HsOfficeCoopAssetsTransactionResource.class);
        return ResponseEntity.created(uri).body(mapped);
    }

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.coopAssets.api.getSingleCoopAssetTransactionByUuid")
-    public ResponseEntity<HsOfficeCoopAssetsTransactionResource> getSingleCoopAssetTransactionByUuid(
-            final String currentSubject, final String assumedRoles, final UUID assetTransactionUuid) {

-        context.define(currentSubject, assumedRoles);
+    public ResponseEntity<HsOfficeCoopAssetsTransactionResource> getCoopAssetTransactionByUuid(
+        final String currentUser, final String assumedRoles, final UUID assetTransactionUuid) {
+
+        context.define(currentUser, assumedRoles);

        final var result = coopAssetsTransactionRepo.findByUuid(assetTransactionUuid);
        if (result.isEmpty()) {
            return ResponseEntity.notFound().build();
        }
-        final var resource = mapper.map(
-                result.get(),
-                HsOfficeCoopAssetsTransactionResource.class,
-                ENTITY_TO_RESOURCE_POSTMAPPER);
-        return ResponseEntity.ok(resource);
+        return ResponseEntity.ok(mapper.map(result.get(), HsOfficeCoopAssetsTransactionResource.class));

    }

@ -134,7 +102,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
    private static void validateDebitTransaction(
            final HsOfficeCoopAssetsTransactionInsertResource requestBody,
            final ArrayList<String> violations) {
-        if (List.of(DEPOSIT, HsOfficeCoopAssetsTransactionTypeResource.ADOPTION).contains(requestBody.getTransactionType())
+        if (List.of(DEPOSIT, ADOPTION).contains(requestBody.getTransactionType())
                && requestBody.getAssetValue().signum() < 0) {
            violations.add("for %s, assetValue must be positive but is \"%.2f\"".formatted(
                    requestBody.getTransactionType(), requestBody.getAssetValue()));
@ -144,8 +112,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
    private static void validateCreditTransaction(
            final HsOfficeCoopAssetsTransactionInsertResource requestBody,
            final ArrayList<String> violations) {
-        if (List.of(DISBURSAL, HsOfficeCoopAssetsTransactionTypeResource.TRANSFER, CLEARING, LOSS)
-                .contains(requestBody.getTransactionType())
+        if (List.of(DISBURSAL, TRANSFER, CLEARING, LOSS).contains(requestBody.getTransactionType())
                && requestBody.getAssetValue().signum() > 0) {
            violations.add("for %s, assetValue must be negative but is \"%.2f\"".formatted(
                    requestBody.getTransactionType(), requestBody.getAssetValue()));
@ -161,157 +128,10 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
        }
    }

-    // TODO.refa: this logic needs to get extracted to a service
-    final BiConsumer<HsOfficeCoopAssetsTransactionEntity, HsOfficeCoopAssetsTransactionResource> ENTITY_TO_RESOURCE_POSTMAPPER = (entity, resource) -> {
-        resource.setMembershipUuid(entity.getMembership().getUuid());
-        resource.setMembershipMemberNumber(entity.getMembership().getTaggedMemberNumber());
-
-        withNonNull(
-                resource.getReversalAssetTx(), reversalAssetTxResource -> {
-                    reversalAssetTxResource.setMembershipUuid(entity.getMembership().getUuid());
-                    reversalAssetTxResource.setMembershipMemberNumber(entity.getTaggedMemberNumber());
-                    reversalAssetTxResource.setRevertedAssetTxUuid(entity.getUuid());
-                    withNonNull(
-                            entity.getAdoptionAssetTx(), adoptionAssetTx ->
-                                    reversalAssetTxResource.setAdoptionAssetTxUuid(adoptionAssetTx.getUuid()));
-                    withNonNull(
-                            entity.getTransferAssetTx(), transferAssetTxResource ->
-                                    reversalAssetTxResource.setTransferAssetTxUuid(transferAssetTxResource.getUuid()));
-                });
-
-        withNonNull(
-                resource.getRevertedAssetTx(), revertAssetTxResource -> {
-                    revertAssetTxResource.setMembershipUuid(entity.getMembership().getUuid());
-                    revertAssetTxResource.setMembershipMemberNumber(entity.getTaggedMemberNumber());
-                    revertAssetTxResource.setReversalAssetTxUuid(entity.getUuid());
-                    withNonNull(
-                            entity.getRevertedAssetTx().getAdoptionAssetTx(), adoptionAssetTx ->
-                                    revertAssetTxResource.setAdoptionAssetTxUuid(adoptionAssetTx.getUuid()));
-                    withNonNull(
-                            entity.getRevertedAssetTx().getTransferAssetTx(), transferAssetTxResource ->
-                                    revertAssetTxResource.setTransferAssetTxUuid(transferAssetTxResource.getUuid()));
-                });
-
-        withNonNull(
-                resource.getAdoptionAssetTx(), adoptionAssetTxResource -> {
-                    adoptionAssetTxResource.setMembershipUuid(entity.getAdoptionAssetTx().getMembership().getUuid());
-                    adoptionAssetTxResource.setMembershipMemberNumber(entity.getAdoptionAssetTx().getTaggedMemberNumber());
-                    adoptionAssetTxResource.setTransferAssetTxUuid(entity.getUuid());
-                    withNonNull(
-                            entity.getAdoptionAssetTx().getReversalAssetTx(), reversalAssetTx ->
-                                    adoptionAssetTxResource.setReversalAssetTxUuid(reversalAssetTx.getUuid()));
-                });
-
-        withNonNull(
-                resource.getTransferAssetTx(), transferAssetTxResource -> {
-                    resource.getTransferAssetTx().setMembershipUuid(entity.getTransferAssetTx().getMembership().getUuid());
-                    resource.getTransferAssetTx()
-                            .setMembershipMemberNumber(entity.getTransferAssetTx().getTaggedMemberNumber());
-                    resource.getTransferAssetTx().setAdoptionAssetTxUuid(entity.getUuid());
-                    withNonNull(
-                            entity.getTransferAssetTx().getReversalAssetTx(), reversalAssetTx ->
-                                    transferAssetTxResource.setReversalAssetTxUuid(reversalAssetTx.getUuid()));
-                });
-    };
-
-    // TODO.refa: this logic needs to get extracted to a service
    final BiConsumer<HsOfficeCoopAssetsTransactionInsertResource, HsOfficeCoopAssetsTransactionEntity> RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
-
-        if (resource.getMembershipUuid() != null) {
-            final HsOfficeMembershipEntity membership = ofNullable(emw.find(
-                    HsOfficeMembershipEntity.class,
-                    resource.getMembershipUuid()))
-                    .orElseThrow(() -> new EntityNotFoundException("membership.uuid %s not found".formatted(
-                            resource.getMembershipUuid())));
-            entity.setMembership(membership);
-        }
-
-        if (entity.getTransactionType() == REVERSAL) {
-            if (resource.getRevertedAssetTxUuid() == null) {
-                throw new ValidationException("REVERSAL asset transaction requires revertedAssetTx.uuid");
-            }
-            final var revertedAssetTx = coopAssetsTransactionRepo.findByUuid(resource.getRevertedAssetTxUuid())
-                    .orElseThrow(() -> new EntityNotFoundException("revertedAssetTx.uuid %s not found".formatted(
-                            resource.getRevertedAssetTxUuid())));
-            revertedAssetTx.setReversalAssetTx(entity);
-            entity.setRevertedAssetTx(revertedAssetTx);
-            if (resource.getAssetValue().negate().compareTo(revertedAssetTx.getAssetValue()) != 0) {
-                throw new ValidationException("given assetValue=" + resource.getAssetValue() +
-                        " but must be negative value from reverted asset tx: " + revertedAssetTx.getAssetValue());
-            }
-
-            if (revertedAssetTx.getTransactionType() == TRANSFER) {
-                final var adoptionAssetTx = revertedAssetTx.getAdoptionAssetTx();
-                final var adoptionReversalAssetTx = HsOfficeCoopAssetsTransactionEntity.builder()
-                        .transactionType(REVERSAL)
-                        .membership(adoptionAssetTx.getMembership())
-                        .revertedAssetTx(adoptionAssetTx)
-                        .assetValue(adoptionAssetTx.getAssetValue().negate())
-                        .comment(resource.getComment())
-                        .reference(resource.getReference())
-                        .valueDate(resource.getValueDate())
-                        .build();
-                adoptionAssetTx.setReversalAssetTx(adoptionReversalAssetTx);
-                adoptionReversalAssetTx.setRevertedAssetTx(adoptionAssetTx);
-            }
-        }
-
-        if (resource.getTransactionType() == HsOfficeCoopAssetsTransactionTypeResource.TRANSFER) {
-            final var adoptingMembership = determineAdoptingMembership(resource);
-            if ( entity.getMembership() == adoptingMembership) {
-                throw new ValidationException("transferring and adopting membership must be different, but both are " +
-                        adoptingMembership.getTaggedMemberNumber());
-            }
-            final var adoptingAssetTx = createAdoptingAssetTx(entity, adoptingMembership);
-            entity.setAdoptionAssetTx(adoptingAssetTx);
+        if ( resource.getReverseEntryUuid() != null ) {
+            entity.setAdjustedAssetTx(coopAssetsTransactionRepo.findByUuid(resource.getReverseEntryUuid())
+                    .orElseThrow(() -> new EntityNotFoundException("ERROR: [400] reverseEntityUuid %s not found".formatted(resource.getReverseEntryUuid()))));
        }
    };
-
-    private HsOfficeMembershipEntity determineAdoptingMembership(final HsOfficeCoopAssetsTransactionInsertResource resource) {
-        final var adoptingMembershipUuid = resource.getAdoptingMembershipUuid();
-        final var adoptingMembershipMemberNumber = resource.getAdoptingMembershipMemberNumber();
-        if (adoptingMembershipUuid != null && adoptingMembershipMemberNumber != null) {
-            throw new ValidationException(
-                    // @formatter:off
-                resource.getTransactionType() == HsOfficeCoopAssetsTransactionTypeResource.TRANSFER
-                    ? "either adoptingMembership.uuid or adoptingMembership.memberNumber can be given, not both"
-                    : "adoptingMembership.uuid and adoptingMembership.memberNumber must not be given for transactionType="
-                            + resource.getTransactionType());
-                // @formatter:on
-        }
-
-        if (adoptingMembershipUuid != null) {
-            final var adoptingMembership = membershipRepo.findByUuid(adoptingMembershipUuid);
-            return adoptingMembership.orElseThrow(() ->
-                    new ValidationException(
-                            "adoptingMembership.uuid='" + adoptingMembershipUuid + "' not found or not accessible"));
-        }
-
-        if (adoptingMembershipMemberNumber != null) {
-            final var adoptingMemberNumber = Integer.valueOf(adoptingMembershipMemberNumber.substring("M-".length()));
-            final var adoptingMembership = membershipRepo.findMembershipByMemberNumber(adoptingMemberNumber);
-            return adoptingMembership.orElseThrow( () ->
-                    new ValidationException("adoptingMembership.memberNumber='" + adoptingMembershipMemberNumber
-                            + "' not found or not accessible")
-            );
-        }
-
-        throw new ValidationException(
-                "either adoptingMembership.uuid or adoptingMembership.memberNumber must be given for transactionType="
-                        + HsOfficeCoopAssetsTransactionTypeResource.TRANSFER);
-    }
-
-    private HsOfficeCoopAssetsTransactionEntity createAdoptingAssetTx(
-            final HsOfficeCoopAssetsTransactionEntity transferAssetTxEntity,
-            final HsOfficeMembershipEntity adoptingMembership) {
-        return HsOfficeCoopAssetsTransactionEntity.builder()
-                .membership(adoptingMembership)
-                .transactionType(HsOfficeCoopAssetsTransactionType.ADOPTION)
-                .transferAssetTx(transferAssetTxEntity)
-                .assetValue(transferAssetTxEntity.getAssetValue().negate())
-                .comment(transferAssetTxEntity.getComment())
-                .reference(transferAssetTxEntity.getReference())
-                .valueDate(transferAssetTxEntity.getValueDate())
-                .build();
-    }
-}
+};
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java
@ -1,3 +1,4 @@
+
 package net.hostsharing.hsadminng.hs.office.coopassets;

 import lombok.AllArgsConstructor;
@ -7,44 +8,33 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;
+import org.hibernate.annotations.GenericGenerator;

-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.Version;
+import jakarta.persistence.*;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.UUID;

 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

@Entity
-@Table(schema = "hs_office", name = "coopassettx_rv")
+@Table(name = "hs_office_coopassetstransaction_rv")
@Getter
@Setter
@Builder
@ -60,14 +50,13 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, BaseE
            .withProp(HsOfficeCoopAssetsTransactionEntity::getAssetValue)
            .withProp(HsOfficeCoopAssetsTransactionEntity::getReference)
            .withProp(HsOfficeCoopAssetsTransactionEntity::getComment)
-            .withProp(HsOfficeCoopAssetsTransactionEntity::getRevertedAssetTx)
-            .withProp(HsOfficeCoopAssetsTransactionEntity::getReversalAssetTx)
-            .withProp(HsOfficeCoopAssetsTransactionEntity::getAdoptionAssetTx)
-            .withProp(HsOfficeCoopAssetsTransactionEntity::getTransferAssetTx)
+            .withProp(at -> ofNullable(at.getAdjustedAssetTx()).map(HsOfficeCoopAssetsTransactionEntity::toShortString).orElse(null))
+            .withProp(at -> ofNullable(at.getAdjustmentAssetTx()).map(HsOfficeCoopAssetsTransactionEntity::toShortString).orElse(null))
            .quotedValues(false);

    @Id
-    @GeneratedValue
+    @GeneratedValue(generator = "UUID")
+    @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
    private UUID uuid;

    @Version
@ -88,7 +77,7 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, BaseE
     * The signed value which directly affects the booking balance.
     *
     * <p>This means, that a DEPOSIT is always positive, a DISBURSAL is always negative,
-     * but an REVERSAL can bei either positive or negative.
+     * but an ADJUSTMENT can bei either positive or negative.
     * See {@link HsOfficeCoopAssetsTransactionType} for</p> more information.
     */
    @Column(name = "assetvalue")
@ -106,23 +95,15 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, BaseE
    @Column(name = "comment")
    private String comment;

-    // Optionally, the UUID of the corresponding transaction for a reversal transaction.
+    /**
+     * Optionally, the UUID of the corresponding transaction for an adjustment transaction.
+     */
    @OneToOne
-    @JoinColumn(name = "revertedassettxuuid")
-    private HsOfficeCoopAssetsTransactionEntity revertedAssetTx;
+    @JoinColumn(name = "adjustedassettxuuid")
+    private HsOfficeCoopAssetsTransactionEntity adjustedAssetTx;

-    // and the other way around
-    @OneToOne(mappedBy = "revertedAssetTx", cascade = CascadeType.PERSIST)
-    private HsOfficeCoopAssetsTransactionEntity reversalAssetTx;
-
-    // Optionally, the UUID of the corresponding transaction for a transfer transaction.
-    @OneToOne(cascade = CascadeType.PERSIST)
-    @JoinColumn(name = "assetadoptiontxuuid")
-    private HsOfficeCoopAssetsTransactionEntity adoptionAssetTx;
-
-    // and the other way around
-    @OneToOne(mappedBy = "adoptionAssetTx", cascade = CascadeType.PERSIST)
-    private HsOfficeCoopAssetsTransactionEntity transferAssetTx;
+    @OneToOne(mappedBy = "adjustedAssetTx")
+    private HsOfficeCoopAssetsTransactionEntity adjustmentAssetTx;

    @Override
    public HsOfficeCoopAssetsTransactionEntity load() {
@ -131,15 +112,15 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, BaseE
        return this;
    }

+    public String getTaggedMemberNumber() {
+        return ofNullable(membership).map(HsOfficeMembershipEntity::toShortString).orElse("M-???????");
+    }
+
    @Override
    public String toString() {
        return stringify.apply(this);
    }

-    public String getTaggedMemberNumber() {
-        return ofNullable(membership).map(HsOfficeMembershipEntity::toShortString).orElse("M-???????");
-    }
-
    @Override
    public String toShortString() {
        return "%s:%.3s:%+1.2f".formatted(
@ -148,9 +129,9 @@ public class HsOfficeCoopAssetsTransactionEntity implements Stringifyable, BaseE
                ofNullable(assetValue).orElse(BigDecimal.ZERO));
    }

-    public static RbacSpec rbac() {
+    public static RbacView rbac() {
        return rbacViewFor("coopAssetsTransaction", HsOfficeCoopAssetsTransactionEntity.class)
-                .withIdentityView(SQL.projection("reference"))
+                .withIdentityView(RbacView.SQL.projection("reference"))
                .withUpdatableColumns("comment")
                .importEntityAlias("membership", HsOfficeMembershipEntity.class, usingDefaultCase(),
                        dependsOnColumn("membershipUuid"),
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepository.java
@ -1,6 +1,5 @@
 package net.hostsharing.hsadminng.hs.office.coopassets;

-import io.micrometer.core.annotation.Timed;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

@ -11,7 +10,6 @@ import java.util.UUID;

 public interface HsOfficeCoopAssetsTransactionRepository extends Repository<HsOfficeCoopAssetsTransactionEntity, UUID> {

-    @Timed("app.office.coopAssets.repo.findByUuid")
    Optional<HsOfficeCoopAssetsTransactionEntity> findByUuid(UUID id);

    @Query("""
@ -20,14 +18,11 @@ public interface HsOfficeCoopAssetsTransactionRepository extends Repository<HsOf
                    AND ( CAST(:fromValueDate AS java.time.LocalDate) IS NULL OR (at.valueDate >= :fromValueDate))
                    AND ( CAST(:toValueDate AS java.time.LocalDate)IS NULL OR (at.valueDate <= :toValueDate))
                ORDER BY at.membership.memberNumberSuffix, at.valueDate
-            """)
-    @Timed("app.office.coopAssets.repo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange")
+               """)
    List<HsOfficeCoopAssetsTransactionEntity> findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(
            UUID membershipUuid, LocalDate fromValueDate, LocalDate toValueDate);

-    @Timed("app.office.coopAssets.repo.save")
    HsOfficeCoopAssetsTransactionEntity save(final HsOfficeCoopAssetsTransactionEntity entity);

-    @Timed("app.office.coopAssets.repo.count")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionType.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionType.java
@ -4,7 +4,7 @@ public enum HsOfficeCoopAssetsTransactionType {
    /**
     * correction of wrong bookings, value can be positive or negative
     */
-    REVERSAL,
+    ADJUSTMENT,

    /**
     * payment received from member after signing shares, value >0
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java
@ -1,13 +1,12 @@
 package net.hostsharing.hsadminng.hs.office.coopshares;

-import io.micrometer.core.annotation.Timed;
+import jakarta.persistence.EntityNotFoundException;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.errors.MultiValidationException;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeCoopSharesApi;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionInsertResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionResource;
-import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipRepository;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
+import net.hostsharing.hsadminng.errors.MultiValidationException;
+import net.hostsharing.hsadminng.mapper.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat.ISO;
@ -24,7 +23,6 @@ import java.util.function.BiConsumer;

 import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionTypeResource.CANCELLATION;
 import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionTypeResource.SUBSCRIPTION;
-import static net.hostsharing.hsadminng.hs.validation.UuidResolver.resolve;

@RestController
 public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopSharesApi {
@ -33,52 +31,41 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
    private Context context;

    @Autowired
-    private StrictMapper mapper;
+    private Mapper mapper;

    @Autowired
    private HsOfficeCoopSharesTransactionRepository coopSharesTransactionRepo;

-    @Autowired
-    private HsOfficeMembershipRepository membershipRepo;
-
    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.coopShares.api.getListOfCoopShares")
-    public ResponseEntity<List<HsOfficeCoopSharesTransactionResource>> getListOfCoopShares(
-            final String currentSubject,
+    public ResponseEntity<List<HsOfficeCoopSharesTransactionResource>> listCoopShares(
+            final String currentUser,
            final String assumedRoles,
            final UUID membershipUuid,
            final @DateTimeFormat(iso = ISO.DATE) LocalDate fromValueDate,
            final @DateTimeFormat(iso = ISO.DATE) LocalDate toValueDate) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var entities = coopSharesTransactionRepo.findCoopSharesTransactionByOptionalMembershipUuidAndDateRange(
                membershipUuid,
                fromValueDate,
                toValueDate);

-        final var resources = mapper.mapList(
-                entities,
-                HsOfficeCoopSharesTransactionResource.class,
-                ENTITY_TO_RESOURCE_POSTMAPPER);
+        final var resources = mapper.mapList(entities, HsOfficeCoopSharesTransactionResource.class);
        return ResponseEntity.ok(resources);
    }

    @Override
    @Transactional
-    @Timed("app.office.coopShares.repo.postNewCoopSharesTransaction")
-    public ResponseEntity<HsOfficeCoopSharesTransactionResource> postNewCoopSharesTransaction(
-            final String currentSubject,
+    public ResponseEntity<HsOfficeCoopSharesTransactionResource> addCoopSharesTransaction(
+            final String currentUser,
            final String assumedRoles,
            final HsOfficeCoopSharesTransactionInsertResource requestBody) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
        validate(requestBody);

-        final var entityToSave = mapper.map(
-                requestBody,
-                HsOfficeCoopSharesTransactionEntity.class,
-                RESOURCE_TO_ENTITY_POSTMAPPER);
+        final var entityToSave = mapper.map(requestBody, HsOfficeCoopSharesTransactionEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);

        final var saved = coopSharesTransactionRepo.save(entityToSave);

@ -87,26 +74,22 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
                        .path("/api/hs/office/coopsharestransactions/{id}")
                        .buildAndExpand(saved.getUuid())
                        .toUri();
-        final var mapped = mapper.map(saved, HsOfficeCoopSharesTransactionResource.class, ENTITY_TO_RESOURCE_POSTMAPPER);
+        final var mapped = mapper.map(saved, HsOfficeCoopSharesTransactionResource.class);
        return ResponseEntity.created(uri).body(mapped);
    }

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.coopShares.repo.getSingleCoopShareTransactionByUuid")
-    public ResponseEntity<HsOfficeCoopSharesTransactionResource> getSingleCoopShareTransactionByUuid(
-            final String currentSubject, final String assumedRoles, final UUID shareTransactionUuid) {
+    public ResponseEntity<HsOfficeCoopSharesTransactionResource> getCoopShareTransactionByUuid(
+        final String currentUser, final String assumedRoles, final UUID shareTransactionUuid) {

-        context.define(currentSubject, assumedRoles);
+            context.define(currentUser, assumedRoles);

-        final var result = coopSharesTransactionRepo.findByUuid(shareTransactionUuid);
-        if (result.isEmpty()) {
-            return ResponseEntity.notFound().build();
-        }
-        return ResponseEntity.ok(mapper.map(
-                result.get(),
-                HsOfficeCoopSharesTransactionResource.class,
-                ENTITY_TO_RESOURCE_POSTMAPPER));
+            final var result = coopSharesTransactionRepo.findByUuid(shareTransactionUuid);
+            if (result.isEmpty()) {
+                return ResponseEntity.notFound().build();
+            }
+            return ResponseEntity.ok(mapper.map(result.get(), HsOfficeCoopSharesTransactionResource.class));

    }

@ -148,16 +131,9 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
    }

    final BiConsumer<HsOfficeCoopSharesTransactionInsertResource, HsOfficeCoopSharesTransactionEntity> RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
-        entity.setMembership(resolve("membership.uuid", resource.getMembershipUuid(), membershipRepo::findByUuid));
-        if (resource.getRevertedShareTxUuid() != null) {
-            entity.setRevertedShareTx(resolve(
-                    "revertedShareTx.uuid",
-                    resource.getRevertedShareTxUuid(),
-                    coopSharesTransactionRepo::findByUuid));
+        if ( resource.getAdjustedShareTxUuid() != null ) {
+            entity.setAdjustedShareTx(coopSharesTransactionRepo.findByUuid(resource.getAdjustedShareTxUuid())
+                .orElseThrow(() -> new EntityNotFoundException("ERROR: [400] adjustedShareTxUuid %s not found".formatted(resource.getAdjustedShareTxUuid()))));
        }
    };
-
-    final BiConsumer<HsOfficeCoopSharesTransactionEntity, HsOfficeCoopSharesTransactionResource> ENTITY_TO_RESOURCE_POSTMAPPER = (entity, resource) -> {
-        resource.setMembershipUuid(entity.getMembership().getUuid());
-    };
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java
@ -7,42 +7,32 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;

-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.Version;
+import jakarta.persistence.*;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.UUID;

 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

@Entity
-@Table(schema = "hs_office", name = "coopsharetx_rv")
+@Table(name = "hs_office_coopsharestransaction_rv")
@Getter
@Setter
@Builder
@ -58,8 +48,8 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, BaseE
            .withProp(HsOfficeCoopSharesTransactionEntity::getShareCount)
            .withProp(HsOfficeCoopSharesTransactionEntity::getReference)
            .withProp(HsOfficeCoopSharesTransactionEntity::getComment)
-            .withProp(at -> ofNullable(at.getRevertedShareTx()).map(HsOfficeCoopSharesTransactionEntity::toShortString).orElse(null))
-            .withProp(at -> ofNullable(at.getReversalShareTx()).map(HsOfficeCoopSharesTransactionEntity::toShortString).orElse(null))
+            .withProp(at -> ofNullable(at.getAdjustedShareTx()).map(HsOfficeCoopSharesTransactionEntity::toShortString).orElse(null))
+            .withProp(at -> ofNullable(at.getAdjustmentShareTx()).map(HsOfficeCoopSharesTransactionEntity::toShortString).orElse(null))
        .quotedValues(false);

    @Id
@ -81,7 +71,7 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, BaseE
     * The signed value which directly affects the booking balance.
     *
     * <p>This means, that a SUBSCRIPTION is always positive, a CANCELLATION is always negative,
-     * but an REVERSAL can bei either positive or negative.
+     * but an ADJUSTMENT can bei either positive or negative.
     * See {@link HsOfficeCoopSharesTransactionType} for</p> more information.
     */
    @Column(name = "valuedate")
@ -103,14 +93,14 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, BaseE
    private String comment;

    /**
-     * Optionally, the UUID of the corresponding transaction for a REVERSAL transaction.
+     * Optionally, the UUID of the corresponding transaction for an adjustment transaction.
     */
    @OneToOne
-    @JoinColumn(name = "revertedsharetxuuid")
-    private HsOfficeCoopSharesTransactionEntity revertedShareTx;
+    @JoinColumn(name = "adjustedsharetxuuid")
+    private HsOfficeCoopSharesTransactionEntity adjustedShareTx;

-    @OneToOne(mappedBy = "revertedShareTx")
-    private HsOfficeCoopSharesTransactionEntity reversalShareTx;
+    @OneToOne(mappedBy = "adjustedShareTx")
+    private HsOfficeCoopSharesTransactionEntity adjustmentShareTx;

    @Override
    public HsOfficeCoopSharesTransactionEntity load() {
@ -133,7 +123,7 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, BaseE
        return "%s:%.3s:%+d".formatted(getMemberNumberTagged(), transactionType, shareCount);
    }

-    public static RbacSpec rbac() {
+    public static RbacView rbac() {
        return rbacViewFor("coopSharesTransaction", HsOfficeCoopSharesTransactionEntity.class)
                .withIdentityView(SQL.projection("reference"))
                .withUpdatableColumns("comment")
@ -142,7 +132,6 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, BaseE
                        directlyFetchedByDependsOnColumn(),
                        NOT_NULL)

-                // the membership:ADMIN is not to be confused with the member itself, it's an account manager of the coop
                .toRole("membership", ADMIN).grantPermission(INSERT)
                .toRole("membership", ADMIN).grantPermission(UPDATE)
                .toRole("membership", AGENT).grantPermission(SELECT);
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepository.java
@ -1,6 +1,5 @@
 package net.hostsharing.hsadminng.hs.office.coopshares;

-import io.micrometer.core.annotation.Timed;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

@ -11,7 +10,6 @@ import java.util.UUID;

 public interface HsOfficeCoopSharesTransactionRepository extends Repository<HsOfficeCoopSharesTransactionEntity, UUID> {

-    @Timed("app.office.coopShares.repo.findByUuid")
    Optional<HsOfficeCoopSharesTransactionEntity> findByUuid(UUID id);

    @Query("""
@ -20,14 +18,11 @@ public interface HsOfficeCoopSharesTransactionRepository extends Repository<HsOf
                    AND ( CAST(:fromValueDate AS java.time.LocalDate) IS NULL OR (st.valueDate >= :fromValueDate))
                    AND ( CAST(:toValueDate AS java.time.LocalDate)IS NULL OR (st.valueDate <= :toValueDate))
                ORDER BY st.membership.memberNumberSuffix, st.valueDate
-            """)
-    @Timed("app.office.coopShares.repo.findCoopSharesTransactionByOptionalMembershipUuidAndDateRange")
+               """)
    List<HsOfficeCoopSharesTransactionEntity> findCoopSharesTransactionByOptionalMembershipUuidAndDateRange(
            UUID membershipUuid, LocalDate fromValueDate, LocalDate toValueDate);

-    @Timed("app.office.coopShares.repo.save")
    HsOfficeCoopSharesTransactionEntity save(final HsOfficeCoopSharesTransactionEntity entity);

-    @Timed("app.office.coopShares.repo.count")
    long count();
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionType.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionType.java
@ -2,9 +2,9 @@ package net.hostsharing.hsadminng.hs.office.coopshares;

 public enum HsOfficeCoopSharesTransactionType {
    /**
-     * reversal of wrong bookings, with either positive or negative value identical to reversed transaction
+     * correction of wrong bookings, with either positive or negative value
     */
-    REVERSAL,
+    ADJUSTMENT,

    /**
     * shares signed, e.g. with the declaration of accession, value >0
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java
@ -1,17 +1,14 @@
 package net.hostsharing.hsadminng.hs.office.debitor;

-import io.micrometer.core.annotation.Timed;
 import net.hostsharing.hsadminng.context.Context;
-import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountRepository;
-import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRealRepository;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeDebitorsApi;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeDebitorInsertResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeDebitorPatchResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeDebitorResource;
-import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRealRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealRepository;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
+import net.hostsharing.hsadminng.mapper.Mapper;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import org.apache.commons.lang3.Validate;
 import org.hibernate.Hibernate;
 import org.springframework.beans.factory.annotation.Autowired;
@ -25,11 +22,9 @@ import jakarta.persistence.PersistenceContext;
 import jakarta.validation.ValidationException;
 import java.util.List;
 import java.util.UUID;
-import java.util.function.BiConsumer;

+import static net.hostsharing.hsadminng.errors.DisplayAs.DisplayName;
 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.DEBITOR;
-import static net.hostsharing.hsadminng.hs.validation.UuidResolver.resolve;
-import static net.hostsharing.hsadminng.repr.TaggedNumber.cropTag;

@RestController

@ -39,122 +34,104 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
    private Context context;

    @Autowired
-    private StrictMapper mapper;
+    private Mapper mapper;

    @Autowired
    private HsOfficeDebitorRepository debitorRepo;

    @Autowired
-    private HsOfficeRelationRealRepository realRelRepo;
-
-    @Autowired
-    private HsOfficePersonRealRepository realPersonRepo;
-
-    @Autowired
-    private HsOfficeContactRealRepository realContactRepo;
-
-    @Autowired
-    private HsOfficeBankAccountRepository bankAccountRepo;
+    private HsOfficeRelationRealRepository relrealRepo;

    @PersistenceContext
    private EntityManager em;

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.debitors.api.getListOfDebitors")
-    public ResponseEntity<List<HsOfficeDebitorResource>> getListOfDebitors(
-            final String currentSubject,
+    public ResponseEntity<List<HsOfficeDebitorResource>> listDebitors(
+            final String currentUser,
            final String assumedRoles,
            final String name,
-            final UUID partnerUuid,
-            final String partnerNumber) {
-        context.define(currentSubject, assumedRoles);
+            final Integer debitorNumber) {
+        context.define(currentUser, assumedRoles);

-        final var entities = partnerNumber != null
-                ? debitorRepo.findDebitorsByPartnerNumber(cropTag("P-", partnerNumber))
-                : partnerUuid != null
-                ? debitorRepo.findDebitorsByPartnerUuid(partnerUuid)
-                : debitorRepo.findDebitorsByOptionalNameLike(name);
+        final var entities = debitorNumber != null
+                ? debitorRepo.findDebitorByDebitorNumber(debitorNumber)
+                : debitorRepo.findDebitorByOptionalNameLike(name);

-        final var resources = mapper.mapList(entities, HsOfficeDebitorResource.class, ENTITY_TO_RESOURCE_POSTMAPPER);
+        final var resources = mapper.mapList(entities, HsOfficeDebitorResource.class);
        return ResponseEntity.ok(resources);
    }

    @Override
    @Transactional
-    @Timed("app.office.debitors.api.postNewDebitor")
-    public ResponseEntity<HsOfficeDebitorResource> postNewDebitor(
-            String currentSubject,
+    public ResponseEntity<HsOfficeDebitorResource> addDebitor(
+            String currentUser,
            String assumedRoles,
            HsOfficeDebitorInsertResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

-        Validate.isTrue(
-                body.getDebitorRel() == null || body.getDebitorRelUuid() == null,
+        Validate.isTrue(body.getDebitorRel() == null || body.getDebitorRelUuid() == null,
                "ERROR: [400] exactly one of debitorRel and debitorRelUuid must be supplied, but found both");
-        Validate.isTrue(
-                body.getDebitorRel() != null || body.getDebitorRelUuid() != null,
+        Validate.isTrue(body.getDebitorRel() != null || body.getDebitorRelUuid() != null,
                "ERROR: [400] exactly one of debitorRel and debitorRelUuid must be supplied, but found none");
-        Validate.isTrue(
-                body.getDebitorRel() == null || body.getDebitorRel().getMark() == null,
+        Validate.isTrue(body.getDebitorRel() == null ||
+                    body.getDebitorRel().getType() == null || DEBITOR.name().equals(body.getDebitorRel().getType()),
+                "ERROR: [400] debitorRel.type must be '"+DEBITOR.name()+"' or null for default");
+        Validate.isTrue(body.getDebitorRel() == null || body.getDebitorRel().getMark() == null,
                "ERROR: [400] debitorRel.mark must be null");

-        final var entityToSave = mapper.map(body, HsOfficeDebitorEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
+        final var entityToSave = mapper.map(body, HsOfficeDebitorEntity.class);
+        if ( body.getDebitorRel() != null ) {
+            body.getDebitorRel().setType(DEBITOR.name());
+            final var debitorRel = mapper.map(body.getDebitorRel(), HsOfficeRelationRealEntity.class);
+            validateEntityExists("debitorRel.anchorUuid", debitorRel.getAnchor());
+            validateEntityExists("debitorRel.holderUuid", debitorRel.getHolder());
+            validateEntityExists("debitorRel.contactUuid", debitorRel.getContact());
+            entityToSave.setDebitorRel(relrealRepo.save(debitorRel));
+        } else {
+            final var debitorRelOptional = relrealRepo.findByUuid(body.getDebitorRelUuid());
+            debitorRelOptional.ifPresentOrElse(
+                    debitorRel -> {entityToSave.setDebitorRel(relrealRepo.save(debitorRel));},
+                    () -> { throw new ValidationException("Unable to find RealRelation by debitorRelUuid: " + body.getDebitorRelUuid());});
+        }

-        final var savedEntity = debitorRepo.save(entityToSave).reload(em);
+        final var savedEntity = debitorRepo.save(entityToSave);
+        em.flush();
+        em.refresh(savedEntity);

        final var uri =
                MvcUriComponentsBuilder.fromController(getClass())
                        .path("/api/hs/office/debitors/{id}")
                        .buildAndExpand(savedEntity.getUuid())
                        .toUri();
-        final var mapped = mapper.map(savedEntity, HsOfficeDebitorResource.class, ENTITY_TO_RESOURCE_POSTMAPPER);
+        final var mapped = mapper.map(savedEntity, HsOfficeDebitorResource.class);
        return ResponseEntity.created(uri).body(mapped);
    }

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.debitors.api.getSingleDebitorByUuid")
-    public ResponseEntity<HsOfficeDebitorResource> getSingleDebitorByUuid(
-            final String currentSubject,
+    public ResponseEntity<HsOfficeDebitorResource> getDebitorByUuid(
+            final String currentUser,
            final String assumedRoles,
            final UUID debitorUuid) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = debitorRepo.findByUuid(debitorUuid);
        if (result.isEmpty()) {
            return ResponseEntity.notFound().build();
        }
-        return ResponseEntity.ok(mapper.map(result.get(), HsOfficeDebitorResource.class, ENTITY_TO_RESOURCE_POSTMAPPER));
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    @Timed("app.office.debitors.api.getSingleDebitorByDebitorNumber")
-    public ResponseEntity<HsOfficeDebitorResource> getSingleDebitorByDebitorNumber(
-            final String currentSubject,
-            final String assumedRoles,
-            final Integer debitorNumber) {
-
-        context.define(currentSubject, assumedRoles);
-
-        final var result = debitorRepo.findDebitorByDebitorNumber(debitorNumber);
-        if (result.isEmpty()) {
-            return ResponseEntity.notFound().build();
-        }
-        return ResponseEntity.ok(mapper.map(result.get(), HsOfficeDebitorResource.class, ENTITY_TO_RESOURCE_POSTMAPPER));
+        return ResponseEntity.ok(mapper.map(result.get(), HsOfficeDebitorResource.class));
    }

    @Override
    @Transactional
-    @Timed("app.office.debitors.api.deleteDebitorByUuid")
    public ResponseEntity<Void> deleteDebitorByUuid(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID debitorUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = debitorRepo.deleteByUuid(debitorUuid);
        if (result == 0) {
@ -166,58 +143,32 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {

    @Override
    @Transactional
-    @Timed("app.office.debitors.api.patchDebitor")
    public ResponseEntity<HsOfficeDebitorResource> patchDebitor(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID debitorUuid,
            final HsOfficeDebitorPatchResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

-        final var current = debitorRepo.findByUuid(debitorUuid).orElseThrow().reload(em);
+        final var current = debitorRepo.findByUuid(debitorUuid).orElseThrow();

        new HsOfficeDebitorEntityPatcher(em, current).apply(body);

        final var saved = debitorRepo.save(current);
        Hibernate.initialize(saved);
-        final var mapped = mapper.map(saved, HsOfficeDebitorResource.class, ENTITY_TO_RESOURCE_POSTMAPPER);
+        final var mapped = mapper.map(saved, HsOfficeDebitorResource.class);
        return ResponseEntity.ok(mapped);
    }

-    final BiConsumer<HsOfficeDebitorInsertResource, HsOfficeDebitorEntity> RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
-        if (resource.getDebitorRel() != null) {
-            final var debitorRel = realRelRepo.save(HsOfficeRelationRealEntity.builder()
-                    .type(DEBITOR)
-                    .anchor(resolve(
-                            "debitorRel.anchor.uuid", resource.getDebitorRel().getAnchorUuid(), realPersonRepo::findByUuid))
-                    .holder(resolve(
-                            "debitorRel.holder.uuid", resource.getDebitorRel().getHolderUuid(), realPersonRepo::findByUuid))
-                    .contact(resolve(
-                            "debitorRel.contact.uuid", resource.getDebitorRel().getContactUuid(), realContactRepo::findByUuid))
-                    .build());
-            entity.setDebitorRel(debitorRel);
-        } else {
-            final var debitorRelOptional = realRelRepo.findByUuid(resource.getDebitorRelUuid());
-            debitorRelOptional.ifPresentOrElse(
-                    debitorRel -> {
-                        entity.setDebitorRel(realRelRepo.save(debitorRel));
-                        },
-                    () -> {
-                        throw new ValidationException(
-                                "Unable to find debitorRel.uuid: " + resource.getDebitorRelUuid());
-                    });
+    // TODO.impl: extract this to some generally usable class?
+    private <T extends BaseEntity<T>> T validateEntityExists(final String property, final T entitySkeleton) {
+        final var foundEntity = em.find(entitySkeleton.getClass(), entitySkeleton.getUuid());
+        if ( foundEntity == null) {
+            throw new ValidationException("Unable to find " + DisplayName.of(entitySkeleton) + " by " + property + ": " + entitySkeleton.getUuid());
        }

-        if (resource.getRefundBankAccountUuid() != null) {
-            entity.setRefundBankAccount(resolve(
-                    "refundBankAccount.uuid", resource.getRefundBankAccountUuid(), bankAccountRepo::findByUuid));
-        }
-
-    };
-
-    final BiConsumer<HsOfficeDebitorEntity, HsOfficeDebitorResource> ENTITY_TO_RESOURCE_POSTMAPPER = (entity, resource) -> {
-        resource.setDebitorNumber(entity.getTaggedDebitorNumber());
-        resource.getPartner().setPartnerNumber(entity.getPartner().getTaggedPartnerNumber());
-    };
+        //noinspection unchecked
+        return (T) foundEntity;
+    }
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java
@ -7,16 +7,16 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
-import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartner;
-import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRealEntity;
+import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelation;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;
+import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.JoinFormula;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
@ -40,21 +40,20 @@ import static jakarta.persistence.CascadeType.PERSIST;
 import static jakarta.persistence.CascadeType.REFRESH;
 import static java.util.Optional.ofNullable;
 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.DEBITOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.ColumnValue.usingCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Nullable.NULLABLE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL.fetchedBySql;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+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.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NULLABLE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.fetchedBySql;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

@Entity
-@Table(schema = "hs_office", name = "debitor_rv")
+@Table(name = "hs_office_debitor_rv")
@Getter
@Setter
@Builder(toBuilder = true)
@ -75,6 +74,7 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,

    @Id
    @GeneratedValue
+    @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
    private UUID uuid;

    @Version
@ -86,16 +86,16 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,
        value = """
            (
                SELECT DISTINCT partner.uuid
-                FROM hs_office.partner partner
-                JOIN hs_office.relation dRel
-                    ON dRel.uuid = debitorRelUuid AND dRel.type = 'DEBITOR'
-                JOIN hs_office.relation pRel
+                FROM hs_office_partner_rv partner
+                JOIN hs_office_relation_rv dRel
+                    ON dRel.uuid = debitorreluuid AND dRel.type = 'DEBITOR'
+                JOIN hs_office_relation_rv pRel
                    ON pRel.uuid = partner.partnerRelUuid AND pRel.type = 'PARTNER'
                WHERE pRel.holderUuid = dRel.anchorUuid
            )
            """)
-    @NotFound(action = NotFoundAction.EXCEPTION) // TODO.impl: map a simplified raw-PartnerEntity, just for the partner-number
-    private HsOfficePartnerRealEntity partner;
+    @NotFound(action = NotFoundAction.IGNORE) // TODO.impl: map a simplified raw-PartnerEntity, just for the partner-number
+    private HsOfficePartnerEntity partner;

    @Column(name = "debitornumbersuffix", length = 2)
    @Pattern(regexp = TWO_DECIMAL_DIGITS)
@ -131,7 +131,9 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,
    @Override
    public HsOfficeDebitorEntity load() {
        BaseEntity.super.load();
-        partner.load();
+        if (partner != null) {
+            partner.load();
+        }
        debitorRel.load();
        if (refundBankAccount != null) {
            refundBankAccount.load();
@ -139,14 +141,19 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,
        return this;
    }

-    public String getTaggedDebitorNumber() {
+    private String getDebitorNumberString() {
        return ofNullable(partner)
                .filter(partner -> debitorNumberSuffix != null)
-                .map(HsOfficePartner::getPartnerNumber)
-                .map(partnerNumber -> DEBITOR_NUMBER_TAG + partnerNumber + debitorNumberSuffix)
+                .map(HsOfficePartnerEntity::getPartnerNumber)
+                .map(Object::toString)
+                .map(partnerNumber -> partnerNumber + debitorNumberSuffix)
                .orElse(null);
    }

+    public Integer getDebitorNumber() {
+        return ofNullable(getDebitorNumberString()).map(Integer::parseInt).orElse(null);
+    }
+
    @Override
    public String toString() {
        return stringify.apply(this);
@ -154,22 +161,22 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,

    @Override
    public String toShortString() {
-        return getTaggedDebitorNumber();
+        return DEBITOR_NUMBER_TAG + getDebitorNumberString();
    }

-    public static RbacSpec rbac() {
+    public static RbacView rbac() {
        return rbacViewFor("debitor", HsOfficeDebitorEntity.class)
                .withIdentityView(SQL.query("""
                        SELECT debitor.uuid AS uuid,
                                    'D-' || (SELECT partner.partnerNumber
-                                            FROM hs_office.partner partner
-                                            JOIN hs_office.relation partnerRel
+                                            FROM hs_office_partner partner
+                                            JOIN hs_office_relation partnerRel
                                                ON partnerRel.uuid = partner.partnerRelUUid AND partnerRel.type = 'PARTNER'
-                                            JOIN hs_office.relation debitorRel
+                                            JOIN hs_office_relation debitorRel
                                                ON debitorRel.anchorUuid = partnerRel.holderUuid AND debitorRel.type = 'DEBITOR'
                                            WHERE debitorRel.uuid = debitor.debitorRelUuid)
                                         || debitorNumberSuffix as idName
-                        FROM hs_office.debitor AS debitor
+                        FROM hs_office_debitor AS debitor
                        """))
                .withRestrictedViewOrderBy(SQL.projection("defaultPrefix"))
                .withUpdatableColumns(
@ -181,7 +188,7 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,
                        "vatBusiness",
                        "vatReverseCharge",
                        "defaultPrefix")
-                .toRole(GLOBAL, ADMIN).grantPermission(INSERT)
+                .toRole("global", ADMIN).grantPermission(INSERT)

                .importRootEntityAliasProxy("debitorRel", HsOfficeRelationRbacEntity.class, usingCase(DEBITOR),
                        directlyFetchedByDependsOnColumn(),
@ -201,8 +208,8 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,
                        dependsOnColumn("debitorRelUuid"),
                        fetchedBySql("""
                                SELECT ${columns}
-                                    FROM hs_office.relation AS partnerRel
-                                    JOIN hs_office.relation AS debitorRel
+                                    FROM hs_office_relation AS partnerRel
+                                    JOIN hs_office_relation AS debitorRel
                                        ON debitorRel.type = 'DEBITOR' AND debitorRel.anchorUuid = partnerRel.holderUuid
                                    WHERE partnerRel.type = 'PARTNER'
                                        AND ${REF}.debitorRelUuid = debitorRel.uuid
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java
@ -1,7 +1,5 @@
 package net.hostsharing.hsadminng.hs.office.debitor;

-import io.micrometer.core.annotation.Timed;
-import net.hostsharing.hsadminng.lambda.Reducer;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;

@ -11,41 +9,28 @@ import java.util.UUID;

 public interface HsOfficeDebitorRepository extends Repository<HsOfficeDebitorEntity, UUID> {

-    @Timed("app.office.debitors.repo.findByUuid")
    Optional<HsOfficeDebitorEntity> findByUuid(UUID id);

-    @Timed("app.office.debitors.repo.findDebitorByPartnerUuid")
-    List<HsOfficeDebitorEntity> findDebitorsByPartnerUuid(UUID partnerUuid);
-
    @Query("""
            SELECT debitor FROM HsOfficeDebitorEntity debitor
-            JOIN HsOfficePartnerRealEntity partner
+            JOIN HsOfficePartnerEntity partner
                    ON partner.partnerRel.holder = debitor.debitorRel.anchor
                        AND partner.partnerRel.type = 'PARTNER' AND debitor.debitorRel.type = 'DEBITOR'
-                WHERE partner.partnerNumber = :partnerNumber
-                  AND (:debitorNumberSuffix IS NULL OR debitor.debitorNumberSuffix = :debitorNumberSuffix)
-            """)
-    @Timed("app.office.debitors.repo.findDebitorByPartnerNumberAndDebitorNumberSuffix")
-    List<HsOfficeDebitorEntity> findDebitorByPartnerNumberAndOptionalDebitorNumberSuffix(int partnerNumber, String debitorNumberSuffix);
+                WHERE cast(partner.partnerNumber as integer) = :partnerNumber
+                  AND cast(debitor.debitorNumberSuffix as integer) = :debitorNumberSuffix
+               """)
+     List<HsOfficeDebitorEntity> findDebitorByDebitorNumber(int partnerNumber, byte debitorNumberSuffix);

-    default Optional<HsOfficeDebitorEntity> findDebitorByDebitorNumber(int debitorNumber) {
-        final var partnerNumber = debitorNumber / 100;
-        final String suffix = String.format("%02d", debitorNumber % 100);
-        final var result = findDebitorByPartnerNumberAndOptionalDebitorNumberSuffix(partnerNumber, suffix);
-        return result.stream().reduce(Reducer::toSingleElement);
-    }
-
-    default List<HsOfficeDebitorEntity> findDebitorsByPartnerNumber(int partnerNumber) {
-        final var result = findDebitorByPartnerNumberAndOptionalDebitorNumberSuffix(partnerNumber, null);
-        return result;
+    default List<HsOfficeDebitorEntity> findDebitorByDebitorNumber(int debitorNumber) {
+        return  findDebitorByDebitorNumber( debitorNumber/100, (byte) (debitorNumber%100));
    }

    @Query("""
            SELECT debitor FROM HsOfficeDebitorEntity debitor
-                JOIN HsOfficePartnerRealEntity partner
+                JOIN HsOfficePartnerEntity partner
                    ON partner.partnerRel.holder = debitor.debitorRel.anchor
                        AND partner.partnerRel.type = 'PARTNER' AND debitor.debitorRel.type = 'DEBITOR'
-                JOIN HsOfficePersonRealEntity person
+                JOIN HsOfficePersonEntity person
                    ON person.uuid = partner.partnerRel.holder.uuid
                        OR person.uuid = debitor.debitorRel.holder.uuid
                JOIN HsOfficeContactRealEntity contact
@ -58,15 +43,11 @@ public interface HsOfficeDebitorRepository extends Repository<HsOfficeDebitorEnt
                    OR person.givenName like concat(cast(:name as text), '%')
                    OR contact.caption like concat(cast(:name as text), '%')
               """)
-    @Timed("app.office.debitors.repo.findDebitorByOptionalNameLike")
-    List<HsOfficeDebitorEntity> findDebitorsByOptionalNameLike(String name);
+    List<HsOfficeDebitorEntity> findDebitorByOptionalNameLike(String name);

-    @Timed("app.office.debitors.repo.save")
    HsOfficeDebitorEntity save(final HsOfficeDebitorEntity entity);

-    @Timed("app.office.debitors.repo.count")
    long count();

-    @Timed("app.office.debitors.repo.deleteByUuid")
    int deleteByUuid(UUID uuid);
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java
@ -1,79 +1,62 @@
 package net.hostsharing.hsadminng.hs.office.membership;

-import io.micrometer.core.annotation.Timed;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeMembershipsApi;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeMembershipInsertResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeMembershipPatchResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeMembershipResource;
-import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRbacEntity;
-import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRealRepository;
-import net.hostsharing.hsadminng.mapper.StrictMapper;
+import net.hostsharing.hsadminng.mapper.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;

-import jakarta.persistence.EntityNotFoundException;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;

-import static net.hostsharing.hsadminng.errors.Validate.validate;
-import static net.hostsharing.hsadminng.repr.TaggedNumber.cropTag;
-
@RestController
+
 public class HsOfficeMembershipController implements HsOfficeMembershipsApi {

    @Autowired
    private Context context;

    @Autowired
-    private StrictMapper mapper;
-
-    @Autowired
-    private HsOfficePartnerRealRepository partnerRepo;
+    private Mapper mapper;

    @Autowired
    private HsOfficeMembershipRepository membershipRepo;

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.membership.api.getListOfMemberships")
-    public ResponseEntity<List<HsOfficeMembershipResource>> getListOfMemberships(
-            final String currentSubject,
+    public ResponseEntity<List<HsOfficeMembershipResource>> listMemberships(
+            final String currentUser,
            final String assumedRoles,
-            final UUID partnerUuid,
-            final String partnerNumber) {
-        context.define(currentSubject, assumedRoles);
+            UUID partnerUuid,
+            Integer memberNumber) {
+        context.define(currentUser, assumedRoles);

-        validate("partnerUuid, partnerNumber").atMaxOne(partnerUuid, partnerNumber);
+        final var entities = ( memberNumber != null)
+                    ? List.of(membershipRepo.findMembershipByMemberNumber(memberNumber))
+                    : membershipRepo.findMembershipsByOptionalPartnerUuid(partnerUuid);

-        final var entities = partnerNumber != null
-                ? membershipRepo.findMembershipsByPartnerNumber(
-                        cropTag(HsOfficePartnerRbacEntity.PARTNER_NUMBER_TAG, partnerNumber))
-                : partnerUuid != null
-                    ? membershipRepo.findMembershipsByPartnerUuid(partnerUuid)
-                    : membershipRepo.findAll();
-
-        final var resources = mapper.mapList(
-                entities, HsOfficeMembershipResource.class,
+        final var resources = mapper.mapList(entities, HsOfficeMembershipResource.class,
                SEPA_MANDATE_ENTITY_TO_RESOURCE_POSTMAPPER);
        return ResponseEntity.ok(resources);
    }

    @Override
    @Transactional
-    @Timed("app.office.membership.api.postNewMembership")
-    public ResponseEntity<HsOfficeMembershipResource> postNewMembership(
-            final String currentSubject,
+    public ResponseEntity<HsOfficeMembershipResource> addMembership(
+            final String currentUser,
            final String assumedRoles,
            final HsOfficeMembershipInsertResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

-        final var entityToSave = mapper.map(body, HsOfficeMembershipEntity.class, SEPA_MANDATE_RESOURCE_TO_ENTITY_POSTMAPPER);
+        final var entityToSave = mapper.map(body, HsOfficeMembershipEntity.class);

        final var saved = membershipRepo.save(entityToSave);

@ -82,58 +65,35 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
                        .path("/api/hs/office/memberships/{id}")
                        .buildAndExpand(saved.getUuid())
                        .toUri();
-        final var mapped = mapper.map(
-                saved, HsOfficeMembershipResource.class,
+        final var mapped = mapper.map(saved, HsOfficeMembershipResource.class,
                SEPA_MANDATE_ENTITY_TO_RESOURCE_POSTMAPPER);
        return ResponseEntity.created(uri).body(mapped);
    }

    @Override
    @Transactional(readOnly = true)
-    @Timed("app.office.membership.api.getSingleMembershipByUuid")
-    public ResponseEntity<HsOfficeMembershipResource> getSingleMembershipByUuid(
-            final String currentSubject,
+    public ResponseEntity<HsOfficeMembershipResource> getMembershipByUuid(
+            final String currentUser,
            final String assumedRoles,
            final UUID membershipUuid) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = membershipRepo.findByUuid(membershipUuid);
        if (result.isEmpty()) {
            return ResponseEntity.notFound().build();
        }
-        return ResponseEntity.ok(mapper.map(
-                result.get(), HsOfficeMembershipResource.class,
-                SEPA_MANDATE_ENTITY_TO_RESOURCE_POSTMAPPER));
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    @Timed("app.office.membership.api.getSingleMembershipByMembershipNumber")
-    public ResponseEntity<HsOfficeMembershipResource> getSingleMembershipByMembershipNumber(
-            final String currentSubject,
-            final String assumedRoles,
-            final Integer membershipNumber) {
-
-        context.define(currentSubject, assumedRoles);
-
-        final var result = membershipRepo.findMembershipByMemberNumber(membershipNumber);
-        if (result.isEmpty()) {
-            return ResponseEntity.notFound().build();
-        }
-        return ResponseEntity.ok(mapper.map(
-                result.get(), HsOfficeMembershipResource.class,
+        return ResponseEntity.ok(mapper.map(result.get(), HsOfficeMembershipResource.class,
                SEPA_MANDATE_ENTITY_TO_RESOURCE_POSTMAPPER));
    }

    @Override
    @Transactional
-    @Timed("app.office.membership.api.deleteMembershipByUuid")
    public ResponseEntity<Void> deleteMembershipByUuid(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID membershipUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var result = membershipRepo.deleteByUuid(membershipUuid);
        if (result == 0) {
@ -145,14 +105,13 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {

    @Override
    @Transactional
-    @Timed("app.office.membership.api.patchMembership")
    public ResponseEntity<HsOfficeMembershipResource> patchMembership(
-            final String currentSubject,
+            final String currentUser,
            final String assumedRoles,
            final UUID membershipUuid,
            final HsOfficeMembershipPatchResource body) {

-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);

        final var current = membershipRepo.findByUuid(membershipUuid).orElseThrow();

@ -164,17 +123,10 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
    }

    final BiConsumer<HsOfficeMembershipEntity, HsOfficeMembershipResource> SEPA_MANDATE_ENTITY_TO_RESOURCE_POSTMAPPER = (entity, resource) -> {
-        resource.setMemberNumber(entity.getTaggedMemberNumber());
+        // TODO.refa: this should be possible via ModelMapper config
        resource.setValidFrom(entity.getValidity().lower());
        if (entity.getValidity().hasUpperBound()) {
            resource.setValidTo(entity.getValidity().upper().minusDays(1));
        }
-        resource.getPartner().setPartnerNumber(entity.getPartner().getTaggedPartnerNumber()); // TODO.refa: use partner mapper?
-    };
-
-    final BiConsumer<HsOfficeMembershipInsertResource, HsOfficeMembershipEntity> SEPA_MANDATE_RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
-        entity.setPartner(partnerRepo.findByUuid(resource.getPartnerUuid())
-                .orElseThrow(() -> new EntityNotFoundException(
-                        "ERROR: [400] partnerUuid %s not found".formatted(resource.getPartnerUuid()))));
    };
 }
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java
@ -8,14 +8,13 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.hostsharing.hsadminng.errors.DisplayAs;
-import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerRealEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
-import net.hostsharing.hsadminng.persistence.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec;
-import net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL;
-import net.hostsharing.hsadminng.rbac.role.WithRoleId;
-import net.hostsharing.hsadminng.repr.Stringify;
-import net.hostsharing.hsadminng.repr.Stringifyable;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
+import net.hostsharing.hsadminng.stringify.Stringify;
+import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.Type;

 import jakarta.persistence.Column;
@ -39,32 +38,31 @@ import static io.hypersistence.utils.hibernate.type.range.Range.emptyRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.lowerInclusiveFromPostgresDateRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.toPostgresDateRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.upperInclusiveFromPostgresDateRange;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.Role.TENANT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.SQL.fetchedBySql;
-import static net.hostsharing.hsadminng.rbac.generator.RbacSpec.rbacViewFor;
-import static net.hostsharing.hsadminng.repr.Stringify.stringify;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.TENANT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.fetchedBySql;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.stringify.Stringify.stringify;

@Entity
-@Table(schema = "hs_office", name = "membership_rv")
+@Table(name = "hs_office_membership_rv")
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@DisplayAs("Membership")
-public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEntity>, Stringifyable, WithRoleId {
+public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEntity>, Stringifyable {

    public static final String MEMBER_NUMBER_TAG = "M-";
    public static final String TWO_DECIMAL_DIGITS = "^([0-9]{2})$";
@ -85,7 +83,7 @@ public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEn

    @ManyToOne(fetch = FetchType.LAZY)
    @JoinColumn(name = "partneruuid")
-    private HsOfficePartnerRealEntity partner;
+    private HsOfficePartnerEntity partner;

    @Column(name = "membernumbersuffix", length = 2)
    @Pattern(regexp = TWO_DECIMAL_DIGITS)
@ -131,7 +129,6 @@ public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEn
        }
        return validity;
    }
-
    public Integer getMemberNumber() {
        if (partner == null || partner.getPartnerNumber() == null || memberNumberSuffix == null ) {
            return null;
@ -140,10 +137,6 @@ public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEn
        return getPartner().getPartnerNumber() * 100 + Integer.parseInt(memberNumberSuffix, 10);
    }

-    public String getTaggedMemberNumber() {
-        return MEMBER_NUMBER_TAG + getMemberNumber();
-    }
-
    @Override
    public String toString() {
        return stringify.apply(this);
@ -161,13 +154,13 @@ public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEn
        }
    }

-    public static RbacSpec rbac() {
+    public static RbacView rbac() {
        return rbacViewFor("membership", HsOfficeMembershipEntity.class)
                .withIdentityView(SQL.query("""
                        SELECT m.uuid AS uuid,
                                'M-' || p.partnerNumber || m.memberNumberSuffix as idName
-                        FROM hs_office.membership AS m
-                        JOIN hs_office.partner AS p ON p.uuid = m.partnerUuid
+                        FROM hs_office_membership AS m
+                        JOIN hs_office_partner AS p ON p.uuid = m.partnerUuid
                        """))
                .withRestrictedViewOrderBy(SQL.projection("validity"))
                .withUpdatableColumns("validity", "membershipFeeBillable", "status")
@ -176,12 +169,12 @@ public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEn
                        dependsOnColumn("partnerUuid"),
                        fetchedBySql("""
                                SELECT ${columns}
-                                    FROM hs_office.partner AS partner
-                                    JOIN hs_office.relation AS partnerRel ON partnerRel.uuid = partner.partnerRelUuid
+                                    FROM hs_office_partner AS partner
+                                    JOIN hs_office_relation AS partnerRel ON partnerRel.uuid = partner.partnerRelUuid
                                    WHERE partner.uuid = ${REF}.partnerUuid
                                """),
                        NOT_NULL)
-                .toRole(GLOBAL, ADMIN).grantPermission(INSERT)
+                .toRole("global", ADMIN).grantPermission(INSERT)

                .createRole(OWNER, (with) -> {
                    with.owningUser(CREATOR);
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcher.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntityPatcher.java
@ -2,18 +2,18 @@ package net.hostsharing.hsadminng.hs.office.membership;

 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeMembershipPatchResource;
 import net.hostsharing.hsadminng.mapper.EntityPatcher;
+import net.hostsharing.hsadminng.mapper.Mapper;
 import net.hostsharing.hsadminng.mapper.OptionalFromJson;
-import net.hostsharing.hsadminng.mapper.StrictMapper;

 import java.util.Optional;

 public class HsOfficeMembershipEntityPatcher implements EntityPatcher<HsOfficeMembershipPatchResource> {

-    private final StrictMapper mapper;
+    private final Mapper mapper;
    private final HsOfficeMembershipEntity entity;

    public HsOfficeMembershipEntityPatcher(
-            final StrictMapper mapper,
+            final Mapper mapper,
            final HsOfficeMembershipEntity entity) {
        this.mapper = mapper;
        this.entity = entity;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Hönnig	0fb3ecb9da	improve setup documentation	2024-09-13 06:29:37 +02:00
Michael	45994b2f48	Merge remote-tracking branch 'refs/remotes/origin/master' into java-for-gradlew # Conflicts: # README.md	2024-09-12 14:14:48 +02:00
mi	81f26c412f	java for gradlew in README.md	2024-01-30 13:55:03 +01:00
				`@ -1 +0,0 @@`
				`find the generated ScenarioReports in build/doc/scenarios`