Merge pull request #648 from HDRUK/hotfix/GAT-607-SUPP-805

hotfix/GAT-607-SUPP-805
HDRUK · Jan 25, 2022 · 876deb3 · 876deb3
2 parents 004244c + 48f5a1b
commit 876deb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/resources/dataUseRegister/__tests__/dataUseRegister.service.test.js b/src/resources/dataUseRegister/__tests__/dataUseRegister.service.test.js
@@ -79,7 +79,7 @@ describe('DataUseRegisterService', function () {
 
 			const updateObj = await dataUseRegisterService.buildUpdateObject(dataUserRegister, dataUseRegisterPayload, user);
 
-			const expectedResponse = { relatedObjects: [], activeflag: 'active', rejectionReason: '' };
+			const expectedResponse = { activeflag: 'active', rejectionReason: '' };
 
 			expect(updateObj).toEqual(expectedResponse);
 		});
@@ -91,7 +91,7 @@ describe('DataUseRegisterService', function () {
 
 			const updateObj = await dataUseRegisterService.buildUpdateObject(dataUserRegister, dataUseRegisterPayload, user);
 
-			const expectedResponse = { relatedObjects: [], activeflag: 'rejected', rejectionReason: 'This dataset is rejected' };
+			const expectedResponse = { activeflag: 'rejected', rejectionReason: 'This dataset is rejected' };
 
 			expect(updateObj).toEqual(expectedResponse);
 		});
@@ -103,7 +103,7 @@ describe('DataUseRegisterService', function () {
 
 			const updateObj = await dataUseRegisterService.buildUpdateObject(dataUserRegister, dataUseRegisterPayload, user);
 
-			const expectedResponse = { relatedObjects: [], activeflag: 'archived', rejectionReason: '' };
+			const expectedResponse = { activeflag: 'archived', rejectionReason: '' };
 
 			expect(updateObj).toEqual(expectedResponse);
 		});

diff --git a/src/resources/dataUseRegister/dataUseRegister.service.js b/src/resources/dataUseRegister/dataUseRegister.service.js
@@ -442,7 +442,9 @@ export default class DataUseRegisterService {
 
 		//relatedObjects
 
-		updateObj.relatedObjects = [...relatedResourcesWithRemovedOldAutomaticEntries, ...newAutomaticRelatedResources];
+		if (relatedObjects) {
+			updateObj.relatedObjects = [...relatedResourcesWithRemovedOldAutomaticEntries, ...newAutomaticRelatedResources];
+		}
 
 		const fundersAndSponsorsList =
 			fundersAndSponsors &&