tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "chore: delete req.transactionID when committing payload operations"

Browse Source 
This reverts commit 8e4cede62c.
This commit is contained in:
Dan Ribbens
2023-10-08 17:35:59 -04:00
parent 18da607f5b
commit 436250d594
20 changed files with 20 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/payload/src/auth/operations/forgotPassword.ts
View File

@@ -152,10 +152,7 @@ async function forgotPassword(incomingArgs: Arguments): Promise<null | string> {
result: token,
})
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return token
} catch (error: unknown) {

5
packages/payload/src/auth/operations/login.ts
View File

@@ -265,10 +265,7 @@ async function login<TSlug extends keyof GeneratedTypes['collections']>(
// Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/auth/operations/registerFirstUser.ts
View File

@@ -86,10 +86,7 @@ async function registerFirstUser<TSlug extends keyof GeneratedTypes['collections
token,
}
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return {
message: 'Registered and logged in successfully. Welcome!',

5
packages/payload/src/auth/operations/resetPassword.ts
View File

@@ -122,10 +122,7 @@ async function resetPassword(args: Arguments): Promise<Result> {
overrideAccess,
req,
})
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return {
token: collectionConfig.auth.removeTokenFromResponses ? undefined : token,

5
packages/payload/src/auth/operations/unlock.ts
View File

@@ -72,10 +72,7 @@ async function unlock(args: Args): Promise<boolean> {
result = null
}
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/create.ts
View File

@@ -405,10 +405,7 @@ async function create<TSlug extends keyof GeneratedTypes['collections']>(
// Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/delete.ts
View File

@@ -271,10 +271,7 @@ async function deleteOperation<TSlug extends keyof GeneratedTypes['collections']
result,
})
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/deleteByID.ts
View File

@@ -220,10 +220,7 @@ async function deleteByID<TSlug extends keyof GeneratedTypes['collections']>(
// 8. Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/find.ts
View File

@@ -257,10 +257,7 @@ async function find<T extends TypeWithID & Record<string, unknown>>(
// Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/findByID.ts
View File

@@ -205,10 +205,7 @@ async function findByID<T extends TypeWithID>(incomingArgs: Arguments): Promise<
// Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/findVersionByID.ts
View File

@@ -135,10 +135,7 @@ async function findVersionByID<T extends TypeWithID = any>(
// Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/findVersions.ts
View File

@@ -166,10 +166,7 @@ async function findVersions<T extends TypeWithVersion<T>>(
docs: result.docs.map((doc) => sanitizeInternalFields<T>(doc)),
}
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/restoreVersion.ts
View File

@@ -190,10 +190,7 @@ async function restoreVersion<T extends TypeWithID = any>(args: Arguments): Prom
})) || result
}, Promise.resolve())
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/update.ts
View File

@@ -404,10 +404,7 @@ async function update<TSlug extends keyof GeneratedTypes['collections']>(
result,
})
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/collections/operations/updateByID.ts
View File

@@ -375,10 +375,7 @@ async function updateByID<TSlug extends keyof GeneratedTypes['collections']>(
// Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/globals/operations/findOne.ts
View File

@@ -120,10 +120,7 @@ async function findOne<T extends Record<string, unknown>>(args: Args): Promise<T
// Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
// /////////////////////////////////////
// Return results

5
packages/payload/src/globals/operations/findVersionByID.ts
View File

@@ -126,10 +126,7 @@ async function findVersionByID<T extends TypeWithVersion<T> = any>(args: Argumen
// Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/globals/operations/findVersions.ts
View File

@@ -133,10 +133,7 @@ async function findVersions<T extends TypeWithVersion<T>>(
docs: result.docs.map((doc) => sanitizeInternalFields<T>(doc)),
}
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/globals/operations/restoreVersion.ts
View File

@@ -149,10 +149,7 @@ async function restoreVersion<T extends TypeWithVersion<T> = any>(args: Argument
})) || result
}, Promise.resolve())
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {

5
packages/payload/src/globals/operations/update.ts
View File

@@ -260,10 +260,7 @@ async function update<TSlug extends keyof GeneratedTypes['globals']>(
// Return results
// /////////////////////////////////////
if (shouldCommit) {
await payload.db.commitTransaction(req.transactionID)
delete req.transactionID
}
if (shouldCommit) await payload.db.commitTransaction(req.transactionID)
return result
} catch (error: unknown) {