From 3afe83f3ad26b48f80c16bdc5a204b9690b5c1f6 Mon Sep 17 00:00:00 2001
From: yaso-meth <yasienmeth@gmail.com>
Date: Wed, 4 Sep 2024 10:19:55 +0200
Subject: [PATCH] update get file api

---
 backend/Minio_Storage/minioConnection.py |  2 +-
 backend/routers/fileStorage.py           | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/backend/Minio_Storage/minioConnection.py b/backend/Minio_Storage/minioConnection.py
index 66600e06..0ec200a1 100644
--- a/backend/Minio_Storage/minioConnection.py
+++ b/backend/Minio_Storage/minioConnection.py
@@ -1,7 +1,7 @@
 from minio import Minio
 
 def minioConnect(env):
-    if(env == "dev"):
+    if(env == "Dev"):
         return Minio(
         "minio:9000",
         # "minio.mzansi-innovation-hub.co.za",
diff --git a/backend/routers/fileStorage.py b/backend/routers/fileStorage.py
index 5cc3eef3..e1c17416 100644
--- a/backend/routers/fileStorage.py
+++ b/backend/routers/fileStorage.py
@@ -71,14 +71,18 @@ class perscriptionList(BaseModel):
     sig_path: str
     data: List[perscription]
 
-@router.get("/minio/pull/file/{app_id}/{folder}/{file_name}/{env}", tags=["Minio"])
+@router.get("/minio/pull/file/{env}/{app_id}/{folder}/{file_name}", tags=["Minio"])
 async def pull_File_from_user(app_id: str, folder: str, file_name: str, env: str, session: SessionContainer = Depends(verify_session())): #, session: SessionContainer = Depends(verify_session())
     path = app_id + "/" + folder + "/" + file_name
     try:
+        # print(f"env: {env}")
         # uploudFile(app_id, file.filename, extension[1], content)
+        
         client = Minio_Storage.minioConnection.minioConnect(env)
     
         miniourl = client.presigned_get_object("mih", path)
+        # if(env == "Dev"):
+        #     miniourl.replace("minio", "localhost")
         # temp = minioResponse.data#.encode('utf-8').strip()
         # print(temp)
         # print("=======================================================================")
@@ -87,9 +91,14 @@ async def pull_File_from_user(app_id: str, folder: str, file_name: str, env: str
     except Exception as error:
         raise HTTPException(status_code=404, detail=miniourl)
         # return {"message": error}
-    return {
-        "minioURL": miniourl,
-    }
+    if(env == "Dev"):
+        return {
+            "minioURL": f"http://localhost:9000/mih/{app_id}/{folder}/{file_name}",
+        }
+    else:
+        return {
+            "minioURL": miniourl,
+        }
 
 @router.post("/minio/upload/file/", tags=["Minio"])
 async def upload_File_to_user(file: UploadFile = File(...), app_id: str= Form(...), folder: str= Form(...), session: SessionContainer = Depends(verify_session())):