fix: 169 - get uploader working on test (#184)

bcgov · Feb 28, 2024 · fa79229 · fa79229
1 parent d4aed6d
commit fa79229
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/django/api/services/minio.py b/django/api/services/minio.py
@@ -11,24 +11,31 @@
 )
 
 
+def get_refined_object_name(object_name):
+    prefix = settings.MINIO_PREFIX
+    if prefix:
+        return prefix + '/' + object_name
+    return object_name
+
+
 def minio_get_object(object_name):
     return MINIO.presigned_get_object(
         bucket_name=settings.MINIO_BUCKET_NAME,
-        object_name=object_name,
+        object_name=get_refined_object_name(object_name),
         expires=timedelta(seconds=3600)
     )
 
 
 def minio_put_object(object_name):
     return MINIO.presigned_put_object(
         bucket_name=settings.MINIO_BUCKET_NAME,
-        object_name=object_name,
+        object_name=get_refined_object_name(object_name),
         expires=timedelta(seconds=7200)
     )
 
 
 def minio_remove_object(object_name):
     return MINIO.remove_object(
         bucket_name=settings.MINIO_BUCKET_NAME,
-        object_name=object_name
+        object_name=get_refined_object_name(object_name),
     )
diff --git a/django/api/settings.py b/django/api/settings.py
@@ -159,6 +159,7 @@
 MINIO_USE_SSL = bool(
     os.getenv('MINIO_USE_SSL', 'False').lower() in ['true', 1]
 )
+MINIO_PREFIX = os.getenv('MINIO_PREFIX')
 
 
 DECODER_ACCESS_KEY = os.getenv('DECODER_ACCESS_KEY')