[Issue 2512] S3 Presign URL

api/src/services/opportunities_v1/get_opportunity.py

@@ -1,10 +1,13 @@
+import copy
 from datetime import date
 
+import boto3
 from sqlalchemy import select
 from sqlalchemy.orm import noload, selectinload
 
 import src.adapters.db as db
 import src.util.datetime_util as datetime_util
+from src.adapters.aws import S3Config, get_s3_client
 from src.api.route_utils import raise_flask_error
 from src.db.models.opportunity_models import Opportunity, OpportunitySummary
 
@@ -31,7 +34,30 @@ def _fetch_opportunity(
 
 
 def get_opportunity(db_session: db.Session, opportunity_id: int) -> Opportunity:
-    return _fetch_opportunity(db_session, opportunity_id, load_all_opportunity_summaries=False)
+    opportunity = _fetch_opportunity(
+        db_session, opportunity_id, load_all_opportunity_summaries=False
+    )
+    opportunity_copy = copy.deepcopy(opportunity)
+
+    s3_config = S3Config()
+    s3_config.s3_endpoint_url = "http://localstack:4566"
+    s3_client = get_s3_client(
+        s3_config, boto3.Session(aws_access_key_id="NO_CREDS", aws_secret_access_key="NO_CREDS")
+    )
+
+    for opp_attachment in opportunity_copy.opportunity_attachments:
+        file_loc = opp_attachment.file_location
+        object_key = file_loc.split(f"{s3_config.s3_opportunity_bucket}/")[
+            1
+        ]  # should be same as filename in db ?
+        pre_sign_file_loc = s3_client.generate_presigned_url(
+            "get_object",
+            Params={"Bucket": s3_config.s3_opportunity_bucket, "Key": object_key},
+            ExpiresIn=1800,
+        )  # do we want to put limit
+        opp_attachment.file_location = pre_sign_file_loc
+
+    return opportunity_copy
 
 
 def get_opportunity_versions(db_session: db.Session, opportunity_id: int) -> dict:

api/tests/lib/opportunity_attachment_test_files/test_file_1.txt

@@ -0,0 +1 @@
+Hello, world

api/tests/lib/opportunity_attachment_test_files/test_file_2.txt

@@ -0,0 +1 @@
+Hello, world

api/tests/lib/opportunity_attachment_test_files/test_file_3.txt

@@ -0,0 +1 @@
+Hello, world

api/tests/lib/seed_local_db.py

@@ -1,13 +1,18 @@
 import logging
+import os
+import pathlib
 import random
 
+import boto3
 import click
+from botocore.exceptions import ClientError
 from sqlalchemy import func
 
 import src.adapters.db as db
 import src.logging
 import src.util.datetime_util as datetime_util
 import tests.src.db.models.factories as factories
+from src.adapters.aws import S3Config, get_s3_client
 from src.adapters.db import PostgresDBClient
 from src.db.models.agency_models import Agency
 from src.db.models.opportunity_models import Opportunity
@@ -16,6 +21,29 @@
 
 logger = logging.getLogger(__name__)
 
+TESTS_FOLDER = pathlib.Path(__file__).parent.resolve()
+
+
+def upload_opportunity_attachments_s3():
+    s3_config = S3Config()
+    s3_client = get_s3_client(
+        s3_config, boto3.Session(aws_access_key_id="NO_CREDS", aws_secret_access_key="NO_CREDS")
+    )
+    test_folder_path = TESTS_FOLDER / "opportunity_attachment_test_files"
+
+    for root, _, files in os.walk(test_folder_path):
+        for file in files:
+            file_path = os.path.join(root, file)
+            object_name = os.path.relpath(file_path, test_folder_path)
+
+            try:
+                s3_client.upload_file(file_path, s3_config.s3_opportunity_bucket, object_name)
+                print(
+                    f"Successfully uploaded {file_path} to s3://{s3_config.s3_opportunity_bucket}/{object_name}"
+                )  # log?
+            except ClientError as e:
+                print(f"Error uploading {file_path}: {e}")
+
 
 def _add_history(
     opps: list[Opportunity],
@@ -173,6 +201,8 @@ def seed_local_db(iterations: int, include_history: bool) -> None:
         logger.info("Running seed script for local DB")
         error_if_not_local()
 
+        upload_opportunity_attachments_s3()
+
         db_client = PostgresDBClient()
 
         with db_client.get_session() as db_session:

api/tests/src/db/models/factories.py

@@ -147,6 +147,14 @@ class CustomProvider(BaseProvider):
 
     YN_YESNO_BOOLEAN_VALUES = ["Y", "N", "Yes", "No"]
 
+    OPPORTUNITY_ATTACHMENT_S3_PATHS = [
+        "s3://local-opportunities/test_file_1.txt",
+        "s3://local-opportunities/test_file_2.txt",
+        "s3://local-opportunities/test_file_3.txt",
+        "s3://local-opportunities/test_file_4.pdf",
+        "s3://local-opportunities/test_file_5.pdf",
+    ]
+
     def agency(self) -> str:
         return self.random_element(self.AGENCIES)
 
@@ -188,6 +196,9 @@ def yn_boolean(self) -> str:
     def yn_yesno_boolean(self) -> str:
         return self.random_element(self.YN_YESNO_BOOLEAN_VALUES)
 
+    def opportunity_attachment(self) -> str:
+        return self.random_element(self.OPPORTUNITY_ATTACHMENT_S3_PATHS)
+
 
 fake = faker.Faker()
 fake.add_provider(CustomProvider)
@@ -239,7 +250,7 @@ class OpportunityAttachmentFactory(BaseFactory):
     class Meta:
         model = opportunity_models.OpportunityAttachment
 
-    file_location = factory.Faker("url")
+    file_location = factory.Faker("opportunity_attachment")
     mime_type = factory.Faker("mime_type")
     file_name = factory.Faker("file_name")
     file_description = factory.Faker("sentence")