From fa9c6f1c6bf13e42e44cc680f2421e5a1ea7e45f Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Thu, 5 May 2022 23:56:37 +0200
Subject: [PATCH] Accomodations ...

---
 src/server/models/myhosp.js        | 57 ++++++++++++++----------------
 src/server/telegram/telegrambot.js |  5 ++-
 src/server/tools/general.js        |  4 +--
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/src/server/models/myhosp.js b/src/server/models/myhosp.js
index 57e3447..58b8e1a 100755
--- a/src/server/models/myhosp.js
+++ b/src/server/models/myhosp.js
@@ -22,38 +22,28 @@ const MyHospSchema = new Schema({
     required: true,
   },
   userId: {type: Schema.Types.ObjectId, ref: 'User'},
-  idSector: {
+  typeHosp: {  // scambio casa / ospitalità
     type: Number,
   },
-  idSkill: {
+  numMaxPeopleHosp: {
     type: Number,
-    default: 0,
   },
-  idStatusSkill: [
+  accomodation: [
+    {
+      type: {  // Letto matrimoniale / letto singolo / divano-letto / almaca / a terra sul tappeto (per sacco a pelo) / culla
+        type: Number,
+      },
+      location: {  // in camera privata / in camera condivisa / in soggiorno / in camper / in tenda / in giardino / all'aperto
+        type: Number,
+      },
+      num: {
+        type: Number,
+      },
+    }],
+  preferences: [  // Accetto bambini, Accetto cani, Accetto gatti, E' consentito fumare in casa, Accessibile con sedia a rotelle
     {
       type: Number,
     }],
-  idContribType: [
-    {
-      type: String,
-    }],
-  idCity: [
-    {
-      type: Number,
-    }],
-  dateTimeStart: {
-    type: Date,
-  },
-  dateTimeEnd: {
-    type: Date,
-  },
-  numLevel: {
-    type: Number,
-    default: 0,
-  },
-  adType: {
-    type: Number,
-  },
   photos: [
     {
       imagefile: {
@@ -66,14 +56,21 @@ const MyHospSchema = new Schema({
         type: String,
       },
     }],
+  idContribType: [
+    {
+      type: String,
+    }],
+  idCity: [
+    {
+      type: Number,
+    }],
+  descr: {
+    type: String,
+  },
   note: {
     type: String,
     default: '',
   },
-  descr: {
-    type: String,
-  },
-  //**ADDFIELD_MyHospS
   website: {
     type: String,
   },
@@ -133,7 +130,6 @@ MyHospSchema.statics.getFieldsLastForSearch = function() {
   ];
 };
 
-
 MyHospSchema.statics.executeQueryTable = function(idapp, params) {
   params.fieldsearch = this.getFieldsForSearch();
   params.fieldsearch_last = this.getFieldsLastForSearch();
@@ -492,7 +488,6 @@ MyHospSchema.statics.getCompleteRecord = function(idapp, id) {
 
 };
 
-
 const MyHosp = mongoose.model('MyHosp', MyHospSchema);
 
 module.exports = {MyHosp};
diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js
index fa8d9e4..d180609 100755
--- a/src/server/telegram/telegrambot.js
+++ b/src/server/telegram/telegrambot.js
@@ -2563,6 +2563,9 @@ class Telegram {
 
           const str2 = '\n' + getstr(this.getlang(msg), 'MSG_ASK_USERNAME_INVITANTE', tools.getNomeAppByIdApp(this.idapp));
 
+          if (msg.from.username)
+            console.log(msg.from.username + ' ha digitato: ' + msg.text);
+
           await this.sendMsg(msg.from.id, getstr(this.getlang(msg), 'MSG_ERRORE_INVITANTE_NOT_FOUND') + str2, null);
         }
       }
@@ -3029,7 +3032,7 @@ class Telegram {
 
       const status = this.getstatus(rec);
       if (status === Status.SET_USERNAME_INVITANTE && rec.aportador_solidario) {
-        let linkreg = tools.getLinkRegByIdAppAndMsgStrutt(this.idapp, msg);
+        let linkreg = tools.getLinkRegByIdAppAndMsgStrutt(this.idapp, msg, rec);
 
         if (process.env.LOCALE === '1') {
           linkreg = 'http://192.168.1.115:8084/signup/' + rec.aportador_solidario + '/' + msg.from.username + '/' + msg.from.id;
diff --git a/src/server/tools/general.js b/src/server/tools/general.js
index 302b0e0..d43614f 100755
--- a/src/server/tools/general.js
+++ b/src/server/tools/general.js
@@ -1114,11 +1114,11 @@ module.exports = {
       return '';
   },
 
-  getLinkRegByIdAppAndMsgStrutt: function(idapp, msg) {
+  getLinkRegByIdAppAndMsgStrutt: function(idapp, msg, rec) {
 
     let myapp = this.getHostByIdApp(idapp);
     if (myapp) {
-      myapp += '/' + msg.from.username + '/' + msg.from.id;
+      myapp += '/signup/' + rec.aportador_solidario + '/' + msg.from.username + '/' + msg.from.id;
     }
 
     return myapp;