Compare commits
No commits in common. "7f066f8b6a3ee1f4310f10008f4bcc78ca187fb4" and "3928c402587f7b4ece18ebb6fcd7ba493f4b3d44" have entirely different histories.
7f066f8b6a
...
3928c40258
@ -8,17 +8,14 @@ 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.StandardMapper;
|
||||
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.function.Function;
|
||||
|
||||
import static java.util.Optional.ofNullable;
|
||||
import static net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsHostingAssetTypeResource.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;
|
||||
@ -112,31 +109,14 @@ public class DomainSetupHostingAssetFactory extends HostingAssetFactory {
|
||||
final HsHostingAssetType subAssetType,
|
||||
final Function<HsHostingAssetRealEntity.HsHostingAssetRealEntityBuilder<?, ?>, HsHostingAssetRealEntity.HsHostingAssetRealEntityBuilder<?, ?>> builderTransformer) {
|
||||
final var resourceType = HsHostingAssetTypeResource.valueOf(subAssetType.name());
|
||||
final var subAssetResource = getSubHostingAssetResources().stream()
|
||||
.filter(ha -> ha.getType() == resourceType)
|
||||
.reduce(Reducer::toSingleElement);
|
||||
if (getSubHostingAssetResources().stream().noneMatch(ha -> ha.getType() == resourceType)) {
|
||||
final var subAssetEntity = builderTransformer.apply(
|
||||
HsHostingAssetRealEntity.builder()
|
||||
.type(subAssetType)
|
||||
.type(HsHostingAssetType.valueOf(subAssetType.name()))
|
||||
.parentAsset(domainSetupAsset))
|
||||
.build();
|
||||
domainSetupAsset.getSubHostingAssets().add(subAssetEntity);
|
||||
subAssetResource.ifPresent(
|
||||
res -> {
|
||||
ofNullable(res.getAssignedToAssetUuid())
|
||||
.map(uuid -> emw.find(HsHostingAssetRealEntity.class, uuid))
|
||||
.ifPresent(subAssetEntity::setAssignedToAsset);
|
||||
ofNullable(res.getAlarmContactUuid())
|
||||
.map(uuid -> emw.find(HsOfficeContactRealEntity.class, uuid))
|
||||
.ifPresent(subAssetEntity::setAlarmContact);
|
||||
ofNullable(res.getIdentifier()).ifPresent(subAssetEntity::setIdentifier);
|
||||
ofNullable(res.getCaption()).ifPresent(subAssetEntity::setCaption);
|
||||
res.getConfig();
|
||||
res.get
|
||||
|
||||
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
private String getDomainName() {
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
package net.hostsharing.hsadminng.lambda;
|
||||
|
||||
public class Reducer {
|
||||
public static <T> T toSingleElement(T last, T next) {
|
||||
throw new AssertionError("only a single entity expected");
|
||||
}
|
||||
|
||||
}
|
||||
@ -135,6 +135,9 @@ components:
|
||||
HsHostingAssetSubInsert:
|
||||
type: object
|
||||
properties:
|
||||
assignedToAssetUuid:
|
||||
type: string
|
||||
format: uuid
|
||||
type:
|
||||
$ref: '#/components/schemas/HsHostingAssetType'
|
||||
identifier:
|
||||
@ -147,9 +150,6 @@ components:
|
||||
minLength: 3
|
||||
maxLength: 80
|
||||
nullable: false
|
||||
assignedToAssetUuid:
|
||||
type: string
|
||||
format: uuid
|
||||
alarmContactUuid:
|
||||
type: string
|
||||
format: uuid
|
||||
|
||||
@ -189,7 +189,6 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
|
||||
context.define("superuser-alex@hostsharing.net", "hs_booking.project#D-1000111-D-1000111defaultproject:AGENT");
|
||||
final var givenProject = findDefaultProjectOfDebitorNumber(1000111);
|
||||
// TODO.impl: "sec01-web" should not work, but does
|
||||
final var givenUnixUser = realHostingAssetRepo.findByTypeAndIdentifier(UNIX_USER, "fir01-web").stream()
|
||||
.findFirst().orElseThrow();
|
||||
|
||||
@ -201,7 +200,7 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
.header("current-subject", "superuser-alex@hostsharing.net")
|
||||
.contentType(ContentType.JSON)
|
||||
.body("""
|
||||
{
|
||||
{
|
||||
"projectUuid": "{projectUuid}",
|
||||
"type": "DOMAIN_SETUP",
|
||||
"caption": "Domain-Setup for example.org",
|
||||
@ -212,22 +211,13 @@ class HsBookingItemControllerAcceptanceTest extends ContextBasedTestWithCleanup
|
||||
"asset": { // FIXME: rename to hostingAsset
|
||||
"identifier": "example.org", // also as default for all subAssets
|
||||
"subHostingAssets": [
|
||||
{
|
||||
"type": "DOMAIN_DNS_SETUP"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_HTTP_SETUP",
|
||||
"assignedToAssetUuid": "{unixUserUuid}"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_MBOX_SETUP"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_SMTP_SETUP"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
.replace("{projectUuid}", givenProject.getUuid().toString())
|
||||
.replace("{unixUserUuid}", givenUnixUser.getUuid().toString())
|
||||
|
||||
@ -6,7 +6,6 @@ import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRealEntity;
|
||||
import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType;
|
||||
import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetRealEntity;
|
||||
import net.hostsharing.hsadminng.hs.hosting.asset.validators.Dns;
|
||||
import net.hostsharing.hsadminng.lambda.Reducer;
|
||||
import net.hostsharing.hsadminng.persistence.EntityManagerWrapperFake;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
@ -34,22 +33,14 @@ class DomainSetupHostingAssetFactoryUnitTest {
|
||||
private final HsHostingAssetRealEntity managedWebspaceHostingAsset = HsHostingAssetRealEntity.builder()
|
||||
.uuid(UUID.randomUUID())
|
||||
.type(MANAGED_WEBSPACE)
|
||||
.identifier("one00")
|
||||
.build();
|
||||
|
||||
private final HsHostingAssetRealEntity unixUserHostingAsset = HsHostingAssetRealEntity.builder()
|
||||
.uuid(UUID.randomUUID())
|
||||
.type(UNIX_USER)
|
||||
.identifier("one00-web")
|
||||
.parentAsset(managedWebspaceHostingAsset)
|
||||
.build();
|
||||
|
||||
private final HsHostingAssetRealEntity anotherManagedWebspaceHostingAsset = HsHostingAssetRealEntity.builder()
|
||||
.uuid(UUID.randomUUID())
|
||||
.type(MANAGED_WEBSPACE)
|
||||
.identifier("two00")
|
||||
.build();
|
||||
|
||||
private EntityManagerWrapperFake emwFake = new EntityManagerWrapperFake();
|
||||
|
||||
@Spy
|
||||
@ -128,8 +119,16 @@ class DomainSetupHostingAssetFactoryUnitTest {
|
||||
);
|
||||
|
||||
// then
|
||||
assertEventStatus(givenBookingItem, givenAssetJson,
|
||||
"[[DNS] no TXT record 'Hostsharing-domain-setup-verification-code=null' found for domain name 'example.org' (nor in its super-domain)]");
|
||||
emwFake.stream(BookingItemCreatedEventEntity.class)
|
||||
.reduce(EntityManagerWrapperFake::toSingleElement)
|
||||
.map(eventEntity -> {
|
||||
assertThat(eventEntity.getBookingItem()).isSameAs(givenBookingItem);
|
||||
assertThat(eventEntity.getAssetJson()).isEqualTo(givenAssetJson);
|
||||
assertThat(eventEntity.getStatusMessage()).isEqualTo(
|
||||
"[[DNS] no TXT record 'Hostsharing-domain-setup-verification-code=null' found for domain name 'example.org' (nor in its super-domain)]"
|
||||
);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -165,45 +164,15 @@ class DomainSetupHostingAssetFactoryUnitTest {
|
||||
);
|
||||
|
||||
// then
|
||||
assertEventStatus(givenBookingItem, givenAssetJson,
|
||||
"domain DNS setup not allowed for legacy compatibility");
|
||||
}
|
||||
|
||||
@Test
|
||||
void persistsEventEntityIfSuppliedDomainUnixUserAndSmtpSetupWebspaceDontMatch() {
|
||||
// given
|
||||
final var givenBookingItem = createBookingItemFromResources(
|
||||
entry("domainName", "example.org"),
|
||||
entry("verificationCode", "just-a-fake-verification-code")
|
||||
);
|
||||
final var givenAssetJson = """
|
||||
{
|
||||
"identifier": "example.org", // also as default for all subAssets
|
||||
"subHostingAssets": [
|
||||
{
|
||||
"type": "DOMAIN_HTTP_SETUP",
|
||||
"assignedToAssetUuid": "{unixUserHostingAssetUuid}"
|
||||
},
|
||||
{
|
||||
"type": "DOMAIN_SMTP_SETUP",
|
||||
"assignedToAssetUuid": "{managedWebspaceHostingAssetUuid}"
|
||||
}
|
||||
]
|
||||
}
|
||||
"""
|
||||
.replace("{unixUserHostingAssetUuid}", unixUserHostingAsset.getUuid().toString())
|
||||
.replace("{managedWebspaceHostingAssetUuid}", anotherManagedWebspaceHostingAsset.getUuid().toString());
|
||||
Dns.fakeResultForDomain("example.org",
|
||||
Dns.Result.fromRecords("Hostsharing-domain-setup-verification-code=just-a-fake-verification-code"));
|
||||
|
||||
// when
|
||||
listener.onApplicationEvent(
|
||||
new BookingItemCreatedAppEvent(this, givenBookingItem, givenAssetJson)
|
||||
);
|
||||
|
||||
// then
|
||||
assertEventStatus(givenBookingItem, givenAssetJson,
|
||||
emwFake.stream(BookingItemCreatedEventEntity.class)
|
||||
.reduce(EntityManagerWrapperFake::toSingleElement)
|
||||
.map(eventEntity -> {
|
||||
assertThat(eventEntity.getBookingItem()).isSameAs(givenBookingItem);
|
||||
assertThat(eventEntity.getAssetJson()).isEqualTo(givenAssetJson);
|
||||
assertThat(eventEntity.getStatusMessage()).isEqualTo(
|
||||
"domain DNS setup not allowed for legacy compatibility");
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
@SafeVarargs
|
||||
@ -213,18 +182,4 @@ class DomainSetupHostingAssetFactoryUnitTest {
|
||||
.resources(Map.ofEntries(givenResources))
|
||||
.build();
|
||||
}
|
||||
|
||||
private void assertEventStatus(
|
||||
final HsBookingItemRealEntity givenBookingItem,
|
||||
final String givenAssetJson,
|
||||
final String expectedErrorMessage) {
|
||||
emwFake.stream(BookingItemCreatedEventEntity.class)
|
||||
.reduce(Reducer::toSingleElement)
|
||||
.map(eventEntity -> {
|
||||
assertThat(eventEntity.getBookingItem()).isSameAs(givenBookingItem);
|
||||
assertThat(eventEntity.getAssetJson()).isEqualTo(givenAssetJson);
|
||||
assertThat(eventEntity.getStatusMessage()).isEqualTo(expectedErrorMessage);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,6 +15,10 @@ public class EntityManagerWrapperFake extends EntityManagerWrapper {
|
||||
|
||||
private Map<Class<?>, Map<Object, Object>> entityClasses = new HashMap<>();
|
||||
|
||||
public static <T> T toSingleElement(T last, T next) {
|
||||
throw new AssertionError("only a single entity expected");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean contains(final Object entity) {
|
||||
final var id = getEntityId(entity);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user