refactor

Author: odeimaiz

services/static-webserver/client/source/class/osparc/data/model/ConversationSupport.js

@@ -161,15 +161,17 @@ qx.Class.define("osparc.data.model.ConversationSupport", {
         });
     },
 
+    setReadBy: function(isRead) {
+      osparc.store.Groups.getInstance().amIASupportUser() ? this.setReadBySupport(isRead) : this.setReadByUser(isRead);
+    },
+
+    getReadBy: function() {
+      return osparc.store.Groups.getInstance().amIASupportUser() ? this.getReadBySupport() : this.getReadByUser();
+    },
+
     markAsRead: function() {
       osparc.store.ConversationsSupport.getInstance().markAsRead(this.getConversationId())
-        .then(() => {
-          if (osparc.store.Groups.getInstance().amIASupportUser()) {
-            this.setReadBySupport(true);
-          } else {
-            this.setReadByUser(true);
-          }
-        });
+        .then(() => this.setReadBy(true));
     },
 
     markAsResolved: function() {
@@ -190,11 +192,7 @@ qx.Class.define("osparc.data.model.ConversationSupport", {
       const userGroupId = message.getUserGroupId();
       const myGroupId = osparc.auth.Data.getInstance().getGroupId();
       if (userGroupId !== myGroupId) {
-        if (osparc.store.Groups.getInstance().amIASupportUser()) {
-          this.setReadBySupport(false);
-        } else {
-          this.setReadByUser(false);
-        }
+        this.setReadBy(false);
       }
       return message;
     },

services/static-webserver/client/source/class/osparc/support/Conversation.js

@@ -140,12 +140,7 @@ qx.Class.define("osparc.support.Conversation", {
       // keep conversation read
       const conversation = this.getConversation();
       if (conversation) {
-        if (osparc.store.Groups.getInstance().amIASupportUser()) {
-          conversation.setReadBySupport(true);
-        } else {
-          conversation.setReadByUser(true);
-        }
-        console.log("marked as read:", message);
+        conversation.setReadBy(true);
       }
     },
 

services/static-webserver/client/source/class/osparc/support/Conversations.js

@@ -158,19 +158,7 @@ qx.Class.define("osparc.support.Conversations", {
             conversationItem.show();
             break;
           case "unread":
-            if (osparc.store.Groups.getInstance().amIASupportUser()) {
-              if (conversation.getReadBySupport()) {
-                conversationItem.exclude();
-              } else {
-                conversationItem.show();
-              }
-            } else {
-              if (conversation.getReadByUser()) {
-                conversationItem.exclude();
-              } else {
-                conversationItem.show();
-              }
-            }
+            conversation.getReadBy() ? conversationItem.exclude() : conversationItem.show();
             break;
           case "open":
             if (conversation.getResolved() === false) {