all fieldsite and object tests pass

Author: amyfromandi

services/api-v3/Makefile

@@ -24,4 +24,10 @@ test-fieldsite:
   	--confcutdir=api/tests \
   	api/tests/test_fieldsite.py
 
+test-object:
+	uv run pytest -q \
+  	--confcutdir=api/tests \
+  	api/tests/test_object.py
+
+
 

services/api-v3/api/settings.py

@@ -1,5 +1,6 @@
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
+from typing import Optional
 
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(
@@ -21,4 +22,5 @@ class Settings(BaseSettings):
     jwt_secret_key: str = Field(alias="SECRET_KEY")
     jwt_algorithm: str = Field(default="HS256", alias="JWT_ENCRYPTION_ALGORITHM")
 
+
 settings = Settings()

services/api-v3/api/tests/test_database.py

@@ -30,10 +30,17 @@ class TEST_SOURCE_TABLE:
     to_filter = {"PTYPE": "eq.Qff"}
 
 
-@pytest.fixture
+@pytest.fixture(scope="module")
 def api_client() -> TestClient:
-    with TestClient(app) as api_client:
-        yield api_client
+    headers = {}
+    test_token = os.environ.get("TEST_ACCESS_TOKEN")
+    if test_token:
+        headers["access_token"] = f"Bearer {test_token}"
+
+    with TestClient(app, headers=headers) as client:
+        yield client
+
+
 
 
 @pytest.fixture

services/api-v3/api/tests/test_fieldsite.py

@@ -189,38 +189,40 @@ def test_spot_to_checkin_from_featurecollection(self, api_client):
         assert resp.status_code == 200
 
         out = resp.json()
-        assert isinstance(out, list)
-        assert len(out) == 1
+        assert isinstance(out, dict)
 
-        c = out[0]
-        # Rockd checkin-ish keys
+        c = out
         assert c["checkin_id"] == 10
         assert c["spot_id"] == 10
         assert c["lat"] == pytest.approx(43.0)
         assert c["lng"] == pytest.approx(-89.0)
+
         assert "created" in c and isinstance(c["created"], str)
-        assert "added" in c and isinstance(c["added"], str)
-        assert "observations" in c and isinstance(c["observations"], list)
+        assert "updated" in c and isinstance(c["updated"], str)
+        assert c["created"].endswith("Z")
+        assert c["updated"].endswith("Z")
 
-        # orientation passed through
+        assert "observations" in c and isinstance(c["observations"], list)
         assert len(c["observations"]) == 1
         assert "orientation" in c["observations"][0]
         assert c["observations"][0]["orientation"]["strike"] == pytest.approx(123.0)
         assert c["observations"][0]["orientation"]["dip"] == pytest.approx(45.0)
 
+
     def test_spot_to_checkin_accepts_single_fieldsite_dict(self, api_client):
         # your spot_to_checkin treats dict with "location" as already-FieldSite-shaped
         payload = _fieldsite_dict(fs_id=501)
         resp = api_client.post(
             "/dev/convert/field-site?in=spot&out=checkin", json=payload
         )
         assert resp.status_code == 200
-
         out = resp.json()
-        assert isinstance(out, list)
-        assert len(out) == 1
-        assert out[0]["checkin_id"] == 501
-        assert out[0]["spot_id"] == 501
+        assert isinstance(out, dict)
+        assert out["checkin_id"] == 501
+        assert out["spot_id"] == 501
+        assert "created" in out and isinstance(out["created"], str)
+        assert "updated" in out and isinstance(out["updated"], str)
+
 
     def test_checkin_to_fieldsite_single(self, api_client):
         payload = _checkin(checkin_id=77)
@@ -262,29 +264,29 @@ def test_fieldsite_to_checkin_list(self, api_client):
             "/dev/convert/field-site?in=fieldsite&out=checkin", json=payload
         )
         assert resp.status_code == 200
-
         out = resp.json()
         assert isinstance(out, list)
         assert len(out) == 2
-
         c0 = out[0]
         assert c0["checkin_id"] == 900
         assert c0["spot_id"] == 900
         assert "created" in c0 and isinstance(c0["created"], str)
-        assert "added" in c0 and isinstance(c0["added"], str)
+        assert "updated" in c0 and isinstance(c0["updated"], str)
+
 
     def test_fieldsite_to_checkin_single_returns_list_of_one(self, api_client):
         payload = _fieldsite_dict(fs_id=999)
         resp = api_client.post(
             "/dev/convert/field-site?in=fieldsite&out=checkin", json=payload
         )
         assert resp.status_code == 200
-
         out = resp.json()
-        assert isinstance(out, list)
-        assert len(out) == 1
-        assert out[0]["checkin_id"] == 999
-        assert out[0]["spot_id"] == 999
+        assert isinstance(out, dict)
+        assert out["checkin_id"] == 999
+        assert out["spot_id"] == 999
+        assert "created" in out and isinstance(out["created"], str)
+        assert "updated" in out and isinstance(out["updated"], str)
+
 
     def test_fieldsite_to_spot_single(self, api_client):
         payload = _fieldsite_dict(fs_id=1234)