surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Gruppi (3) - lista degli utenti del gruppo

Browse Source
This commit is contained in:
paoloar77
2022-02-08 23:14:08 +01:00
parent 16664f7be7
commit 8ed9bd941f
9 changed files with 129 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/models/mygroup.js
View File

@@ -200,7 +200,7 @@ MyGroupSchema.statics.getInfoGroupByGroupname = async function(idapp, groupname)
};
MyGroupSchema.statics.getGroupsByUsername = async function(idapp, username) {
MyGroupSchema.statics.getGroupsByUsername = async function(idapp, username, req) {
try {
const {User} = require('../models/user');
@@ -251,6 +251,7 @@ MyGroupSchema.statics.getGroupsByUsername = async function(idapp, username) {
listgroups,
//listRequestUsersGroup,
listSentRequestGroups,
mygroups: req.user.profile.mygroups,
};
} catch (e) {

10
src/server/models/user.js
View File

@@ -1275,7 +1275,7 @@ UserSchema.statics.getArrUsernameFromFieldByUsername = async function(
$or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}],
}, myobj).then((ris) => ris ? ris._doc[field][subfield] : []);
if (arrrec.length > 0) {
if (arrrec && arrrec.length > 0) {
return arrrec.map(m => m.username);
}
return [];
@@ -1902,8 +1902,12 @@ UserSchema.statics.getNameSurnameByUsername = async function(idapp, username) {
return User.findOne({
idapp, username,
$or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}],
}, {name: 1, surname: 1}).then((rec) => {
return (!!rec) ? `${rec.name} ${rec.surname}` : '';
}, {username: 1, name: 1, surname: 1}).then((rec) => {
let ris = rec.username;
if (!!rec && rec.name) {
ris = (`${rec.name} ${rec.surname}`)
}
return (!!rec) ? (`${rec.name} ${rec.surname}`) : '';
}).catch((e) => {
console.error('getNameSurnameByUsername', e);
});