@tiledesk/tiledesk-server 2.3.39 → 2.3.41

package/CHANGELOG.md

@@ -1,9 +1,16 @@
 
+
 💥 TILEDESK SERVER v2.3.39 💥
 🚀        TAGGED AND PUBLISHED ON NPM           🚀
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.39) 
 
+# 2.3.41
+- Added force parameter to close request 
+
+# 2.3.40
+- logfix
+
 # 2.3.39
 - logfix
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.39",
+  "version": "2.3.41",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -40,7 +40,7 @@
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.14",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.16",
     "@tiledesk/tiledesk-dialogflow-connector": "^1.7.4",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/emailNotification/requestNotification.js

@@ -354,7 +354,7 @@ sendToUserEmailChannelEmail(projectid, message) {
     });
 
   } catch(e) {
-    winston.error("Error sending email", {error:e, projectid:projectid, message:message});
+    winston.error("Error sending requestNotification email", {error:e, projectid:projectid, message:message});
   }
 }
 
@@ -459,7 +459,7 @@ sendToFollower(projectid, message) {
           }
         })
     } catch (e) {
-      winston.warn("Error sending email", {error:e, projectid:projectid, message: message, savedRequest:savedRequest}); //it's better to view error email at this stage
+      winston.warn("Error sending requestNotification email", {error:e, projectid:projectid, message: message, savedRequest:savedRequest}); //it's better to view error email at this stage
     }
 }
 
@@ -595,7 +595,7 @@ sendToAgentEmailChannelEmail(projectid, message) {
                             //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+assignedId)    //user_cache
                             .exec(function (err, user) {
                             if (err) {
-                              winston.error("Error sending email to " + savedRequest.participants[0], err);
+                              winston.error("Error sending requestNotification email to " + savedRequest.participants[0], err);
                             }
                             if (!user) {
                               winston.warn("User not found",  savedRequest.participants[0]);
@@ -625,7 +625,7 @@ sendToAgentEmailChannelEmail(projectid, message) {
      });
      
      } catch (e) {
-       winston.warn("Error sending email", {error:e, projectid:projectid, message: message, savedRequest:savedRequest}); //it's better to view error email at this stage
+       winston.warn("Error sending requestNotification email", {error:e, projectid:projectid, message: message, savedRequest:savedRequest}); //it's better to view error email at this stage
      }
      //end send email
      
@@ -666,7 +666,7 @@ sendEmailChannelTakingNotification(projectid, request) {
     });
 
   } catch(e) {
-    winston.error("Error sending email", {error:e, projectid:projectid, message:message});
+    winston.error("Error sending requestNotification email", {error:e, projectid:projectid, message:message});
   }
 }
 
@@ -820,7 +820,7 @@ sendUserEmail(projectid, message) {
     });
 
   } catch(e) {
-    winston.error("Error sending email", {error:e, projectid:projectid, message:message});
+    winston.error("Error sending requestNotification email", {error:e, projectid:projectid, message:message});
   }
 }
 
@@ -970,7 +970,7 @@ sendAgentEmail(projectid, savedRequest) {
                           //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+assignedId)    //user_cache
                           .exec(function (err, user) {
                           if (err) {
-                            winston.error("Error sending email to " + savedRequest.participants[0], err);
+                            winston.error("Error sending requestNotification email to " + savedRequest.participants[0], err);
                           }
                           if (!user) {
                             winston.warn("User not found",  savedRequest.participants[0]);
@@ -1018,7 +1018,7 @@ sendAgentEmail(projectid, savedRequest) {
    });
    
    } catch (e) {
-     winston.warn("Error sending email", {error:e, projectid:projectid, savedRequest:savedRequest}); //it's better to view error email at this stage
+     winston.warn("Error sending requestNotification email", {error:e, projectid:projectid, savedRequest:savedRequest}); //it's better to view error email at this stage
    }
    //end send email
    

package/routes/request.js

@@ -288,7 +288,7 @@ router.put('/:requestid/close', function (req, res) {
   
   // closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
   const closed_by = req.user.id;
-  return requestService.closeRequestByRequestId(req.params.requestid, req.projectid, false, true, closed_by).then(function(closedRequest) {
+  return requestService.closeRequestByRequestId(req.params.requestid, req.projectid, false, true, closed_by, req.body.force).then(function(closedRequest) {
 
       winston.verbose("request closed", closedRequest);
 

package/services/emailService.js

@@ -272,7 +272,7 @@ class EmailService {
         if (mail.callback){
           mail.callback(error, {info:info});
         }
-        return winston.error("Error sending email ", {error:error,  mailOptions:mailOptions});
+        return winston.error("Error sending email ", {error:error,  mailConfig: mail.config, mailOptions:mailOptions});
       }
       winston.verbose('Email sent:', {info: info});
       winston.debug('Email sent:', {info: info, mailOptions: mailOptions});

package/services/requestService.js

@@ -1019,12 +1019,19 @@ class RequestService {
   }
 
 
-  closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by) {
+  closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by, force) {
 
     var that = this;
     return new Promise(function (resolve, reject) {
      // winston.debug("request_id", request_id);
      
+     if (force==undefined) {
+      winston.debug("force is undefined ");
+      force = false;
+     } 
+    //  else {
+    //   winston.info("force is: " + force);
+    //  }
 
      return Request      
      .findOne({request_id: request_id, id_project: id_project})
@@ -1045,13 +1052,15 @@ class RequestService {
          winston.error("Request not found for request_id "+ request_id + " and id_project " + id_project);
          return reject({"success":false, msg:"Request not found for request_id "+ request_id + " and id_project " + id_project});
        }      
-       if (request.status == RequestConstants.CLOSED) {
+       if (force == false && request.status == RequestConstants.CLOSED) {
          // qui1000
       //  if (request.statusObj.closed) {
         winston.debug("Request already closed for request_id "+ request_id + " and id_project " + id_project);
         return resolve(request);
        }
 
+       winston.debug("sono qui");
+
       //  un utente può chiudere se appartiene a participatingAgents oppure meglio agents del progetto?
       
      

package/test/faqRoute.js

@@ -18,7 +18,6 @@ const path = require('path');
 
 var expect = chai.expect;
 var assert = chai.assert;
-var path = require('path');
 
 chai.use(chaiHttp);