Putting requester+channel to all notifications, except for workflows.

Evolveum · Oct 9, 2015 · 286f55b · 286f55b
1 parent 2cfe097
commit 286f55b
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 18 deletions.
diff --git a/...fications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java b/...fications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
@@ -60,6 +60,8 @@ public abstract class BaseEvent implements Event {
 
     private SimpleObjectRef requestee;
 
+    private String channel;
+
     public BaseEvent(LightweightIdentifierGenerator lightweightIdentifierGenerator) {
         id = lightweightIdentifierGenerator.generate();
     }
@@ -291,5 +293,12 @@ private ItemPath pathTail(ItemPath itemPath) {
         return itemPath;
     }
 
+    @Override
+    public String getChannel() {
+        return channel;
+    }
 
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
 }
diff --git a/...notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/Event.java b/...notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/Event.java
@@ -101,4 +101,6 @@ public interface Event {
      * @return
      */
     boolean isRelatedToItem(ItemPath itemPath);
+
+    String getChannel();
 }
diff --git a/...impl/src/main/java/com/evolveum/midpoint/notifications/impl/AccountOperationListener.java b/...impl/src/main/java/com/evolveum/midpoint/notifications/impl/AccountOperationListener.java
@@ -179,6 +179,11 @@ private ResourceObjectEvent createRequest(OperationStatus status,
         } else {
             LOGGER.warn("No owner for task " + task + ", therefore no requester will be set for event " + event.getId());
         }
+
+        if (task != null) {
+            event.setChannel(task.getChannel());
+        }
+
         return event;
     }
 

diff --git a/...s-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java b/...s-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
@@ -137,6 +137,8 @@ private Event createRequest(PrismObject<? extends ObjectType> object, Task task,
 
         ModelEvent event = new ModelEvent(lightweightIdentifierGenerator);
         event.setModelContext(modelContext);
+        // TODO or take channel from modelContext?
+        event.setChannel(task.getChannel());
 
         if (task.getOwner() != null) {
             event.setRequester(new SimpleObjectRefImpl(notificationsUtil, task.getOwner().asObjectable()));

diff --git a/...ations-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationsUtil.java b/...ations-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationsUtil.java
@@ -16,13 +16,15 @@
 
 package com.evolveum.midpoint.notifications.impl;
 
+import com.evolveum.midpoint.notifications.api.events.Event;
 import com.evolveum.midpoint.notifications.api.events.SimpleObjectRef;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.repo.api.RepositoryService;
 import com.evolveum.midpoint.schema.processor.ResourceAttribute;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.schema.util.ShadowUtil;
 import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
 import com.evolveum.midpoint.util.exception.SchemaException;
@@ -133,4 +135,25 @@ public String getShadowName(PrismObject<? extends ShadowType> shadow) {
             }
         }
     }
+
+    // TODO move to some other class?
+    public void addRequesterAndChannelInformation(StringBuilder body, Event event, OperationResult result) {
+        if (event.getRequester() != null) {
+            body.append("Requester: ");
+            try {
+                ObjectType requester = event.getRequester().resolveObjectType(result);
+                if (requester instanceof UserType) {
+                    UserType requesterUser = (UserType) requester;
+                    body.append(requesterUser.getFullName()).append(" (").append(requester.getName()).append(")");
+                } else {
+                    body.append(ObjectTypeUtil.toShortString(requester));
+                }
+            } catch (RuntimeException e) {
+                body.append("couldn't be determined: ").append(e.getMessage());
+                LoggingUtils.logUnexpectedException(LOGGER, "Couldn't determine requester for a notification", e);
+            }
+            body.append("\n");
+        }
+        body.append("Channel: ").append(event.getChannel()).append("\n\n");
+    }
 }
diff --git a/.../src/main/java/com/evolveum/midpoint/notifications/impl/events/cert/CertEventFactory.java b/.../src/main/java/com/evolveum/midpoint/notifications/impl/events/cert/CertEventFactory.java
@@ -54,7 +54,10 @@ public CertCampaignEvent createOnCampaignStartEvent(AccessCertificationCampaignT
 
     protected void fillInEvent(AccessCertificationCampaignType campaign, Task task, AccessCertificationEvent event) {
         event.setRequestee(new SimpleObjectRefImpl(notificationsUtil, campaign.getOwnerRef()));
-        event.setRequester(new SimpleObjectRefImpl(notificationsUtil, task.getOwner()));
+        if (task != null) {
+            event.setRequester(new SimpleObjectRefImpl(notificationsUtil, task.getOwner()));
+            event.setChannel(task.getChannel());
+        }
     }
 
     protected void fillInReviewerRelatedEvent(ObjectReferenceType reviewerRef, Task task, AccessCertificationEvent event) {

diff --git a/.../main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignNotifier.java b/.../main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignNotifier.java
@@ -107,6 +107,9 @@ protected String getBody(Event event, GeneralNotifierType generalNotifierType, S
         body.append("\n\n");
         certHelper.appendStatistics(body, campaign, task, result);
 
+        body.append("\n\n");
+        notificationsUtil.addRequesterAndChannelInformation(body, event, result);
+
         return body.toString();
     }
 

diff --git a/.../java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignStageNotifier.java b/.../java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignStageNotifier.java
@@ -132,6 +132,9 @@ protected String getBody(Event event, GeneralNotifierType generalNotifierType, S
         body.append("\n");
         certHelper.appendStatistics(body, campaign, task, result);
 
+        body.append("\n\n");
+        notificationsUtil.addRequesterAndChannelInformation(body, event, result);
+
         return body.toString();
     }
 

diff --git a/...in/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java b/...in/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
@@ -178,23 +178,7 @@ protected String getBody(Event event, GeneralNotifierType generalNotifierType, S
             body.append("More information about the status of the request was displayed and/or is present in log files.\n\n");
         }
 
-        if (event.getRequester() != null) {
-            body.append("Requester: ");
-            try {
-                ObjectType requester = event.getRequester().resolveObjectType(result);
-                if (requester instanceof UserType) {
-                    UserType requesterUser = (UserType) requester;
-                    body.append(requesterUser.getFullName()).append(" (").append(requester.getName()).append(")");
-                } else {
-                    body.append(ObjectTypeUtil.toShortString(requester));
-                }
-            } catch (RuntimeException e) {
-                body.append("couldn't be determined: ").append(e.getMessage());
-                LoggingUtils.logUnexpectedException(LOGGER, "Couldn't determine requester for a notification", e);
-            }
-            body.append("\n");
-        }
-        body.append("Channel: ").append(modelContext.getChannel()).append("\n\n");
+        notificationsUtil.addRequesterAndChannelInformation(body, event, result);
 
         if (techInfo) {
             body.append("----------------------------------------\n");

diff --git a/...java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleResourceObjectNotifier.java b/...java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleResourceObjectNotifier.java
@@ -231,6 +231,9 @@ protected String getBody(Event event, GeneralNotifierType generalNotifierType, S
             body.append("Error: " + resourceObjectEvent.getAccountOperationDescription().getResult().getMessage() + "\n\n");
         }
 
+        body.append("\n\n");
+        notificationsUtil.addRequesterAndChannelInformation(body, event, result);
+
         if (techInfo) {
             body.append("----------------------------------------\n");
             body.append("Technical information:\n\n");