From 197b6c44367f8699e8bc3cda0ae8875adda2ff94 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Thu, 11 Jul 2024 09:01:31 +0200 Subject: [PATCH] add test-data and rename HA_DOMAIN_EMAIL_..._SETUP to SMTP/MBOX --- doc/hs-hosting-asset-type-structure.md | 20 ++++---- ...HsManagedWebspaceBookingItemValidator.java | 4 +- .../hs/hosting/asset/HsHostingAssetType.java | 14 +++--- .../HostingAssetEntityValidatorRegistry.java | 4 +- ...MailMailboxSetupHostingAssetValidator.java | 4 +- ...lSubmissionSetupHostingAssetValidator.java | 4 +- .../hs-hosting/hs-hosting-asset-schemas.yaml | 4 +- .../7010-hs-hosting-asset.sql | 10 ++-- .../7018-hs-hosting-asset-test-data.sql | 49 ++++++++++--------- ...gedServerBookingItemValidatorUnitTest.java | 2 +- .../HsHostingAssetControllerRestTest.java | 14 +++--- ...ingAssetPropsControllerAcceptanceTest.java | 4 +- .../asset/HsHostingAssetTypeUnitTest.java | 16 +++--- ...gAssetEntityValidatorRegistryUnitTest.java | 4 +- ...boxSetupHostingAssetValidatorUnitTest.java | 14 +++--- ...ionSetupHostingAssetValidatorUnitTest.java | 14 +++--- ...lAddressHostingAssetValidatorUnitTest.java | 6 +-- 17 files changed, 97 insertions(+), 90 deletions(-) diff --git a/doc/hs-hosting-asset-type-structure.md b/doc/hs-hosting-asset-type-structure.md index b03b7ced..f2af876b 100644 --- a/doc/hs-hosting-asset-type-structure.md +++ b/doc/hs-hosting-asset-type-structure.md @@ -12,7 +12,7 @@ package Booking #feb28c { entity BI_MANAGED_SERVER entity BI_MANAGED_WEBSPACE entity BI_DOMAIN_DNS_SETUP - entity BI_DOMAIN_EMAIL_SUBMISSION_SETUP + entity BI_DOMAIN_SMTP_SETUP } package Hosting #feb28c{ @@ -20,8 +20,8 @@ package Hosting #feb28c{ entity HA_DOMAIN_SETUP entity HA_DOMAIN_DNS_SETUP entity HA_DOMAIN_HTTP_SETUP - entity HA_DOMAIN_EMAIL_SUBMISSION_SETUP - entity HA_DOMAIN_EMAIL_MAILBOX_SETUP + entity HA_DOMAIN_SMTP_SETUP + entity HA_DOMAIN_MBOX_SETUP entity HA_EMAIL_ADDRESS } @@ -52,12 +52,12 @@ HA_DOMAIN_SETUP o..> HA_DOMAIN_SETUP HA_DOMAIN_DNS_SETUP *==> HA_DOMAIN_SETUP HA_DOMAIN_HTTP_SETUP *==> HA_DOMAIN_SETUP HA_DOMAIN_HTTP_SETUP o..> HA_UNIX_USER -HA_DOMAIN_EMAIL_SUBMISSION_SETUP *==> HA_DOMAIN_SETUP -HA_DOMAIN_EMAIL_SUBMISSION_SETUP o..> HA_MANAGED_WEBSPACE -HA_DOMAIN_EMAIL_MAILBOX_SETUP *==> HA_DOMAIN_SETUP -HA_DOMAIN_EMAIL_MAILBOX_SETUP o..> HA_MANAGED_WEBSPACE +HA_DOMAIN_SMTP_SETUP *==> HA_DOMAIN_SETUP +HA_DOMAIN_SMTP_SETUP o..> HA_MANAGED_WEBSPACE +HA_DOMAIN_MBOX_SETUP *==> HA_DOMAIN_SETUP +HA_DOMAIN_MBOX_SETUP o..> HA_MANAGED_WEBSPACE HA_EMAIL_ALIAS *==> HA_MANAGED_WEBSPACE -HA_EMAIL_ADDRESS *==> HA_DOMAIN_EMAIL_MAILBOX_SETUP +HA_EMAIL_ADDRESS *==> HA_DOMAIN_MBOX_SETUP HA_IP_NUMBER o..> HA_CLOUD_SERVER HA_IP_NUMBER o..> HA_MANAGED_SERVER HA_IP_NUMBER o..> HA_MANAGED_WEBSPACE @@ -82,7 +82,7 @@ package Booking #feb28c { entity BI_MANAGED_SERVER entity BI_MANAGED_WEBSPACE entity BI_DOMAIN_DNS_SETUP - entity BI_DOMAIN_EMAIL_SUBMISSION_SETUP + entity BI_DOMAIN_SMTP_SETUP } package Hosting #feb28c{ @@ -145,7 +145,7 @@ package Booking #feb28c { entity BI_MANAGED_SERVER entity BI_MANAGED_WEBSPACE entity BI_DOMAIN_DNS_SETUP - entity BI_DOMAIN_EMAIL_SUBMISSION_SETUP + entity BI_DOMAIN_SMTP_SETUP } package Hosting #feb28c{ diff --git a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedWebspaceBookingItemValidator.java b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedWebspaceBookingItemValidator.java index 2bca0042..1f094f36 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedWebspaceBookingItemValidator.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedWebspaceBookingItemValidator.java @@ -8,7 +8,7 @@ import java.util.List; import static java.util.Collections.emptyList; import static java.util.Optional.ofNullable; -import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_EMAIL_MAILBOX_SETUP; +import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_MBOX_SETUP; import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.EMAIL_ADDRESS; import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.MARIADB_DATABASE; import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.MARIADB_USER; @@ -88,7 +88,7 @@ class HsManagedWebspaceBookingItemValidator extends HsBookingItemEntityValidator return (final HsBookingItemEntity entity, final IntegerProperty prop, final Integer factor) -> { final var unixUserCount = ofNullable(entity.getRelatedHostingAsset()) .map(ha -> ha.getSubHostingAssets().stream() - .filter(bi -> bi.getType() == DOMAIN_EMAIL_MAILBOX_SETUP) + .filter(bi -> bi.getType() == DOMAIN_MBOX_SETUP) .flatMap(domainEMailSetup -> domainEMailSetup.getSubHostingAssets().stream() .filter(subAsset -> subAsset.getType()==EMAIL_ADDRESS)) .count()) diff --git a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java index 6a0846a9..b3d574e1 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java @@ -45,6 +45,10 @@ public enum HsHostingAssetType implements Node { inGroup("Webspace"), requiredParent(MANAGED_WEBSPACE)), + EMAIL_ALIAS( // named e.g. xyz00-abc + inGroup("Webspace"), + requiredParent(MANAGED_WEBSPACE)), + DOMAIN_SETUP( // named e.g. example.org inGroup("Domain"), optionalParent(SAME_TYPE) @@ -59,25 +63,21 @@ public enum HsHostingAssetType implements Node { requiredParent(DOMAIN_SETUP), assignedTo(UNIX_USER)), - DOMAIN_EMAIL_SUBMISSION_SETUP( // named e.g. example.org + DOMAIN_SMTP_SETUP( // named e.g. example.org inGroup("Domain"), requiredParent(DOMAIN_SETUP), assignedTo(MANAGED_WEBSPACE)), - DOMAIN_EMAIL_MAILBOX_SETUP( // named e.g. example.org + DOMAIN_MBOX_SETUP( // named e.g. example.org inGroup("Domain"), requiredParent(DOMAIN_SETUP), assignedTo(MANAGED_WEBSPACE)), // TODO.spec: SECURE_MX - EMAIL_ALIAS( // named e.g. xyz00-abc - inGroup("Webspace"), - requiredParent(MANAGED_WEBSPACE)), - EMAIL_ADDRESS( // named e.g. sample@example.org inGroup("Domain"), - requiredParent(DOMAIN_EMAIL_MAILBOX_SETUP)), + requiredParent(DOMAIN_MBOX_SETUP)), PGSQL_INSTANCE( // TODO.spec: identifier to be specified inGroup("PostgreSQL"), diff --git a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntityValidatorRegistry.java b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntityValidatorRegistry.java index f44be666..927d0070 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntityValidatorRegistry.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntityValidatorRegistry.java @@ -23,8 +23,8 @@ public class HostingAssetEntityValidatorRegistry { register(DOMAIN_SETUP, new HsDomainSetupHostingAssetValidator()); register(DOMAIN_DNS_SETUP, new HsDomainDnsSetupHostingAssetValidator()); register(DOMAIN_HTTP_SETUP, new HsDomainHttpSetupHostingAssetValidator()); - register(DOMAIN_EMAIL_SUBMISSION_SETUP, new HsDomainEMailSubmissionSetupHostingAssetValidator()); - register(DOMAIN_EMAIL_MAILBOX_SETUP, new HsDomainEMailMailboxSetupHostingAssetValidator()); + register(DOMAIN_SMTP_SETUP, new HsDomainEMailSubmissionSetupHostingAssetValidator()); + register(DOMAIN_MBOX_SETUP, new HsDomainEMailMailboxSetupHostingAssetValidator()); register(EMAIL_ADDRESS, new HsEMailAddressHostingAssetValidator()); } diff --git a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEMailMailboxSetupHostingAssetValidator.java b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEMailMailboxSetupHostingAssetValidator.java index 5e919b00..85291aeb 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEMailMailboxSetupHostingAssetValidator.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEMailMailboxSetupHostingAssetValidator.java @@ -5,7 +5,7 @@ import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetEntity; import java.util.regex.Pattern; import static java.util.Optional.ofNullable; -import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_EMAIL_SUBMISSION_SETUP; +import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_SMTP_SETUP; class HsDomainEMailMailboxSetupHostingAssetValidator extends HostingAssetEntityValidator { @@ -13,7 +13,7 @@ class HsDomainEMailMailboxSetupHostingAssetValidator extends HostingAssetEntityV HsDomainEMailMailboxSetupHostingAssetValidator() { super( - DOMAIN_EMAIL_SUBMISSION_SETUP, + DOMAIN_SMTP_SETUP, AlarmContact.isOptional(), NO_EXTRA_PROPERTIES); diff --git a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEMailSubmissionSetupHostingAssetValidator.java b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEMailSubmissionSetupHostingAssetValidator.java index aa80d332..7c1bbecb 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEMailSubmissionSetupHostingAssetValidator.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEMailSubmissionSetupHostingAssetValidator.java @@ -5,7 +5,7 @@ import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetEntity; import java.util.regex.Pattern; import static java.util.Optional.ofNullable; -import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_EMAIL_SUBMISSION_SETUP; +import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_SMTP_SETUP; class HsDomainEMailSubmissionSetupHostingAssetValidator extends HostingAssetEntityValidator { @@ -13,7 +13,7 @@ class HsDomainEMailSubmissionSetupHostingAssetValidator extends HostingAssetEnti HsDomainEMailSubmissionSetupHostingAssetValidator() { super( - DOMAIN_EMAIL_SUBMISSION_SETUP, + DOMAIN_SMTP_SETUP, AlarmContact.isOptional(), NO_EXTRA_PROPERTIES); diff --git a/src/main/resources/api-definition/hs-hosting/hs-hosting-asset-schemas.yaml b/src/main/resources/api-definition/hs-hosting/hs-hosting-asset-schemas.yaml index 11cb1050..f4a25607 100644 --- a/src/main/resources/api-definition/hs-hosting/hs-hosting-asset-schemas.yaml +++ b/src/main/resources/api-definition/hs-hosting/hs-hosting-asset-schemas.yaml @@ -13,8 +13,8 @@ components: - DOMAIN_SETUP - DOMAIN_DNS_SETUP - DOMAIN_HTTP_SETUP - - DOMAIN_EMAIL_SUBMISSION_SETUP - - DOMAIN_EMAIL_MAILBOX_SETUP + - DOMAIN_SMTP_SETUP + - DOMAIN_MBOX_SETUP - EMAIL_ALIAS - EMAIL_ADDRESS - PGSQL_USER diff --git a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql index eb335238..c1b4bbcc 100644 --- a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql +++ b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7010-hs-hosting-asset.sql @@ -12,7 +12,8 @@ create type HsHostingAssetType as enum ( 'DOMAIN_SETUP', 'DOMAIN_DNS_SETUP', 'DOMAIN_HTTP_SETUP', - 'DOMAIN_EMAIL_SETUP', + 'DOMAIN_SMTP_SETUP', + 'DOMAIN_MBOX_SETUP', 'EMAIL_ALIAS', 'EMAIL_ADDRESS', 'PGSQL_USER', @@ -64,12 +65,13 @@ begin when 'MANAGED_SERVER' then null when 'MANAGED_WEBSPACE' then 'MANAGED_SERVER' when 'UNIX_USER' then 'MANAGED_WEBSPACE' + when 'EMAIL_ALIAS' then 'MANAGED_WEBSPACE' when 'DOMAIN_SETUP' then null when 'DOMAIN_DNS_SETUP' then 'DOMAIN_SETUP' when 'DOMAIN_HTTP_SETUP' then 'DOMAIN_SETUP' - when 'DOMAIN_EMAIL_SETUP' then 'DOMAIN_SETUP' - when 'EMAIL_ALIAS' then 'MANAGED_WEBSPACE' - when 'EMAIL_ADDRESS' then 'DOMAIN_EMAIL_SETUP' + when 'DOMAIN_SMTP_SETUP' then 'DOMAIN_SETUP' + when 'DOMAIN_MBOX_SETUP' then 'DOMAIN_SETUP' + when 'EMAIL_ADDRESS' then 'DOMAIN_MBOX_SETUP' when 'PGSQL_USER' then 'MANAGED_WEBSPACE' when 'PGSQL_DATABASE' then 'MANAGED_WEBSPACE' when 'MARIADB_USER' then 'MANAGED_WEBSPACE' diff --git 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 index 26ef2ac8..f43edef0 100644 --- 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 @@ -14,16 +14,17 @@ declare currentTask varchar; relatedProject hs_booking_project; relatedDebitor hs_office_debitor; - relatedPrivateCloudBookingItem hs_booking_item; - relatedManagedServerBookingItem hs_booking_item; - relatedCloudServerBookingItem hs_booking_item; - relatedManagedWebspaceBookingItem hs_booking_item; + privateCloudBI hs_booking_item; + managedServerBI hs_booking_item; + cloudServerBI hs_booking_item; + managedWebspaceBI hs_booking_item; debitorNumberSuffix varchar; defaultPrefix varchar; managedServerUuid uuid; managedWebspaceUuid uuid; webUnixUserUuid uuid; domainSetupUuid uuid; + domainMBoxSetupUuid uuid; begin currentTask := 'creating hosting-asset test-data ' || givenProjectCaption; call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global:ADMIN'); @@ -39,47 +40,51 @@ begin where debitor.uuid = relatedProject.debitorUuid; assert relatedDebitor.uuid is not null, 'relatedDebitor for "' || givenProjectCaption || '" must not be null'; - select item.* into relatedPrivateCloudBookingItem + select item.* into privateCloudBI from hs_booking_item item where item.projectUuid = relatedProject.uuid and item.type = 'PRIVATE_CLOUD'; - assert relatedPrivateCloudBookingItem.uuid is not null, 'relatedPrivateCloudBookingItem for "' || givenProjectCaption|| '" must not be null'; + assert privateCloudBI.uuid is not null, 'relatedPrivateCloudBookingItem for "' || givenProjectCaption|| '" must not be null'; - select item.* into relatedManagedServerBookingItem + select item.* into managedServerBI from hs_booking_item item where item.projectUuid = relatedProject.uuid and item.type = 'MANAGED_SERVER'; - assert relatedManagedServerBookingItem.uuid is not null, 'relatedManagedServerBookingItem for "' || givenProjectCaption|| '" must not be null'; + assert managedServerBI.uuid is not null, 'relatedManagedServerBookingItem for "' || givenProjectCaption|| '" must not be null'; - select item.* into relatedCloudServerBookingItem + select item.* into cloudServerBI from hs_booking_item item - where item.parentItemuuid = relatedPrivateCloudBookingItem.uuid + where item.parentItemuuid = privateCloudBI.uuid and item.type = 'CLOUD_SERVER'; - assert relatedCloudServerBookingItem.uuid is not null, 'relatedCloudServerBookingItem for "' || givenProjectCaption|| '" must not be null'; + assert cloudServerBI.uuid is not null, 'relatedCloudServerBookingItem for "' || givenProjectCaption|| '" must not be null'; - select item.* into relatedManagedWebspaceBookingItem + select item.* into managedWebspaceBI from hs_booking_item item where item.projectUuid = relatedProject.uuid and item.type = 'MANAGED_WEBSPACE'; - assert relatedManagedWebspaceBookingItem.uuid is not null, 'relatedManagedWebspaceBookingItem for "' || givenProjectCaption|| '" must not be null'; + assert managedWebspaceBI.uuid is not null, 'relatedManagedWebspaceBookingItem for "' || givenProjectCaption|| '" must not be null'; select uuid_generate_v4() into managedServerUuid; select uuid_generate_v4() into managedWebspaceUuid; select uuid_generate_v4() into webUnixUserUuid; select uuid_generate_v4() into domainSetupUuid; + select uuid_generate_v4() into domainMBoxSetupUuid; debitorNumberSuffix := relatedDebitor.debitorNumberSuffix; defaultPrefix := relatedDebitor.defaultPrefix; insert into hs_hosting_asset - (uuid, bookingitemuuid, type, parentAssetUuid, assignedToAssetUuid, identifier, caption, config) - values (managedServerUuid, relatedManagedServerBookingItem.uuid, 'MANAGED_SERVER', null, null, 'vm10' || debitorNumberSuffix, 'some ManagedServer', '{ "monit_max_cpu_usage": 90, "monit_max_ram_usage": 80, "monit_max_ssd_usage": 70 }'::jsonb), - (uuid_generate_v4(), relatedCloudServerBookingItem.uuid, 'CLOUD_SERVER', null, null, 'vm20' || debitorNumberSuffix, 'another CloudServer', '{}'::jsonb), - (managedWebspaceUuid, relatedManagedWebspaceBookingItem.uuid, 'MANAGED_WEBSPACE', managedServerUuid, null, defaultPrefix || '01', 'some Webspace', '{}'::jsonb), - (uuid_generate_v4(), null, 'EMAIL_ALIAS', managedWebspaceUuid, null, defaultPrefix || '01-web', 'some E-Mail-Alias', '{ "target": [ "office@example.org", "archive@example.com" ] }'::jsonb), - (webUnixUserUuid, null, 'UNIX_USER', managedWebspaceUuid, null, defaultPrefix || '01-web', 'some UnixUser for Website', '{ "SSD-soft-quota": "128", "SSD-hard-quota": "256", "HDD-soft-quota": "512", "HDD-hard-quota": "1024"}'::jsonb), - (domainSetupUuid, null, 'DOMAIN_SETUP', null, null, defaultPrefix || '.example.org', 'some Domain-Setup', '{}'::jsonb), - (uuid_generate_v4(), null, 'DOMAIN_DNS_SETUP', domainSetupUuid, null, defaultPrefix || '.example.org|DNS', 'some Domain-DNS-Setup', '{}'::jsonb), - (uuid_generate_v4(), null, 'DOMAIN_HTTP_SETUP', domainSetupUuid, webUnixUserUuid, defaultPrefix || '.example.org|HTTP', 'some Domain-HTTP-Setup', '{ "option-htdocsfallback": true, "use-fcgiphpbin": "/usr/lib/cgi-bin/php", "validsubdomainnames": "*"}'::jsonb); + (uuid, bookingitemuuid, type, parentAssetUuid, assignedToAssetUuid, identifier, caption, config) + values (managedServerUuid, managedServerBI.uuid, 'MANAGED_SERVER', null, null, 'vm10' || debitorNumberSuffix, 'some ManagedServer', '{ "monit_max_cpu_usage": 90, "monit_max_ram_usage": 80, "monit_max_ssd_usage": 70 }'::jsonb), + (uuid_generate_v4(), cloudServerBI.uuid, 'CLOUD_SERVER', null, null, 'vm20' || debitorNumberSuffix, 'another CloudServer', '{}'::jsonb), + (managedWebspaceUuid, managedWebspaceBI.uuid, 'MANAGED_WEBSPACE', managedServerUuid, null, defaultPrefix || '01', 'some Webspace', '{}'::jsonb), + (uuid_generate_v4(), null, 'EMAIL_ALIAS', managedWebspaceUuid, null, defaultPrefix || '01-web', 'some E-Mail-Alias', '{ "target": [ "office@example.org", "archive@example.com" ] }'::jsonb), + (webUnixUserUuid, null, 'UNIX_USER', managedWebspaceUuid, null, defaultPrefix || '01-web', 'some UnixUser for Website', '{ "SSD-soft-quota": "128", "SSD-hard-quota": "256", "HDD-soft-quota": "512", "HDD-hard-quota": "1024"}'::jsonb), + (domainSetupUuid, null, 'DOMAIN_SETUP', null, null, defaultPrefix || '.example.org', 'some Domain-Setup', '{}'::jsonb), + (uuid_generate_v4(), null, 'DOMAIN_DNS_SETUP', domainSetupUuid, null, defaultPrefix || '.example.org|DNS', 'some Domain-DNS-Setup', '{}'::jsonb), + (uuid_generate_v4(), null, 'DOMAIN_HTTP_SETUP', domainSetupUuid, webUnixUserUuid, defaultPrefix || '.example.org|HTTP', 'some Domain-HTTP-Setup', '{ "option-htdocsfallback": true, "use-fcgiphpbin": "/usr/lib/cgi-bin/php", "validsubdomainnames": "*"}'::jsonb), + (uuid_generate_v4(), null, 'DOMAIN_SMTP_SETUP', domainSetupUuid, managedWebspaceUuid, defaultPrefix || '.example.org|DNS', 'some Domain-SMPT-Setup', '{}'::jsonb), + (domainMBoxSetupUuid, null, 'DOMAIN_MBOX_SETUP', domainSetupUuid, managedWebspaceUuid, defaultPrefix || '.example.org|DNS', 'some Domain-MBOX-Setup', '{}'::jsonb), + (uuid_generate_v4(), null, 'EMAIL_ADDRESS', domainMBoxSetupUuid, null, 'test@' || defaultPrefix || '.example.org', 'some E-Mail-Address', '{}'::jsonb); end; $$; --// diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java index b0605239..5f95e598 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java @@ -152,7 +152,7 @@ class HsManagedServerBookingItemValidatorUnitTest { "xyz00_%c%c", 2, HsHostingAssetType.MARIADB_DATABASE ), - generateDomainEmailSetupsWithEMailAddresses(26, HsHostingAssetType.DOMAIN_EMAIL_MAILBOX_SETUP, + generateDomainEmailSetupsWithEMailAddresses(26, HsHostingAssetType.DOMAIN_MBOX_SETUP, "%c%c.example.com", 10, HsHostingAssetType.EMAIL_ADDRESS ) diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java index 9df023a1..4a5bc04c 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java @@ -300,17 +300,17 @@ public class HsHostingAssetControllerRestTest { } ] """), - DOMAIN_EMAIL_SUBMISSION_SETUP( + DOMAIN_SMTP_SETUP( List.of( HsHostingAssetEntity.builder() - .type(HsHostingAssetType.DOMAIN_EMAIL_SUBMISSION_SETUP) + .type(HsHostingAssetType.DOMAIN_SMTP_SETUP) .identifier("example.org|SMTP") .caption("some fake Domain-SMTP-Setup") .build()), """ [ { - "type": "DOMAIN_EMAIL_SUBMISSION_SETUP", + "type": "DOMAIN_SMTP_SETUP", "identifier": "example.org|SMTP", "caption": "some fake Domain-SMTP-Setup", "alarmContact": null, @@ -318,17 +318,17 @@ public class HsHostingAssetControllerRestTest { } ] """), - DOMAIN_EMAIL_MAILBOX_SETUP( + DOMAIN_MBOX_SETUP( List.of( HsHostingAssetEntity.builder() - .type(HsHostingAssetType.DOMAIN_EMAIL_MAILBOX_SETUP) + .type(HsHostingAssetType.DOMAIN_MBOX_SETUP) .identifier("example.org|MBOX") .caption("some fake Domain-MBOX-Setup") .build()), """ [ { - "type": "DOMAIN_EMAIL_MAILBOX_SETUP", + "type": "DOMAIN_MBOX_SETUP", "identifier": "example.org|MBOX", "caption": "some fake Domain-MBOX-Setup", "alarmContact": null, @@ -341,7 +341,7 @@ public class HsHostingAssetControllerRestTest { HsHostingAssetEntity.builder() .type(HsHostingAssetType.EMAIL_ADDRESS) .parentAsset(HsHostingAssetEntity.builder() - .type(HsHostingAssetType.DOMAIN_EMAIL_MAILBOX_SETUP) + .type(HsHostingAssetType.DOMAIN_MBOX_SETUP) .identifier("example.org|MBOX") .caption("some fake Domain-MBOX-Setup") .build()) diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsControllerAcceptanceTest.java index 37affab1..290777ea 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsControllerAcceptanceTest.java @@ -39,8 +39,8 @@ class HsHostingAssetPropsControllerAcceptanceTest { "DOMAIN_SETUP", "DOMAIN_DNS_SETUP", "DOMAIN_HTTP_SETUP", - "DOMAIN_EMAIL_SUBMISSION_SETUP", - "DOMAIN_EMAIL_MAILBOX_SETUP", + "DOMAIN_SMTP_SETUP", + "DOMAIN_MBOX_SETUP", "EMAIL_ADDRESS" ] """)); diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetTypeUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetTypeUnitTest.java index 91d141a2..24eea31d 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetTypeUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetTypeUnitTest.java @@ -32,8 +32,8 @@ class HsHostingAssetTypeUnitTest { entity HA_DOMAIN_SETUP entity HA_DOMAIN_DNS_SETUP entity HA_DOMAIN_HTTP_SETUP - entity HA_DOMAIN_EMAIL_SUBMISSION_SETUP - entity HA_DOMAIN_EMAIL_MAILBOX_SETUP + entity HA_DOMAIN_SMTP_SETUP + entity HA_DOMAIN_MBOX_SETUP entity HA_EMAIL_ADDRESS } @@ -60,16 +60,16 @@ class HsHostingAssetTypeUnitTest { HA_MANAGED_WEBSPACE *==> BI_MANAGED_WEBSPACE HA_MANAGED_WEBSPACE o..> HA_MANAGED_SERVER HA_UNIX_USER *==> HA_MANAGED_WEBSPACE + HA_EMAIL_ALIAS *==> HA_MANAGED_WEBSPACE HA_DOMAIN_SETUP o..> HA_DOMAIN_SETUP HA_DOMAIN_DNS_SETUP *==> HA_DOMAIN_SETUP HA_DOMAIN_HTTP_SETUP *==> HA_DOMAIN_SETUP HA_DOMAIN_HTTP_SETUP o..> HA_UNIX_USER - HA_DOMAIN_EMAIL_SUBMISSION_SETUP *==> HA_DOMAIN_SETUP - HA_DOMAIN_EMAIL_SUBMISSION_SETUP o..> HA_MANAGED_WEBSPACE - HA_DOMAIN_EMAIL_MAILBOX_SETUP *==> HA_DOMAIN_SETUP - HA_DOMAIN_EMAIL_MAILBOX_SETUP o..> HA_MANAGED_WEBSPACE - HA_EMAIL_ALIAS *==> HA_MANAGED_WEBSPACE - HA_EMAIL_ADDRESS *==> HA_DOMAIN_EMAIL_MAILBOX_SETUP + HA_DOMAIN_SMTP_SETUP *==> HA_DOMAIN_SETUP + HA_DOMAIN_SMTP_SETUP o..> HA_MANAGED_WEBSPACE + HA_DOMAIN_MBOX_SETUP *==> HA_DOMAIN_SETUP + HA_DOMAIN_MBOX_SETUP o..> HA_MANAGED_WEBSPACE + HA_EMAIL_ADDRESS *==> HA_DOMAIN_MBOX_SETUP HA_IP_NUMBER o..> HA_CLOUD_SERVER HA_IP_NUMBER o..> HA_MANAGED_SERVER HA_IP_NUMBER o..> HA_MANAGED_WEBSPACE diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntityValidatorRegistryUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntityValidatorRegistryUnitTest.java index 3f6b4917..c1c8a53c 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntityValidatorRegistryUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HostingAssetEntityValidatorRegistryUnitTest.java @@ -37,8 +37,8 @@ class HostingAssetEntityValidatorRegistryUnitTest { HsHostingAssetType.DOMAIN_SETUP, HsHostingAssetType.DOMAIN_DNS_SETUP, HsHostingAssetType.DOMAIN_HTTP_SETUP, - HsHostingAssetType.DOMAIN_EMAIL_SUBMISSION_SETUP, - HsHostingAssetType.DOMAIN_EMAIL_MAILBOX_SETUP, + HsHostingAssetType.DOMAIN_SMTP_SETUP, + HsHostingAssetType.DOMAIN_MBOX_SETUP, HsHostingAssetType.EMAIL_ADDRESS ); } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEmailMailboxSetupHostingAssetValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEmailMailboxSetupHostingAssetValidatorUnitTest.java index 50d195d9..6bbb2cfb 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEmailMailboxSetupHostingAssetValidatorUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEmailMailboxSetupHostingAssetValidatorUnitTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import java.util.Map; import static java.util.Map.entry; -import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_EMAIL_MAILBOX_SETUP; +import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_MBOX_SETUP; import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_SETUP; import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.MANAGED_WEBSPACE; import static org.assertj.core.api.Assertions.assertThat; @@ -23,7 +23,7 @@ class HsDomainEmailMailboxSetupHostingAssetValidatorUnitTest { static HsHostingAssetEntityBuilder validEntityBuilder() { return HsHostingAssetEntity.builder() - .type(DOMAIN_EMAIL_MAILBOX_SETUP) + .type(DOMAIN_MBOX_SETUP) .parentAsset(validDomainSetupEntity) .assignedToAsset(HsHostingAssetEntity.builder().type(MANAGED_WEBSPACE).build()) .identifier("example.org|MBOX"); @@ -32,7 +32,7 @@ class HsDomainEmailMailboxSetupHostingAssetValidatorUnitTest { @Test void containsExpectedProperties() { // when - final var validator = HostingAssetEntityValidatorRegistry.forType(DOMAIN_EMAIL_MAILBOX_SETUP); + final var validator = HostingAssetEntityValidatorRegistry.forType(DOMAIN_MBOX_SETUP); // then assertThat(validator.properties()).map(Map::toString).isEmpty(); @@ -95,9 +95,9 @@ class HsDomainEmailMailboxSetupHostingAssetValidatorUnitTest { // then assertThat(result).containsExactlyInAnyOrder( - "'DOMAIN_EMAIL_MAILBOX_SETUP:example.org|MBOX.bookingItem' must be null but is of type CLOUD_SERVER", - "'DOMAIN_EMAIL_MAILBOX_SETUP:example.org|MBOX.parentAsset' must be of type DOMAIN_SETUP but is of type MANAGED_WEBSPACE", - "'DOMAIN_EMAIL_MAILBOX_SETUP:example.org|MBOX.assignedToAsset' must be of type MANAGED_WEBSPACE but is null"); + "'DOMAIN_MBOX_SETUP:example.org|MBOX.bookingItem' must be null but is of type CLOUD_SERVER", + "'DOMAIN_MBOX_SETUP:example.org|MBOX.parentAsset' must be of type DOMAIN_SETUP but is of type MANAGED_WEBSPACE", + "'DOMAIN_MBOX_SETUP:example.org|MBOX.assignedToAsset' must be of type MANAGED_WEBSPACE but is null"); } @Test @@ -128,6 +128,6 @@ class HsDomainEmailMailboxSetupHostingAssetValidatorUnitTest { // then assertThat(result).containsExactlyInAnyOrder( - "'DOMAIN_EMAIL_MAILBOX_SETUP:example.org|MBOX.config.any' is not expected but is set to 'false'"); + "'DOMAIN_MBOX_SETUP:example.org|MBOX.config.any' is not expected but is set to 'false'"); } } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEmailSubmissionSetupHostingAssetValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEmailSubmissionSetupHostingAssetValidatorUnitTest.java index 57c847fc..db87f8e6 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEmailSubmissionSetupHostingAssetValidatorUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainEmailSubmissionSetupHostingAssetValidatorUnitTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import java.util.Map; import static java.util.Map.entry; -import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_EMAIL_SUBMISSION_SETUP; +import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_SMTP_SETUP; import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_SETUP; import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.MANAGED_WEBSPACE; import static org.assertj.core.api.Assertions.assertThat; @@ -23,7 +23,7 @@ class HsDomainEmailSubmissionSetupHostingAssetValidatorUnitTest { static HsHostingAssetEntityBuilder validEntityBuilder() { return HsHostingAssetEntity.builder() - .type(DOMAIN_EMAIL_SUBMISSION_SETUP) + .type(DOMAIN_SMTP_SETUP) .parentAsset(validDomainSetupEntity) .assignedToAsset(HsHostingAssetEntity.builder().type(MANAGED_WEBSPACE).build()) .identifier("example.org|SMTP"); @@ -32,7 +32,7 @@ class HsDomainEmailSubmissionSetupHostingAssetValidatorUnitTest { @Test void containsExpectedProperties() { // when - final var validator = HostingAssetEntityValidatorRegistry.forType(DOMAIN_EMAIL_SUBMISSION_SETUP); + final var validator = HostingAssetEntityValidatorRegistry.forType(DOMAIN_SMTP_SETUP); // then assertThat(validator.properties()).map(Map::toString).isEmpty(); @@ -95,9 +95,9 @@ class HsDomainEmailSubmissionSetupHostingAssetValidatorUnitTest { // then assertThat(result).containsExactlyInAnyOrder( - "'DOMAIN_EMAIL_SUBMISSION_SETUP:example.org|SMTP.bookingItem' must be null but is of type CLOUD_SERVER", - "'DOMAIN_EMAIL_SUBMISSION_SETUP:example.org|SMTP.parentAsset' must be of type DOMAIN_SETUP but is of type MANAGED_WEBSPACE", - "'DOMAIN_EMAIL_SUBMISSION_SETUP:example.org|SMTP.assignedToAsset' must be of type MANAGED_WEBSPACE but is null"); + "'DOMAIN_SMTP_SETUP:example.org|SMTP.bookingItem' must be null but is of type CLOUD_SERVER", + "'DOMAIN_SMTP_SETUP:example.org|SMTP.parentAsset' must be of type DOMAIN_SETUP but is of type MANAGED_WEBSPACE", + "'DOMAIN_SMTP_SETUP:example.org|SMTP.assignedToAsset' must be of type MANAGED_WEBSPACE but is null"); } @Test @@ -128,6 +128,6 @@ class HsDomainEmailSubmissionSetupHostingAssetValidatorUnitTest { // then assertThat(result).containsExactlyInAnyOrder( - "'DOMAIN_EMAIL_SUBMISSION_SETUP:example.org|SMTP.config.any' is not expected but is set to 'false'"); + "'DOMAIN_SMTP_SETUP:example.org|SMTP.config.any' is not expected but is set to 'false'"); } } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsEMailAddressHostingAssetValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsEMailAddressHostingAssetValidatorUnitTest.java index 878f45e3..1dacb1e2 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsEMailAddressHostingAssetValidatorUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsEMailAddressHostingAssetValidatorUnitTest.java @@ -8,7 +8,7 @@ import java.util.Map; import static java.util.Map.entry; import static net.hostsharing.hsadminng.hs.booking.item.TestHsBookingItem.TEST_MANAGED_SERVER_BOOKING_ITEM; -import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_EMAIL_MAILBOX_SETUP; +import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.DOMAIN_MBOX_SETUP; import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.EMAIL_ADDRESS; import static net.hostsharing.hsadminng.hs.hosting.asset.TestHsHostingAssetEntities.TEST_MANAGED_SERVER_HOSTING_ASSET; import static org.assertj.core.api.Assertions.assertThat; @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; class HsEMailAddressHostingAssetValidatorUnitTest { final static HsHostingAssetEntity domainEmailMailboxSetup = HsHostingAssetEntity.builder() - .type(DOMAIN_EMAIL_MAILBOX_SETUP) + .type(DOMAIN_MBOX_SETUP) .identifier("example.org") .build(); static HsHostingAssetEntity.HsHostingAssetEntityBuilder validEntityBuilder() { @@ -108,7 +108,7 @@ class HsEMailAddressHostingAssetValidatorUnitTest { // then assertThat(result).containsExactlyInAnyOrder( "'EMAIL_ADDRESS:test@example.org.bookingItem' must be null but is of type MANAGED_SERVER", - "'EMAIL_ADDRESS:test@example.org.parentAsset' must be of type DOMAIN_EMAIL_MAILBOX_SETUP but is of type MANAGED_SERVER", + "'EMAIL_ADDRESS:test@example.org.parentAsset' must be of type DOMAIN_MBOX_SETUP but is of type MANAGED_SERVER", "'EMAIL_ADDRESS:test@example.org.assignedToAsset' must be null but is of type MANAGED_SERVER"); } }