ISSUE #5163 address feedback

3drepo · Sep 23, 2024 · bd9c225 · bd9c225
1 parent 1042c56
commit bd9c225
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/backend/src/v5/processors/teamspaces/projects/models/drawings/calibrations.js b/backend/src/v5/processors/teamspaces/projects/models/drawings/calibrations.js
@@ -118,10 +118,12 @@ Calibrations.getCalibrationStatusForAllRevs = async (teamspace, project, drawing
 Calibrations.addCalibration = async (teamspace, project, drawing, revision, createdBy, calibration) => {
 	const existingCalibration = await getCalibration(teamspace, project, drawing, revision, { _id: 1 });
 
-	await addCalibration(teamspace, project, drawing, revision, createdBy,
-		deleteIfUndefined({ ...calibration, verticalRange: undefined, units: undefined }));
-	await updateModelSettings(teamspace, project, drawing,
-		{ calibration: { verticalRange: calibration.verticalRange, units: calibration.units } });
+	const { verticalRange, units, ...calibrationData } = calibration;
+
+	await Promise.all([
+		addCalibration(teamspace, project, drawing, revision, createdBy, { ...calibrationData, units }),
+		updateModelSettings(teamspace, project, drawing, { calibration: { verticalRange, units } }),
+	]);
 
 	if (!existingCalibration) {
 		publish(events.REVISION_UPDATED, {

diff --git a/backend/tests/v5/unit/processors/teamspaces/projects/models/drawings/calibrations.test.js b/backend/tests/v5/unit/processors/teamspaces/projects/models/drawings/calibrations.test.js
@@ -307,12 +307,14 @@ const testAddCalibration = () => {
 
 			await Calibrations.addCalibration(teamspace, project, drawing, revision, createdBy, calibration);
 
+			const { verticalRange, units, ...calibrationData } = calibration;
+
 			expect(CalibrationsModel.addCalibration).toHaveBeenCalledTimes(1);
 			expect(CalibrationsModel.addCalibration).toHaveBeenCalledWith(teamspace, project, drawing, revision,
-				createdBy, deleteIfUndefined({ ...calibration, verticalRange: undefined, units: undefined }));
+				createdBy, { ...calibrationData, units });
 			expect(ModelSettingsModel.updateModelSettings).toHaveBeenCalledTimes(1);
 			expect(ModelSettingsModel.updateModelSettings).toHaveBeenCalledWith(teamspace, project, drawing,
-				{ calibration: { verticalRange: calibration.verticalRange, units: calibration.units } });
+				{ calibration: { verticalRange, units } });
 			expect(CalibrationsModel.getCalibration).toHaveBeenCalledTimes(1);
 			expect(CalibrationsModel.getCalibration).toHaveBeenCalledWith(teamspace, project, drawing,
 				revision, { _id: 1 });
@@ -324,12 +326,14 @@ const testAddCalibration = () => {
 
 			await Calibrations.addCalibration(teamspace, project, drawing, revision, createdBy, calibration);
 
+			const { verticalRange, units, ...calibrationData } = calibration;
+
 			expect(CalibrationsModel.addCalibration).toHaveBeenCalledTimes(1);
 			expect(CalibrationsModel.addCalibration).toHaveBeenCalledWith(teamspace, project, drawing, revision,
-				createdBy, deleteIfUndefined({ ...calibration, verticalRange: undefined, units: undefined }));
+				createdBy, { ...calibrationData, units });
 			expect(ModelSettingsModel.updateModelSettings).toHaveBeenCalledTimes(1);
 			expect(ModelSettingsModel.updateModelSettings).toHaveBeenCalledWith(teamspace, project, drawing,
-				{ calibration: { verticalRange: calibration.verticalRange, units: calibration.units } });
+				{ calibration: { verticalRange, units } });
 			expect(CalibrationsModel.getCalibration).toHaveBeenCalledTimes(1);
 			expect(CalibrationsModel.getCalibration).toHaveBeenCalledWith(teamspace, project, drawing,
 				revision, { _id: 1 });