refactor

Author: odeimaiz

services/static-webserver/client/source/class/osparc/conversation/MessageUI.js

@@ -36,15 +36,6 @@ qx.Class.define("osparc.conversation.MessageUI", {
     });
   },
 
-  statics: {
-    isMyMessage: function(message) {
-      if (message.getUserGroupId() === osparc.data.model.Message.SYSTEM_MESSAGE_ID) {
-        return false;
-      }
-      return message && osparc.auth.Data.getInstance().getGroupId() === message.getUserGroupId();
-    }
-  },
-
   events: {
     "messageUpdated": "qx.event.type.Data",
     "messageDeleted": "qx.event.type.Data",
@@ -61,7 +52,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
 
   members: {
     _createChildControlImpl: function(id) {
-      const isMyMessage = this.self().isMyMessage(this.getMessage());
+      const isMyMessage = osparc.data.model.Message.isMyMessage(this.getMessage());
       let control;
       switch (id) {
         case "avatar":
@@ -154,7 +145,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
 
       const avatar = this.getChildControl("avatar");
       const userName = this.getChildControl("user-name");
-      if (message.getUserGroupId() === osparc.data.model.Message.SYSTEM_MESSAGE_ID) {
+      if (osparc.data.model.Message.isSupportMessage(message)) {
         userName.setValue("Support");
       } else {
         osparc.store.Users.getInstance().getUser(message.getUserGroupId())
@@ -168,7 +159,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
           });
       }
 
-      if (this.self().isMyMessage(message)) {
+      if (osparc.data.model.Message.isMyMessage(message)) {
         const menuButton = this.getChildControl("menu-button");
 
         const menu = new qx.ui.menu.Menu().set({

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

@@ -189,9 +189,7 @@ qx.Class.define("osparc.data.model.ConversationSupport", {
       this.__evalFirstAndLastMessage();
 
       // mark conversation as unread if the message is from the other party
-      const userGroupId = message.getUserGroupId();
-      const myGroupId = osparc.auth.Data.getInstance().getGroupId();
-      if (userGroupId !== myGroupId) {
+      if (osparc.data.model.Message.isMyMessage(message)) {
         this.setReadBy(false);
       }
       return message;

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

@@ -92,6 +92,17 @@ qx.Class.define("osparc.data.model.Message", {
       // oldest first: higher in the list. Latest at the bottom
       messages.sort((a, b) => a.getCreated() - b.getCreated());
     },
+
+    isSupportMessage: function(message) {
+      return message.getUserGroupId() === osparc.data.model.Message.SYSTEM_MESSAGE_ID;
+    },
+
+    isMyMessage: function(message) {
+      if (osparc.data.model.Message.isSupportMessage(message)) {
+        return false;
+      }
+      return message && osparc.auth.Data.getInstance().getGroupId() === message.getUserGroupId();
+    },
   },
 
   members: {