more fixes

Author: Cookiezaurs

api/api.js

@@ -14,7 +14,7 @@ const pack = require('../package.json');
 const versionInfo = require('../frontend/express/version.info.js');
 const moment = require("moment");
 
-var {MongoDbQueryRunner} = require('../plugins/drill/api/parts/data/MongoDbQueryRunner.js');
+var {MongoDbQueryRunner} = require('./utils/mongoDbQueryRunner.js');
 
 var t = ["countly:", "api"];
 common.processRequest = processRequest;

api/ingestor/requestProcessor.js

@@ -709,9 +709,9 @@ const processRequestData = (ob, done) => {
             update = common.mergeQuery(update, ob.updates[i]);
         }
     }
-    var SaveAppUser = Date.now().valueOf();
+    //var SaveAppUser = Date.now().valueOf();
 
-    common.updateAppUser(ob.params, update, false, function(err, userdoc) {
+    common.updateAppUser(ob.params, update, false, function() {
 
         /*var AfterSaveAppUser = Date.now().valueOf();
         if (AfterSaveAppUser - SaveAppUser > treshold) {
@@ -727,10 +727,6 @@ const processRequestData = (ob, done) => {
             }
         });
 
-    }).catch(function(err) {
-        log.e(err);
-        common.returnMessage(ob.params, 400, 'Cannot process request');
-        done();
     });
 };
 

plugins/views/api/api.js

@@ -1965,36 +1965,6 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi
         });
     });
 
-    /**
-     *  Check if view count is alread updated somewhere else and fix it
-     *  @param {Array} updates - array with updates
-     *  @param {number} inc - amount to increment
-     *  @param {number} set - amount to set
-     */
-    function checkViewQuery(updates, inc, set) {
-        var needUpdate = true;
-        for (let i = 0; i < updates.length; i++) {
-            if (inc && updates[i] && updates[i].$set && typeof updates[i].$set.vc === "number") {
-                updates[i].$set.vc = updates[i].$set.vc + inc;
-                needUpdate = false;
-                break;
-            }
-            else if (typeof set !== "undefined" && updates[i] && updates[i].$inc && updates[i].$inc.vc) {
-                set += updates[i].$inc.vc;
-                delete updates[i].$inc.vc;
-            }
-        }
-
-        if (needUpdate) {
-            if (typeof set !== "undefined") {
-                updates.push({$set: {vc: set}});
-            }
-            else if (inc) {
-                updates.push({$inc: {vc: inc}});
-            }
-        }
-    }
-
     /**
      * Function to process view
      * @param  {Object} params - Default parameters object

test/unit-tests/db.tests.js

@@ -257,25 +257,25 @@ describe('Testing Simple database operations', function() {
 
     describe("test insert Many(+behaviour on duplicate)", function() {
         it("Insert once and check result(promise)", async function(done) {
-            var rr = await db.collection("testCommands3").insertMany([{"_id": 1},{ "_id": 2},{"_id": 3}]);
+            var rr = await db.collection("testCommands3").insertMany([{"_id": 1}, { "_id": 2}, {"_id": 3}]);
 
             var cursor = db.collection("testCommands3").find();
             var res = await cursor.toArray();
             res.should.have.property.length(3);
         });
 
         it("Insert again and check result(callback)", async function(done) {
-            var rr = await db.collection("testCommands3").insertMany([{"_id": 4},{ "_id": 5},{ "_id": 6}]);
+            var rr = await db.collection("testCommands3").insertMany([{"_id": 4}, { "_id": 5}, { "_id": 6}]);
 
-            db.collection("testCommands3").insertMany([{"_id": 4},{ "_id": 5},{ "_id": 6}], function(err, res) {
+            db.collection("testCommands3").insertMany([{"_id": 4}, { "_id": 5}, { "_id": 6}], function(err, res) {
                 db.collection("testCommands3").find().toArray(function(err, res) {
                     res.should.have.property.length(6);
                 });
             });
         });
 
         it("Insert and should get duplicate error", async function(done) {
-            var rr = await db.collection("testCommands3").insertMany([{"_id": 7, "_id": 1, "_id": 8}]);
+            var rr = await db.collection("testCommands3").insertMany([{"_id": 7}, { "_id": 1}, { "_id": 8}]);
 
             var cursor = db.collection("testCommands3").find();
             var res = await cursor.toArray();