bug fix group edit + ejs for

services/groups.service.js

@@ -3,6 +3,7 @@ const Member = require('../model/member.model')
 const User = require('../model/user.model')
 const Server = require('../model/server.model')
 const Access = require('../model/access.model')
+const sequelize = require("./database.service");
 
 const regexp_space = /^\S*$/;
 
@@ -62,50 +63,58 @@ async function getGroupsWithMembers() {
     return count
 }
 
+async function getGroupsWithServers() {
+    Group.hasMany(Access);
+    Access.belongsTo(Group);
+    const count = await Group.findAll({ include: Access });
+    return count
+}
+
+
 
 
 async function groupUserList(groupName) {
-    User.hasMany(Member);
-    Member.belongsTo(User);
-    const users = await User.findAll({ include: Member });
-    var result = []
-    for (x in users) {
-        try {
-            for (y in users[x].dataValues.members) {
-                if (users[x].dataValues.members[y].dataValues.groupName === groupName) {
-                    result[x] = (users[x].dataValues)
-                }
+    const dump = await sequelize.query('SELECT * FROM users JOIN members ON users.id = members.userId WHERE groupName = \'' + groupName + '\'', {});
+    result = {}
+    for (x in dump[0]) {
+        if (dump[0][x].userId) {
+            result[(dump[0][x].userId).toString()] = {
+                'id': dump[0][x].userId,
+                'login': dump[0][x].login,
+                'avatar': dump[0][x].avatar
             }
-
-        } catch (error) {
-    }}
+        }
+    }
     return result
-};
-
+}
 
 async function groupServerList(groupName) {
-    Server.hasMany(Access);
-    Access.belongsTo(Server);
-    const servers = await Server.findAll({ include: Access });
-    var result = []
-    for (x in servers) {
-        try {
-            for (y in servers[x].dataValues.accesses) {
-                if (servers[x].dataValues.accesses[y].dataValues.groupName === groupName) {
-                    result[x] = (servers[x].dataValues)
-                }
+    const dump = await sequelize.query('SELECT hostname, ip, username, lastPull FROM servers JOIN accesses ON servers.hostname = accesses.serverHostname WHERE groupName = \'' + groupName + '\'', {});
+    result = {}
+    for (x in dump[0]) {
+        if (dump[0][x].hostname) {
+            if (!dump[0][x].lastPull) {
+                dump[0][x].lastPull = ' never'
             }
-
-        } catch (error) {
-        }}
+            result[(dump[0][x].hostname).toString()] = {
+                'username': dump[0][x].username,
+                'ip': dump[0][x].ip,
+                'lastPull': dump[0][x].lastPull
+            }
+        }
+    }
     return result
-};
+}
+
+
+groupServerList('admin')
 
 module.exports = {
     addGroup,
     delGroup,
     groupUserList,
     getGroupsWithMembers,
-    groupServerList
+    groupServerList,
+    getGroupsWithServers
 
 };

services/server.service.js

@@ -16,7 +16,7 @@ async function addServer(hostname, ip, username) {
         } else {
             if (hostname && ip && username && regexp_space.test(hostname, username) && regexp_ip.test(ip)) {
                 var secret_generated= (Math.random() + 1).toString(36).substring(2);
-                console.log(secret_generated)
+                console.log('secret: TODO' + secret_generated)
                 Server.create({
                     hostname: hostname.toLowerCase(),
                     ip: ip,
@@ -72,6 +72,8 @@ async function getServerKeys(server) {
     return result
 }
 
+
+
 async function getServerListForUserId(userId) {
     const dump = await sequelize.query('SELECT hostname, username, ip, lastPull FROM servers JOIN accesses ON servers.hostname = accesses.serverHostname JOIN members ON members.groupName = accesses.groupName WHERE userId  = \'' + userId + '\'', {});
     result = {}