RHCLOUD-28235 Unify how org ID is passed to connectors

gwenneg · Sep 23, 2023 · 2b7fd97 · 2b7fd97
1 parent 2c613eb
commit 2b7fd97
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 25 deletions.
diff --git a/engine/src/main/java/com/redhat/cloud/notifications/processors/ConnectorSender.java b/engine/src/main/java/com/redhat/cloud/notifications/processors/ConnectorSender.java
@@ -43,14 +43,15 @@ public class ConnectorSender {
     NotificationHistoryRepository notificationHistoryRepository;
 
     public void send(Event event, Endpoint endpoint, JsonObject payload) {
+        payload.put("orgId", event.getOrgId());
 
         String connector = getConnector(endpoint);
 
         NotificationHistory history = getHistoryStub(endpoint, event, 0L, UUID.randomUUID());
         history.setStatus(PROCESSING);
 
         Log.infof("Sending notification to connector [orgId=%s, eventId=%s, connector=%s, historyId=%s]",
-                endpoint.getOrgId(), event.getId(), connector, history.getId());
+                event.getOrgId(), event.getId(), connector, history.getId());
 
         notificationHistoryRepository.createNotificationHistory(history);
 
@@ -62,7 +63,7 @@ public void send(Event event, Endpoint endpoint, JsonObject payload) {
             history.setDetails(Map.of("failure", e.getMessage()));
             notificationHistoryRepository.updateHistoryItem(history);
             Log.infof(e, "Failed to send notification to connector [orgId=%s, eventId=%s, connector=%s, historyId=%s]",
-                    endpoint.getOrgId(), event.getId(), connector, history.getId());
+                    event.getOrgId(), event.getId(), connector, history.getId());
         }
     }
 

diff --git a/engine/src/main/java/com/redhat/cloud/notifications/processors/camel/CamelNotification.java b/engine/src/main/java/com/redhat/cloud/notifications/processors/camel/CamelNotification.java
@@ -2,14 +2,7 @@
 
 public class CamelNotification {
 
-    public String orgId;
-
     public String webhookUrl;
 
     public String message;
-
-    @Override
-    public String toString() {
-        return "CamelNotification [orgId=" + orgId + ", webhookUrl=" + webhookUrl + "]";
-    }
 }
diff --git a/engine/src/main/java/com/redhat/cloud/notifications/processors/camel/CamelProcessor.java b/engine/src/main/java/com/redhat/cloud/notifications/processors/camel/CamelProcessor.java
@@ -103,7 +103,6 @@ protected CamelNotification getCamelNotification(Event event, Endpoint endpoint)
         CamelProperties properties = endpoint.getProperties(CamelProperties.class);
 
         CamelNotification notification = new CamelNotification();
-        notification.orgId = endpoint.getOrgId();
         notification.webhookUrl = properties.getUrl();
         notification.message = message;
         return notification;

diff --git a/...rc/main/java/com/redhat/cloud/notifications/processors/camel/slack/SlackNotification.java b/...rc/main/java/com/redhat/cloud/notifications/processors/camel/slack/SlackNotification.java
@@ -5,9 +5,4 @@
 public class SlackNotification extends CamelNotification {
 
     public String channel;
-
-    @Override
-    public String toString() {
-        return "SlackNotification [orgId=" + orgId + ", webhookUrl=" + webhookUrl + ", channel=" + channel + "]";
-    }
 }
diff --git a/...e/src/main/java/com/redhat/cloud/notifications/processors/camel/slack/SlackProcessor.java b/...e/src/main/java/com/redhat/cloud/notifications/processors/camel/slack/SlackProcessor.java
@@ -28,7 +28,6 @@ protected CamelNotification getCamelNotification(Event event, Endpoint endpoint)
         CamelProperties properties = endpoint.getProperties(CamelProperties.class);
 
         SlackNotification notification = new SlackNotification();
-        notification.orgId = endpoint.getOrgId();
         notification.webhookUrl = properties.getUrl();
         notification.channel = properties.getExtras().get("channel");
         notification.message = message;

diff --git a/engine/src/test/java/com/redhat/cloud/notifications/processors/camel/CamelProcessorTest.java b/engine/src/test/java/com/redhat/cloud/notifications/processors/camel/CamelProcessorTest.java
@@ -105,11 +105,11 @@ protected void verifyKafkaMessage() {
         assertNotNull(cloudEventMetadata.getId());
         assertEquals(getExpectedCloudEventType(), cloudEventMetadata.getType());
 
-        CamelNotification notification = message.getPayload().mapTo(CamelNotification.class);
+        JsonObject notification = message.getPayload();
 
-        assertEquals(DEFAULT_ORG_ID, notification.orgId);
-        assertEquals(WEBHOOK_URL, notification.webhookUrl);
-        assertEquals(getExpectedMessage(), notification.message);
+        assertEquals(DEFAULT_ORG_ID, notification.getString("orgId"));
+        assertEquals(WEBHOOK_URL, notification.getString("webhookUrl"));
+        assertEquals(getExpectedMessage(), notification.getString("message"));
     }
 
     protected void assertNotificationsConnectorHeader(Message<JsonObject> message) {
@@ -155,6 +155,7 @@ protected static Event buildEvent() {
 
         Event event = new Event();
         event.setId(UUID.randomUUID());
+        event.setOrgId(DEFAULT_ORG_ID);
         event.setEventWrapper(new EventWrapperAction(action));
 
         return event;

diff --git a/...c/test/java/com/redhat/cloud/notifications/processors/camel/slack/SlackProcessorTest.java b/...c/test/java/com/redhat/cloud/notifications/processors/camel/slack/SlackProcessorTest.java
@@ -66,12 +66,12 @@ protected void verifyKafkaMessage() {
         assertNotNull(cloudEventMetadata.getId());
         assertEquals(getExpectedCloudEventType(), cloudEventMetadata.getType());
 
-        SlackNotification notification = message.getPayload().mapTo(SlackNotification.class);
+        JsonObject notification = message.getPayload();
 
-        assertEquals(DEFAULT_ORG_ID, notification.orgId);
-        assertEquals(WEBHOOK_URL, notification.webhookUrl);
-        assertEquals(CHANNEL, notification.channel);
-        assertEquals(SLACK_EXPECTED_MSG, notification.message);
+        assertEquals(DEFAULT_ORG_ID, notification.getString("orgId"));
+        assertEquals(WEBHOOK_URL, notification.getString("webhookUrl"));
+        assertEquals(CHANNEL, notification.getString("channel"));
+        assertEquals(SLACK_EXPECTED_MSG, notification.getString("message"));
     }
 
     @Override