hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

fix import with domain setup dns verification #98

Merged
hsh-michaelhoennig merged 1 commits from fix-import-with-domain-setup-dns-verification into master 2024-09-11 13:32:50 +02:00
Conversation 0 Commits 1 Files Changed 2 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainSetupHostingAssetValidator.java
View File

@ -26,9 +26,11 @@ class HsDomainSetupHostingAssetValidator extends HostingAssetEntityValidator {
@Override @Override
public List<String> validateEntity(final HsHostingAsset assetEntity) { public List<String> validateEntity(final HsHostingAsset assetEntity) {
final var violations = // new ArrayList<String>(); final var violations = super.validateEntity(assetEntity);
super.validateEntity(assetEntity); if (!violations.isEmpty() || assetEntity.isLoaded()) {
if (!violations.isEmpty()) { // it makes no sense to do DNS-based validation
// if the entity is already persisted or
// if the identifier (domain name) or structure is already invalid
return violations; return violations;
} }

1
src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
View File

@ -1450,6 +1450,7 @@ public class ImportHostingAssets extends BaseOfficeDataImport {
// nothing here // nothing here
)) ))
.build(); .build();
domainSetupAsset.markAsLoaded(); // to skip setup verification
domainSetupsByName.put(domain_name, domainSetupAsset); domainSetupsByName.put(domain_name, domainSetupAsset);
domainSetupAssets.put(domain_id, domainSetupAsset); domainSetupAssets.put(domain_id, domainSetupAsset);
domainSetupAsset.setSubHostingAssets(new ArrayList<>()); domainSetupAsset.setSubHostingAssets(new ArrayList<>());