Merge pull request #61 from camicroscope/develop

For 3.8.2

caracal.js

@@ -10,6 +10,7 @@ const fs = require('fs');
 
 // handlers
 const auth = require('./handlers/authHandlers.js');
+const monitor = require('./handlers/monitorHandlers.js');
 const userFunction = require('./handlers/userFunction.js');
 const iipHandler = require('./handlers/iipHandler.js');
 const proxyHandler = require('./handlers/proxyHandler.js');
@@ -88,6 +89,7 @@ var HANDLERS = {
   "sanitizeBody": function() {
     return sanitizeBody;
   },
+  "monitorCheck": monitor.check,
   "mongoFind": dataHandlers.General.find,
   "mongoAdd": dataHandlers.General.add,
   "mongoUpdate": dataHandlers.General.update,

handlers/dataHandlers.js

@@ -386,41 +386,36 @@ Mark.findMarkTypes = function(req, res, next) {
     query['provenance.image.slide'] = query.slide;
     delete query.slide;
   }
-  if (query.name) {
-    query['provenance.analysis.execution_id'] = query.name;
-    delete query.name;
+  if (query.type) {
+    query['provenance.analysis.source'] = query.type;
+    delete query.type;
   }
   delete query.token;
-  const pipeline = [
-    {
-      "$match": query,
-    }, {
-      "$group": {
-        "_id": {
-          "creator": "$creator",
-          "analysis": "$provenance.analysis",
-          "shape": "$geometries.features.geometry.type",
-        },
-      },
-    }, {
-      "$project": {
-        "_id": 0,
-        "creator": "$_id.creator",
-        "source": "$_id.analysis.source",
-        "execution_id": "$_id.analysis.execution_id",
-        "name": "$_id.analysis.name",
-        "type": "$_id.analysis.type",
-        "isGrid": "$_id.analysis.isGrid",
-        "shape": {
-          "$arrayElemAt": ["$_id.shape", 0],
+
+  if (query['provenance.analysis.source'] == 'human') {
+    const pipeline = [
+      {
+        "$match": query,
+      }, {
+        "$group": {
+          "_id": {
+            "creator": "$creator",
+            "analysis": "$provenance.analysis",
+            "shape": "$geometries.features.geometry.type",
+          },
         },
       },
-    },
-  ];
-  mongoAggregate('camic', 'mark', pipeline).then((x) => {
-    req.data = x;
-    next();
-  }).catch((e) => next(e));
+    ];
+    mongoAggregate('camic', 'mark', pipeline).then((x) => {
+      req.data = x;
+      next();
+    }).catch((e) => next(e));
+  } else {
+    mongoDistinct('camic', 'mark', 'provenance.analysis', query).then((x) => {
+      req.data = x;
+      next();
+    }).catch((e) => next(e));
+  }
 };
 
 var Heatmap = {};

handlers/monitorHandlers.js

@@ -0,0 +1,29 @@
+var mongo = require('mongodb');
+
+var MONGO_URI = process.env.MONGO_URI || 'mongodb://localhost';
+// handle monitoring checks
+
+let monitor = {};
+
+monitor.check = function(type) {
+  if (type == "basic") {
+    return new Promise(function(res, rej) {
+      let checkMsg = {"status": "up", "checkType": "basic"};
+      res(checkMsg);
+    });
+  }
+  if (type == "mongo") {
+    return new Promise(function(res, rej) {
+      mongo.MongoClient.connect(MONGO_URI, function(err, db) {
+        if (err) {
+          rej(err);
+        } else {
+          res({"status": "up", "checkType": "mongo"});
+        }
+      });
+    });
+  }
+};
+
+
+module.exports = monitor;