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

12
src/actors.js
View File

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