Merge pull request #518 from bookbrainz/null-relationship-sets

fix(BB-545): Allow relationship sets to be null (empty)
metabrainz · Oct 7, 2020 · 723d746 · 723d746
2 parents 8bc8b8e + cebe185
commit 723d746
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/server/routes/entity/entity.js b/src/server/routes/entity/entity.js
@@ -1047,10 +1047,11 @@ export function handleCreateOrEditEntity(
 
 			_.forEach(allEntities, (entityModel) => {
 				const bbid: string = entityModel.get('bbid');
-				if (_.has(relationshipSets, bbid) && !_.isNil(relationshipSets[bbid])) {
+				if (_.has(relationshipSets, bbid)) {
 					entityModel.set(
 						'relationshipSetId',
-						relationshipSets[bbid].get('id')
+						// Set to relationshipSet id or null if empty set
+						relationshipSets[bbid] && relationshipSets[bbid].get('id')
 					);
 				}
 			});