added pucks and samples

backend/app/routers/__init__.py

@@ -0,0 +1,7 @@
+from .address import router as address_router
+from .contact import router as contact_router
+from .proposal import router as proposal_router
+from .dewar import router as dewar_router
+from .shipment import router as shipment_router
+
+__all__ = ["address_router", "contact_router", "proposal_router", "dewar_router", "shipment_router"]

backend/app/routers/dewar.py

@@ -1,17 +1,19 @@
 from fastapi import APIRouter, HTTPException, status, Depends
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, joinedload
 from typing import List
 import uuid
-from app.schemas import Dewar as DewarSchema, DewarCreate
-from app.models import Dewar as DewarModel
+from app.schemas import Dewar as DewarSchema, DewarCreate, DewarUpdate, Sample as SampleSchema, Puck as PuckSchema
+from app.models import Dewar as DewarModel, Puck as PuckModel, Sample as SampleModel
 from app.dependencies import get_db
 
 router = APIRouter()
 
+
 @router.get("/", response_model=List[DewarSchema])
 async def get_dewars(db: Session = Depends(get_db)):
     return db.query(DewarModel).all()
 
+
 @router.post("/", response_model=DewarSchema, status_code=status.HTTP_201_CREATED)
 async def create_dewar(dewar: DewarCreate, db: Session = Depends(get_db)) -> DewarSchema:
     dewar_id = f'DEWAR-{uuid.uuid4().hex[:8].upper()}'
@@ -35,4 +37,32 @@ async def create_dewar(dewar: DewarCreate, db: Session = Depends(get_db)) -> Dew
     db.add(db_dewar)
     db.commit()
     db.refresh(db_dewar)
-    return db_dewar
+    return db_dewar
+
+
+@router.get("/{dewar_id}", response_model=DewarSchema)
+async def get_dewar(dewar_id: str, db: Session = Depends(get_db)):
+    dewar = db.query(DewarModel).options(
+        joinedload(DewarModel.pucks).joinedload(PuckModel.positions)
+    ).filter(DewarModel.id == dewar_id).first()
+
+    if not dewar:
+        raise HTTPException(status_code=404, detail="Dewar not found")
+
+    return dewar
+
+
+@router.put("/{dewar_id}", response_model=DewarSchema)
+async def update_dewar(dewar_id: str, dewar_update: DewarUpdate, db: Session = Depends(get_db)) -> DewarSchema:
+    dewar = db.query(DewarModel).filter(DewarModel.id == dewar_id).first()
+
+    if not dewar:
+        raise HTTPException(status_code=404, detail="Dewar not found")
+
+    for key, value in dewar_update.dict(exclude_unset=True).items():
+        setattr(dewar, key, value)
+
+    db.commit()
+    db.refresh(dewar)
+
+    return dewar

backend/app/routers/puck.py

@@ -0,0 +1,63 @@
+from fastapi import APIRouter, HTTPException, status, Depends
+from sqlalchemy.orm import Session
+from typing import List
+import uuid
+from app.schemas import Puck as PuckSchema, PuckCreate, PuckUpdate
+from app.models import Puck as PuckModel, Sample as SampleModel
+from app.dependencies import get_db
+
+router = APIRouter()
+
+
+@router.get("/", response_model=List[PuckSchema])
+async def get_pucks(db: Session = Depends(get_db)):
+    return db.query(PuckModel).all()
+
+
+@router.get("/{puck_id}", response_model=PuckSchema)
+async def get_puck(puck_id: str, db: Session = Depends(get_db)):
+    puck = db.query(PuckModel).filter(PuckModel.id == puck_id).first()
+    if not puck:
+        raise HTTPException(status_code=404, detail="Puck not found")
+    return puck
+
+
+@router.post("/", response_model=PuckSchema, status_code=status.HTTP_201_CREATED)
+async def create_puck(puck: PuckCreate, db: Session = Depends(get_db)) -> PuckSchema:
+    puck_id = f'PUCK-{uuid.uuid4().hex[:8].upper()}'
+    db_puck = PuckModel(
+        id=puck_id,
+        puck_name=puck.puck_name,
+        puck_type=puck.puck_type,
+        puck_location_in_dewar=puck.puck_location_in_dewar,
+        dewar_id=puck.dewar_id
+    )
+    db.add(db_puck)
+    db.commit()
+    db.refresh(db_puck)
+    return db_puck
+
+
+@router.put("/{puck_id}", response_model=PuckSchema)
+async def update_puck(puck_id: str, updated_puck: PuckUpdate, db: Session = Depends(get_db)):
+    puck = db.query(PuckModel).filter(PuckModel.id == puck_id).first()
+    if not puck:
+        raise HTTPException(status_code=404, detail="Puck not found")
+
+    for key, value in updated_puck.dict(exclude_unset=True).items():
+        setattr(puck, key, value)
+
+    db.commit()
+    db.refresh(puck)
+    return puck
+
+
+@router.delete("/{puck_id}", status_code=status.HTTP_204_NO_CONTENT)
+async def delete_puck(puck_id: str, db: Session = Depends(get_db)):
+    puck = db.query(PuckModel).filter(PuckModel.id == puck_id).first()
+    if not puck:
+        raise HTTPException(status_code=404, detail="Puck not found")
+
+    db.delete(puck)
+    db.commit()
+    return

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