[RHCLOUD-36917] Debug/Update recipients authorization criterion management

connector-email/src/main/java/com/redhat/cloud/notifications/connector/email/EmailCloudEventDataExtractor.java

@@ -59,7 +59,7 @@ public void extract(final Exchange exchange, final JsonObject cloudEventData) {
         exchange.setProperty(ExchangeProperty.SUBSCRIBED_BY_DEFAULT, cloudEventData.getBoolean("subscribed_by_default"));
         exchange.setProperty(ExchangeProperty.SUBSCRIBERS, subscribers);
         exchange.setProperty(ExchangeProperty.UNSUBSCRIBERS, unsubscribers);
-        exchange.setProperty(ExchangeProperty.AUTHORIZATION_CRITERIA, recipientsAuthorizationCriterion);
+        exchange.setProperty(ExchangeProperty.RECIPIENTS_AUTHORIZATION_CRITERION, recipientsAuthorizationCriterion);
         exchange.setProperty(ExchangeProperty.EMAIL_RECIPIENTS, emails);
         exchange.setProperty(ExchangeProperty.EMAIL_SENDER, cloudEventData.getString("email_sender"));
 

connector-email/src/main/java/com/redhat/cloud/notifications/connector/email/constants/ExchangeProperty.java

@@ -49,5 +49,5 @@ public class ExchangeProperty {
 
     public static final String USE_EMAIL_BOP_V1_SSL = "use_email_bop_V1_ssl";
 
-    public static final String AUTHORIZATION_CRITERIA = "authorization_criteria";
+    public static final String RECIPIENTS_AUTHORIZATION_CRITERION = "recipients_authorization_criterion";
 }

connector-email/src/main/java/com/redhat/cloud/notifications/connector/email/processors/recipients/RecipientsQuery.java

@@ -24,5 +24,5 @@ public class RecipientsQuery {
 
     public boolean subscribedByDefault;
 
-    public JsonObject authorizationCriteria;
+    public JsonObject recipientsAuthorizationCriterion;
 }

connector-email/src/main/java/com/redhat/cloud/notifications/connector/email/processors/recipients/RecipientsResolverRequestPreparer.java

@@ -26,7 +26,7 @@ public void process(final Exchange exchange) throws JsonProcessingException {
         List<RecipientSettings> recipientSettings = exchange.getProperty(ExchangeProperty.RECIPIENT_SETTINGS, List.class);
         Set<String> subscribers = exchange.getProperty(ExchangeProperty.SUBSCRIBERS, Set.class);
         Set<String> unsubscribers = exchange.getProperty(ExchangeProperty.UNSUBSCRIBERS, Set.class);
-        JsonObject authorizationCriteria = exchange.getProperty(ExchangeProperty.AUTHORIZATION_CRITERIA, JsonObject.class);
+        JsonObject recipientsAuthorizationCriterion = exchange.getProperty(ExchangeProperty.RECIPIENTS_AUTHORIZATION_CRITERION, JsonObject.class);
 
         boolean subscribedByDefault = exchange.getProperty(ExchangeProperty.SUBSCRIBED_BY_DEFAULT, boolean.class);
         final String orgId = exchange.getProperty(ORG_ID, String.class);
@@ -37,7 +37,7 @@ public void process(final Exchange exchange) throws JsonProcessingException {
         recipientsQuery.orgId = orgId;
         recipientsQuery.recipientSettings = Set.copyOf(recipientSettings);
         recipientsQuery.subscribedByDefault = subscribedByDefault;
-        recipientsQuery.authorizationCriteria = authorizationCriteria;
+        recipientsQuery.recipientsAuthorizationCriterion = recipientsAuthorizationCriterion;
 
         // Serialize the payload.
         exchange.getMessage().setBody(objectMapper.writeValueAsString(recipientsQuery));

engine/src/main/java/com/redhat/cloud/notifications/processors/ExternalAuthorizationCriterionExtractor.java → engine/src/main/java/com/redhat/cloud/notifications/processors/RecipientsAuthorizationCriterionExtractor.java

@@ -1,6 +1,7 @@
 package com.redhat.cloud.notifications.processors;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.redhat.cloud.notifications.ingress.RecipientsAuthorizationCriterion;
 import com.redhat.cloud.notifications.models.EmailAggregation;
 import com.redhat.cloud.notifications.models.Event;
 import com.redhat.cloud.notifications.transformers.BaseTransformer;
@@ -9,29 +10,29 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
-@ApplicationScoped
-public class ExternalAuthorizationCriterionExtractor {
+import static com.redhat.cloud.notifications.transformers.BaseTransformer.RECIPIENTS_AUTHORIZATION_CRITERION;
 
-    public static final String EXTERNAL_AUTHORIZATION_CRITERIA = "recipients_authorization_criterion";
+@ApplicationScoped
+public class RecipientsAuthorizationCriterionExtractor {
 
     @Inject
     BaseTransformer baseTransformer;
 
     @Inject
     ObjectMapper objectMapper;
 
-    public ExternalAuthorizationCriterion extract(Event event) {
+    public RecipientsAuthorizationCriterion extract(Event event) {
         return extract(baseTransformer.toJsonObject(event));
     }
 
-    public ExternalAuthorizationCriterion extract(EmailAggregation emailAggregation) {
+    public RecipientsAuthorizationCriterion extract(EmailAggregation emailAggregation) {
         return extract(emailAggregation.getPayload());
     }
 
-    private ExternalAuthorizationCriterion extract(JsonObject data) {
-        if (null != data.getJsonObject(BaseTransformer.CONTEXT) && null != data.getJsonObject(BaseTransformer.CONTEXT).getJsonObject(EXTERNAL_AUTHORIZATION_CRITERIA)) {
+    private RecipientsAuthorizationCriterion extract(JsonObject data) {
+        if (null != data.getJsonObject(RECIPIENTS_AUTHORIZATION_CRITERION)) {
             try {
-                return objectMapper.convertValue(data.getJsonObject(BaseTransformer.CONTEXT).getJsonObject(EXTERNAL_AUTHORIZATION_CRITERIA), ExternalAuthorizationCriterion.class);
+                return objectMapper.convertValue(data.getJsonObject(RECIPIENTS_AUTHORIZATION_CRITERION), RecipientsAuthorizationCriterion.class);
             } catch (IllegalArgumentException e) {
                 Log.error("Error parsing authorization criteria", e);
             }

engine/src/main/java/com/redhat/cloud/notifications/processors/drawer/DrawerNotificationToConnector.java

@@ -1,8 +1,8 @@
 package com.redhat.cloud.notifications.processors.drawer;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.redhat.cloud.notifications.ingress.RecipientsAuthorizationCriterion;
 import com.redhat.cloud.notifications.models.DrawerEntryPayload;
-import com.redhat.cloud.notifications.processors.ExternalAuthorizationCriterion;
 import com.redhat.cloud.notifications.processors.email.connector.dto.RecipientSettings;
 import java.util.Collection;
 
@@ -20,6 +20,6 @@ public record DrawerNotificationToConnector(
     @JsonProperty("unsubscribers")
     Collection<String> unsubscribers,
 
-    @JsonProperty("authorization_criteria")
-    ExternalAuthorizationCriterion externalAuthorizationCriteria
+    @JsonProperty("recipients_authorization_criterion")
+    RecipientsAuthorizationCriterion recipientsAuthorizationCriterion
 )  { }

engine/src/main/java/com/redhat/cloud/notifications/processors/drawer/DrawerProcessor.java

@@ -14,7 +14,7 @@
 import com.redhat.cloud.notifications.models.Event;
 import com.redhat.cloud.notifications.models.IntegrationTemplate;
 import com.redhat.cloud.notifications.processors.ConnectorSender;
-import com.redhat.cloud.notifications.processors.ExternalAuthorizationCriterionExtractor;
+import com.redhat.cloud.notifications.processors.RecipientsAuthorizationCriterionExtractor;
 import com.redhat.cloud.notifications.processors.SystemEndpointTypeProcessor;
 import com.redhat.cloud.notifications.processors.email.connector.dto.RecipientSettings;
 import com.redhat.cloud.notifications.templates.TemplateService;
@@ -70,7 +70,7 @@ public class DrawerProcessor extends SystemEndpointTypeProcessor {
     BundleRepository bundleRepository;
 
     @Inject
-    ExternalAuthorizationCriterionExtractor externalAuthorizationCriteriaExtractor;
+    RecipientsAuthorizationCriterionExtractor recipientsAuthorizationCriterionExtractor;
 
     @Override
     public void process(Event event, List<Endpoint> endpoints) {
@@ -101,7 +101,7 @@ public void process(Event event, List<Endpoint> endpoints) {
             drawerEntryPayload,
             recipientSettings,
             unsubscribers,
-            externalAuthorizationCriteriaExtractor.extract(event)
+            recipientsAuthorizationCriterionExtractor.extract(event)
         );
 
         connectorSender.send(event, endpoints.getFirst(), JsonObject.mapFrom(drawerNotificationToConnector));

engine/src/main/java/com/redhat/cloud/notifications/processors/email/EmailAggregator.java

@@ -12,6 +12,7 @@
 import com.redhat.cloud.notifications.events.EventWrapperCloudEvent;
 import com.redhat.cloud.notifications.ingress.Action;
 import com.redhat.cloud.notifications.ingress.Recipient;
+import com.redhat.cloud.notifications.ingress.RecipientsAuthorizationCriterion;
 import com.redhat.cloud.notifications.models.EmailAggregation;
 import com.redhat.cloud.notifications.models.EmailAggregationKey;
 import com.redhat.cloud.notifications.models.Endpoint;
@@ -20,8 +21,7 @@
 import com.redhat.cloud.notifications.models.EventType;
 import com.redhat.cloud.notifications.models.NotificationsConsoleCloudEvent;
 import com.redhat.cloud.notifications.models.SubscriptionType;
-import com.redhat.cloud.notifications.processors.ExternalAuthorizationCriterion;
-import com.redhat.cloud.notifications.processors.ExternalAuthorizationCriterionExtractor;
+import com.redhat.cloud.notifications.processors.RecipientsAuthorizationCriterionExtractor;
 import com.redhat.cloud.notifications.processors.email.aggregators.AbstractEmailPayloadAggregator;
 import com.redhat.cloud.notifications.processors.email.aggregators.EmailPayloadAggregatorFactory;
 import com.redhat.cloud.notifications.recipients.User;
@@ -82,7 +82,7 @@ public class EmailAggregator {
     private static final String RECIPIENTS_KEY = "recipients";
 
     @Inject
-    ExternalAuthorizationCriterionExtractor externalAuthorizationCriteriaExtractor;
+    RecipientsAuthorizationCriterionExtractor recipientsAuthorizationCriterionExtractor;
 
     @ConfigProperty(name = "notifications.aggregation.max-page-size", defaultValue = "100")
     int maxPageSize;
@@ -147,7 +147,7 @@ private void aggregationBasedOnEmailAggregation(EmailAggregationKey aggregationK
 
                 Set<String> subscribers = subscribersByEventType.getOrDefault(eventType.getName(), Collections.emptySet());
                 Set<String> unsubscribers = unsubscribersByEventType.getOrDefault(eventType.getName(), Collections.emptySet());
-                ExternalAuthorizationCriterion externalAuthorizationCriteria = externalAuthorizationCriteriaExtractor.extract(aggregation);
+                RecipientsAuthorizationCriterion externalAuthorizationCriteria = recipientsAuthorizationCriterionExtractor.extract(aggregation);
 
                 Set<User> recipients = externalRecipientsResolver.recipientUsers(
                     aggregationKey.getOrgId(),
@@ -209,7 +209,7 @@ private void aggregationBasedOnEvent(EventAggregationCriteria eventAggregationCr
                 Set<String> subscribers = subscribersByEventType.getOrDefault(eventType.getName(), Collections.emptySet());
                 Set<String> unsubscribers = unsubscribersByEventType.getOrDefault(eventType.getName(), Collections.emptySet());
                 aggregation.setEventWrapper(getEventWrapper(aggregation.getPayload()));
-                ExternalAuthorizationCriterion externalAuthorizationCriterion = externalAuthorizationCriteriaExtractor.extract(aggregation);
+                RecipientsAuthorizationCriterion externalAuthorizationCriterion = recipientsAuthorizationCriterionExtractor.extract(aggregation);
 
                 Log.info("Start calling external resolver service ");
                 Set<User> recipients = externalRecipientsResolver.recipientUsers(

engine/src/main/java/com/redhat/cloud/notifications/processors/email/EmailProcessor.java

@@ -7,7 +7,7 @@
 import com.redhat.cloud.notifications.models.Event;
 import com.redhat.cloud.notifications.models.InstantEmailTemplate;
 import com.redhat.cloud.notifications.processors.ConnectorSender;
-import com.redhat.cloud.notifications.processors.ExternalAuthorizationCriterionExtractor;
+import com.redhat.cloud.notifications.processors.RecipientsAuthorizationCriterionExtractor;
 import com.redhat.cloud.notifications.processors.SystemEndpointTypeProcessor;
 import com.redhat.cloud.notifications.processors.email.connector.dto.EmailNotification;
 import com.redhat.cloud.notifications.processors.email.connector.dto.RecipientSettings;
@@ -53,7 +53,7 @@ public class EmailProcessor extends SystemEndpointTypeProcessor {
     SubscriptionRepository subscriptionRepository;
 
     @Inject
-    ExternalAuthorizationCriterionExtractor externalAuthorizationCriteriaExtractor;
+    RecipientsAuthorizationCriterionExtractor recipientsAuthorizationCriterionExtractor;
 
     @Override
     public void process(final Event event, final List<Endpoint> endpoints) {
@@ -123,7 +123,7 @@ public void process(final Event event, final List<Endpoint> endpoints, final boo
             subscribers,
             unsubscribers,
             event.getEventType().isSubscribedByDefault(),
-            externalAuthorizationCriteriaExtractor.extract(event)
+            recipientsAuthorizationCriterionExtractor.extract(event)
         );
 
         Log.debugf("[org_id: %s] Sending email notification to connector", emailNotification);

engine/src/main/java/com/redhat/cloud/notifications/processors/email/connector/dto/EmailNotification.java

@@ -1,7 +1,7 @@
 package com.redhat.cloud.notifications.processors.email.connector.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.redhat.cloud.notifications.processors.ExternalAuthorizationCriterion;
+import com.redhat.cloud.notifications.ingress.RecipientsAuthorizationCriterion;
 import java.util.Collection;
 
 /**
@@ -21,7 +21,7 @@
  *                              event type.
  * @param subscribedByDefault   true if the event type is subscribed by
  *                              default.
- * @param externalAuthorizationCriteria   forward received authorization criteria.
+ * @param recipientsAuthorizationCriterion   forward received authorization criterion.
  *
  */
 public record EmailNotification(
@@ -33,5 +33,5 @@ public record EmailNotification(
     @JsonProperty("subscribers")            Collection<String> subscribers,
     @JsonProperty("unsubscribers")          Collection<String> unsubscribers,
     @JsonProperty("subscribed_by_default")  boolean subscribedByDefault,
-    @JsonProperty("external_authorization_criterion") ExternalAuthorizationCriterion externalAuthorizationCriteria
+    @JsonProperty("recipients_authorization_criterion") RecipientsAuthorizationCriterion recipientsAuthorizationCriterion
 )  { }

engine/src/main/java/com/redhat/cloud/notifications/recipients/recipientsresolver/ExternalRecipientsResolver.java

@@ -1,6 +1,6 @@
 package com.redhat.cloud.notifications.recipients.recipientsresolver;
 
-import com.redhat.cloud.notifications.processors.ExternalAuthorizationCriterion;
+import com.redhat.cloud.notifications.ingress.RecipientsAuthorizationCriterion;
 import com.redhat.cloud.notifications.recipients.RecipientSettings;
 import com.redhat.cloud.notifications.recipients.User;
 import com.redhat.cloud.notifications.recipients.recipientsresolver.pojo.RecipientsQuery;
@@ -59,7 +59,7 @@ private <T> T retryOnError(final CheckedSupplier<T> usersServiceCall) {
     }
 
     @CacheResult(cacheName = "recipients-resolver-results")
-    public Set<User> recipientUsers(String orgId, Set<RecipientSettings> recipientSettings, Set<String> subscribers, Set<String> unsubscribers, boolean subscribedByDefault, ExternalAuthorizationCriterion externalAuthorizationCriteria) {
+    public Set<User> recipientUsers(String orgId, Set<RecipientSettings> recipientSettings, Set<String> subscribers, Set<String> unsubscribers, boolean subscribedByDefault, RecipientsAuthorizationCriterion recipientsAuthorizationCriterion) {
         RecipientsQuery recipientsQuery = new RecipientsQuery();
         recipientsQuery.subscribers = Set.copyOf(subscribers);
         recipientsQuery.unsubscribers = Set.copyOf(unsubscribers);
@@ -71,7 +71,7 @@ public Set<User> recipientUsers(String orgId, Set<RecipientSettings> recipientSe
 
         recipientsQuery.recipientSettings = recipientSettingsSet;
         recipientsQuery.subscribedByDefault = subscribedByDefault;
-        recipientsQuery.externalAuthorizationCriteria = externalAuthorizationCriteria;
+        recipientsQuery.recipientsAuthorizationCriterion = recipientsAuthorizationCriterion;
         Set<User> recipientsList = retryOnError(() -> recipientsResolverService.getRecipients(recipientsQuery));
         return recipientsList;
     }

engine/src/main/java/com/redhat/cloud/notifications/recipients/recipientsresolver/pojo/RecipientsQuery.java

@@ -1,7 +1,7 @@
 package com.redhat.cloud.notifications.recipients.recipientsresolver.pojo;
 
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import com.redhat.cloud.notifications.processors.ExternalAuthorizationCriterion;
+import com.redhat.cloud.notifications.ingress.RecipientsAuthorizationCriterion;
 import com.redhat.cloud.notifications.processors.email.connector.dto.RecipientSettings;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -24,5 +24,5 @@ public class RecipientsQuery {
 
     public boolean subscribedByDefault;
 
-    public ExternalAuthorizationCriterion externalAuthorizationCriteria;
+    public RecipientsAuthorizationCriterion recipientsAuthorizationCriterion;
 }

engine/src/main/java/com/redhat/cloud/notifications/transformers/BaseTransformer.java

@@ -29,6 +29,7 @@ public class BaseTransformer {
     public static final String PAYLOAD = "payload";
     public static final String SOURCE = "source";
     public static final String TIMESTAMP = "timestamp";
+    public static final String RECIPIENTS_AUTHORIZATION_CRITERION = "recipients_authorization_criterion";
 
     /**
      * Transforms the given event into a {@link JsonObject}.
@@ -45,6 +46,9 @@ public JsonObject toJsonObject(final Event event) {
             message.put(BUNDLE, action.getBundle());
             message.put(CONTEXT, JsonObject.mapFrom(action.getContext()));
             message.put(EVENT_TYPE, action.getEventType());
+            if (action.getRecipientsAuthorizationCriterion() != null) {
+                message.put(RECIPIENTS_AUTHORIZATION_CRITERION, JsonObject.mapFrom(action.getRecipientsAuthorizationCriterion()));
+            }
             message.put(
                     EVENTS,
                     new JsonArray(