now creating dewars, pucks and samples from spreadsheet and replacing dewars if a dewar with the same name exists

backend/app/routers/shipment.py

@@ -9,7 +9,7 @@ from sqlalchemy.exc import SQLAlchemyError
 from app.models import Shipment as ShipmentModel, ContactPerson as ContactPersonModel, Address as AddressModel, \
     Proposal as ProposalModel, Dewar as DewarModel, Puck as PuckModel, Sample as SampleModel
 from app.schemas import ShipmentCreate, UpdateShipmentComments, Shipment as ShipmentSchema, DewarUpdate, \
-    ContactPerson as ContactPersonSchema, Sample as SampleSchema, DewarCreate, PuckCreate, SampleCreate
+    ContactPerson as ContactPersonSchema, Sample as SampleSchema, DewarCreate, PuckCreate, SampleCreate, DewarSchema
 from app.database import get_db
 from app.crud import get_shipments, get_shipment_by_id
 
@@ -38,6 +38,19 @@ async def fetch_shipments(id: Optional[int] = Query(None), db: Session = Depends
         logging.info(f"Shipment ID: {shipment.id}, Shipment Name: {shipment.shipment_name}")
     return shipments
 
+@router.get("/{shipment_id}/dewars", response_model=List[DewarSchema])
+async def get_dewars_by_shipment_id(shipment_id: int, db: Session = Depends(get_db)):
+    shipment = db.query(ShipmentModel).filter(ShipmentModel.id == shipment_id).first()
+    if not shipment:
+        raise HTTPException(status_code=404, detail="Shipment not found")
+
+    dewars = db.query(DewarModel).filter(DewarModel.shipment_id == shipment_id).all()
+    if not dewars:
+        raise HTTPException(status_code=404, detail="No dewars found for this shipment")
+
+    return dewars
+
+
 
 @router.post("", response_model=ShipmentSchema, status_code=status.HTTP_201_CREATED)
 async def create_shipment(shipment: ShipmentCreate, db: Session = Depends(get_db)):
@@ -220,58 +233,55 @@ async def update_shipment_comments(shipment_id: int, comments_data: UpdateShipme
 
 
 @router.post("/{shipment_id}/add_dewar_puck_sample", response_model=ShipmentSchema, status_code=status.HTTP_201_CREATED)
-async def add_dewar_puck_sample_to_shipment(
-        shipment_id: int,
-        payload: DewarCreate,
-        db: Session = Depends(get_db)
-):
+def add_dewar_puck_sample_to_shipment(shipment_id: int, payload: DewarCreate, db: Session = Depends(get_db)):
     shipment = db.query(ShipmentModel).filter(ShipmentModel.id == shipment_id).first()
     if not shipment:
-        logging.error(f"Shipment not found with ID: {shipment_id}")
         raise HTTPException(status_code=404, detail="Shipment not found")
 
     try:
-        dewar = DewarModel(
-            shipment_id=shipment_id,
-            dewar_name=payload.dewar_name,
-            tracking_number=payload.tracking_number,
-            status=payload.status,
-            contact_person_id=payload.contact_person_id,
-            return_address_id=payload.return_address_id,
-        )
-        db.add(dewar)
-        db.commit()
-        db.refresh(dewar)
-
-        for puck_data in payload.pucks:
-            puck = PuckModel(
-                dewar_id=dewar.id,
-                puck_name=puck_data.puck_name,
-                puck_type=puck_data.puck_type,
-                puck_location_in_dewar=puck_data.puck_location_in_dewar,
-            )
-            db.add(puck)
-            db.commit()
-            db.refresh(puck)
-
-            for sample_data in puck_data.samples:
-                sample = SampleModel(
-                    puck_id=puck.id,
-                    sample_name=sample_data.sample_name,
-                    position=sample_data.position,
-                    data_collection_parameters=sample_data.data_collection_parameters,
-                )
-                db.add(sample)
+        for dewar_data in payload.dewars:
+            dewar = db.query(DewarModel).filter(DewarModel.dewar_name == dewar_data.dewar_name).first()
+            if dewar:
+                # Update existing dewar
+                dewar.tracking_number = dewar_data.tracking_number
+                dewar.status = dewar_data.status
                 db.commit()
-                db.refresh(sample)
+            else:
+                dewar = DewarModel(
+                    shipment_id=shipment_id,
+                    dewar_name=dewar_data.dewar_name,
+                    tracking_number=dewar_data.tracking_number,
+                    status=dewar_data.status,
+                )
+                db.add(dewar)
+                db.commit()
+                db.refresh(dewar)
+
+            for puck_data in dewar_data.pucks:
+                puck = PuckModel(
+                    dewar_id=dewar.id,
+                    puck_name=puck_data.puck_name,
+                    puck_type=puck_data.puck_type,
+                    puck_location_in_dewar=puck_data.puck_location_in_dewar,
+                )
+                db.add(puck)
+                db.commit()
+                db.refresh(puck)
+
+                for sample_data in puck_data.samples:
+                    sample = SampleModel(
+                        puck_id=puck.id,
+                        sample_name=sample_data.sample_name,
+                        position=sample_data.position,
+                    )
+                    db.add(sample)
+                    db.commit()
+                    db.refresh(sample)
 
         db.refresh(shipment)
     except SQLAlchemyError as e:
-        logging.error(f"Database error occurred: {e}")
-        raise HTTPException(status_code=500, detail="Internal server error")
+        raise HTTPException(status_code=500, detail=f"Database error: {e}")
     except ValidationError as e:
-        logging.error(f"Validation error occurred: {e}")
-        raise HTTPException(status_code=400, detail="Validation error")
+        raise HTTPException(status_code=400, detail=f"Validation error: {e}")
 
-    logging.info(f"Successfully added dewar, puck, and sample for shipment ID: {shipment_id}")
-    return shipment
+    return shipment