Merge pull request #362 from bookbrainz/reindex-aliases-on-edit

Fix BB-367: reindex entities (search) with updated aliases

src/server/routes/entity/entity.js

@@ -645,14 +645,15 @@ async function saveEntitiesAndFinishRevision(
 	const parentsAddedPromise =
 		setParentRevisions(transacting, newRevision, parentRevisionIDs);
 
-	await Promise.all([
+	/** model.save returns a refreshed model */
+	const [savedEntities, ...others] = await Promise.all([
 		entitiesSavedPromise,
 		editorUpdatePromise,
 		parentsAddedPromise,
 		notePromise
 	]);
 
-	return mainEntity;
+	return savedEntities.find(entityModel => entityModel.get('bbid') === mainEntity.get('bbid')) || mainEntity;
 }
 
 export function handleCreateOrEditEntity(
@@ -751,12 +752,11 @@ export function handleCreateOrEditEntity(
 			editorJSON.id, body.note
 		);
 
-		const refreshedEntity = await savedMainEntity.refresh({
-			transacting,
-			withRelated: ['defaultAlias', 'aliasSet.aliases']
-		});
+		/** savedMainEntity is already updated, but without relations (we need the aliases for search reindexing) */
+		const savedEntityWithRelationships = await savedMainEntity.load(['aliasSet.aliases'],
+			{transacting});
 
-		return refreshedEntity.toJSON();
+		return savedEntityWithRelationships.toJSON();
 	});
 
 	const achievementPromise = entityEditPromise.then(