feature/run-office-module-without-booking-and-hosting (#148)

Co-authored-by: Michael Hoennig <michael@hoennig.de> Co-authored-by: Timotheus Pokorra <timotheus.pokorra@hostsharing.net> Co-authored-by: Timotheus Pokorra <timotheus.pokorra@solidcharity.com> Reviewed-on: https://dev.hostsharing.net/hostsharing/hs.hsadmin.ng/pulls/148 Reviewed-by: Marc Sandlus <marc.sandlus@hostsharing.net>
2025-01-21 14:36:49 +01:00
parent ad61f2af59
commit c1d3d583e7
91 changed files with 643 additions and 101 deletions
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,17 +8,33 @@ management:
    endpoints:
        web:
            exposure:
-                # HOWTO: view _clickable_ Spring Actuator (Micrometer) Metrics endpoints: http://localhost:8081/actuator/metric-links
-                include: info, health, metrics, metric-links, mappings, openapi, swaggerui
+                # HOWTO: view _clickable_ Spring Actuator (Micrometer) Metrics endpoints:
+                #   http://localhost:8081/actuator/metric-links
+
+                # HOWTO: view all configured endpoints of the running application:
+                #   http://localhost:8081/actuator/mappings
+
+                # HOWTO: view the effective application configuration properties:
+                #   http://localhost:8081/actuator/configprops
+
+                include: info, health, metrics, metric-links, mappings, openapi, swaggerui, configprops, env
+    endpoint:
+        env:
+            # TODO.spec: check this, maybe set to when_authorized?
+            show-values: always
+        configprops:
+            # TODO.spec: check this, maybe set to when_authorized?
+            show-values: always
    observations:
        annotations:
            enabled: true

 spring:
+
    datasource:
        driver-class-name: org.postgresql.Driver
        password: password
-        url: jdbc:postgresql://localhost:5432/postgres
+        url: ${HSADMINNG_POSTGRES_JDBC_URL}
        username: postgres

    sql:
@@ -30,13 +46,13 @@ spring:
            hibernate:
                dialect: net.hostsharing.hsadminng.config.PostgresCustomDialect

+    liquibase:
+        contexts: ${spring.profiles.active}
+
 # keep this in sync with test/.../application.yml
 springdoc:
    use-management-port: true

-liquibase:
-    contexts: dev
-
 hsadminng:
    postgres:
        leakproof:
@@ -50,4 +66,3 @@ metrics:
            http:
                server:
                    requests: true
-
--- a/src/main/resources/db/changelog/1-rbac/1050-rbac-base.sql
+++ b/src/main/resources/db/changelog/1-rbac/1050-rbac-base.sql
@@ -870,7 +870,7 @@ $$;


 -- ============================================================================
--changeset michael.hoennig:rbac-base-PGSQL-ROLES context:dev,tc endDelimiter:--//
+--changeset michael.hoennig:rbac-base-PGSQL-ROLES context:!external-db endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do $$
--- a/src/main/resources/db/changelog/1-rbac/1080-rbac-global.sql
+++ b/src/main/resources/db/changelog/1-rbac/1080-rbac-global.sql
@@ -170,7 +170,7 @@ commit;


 -- ============================================================================
--changeset michael.hoennig:rbac-global-ADMIN-USERS context:dev,tc endDelimiter:--//
+--changeset michael.hoennig:rbac-global-ADMIN-USERS context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------
 /*
    Create two users and assign both to the administrators' role.
@@ -192,7 +192,7 @@ $$;


 -- ============================================================================
--changeset michael.hoennig:rbac-global-TEST context:dev,tc runAlways:true endDelimiter:--//
+--changeset michael.hoennig:rbac-global-TEST context:!without-test-data runAlways:true endDelimiter:--//
 -- ----------------------------------------------------------------------------

 /*
--- a/src/main/resources/db/changelog/2-rbactest/201-rbactest-customer/2018-rbactest-customer-test-data.sql
+++ b/src/main/resources/db/changelog/2-rbactest/201-rbactest-customer/2018-rbactest-customer-test-data.sql
@@ -67,7 +67,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:test-customer-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:test-customer-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/2-rbactest/202-rbactest-package/2028-rbactest-package-test-data.sql
+++ b/src/main/resources/db/changelog/2-rbactest/202-rbactest-package/2028-rbactest-package-test-data.sql
@@ -59,7 +59,7 @@ $$;


 -- ============================================================================
--changeset michael.hoennig:test-package-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:test-package-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/2-rbactest/203-rbactest-domain/2038-rbactest-domain-test-data.sql
+++ b/src/main/resources/db/changelog/2-rbactest/203-rbactest-domain/2038-rbactest-domain-test-data.sql
@@ -52,7 +52,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-domain-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-domain-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/501-contact/5018-hs-office-contact-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/501-contact/5018-hs-office-contact-test-data.sql
@@ -55,7 +55,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-contact-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-contact-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/502-person/5028-hs-office-person-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/502-person/5028-hs-office-person-test-data.sql
@@ -34,7 +34,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-person-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-person-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/503-relation/5038-hs-office-relation-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/503-relation/5038-hs-office-relation-test-data.sql
@@ -80,7 +80,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-relation-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-relation-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/504-partner/5048-hs-office-partner-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/504-partner/5048-hs-office-partner-test-data.sql
@@ -66,7 +66,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-partner-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-partner-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/505-bankaccount/5058-hs-office-bankaccount-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/505-bankaccount/5058-hs-office-bankaccount-test-data.sql
@@ -26,7 +26,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-bankaccount-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-bankaccount-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/506-debitor/5068-hs-office-debitor-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/506-debitor/5068-hs-office-debitor-test-data.sql
@@ -45,7 +45,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-debitor-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-debitor-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5078-hs-office-sepamandate-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5078-hs-office-sepamandate-test-data.sql
@@ -38,7 +38,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-sepaMandate-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-sepaMandate-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/510-membership/5108-hs-office-membership-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/510-membership/5108-hs-office-membership-test-data.sql
@@ -28,7 +28,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-membership-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-membership-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql
@@ -38,7 +38,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-coopSharesTransaction-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-coopSharesTransaction-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql
@@ -44,7 +44,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-office-coopAssetsTransaction-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-office-coopAssetsTransaction-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/6-hs-booking/620-booking-project/6208-hs-booking-project-test-data.sql
+++ b/src/main/resources/db/changelog/6-hs-booking/620-booking-project/6208-hs-booking-project-test-data.sql
@@ -34,7 +34,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-booking-project-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-booking-project-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/6-hs-booking/630-booking-item/6308-hs-booking-item-test-data.sql
+++ b/src/main/resources/db/changelog/6-hs-booking/630-booking-item/6308-hs-booking-item-test-data.sql
@@ -40,7 +40,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-booking-item-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-booking-item-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7018-hs-hosting-asset-test-data.sql
+++ b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7018-hs-hosting-asset-test-data.sql
@@ -105,7 +105,7 @@ end; $$;


 -- ============================================================================
--changeset michael.hoennig:hs-hosting-asset-TEST-DATA-GENERATION –context=dev,tc endDelimiter:--//
+--changeset michael.hoennig:hs-hosting-asset-TEST-DATA-GENERATION context:!without-test-data endDelimiter:--//
 -- ----------------------------------------------------------------------------

 do language plpgsql $$
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -29,6 +29,7 @@ databaseChangeLog:
        file: db/changelog/0-base/030-historization.sql
    - include:
        file: db/changelog/0-base/090-log-slow-queries-extensions.sql
+
    - include:
        file: db/changelog/1-rbac/1000-rbac-schema.sql
    - include:
@@ -49,26 +50,38 @@ databaseChangeLog:
        file: db/changelog/1-rbac/1059-rbac-statistics.sql
    - include:
        file: db/changelog/1-rbac/1080-rbac-global.sql
+
    - include:
        file: db/changelog/2-rbactest/200-rbactest-schema.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/2-rbactest/201-rbactest-customer/2010-rbactest-customer.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/2-rbactest/201-rbactest-customer/2013-rbactest-customer-rbac.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/2-rbactest/201-rbactest-customer/2018-rbactest-customer-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/2-rbactest/202-rbactest-package/2020-rbactest-package.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/2-rbactest/202-rbactest-package/2023-rbactest-package-rbac.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/2-rbactest/202-rbactest-package/2028-rbactest-package-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/2-rbactest/203-rbactest-domain/2030-rbactest-domain.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/2-rbactest/203-rbactest-domain/2033-rbactest-domain-rbac.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/2-rbactest/203-rbactest-domain/2038-rbactest-domain-test-data.sql
+        context: "!without-test-data"
+
    - include:
        file: db/changelog/5-hs-office/500-hs-office-schema.sql
    - include:
@@ -79,18 +92,21 @@ databaseChangeLog:
        file: db/changelog/5-hs-office/501-contact/5016-hs-office-contact-migration.sql
    - include:
        file: db/changelog/5-hs-office/501-contact/5018-hs-office-contact-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/5-hs-office/502-person/5020-hs-office-person.sql
    - include:
        file: db/changelog/5-hs-office/502-person/5023-hs-office-person-rbac.sql
    - include:
        file: db/changelog/5-hs-office/502-person/5028-hs-office-person-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/5-hs-office/503-relation/5030-hs-office-relation.sql
    - include:
        file: db/changelog/5-hs-office/503-relation/5033-hs-office-relation-rbac.sql
    - include:
        file: db/changelog/5-hs-office/503-relation/5038-hs-office-relation-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/5-hs-office/504-partner/5040-hs-office-partner.sql
    - include:
@@ -101,18 +117,21 @@ databaseChangeLog:
        file: db/changelog/5-hs-office/504-partner/5046-hs-office-partner-migration.sql
    - include:
        file: db/changelog/5-hs-office/504-partner/5048-hs-office-partner-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/5-hs-office/505-bankaccount/5050-hs-office-bankaccount.sql
    - include:
        file: db/changelog/5-hs-office/505-bankaccount/5053-hs-office-bankaccount-rbac.sql
    - include:
          file: db/changelog/5-hs-office/505-bankaccount/5058-hs-office-bankaccount-test-data.sql
+          context: "!without-test-data"
    - include:
        file: db/changelog/5-hs-office/506-debitor/5060-hs-office-debitor.sql
    - include:
        file: db/changelog/5-hs-office/506-debitor/5063-hs-office-debitor-rbac.sql
    - include:
        file: db/changelog/5-hs-office/506-debitor/5068-hs-office-debitor-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/5-hs-office/507-sepamandate/5070-hs-office-sepamandate.sql
    - include:
@@ -121,12 +140,14 @@ databaseChangeLog:
        file: db/changelog/5-hs-office/507-sepamandate/5076-hs-office-sepamandate-migration.sql
    - include:
        file: db/changelog/5-hs-office/507-sepamandate/5078-hs-office-sepamandate-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/5-hs-office/510-membership/5100-hs-office-membership.sql
    - include:
        file: db/changelog/5-hs-office/510-membership/5103-hs-office-membership-rbac.sql
    - include:
        file: db/changelog/5-hs-office/510-membership/5108-hs-office-membership-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/5-hs-office/511-coopshares/5110-hs-office-coopshares.sql
    - include:
@@ -135,6 +156,7 @@ databaseChangeLog:
        file: db/changelog/5-hs-office/511-coopshares/5116-hs-office-coopshares-migration.sql
    - include:
        file: db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql
+        context: "!without-test-data"
    - include:
        file: db/changelog/5-hs-office/512-coopassets/5120-hs-office-coopassets.sql
    - include:
@@ -143,34 +165,53 @@ databaseChangeLog:
        file: db/changelog/5-hs-office/512-coopassets/5126-hs-office-coopassets-migration.sql
    - include:
        file: db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql
+        context: "!without-test-data"
+
    - include:
        file: db/changelog/6-hs-booking/600-hs-booking-schema.sql
+        context: "!only-office"
    - include:
        file: db/changelog/6-hs-booking/610-booking-debitor/6100-hs-booking-debitor.sql
+        context: "!only-office"
    - include:
        file: db/changelog/6-hs-booking/620-booking-project/6200-hs-booking-project.sql
+        context: "!only-office"
    - include:
        file: db/changelog/6-hs-booking/620-booking-project/6203-hs-booking-project-rbac.sql
+        context: "!only-office"
    - include:
        file: db/changelog/6-hs-booking/620-booking-project/6208-hs-booking-project-test-data.sql
+        context: "!only-office and !without-test-data"
    - include:
        file: db/changelog/6-hs-booking/630-booking-item/6300-hs-booking-item.sql
+        context: "!only-office"
    - include:
        file: db/changelog/6-hs-booking/630-booking-item/6303-hs-booking-item-rbac.sql
+        context: "!only-office"
    - include:
        file: db/changelog/6-hs-booking/630-booking-item/6308-hs-booking-item-test-data.sql
+        context: "!only-office and !without-test-data"
+
    - include:
        file: db/changelog/7-hs-hosting/700-hs-hosting-schema.sql
+        context: "!only-office"
    - include:
        file: db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql
+        context: "!only-office"
    - include:
        file: db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac.sql
+        context: "!only-office"
    - include:
        file: db/changelog/7-hs-hosting/701-hosting-asset/7016-hs-hosting-asset-migration.sql
+        context: "!only-office"
    - include:
        file: db/changelog/7-hs-hosting/701-hosting-asset/7018-hs-hosting-asset-test-data.sql
+        context: "!only-office and !without-test-data"
+
    - include:
        file: db/changelog/9-hs-global/9000-statistics.sql
+        context: "!only-office"
+
    - include:
        file: db/changelog/9-hs-global/9100-hs-integration-schema.sql
    - include: