added pucks and samples

backend/app/routers/shipment.py

@@ -7,6 +7,7 @@ from datetime import date
 
 from app.models import Shipment as ShipmentModel, ContactPerson as ContactPersonModel, Address as AddressModel, Proposal as ProposalModel, Dewar as DewarModel
 from app.schemas import ShipmentCreate, Shipment as ShipmentSchema, DewarUpdate, ContactPerson as ContactPersonSchema
+from app.schemas import Sample as SampleSchema
 from app.database import get_db
 from app.crud import get_shipments, get_shipment_by_id
 
@@ -149,4 +150,33 @@ async def remove_dewar_from_shipment(shipment_id: str, dewar_id: str, db: Sessio
 @router.get("/contact_persons", response_model=List[ContactPersonSchema])
 async def get_shipment_contact_persons(db: Session = Depends(get_db)):
     contact_persons = db.query(ContactPersonModel).all()
-    return contact_persons
+    return contact_persons
+
+@router.get("/{shipment_id}/samples", response_model=List[SampleSchema])
+def get_samples_in_shipment(shipment_id: str, db: Session = Depends(get_db)):
+    shipment = db.query(ShipmentModel).filter(ShipmentModel.shipment_id == shipment_id).first()
+    if shipment is None:
+        raise HTTPException(status_code=404, detail="Shipment not found")
+
+    samples = []
+    for dewar in shipment.dewars:
+        for puck in dewar.pucks:
+            samples.extend(puck.positions)
+
+    return samples
+
+@router.get("/{shipment_id}/dewars/{dewar_id}/samples", response_model=List[SampleSchema])
+def get_samples_in_dewar(shipment_id: str, dewar_id: str, db: Session = Depends(get_db)):
+    shipment = db.query(ShipmentModel).filter(ShipmentModel.shipment_id == shipment_id).first()
+    if shipment is None:
+        raise HTTPException(status_code=404, detail="Shipment not found")
+
+    dewar = db.query(DewarModel).filter(DewarModel.id == dewar_id, DewarModel.shipment_id == shipment_id).first()
+    if dewar is None:
+        raise HTTPException(status_code=404, detail="Dewar not found in shipment")
+
+    samples = []
+    for puck in dewar.pucks:
+        samples.extend(puck.positions)
+
+    return samples