WIP

Author: martingreilinger

container/src/main/java/io/vanillabp/cockpit/gui/api/v1/GuiEvent.java

@@ -1,55 +1,57 @@
 package io.vanillabp.cockpit.gui.api.v1;
 
+import java.io.Serial;
 import java.util.Collection;
+import java.util.Optional;
+
 import org.springframework.context.ApplicationEvent;
+import org.springframework.lang.NonNull;
 
 public class GuiEvent extends ApplicationEvent {
 
+    @Serial
     private static final long serialVersionUID = 1L;
-    
-    private Object event;
-    
-    private Collection<String> targetGroups;
+
+    private final Object event;
+
+    private final Collection<String> targetGroups;
 
     public GuiEvent(
-            final Object source,
+            @NonNull final Object source,
             final Collection<String> targetGroups,
             final Object event) {
-        
+
         super(source);
         this.event = event;
         this.targetGroups = targetGroups;
-        
+
     }
-    
+
     public Object getEvent() {
         return event;
     }
 
     public Collection<String> getTargetGroups() {
         return targetGroups;
     }
-    
+
     public boolean matchesTargetGroups(
             final Collection<String> groups) {
-        
+
         if (targetGroups == null) {
             return true;
         }
-        
+
         return targetGroups
                 .stream()
                 .flatMap(targetGroup -> groups.stream().map(targetGroups::equals))
                 .anyMatch(hasMatchingGroup -> hasMatchingGroup);
-        
-    }
 
-    public boolean relevantForTargetGroups(final Collection<String> groups) {
-        if (targetGroups == null) {
-	    return true;
-	}
-
-	return targetGroups.stream().anyMatch(groups::contains);
     }
 
+    public boolean relevantForTargetGroups(@NonNull Collection<String> groups) {
+        return Optional.ofNullable(targetGroups)
+		.map(tg -> tg.stream().anyMatch(groups::contains))
+		.orElse(true);
+    }
 }

container/src/main/java/io/vanillabp/cockpit/tasklist/UserTaskChangedNotification.java

@@ -19,7 +19,8 @@ public class UserTaskChangedNotification extends NotificationEvent {
     public UserTaskChangedNotification(
             final Type type,
             final String userTaskId,
-            final Collection<String> targetGroups) {
+            final Collection<String> targetGroups,
+	    final Collection<String> targetUsers) {
 
         super(
                 "UserTask",

container/src/main/java/io/vanillabp/cockpit/util/events/NotificationEvent.java

@@ -1,40 +1,46 @@
 package io.vanillabp.cockpit.util.events;
 
+import java.io.Serial;
 import java.time.Clock;
 import java.util.Collection;
 import java.util.List;
 import org.springframework.context.ApplicationEvent;
 
 public abstract class NotificationEvent extends ApplicationEvent {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
-    public static enum Type { INSERT, UPDATE, DELETE };
+    public enum Type { INSERT, UPDATE, DELETE };
 
     private final Type type;
-    
-    private Collection<String> targetGroups;
+    private final Collection<String> targetGroups;
+    private final Collection<String> targetUsers;
 
     public NotificationEvent(
             final Object source,
             final Clock clock,
             final Type type,
-            final Collection<String> targetGroups) {
+            final Collection<String> targetGroups,
+	    final Collection<String> targetUsers) {
 
         super(source, clock);
         this.type = type;
         this.targetGroups = targetGroups;
+	this.targetUsers = targetUsers;
 
     }
 
     public NotificationEvent(
             final Object source,
             final Type type,
-            Collection<String> targetGroups) {
+            Collection<String> targetGroups,
+	    Collection<String> targetUsers) {
 
         super(source);
         this.type = type;
         this.targetGroups = targetGroups;
+	this.targetUsers = targetUsers;
 
     }
 
@@ -45,7 +51,11 @@ public Type getType() {
     public Collection<String> getTargetGroups() {
         return targetGroups;
     }
-    
+
+    public Collection<String> getTargetUsers() {
+        return targetUsers;
+    }
+
     public boolean matchesTargetGroups(
             final List<String> groups) {
 

container/src/main/java/io/vanillabp/cockpit/workflowlist/WorkflowChangedNotification.java

@@ -18,12 +18,14 @@ public class WorkflowChangedNotification extends NotificationEvent {
     public WorkflowChangedNotification(
             final Type type,
             final String workflowId,
-            final Collection<String> targetGroups) {
+            final Collection<String> targetGroups,
+	    final Collection<String> targetUsers) {
 
         super(
                 "Workflow",
                 type,
-                targetGroups);
+                targetGroups,
+		targetUsers);
 
         this.workflowId = workflowId;
 
@@ -53,7 +55,8 @@ public static WorkflowChangedNotification build(
                 Type.valueOf(type.name()),
                 message.getRaw().getDocumentKey().get(
                         message.getRaw().getDocumentKey().getFirstKey()).asString().getValue(),
-                null);
+                null,
+		null);
 
     }
 
@@ -81,7 +84,8 @@ public static WorkflowChangedNotification build(
                 Type.valueOf(type.name()),
                 event.getRaw().getDocumentKey().get(
                         event.getRaw().getDocumentKey().getFirstKey()).asString().getValue(),
-                null);
+                null,
+		null);
 
     }
 

container/src/test/java/io/vanillabp/cockpit/gui/api/v1/GuiEventTest.java

@@ -0,0 +1,48 @@
+package io.vanillabp.cockpit.gui.api.v1;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+record TestSource(){}
+
+class GuiEventTest {
+    private static final List<String> TARGET_GROUPS = List.of("A", "B");
+    private static final List<String> MATCHING_GROUPS = Collections.singletonList("B");
+    private static final List<String> OTHER_GROUPS = Collections.singletonList("C");
+
+    private GuiEvent event;
+
+    @BeforeEach
+    void setUp() {
+	event = new GuiEvent(new TestSource(), TARGET_GROUPS, null);
+    }
+
+    @Test
+    void eventIsRelevantForCollectionContainingGroupTest() {
+	var isRelevant = event.relevantForTargetGroups(MATCHING_GROUPS);
+
+	assertTrue(isRelevant);
+    }
+
+    @Test
+    void eventIsRelevantWhenNoGroupsAreSet() {
+	var eventWithoutGroups = new GuiEvent(new TestSource(), null, null);
+
+	var isRelevant = eventWithoutGroups.relevantForTargetGroups(MATCHING_GROUPS);
+
+	assertTrue(isRelevant);
+    }
+
+    @Test
+    void eventIsNotRelevantWhenNoGroupsAreMatching() {
+	var isRelevant = event.relevantForTargetGroups(OTHER_GROUPS);
+
+	assertFalse(isRelevant);
+    }
+}