- ver 1.1.15

src/server/models/circuit.js

@@ -127,6 +127,12 @@ const CircuitSchema = new Schema({
   qta_max_default_grp: {
     type: Number,
   },
+  fido_scoperto_default_contocom: {
+    type: Number,
+  },
+  qta_max_default_contocom: {
+    type: Number,
+  },
   data_costituz: {
     type: Date,
   },

src/server/models/user.js

@@ -2219,7 +2219,7 @@ UserSchema.statics.removeFromCircuits = async function (idapp, username, circuit
   if (myaccount && myaccount.totTransato === 0) {
     remove = true;
   } else {
-    remove = true;
+    remove = false;
   }
 
   if (remove) {
@@ -3045,33 +3045,8 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
           outres.result = await Circuit.getInfoCircuitByName(idapp, circuitname);
         }
       } else {
-        const foundIfAlreadyCircuit = await this.ifAlreadyInCircuit(idapp, usernameOrig, circuitname);
 
-        if (!foundIfAlreadyCircuit) {
-          update = {
-            $push: {
-              'profile.mycircuits': {
-                circuitname,
-                date: new Date(),
-              },
-            },
-          };
-          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);
-
-          await Account.createAccount(idapp, usernameOrig, circuitname);
-
-
-        } else {
-          ris = false;
-        }
+        ris = await this.addCircuitToUser(idapp, usernameOrig, circuitname, true, '');
 
         await Circuit.updateData(idapp, circuitname)
         if (ris) {