Small update of webhooks

src/main/java/net/geant/nmaas/portal/service/impl/DomainServiceImpl.java

@@ -339,21 +339,26 @@ public class DomainServiceImpl implements DomainService {
         String removedSuffix = "_DELETED_" + OffsetDateTime.now();
         return findDomain(domainId).map(domain -> {
             checkGlobal(domain);
+            final DomainView domainViewForEvent = modelMapper.map(domain, DomainView.class);
+
             dcnRepositoryManager.removeDcnInfo(domain.getCodename());
             domain.setDeleted(true);
             domain.setName(domain.getName() + removedSuffix);
             domain.setCodename(domain.getCodename() + removedSuffix);
-            Long domainDcnDetailsId = domain.getDomainDcnDetails().getId();
+
+            final Long domainDcnDetailsId = domain.getDomainDcnDetails().getId();
             domain.setDomainDcnDetails(null);
             domainDcnDetailsRepository.deleteById(domainDcnDetailsId);
-            Long domainTechDetailsId = domain.getDomainTechDetails().getId();
+
+            final Long domainTechDetailsId = domain.getDomainTechDetails().getId();
             domain.setDomainTechDetails(null);
             domainTechDetailsRepository.deleteById(domainTechDetailsId);
+
             removeAllUsersFromDomain(domain);
             removeDomainFromAllGroups(domain);
             domainRepository.save(domain);
-            DomainView domainView = modelMapper.map(domain, DomainView.class);
-            eventPublisher.publishEvent(new DomainRemovalEvent(this, domainView, true));
+
+            eventPublisher.publishEvent(new DomainRemovalEvent(this, domainViewForEvent, true));
             return true;
         }).orElse(false);
     }

src/main/java/net/geant/nmaas/portal/service/impl/WebhooksEventListener.java

@@ -55,14 +55,15 @@ public class WebhooksEventListener {
     @Loggable(LogLevel.INFO)
     @Transactional
     public void trigger(DomainRemovalEvent event) {
-        final DomainView domainView = event.getDomainView();
+        final DomainView domain = event.getDomainView();
+        domain.setClusters(Collections.emptyList());
         String action = event.isHardRemoval() ? "delete" : "softDelete";
         webhookEventRepository.findIdByEventType(WebhookEventType.DOMAIN_ACTION)
                 .forEach(id ->
                         scheduleManager.createOneTimeJob(
                                 DomainActionJob.class,
-                                "Domain" + action + "_" + id + "_" + domainView.getId(),
-                                Map.of("webhookId", id, "domain", domainView, "action", action))
+                                "Domain" + action + "_" + id + "_" + domain.getId(),
+                                Map.of("webhookId", id, "domain", domain, "action", action))
                 );
     }
 

src/test/shell/data/i18n/de.json

@@ -1359,10 +1359,10 @@
     "TYPE" : "Webhook type",
     "TOKEN" : "Token value",
     "AUTH" : "Authorization header",
-    "DOMAIN_CREATION" : "Domain creation",
+    "DOMAIN_ACTION" : "Domain action",
+    "DOMAIN_GROUP_ACTION" : "Domain group action",
     "APPLICATION_DEPLOYMENT" : "Application deployment",
     "USER_ASSIGNMENT" : "User assignment",
-    "DOMAIN_GROUP_CHANGE" : "Domain group change",
     "NEW" : "Add webhook",
     "DETAILS" : "Webhooks details",
     "SAVE" : "Save",

src/test/shell/data/i18n/en.json

@@ -1364,10 +1364,10 @@
     "TYPE" : "Webhook type",
     "TOKEN" : "Token value",
     "AUTH" : "Authorization header",
-    "DOMAIN_CREATION" : "Domain creation",
+    "DOMAIN_ACTION" : "Domain action",
+    "DOMAIN_GROUP_ACTION" : "Domain group action",
     "APPLICATION_DEPLOYMENT" : "Application deployment",
     "USER_ASSIGNMENT" : "User assignment",
-    "DOMAIN_GROUP_CHANGE" : "Domain group change",
     "NEW" : "Add webhook",
     "DETAILS" : "Webhooks details",
     "SAVE" : "Save",

src/test/shell/data/i18n/fr.json

@@ -1363,10 +1363,10 @@
     "TYPE" : "Webhook type",
     "TOKEN" : "Token value",
     "AUTH" : "Authorization header",
-    "DOMAIN_CREATION" : "Domain creation",
+    "DOMAIN_ACTION" : "Domain action",
+    "DOMAIN_GROUP_ACTION" : "Domain group action",
     "APPLICATION_DEPLOYMENT" : "Application deployment",
     "USER_ASSIGNMENT" : "User assignment",
-    "DOMAIN_GROUP_CHANGE" : "Domain group change",
     "NEW" : "Add webhook",
     "DETAILS" : "Webhooks details",
     "SAVE" : "Save",

src/test/shell/data/i18n/pl.json

@@ -1362,10 +1362,10 @@
     "TYPE" : "Webhook type",
     "TOKEN" : "Token value",
     "AUTH" : "Authorization header",
-    "DOMAIN_CREATION" : "Domain creation",
+    "DOMAIN_ACTION" : "Domain action",
+    "DOMAIN_GROUP_ACTION" : "Domain group action",
     "APPLICATION_DEPLOYMENT" : "Application deployment",
     "USER_ASSIGNMENT" : "User assignment",
-    "DOMAIN_GROUP_CHANGE" : "Domain group change",
     "NEW" : "Add webhook",
     "DETAILS" : "Webhooks details",
     "SAVE" : "Save",