surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- corretta configurazione

Browse Source 
- fix problemi al database su piuchebuono una chiamata dava errore...
const c = ....
if (mycart && mycart.length > 0) {
This commit is contained in:
Surya Paolo
2025-03-10 19:59:03 +01:00
parent 4758ce0857
commit d106a59bb5
16 changed files with 77 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.env.development
View File

@@ -1,12 +1,12 @@
DATABASE=test_FreePlanet DATABASE=test_PiuCheBuono
UDB=paofreeplanet UDB=paofreeplanet
PDB=mypassword@1A PDB=mypassword@1A
SEND_EMAIL=0 SEND_EMAIL=0
SEND_EMAIL_ORDERS=1 SEND_EMAIL_ORDERS=1
PORT=3000 PORT=3000
appTelegram_TEST=["1","13"] appTelegram_TEST=["1","17"]
appTelegram=["1","13"] appTelegram=["1","17"]
appTelegram_DEVELOP=["13"] appTelegram_DEVELOP=["17"]
DOMAIN=mongodb://localhost:27017/ DOMAIN=mongodb://localhost:27017/
AUTH_MONGODB=0 AUTH_MONGODB=0
ENABLE_PUSHNOTIFICATION=1 ENABLE_PUSHNOTIFICATION=1
@@ -29,7 +29,7 @@ GCM_API_KEY=""
PROD=0 PROD=0
PROJECT_DESCR_MAIN='__PROJECTS' PROJECT_DESCR_MAIN='__PROJECTS'
SECRK=Askb38v23jjDFaoskBOWj92axXCQ SECRK=Askb38v23jjDFaoskBOWj92axXCQ
TOKEN_LIFE=1m TOKEN_LIFE=2h
REFRESH_TOKEN_LIFE=14d REFRESH_TOKEN_LIFE=14d
FTPSERVER_HOST=139.162.166.31 FTPSERVER_HOST=139.162.166.31
FTPSERVER_PORT=21 FTPSERVER_PORT=21
@@ -38,4 +38,9 @@ FTPSERVER_PWD=ftpmypwd@1A_
AUTH_NEW_SITES=123123123 AUTH_NEW_SITES=123123123
SCRIPTS_DIR=admin_scripts SCRIPTS_DIR=admin_scripts
CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}] CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}]
MIAB_HOST=box.lamiaposta.org
MIAB_ADMIN_EMAIL=admin@lamiaposta.org
MIAB_ADMIN_PASSWORD=passpao1pabox@1A
DS_API_KEY="sk-222e3addb3d8455d8b0516d93906eec7" DS_API_KEY="sk-222e3addb3d8455d8b0516d93906eec7"
API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK"
SERVER_A_URL="http://51.77.156.69:3000"

2
.env.test.pcb
View File

@@ -15,7 +15,7 @@ DOMAIN_AUTH=mongodb://{username}:{password}@127.0.0.1:32002/
AUTH_MONGODB=1 AUTH_MONGODB=1
AUTH_DB_PASSING=1 AUTH_DB_PASSING=1
MONGODB_USER=admin MONGODB_USER=admin
MONGODB_PWD=mypwadmin@1A MONGODB_PWD=mypwadminS1A
SIGNCODE=SU2134hncaskjdbo231oihJSDNHEI$1@AB SIGNCODE=SU2134hncaskjdbo231oihJSDNHEI$1@AB
VITE_DEBUG=0 VITE_DEBUG=0
LOCALE=0 LOCALE=0

2
.env.test.risosrv
View File

@@ -28,7 +28,7 @@ PATH_SSL_CHAIN_PEM=chain.pem
PROD=0 PROD=0
PROJECT_DESCR_MAIN='__PROJECTS' PROJECT_DESCR_MAIN='__PROJECTS'
SECRK=iUUb38v23jjDFaosWj92axkBOXCQ SECRK=iUUb38v23jjDFaosWj92axkBOXCQ
TOKEN_LIFE=1m TOKEN_LIFE=2h
REFRESH_TOKEN_LIFE=14d REFRESH_TOKEN_LIFE=14d
AUTH_NEW_SITES=B234HDSAOJ734ndcsdKWNV AUTH_NEW_SITES=B234HDSAOJ734ndcsdKWNV
DOMAINS=[{"hostname":"riso.app","port":"3005"}] DOMAINS=[{"hostname":"riso.app","port":"3005"}]

2
deploynode_pcb_prod.sh
View File

@@ -64,7 +64,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "" echo ""
echo "*** Copia del file ecosystem.config.js ... " echo "*** Copia del file ecosystem.config.js ... "
rsync -avz -e "ssh $SSH_OPTIONS" \ rsync -avz -e "ssh $SSH_OPTIONS" \
ecosystem.config.pcb.js "$REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/ecosystem.config.js" ecosystem.config.pcb_test.js "$REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/ecosystem.config.js"
# Verifica il risultato # Verifica il risultato
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then

9
deploynode_pcb_test.sh
View File

@@ -26,8 +26,8 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
REMOTE_DIR="$DIRECTORY_SERVER" REMOTE_DIR="$DIRECTORY_SERVER"
SSH_OPTIONS="-p $REMOTE_PORT" SSH_OPTIONS="-p $REMOTE_PORT"
CONFIG_JS="ecosystem.config.testriso.js" CONFIG_JS="ecosystem.config.pcb_test.js"
ENV_FILE=".env.test.risosrv" ENV_FILE=".env.test.pcb"
ENV_OUT=".env.test" ENV_OUT=".env.test"
# Array di cartelle e file da sincronizzare # Array di cartelle e file da sincronizzare
@@ -67,11 +67,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
rsync -avz -e "ssh $SSH_OPTIONS" \ rsync -avz -e "ssh $SSH_OPTIONS" \
package.json "$REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/package.json" package.json "$REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/package.json"
echo ""
echo "*** Copia del file ecosystem.config.testpcb.js in ecosystem.config.js ... "
rsync -avz -e "ssh $SSH_OPTIONS" \
ecosystem.config.testpcb.js "$REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/ecosystem.config.js"
echo "" echo ""
echo "*** Copia del file $CONFIG_JS in ecosystem.config.js ... " echo "*** Copia del file $CONFIG_JS in ecosystem.config.js ... "
rsync -avz -e "ssh $SSH_OPTIONS" \ rsync -avz -e "ssh $SSH_OPTIONS" \

2
deploynode_riso_prod.sh
View File

@@ -22,7 +22,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
REMOTE_PORT="8822" REMOTE_PORT="8822"
REMOTE_DIR="$DIRECTORY_SERVER" REMOTE_DIR="$DIRECTORY_SERVER"
SSH_OPTIONS="-p $REMOTE_PORT" SSH_OPTIONS="-p $REMOTE_PORT"
CONFIG_JS="ecosystem.config.prod_riso.js" CONFIG_JS="ecosystem.config.riso_prod.js"
ENV_FILE=".env.prod.riso" ENV_FILE=".env.prod.riso"
ENV_OUT=".env.production" ENV_OUT=".env.production"

2
deploynode_riso_test.sh
View File

@@ -22,7 +22,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
REMOTE_PORT="8822" REMOTE_PORT="8822"
REMOTE_DIR="$DIRECTORY_SERVER" REMOTE_DIR="$DIRECTORY_SERVER"
SSH_OPTIONS="-p $REMOTE_PORT" SSH_OPTIONS="-p $REMOTE_PORT"
CONFIG_JS="ecosystem.config.testriso.js" CONFIG_JS="ecosystem.config.riso_test.js"
ENV_FILE=".env.test.risosrv" ENV_FILE=".env.test.risosrv"
ENV_OUT=".env.test" ENV_OUT=".env.test"

3
ecosystem.config.pcb.js → ecosystem.config.pcb_prod.js
View File

@@ -1,9 +1,10 @@
module.exports = { module.exports = {
apps: [ apps: [
{ {
name: "PiuCheBuono", name: "PiuCheBuono (Prod)",
script: "/var/www/nodejs_piuchebuono_server/src/server/server.js", script: "/var/www/nodejs_piuchebuono_server/src/server/server.js",
ignore_watch: ["node_modules", "logs"], ignore_watch: ["node_modules", "logs"],
interpreter: "/root/.nvm/versions/node/v22.13.1/bin/node",
//autorestart: true, //autorestart: true,
instances: 1, instances: 1,
watch: false, watch: false,

1
ecosystem.config.testpcb.js → ecosystem.config.pcb_test.js
View File

@@ -5,7 +5,6 @@ module.exports = {
script: "/var/www/nodejs_test.piuchebuono_server/src/server/server.js", script: "/var/www/nodejs_test.piuchebuono_server/src/server/server.js",
ignore_watch: ["node_modules", "logs"], ignore_watch: ["node_modules", "logs"],
interpreter: "/root/.nvm/versions/node/v22.13.1/bin/node", interpreter: "/root/.nvm/versions/node/v22.13.1/bin/node",
//autorestart: true,
instances: 1, instances: 1,
watch: false, watch: false,
env: { env: {

2
ecosystem.config.prod_riso.js → ecosystem.config.riso_prod.js
View File

@@ -1,7 +1,7 @@
module.exports = { module.exports = {
apps: [ apps: [
{ {
name: "RISO", name: "RISO (Prod)",
script: "/var/www/nodejs_riso_server/src/server/server.js", script: "/var/www/nodejs_riso_server/src/server/server.js",
ignore_watch: ["node_modules", "logs"], ignore_watch: ["node_modules", "logs"],
interpreter: "/root/.nvm/versions/node/v22.13.1/bin/node", interpreter: "/root/.nvm/versions/node/v22.13.1/bin/node",

1
ecosystem.config.testriso.js → ecosystem.config.riso_test.js
View File

@@ -6,7 +6,6 @@ module.exports = {
ignore_watch: ["node_modules", "logs"], ignore_watch: ["node_modules", "logs"],
interpreter: "/root/.nvm/versions/node/v22.13.1/bin/node", interpreter: "/root/.nvm/versions/node/v22.13.1/bin/node",
watch: false, watch: false,
//autorestart: true,
instances: 1, instances: 1,
env_test: { env_test: {
"PORT": 3001, "PORT": 3001,

4
src/server/config/config.js
View File

@@ -46,8 +46,10 @@ const database = process.env.DATABASE || "test"; // Nome del database, default a
if (process.env.AUTH_DB_PASSING === "1") { if (process.env.AUTH_DB_PASSING === "1") {
// replace username and password in the process.env.DOMAIN // replace username and password in the process.env.DOMAIN
process.env.MONGODB_URI = process.env.DOMAIN_AUTH.replace('{username}', username).replace('{password}', password) + database; process.env.MONGODB_URI = process.env.DOMAIN_AUTH.replace('{username}', username).replace('{password}', password) + database;
process.env.MONGODB_URI_NOPWD = process.env.DOMAIN_AUTH.replace('{username}', username) + database;
} else { } else {
process.env.MONGODB_URI = domain + database; process.env.MONGODB_URI = domain + database;
process.env.MONGODB_URI_NOPWD = domain + database;
} }
console.log('process.env.MONGODB_URI:', process.env.MONGODB_URI); console.log('process.env.MONGODB_URI:', process.env.MONGODB_URI_NOPWD);

6
src/server/db/mongoose.js
View File

@@ -41,7 +41,7 @@ console.log('Mongoose Version ' + mongoose.version);
// URL di connessione // URL di connessione
const connectionUrl = process.env.MONGODB_URI; const connectionUrl = process.env.MONGODB_URI;
console.log('Connessione a ' + connectionUrl + ' in corso...'); console.log('Connessione a ' + process.env.MONGODB_URI_NOPWD + ' in corso...');
// Funzione per connettersi al database con retry // Funzione per connettersi al database con retry
async function connectToDatabase(uri, opts) { async function connectToDatabase(uri, opts) {
@@ -52,12 +52,12 @@ async function connectToDatabase(uri, opts) {
console.log("Sto provando a connettermi al database..."); console.log("Sto provando a connettermi al database...");
await mongoose.connect(uri); await mongoose.connect(uri);
console.log(' *** CONNESSIONE EFFETTUATA ! ' + uri + ' db: ' + process.env.DATABASE); console.log(' *** CONNESSIONE EFFETTUATA ! ' + ' db: ' + process.env.DATABASE);
console.log(' Database corrente:', mongoose.connection.name); console.log(' Database corrente:', mongoose.connection.name);
// Ottieni l'URL completo della connessione // Ottieni l'URL completo della connessione
console.log(' URL di connessione:', mongoose.connection.client.s.url); // console.log(' URL di connessione:', mongoose.connection.client.s.url);
const db = mongoose.connection; const db = mongoose.connection;
const serverInfo = await db.db.admin().serverStatus(); // Ottieni lo stato del server const serverInfo = await db.db.admin().serverStatus(); // Ottieni lo stato del server

10
src/server/models/orderscart.js
View File

@@ -548,15 +548,17 @@ module.exports.updateOrdersCartById = async function(id, newOrdersCart, callback
id, id,
deleted: false, deleted: false,
} }
let mycart = null;
try { try {
const c = await OrdersCart.find(query); mycart = await OrdersCart.find(query);
} catch (err) { } catch (err) {
console.log('ERR: updateOrdersCartById', err); console.log('ERR: updateOrdersCartById', err);
if (err) throw err; if (err) throw err;
} }
try {
//exist cart in databse //exist cart in databse
if (c.length > 0) { if (mycart && mycart.length > 0) {
return OrdersCart.findOneAndUpdate( return OrdersCart.findOneAndUpdate(
{ _id: id }, { _id: id },
{ {
@@ -581,7 +583,11 @@ module.exports.updateOrdersCartById = async function(id, newOrdersCart, callback
//no cart in database //no cart in database
return newOrdersCart.save(callback) return newOrdersCart.save(callback)
} }
} catch (e) {
console.log('Err updateOrdersCartById', e.message);
} }
}
module.exports.setFieldInOrdersById = async function (objtoset, myOrderCart) { module.exports.setFieldInOrdersById = async function (objtoset, myOrderCart) {

4
src/server/router/cart_router.js
View File

@@ -248,7 +248,7 @@ router.post('/:userId/createorderscart', authenticate, async function (req, res,
let options = req.body.options; let options = req.body.options;
try { try {
let mycart = await Cart.findOne({ _id: cart_id }); let mycart = await Cart.findOne({ _id: cart_id }).lean();
if (!mycart) { if (!mycart) {
return res.send({ return res.send({
@@ -309,6 +309,7 @@ router.post('/:userId/createorderscart', authenticate, async function (req, res,
.then(async (orders) => { .then(async (orders) => {
if (!!orders) { if (!!orders) {
if (orders[0]) {
await OrdersCart.updateCmd(orders[0], status, true, req, options); await OrdersCart.updateCmd(orders[0], status, true, req, options);
// Invia la email dell'Ordine // Invia la email dell'Ordine
@@ -323,6 +324,7 @@ router.post('/:userId/createorderscart', authenticate, async function (req, res,
}); });
}); });
} }
}
}); });
}) })

8
src/server/router/index_router.js
View File

@@ -1961,22 +1961,22 @@ function load(req, res, version) {
operators, operators,
wheres, wheres,
contribtype, contribtype,
settings, settings, // 5
permissions, permissions,
disciplines, disciplines,
newstosent, newstosent,
mailinglist, mailinglist,
mypage, mypage, // 10
gallery, gallery,
paymenttype, paymenttype,
calcstat, calcstat,
calzoom, calzoom,
producers, producers, // 15
cart, cart,
storehouses, storehouses,
departments, departments,
orderscart, orderscart,
groups, groups, // 20
resps, resps,
workers, workers,
internalpages, internalpages,