diff --git a/app/api/odm/MultiTenantMongooseModel.ts b/app/api/odm/MongooseModelWrapper.ts similarity index 98% rename from app/api/odm/MultiTenantMongooseModel.ts rename to app/api/odm/MongooseModelWrapper.ts index 058a957f62..9eaf3e026d 100644 --- a/app/api/odm/MultiTenantMongooseModel.ts +++ b/app/api/odm/MongooseModelWrapper.ts @@ -69,7 +69,7 @@ export class MongooseModelWrapper { const session = dbSessionContext.getSession(); return this.dbForCurrentTenant().create(data, { ...options, - ...(session && { session }), + ...(session && { session, ordered: true }), }); } @@ -77,7 +77,7 @@ export class MongooseModelWrapper { const session = dbSessionContext.getSession(); return this.dbForCurrentTenant().create(dataArray, { ...options, - ...(session && { session }), + ...(session && { session, ordered: true }), }); } diff --git a/app/api/odm/model.ts b/app/api/odm/model.ts index f1f2bb133f..96d7b3c7fa 100644 --- a/app/api/odm/model.ts +++ b/app/api/odm/model.ts @@ -10,7 +10,7 @@ import mongoose, { } from 'mongoose'; import { ObjectIdSchema } from 'shared/types/commonTypes'; import { inspect } from 'util'; -import { MongooseModelWrapper } from './MultiTenantMongooseModel'; +import { MongooseModelWrapper } from './MongooseModelWrapper'; import { UpdateLogger, createUpdateLogHelper } from './logHelper'; import { ModelBulkWriteStream } from './modelBulkWriteStream'; diff --git a/app/api/odm/modelBulkWriteStream.ts b/app/api/odm/modelBulkWriteStream.ts index bd9d4c560c..f0b21279db 100644 --- a/app/api/odm/modelBulkWriteStream.ts +++ b/app/api/odm/modelBulkWriteStream.ts @@ -1,5 +1,5 @@ import { OdmModel } from 'api/odm/model'; -import { MongooseModelWrapper } from 'api/odm/MultiTenantMongooseModel'; +import { MongooseModelWrapper } from 'api/odm/MongooseModelWrapper'; class ModelBulkWriteStream { db: MongooseModelWrapper; diff --git a/app/api/odm/specs/mongooseModelWrapper_sessions.spec.ts b/app/api/odm/specs/mongooseModelWrapper_sessions.spec.ts index 31f570bc1a..7b5b8f1b8d 100644 --- a/app/api/odm/specs/mongooseModelWrapper_sessions.spec.ts +++ b/app/api/odm/specs/mongooseModelWrapper_sessions.spec.ts @@ -4,7 +4,7 @@ import { appContext } from 'api/utils/AppContext'; import { testingEnvironment } from 'api/utils/testingEnvironment'; import { ClientSession } from 'mongodb'; import { Schema } from 'mongoose'; -import { MongooseModelWrapper } from '../MultiTenantMongooseModel'; +import { MongooseModelWrapper } from '../MongooseModelWrapper'; interface TestDoc { title: string; diff --git a/app/api/sync/syncsModel.ts b/app/api/sync/syncsModel.ts index bcff4d2105..0c51db1f2b 100644 --- a/app/api/sync/syncsModel.ts +++ b/app/api/sync/syncsModel.ts @@ -1,5 +1,5 @@ import mongoose from 'mongoose'; -import { MongooseModelWrapper } from 'api/odm/MultiTenantMongooseModel'; +import { MongooseModelWrapper } from 'api/odm/MongooseModelWrapper'; const syncSchema = new mongoose.Schema({ lastSyncs: { type: mongoose.Schema.Types.Mixed, default: {} }, diff --git a/app/api/updatelogs/updatelogsModel.ts b/app/api/updatelogs/updatelogsModel.ts index dbd8843215..54f5006d09 100644 --- a/app/api/updatelogs/updatelogsModel.ts +++ b/app/api/updatelogs/updatelogsModel.ts @@ -1,5 +1,5 @@ import mongoose from 'mongoose'; -import { MongooseModelWrapper } from 'api/odm/MultiTenantMongooseModel'; +import { MongooseModelWrapper } from 'api/odm/MongooseModelWrapper'; import { ObjectIdSchema } from 'shared/types/commonTypes'; import { ObjectId } from 'mongodb';