feat: update setup fixture

Author: harryle95

driver.py

@@ -63,6 +63,15 @@
     ZN_CONCENTRATION_TRAIT,
     ZN_CONCENTRATION_VARIABLE,
 )
+from tests.router.sample.fixture import (
+    CEA_BE00034067,
+    LEAFDISC_061439,
+    LEAFDISC_061440,
+    PO_0006001,
+    PO_0007010,
+    PO_0025094,
+    PO_0025161,
+)
 from tests.router.staff.fixture import CHRIS_B, JOHN_DOE, STEP_W
 from tests.router.study.fixture import BARLEY_PROJECT_STUDY, FIRST_STUDY, MAIZE_PROJECT_STUDY, SECOND_STUDY
 from tests.router.unit.fixture import DEGREE_DAY_REF, DEGREE_DAY_UNIT, KILO_PIXEL_UNIT, MICROGRAM_UNIT
@@ -273,6 +282,28 @@ async def async_main() -> None:
 
         session.add_all([PLANT_061439, PLANT_061440, PLANT_TYPE, PLOT_894, PLOT_TYPE])
 
+        # Add sample
+        CEA_BE00034067.plant_anatomical_entity = PO_0025161
+        CEA_BE00034067.observation_unit = PLOT_894
+        CEA_BE00034067.plant_structural_development_stage = PO_0025094
+        LEAFDISC_061439.plant_anatomical_entity = PO_0006001
+        LEAFDISC_061439.observation_unit = PLANT_061439
+        LEAFDISC_061439.plant_structural_development_stage = PO_0007010
+        LEAFDISC_061440.plant_anatomical_entity = PO_0006001
+        LEAFDISC_061440.observation_unit = PLANT_061440
+        LEAFDISC_061440.plant_structural_development_stage = PO_0007010
+
+        session.add_all(
+            [
+                PO_0006001,
+                PO_0007010,
+                PO_0025094,
+                PO_0025161,
+                CEA_BE00034067,
+                LEAFDISC_061440,
+                LEAFDISC_061439,
+            ]
+        )
         await session.commit()
 
     # for AsyncEngine created in function scope, close and

src/setup.py

@@ -45,13 +45,12 @@ class AllSampleFixtureResponse:
     observation_unit_response: AllObservationUnitFixtureResponse
 
 
-PO_0025094 = Vocabulary(title="PO:0025094", accession_number="PO:0025094")
-BBCH_17 = Vocabulary(title="BBCH-17", accession_number="BBCH-17")
 PO_0007010 = Vocabulary(title="PO_0007010", accession_number="PO_0007010")
-PO_0000003 = Vocabulary(title="PO:0000003", accession_number="PO:0000003")
+PO_0025094 = Vocabulary(title="PO:0025094", accession_number="PO:0025094")
 PO_0025161 = Vocabulary(title="PO:0025161", accession_number="PO:0025161")
 PO_0006001 = Vocabulary(title="PO_0006001", accession_number="PO_0006001")
 
+
 LEAFDISC_061439 = Sample(
     title="leafdisc_061439",
     description="Leaves collected at harvest stage (Barley developmental stage 11)",
@@ -89,7 +88,6 @@ async def get_sample_fixture(
         **data.to_dict(),
     )
     if id is None:
-        send_data.updated_at = None
         response = await post_fixture(PATH, send_data, test_client)
     else:
         response = await put_fixture(PATH, send_data, test_client, id)
@@ -162,6 +160,6 @@ async def setup_sample(
         anatomical_entity_response=setup_anatomical_entity,
         observation_unit_response=setup_observation_units,
     )
-    await delete_fixture(PATH, cea_be.sample_response, test_client)
-    await delete_fixture(PATH, leafdisc_061439.sample_response, test_client)
-    await delete_fixture(PATH, leafdisc_061440.sample_response, test_client)
+    await delete_fixture(PATH, cea_be.sample_response.json()["id"], test_client)
+    await delete_fixture(PATH, leafdisc_061439.sample_response.json()["id"], test_client)
+    await delete_fixture(PATH, leafdisc_061440.sample_response.json()["id"], test_client)