refactor

Author: odeimaiz

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

@@ -87,13 +87,39 @@ qx.Class.define("osparc.data.model.Group", {
     },
   },
 
+  events: {
+    "memberAdded": "qx.event.type.Event",
+    "memberRemoved": "qx.event.type.Event",
+  },
+
   statics: {
     getProperties: function() {
       return Object.keys(qx.util.PropertyUtil.getProperties(osparc.data.model.Group));
     }
   },
 
   members: {
+    getGroupMemberByUserId: function(userId) {
+      return Object.values(this.getGroupMembers()).find(user => user.getUserId() === userId);
+    },
+
+    getGroupMemberByLogin: function(userEmail) {
+      return Object.values(this.getGroupMembers()).find(user => user.getLogin() === userEmail);
+    },
+
+    addGroupMember: function(user) {
+      this.getGroupMembers()[user.getGroupId()] = user;
+      this.fireEvent("memberAdded");
+    },
+
+    removeGroupMember: function(userId) {
+      const groupMember = this.getGroupMemberByUserId(userId);
+      if (groupMember) {
+        delete this.getGroupMembers()[groupMember.getGroupId()];
+        this.fireEvent("memberRemoved");
+      }
+    },
+
     serialize: function() {
       const jsonObject = {};
       const propertyKeys = this.self().getProperties();

services/static-webserver/client/source/class/osparc/store/Groups.js

@@ -234,15 +234,15 @@ qx.Class.define("osparc.store.Groups", {
     getGroupMemberByUserId: function(orgId, userId) {
       const org = this.getGroup(orgId);
       if (org) {
-        return Object.values(org.getGroupMembers()).find(user => user.getUserId() === userId);
+        return org.getGroupMemberByUserId(userId);
       }
       return null;
     },
 
     getGroupMemberByLogin: function(orgId, userEmail) {
       const org = this.getGroup(orgId);
       if (org) {
-        return Object.values(org.getGroupMembers()).find(user => user.getLogin() === userEmail);
+        return org.getGroupMemberByLogin(userEmail);
       }
       return null;
     },
@@ -397,7 +397,7 @@ qx.Class.define("osparc.store.Groups", {
       if (orgId) {
         const organization = this.getOrganization(orgId);
         if (organization) {
-          organization.getGroupMembers()[user.getGroupId()] = user;
+          organization.addGroupMember(user);
         }
       }
       this.getReachableUsers()[user.getGroupId()] = user;
@@ -406,9 +406,8 @@ qx.Class.define("osparc.store.Groups", {
     __removeUserFromCache: function(userId, orgId) {
       if (orgId) {
         const organization = this.getOrganization(orgId);
-        const groupMember = this.getGroupMemberByUserId(orgId, userId)
-        if (organization && groupMember) {
-          delete organization.getGroupMembers()[groupMember.getGroupId()]
+        if (organization) {
+          organization.removeGroupMember(userId)
         }
       }
     },