Add 'state' field to FileUpload and fix test that was broken by recent change

Author: TheByronHimes

src/uos/core/models.py

@@ -47,10 +47,17 @@ class FileUploadBox(BaseModel):
     storage_alias: str = Field(..., description="S3 storage alias to use for uploads")
 
 
+FileUploadState = Literal["init", "inbox", "archived"]
+# init = file upload initiated, but not yet finished
+# inbox = file upload complete, file in inbox
+# archived = file moved out of inbox after completion
+
+
 class FileUpload(BaseModel):
     """A File Upload. These objects are owned by the UCS."""
 
     upload_id: UUID4 = Field(..., description="Unique identifier for the file upload")
+    state: FileUploadState = "init"
     completed: bool = Field(
         default=False, description="Whether or not the file upload has finished"
     )

tests/integration/test_typical_journey.py

@@ -125,11 +125,6 @@ async def test_typical_journey(joint_fixture: JointFixture, httpx_mock: HTTPXMoc
         title="Updated Test Box",
         description="Updated description",
     )
-    httpx_mock.add_response(  # mock call that checks if DS has access to box
-        method="GET",
-        url=f"{access_url}/upload-access/users/{ds_user_id}/boxes/{box_id}",
-        status_code=200,
-    )
     async with (
         joint_fixture.kafka.record_events(in_topic=audit_topic) as audit_event_recorder,
         joint_fixture.kafka.record_events(
@@ -181,7 +176,7 @@ async def test_typical_journey(joint_fixture: JointFixture, httpx_mock: HTTPXMoc
     )
     updated_box = await joint_fixture.upload_orchestrator.get_research_data_upload_box(
         box_id=box_id,
-        user_id=regular_user_id,
+        auth_context=user_auth_context,
     )
     assert updated_box.title == "Updated Test Box"
     assert updated_box.description == "Updated description"
@@ -204,6 +199,6 @@ async def test_typical_journey(joint_fixture: JointFixture, httpx_mock: HTTPXMoc
     # Verify the box is now locked
     final_box = await joint_fixture.upload_orchestrator.get_research_data_upload_box(
         box_id=box_id,
-        user_id=regular_user_id,
+        auth_context=user_auth_context,
     )
     assert final_box.state == ResearchDataUploadBoxState.LOCKED