fixesthe bug that API to retrieve annotations returning status 404 #98

DIDSR/HTTdev#98
camicroscope · Mar 10, 2022 · f998cb2 · f998cb2
1 parent 6e7c751
commit f998cb2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/caracal.js b/caracal.js
@@ -135,6 +135,9 @@ var HANDLERS = {
   "advancedFindLabelingAnnotation": function() {
     return dataHandlers.LabelingAnnotation.advancedFind;
   },
+  "findByTypeOrCreator": function() {
+    return dataHandlers.LabelingAnnotation.findByTypeOrCreator;
+  },
 };
 
 if (!DISABLE_TF) {

diff --git a/handlers/dataHandlers.js b/handlers/dataHandlers.js
@@ -350,6 +350,18 @@ User.wcido = function(req, res, next) {
   }
 };
 var LabelingAnnotation = {};
+LabelingAnnotation.findByTypeOrCreator = function(req, res, next) {
+  const {slideId, slideName, computation, creator} = req.query;
+  const query = {};
+  if (slideId) query["provenance.image.slide"] = slideId;
+  if (slideName) query["provenance.image.name"] = slideName;
+  if (computation) query["provenance.analysis.computation"] = computation;
+  if (creator) query["creator"] = creator;
+  mongoDB.find('camic', 'labelingAnnotation', query, true, {"geometries": 0}).then((x) => {
+    req.data = x;
+    next();
+  }).catch((e) => next(e));
+};
 LabelingAnnotation.advancedFind = async function(req, res, next) {
   // get params -
   // id - annotation id (_id)
@@ -379,7 +391,6 @@ LabelingAnnotation.advancedFind = async function(req, res, next) {
     if (endDate) query.create_date['$lte'] = new Date(endDate);
   }
   mongoDB.find('camic', 'labelingAnnotation', query ).then((x) => {
-    console.log(x.length);
     req.data = x;
     next();
   }).catch((e) => next(e));

diff --git a/service/database/index.js b/service/database/index.js
@@ -19,13 +19,13 @@ class Mongo {
    *
    * {@link https://docs.mongodb.com/manual/reference/method/db.collection.find/ Read MongoDB Reference}
    */
-  static async find(database, collectionName, query, transform = true) {
+  static async find(database, collectionName, query, transform = true, projection) {
     try {
       query = transformIdToObjectId(query);
 
       const collection = getConnection(database).collection(collectionName);
-      console.log('find', database, collectionName, query);
-      const data = await collection.find(query).toArray();
+
+      const data = projection ? await collection.find(query, projection).toArray():await collection.find(query).toArray();
 
       /** allow caller method to toggle response transformation */
       if (transform) {
@@ -42,7 +42,6 @@ class Mongo {
       throw e;
     }
   }
-
   /**
    * Runs a distinct find operation based on given query
    *