@tiledesk/tiledesk-server 2.9.26 → 2.9.28

package/routes/users.js

@@ -193,17 +193,14 @@ router.post('/loginemail', function (req, res) {
 
   let project_id = req.body.id_project;
   let chatbot_id = req.body.bot_id;
+  let namespace_id = req.body.namespace_id;
 
   if (!project_id) {
     res.status(500).send({ success: false, error: "missing 'id_project' field" });
   }
 
-  if (!chatbot_id) {
-    res.status(500).send({ success: false, error: "missing 'bot_id' field" });
-  }
-
-  if (!chatbot_id) {
-    res.status(500).send({ success: false, error: "missing 'bot_id' field" });
+  if (!chatbot_id && !namespace_id) {
+    res.status(500).send({ success: false, error: "missing 'bot_id' or 'namespace_id' field" });
   }
 
   User.findById(user_id, (err, user) => {
@@ -212,7 +209,7 @@ router.post('/loginemail', function (req, res) {
     }
     winston.debug("user found: ", user);
 
-    emailService.sendEmailRedirectOnDesktop(user.email, token, project_id, chatbot_id)
+    emailService.sendEmailRedirectOnDesktop(user.email, token, project_id, chatbot_id, namespace_id)
     return res.status(200).send({ success: true, message: "Sending email..."})
   })
 

package/services/QuoteManager.js

@@ -1,4 +1,5 @@
 const { ceil, floor } = require('lodash');
+const moment = require('moment');
 let winston = require('../config/winston');
 const requestEvent = require('../event/requestEvent');
 const messageEvent = require('../event/messageEvent');
@@ -99,40 +100,82 @@ class QuoteManager {
 
     async generateKey(object, type) {
 
-        winston.debug("generateKey object ", object)
-        winston.debug("generateKey type " + type)
+        let objectDate = moment(object.createdAt);
         let subscriptionDate;
 
         if (this.project.isActiveSubscription === true) {
             if (this.project.profile.subStart) {
-                subscriptionDate = this.project.profile.subStart;
+                subscriptionDate = moment(this.project.profile.subStart);
+                winston.debug("Subscription date from subStart: " + subscriptionDate.toISOString());
             } else {
                 // it should never happen
                 winston.error("Error: quote manager - isActiveSubscription is true but subStart does not exists.")
             }
         } else {
             if (this.project.profile.subEnd) {
-                subscriptionDate = this.project.profile.subEnd;
+                subscriptionDate = moment(this.project.profile.subEnd);
+                winston.debug("Subscription date from subEnd: " + subscriptionDate.toISOString());
             } else {
-                subscriptionDate = this.project.createdAt;
+                subscriptionDate = moment(this.project.createdAt);
+                winston.debug("Subscription date from project createdAt: " + subscriptionDate.toISOString());
             }
         }
 
-        let objectDate = object.createdAt;
-        winston.debug("objectDate " + objectDate);
+        // Calculate the difference in months between the object date and the subscription date
+        let diffInMonths = objectDate.diff(subscriptionDate, 'months');
+        winston.debug("diffInMonths: ", diffInMonths)
+
+        // Make a clone of the subscription date --> this operation could be avoided
+        // Get the renewal date adding diffInMonths. Moment.js manage automatically the less longer month. 
+        // E.g. if subscription date is 31 jan the renewals will be, 28/29 feb, 31 mar, 30 apr, etc.
+        let renewalDate = subscriptionDate.clone().add(diffInMonths, 'months');
+        // Force the renewal date equal to the last day of the month --> this operation could be avoided
+        if (renewalDate.date() !== subscriptionDate.date()) {
+            renewalDate = renewalDate.endOf('month');
+        }
+        winston.debug("renewalDate: ", renewalDate)
 
-        // converts date in timestamps and transform from ms to s
-        const objectDateTimestamp = ceil(objectDate.getTime() / 1000);
-        const subscriptionDateTimestamp = ceil(subscriptionDate.getTime() / 1000);
+        return "quotes:" + type + ":" + this.project._id + ":" + renewalDate.format('M/D/YYYY');
+        // return "quotes:" + type + ":" + this.project._id + ":" + renewalDate.format('MM/DD/YYYY');
+        // return "quotes:" + type + ":" + this.project._id + ":" + renewalDate.toLocaleString();
+    }
 
-        let ndays = (objectDateTimestamp - subscriptionDateTimestamp) / 86400;  // 86400 is the number of seconds in 1 day
-        let nmonths = floor(ndays / 30); // number of month to add to the initial subscription date;
+    // async _generateKey(object, type) {
 
-        let date = new Date(subscriptionDate);
-        date.setMonth(date.getMonth() + nmonths);
+    //     winston.debug("generateKey object ", object)
+    //     winston.debug("generateKey type " + type)
+    //     let subscriptionDate;
 
-        return "quotes:" + type + ":" + this.project._id + ":" + date.toLocaleDateString();
-    }
+    //     if (this.project.isActiveSubscription === true) {
+    //         if (this.project.profile.subStart) {
+    //             subscriptionDate = this.project.profile.subStart;
+    //         } else {
+    //             // it should never happen
+    //             winston.error("Error: quote manager - isActiveSubscription is true but subStart does not exists.")
+    //         }
+    //     } else {
+    //         if (this.project.profile.subEnd) {
+    //             subscriptionDate = this.project.profile.subEnd;
+    //         } else {
+    //             subscriptionDate = this.project.createdAt;
+    //         }
+    //     }
+
+    //     let objectDate = object.createdAt;
+    //     winston.debug("objectDate " + objectDate);
+
+    //     // converts date in timestamps and transform from ms to s
+    //     const objectDateTimestamp = ceil(objectDate.getTime() / 1000);
+    //     const subscriptionDateTimestamp = ceil(subscriptionDate.getTime() / 1000);
+
+    //     let ndays = (objectDateTimestamp - subscriptionDateTimestamp) / 86400;  // 86400 is the number of seconds in 1 day
+    //     let nmonths = floor(ndays / 30); // number of month to add to the initial subscription date;
+
+    //     let date = new Date(subscriptionDate);
+    //     date.setMonth(date.getMonth() + nmonths);
+
+    //     return "quotes:" + type + ":" + this.project._id + ":" + date.toLocaleDateString();
+    // }
 
     /**
      * Get current quote for a single type (tokens or request or ...)
@@ -373,6 +416,51 @@ class QuoteManager {
         }
     }
 
+    async getCurrentSlot(project) {
+        let subscriptionDate;
+        if (project.isActiveSubscription === true) {
+            if (project.profile.subStart) {
+                subscriptionDate = moment(project.profile.subStart);
+                winston.debug("Subscription date from subStart: " + subscriptionDate.toISOString());
+            } else {
+                // it should never happen
+                winston.error("Error: quote manager - isActiveSubscription is true but subStart does not exists.")
+            }
+        } else {
+            if (project.profile.subEnd) {
+                subscriptionDate = moment(project.profile.subEnd);
+                winston.debug("Subscription date from subEnd: " + subscriptionDate.toISOString());
+            } else {
+                subscriptionDate = moment(project.createdAt);
+                winston.debug("Subscription date from project createdAt: " + subscriptionDate.toISOString());
+            }
+        }
+        
+        let now = moment();
+        winston.debug("now: ", now);
+
+        let diffInMonths = now.diff(subscriptionDate, 'months');
+        winston.debug("diffInMonths: ", diffInMonths)
+
+        let renewalDate = subscriptionDate.clone().add(diffInMonths, 'months').startOf('day');
+        winston.debug("renewalDate: ", renewalDate)
+
+        let slotEnd = subscriptionDate.clone().add(diffInMonths + 1, 'month');
+        slotEnd.subtract(1, 'day').endOf('day')
+        winston.debug("slotEnd: ", slotEnd)
+
+        // let slot = {
+        //     startDate: renewalDate.format('DD/MM/YYYY'),
+        //     endDate: slotEnd.format('DD/MM/YYYY')
+        // }
+        let slot = {
+            startDate: renewalDate,
+            endDate: slotEnd
+        }
+
+        return slot;
+    }
+
 
 
     start() {

package/services/emailService.js

@@ -324,7 +324,8 @@ class EmailService {
     winston.debug(' mail.config', mail.config);
 
     if (!mail.to) {
-      return winston.warn("EmailService send method. to field is not defined", mailOptions);
+      // return winston.warn("EmailService send method. to field is not defined", mailOptions);
+      return winston.warn("EmailService send method. to field is not defined");
     }
 
     // send mail with defined transport object
@@ -1802,7 +1803,7 @@ class EmailService {
 
   }
 
-  async sendEmailRedirectOnDesktop(to, token, project_id, chatbot_id) {
+  async sendEmailRedirectOnDesktop(to, token, project_id, chatbot_id, namespace_id) {
     winston.debug("sendEmailRedirectOnDesktop: " + to);
 
     var that = this;
@@ -1817,8 +1818,16 @@ class EmailService {
     let baseScope = JSON.parse(JSON.stringify(that));
     delete baseScope.pass;
 
+    let redirect_url;
+    if (chatbot_id) {
+      redirect_url = `https://panel.tiledesk.com/v3/cds/#/project/${project_id}/chatbot/${chatbot_id}/intent/0?jwt=${token}`;
+    } else {
+      redirect_url = `${baseScope.baseUrl}/#/project/${project_id}/knowledge-bases/${namespace_id}?token=${token}`;
+    }
+
     let replacements = {
       baseScope: baseScope,
+      redirect_url: redirect_url,
       token: token,
       project_id: project_id,
       chatbot_id: chatbot_id

package/services/operatingHoursService.js

@@ -355,6 +355,7 @@ function checkDay(operatingHoursPars, dayNowAtPrjctTz) {
 }
 
 function checkTimes(operatingHoursPars, dayNowAtPrjctTz, timeNowAtPrjctTz) {
+
   for (var operatingHoursweekDay in operatingHoursPars) {
     if (operatingHoursweekDay != 'tzname') {
       if (dayNowAtPrjctTz == operatingHoursweekDay) {

package/services/projectService.js

@@ -6,6 +6,8 @@ var mongoose = require('mongoose');
 var departmentService = require('../services/departmentService');
 var projectEvent = require("../event/projectEvent");
 var winston = require('../config/winston');
+const cacheEnabler = require("./cacheEnabler");
+const cacheUtil = require("../utils/cacheUtil");
 
 class ProjectService {
 
@@ -71,6 +73,25 @@ class ProjectService {
     });
   }
 
+  async getCachedProject(id_project) {
+    return new Promise((resolve, reject) => {
+      let q = Project.findOne({ _id: id_project, status: 100 });
+      if (cacheEnabler.project) {
+        q.cache(cacheUtil.longTTL, "projects:id:" + id_project)  //project_cache
+        winston.debug('project cache enabled for /project detail');
+      }
+      q.exec( async (err, p) => {
+        if (err) {
+          reject(err);
+        }
+        if (!p) {
+          reject('Project not found')
+        }
+
+        resolve(p);
+      })
+    })
+  }
 
 
 }