- L'utente entra direttamente sul circuito, con fido a zero.

++Abilitazione Fido utente (per admin).

src/server/models/user.js

@@ -1530,7 +1530,7 @@ UserSchema.statics.getUserById = function (idapp, id) {
 UserSchema.statics.getUserByUsername = function (idapp, username) {
   const User = this;
 
-  return User.findne({
+  return User.findOne({
     idapp,
     username,
     $or: [{ deleted: { $exists: false } }, { deleted: { $exists: true, $eq: false } }],
@@ -1900,13 +1900,65 @@ UserSchema.statics.removeFromMyGroups = async function (
   return await User.updateOne({ idapp, username },
     { $pull: { 'profile.mygroups': { groupname: { $in: [groupnameDest] } } } });
 };
-// Rimuovo il Gruppo
+
+// Rimuovo il Circuito
 UserSchema.statics.removeFromCircuits = async function (idapp, username, circuitname) {
-  return await User.updateOne({ idapp, username },
+    
+    // Elimina la richiesta (se esiste):
+    update = { $pull: { req_users: { username: { $in: [username] } } } };
+    await Circuit.updateOne({ idapp, name: circuitname }, update);
+
+    return await User.updateOne({ idapp, username },
     { $pull: { 'profile.mycircuits': { circuitname: { $in: [circuitname] } } } });
 
 };
 
+// Aggiungo il Circuito
+UserSchema.statics.addCircuitToUser = async function (idapp, usernameOrig, circuitname, confido, groupname, contocom) {
+
+  let ris = null;
+
+  if (groupname) {
+
+    ris = await MyGroup.addCircuitFromGroup(idapp, groupname, circuitname);
+
+    // Elimina la richiesta:
+    update = { $pull: { req_groups: { groupname: { $in: [groupname] } } } };
+    await Circuit.updateOne({ idapp, name: circuitname }, update);
+
+    // Elimina eventualmente se era bloccato:
+    update = { $pull: { refused_groups: { groupname: { $in: [groupname] } } } };
+    await Circuit.updateOne({ idapp, name: circuitname }, update);
+
+  } else {
+
+    let update = {
+      $push: {
+        'profile.mycircuits': {
+          circuitname,
+          date: new Date(),
+        },
+      },
+    };
+    ris = await User.updateOne({ idapp, username: usernameOrig }, update);
+
+    if (confido) {
+      // Elimina la richiesta:
+      update = { $pull: { req_users: { username: { $in: [usernameOrig] } } } };
+      await Circuit.updateOne({ idapp, name: circuitname }, update);
+    }
+
+    // Elimina eventualmente se era bloccato:
+    update = { $pull: { refused_users: { username: { $in: [usernameOrig] } } } };
+    await Circuit.updateOne({ idapp, name: circuitname }, update);
+
+  }
+
+  await Account.createAccount(idapp, usernameOrig, circuitname, confido, groupname, contocom);
+
+  return ris;
+};
+
 // Rimuovo il Gruppo per Tutti gli Utenti
 UserSchema.statics.removeAllUsersFromMyGroups = async function (idapp, groupnameDest) {
   return await User.updateMany({ idapp },
@@ -2521,7 +2573,7 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
       const mycirc = await Circuit.findOne({ idapp, name: circuitname });
       if (mycirc) {
         // Il Conto Comunitario prende il nome del circuito !
-        await Account.createAccount(idapp, '', circuitname, '', mycirc.path);
+        await Account.createAccount(idapp, '', circuitname, true, '', mycirc.path);
       }
 
     } else if (cmd === shared_consts.CIRCUITCMD.SET) {
@@ -2529,18 +2581,7 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
         const foundIfCircuitInGroup = await MyGroup.ifCircuitAlreadyInGroup(idapp, groupname, circuitname);
 
         if (!foundIfCircuitInGroup) {
-          ris = await MyGroup.addCircuitFromGroup(idapp, groupname, circuitname);
-
-          // Elimina la richiesta:
-          update = { $pull: { req_groups: { groupname: { $in: [groupname] } } } };
-          await Circuit.updateOne({ idapp, name: circuitname }, update);
-
-          // Elimina eventualmente se era bloccato:
-          update = { $pull: { refused_groups: { groupname: { $in: [groupname] } } } };
-          await Circuit.updateOne({ idapp, name: circuitname }, update);
-
-          await Account.createAccount(idapp, '', circuitname, groupname);
-
+          ris = await this.addCircuitToUser(idapp, usernameOrig, circuitname, true, groupname);
 
         } else {
           ris = false;
@@ -2552,7 +2593,6 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
           tools.sendNotificationByCircuit(idapp, usernameOrig, circuitname, cmd, value, true, username_action, extrarec);
           outres.result = await Circuit.getInfoCircuitByName(idapp, circuitname);
         }
-
       } else {
         const foundIfAlreadyCircuit = await this.ifAlreadyInCircuit(idapp, usernameOrig, circuitname);
 
@@ -2567,10 +2607,6 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
           };
           ris = await User.updateOne({ idapp, username: usernameOrig }, update);
 
-          // Elimina la richiesta:
-          update = { $pull: { req_users: { username: { $in: [usernameOrig] } } } };
-          await Circuit.updateOne({ idapp, name: circuitname }, update);
-
           // Elimina eventualmente se era bloccato:
           update = { $pull: { refused_users: { username: { $in: [usernameOrig] } } } };
           await Circuit.updateOne({ idapp, name: circuitname }, update);
@@ -2589,6 +2625,22 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
           outres.result = await Circuit.getInfoCircuitByName(idapp, circuitname);
         }
       }
+
+    } else if (cmd === shared_consts.CIRCUITCMD.SETFIDO) {
+
+      ris = await Circuit.setFido(idapp, usernameOrig, circuitname, groupname);
+
+      // Elimina la richiesta:
+      update = { $pull: { req_users: { username: { $in: [usernameOrig] } } } };
+      await Circuit.updateOne({ idapp, name: circuitname }, update);
+
+      await Circuit.updateData(idapp, circuitname)
+      if (ris) {
+        // Invia una notifica alla persona e agli Admin
+        tools.sendNotificationByCircuit(idapp, usernameOrig, circuitname, cmd, value, true, username_action, extrarec);
+        outres.result = await Circuit.getInfoCircuitByName(idapp, circuitname);
+      }
+
     } else if (cmd === shared_consts.CIRCUITCMD.REQ) {
 
       if (groupname) {
@@ -2628,7 +2680,7 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
         }
 
       } else {
-        // Aggiungo la richiesta di Gruppo a me
+        // Aggiungo la richiesta di Circuito a me
         const foundIfAlreadyAskCircuit = await Circuit.findOne({
           idapp,
           name: circuitname,
@@ -2638,6 +2690,9 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
         });
 
         if (value) {
+          // Aggiungi intanto l'utente al Circuito (senza fido)
+          ris = await this.addCircuitToUser(idapp, usernameOrig, circuitname, false);
+
           if (!foundIfAlreadyAskCircuit) {
             update = {
               $push: {
@@ -2647,6 +2702,7 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
                 },
               },
             };
+            // Aggiungi la richiesta per ottenere il fido
             ris = await Circuit.updateOne({ idapp, name: circuitname }, update);
 
           }