Remove last traces of testserver

.env.django

@@ -60,7 +60,7 @@ POSTGRES_DB=redbox-core
 POSTGRES_PASSWORD=insecure
 [email protected]
 POSTGRES_HOST=db
-CORE_API_HOST=testserver
+CORE_API_HOST=core-api
 CORE_API_PORT=5002
 EMAIL_BACKEND_TYPE=CONSOLE
 GOV_NOTIFY_API_KEY=f4k3_k3y

django_app/redbox_app/redbox_core/client.py

@@ -1,12 +1,12 @@
 import logging
-import uuid
 from types import SimpleNamespace
 
 import boto3
 import requests
 from botocore.exceptions import ClientError
 from django.conf import settings
 from redbox_app.redbox_core.models import User
+from yarl import URL
 
 logger = logging.getLogger(__name__)
 
@@ -44,22 +44,19 @@ def __init__(self, host: str, port: int):
         self.port = port
 
     @property
-    def url(self) -> str:
-        return f"http://{self.host}:{self.port}"
-
-    def upload_file(self, bucket_name: str, name: str, user: User) -> SimpleNamespace:
-        if self.host == "testserver":
-            return SimpleNamespace(key=name, bucket=bucket_name, uuid=uuid.uuid4())
+    def url(self) -> URL:
+        return URL(f"http://{self.host}:{self.port}")
 
+    def upload_file(self, name: str, user: User) -> SimpleNamespace:
         response = requests.post(
-            f"{self.url}/file", json={"key": name}, headers={"Authorization": user.get_bearer_token()}, timeout=30
+            self.url / "file", json={"key": name}, headers={"Authorization": user.get_bearer_token()}, timeout=30
         )
         response.raise_for_status()
         return response.json(object_hook=lambda d: SimpleNamespace(**d))
 
     def rag_chat(self, message_history: list[dict[str, str]], user: User) -> SimpleNamespace:
         response = requests.post(
-            f"{self.url}/chat/rag",
+            self.url / "chat/rag",
             json={"message_history": message_history},
             headers={"Authorization": user.get_bearer_token()},
             timeout=60,

django_app/redbox_app/redbox_core/views.py

@@ -120,7 +120,7 @@ def injest_file(uploaded_file: UploadedFile, user: User) -> list[str]:
         errors.append(e.args[0])
     else:
         try:
-            upload_file_response = api.upload_file(settings.BUCKET_NAME, uploaded_file.name, user)
+            upload_file_response = api.upload_file(uploaded_file.name, user)
         except HTTPError as e:
             logger.error("Error uploading file object %s.", file, exc_info=e)
             file.delete()

django_app/tests/test_views.py

@@ -1,4 +1,5 @@
 import logging
+import uuid
 from http import HTTPStatus
 
 import pytest
@@ -54,7 +55,7 @@ def test_upload_view(alice, client, file_pdf_path, s3_client, requests_mock):
     client.force_login(alice)
 
     # we mock the response from the core-api
-    mocked_response = {"key": file_name, "bucket": settings.BUCKET_NAME}
+    mocked_response = {"key": file_name, "bucket": settings.BUCKET_NAME, "uuid": str(uuid.uuid4())}
     requests_mock.post(
         f"http://{settings.CORE_API_HOST}:{settings.CORE_API_PORT}/file", status_code=201, json=mocked_response
     )