fix: graphql query concurrency issues (#6925)

PatrikKozak · web-flow · commit fb72d19d6c80 · 2024-07-08T15:55:04.000Z
## Description This is the beta (v3) PR for the v2 PR [here](#6857) Addresses #6800, #5108 - [x] I have read and understand the [CONTRIBUTING.md](https://github.com/payloadcms/payload/blob/main/CONTRIBUTING.md) document in this repository. ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## Checklist: - [x] I have added tests that prove my fix is effective or that my feature works - [x] Existing test suite passes locally with my changes
diff --git a/packages/db-mongodb/src/count.ts b/packages/db-mongodb/src/count.ts
@@ -12,7 +12,7 @@ export const count: Count = async function count(
   { collection, locale, req = {} as PayloadRequest, where },
 ) {
   const Model = this.collections[collection]
-  const options: QueryOptions = withSession(this, req.transactionID)
+  const options: QueryOptions = await withSession(this, req)
 
   let hasNearConstraint = false
 
diff --git a/packages/db-mongodb/src/create.ts b/packages/db-mongodb/src/create.ts
@@ -10,7 +10,7 @@ export const create: Create = async function create(
   { collection, data, req = {} as PayloadRequest },
 ) {
   const Model = this.collections[collection]
-  const options = withSession(this, req.transactionID)
+  const options = await withSession(this, req)
   let doc
   try {
     ;[doc] = await Model.create([data], options)
diff --git a/packages/db-mongodb/src/createGlobal.ts b/packages/db-mongodb/src/createGlobal.ts
@@ -14,7 +14,7 @@ export const createGlobal: CreateGlobal = async function createGlobal(
     globalType: slug,
     ...data,
   }
-  const options = withSession(this, req.transactionID)
+  const options = await withSession(this, req)
 
   let [result] = (await Model.create([global], options)) as any
 
diff --git a/packages/db-mongodb/src/createGlobalVersion.ts b/packages/db-mongodb/src/createGlobalVersion.ts
@@ -9,7 +9,7 @@ export const createGlobalVersion: CreateGlobalVersion = async function createGlo
   { autosave, createdAt, globalSlug, parent, req = {} as PayloadRequest, updatedAt, versionData },
 ) {
   const VersionModel = this.versions[globalSlug]
-  const options = withSession(this, req.transactionID)
+  const options = await withSession(this, req)
 
   const [doc] = await VersionModel.create(
     [
diff --git a/packages/db-mongodb/src/createVersion.ts b/packages/db-mongodb/src/createVersion.ts
@@ -17,7 +17,7 @@ export const createVersion: CreateVersion = async function createVersion(
   },
 ) {
   const VersionModel = this.versions[collectionSlug]
-  const options = withSession(this, req.transactionID)
+  const options = await withSession(this, req)
 
   const [doc] = await VersionModel.create(
     [
diff --git a/packages/db-mongodb/src/deleteMany.ts b/packages/db-mongodb/src/deleteMany.ts
@@ -10,7 +10,7 @@ export const deleteMany: DeleteMany = async function deleteMany(
 ) {
   const Model = this.collections[collection]
   const options = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     lean: true,
   }
 
diff --git a/packages/db-mongodb/src/deleteOne.ts b/packages/db-mongodb/src/deleteOne.ts
@@ -10,7 +10,7 @@ export const deleteOne: DeleteOne = async function deleteOne(
   { collection, req = {} as PayloadRequest, where },
 ) {
   const Model = this.collections[collection]
-  const options = withSession(this, req.transactionID)
+  const options = await withSession(this, req)
 
   const query = await Model.buildQuery({
     payload: this.payload,
diff --git a/packages/db-mongodb/src/deleteVersions.ts b/packages/db-mongodb/src/deleteVersions.ts
@@ -10,7 +10,7 @@ export const deleteVersions: DeleteVersions = async function deleteVersions(
 ) {
   const VersionsModel = this.versions[collection]
   const options = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     lean: true,
   }
 
diff --git a/packages/db-mongodb/src/find.ts b/packages/db-mongodb/src/find.ts
@@ -15,7 +15,7 @@ export const find: Find = async function find(
 ) {
   const Model = this.collections[collection]
   const collectionConfig = this.payload.collections[collection].config
-  const options = withSession(this, req.transactionID)
+  const options = await withSession(this, req)
 
   let hasNearConstraint = false
 
diff --git a/packages/db-mongodb/src/findGlobal.ts b/packages/db-mongodb/src/findGlobal.ts
@@ -13,7 +13,7 @@ export const findGlobal: FindGlobal = async function findGlobal(
 ) {
   const Model = this.globals
   const options = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     lean: true,
   }
 
diff --git a/packages/db-mongodb/src/findGlobalVersions.ts b/packages/db-mongodb/src/findGlobalVersions.ts
@@ -28,7 +28,7 @@ export const findGlobalVersions: FindGlobalVersions = async function findGlobalV
     this.payload.globals.config.find(({ slug }) => slug === global),
   )
   const options = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     limit,
     skip,
   }
diff --git a/packages/db-mongodb/src/findOne.ts b/packages/db-mongodb/src/findOne.ts
@@ -12,7 +12,7 @@ export const findOne: FindOne = async function findOne(
 ) {
   const Model = this.collections[collection]
   const options: MongooseQueryOptions = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     lean: true,
   }
 
diff --git a/packages/db-mongodb/src/findVersions.ts b/packages/db-mongodb/src/findVersions.ts
@@ -26,7 +26,7 @@ export const findVersions: FindVersions = async function findVersions(
   const Model = this.versions[collection]
   const collectionConfig = this.payload.collections[collection].config
   const options = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     limit,
     skip,
   }
diff --git a/packages/db-mongodb/src/queryDrafts.ts b/packages/db-mongodb/src/queryDrafts.ts
@@ -15,7 +15,7 @@ export const queryDrafts: QueryDrafts = async function queryDrafts(
 ) {
   const VersionModel = this.versions[collection]
   const collectionConfig = this.payload.collections[collection].config
-  const options = withSession(this, req.transactionID)
+  const options = await withSession(this, req)
 
   let hasNearConstraint
   let sort
diff --git a/packages/db-mongodb/src/transactions/commitTransaction.ts b/packages/db-mongodb/src/transactions/commitTransaction.ts
@@ -1,6 +1,8 @@
 import type { CommitTransaction } from 'payload'
 
 export const commitTransaction: CommitTransaction = async function commitTransaction(id) {
+  if (id instanceof Promise) return
+
   if (!this.sessions[id]?.inTransaction()) {
     return
   }
diff --git a/packages/db-mongodb/src/transactions/rollbackTransaction.ts b/packages/db-mongodb/src/transactions/rollbackTransaction.ts
@@ -1,27 +1,35 @@
 import type { RollbackTransaction } from 'payload'
 
 export const rollbackTransaction: RollbackTransaction = async function rollbackTransaction(
-  id = '',
+  incomingID = '',
 ) {
+  let transactionID: number | string
+
+  if (incomingID instanceof Promise) {
+    transactionID = await incomingID
+  } else {
+    transactionID = incomingID
+  }
+
   // if multiple operations are using the same transaction, the first will flow through and delete the session.
   // subsequent calls should be ignored.
-  if (!this.sessions[id]) {
+  if (!this.sessions[transactionID]) {
     return
   }
 
   // when session exists but is not inTransaction something unexpected is happening to the session
-  if (!this.sessions[id].inTransaction()) {
+  if (!this.sessions[transactionID].inTransaction()) {
     this.payload.logger.warn('rollbackTransaction called when no transaction exists')
-    delete this.sessions[id]
+    delete this.sessions[transactionID]
     return
   }
 
   // the first call for rollback should be aborted and deleted causing any other operations with the same transaction to fail
   try {
-    await this.sessions[id].abortTransaction()
-    await this.sessions[id].endSession()
+    await this.sessions[transactionID].abortTransaction()
+    await this.sessions[transactionID].endSession()
   } catch (error) {
     // ignore the error as it is likely a race condition from multiple errors
   }
-  delete this.sessions[id]
+  delete this.sessions[transactionID]
 }
diff --git a/packages/db-mongodb/src/updateGlobal.ts b/packages/db-mongodb/src/updateGlobal.ts
@@ -11,7 +11,7 @@ export const updateGlobal: UpdateGlobal = async function updateGlobal(
 ) {
   const Model = this.globals
   const options = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     lean: true,
     new: true,
   }
diff --git a/packages/db-mongodb/src/updateGlobalVersion.ts b/packages/db-mongodb/src/updateGlobalVersion.ts
@@ -18,7 +18,7 @@ export async function updateGlobalVersion<T extends TypeWithID>(
   const VersionModel = this.versions[global]
   const whereToUse = where || { id: { equals: id } }
   const options = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     lean: true,
     new: true,
   }
diff --git a/packages/db-mongodb/src/updateOne.ts b/packages/db-mongodb/src/updateOne.ts
@@ -13,7 +13,7 @@ export const updateOne: UpdateOne = async function updateOne(
   const where = id ? { id: { equals: id } } : whereArg
   const Model = this.collections[collection]
   const options = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     lean: true,
     new: true,
   }
diff --git a/packages/db-mongodb/src/updateVersion.ts b/packages/db-mongodb/src/updateVersion.ts
@@ -11,7 +11,7 @@ export const updateVersion: UpdateVersion = async function updateVersion(
   const VersionModel = this.versions[collection]
   const whereToUse = where || { id: { equals: id } }
   const options = {
-    ...withSession(this, req.transactionID),
+    ...(await withSession(this, req)),
     lean: true,
     new: true,
   }
diff --git a/packages/db-mongodb/src/withSession.ts b/packages/db-mongodb/src/withSession.ts
@@ -1,14 +1,21 @@
 import type { ClientSession } from 'mongoose'
+import type { PayloadRequest } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
 /**
  * returns the session belonging to the transaction of the req.session if exists
  * @returns ClientSession
  */
-export function withSession(
+export async function withSession(
   db: MongooseAdapter,
-  transactionID?: number | string,
-): { session: ClientSession } | object {
-  return db.sessions[transactionID] ? { session: db.sessions[transactionID] } : {}
+  req: PayloadRequest,
+): Promise<{ session: ClientSession } | object> {
+  let transactionID = req.transactionID
+
+  if (transactionID instanceof Promise) {
+    transactionID = await req.transactionID
+  }
+
+  if (req) return db.sessions[transactionID] ? { session: db.sessions[transactionID] } : {}
 }
diff --git a/packages/db-postgres/src/count.ts b/packages/db-postgres/src/count.ts
@@ -17,7 +17,7 @@ export const count: Count = async function count(
 
   const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))
 
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const table = this.tables[tableName]
 
   const { joins, where } = await buildQuery({
diff --git a/packages/db-postgres/src/create.ts b/packages/db-postgres/src/create.ts
@@ -10,7 +10,7 @@ export const create: Create = async function create(
   this: PostgresAdapter,
   { collection: collectionSlug, data, req },
 ) {
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const collection = this.payload.collections[collectionSlug].config
 
   const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))
diff --git a/packages/db-postgres/src/createGlobal.ts b/packages/db-postgres/src/createGlobal.ts
@@ -10,7 +10,7 @@ export async function createGlobal<T extends Record<string, unknown>>(
   this: PostgresAdapter,
   { slug, data, req = {} as PayloadRequest }: CreateGlobalArgs,
 ): Promise<T> {
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const globalConfig = this.payload.globals.config.find((config) => config.slug === slug)
 
   const tableName = this.tableNameMap.get(toSnakeCase(globalConfig.slug))
diff --git a/packages/db-postgres/src/createGlobalVersion.ts b/packages/db-postgres/src/createGlobalVersion.ts
@@ -1,7 +1,7 @@
-import type { PayloadRequest, TypeWithID, TypeWithVersion } from 'payload'
+import type { CreateGlobalVersionArgs, PayloadRequest, TypeWithID, TypeWithVersion } from 'payload'
 
 import { sql } from 'drizzle-orm'
-import { type CreateGlobalVersionArgs, buildVersionGlobalFields } from 'payload'
+import { buildVersionGlobalFields } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'
@@ -12,7 +12,7 @@ export async function createGlobalVersion<T extends TypeWithID>(
   this: PostgresAdapter,
   { autosave, globalSlug, req = {} as PayloadRequest, versionData }: CreateGlobalVersionArgs,
 ) {
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const global = this.payload.globals.config.find(({ slug }) => slug === globalSlug)
 
   const tableName = this.tableNameMap.get(`_${toSnakeCase(global.slug)}${this.versionsSuffix}`)
diff --git a/packages/db-postgres/src/createVersion.ts b/packages/db-postgres/src/createVersion.ts
@@ -18,7 +18,7 @@ export async function createVersion<T extends TypeWithID>(
     versionData,
   }: CreateVersionArgs<T>,
 ) {
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const collection = this.payload.collections[collectionSlug].config
   const defaultTableName = toSnakeCase(collection.slug)
 
diff --git a/packages/db-postgres/src/deleteMany.ts b/packages/db-postgres/src/deleteMany.ts
@@ -11,7 +11,7 @@ export const deleteMany: DeleteMany = async function deleteMany(
   this: PostgresAdapter,
   { collection, req = {} as PayloadRequest, where },
 ) {
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const collectionConfig = this.payload.collections[collection].config
 
   const tableName = this.tableNameMap.get(toSnakeCase(collectionConfig.slug))
diff --git a/packages/db-postgres/src/deleteOne.ts b/packages/db-postgres/src/deleteOne.ts
@@ -14,7 +14,7 @@ export const deleteOne: DeleteOne = async function deleteOne(
   this: PostgresAdapter,
   { collection: collectionSlug, req = {} as PayloadRequest, where: whereArg },
 ) {
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const collection = this.payload.collections[collectionSlug].config
 
   const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))
diff --git a/packages/db-postgres/src/deleteVersions.ts b/packages/db-postgres/src/deleteVersions.ts
@@ -12,7 +12,7 @@ export const deleteVersions: DeleteVersions = async function deleteVersion(
   this: PostgresAdapter,
   { collection, locale, req = {} as PayloadRequest, where: where },
 ) {
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const collectionConfig: SanitizedCollectionConfig = this.payload.collections[collection].config
 
   const tableName = this.tableNameMap.get(
diff --git a/packages/db-postgres/src/find/findMany.ts b/packages/db-postgres/src/find/findMany.ts
@@ -30,7 +30,7 @@ export const findMany = async function find({
   tableName,
   where: whereArg,
 }: Args) {
-  const db = adapter.sessions[req.transactionID]?.db || adapter.drizzle
+  const db = adapter.sessions[await req.transactionID]?.db || adapter.drizzle
   const table = adapter.tables[tableName]
 
   const limit = limitArg ?? 10
diff --git a/packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts b/packages/db-postgres/src/predefinedMigrations/v2-v3/index.ts
@@ -38,7 +38,7 @@ type Args = {
  */
 export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
   const adapter = payload.db as PostgresAdapter
-  const db = adapter.sessions[req.transactionID]?.db
+  const db = adapter.sessions[await req.transactionID]?.db
   const dir = payload.db.migrationDir
 
   // get the drizzle migrateUpSQL from drizzle using the last schema
diff --git a/packages/db-postgres/src/queryDrafts.ts b/packages/db-postgres/src/queryDrafts.ts
@@ -1,6 +1,6 @@
-import type { PayloadRequest, SanitizedCollectionConfig } from 'payload'
+import type { PayloadRequest, QueryDrafts, SanitizedCollectionConfig } from 'payload'
 
-import { type QueryDrafts, buildVersionCollectionFields, combineQueries } from 'payload'
+import { buildVersionCollectionFields, combineQueries } from 'payload'
 import toSnakeCase from 'to-snake-case'
 
 import type { PostgresAdapter } from './types.js'
diff --git a/packages/db-postgres/src/transactions/commitTransaction.ts b/packages/db-postgres/src/transactions/commitTransaction.ts
@@ -1,6 +1,8 @@
 import type { CommitTransaction } from 'payload'
 
 export const commitTransaction: CommitTransaction = async function commitTransaction(id) {
+  if (id instanceof Promise) return
+
   // if the session was deleted it has already been aborted
   if (!this.sessions[id]) {
     return
diff --git a/packages/db-postgres/src/transactions/rollbackTransaction.ts b/packages/db-postgres/src/transactions/rollbackTransaction.ts
@@ -1,17 +1,19 @@
 import type { RollbackTransaction } from 'payload'
 
 export const rollbackTransaction: RollbackTransaction = async function rollbackTransaction(
-  id = '',
+  incomingID = '',
 ) {
+  const transactionID = incomingID instanceof Promise ? await incomingID : incomingID
+
   // if multiple operations are using the same transaction, the first will flow through and delete the session.
   // subsequent calls should be ignored.
-  if (!this.sessions[id]) {
+  if (!this.sessions[transactionID]) {
     return
   }
 
   // end the session promise in failure by calling reject
-  await this.sessions[id].reject()
+  await this.sessions[transactionID].reject()
 
   // delete the session causing any other operations with the same transaction to fail
-  delete this.sessions[id]
+  delete this.sessions[transactionID]
 }
diff --git a/packages/db-postgres/src/update.ts b/packages/db-postgres/src/update.ts
@@ -12,7 +12,7 @@ export const updateOne: UpdateOne = async function updateOne(
   this: PostgresAdapter,
   { id, collection: collectionSlug, data, draft, locale, req, where: whereArg },
 ) {
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const collection = this.payload.collections[collectionSlug].config
   const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))
   const whereToUse = whereArg || { id: { equals: id } }
diff --git a/packages/db-postgres/src/updateGlobal.ts b/packages/db-postgres/src/updateGlobal.ts
@@ -10,7 +10,7 @@ export async function updateGlobal<T extends Record<string, unknown>>(
   this: PostgresAdapter,
   { slug, data, req = {} as PayloadRequest }: UpdateGlobalArgs,
 ): Promise<T> {
-  const db = this.sessions[req.transactionID]?.db || this.drizzle
+  const db = this.sessions[await req.transactionID]?.db || this.drizzle
   const globalConfig = this.payload.globals.config.find((config) => config.slug === slug)
   const tableName = this.tableNameMap.get(toSnakeCase(globalConfig.slug))
 
diff --git a/packages/db-postgres/src/updateGlobalVersion.ts b/packages/db-postgres/src/updateGlobalVersion.ts
diff --git a/packages/db-postgres/src/updateVersion.ts b/packages/db-postgres/src/updateVersion.ts
diff --git a/packages/graphql/src/resolvers/collections/find.ts b/packages/graphql/src/resolvers/collections/find.ts
diff --git a/packages/payload/src/collections/dataloader.ts b/packages/payload/src/collections/dataloader.ts
diff --git a/packages/payload/src/database/types.ts b/packages/payload/src/database/types.ts
diff --git a/packages/payload/src/types/index.ts b/packages/payload/src/types/index.ts
diff --git a/packages/payload/src/utilities/initTransaction.ts b/packages/payload/src/utilities/initTransaction.ts
diff --git a/packages/payload/src/utilities/isolateObjectProperty.ts b/packages/payload/src/utilities/isolateObjectProperty.ts
diff --git a/packages/payload/src/utilities/killTransaction.ts b/packages/payload/src/utilities/killTransaction.ts
diff --git a/packages/richtext-lexical/src/features/link/plugins/autoLink/index.tsx b/packages/richtext-lexical/src/features/link/plugins/autoLink/index.tsx
diff --git a/packages/ui/src/elements/WhereBuilder/reduceFieldMap.tsx b/packages/ui/src/elements/WhereBuilder/reduceFieldMap.tsx
diff --git a/test/dataloader/config.ts b/test/dataloader/config.ts
diff --git a/test/dataloader/int.spec.ts b/test/dataloader/int.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export const createGlobal: CreateGlobal = async function createGlobal(`
`14`	`14`	`globalType: slug,`
`15`	`15`	`...data,`
`16`	`16`	`}`
`17`		`- const options = withSession(this, req.transactionID)`
	`17`	`+ const options = await withSession(this, req)`
`18`	`18`
`19`	`19`	`let [result] = (await Model.create([global], options)) as any`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export const createGlobalVersion: CreateGlobalVersion = async function createGlo`
`9`	`9`	`{ autosave, createdAt, globalSlug, parent, req = {} as PayloadRequest, updatedAt, versionData },`
`10`	`10`	`) {`
`11`	`11`	`const VersionModel = this.versions[globalSlug]`
`12`		`- const options = withSession(this, req.transactionID)`
	`12`	`+ const options = await withSession(this, req)`
`13`	`13`
`14`	`14`	`const [doc] = await VersionModel.create(`
`15`	`15`	`[`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export const createVersion: CreateVersion = async function createVersion(`
`17`	`17`	`},`
`18`	`18`	`) {`
`19`	`19`	`const VersionModel = this.versions[collectionSlug]`
`20`		`- const options = withSession(this, req.transactionID)`
	`20`	`+ const options = await withSession(this, req)`
`21`	`21`
`22`	`22`	`const [doc] = await VersionModel.create(`
`23`	`23`	`[`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export const deleteMany: DeleteMany = async function deleteMany(`
`10`	`10`	`) {`
`11`	`11`	`const Model = this.collections[collection]`
`12`	`12`	`const options = {`
`13`		`- ...withSession(this, req.transactionID),`
	`13`	`+ ...(await withSession(this, req)),`
`14`	`14`	`lean: true,`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export const deleteVersions: DeleteVersions = async function deleteVersions(`
`10`	`10`	`) {`
`11`	`11`	`const VersionsModel = this.versions[collection]`
`12`	`12`	`const options = {`
`13`		`- ...withSession(this, req.transactionID),`
	`13`	`+ ...(await withSession(this, req)),`
`14`	`14`	`lean: true,`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export const findGlobal: FindGlobal = async function findGlobal(`
`13`	`13`	`) {`
`14`	`14`	`const Model = this.globals`
`15`	`15`	`const options = {`
`16`		`- ...withSession(this, req.transactionID),`
	`16`	`+ ...(await withSession(this, req)),`
`17`	`17`	`lean: true,`
`18`	`18`	`}`
`19`	`19`