Merge pull request #696 from 3drepo/ISSUE_693

Issue 693 -
3drepo · Sep 4, 2024 · 4ccfbe5 · 4ccfbe5
2 parents 309bd58 + cfc3802
commit 4ccfbe5
Show file tree

Hide file tree

Showing 19 changed files with 396 additions and 300 deletions.
diff --git a/bouncer/src/repo/core/model/repo_model_global.h b/bouncer/src/repo/core/model/repo_model_global.h
@@ -53,7 +53,7 @@
 #define REPO_LABEL_DATA             "data"
 #define REPO_LABEL_DATABASE         "database"
 #define REPO_LABEL_HEIGHT           "height"
-#define REPO_LABEL_MEDIA_TYPE       "mime"              //!< Media Type (mime type)
+#define REPO_LABEL_MEDIA_TYPE       "mimeType"              //!< Media Type (mime type)
 #define REPO_LABEL_PROJECT          "project"
 #define REPO_LABEL_MODEL            "model"
 #define REPO_LABEL_ROLE             "role"

diff --git a/bouncer/src/repo/error_codes.h b/bouncer/src/repo/error_codes.h
@@ -90,4 +90,6 @@
 //When a component fails a 3drepo license check
 #define ERRCODE_REPO_LICENCE_INVALID 36
 //When a password protected or encrypted file is provided
-#define REPOERR_FILE_IS_ENCRYPTED 37
+#define REPOERR_FILE_IS_ENCRYPTED 37
+//When image processing failed (only used by bouncer_worker)
+#define REPOERR_IMAGE_PROCESSING_FAILED 38
diff --git a/bouncer/src/repo/manipulator/modelutility/repo_drawing_manager.cpp b/bouncer/src/repo/manipulator/modelutility/repo_drawing_manager.cpp
@@ -56,7 +56,8 @@ uint8_t DrawingManager::commitImage(
 		REPO_COLLECTION_DRAWINGS,
 		drawingRefNodeId,
 		drawing.data,
-		metadata.obj()
+		metadata.obj(),
+		repo::core::handler::fileservice::FileManager::Encoding::Gzip
 	);
 
 	auto updated = revision.cloneAndAddImage(drawingRefNodeId);