Fixed actor merge failing if target actor is already assigned to some scenes. Linked ID in actors admin to actor page.

pages/admin/actors/+Page.vue

@@ -45,7 +45,13 @@
 					:key="`actor-${actor.id}`"
 					class="actor"
 				>
-					<td class="actor-id ellipsis">{{ actor.id }}</td>
+					<td class="actor-id ellipsis">
+						<a
+							:href="`/actor/${actor.id}/${actor.slug}`"
+							target="_blank"
+							class="nolink"
+						>{{ actor.id }}</a>
+					</td>
 
 					<td
 						v-tooltip="actor.entity?.name || 'Global'"

src/actors.js

@@ -599,7 +599,8 @@ export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
 	const trx = await knex.transaction();
 
 	let mergedProfiles;
-	let mergedScenes;
+	let mergedSceneActors;
+	let existingSceneActors;
 
 	try {
 		const [existingProfiles] = await Promise.all([
@@ -619,20 +620,30 @@ export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
 				.returning('id'),
 		]);
 
+		existingSceneActors = await trx('releases_actors')
+			.where('actor_id', targetActorId);
+
 		mergedProfiles = await trx('actors_profiles')
 			.update('actor_id', targetActorId)
 			.whereIn('actor_id', sourceActorIds)
 			.whereNotIn('entity_id', existingProfiles.map((profile) => profile.entity_id))
 			.returning('id');
 
-		mergedScenes = await trx('releases_actors')
+		mergedSceneActors = await trx('releases_actors')
 			.update({
 				actor_id: targetActorId,
 				alias_id: knex.raw('actor_id'),
 			})
 			.whereIn('actor_id', sourceActorIds)
+			.whereNotIn('release_id', existingSceneActors.map((sceneActor) => sceneActor.release_id)) // can't update entry if target actor already exists alongside source actor
 			.returning('release_id');
 
+		// delete aliased actors for scenes that already had both source/aliased and target actor assigned
+		const releases = await trx('releases_actors')
+			.whereIn('release_id', existingSceneActors.map((sceneActor) => sceneActor.release_id))
+			.whereIn('actor_id', sourceActorIds)
+			.delete();
+
 		await trx.commit();
 	} catch (error) {
 		await trx.rollback();
@@ -649,13 +660,13 @@ export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
 	}, { refreshView: false });
 
 	await Promise.all([
-		syncScenes(mergedScenes.map((scene) => scene.release_id)),
+		syncScenes([...mergedSceneActors.map((sceneActor) => sceneActor.release_id), ...existingSceneActors.map((sceneActor) => sceneActor.release_id)]),
 		syncActors([targetActorId, ...sourceActorIds]),
 		syncStashes('actor', [targetActorId, ...sourceActorIds]),
 	]);
 
 	return {
-		scenes: mergedScenes.length,
+		scenes: mergedSceneActors.length,
 		profiles: mergedProfiles.length,
 	};
 }