move around some code

Author: Phil Varner

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
     rev: v0.7.3
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args: [--fix, --select, I, --exit-non-zero-on-fix]
       - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.13.0

tests/conftest.py

@@ -12,22 +12,12 @@
 
 from stapi_fastapi.models.opportunity import (
     Opportunity,
-    OpportunityProperties,
 )
-from stapi_fastapi.models.order import OrderParameters, OrderRequest
 from stapi_fastapi.models.product import Product, Provider, ProviderRole
 from stapi_fastapi.routers.root_router import RootRouter
 
 from .backends import MockOrderDB, MockProductBackend, MockRootBackend
-from .utils import find_link
-
-
-class TestSpotlightProperties(OpportunityProperties):
-    off_nadir: int
-
-
-class TestSpotlightOrderParameters(OrderParameters):
-    s3_path: str | None = None
+from .shared import SpotlightOpportunityProperties, SpotlightOrderParameters, find_link
 
 
 @pytest.fixture(scope="session")
@@ -63,8 +53,8 @@ def mock_product_test_spotlight(
         keywords=["test", "satellite"],
         providers=[mock_provider],
         links=[],
-        constraints=TestSpotlightProperties,
-        order_parameters=TestSpotlightOrderParameters,
+        constraints=SpotlightOpportunityProperties,
+        order_parameters=SpotlightOrderParameters,
         backend=product_backend,
     )
 
@@ -141,26 +131,9 @@ def mock_test_spotlight_opportunities() -> list[Opportunity]:
                 type="Point",
                 coordinates=Position2D(longitude=0.0, latitude=0.0),
             ),
-            properties=TestSpotlightProperties(
+            properties=SpotlightOpportunityProperties(
                 datetime=(start, end),
                 off_nadir=20,
             ),
         ),
     ]
-
-
-@pytest.fixture
-def create_order_allowed_payloads() -> list[OrderRequest]:
-    return [
-        OrderRequest(
-            geometry=Point(
-                type="Point", coordinates=Position2D(longitude=13.4, latitude=52.5)
-            ),
-            datetime=(
-                datetime.fromisoformat("2024-11-11T18:55:33Z"),
-                datetime.fromisoformat("2024-11-15T18:55:33Z"),
-            ),
-            filter=None,
-            order_parameters=TestSpotlightOrderParameters(s3_path="BUCKET"),
-        ),
-    ]

tests/order_test.py

@@ -3,18 +3,37 @@
 import pytest
 from fastapi import status
 from fastapi.testclient import TestClient
+from geojson_pydantic import Point
+from geojson_pydantic.types import Position2D
 from httpx import Response
 
 from stapi_fastapi.models.order import OrderRequest
 
 from .backends import MockProductBackend
-from .utils import find_link
+from .shared import SpotlightOrderParameters, find_link
 
 NOW = datetime.now(UTC)
 START = NOW
 END = START + timedelta(days=5)
 
 
+@pytest.fixture
+def create_order_allowed_payloads() -> list[OrderRequest]:
+    return [
+        OrderRequest(
+            geometry=Point(
+                type="Point", coordinates=Position2D(longitude=13.4, latitude=52.5)
+            ),
+            datetime=(
+                datetime.fromisoformat("2024-11-11T18:55:33Z"),
+                datetime.fromisoformat("2024-11-15T18:55:33Z"),
+            ),
+            filter=None,
+            order_parameters=SpotlightOrderParameters(s3_path="BUCKET"),
+        ),
+    ]
+
+
 @pytest.fixture
 def new_order_response(
     product_id: str,

tests/product_test.py

@@ -2,7 +2,7 @@
 from fastapi import status
 from fastapi.testclient import TestClient
 
-from .utils import find_link
+from .shared import find_link
 
 
 def test_products_response(stapi_client: TestClient):

tests/shared.py

@@ -0,0 +1,19 @@
+from typing import Any
+
+from stapi_fastapi.models.opportunity import OpportunityProperties
+from stapi_fastapi.models.order import OrderParameters
+
+
+class SpotlightOpportunityProperties(OpportunityProperties):
+    off_nadir: int
+
+
+class SpotlightOrderParameters(OrderParameters):
+    s3_path: str | None = None
+
+
+type link_dict = dict[str, Any]
+
+
+def find_link(links: list[link_dict], rel: str) -> link_dict | None:
+    return next((link for link in links if link["rel"] == rel), None)