DebaucheryLibrarian/traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Moved actor merge queries inside try/catch.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2026-06-09 03:18:43 +02:00
parent 65af850d68
commit a2e2704a05
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common

Submodule common updated: e4d6ff6ad1...71b58d5099

46
src/actors.js
View File

@@ -585,29 +585,33 @@ export async function mergeActors(targetActorId, sourceActorId, reqUser) {
const trx = await knex.transaction(); const trx = await knex.transaction();
await trx('actors') let mergedProfiles;
.update('alias_for', targetActorId) let mergedScenes;
.where('id', sourceActorId);
const mergedProfiles = await trx('actors_profiles')
.update('actor_id', targetActorId)
.where('actor_id', sourceActorId)
.returning('id');
const mergedScenes = await trx('releases_actors')
.update({
actor_id: targetActorId,
alias_id: sourceActorId,
})
.where('actor_id', sourceActorId)
.returning('release_id');
await trx('stashes_actors')
.update('actor_id', targetActorId)
.where('actor_id', sourceActorId)
.returning('id');
try { try {
await trx('actors')
.update('alias_for', targetActorId)
.where('id', sourceActorId)
.returning(['id', 'alias_for']);
mergedProfiles = await trx('actors_profiles')
.update('actor_id', targetActorId)
.where('actor_id', sourceActorId)
.returning('id');
mergedScenes = await trx('releases_actors')
.update({
actor_id: targetActorId,
alias_id: sourceActorId,
})
.where('actor_id', sourceActorId)
.returning('release_id');
await trx('stashes_actors')
.update('actor_id', targetActorId)
.where('actor_id', sourceActorId)
.returning('id');
await trx.commit(); await trx.commit();
} catch (error) { } catch (error) {
await trx.rollback(); await trx.rollback();