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] 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