Merge pull request #530 from bookbrainz/BB-554

BB-554: Issues when merging Publishers without Editions
metabrainz · Nov 3, 2020 · 71a0f5f · 71a0f5f
2 parents e7383f6 + eb87759
commit 71a0f5f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/client/helpers/entity.js b/src/client/helpers/entity.js
@@ -202,7 +202,7 @@ export function getEditionPublishers(edition) {
 		return edition.publisherSet.publishers.map(
 			(publisher) => (
 				<a href={`/publisher/${publisher.bbid}`} key={publisher.bbid}>
-					{publisher.defaultAlias.name}
+					{_get(publisher, 'defaultAlias.name', publisher.bbid)}
 				</a>
 			)
 		);

diff --git a/src/common/helpers/error.js b/src/common/helpers/error.js
@@ -140,7 +140,7 @@ export function getErrorToSend(err) {
 	 * instead and return a new generic SiteError
 	 */
 	_logError(err);
-	return new SiteError();
+	return new SiteError(err.message);
 }
 
 export function sendErrorAsJSON(res, err) {

diff --git a/src/server/routes/entity/entity.js b/src/server/routes/entity/entity.js
@@ -599,11 +599,13 @@ export async function processMergeOperation(orm, transacting, session, mainEntit
 		try {
 			const editionsToSetCollections = await Promise.all(entitiesModelsToMerge.map(entitiesModel => entitiesModel.editions()));
 			// eslint-disable-next-line consistent-return
-			const editionsToSet = _.flatMap(editionsToSetCollections, edition => {
+			let editionsToSet = _.flatMap(editionsToSetCollections, edition => {
 				if (edition.models && edition.models.length) {
 					return edition.models;
 				}
 			});
+			// Remove 'undefined' entries (no editions in those publishers)
+			editionsToSet = _.reject(editionsToSet, _.isNil);
 			await Promise.all(editionsToSet.map(async (edition) => {
 				// Fetch current PublisherSet
 				const oldPublisherSet = await edition.publisherSet();
@@ -617,6 +619,7 @@ export async function processMergeOperation(orm, transacting, session, mainEntit
 		}
 		catch (err) {
 			log.error(err);
+			throw err;
 		}
 	}