tests: add more async tests and fix a few bugs

Author: pjhartzell

src/stapi_fastapi/models/opportunity.py

@@ -65,7 +65,7 @@ class OpportunitySearchRecord(BaseModel):
 
 
 class OpportunitySearchRecords(BaseModel):
-    records: list[OpportunitySearchRecord]
+    search_records: list[OpportunitySearchRecord]
     links: list[Link] = Field(default_factory=list)
 
 

src/stapi_fastapi/routers/product_router.py

@@ -429,7 +429,9 @@ async def get_opportunity_collection(
                         type=TYPE_JSON,
                     ),
                 )
-                return GeoJSONResponse(content=opportunity_collection.model_dump_json())
+                return GeoJSONResponse(
+                    content=opportunity_collection.model_dump(mode="json")
+                )
             case Success(Maybe.empty):
                 raise NotFoundException("Opportunity Collection not found")
             case Failure(e):

src/stapi_fastapi/routers/root_router.py

@@ -409,7 +409,7 @@ async def get_opportunity_search_record(
         Get the Opportunity Search Record with `search_record_id`.
         """
         match await self._get_opportunity_search_record(search_record_id, request):
-            case Success(Maybe(Some(search_record))):
+            case Success(Some(search_record)):
                 self.add_opportunity_search_record_self_link(search_record, request)
                 return search_record
             case Success(Maybe.empty):

tests/backends.py

@@ -147,23 +147,18 @@ async def mock_search_opportunities_async(
     request: Request,
 ) -> ResultE[OpportunitySearchRecord]:
     try:
-        status = OpportunitySearchStatus(
+        received_status = OpportunitySearchStatus(
             timestamp=datetime.now(timezone.utc),
             status_code=OpportunitySearchStatusCode.received,
         )
         search_record = OpportunitySearchRecord(
             id=str(uuid4()),
             product_id=product_router.product.id,
             opportunity_request=search,
-            status=status,
+            status=received_status,
             links=[],
         )
-        request.state._opportunities_db._search_records[search_record.id] = (
-            search_record
-        )
-        request.state._opportunities_db._search_record_statuses[
-            search_record.id
-        ].insert(0, status)
+        request.state._opportunities_db.put_search_record(search_record)
         return Success(search_record)
     except Exception as e:
         return Failure(e)
@@ -175,7 +170,7 @@ async def mock_get_opportunity_collection(
     try:
         return Success(
             Maybe.from_optional(
-                request.state._opportunities_db._collections.get(
+                request.state._opportunities_db.get_opportunity_collection(
                     opportunity_collection_id
                 )
             )
@@ -192,7 +187,7 @@ async def mock_get_opportunity_search_records(
     try:
         start = 0
         limit = min(limit, 100)
-        search_records = list(request.state._opportunities_db._search_records.values())
+        search_records = request.state._opportunities_db.get_search_records()
 
         if next:
             start = int(next)
@@ -212,7 +207,7 @@ async def mock_get_opportunity_search_record(
     try:
         return Success(
             Maybe.from_optional(
-                request.state._opportunities_db._search_records.get(search_record_id)
+                request.state._opportunities_db.get_search_record(search_record_id)
             )
         )
     except Exception as e:

tests/shared.py

@@ -1,4 +1,5 @@
 from collections import defaultdict
+from copy import deepcopy
 from datetime import datetime, timedelta, timezone
 from typing import Any, Literal, Self
 from uuid import uuid4
@@ -51,9 +52,25 @@ def __init__(self) -> None:
 class InMemoryOpportunityDB:
     def __init__(self) -> None:
         self._search_records: dict[str, OpportunitySearchRecord] = {}
-        self._search_record_statuses: dict[str, list[OrderStatus]] = defaultdict(list)
         self._collections: dict[str, OpportunityCollection] = {}
 
+    def get_search_record(self, search_id: str) -> OpportunitySearchRecord | None:
+        return deepcopy(self._search_records.get(search_id))
+
+    def get_search_records(self) -> list[OpportunitySearchRecord]:
+        return deepcopy(list(self._search_records.values()))
+
+    def put_search_record(self, search_record: OpportunitySearchRecord) -> None:
+        self._search_records[search_record.id] = deepcopy(search_record)
+
+    def get_opportunity_collection(self, collection_id) -> OpportunityCollection | None:
+        return deepcopy(self._collections.get(collection_id))
+
+    def put_opportunity_collection(self, collection: OpportunityCollection) -> None:
+        if collection.id is None:
+            raise ValueError("collection must have an id")
+        self._collections[collection.id] = deepcopy(collection)
+
 
 class MyProductConstraints(BaseModel):
     off_nadir: int