update test implementation

Author: tylanderson

bin/server.py

@@ -8,12 +8,13 @@
     OpportunityPropertiesBase,
     OpportunityRequest,
 )
-from stapi_fastapi.models.order import Order
+from stapi_fastapi.models.order import Order, OrderParametersBase, OrderRequest
 from stapi_fastapi.models.product import (
     Product,
     Provider,
     ProviderRole,
 )
+from stapi_fastapi.routers.product_router import ProductRouter
 from stapi_fastapi.routers.root_router import RootRouter
 
 
@@ -44,29 +45,34 @@ async def get_order(self, order_id: str, request: Request) -> Order:
 class MockProductBackend(ProductBackend):
     def __init__(self, orders: MockOrderDB) -> None:
         self._opportunities: list[Opportunity] = []
-        self._allowed_payloads: list[OpportunityRequest] = []
+        self._allowed_payloads: list[OrderRequest] = []
         self._orders: MockOrderDB = orders
 
     async def search_opportunities(
-        self, product: Product, search: OpportunityRequest, request: Request
+        self,
+        product_router: ProductRouter,
+        search: OpportunityRequest,
+        request: Request,
     ) -> list[Opportunity]:
         return [o.model_copy(update=search.model_dump()) for o in self._opportunities]
 
     async def create_order(
-        self, product: Product, payload: OpportunityRequest, request: Request
+        self, product_router: ProductRouter, payload: OrderRequest, request: Request
     ) -> Order:
         """
         Create a new order.
         """
         allowed: bool = any(allowed == payload for allowed in self._allowed_payloads)
+        allowed = True
         if allowed:
             order = Order(
                 id=str(uuid4()),
                 geometry=payload.geometry,
                 properties={
                     "filter": payload.filter,
                     "datetime": payload.datetime,
-                    "product_id": product.id,
+                    "product_id": product_router.product.id,
+                    **dict(payload.order_parameters),
                 },
                 links=[],
             )
@@ -79,6 +85,10 @@ class TestSpotlightProperties(OpportunityPropertiesBase):
     off_nadir: int
 
 
+class TestOrderParameters(OrderParametersBase):
+    s3_path: str
+
+
 order_db = MockOrderDB()
 product_backend = MockProductBackend(order_db)
 root_backend = MockRootBackend(order_db)
@@ -99,6 +109,7 @@ class TestSpotlightProperties(OpportunityPropertiesBase):
     providers=[provider],
     links=[],
     constraints=TestSpotlightProperties,
+    order_parameters=TestOrderParameters,
     backend=product_backend,
 )
 

tests/backends.py

@@ -64,7 +64,7 @@ async def create_order(
                     "filter": payload.filter,
                     "datetime": payload.datetime,
                     "product_id": product_router.product.id,
-                    # **payload.order_parameters,
+                    **dict(payload.order_parameters),
                 },
                 links=[],
             )

tests/conftest.py

@@ -12,8 +12,8 @@
 from stapi_fastapi.models.opportunity import (
     Opportunity,
     OpportunityPropertiesBase,
-    OpportunityRequest,
 )
+from stapi_fastapi.models.order import OrderParametersBase, OrderRequest
 from stapi_fastapi.models.product import Product, Provider, ProviderRole
 from stapi_fastapi.routers.root_router import RootRouter
 
@@ -24,6 +24,10 @@ class TestSpotlightProperties(OpportunityPropertiesBase):
     off_nadir: int
 
 
+class TestSpotlightOrderProperties(OrderParametersBase):
+    s3_path: str | None = None
+
+
 @pytest.fixture(scope="session")
 def base_url() -> Iterator[str]:
     yield "http://stapiserver"
@@ -58,6 +62,7 @@ def mock_product_test_spotlight(
         providers=[mock_provider],
         links=[],
         constraints=TestSpotlightProperties,
+        order_parameters=TestSpotlightOrderProperties,
         backend=product_backend,
     )
 
@@ -126,13 +131,14 @@ def mock_test_spotlight_opportunities() -> list[Opportunity]:
 
 
 @pytest.fixture
-def allowed_payloads() -> list[OpportunityRequest]:
+def allowed_payloads() -> list[OrderRequest]:
     return [
-        OpportunityRequest(
+        OrderRequest(
             geometry=Point(
                 type="Point", coordinates=Position2D(longitude=13.4, latitude=52.5)
             ),
             datetime=(datetime.now(UTC), datetime.now(UTC)),
             filter={},
+            order_parameters={"s3_path": "BUCKET"},
         ),
     ]

tests/order_test.py

@@ -4,7 +4,7 @@
 from fastapi import status
 from fastapi.testclient import TestClient
 from httpx import Response
-from stapi_fastapi.models.opportunity import OpportunityRequest
+from stapi_fastapi.models.order import OrderRequest
 
 from .backends import MockProductBackend
 from .utils import find_link
@@ -19,7 +19,7 @@ def new_order_response(
     product_id: str,
     product_backend: MockProductBackend,
     stapi_client: TestClient,
-    allowed_payloads: list[OpportunityRequest],
+    allowed_payloads: list[OrderRequest],
 ) -> Response:
     product_backend._allowed_payloads = allowed_payloads