From da50b91349c1ba46e4b7002cdb3fae1232aebbf3 Mon Sep 17 00:00:00 2001
From: petruki <31597636+petruki@users.noreply.github.com>
Date: Sun, 3 Sep 2023 14:21:21 -0700
Subject: [PATCH] Closes #443 - Upgrade mongodb driver to 6.0.0

---
 package.json           | 4 ++--
 src/services/metric.js | 3 +--
 tests/metric.test.js   | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 0ba5409..a9ca7c1 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,8 @@
     "helmet": "^7.0.0",
     "jsonwebtoken": "^9.0.2",
     "moment": "^2.29.4",
-    "mongodb": "^5.7.0",
-    "mongoose": "^7.4.0",
+    "mongodb": "^6.0.0",
+    "mongoose": "^7.5.0",
     "pino": "^8.15.0",
     "pino-pretty": "^10.2.0",
     "swagger-ui-express": "^5.0.0",
diff --git a/src/services/metric.js b/src/services/metric.js
index 9391710..a4b7242 100644
--- a/src/services/metric.js
+++ b/src/services/metric.js
@@ -1,5 +1,4 @@
 import moment from 'moment';
-import { ObjectId } from 'mongodb';
 import { NotFoundError } from '../exceptions';
 import { verifyOwnership } from '../helpers';
 import { EnvType } from '../models/environment';
@@ -180,7 +179,7 @@ function buildMetricsFilter(req) {
     let args = {};
 
     args.domain = req.query.domainid;
-    aggregate.match({ domain: new ObjectId(String(req.query.domainid)) });
+    aggregate.match({ $expr: { $eq: [{ $toString: '$domain' }, args.domain] } });
 
     if (req.query.environment) {
         args.environment = req.query.environment;
diff --git a/tests/metric.test.js b/tests/metric.test.js
index 395a780..88b5713 100644
--- a/tests/metric.test.js
+++ b/tests/metric.test.js
@@ -26,6 +26,9 @@ describe('Fetch overall statistics', () => {
 
         // Response validation
         expect(response.body).not.toBeNull();
+        expect(response.body.reasons.length > 0).toEqual(true);
+        expect(response.body.switchers.length > 0).toEqual(true);
+        expect(response.body.components.length > 0).toEqual(true);
     });
 
     test('METRIC_SUITE - Should return only switcher statistics from a given Domain', async () => {