Aggiunto messaggio nella registrazione, dicendo che occorre avere Telegram installato.

PASSARE TUTTI I _DOC e mettergli .lean() prima dello then() -> velocizza le Query di Mongodb "Floriterapia costellazioni familiari coach motivazionale Tecniche Essene" Inserimento Gruppi: anche il comune obbligatorio Far comparire le ultime persone registrate Mettere il controllo dell'abilitazione del BOT Telegram solo dopo che conosco il suo username, e cosi gli metto anche il contatto telegram. risolto foto profilo di telegram che non si salvava in automatico tolto il controllo della email aggiunto msg se errore al server, installare altro browser.
2022-03-03 20:32:04 +01:00
parent 94a2a073e5
commit c1cecc5eb4
11 changed files with 228 additions and 169 deletions
--- a/src/server/models/cart.js
+++ b/src/server/models/cart.js
@@ -1,5 +1,4 @@
-
-const mongoose = require('mongoose').set('debug', false)
+const mongoose = require('mongoose').set('debug', false);
 const Schema = mongoose.Schema;

 const shared_consts = require('../tools/shared_nodejs');
@@ -8,40 +7,39 @@ const Order = require('../models/order');

 const CartSchema = new Schema({
  idapp: {
-    type: String
+    type: String,
  },
-  userId: { type: Schema.Types.ObjectId, ref: 'User' },
-  totalQty: { type: Number, default: 0 },
-  totalPrice: { type: Number, default: 0 },
+  userId: {type: Schema.Types.ObjectId, ref: 'User'},
+  totalQty: {type: Number, default: 0},
+  totalPrice: {type: Number, default: 0},
  department: {
-    type: String, ref: 'Department'
+    type: String, ref: 'Department',
  },
  items: [
    {
      order:
-        { type: Schema.Types.ObjectId, ref: 'Order' }
-    }
+          {type: Schema.Types.ObjectId, ref: 'Order'},
+    },
  ],
  note: {
-    type: String
+    type: String,
  },
  modify_at: {
-    type: Date
+    type: Date,
  },
 });

 var Cart = module.exports = mongoose.model('Cart', CartSchema);

-module.exports.findAllIdApp = async function (idapp, userId) {
-  const myfind = { idapp, userId };
+module.exports.findAllIdApp = async function(idapp, userId) {
+  const myfind = {idapp, userId};

-  return await Cart.findOne(myfind);
+  return await Cart.findOne(myfind).lean();
 };

-
-module.exports.getCartByUserId = async function (uid, idapp) {
-  let query = { userId: uid, idapp }
-  const mycart = await Cart.findOne(query);
+module.exports.getCartByUserId = async function(uid, idapp) {
+  let query = {userId: uid, idapp};
+  const mycart = await Cart.findOne(query).lean();

  if (!!mycart) {
    for (const idkey in mycart.items) {
@@ -53,7 +51,7 @@ module.exports.getCartByUserId = async function (uid, idapp) {
        }
        const myord = await Order.getTotalOrderById(idorder);
        if (myord.length > 0) {
-          mycart.items[idkey]._doc.order = myord[0];
+          mycart.items[idkey].order = myord[0];
        }
      } catch (e) {
        console.log('err', e);
@@ -63,66 +61,64 @@ module.exports.getCartByUserId = async function (uid, idapp) {
  }
  return null;

-}
+};

-module.exports.updateCartByUserId = function (userId, newCart, callback) {
-  let query = { userId: userId }
-  Cart.find(query, function (err, c) {
-    if (err) throw err
+module.exports.updateCartByUserId = function(userId, newCart, callback) {
+  let query = {userId: userId};
+  Cart.find(query, function(err, c) {
+    if (err) throw err;

    //exist cart in databse
    if (c.length > 0) {
      Cart.findOneAndUpdate(
-        { userId: userId },
-        {
-          $set: {
-            items: newCart.items,
-            totalQty: newCart.totalQty,
-            totalPrice: newCart.totalPrice,
-            userId: userId
-          }
-        },
-        { new: true },
-        callback
-      )
+          {userId: userId},
+          {
+            $set: {
+              items: newCart.items,
+              totalQty: newCart.totalQty,
+              totalPrice: newCart.totalPrice,
+              userId: userId,
+            },
+          },
+          {new: true},
+          callback,
+      );
    } else {
      //no cart in database
-      newCart.save(callback)
+      newCart.save(callback);
    }
-  })
-}
+  });
+};

-module.exports.updateCartByCartId = async function (cartId, newCart) {
+module.exports.updateCartByCartId = async function(cartId, newCart) {
  // delete newCart._doc._id;
-  const items = newCart._doc.items;
+  const items = newCart.items;
  const totalQty = newCart.totalQty;
  const totalPrice = newCart.totalPrice;

  const modify_at = new Date();

-  return await Cart.findOneAndUpdate({ _id: cartId }, {
+  return Cart.findOneAndUpdate({_id: cartId}, {
    $set: {
      items,
      totalPrice,
      totalQty,
-      modify_at
-    }
-  }, { new: false })
-    .then((ris) => {
-      return ris;
-    }).catch(err => {
-      console.log('err', err);
-      return null
-    })
+      modify_at,
+    },
+  }, {new: false}).lean().then((ris) => {
+    return ris;
+  }).catch(err => {
+    console.log('err', err);
+    return null;
+  });

-}
+};

-module.exports.deleteCartByCartId = async function (cartId) {
-  return await Cart.remove({ _id: cartId });
-}
+module.exports.deleteCartByCartId = async function(cartId) {
+  return await Cart.remove({_id: cartId});
+};

-
-module.exports.createCart = async function (newCart) {
-  return await newCart.save()
-}
+module.exports.createCart = async function(newCart) {
+  return await newCart.save();
+};

--- a/src/server/models/newstosent.js
+++ b/src/server/models/newstosent.js
@@ -160,8 +160,8 @@ NewstosentSchema.statics.isActivated = async function (_id) {
  const Newstosent = this;

  try {
-    const mydoc = await Newstosent.findOne({ _id });
-    return (mydoc._doc.activate);
+    const mydoc = await Newstosent.findOne({ _id }).lean();
+    return (mydoc.activate);
  } catch (e) {
    return false
  }
--- a/src/server/models/orderscart.js
+++ b/src/server/models/orderscart.js
@@ -109,7 +109,7 @@ module.exports.getOrdersCartByUserId = async function (uid, idapp, numorder) {
    query.userId = uid;
  }

-  myorderscart = await OrdersCart.find(query);
+  myorderscart = await OrdersCart.find(query).lean();

  for (let ind = 0; ind < myorderscart.length; ind++) {
    for (const idkey in myorderscart[ind].items) {
@@ -119,10 +119,10 @@ module.exports.getOrdersCartByUserId = async function (uid, idapp, numorder) {
        if (!!myorder) {
          idorder = myorderscart[ind].items[idkey].order._id.toString();
        }
-        myorderscart[ind]._doc.nameSurname = await User.getNameSurnameById(idapp, myorderscart[ind].userId);
+        myorderscart[ind].nameSurname = await User.getNameSurnameById(idapp, myorderscart[ind].userId);
        const myord = await Order.getTotalOrderById(idorder);
        if (myord.length > 0) {
-          myorderscart[ind].items[idkey]._doc.order = myord[0];
+          myorderscart[ind].items[idkey].order = myord[0];
        }
      } catch (e) {
        console.log('err', e);
@@ -154,7 +154,7 @@ module.exports.getOrdersCartByUserId = async function (uid, idapp, numorder) {

 module.exports.getOrdersCartByDepartmentId = async function (depId, idapp) {
  let query = { idapp, status: { $gte: shared_consts.OrderStatus.CHECKOUT_SENT } }
-  const myorderscart = await OrdersCart.find(query);
+  const myorderscart = await OrdersCart.find(query).lean();

  for (let ind = 0; ind < myorderscart.length; ind++) {
    for (const idkey in myorderscart[ind].items) {
@@ -164,10 +164,10 @@ module.exports.getOrdersCartByDepartmentId = async function (depId, idapp) {
        if (!!myorder) {
          idorder = myorderscart[ind].items[idkey].order._id.toString();
        }
-        myorderscart[ind]._doc.nameSurname = await User.getNameSurnameById(idapp, myorderscart[ind].userId);
+        myorderscart[ind].nameSurname = await User.getNameSurnameById(idapp, myorderscart[ind].userId);
        const myord = await Order.getTotalOrderById(idorder);
        if (myord.length > 0) {
-          myorderscart[ind].items[idkey]._doc.order = myord[0];
+          myorderscart[ind].items[idkey].order = myord[0];
        }
      } catch (e) {
        console.log('err', e);
@@ -181,7 +181,7 @@ module.exports.getOrdersCartByDepartmentId = async function (depId, idapp) {

 module.exports.getOrderById = async function (Id, idapp) {
  let query = { _id: Id, idapp, status: { $gte: shared_consts.OrderStatus.CHECKOUT_SENT } }
-  const myorderscart = await OrdersCart.find(query);
+  const myorderscart = await OrdersCart.find(query).lean();

  for (let ind = 0; ind < myorderscart.length; ind++) {
    for (const idkey in myorderscart[ind].items) {
@@ -191,10 +191,10 @@ module.exports.getOrderById = async function (Id, idapp) {
        if (!!myorder) {
          idorder = myorderscart[ind].items[idkey].order._id.toString();
        }
-        myorderscart[ind]._doc.nameSurname = await User.getNameSurnameById(idapp, myorderscart[ind].userId);
+        myorderscart[ind].nameSurname = await User.getNameSurnameById(idapp, myorderscart[ind].userId);
        const myord = await Order.getTotalOrderById(idorder);
        if (myord.length > 0) {
-          myorderscart[ind].items[idkey]._doc.order = myord[0];
+          myorderscart[ind].items[idkey].order = myord[0];
        }
      } catch (e) {
        console.log('err', e);
--- a/src/server/models/user.js
+++ b/src/server/models/user.js
@@ -4,6 +4,7 @@ const validator = require('validator');
 const jwt = require('jsonwebtoken');
 const _ = require('lodash');

+
 const tools = require('../tools/general');

 const {Settings} = require('../models/settings');
@@ -996,7 +997,7 @@ UserSchema.statics.getindOrderDuplicate = function(idapp) {

  return User.aggregate(User.getUsersNationalityQuery(idapp)).then(ris => {
    // console.table(ris);
-    return JSON.stringify(ris);
+    return ris;
  });
 };

@@ -1875,7 +1876,7 @@ UserSchema.statics.UsersByIdTelegram = async function(idapp, teleg_id) {
  return User.find({
    idapp, 'profile.teleg_id': teleg_id,
    $or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}],
-  }).then((rec) => {
+  }).lean().then((rec) => {
    return (!!rec) ? rec._doc : null;
  }).catch((e) => {
    console.error('UserExistByIdTelegram', e);
@@ -1891,7 +1892,7 @@ UserSchema.statics.setPicProfile = async function(idapp, username, imgpic) {

  return User.findOneAndUpdate({
    idapp, username,
-  }, {$set: fields_to_update}, {new: false}).then((record) => {
+  }, {$set: fields_to_update}, {new: false}).lean().then((record) => {
    return !!record;
  });

@@ -1903,7 +1904,7 @@ UserSchema.statics.TelegIdByUsername = async function(idapp, username) {
  return User.findOne({
    idapp, username,
    $or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}],
-  }, {'profile.teleg_id': 1}).then((rec) => {
+  }, {'profile.teleg_id': 1}).lean().then((rec) => {
    return (!!rec) ? rec.profile.teleg_id : null;
  }).catch((e) => {
    console.error('TelegIdByUsername', e);
@@ -1914,7 +1915,7 @@ UserSchema.statics.notAsk_VerifByUsername = async function(idapp, username) {
  return User.findOne({
    idapp, username,
    $or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}],
-  }, {'notask_verif': 1}).then((rec) => {
+  }, {'notask_verif': 1}).lean().then((rec) => {
    return (!!rec && rec.notask_verif) ? true: false;
  }).catch((e) => {
    console.error('notAsk_VerifByUsername', e);
@@ -1932,7 +1933,7 @@ UserSchema.statics.SetTelegramCheckCode = async function(

  return User.findOneAndUpdate({
    _id: id,
-  }, {$set: fields_to_update}, {new: false}).then((record) => {
+  }, {$set: fields_to_update}, {new: false}).lean().then((record) => {
    return !!record;
  });

@@ -1966,7 +1967,7 @@ UserSchema.statics.SetTelegramIdSuccess = async function(idapp, id, teleg_id) {
  return User.findOneAndUpdate({
    idapp,
    _id: id,
-  }, {$set: fields_to_update}, {new: false}).then((record) => {
+  }, {$set: fields_to_update}, {new: false}).lean().then((record) => {
    return record;
  });

@@ -2690,8 +2691,8 @@ UserSchema.statics.checkUser = async function(idapp, username) {
    notask_verif: 1,
    'profile.teleg_id': 1,
    'profile.teleg_checkcode': 1,
-  }).then((rec) => {
-    return JSON.stringify(rec);
+  }).lean().then((rec) => {
+    return rec;
  });

 };
@@ -2720,7 +2721,18 @@ UserSchema.statics.calculateStat = async function(idapp, username) {

    const numGroups = await MyGroup.countDocuments({idapp});

-    return {numMySkills, numMyGoods, numMyBachecas, numUsersReg, numGroups};
+    let numByTab = {}
+
+    const globalTables = require('../tools/globalTables');
+
+    for (let table of shared_consts.TABLES_VISU_STAT_IN_HOME) {
+      let mytable = globalTables.getTableByTableName(table);
+      if (mytable) {
+        numByTab[table] = await mytable.countDocuments({idapp});
+      }
+    }
+
+    return {numByTab, numUsersReg};
  } catch (e) {
    console.error(e.message);
  }
@@ -2752,7 +2764,7 @@ UserSchema.statics.findAllDistinctNationality = async function(idapp) {

  return User.aggregate(User.getDistinctNationalityQuery(idapp)).then(ris => {
    // console.table(ris);
-    return JSON.stringify(ris);
+    return ris;
  });
 };

@@ -2863,7 +2875,7 @@ UserSchema.statics.calcRegDaily = async function(idapp) {

  return User.aggregate(User.getUsersRegDaily(idapp, 30)).then(ris => {
    // console.table(ris);
-    return JSON.stringify(ris);
+    return ris;
  });
 };

@@ -2872,7 +2884,7 @@ UserSchema.statics.calcRegWeekly = async function(idapp) {

  return User.aggregate(User.getUsersRegWeekly(idapp, 20 * 7)).then(ris => {
    // console.table(ris);
-    return JSON.stringify(ris.slice(0, -1));
+    return ris.slice(0, -1);
  });
 };

@@ -3160,9 +3172,9 @@ UserSchema.statics.addExtraInfo = async function(idapp, recUser) {
      $or: [
        {deleted: {$exists: false}},
        {deleted: {$exists: true, $eq: false}}],
-    }, {username: 1});
+    }, {username: 1}).lean();

-    recUser._doc.profile.asked_friends = listSentMyRequestFriends
+    recUser.profile.asked_friends = listSentMyRequestFriends
        ? listSentMyRequestFriends
        : [];

@@ -3176,7 +3188,7 @@ UserSchema.statics.addExtraInfo = async function(idapp, recUser) {
        {deleted: {$exists: true, $eq: false}}],
    }, MyGroup.getWhatToShow_Unknown());

-    recUser._doc.profile.asked_groups = listSentMyRequestGroups
+    recUser.profile.asked_groups = listSentMyRequestGroups
        ? listSentMyRequestGroups
        : [];

@@ -3190,7 +3202,7 @@ UserSchema.statics.addExtraInfo = async function(idapp, recUser) {
        {deleted: {$exists: true, $eq: false}}],
    });

-    recUser._doc.profile.manage_mygroups = listManageGroups
+    recUser.profile.manage_mygroups = listManageGroups
        ? listManageGroups
        : [];