ISSUE #695 check that the calibration is valid before writing it to d…

…atabase
3drepo · Sep 25, 2024 · 991db93 · 991db93
1 parent a5d7639
commit 991db93
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/bouncer/src/repo/manipulator/modelutility/repo_drawing.h b/bouncer/src/repo/manipulator/modelutility/repo_drawing.h
@@ -32,6 +32,10 @@ namespace repo {
 				std::vector<repo::lib::RepoVector3D> horizontalCalibration3d;
 				std::vector<repo::lib::RepoVector2D> horizontalCalibration2d;
 				std::string units;
+
+				bool valid() {
+					return horizontalCalibration2d.size() && horizontalCalibration3d.size();
+				}
 			};
 
 			/**

diff --git a/bouncer/src/repo/manipulator/modelutility/repo_drawing_manager.cpp b/bouncer/src/repo/manipulator/modelutility/repo_drawing_manager.cpp
@@ -73,24 +73,28 @@ uint8_t DrawingManager::commitImage(
 		return REPOERR_UPLOAD_FAILED;
 	}
 
-	// Retreive and process calibration
+	// Retreive and process calibration - drawing processors do not have to return a calibration,
+	// in which case the vectors will be empty.
+
 	auto calibration = drawing.calibration;
+	if (calibration.valid()) {
 
-	auto calibrationBSON = repo::core::model::RepoBSONFactory::makeRepoCalibration(
-		revision.getProject(),
-		revision.getModel(),
-		revId,
-		calibration.horizontalCalibration3d,
-		calibration.horizontalCalibration2d,
-		calibration.units
-	);
+		auto calibrationBSON = repo::core::model::RepoBSONFactory::makeRepoCalibration(
+			revision.getProject(),
+			revision.getModel(),
+			revId,
+			calibration.horizontalCalibration3d,
+			calibration.horizontalCalibration2d,
+			calibration.units
+		);
 
-	handler->insertDocument(teamspace, REPO_COLLECTION_CALIBRATIONS, calibrationBSON, error);
+		handler->insertDocument(teamspace, REPO_COLLECTION_CALIBRATIONS, calibrationBSON, error);
 
-	if (error.size())
-	{
-		repoError << "Error committing calibration: " << error;
-		return REPOERR_UPLOAD_FAILED;
+		if (error.size())
+		{
+			repoError << "Error committing calibration: " << error;
+			return REPOERR_UPLOAD_FAILED;
+		}
 	}
 
 	return REPOERR_OK;

diff --git a/test/src/unit/repo/manipulator/modelconvertor/import/ut_repo_drawing_import_manager.cpp b/test/src/unit/repo/manipulator/modelconvertor/import/ut_repo_drawing_import_manager.cpp
@@ -103,5 +103,9 @@ TEST(DrawingImportManager, ImportDWG)
 	// And of course expect that the DWG holds the above geometries
 
 	EXPECT_EQ(groupPrimitives, 2);
+
+	// Finally check that the calibration structure has been populated
+
+	EXPECT_TRUE(drawing.calibration.valid());
 }