Remove the filter on user (#51)

Signed-off-by: Florent MILLOT <[email protected]>

Author: flomillot

src/main/java/org/gridsuite/study/notification/server/NotificationWebSocketHandler.java

@@ -52,7 +52,6 @@ public class NotificationWebSocketHandler implements WebSocketHandler {
     static final String QUERY_UPDATE_TYPE = "updateType";
     static final String HEADER_USER_ID = "userId";
     static final String HEADER_STUDY_UUID = "studyUuid";
-    static final String HEADER_IS_PUBLIC_STUDY = "isPublicStudy";
     static final String HEADER_UPDATE_TYPE = "updateType";
     static final String HEADER_TIMESTAMP = "timestamp";
     static final String HEADER_ERROR = "error";
@@ -95,14 +94,10 @@ public Consumer<Flux<Message<String>>> consumeNotification() {
      * map from the broker flux to the filtered flux for one websocket client, extracting only relevant fields.
      */
     private Flux<WebSocketMessage> notificationFlux(WebSocketSession webSocketSession,
-                                                    String userId,
                                                     String filterStudyUuid,
                                                     String filterUpdateType) {
         return flux.transform(f -> {
             Flux<Message<String>> res = f;
-            if (userId != null) {
-                res = res.filter(m -> m.getHeaders().get(HEADER_ERROR) == null || userId.equals(m.getHeaders().get(HEADER_USER_ID)));
-            }
             if (filterStudyUuid != null) {
                 res = res.filter(m -> filterStudyUuid.equals(m.getHeaders().get(HEADER_STUDY_UUID)));
             }
@@ -138,6 +133,7 @@ private static Map<String, Object> toResultHeader(Map<String, Object> messageHea
         passHeader(messageHeader, resHeader, HEADER_NODES);
         passHeader(messageHeader, resHeader, HEADER_NEW_NODE);
         passHeader(messageHeader, resHeader, HEADER_MOVED_NODE);
+        passHeader(messageHeader, resHeader, HEADER_USER_ID); // to filter the display of error messages in the front end
 
         return resHeader;
     }
@@ -159,7 +155,6 @@ private Flux<WebSocketMessage> heartbeatFlux(WebSocketSession webSocketSession)
     @Override
     public Mono<Void> handle(WebSocketSession webSocketSession) {
         var uri = webSocketSession.getHandshakeInfo().getUri();
-        String userId = webSocketSession.getHandshakeInfo().getHeaders().getFirst(HEADER_USER_ID);
         MultiValueMap<String, String> parameters = UriComponentsBuilder.fromUri(uri).build(true).getQueryParams();
         String filterStudyUuid = parameters.getFirst(QUERY_STUDY_UUID);
         if (filterStudyUuid != null) {
@@ -172,7 +167,7 @@ public Mono<Void> handle(WebSocketSession webSocketSession) {
         String filterUpdateType = parameters.getFirst(QUERY_UPDATE_TYPE);
         LOGGER.debug("New websocket connection for studyUuid={}, updateType={}", filterStudyUuid, filterUpdateType);
         return webSocketSession
-                .send(notificationFlux(webSocketSession, userId, filterStudyUuid, filterUpdateType)
+                .send(notificationFlux(webSocketSession, filterStudyUuid, filterUpdateType)
                         .mergeWith(heartbeatFlux(webSocketSession)))
                 .and(webSocketSession.receive());
     }

src/test/java/org/gridsuite/study/notification/server/NotificationWebSocketHandlerTest.java

@@ -152,11 +152,8 @@ private void withFilters(String filterStudyUuid, String filterUpdateType) {
         List<Map<String, Object>> expected = refMessages.stream()
                 .filter(m -> {
                     String studyUuid = (String) m.getHeaders().get(HEADER_STUDY_UUID);
-                    String userId = (String) m.getHeaders().get(HEADER_USER_ID);
                     String updateType = (String) m.getHeaders().get(HEADER_UPDATE_TYPE);
-                    String headerMessageError = (String) m.getHeaders().get(HEADER_ERROR);
-                    return (headerMessageError == null || connectedUserId.equals(userId))
-                            && (filterStudyUuid == null || filterStudyUuid.equals(studyUuid))
+                    return (filterStudyUuid == null || filterStudyUuid.equals(studyUuid))
                             && (filterUpdateType == null || filterUpdateType.equals(updateType));
                 })
                 .map(GenericMessage::getHeaders)
@@ -173,7 +170,6 @@ private void withFilters(String filterStudyUuid, String filterUpdateType) {
         assertEquals(expected, actual);
         assertNotEquals(0, actual.size());
         assertEquals(0, actual.stream().filter(m -> m.get(HEADER_STUDY_UUID).equals("private_" + otherUserId)).count());
-        assertEquals(0, actual.stream().filter(m -> m.get(HEADER_STUDY_UUID).equals("public_" + otherUserId) && m.get(HEADER_ERROR) != null).count());
     }
 
     private Map<String, Object> toResultHeader(Map<String, Object> messageHeader) {