findAndRemove & findOne

Author: sevenbitbyte

src/party/loki-cache.js

@@ -39,7 +39,7 @@ module.exports = class LokiCache extends EventEmitter {
       '$meta.id': id
     }).remove()
 
-    var found = collection.findOne({'$meta.id': id})
+    var found = collection.findOne({'$meta.id': {'$eq': id}})
 
     debug(found)
     if(found){ 
@@ -71,7 +71,7 @@ module.exports = class LokiCache extends EventEmitter {
   }
 
   findById(type, id){
-    const cachedMsg = this.db.getCollection(type).findOne({ '$meta.id': id })
+    const cachedMsg = this.db.getCollection(type).findOne({'$meta.id': {'$eq': id}})
 
     if(cachedMsg){
       delete cachedMsg.$loki
@@ -103,18 +103,18 @@ module.exports = class LokiCache extends EventEmitter {
         const collection = this.db.getCollection(type)
 
         // check for cached version of message
-        const cachedMsg = collection.findOne({ '$meta.id': id })
+        const cachedMsg = collection.findOne({'$meta.id': {'$eq': id}})
 
         // if backend set error or removed flag invalidate cache
         if (error || removed) {
           debug('invalidating msg!')
 
           if (cachedMsg) {
             try{
-              //collection.remove(cachedMsg)
-              collection.findAndRemove({
-                '$meta.id': id,
-              })
+              collection.remove(cachedMsg)
+              //collection.findAndRemove({
+              //  '$meta.id': id,
+              //})
             }
             catch(err){
               debug('WARN', err)
@@ -131,9 +131,10 @@ module.exports = class LokiCache extends EventEmitter {
 
           // check if msg is already in cache
           if (cachedMsg) {
-            collection.findAndRemove({
-              '$meta.id': id,
-            })
+            collection.remove(cachedMsg)
+            //collection.findAndRemove({
+            //  '$meta.id': id,
+            //})
           }
 
           // clone msg on insert - cache should follow backend
@@ -170,7 +171,7 @@ module.exports = class LokiCache extends EventEmitter {
           // get msg by id & strip loki metadata
           const cachedMsg = Object.assign(
             {},
-            collection.findOne({ '$meta.id': id})
+            collection.findOne({'$meta.id': {'$eq': id}})
           )
           delete cachedMsg.$loki
           delete cachedMsg.meta