From 38d7ab0c6dbefe1bab3d4e15daedeb862e0e9e46 Mon Sep 17 00:00:00 2001
From: Christina Papadogianni <59121443+ChrisPdgn@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:03:38 +0200
Subject: [PATCH] fix(database): mongoose parseStringToQuery EJSON -> JSON
 (#926)

* fix: parseStringToQuery EJSON -> JSON

* fix: ejson -> json parse in mongoose view pipeline queries
---
 .../database/src/adapters/mongoose-adapter/MongooseSchema.ts   | 3 +--
 modules/database/src/adapters/mongoose-adapter/index.ts        | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts b/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts
index f7476b4a9..257353467 100644
--- a/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts
+++ b/modules/database/src/adapters/mongoose-adapter/MongooseSchema.ts
@@ -23,7 +23,6 @@ import ConduitGrpcSdk, {
 } from '@conduitplatform/grpc-sdk';
 import { cloneDeep, isNil } from 'lodash';
 import { parseQuery } from './parser';
-import { EJSON } from 'bson';
 
 export class MongooseSchema extends SchemaAdapter<Model<any>> {
   model: Model<any>;
@@ -58,7 +57,7 @@ export class MongooseSchema extends SchemaAdapter<Model<any>> {
   parseStringToQuery(
     query: Query | SingleDocQuery | MultiDocQuery,
   ): ParsedQuery | ParsedQuery[] {
-    return typeof query === 'string' ? EJSON.parse(query) : query;
+    return typeof query === 'string' ? JSON.parse(query) : query;
   }
 
   async create(
diff --git a/modules/database/src/adapters/mongoose-adapter/index.ts b/modules/database/src/adapters/mongoose-adapter/index.ts
index b5a3341b4..dbd0c469b 100644
--- a/modules/database/src/adapters/mongoose-adapter/index.ts
+++ b/modules/database/src/adapters/mongoose-adapter/index.ts
@@ -20,7 +20,6 @@ import {
   introspectedSchemaCmsOptionsDefaults,
 } from '../../interfaces';
 import { isNil } from 'lodash';
-import { EJSON } from 'bson';
 
 const parseSchema = require('mongodb-schema');
 
@@ -96,7 +95,7 @@ export class MongooseAdapter extends DatabaseAdapter<MongooseSchema> {
       this.views[viewName] = viewModel;
       await viewModel.model.createCollection({
         viewOn: model.originalSchema.collectionName,
-        pipeline: EJSON.parse(query.mongoQuery),
+        pipeline: JSON.parse(query.mongoQuery),
       });
     } catch (e: any) {
       if (!e.message.includes('Cannot overwrite')) {