From 83265091e93d9c052775f67dc2fd3dbafa1e9873 Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Tue, 27 May 2025 10:19:54 +0200
Subject: [PATCH 1/2] change webhook update

---
 .../nmaas/portal/api/market/WebhookEventController.java      | 4 ++--
 .../net/geant/nmaas/portal/service/WebhookEventService.java  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/geant/nmaas/portal/api/market/WebhookEventController.java b/src/main/java/net/geant/nmaas/portal/api/market/WebhookEventController.java
index 455af4018..e99ba0b1a 100644
--- a/src/main/java/net/geant/nmaas/portal/api/market/WebhookEventController.java
+++ b/src/main/java/net/geant/nmaas/portal/api/market/WebhookEventController.java
@@ -49,13 +49,13 @@ public class WebhookEventController {
     @PutMapping("/{id}")
     @Transactional
     @PreAuthorize("hasRole('ROLE_SYSTEM_ADMIN')")
-    public void updateWebhook(@PathVariable Long id, @RequestBody @Valid WebhookEventDto webhook) {
+    public ResponseEntity<WebhookEventDto> updateWebhook(@PathVariable Long id, @RequestBody @Valid WebhookEventDto webhook) {
         if (!id.equals(webhook.getId())) {
             throw new ProcessingException(UNABLE_TO_CHANGE_WEBHOOK_EVENT);
         }
 
         try {
-            webhookEventService.update(webhook);
+            return ResponseEntity.ok(webhookEventService.update(webhook));
         } catch (GeneralSecurityException e) {
             throw new RuntimeException(e);
         }
diff --git a/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java b/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java
index 7d698b738..7423f74cf 100644
--- a/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java
+++ b/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java
@@ -35,10 +35,11 @@ public class WebhookEventService {
         return webhookRepository.save(webhookEvent);
     }
 
-    public void update(WebhookEventDto webhookEventDto) throws GeneralSecurityException {
+    public WebhookEventDto update(WebhookEventDto webhookEventDto) throws GeneralSecurityException {
         WebhookEvent webhookEvent = webhookRepository.findById(webhookEventDto.getId()).orElseThrow(() -> new MissingElementException(WEBHOOK_EVENT_NOT_FOUND));
         setWebhookEvent(webhookEvent, webhookEventDto);
-        webhookRepository.save(webhookEvent);
+        webhookEvent = webhookRepository.save(webhookEvent);
+        return modelMapper.map(webhookEvent, WebhookEventDto.class);
     }
 
     private void setWebhookEvent(WebhookEvent webhookEvent, WebhookEventDto webhookEventDto) throws GeneralSecurityException {
-- 
GitLab


From 6bff48cf4dde778152a486b8159ff2a0833286fd Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Tue, 27 May 2025 10:20:39 +0200
Subject: [PATCH 2/2] remote cluster change domainnames

---
 .../kubernetes/RemoteClusterManager.java      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
index 36ae7abb5..1ce39f84b 100644
--- a/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
+++ b/src/main/java/net/geant/nmaas/externalservices/kubernetes/RemoteClusterManager.java
@@ -151,11 +151,7 @@ public class RemoteClusterManager implements ClusterMonitoringService {
                                 .state(KClusterState.UNKNOWN)
                                 .contactEmail(view.getContactEmail())
                                 .currentStateSince(OffsetDateTime.now())
-                                .domains(!view.getDomainNames().isEmpty() ? view.getDomainNames().stream().map(d -> {
-                                            Optional<Domain> dom = domainService.findDomain(d);
-                                            return dom.orElse(null);
-                                        }
-                                ).toList() : Collections.emptyList())
+                                .domains(prepareList(view))
                                 .build(),
                         file);
 
@@ -170,6 +166,17 @@ public class RemoteClusterManager implements ClusterMonitoringService {
         return null;
     }
 
+    private List<Domain> prepareList(RemoteClusterView view) {
+        if (view == null || view.getDomainNames() == null) {
+            return Collections.emptyList();
+        }
+        return view.getDomainNames().stream().map(d -> {
+                    Optional<Domain> dom = domainService.findDomain(d);
+                    return dom.orElse(null);
+                }
+        ).toList();
+    }
+
     public RemoteClusterView updateCluster(RemoteClusterView cluster, Long id) {
         Optional<KCluster> entity = clusterRepository.findById(id);
 
@@ -332,7 +339,7 @@ public class RemoteClusterManager implements ClusterMonitoringService {
 
     public void removeCluster(Long id) {
         try {
-            if(clusterRepository.existsById(id)) {
+            if (clusterRepository.existsById(id)) {
                 this.clusterRepository.deleteById(id);
             }
         } catch (RuntimeException ex) {
-- 
GitLab