Merge pull request #289 from tr1ten/feat/concurrent-rel-edit

Fix(BB-538): Support concurrent relationships edit workflow

Author: MonkeyDo

src/func/relationship.ts

@@ -24,8 +24,6 @@ import type {
 } from './types';
 import {
 	createNewSetWithItems,
-	getAddedItems,
-	getRemovedItems,
 	removeItemsFromSet
 } from './set';
 import {promiseProps} from '../util';
@@ -141,13 +139,10 @@ export function updateRelationshipSets(
 			obj.attributeSetId === other.attributeSetId;
 	}
 
-	const oldSetItems =
-		oldSet ? oldSet.related('relationships').toJSON() : [];
-
-	const allAddedItems =
-		getAddedItems(oldSetItems, newSetItems, comparisonFunc);
-	const allRemovedItems =
-		getRemovedItems(oldSetItems, newSetItems, comparisonFunc);
+	const allAddedItems:any[] = newSetItems.filter((rel:any) => rel.isAdded)
+		.map((rel) => _.omit(rel, ['isRemoved', 'isAdded']));
+	const allRemovedItems:any[] = newSetItems.filter((rel:any) => rel.isRemoved)
+		.map((rel) => _.omit(rel, ['isRemoved', 'isAdded']));
 
 
 	if (_.isEmpty(allAddedItems) && _.isEmpty(allRemovedItems)) {

test/func/relationship.js

@@ -186,7 +186,7 @@ describe('updateRelationshipSet', () => {
 
 		const result = await bookshelf.transaction(async (trx) => {
 			const sets = await updateRelationshipSets(
-				bookbrainzData, trx, null, [relationshipData]
+				bookbrainzData, trx, null, [{...relationshipData, isAdded: true}]
 			);
 
 			return promiseProps(
@@ -213,7 +213,7 @@ describe('updateRelationshipSet', () => {
 		const firstResult = await bookshelf.transaction(async (trx) => {
 			const sets = await updateRelationshipSets(
 				bookbrainzData, trx, null,
-				[firstRelationshipData, secondRelationshipData]
+				[{...firstRelationshipData, isAdded: true}, {...secondRelationshipData, isAdded: true}]
 			);
 
 			const updatedEntitiesPromise = Promise.all(
@@ -246,8 +246,11 @@ describe('updateRelationshipSet', () => {
 			.map((relationship) =>
 				_.pick(relationship, ['typeId', 'sourceBbid', 'targetBbid', 'attributeSetId']));
 
+		const firstRel = firstSetRelationships[1];
+		firstSetRelationships.push({...firstRel, isRemoved: true});
 		firstSetRelationships[1].targetBbid = dBBID;
-		const thirdRelationshipData = firstSetRelationships[1];
+		firstSetRelationships[1].isAdded = true;
+		const thirdRelationshipData = _.omit(firstSetRelationships[1], 'isAdded');
 
 		const result = await bookshelf.transaction(async (trx) => {
 			const sets = await updateRelationshipSets(
@@ -284,7 +287,7 @@ describe('updateRelationshipSet', () => {
 		const firstResult = await bookshelf.transaction(async (trx) => {
 			const sets = await updateRelationshipSets(
 				bookbrainzData, trx, null,
-				[firstRelationshipData, secondRelationshipData]
+				[{...firstRelationshipData, isAdded: true}, {isAdded: true, ...secondRelationshipData}]
 			);
 
 			const updatedEntitiesPromise = Promise.all(