From 5f3ce44a68d1064ade612c6a841ca31e19d1bb8a Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sun, 29 Jan 2023 22:22:48 +0100
Subject: [PATCH] =?UTF-8?q?Pagina=20"Attivit=C3=A0"=20non=20compare=20bene?=
 =?UTF-8?q?=20la=20scritta=20Beni=20e=20Servizi...=20=3F!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/models/user.js            |  2 ++
 src/server/router/index_router.js    |  2 ++
 src/server/router/mygroups_router.js | 49 +++++++++++++++++++---------
 src/server/sendemail.js              |  1 +
 4 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/server/models/user.js b/src/server/models/user.js
index 0f3b2ff..10955e0 100755
--- a/src/server/models/user.js
+++ b/src/server/models/user.js
@@ -1204,6 +1204,8 @@ UserSchema.statics.createNewRequestPwd = function (idapp, email, code) {
 
   const sendemail = require('../sendemail');
 
+  console.log('createNewRequestPwd');
+
   if (code && code.length === 6) {
     return User.findByLinkTokenforgotCode(idapp, email, code)
       .then((user) => {
diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js
index d0efe06..ff190d7 100755
--- a/src/server/router/index_router.js
+++ b/src/server/router/index_router.js
@@ -142,6 +142,8 @@ router.post(process.env.LINK_REQUEST_NEWPASSWORD, async (req, res) => {
     const email = body.email.toLowerCase().trim();
     const codetocheck = body.codetocheck ? body.codetocheck.trim() : '';
 
+    console.log('Request Reset Pwd:', email, ' idapp=', idapp);
+
     // Check if too many requests
     if (await User.tooManyReqPassword(idapp, email, true)) {
       console.log(process.env.LINK_REQUEST_NEWPASSWORD, 'TOO MANY REQUESTS !!! EXIT ', email);
diff --git a/src/server/router/mygroups_router.js b/src/server/router/mygroups_router.js
index bbe18d8..33882bb 100755
--- a/src/server/router/mygroups_router.js
+++ b/src/server/router/mygroups_router.js
@@ -5,23 +5,23 @@ const tools = require('../tools/general');
 
 const server_constants = require('../tools/server_constants');
 
-const {authenticate} = require('../middleware/authenticate');
+const { authenticate } = require('../middleware/authenticate');
 
 const mongoose = require('mongoose').set('debug', false);
 
-const {User} = require('../models/user');
-const {MyGroup} = require('../models/mygroup');
+const { User } = require('../models/user');
+const { MyGroup } = require('../models/mygroup');
 
 const _ = require('lodash');
 
-const {ObjectID} = require('mongodb');
+const { ObjectID } = require('mongodb');
 
 async function getGroupRecAdminsInfo(idapp, data) {
 
   if (data && data.admins) {
     for (const admin of data.admins) {
-      const myuser = await User.findOne({idapp, username: admin.username}, {'profile.img': 1}).lean();
-      admin.profile = {img: myuser.profile.img};
+      const myuser = await User.findOne({ idapp, username: admin.username }, { 'profile.img': 1 }).lean();
+      admin.profile = { img: myuser.profile.img };
     }
   }
 
@@ -35,14 +35,33 @@ router.post('/load', authenticate, async (req, res) => {
 
   try {
 
-    const {SendNotif} = require('../models/sendnotif');
+    const { SendNotif } = require('../models/sendnotif');
+    const { Circuit } = require('../models/circuit');
+    const { Account } = require('../models/account');
 
     // Check if ìs a Notif to read
     const idnotif = req.body['idnotif'] ? req.body['idnotif'] : '';
     SendNotif.setNotifAsRead(idapp, usernameOrig, idnotif);
 
     const whatshow = MyGroup.getWhatToShow(idapp, req.user.username);
-    let data = await MyGroup.findOne({idapp, groupname}, whatshow).lean();
+    let data = await MyGroup.findOne({ idapp, groupname }, whatshow).lean();
+
+    /*
+    if (data.mycircuits) {
+      for (let i = 0; i < data.mycircuits.length; i++) {
+        const mycirc = await Circuit.findOne({ idapp, name: data.mycircuits[i].circuitname }).lean();
+        data.mycircuits[i] = mycirc;
+      }
+    }
+    */
+
+    if (data.mycircuits) {
+      for (let i = 0; i < data.mycircuits.length; i++) {
+        const mycirc = await Circuit.findOne({ idapp, name: data.mycircuits[i].circuitname }).lean();
+        if (mycirc)
+          data.mycircuits[i].account = await Account.getAccountByUsernameAndCircuitId(idapp, '', mycirc._id, true, groupname);
+      }
+    }
 
     let cities = [];
     if (data) {
@@ -57,16 +76,16 @@ router.post('/load', authenticate, async (req, res) => {
     const whatshowUsers = await User.getWhatToShow_IfFriends(idapp, req.user.username);
 
     const users_in_group = await User.find(
-        {
-          idapp,
-          'profile.mygroups': {
-            $elemMatch: {groupname: {$eq: groupname}},
-          },
+      {
+        idapp,
+        'profile.mygroups': {
+          $elemMatch: { groupname: { $eq: groupname } },
         },
-        whatshowUsers,
+      },
+      whatshowUsers,
     ).lean();
 
-    res.send({mygroup: data, users_in_group, cities});
+    res.send({ mygroup: data, users_in_group, cities });
 
   } catch (e) {
     console.error('Error in MyGroups', e);
diff --git a/src/server/sendemail.js b/src/server/sendemail.js
index e571a30..3a7b86f 100755
--- a/src/server/sendemail.js
+++ b/src/server/sendemail.js
@@ -279,6 +279,7 @@ module.exports = {
   },
 
   sendEmail_RequestNewPassword: async function(lang, user, emailto, idapp, tokenforgot, tokenforgot_code) {
+    console.log('sendEmail_RequestNewPassword');
 
     let mylocalsconf = {
       idapp,