@tiledesk/tiledesk-server 2.3.84 → 2.3.86

package/CHANGELOG.md

@@ -6,7 +6,13 @@
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
 
-# 2.3.84 -> PROD v3
+# 2.3.86 -> PROD v3
+- Geo Service fix with queue enabled
+
+# 2.3.85
+- Dependency updated tiledesk-whatsapp-connector 0.1.33
+
+# 2.3.84 
 - Dependency updated tiledesk-tybot-connector 0.1.58
 - Dependency updated tiledesk/tiledesk-kaleyra-proxy 0.1.7
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.84",
+  "version": "2.3.86",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,7 +44,7 @@
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-tybot-connector": "^0.1.58",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.32",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.33",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/services/geoService.js

@@ -2,6 +2,8 @@
 
 var requestEvent = require("./../event/requestEvent");
 var Location = require("./../models/location");
+var Request = require("./../models/request");
+
 
 var winston = require('../config/winston');
 var geoip = require('geoip-lite');
@@ -68,34 +70,35 @@ class GeoService {
         var geo = geoip.lookup(ip);  
         winston.debug("Geo result", geo);
 
-        // var update = {};
+        
         if (geo) {
+            var update = {};
 
-            if (!request.location) {
-                request.location = {};
-            }
+            // if (!request.location) {
+            //     request.location = {};
+            // }
 
             if (geo.country && !request.location.country) {
                 winston.debug("geo.country:"+ geo.country);
-                request.location.country = geo.country;
-                // update["location.country"] = geo.country;
+                // request.location.country = geo.country;
+                update["location.country"] = geo.country;
 
             }
             if (geo.region && !request.location.region) {
                 winston.debug("geo.region: "+ geo.region);
-                request.location.region = geo.region;
-                // update["location.region"] = geo.region;
+                // request.location.region = geo.region;
+                update["location.region"] = geo.region;
             }
             if (geo.city && !request.location.city) {
                 winston.debug("geo.city: " + geo.city);
-                request.location.city = geo.city;
-                // update["location.city"] = geo.city;
+                // request.location.city = geo.city;
+                update["location.city"] = geo.city;
             }
 
             if (!request.location.ipAddress) {
                 winston.debug("request.location.ipAddress: " + request.location.ipAddress);
-                request.location.ipAddress = ip;
-                // update["location.city"] = geo.city;
+                // request.location.ipAddress = ip;
+                update["location.city"] = geo.city;
             }
 
             // console.log(request.location.toString());
@@ -117,8 +120,8 @@ class GeoService {
                 ) ) {
                 // if (geo.ll && request.location.geometry != undefined) {
                 winston.debug("geo.ll: " + geo.ll);
-                request.location.geometry = {type: "Point", coordinates: geo.ll};
-                // update["location.geometry"]  = {type: "Point", coordinates: geo.ll};
+                // request.location.geometry = {type: "Point", coordinates: geo.ll};
+                update["location.geometry"]  = {type: "Point", coordinates: geo.ll};
             }
             
             
@@ -126,15 +129,18 @@ class GeoService {
             // winston.info("setObj", setObj);
             // winston.info("update", update);
 
-            winston.debug("geo request saving", request);
+            winston.debug("geo request saving", update);
+            // winston.debug("geo request saving", request);
 
 
-            if (request.markModified) {
-                request.markModified('location');
-            }
+            // if (request.markModified) {
+            //     request.markModified('location');
+            // }
             
-            request.save(function(err, reqL) {            
-            // return Request.findByIdAndUpdate("5fb297bd1d838b14607b3b62", update, { new: true, upsert: false }).exec( function(err, reqL) {                
+
+            //when queue is enabled request.save is undefined because request is a plain object
+            // request.save(function(err, reqL) {            
+            return Request.findByIdAndUpdate(request.id, update, { new: true, upsert: false }).exec( function(err, reqL) {                
                 if (err) {
                     return winston.error("Error saving location metadata for request with id " + request._id, err);
                 }