Lista Città (prese dal server: pickup)

src/server/router/admin_router.js

@@ -1,32 +1,57 @@
 const express = require('express');
 const router = express.Router();
-const mongoose = require('mongoose').set('debug', false)
+const mongoose = require('mongoose').set('debug', false);
 const cfgserver = mongoose.model('cfgserver');
 
+const shared_consts = require('../tools/shared_nodejs');
+
 const tools = require('../tools/general');
 
-var { authenticate } = require('../middleware/authenticate');
+const {City} = require('../models/city');
+
+var {authenticate} = require('../middleware/authenticate');
 
 router.post('/updateval', authenticate, async (req, res) => {
   console.log('/updateval', req.body.pairval);
   idapp = req.body.idapp;
   pair = req.body.pairval;
 
-  return await cfgserver.findOneAndUpdate({ chiave: pair.chiave, idapp, userId: pair.userId }, { $set: pair }, { new: false })
-    .then((item) => {
-      // cfgserver.find({ chiave: pair.chiave }, (err, item) => {
-      if (!!item) {
-        res.status(200).send();
-      } else {
-        res.status(400).send();
-      }
-    }).catch(err => {
+  return await cfgserver.findOneAndUpdate(
+      {chiave: pair.chiave, idapp, userId: pair.userId}, {$set: pair},
+      {new: false}).then((item) => {
+    // cfgserver.find({ chiave: pair.chiave }, (err, item) => {
+    if (!!item) {
+      res.status(200).send();
+    } else {
+      res.status(400).send();
+    }
+  }).catch(err => {
     console.log('ERR:', err);
     res.status(400).send();
-  })
-
+  });
 
 });
 
+router.post('/import', authenticate, async (req, res) => {
+  const cmd = req.body.cmd;
+  const data = [];
+
+  try {
+    const liste = require('../data/liste');
+
+    if (cmd === shared_consts.Cmd.CITIES_SERVER) {
+      return City.insertMany(liste.Comuni).then((ris) => {
+        return res.status(200).send(true);
+      });
+
+    }
+  }catch (e) {
+    console.error('e', e);
+    res.status(400).send();
+  }
+
+  res.status(400).send();
+
+});
 
 module.exports = router;

src/server/router/index_router.js

@@ -466,12 +466,12 @@ router.post('/pickup', authenticate, (req, res) => {
   const params = req.body;
   let mytable = getTableByTableName(params.table);
   // console.log('mytable', mytable);
-  if (!mytable || !shared_consts.TablePickup.includes(params.table)) {
+  if (!mytable) {
     console.log(`Table ${params.table} not found`);
     return res.status(400).send({});
   }
 
-  return mytable.executeQueryTable(req.user.idapp, params).then(ris => {
+  return mytable.executeQueryPickup(req.user.idapp, params).then(ris => {
     return res.send(ris);
 
   }).catch((e) => {
@@ -1335,8 +1335,10 @@ function load(req, res, version) {
     }
   }
   let askedfriends = []
+  let myuserextra = null;
   if (req.user) {
     // askedfriends = User.getAskedFriendsByUsername(idapp, req.user.username);
+    myuserextra = User.addExtraInfo(idapp, req.user);
   }
 
   return Promise.all([
@@ -1369,14 +1371,17 @@ function load(req, res, version) {
     subSkills,
     sectors,
     statusSkills,
-    cities]).then((arrdata) => {
+    cities,
+    myuserextra]).then((arrdata) => {
     // console.table(arrdata);
-    const myuser = req.user;
+    let myuser = req.user;
     if (myuser) {
       try {
-        myuser.password = '';
-        myuser._doc.calcstat = arrdata[13];
-        // myuser._doc.profile.asked_friends = arrdata[30];
+        myuser = arrdata[30];
+        if (myuser) {
+          myuser.password = '';
+          myuser._doc.calcstat = arrdata[13];
+        }
       } catch (e) {}
     }
     if (version < 91) {