update: Refactored downloading of documents/logo

kojicmarko · Mar 9, 2024 · 60942bc · 60942bc
1 parent 7cb5d38
commit 60942bc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/src/documents/router.py b/src/documents/router.py
@@ -1,7 +1,6 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Query, UploadFile, status
-from fastapi.responses import StreamingResponse
 from sqlalchemy.orm import Session
 
 from src.database import get_db
@@ -56,10 +55,9 @@ def download_document(
     document: Annotated[doc_models.Document, Depends(get_doc_by_id)],
     curr_user: Annotated[user_schemas.User, Depends(get_curr_user)],
     db: Annotated[Session, Depends(get_db)],
-) -> StreamingResponse:
+) -> doc_schemas.Document:
     is_participant(document.project_id, curr_user, db)
-    res = doc_service.read(document)
-    return StreamingResponse(res["Body"])
+    return doc_service.read(document)
 
 
 @router.put("/documents/{doc_id}", status_code=status.HTTP_200_OK)

diff --git a/src/documents/service.py b/src/documents/service.py
@@ -1,4 +1,3 @@
-from typing import Any
 from uuid import UUID
 
 from fastapi import HTTPException, UploadFile, status
@@ -34,10 +33,11 @@ def read_all(
     )
 
 
-def read(document: doc_models.Document) -> Any:
+def read(document: doc_models.Document) -> doc_schemas.Document:
     doc = doc_schemas.Document.model_validate(document)
-    res = s3.download(f"{doc.project_id}_{doc.name}", "documents")
-    return res
+    # Due to API Gateway problems we're only returning URL to the Document
+    # res = s3.download(f"{doc.project_id}_{doc.name}", "documents")
+    return doc
 
 
 def create(

diff --git a/src/logos/router.py b/src/logos/router.py
@@ -2,7 +2,6 @@
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, UploadFile, status
-from fastapi.responses import StreamingResponse
 from sqlalchemy.orm import Session
 
 from src.database import get_db
@@ -40,9 +39,8 @@ def upload_logo(
 def download_logo(
     proj_id: UUID,
     proj_logo: Annotated[logo_models.Logo, Depends(get_logo_by_id)],
-) -> StreamingResponse:
-    res = logo_service.read(proj_logo, proj_id)
-    return StreamingResponse(res["Body"])
+) -> logo_schemas.Logo:
+    return logo_service.read(proj_logo, proj_id)
 
 
 @router.put(

diff --git a/src/logos/service.py b/src/logos/service.py
@@ -1,4 +1,3 @@
-from typing import Any
 from uuid import UUID
 
 from fastapi import HTTPException, UploadFile, status
@@ -14,10 +13,11 @@
 s3 = S3Client()
 
 
-def read(logo: logo_models.Logo, proj_id: UUID) -> Any:
+def read(logo: logo_models.Logo, proj_id: UUID) -> logo_schemas.Logo:
     logo_schema = logo_schemas.Logo.model_validate(logo)
-    res = s3.download(f"{proj_id}_{logo_schema.name}", "logos")
-    return res
+    # Due to API Gateway problems we're only returning URL to the Logo
+    # res = s3.download(f"{proj_id}_{logo_schema.name}", "logos")
+    return logo_schema
 
 
 def create(