@tiledesk/tiledesk-server 2.3.100 → 2.3.101

package/app.js

@@ -56,7 +56,7 @@ const masked_databaseUri = MaskData.maskPhone(databaseUri, {
 if (process.env.DISABLE_MONGO_PASSWORD_MASK ==true || process.env.DISABLE_MONGO_PASSWORD_MASK == "true")  {
   winston.info("DatabaseUri: " + databaseUri);
 }else {
-  winston.info("DatabaseUri: " + masked_databaseUri);
+  winston.info("DatabaseUri masked: " + masked_databaseUri);
 }
 
 
@@ -125,6 +125,7 @@ var logs = require('./routes/logs');
 var requestUtilRoot = require('./routes/requestUtilRoot');
 var urls = require('./routes/urls');
 var email = require('./routes/email');
+var property = require('./routes/property');
 
 var bootDataLoader = require('./services/bootDataLoader');
 var settingDataLoader = require('./services/settingDataLoader');
@@ -242,7 +243,7 @@ if (process.env.ENABLE_ALTERNATIVE_CORS_MIDDLEWARE === "true") {
 
 // https://stackoverflow.com/questions/18710225/node-js-get-raw-request-body-using-express
 
-const JSON_BODY_LIMIT = process.envJSON_BODY_LIMIT || '500KB';
+const JSON_BODY_LIMIT = process.env.JSON_BODY_LIMIT || '500KB';
 winston.debug("JSON_BODY_LIMIT : " + JSON_BODY_LIMIT);
 
 app.use(bodyParser.json({limit: JSON_BODY_LIMIT,
@@ -491,6 +492,7 @@ app.use('/:projectid/campaigns',[passport.authenticate(['basic', 'jwt'], { sessi
 
 app.use('/:projectid/emails',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], email);
 
+app.use('/:projectid/properties',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('owner', ['bot','subscription'])], property);
 
 
 
@@ -545,5 +547,4 @@ app.use((err, req, res, next) => {
 
 
 
-
-module.exports = app;
+module.exports = app;

package/models/property.js

@@ -0,0 +1,49 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var winston = require('../config/winston');
+
+var PropertySchema = new Schema({
+  
+  label: {
+    type: String,
+    required: true,
+  },  
+  name: {
+    type: String,
+    required: true,
+    index: true
+  },  
+  type: {
+    type: String,
+    required: true,
+    default: "text",
+    index: true
+  },  
+  status: {
+    type: Number,
+    required: true,
+    default: 100, 
+    index: true
+  },
+  createdBy: {
+    type: String,
+    required: true
+  },
+  id_project: {
+    type: String,
+    required: true,
+    index: true
+  }
+  },{
+    timestamps: true
+  }
+);
+
+var property = mongoose.model('property', PropertySchema);
+
+ if (process.env.MONGOOSE_SYNCINDEX) {
+  property.syncIndexes();
+  winston.info("property syncIndexes")
+}
+
+module.exports = property;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.100",
+  "version": "2.3.101",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/routes/property.js

@@ -0,0 +1,175 @@
+var express = require('express');
+var router = express.Router();
+var Property = require("../models/property");
+var winston = require('../config/winston');
+
+router.post('/', function (req, res) {
+
+  winston.debug(req.body);
+  winston.debug("req.user", req.user);
+
+  var newProperty= new Property({
+    label: req.body.label,
+    name: req.body.name,
+    type: req.body.type,
+    id_project: req.projectid,
+    createdBy: req.user._id,
+  });
+
+  newProperty.save(function(err, savedProperty) {
+    if (err) {
+      winston.error('Error saving the property '+ JSON.stringify(savedProperty), err)
+      return reject(err);
+    }            
+    winston.verbose('Property created ', savedProperty.toJSON());
+
+    res.json(savedProperty);
+  });
+
+});
+
+router.put('/:propertyid', function (req, res) {
+  winston.debug(req.body);
+  var update = {};
+  
+  if (req.body.label!=undefined) {
+    update.label = req.body.label;
+  }
+  
+  if (req.body.name!=undefined) {
+    update.name = req.body.name;
+  }
+  if (req.body.type!=undefined) {
+    update.type = req.body.type;
+  }
+  if (req.body.status!=undefined) {
+    update.status = req.body.status;
+  }
+
+  
+  Property.findByIdAndUpdate(req.params.propertyid, update, { new: true, upsert: true }, function (err, updatedProperty) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error updating object.' });
+    }   
+  
+    res.json(updatedProperty);
+  });
+});
+
+
+
+
+router.delete('/:propertyid', function (req, res) {
+  winston.debug(req.body);
+
+  Property.findByIdAndUpdate(req.params.propertyid, {status: 1000}, { new: true, upsert: true }, function (err, updatedProperty) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error updating object.' });
+    }
+
+    res.json(updatedProperty);
+  });
+});
+
+router.delete('/:propertyid/physical', function (req, res) {
+  winston.debug(req.body);
+
+  var projectuser = req.projectuser;
+
+
+  if (projectuser.role != "owner" ) {
+    return res.status(403).send({ success: false, msg: 'Unauthorized.' });
+  }
+  
+   Property.remove({ _id: req.params.propertyid }, function (err, property) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error deleting object.' });
+    }
+
+
+    res.json(property);
+  });
+});
+
+
+
+router.get('/:propertyid', function (req, res) {
+  winston.debug(req.body);
+
+  Property.findById(req.params.propertyid, function (err, property) {
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error getting object.' });
+    }
+    if (!property) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+    res.json(property);
+  });
+});
+
+
+router.get('/', function (req, res) {
+
+  var limit = 40; // Number of request per page
+
+  if (req.query.limit) {    
+    limit = parseInt(req.query.limit);
+    winston.debug('property ROUTE - limit: '+limit);
+  }
+
+  var page = 0;
+
+  if (req.query.page) {
+    page = req.query.page;
+  }
+
+  var skip = page * limit;
+  winston.debug('property ROUTE - SKIP PAGE ', skip);
+
+
+  var query = { "id_project": req.projectid, "status": 100};
+
+  if (req.query.name) {
+    winston.debug('property ROUTE req.query.name', req.query.name);
+    query.name = req.query.name;
+  }
+
+  if (req.query.status) {
+    query.status = req.query.status;
+  }
+
+  var direction = -1; //-1 descending , 1 ascending
+  if (req.query.direction) {
+    direction = req.query.direction;
+  }
+
+  var sortField = "createdAt";
+  if (req.query.sort) {
+    sortField = req.query.sort;
+  }
+
+  var sortQuery = {};
+  sortQuery[sortField] = direction;
+
+  winston.debug("sort query", sortQuery);  
+
+  return Property.find(query).
+    skip(skip).limit(limit).
+    sort(sortQuery).
+    exec(function (err, properties) {
+      if (err) {
+        winston.error('property ROUTE - REQUEST FIND ERR ', err)
+        return (err);
+      }
+     
+        return res.json(properties);
+    });
+});
+
+
+
+
+module.exports = router;