updated models and schemas for shipments and dewars

backend/app/routers/shipment.py

@@ -20,11 +20,11 @@ def default_serializer(obj):
     raise TypeError(f"Type {type(obj)} not serializable")
 
 @router.get("", response_model=List[ShipmentSchema])
-async def fetch_shipments(shipment_id: Optional[str] = Query(None), db: Session = Depends(get_db)):
-    if shipment_id:
-        shipment = get_shipment_by_id(db, shipment_id)
+async def fetch_shipments(id: Optional[int] = Query(None), db: Session = Depends(get_db)):
+    if id:
+        shipment = get_shipment_by_id(db, id)
         if not shipment:
-            logging.error(f"Shipment with ID {shipment_id} not found")
+            logging.error(f"Shipment with ID {id} not found")
             raise HTTPException(status_code=404, detail="Shipment not found")
         logging.info(f"Shipment found: {shipment}")
         return [shipment]
@@ -32,7 +32,7 @@ async def fetch_shipments(shipment_id: Optional[str] = Query(None), db: Session
     shipments = get_shipments(db)
     logging.info(f"Total shipments fetched: {len(shipments)}")
     for shipment in shipments:
-        logging.info(f"Shipment ID: {shipment.shipment_id}, Shipment Name: {shipment.shipment_name}")
+        logging.info(f"Shipment ID: {shipment.id}, Shipment Name: {shipment.shipment_name}")
     return shipments
 
 @router.post("", response_model=ShipmentSchema, status_code=status.HTTP_201_CREATED)
@@ -69,8 +69,8 @@ async def create_shipment(shipment: ShipmentCreate, db: Session = Depends(get_db
     return db_shipment
 
 @router.delete("/{shipment_id}", status_code=status.HTTP_204_NO_CONTENT)
-async def delete_shipment(shipment_id: str, db: Session = Depends(get_db)):
-    shipment = db.query(ShipmentModel).filter(ShipmentModel.shipment_id == shipment_id).first()
+async def delete_shipment(id: int, db: Session = Depends(get_db)):
+    shipment = db.query(ShipmentModel).filter(ShipmentModel.id == id).first()
     if not shipment:
         raise HTTPException(status_code=404, detail="Shipment not found")
     db.delete(shipment)
@@ -78,10 +78,10 @@ async def delete_shipment(shipment_id: str, db: Session = Depends(get_db)):
     return
 
 @router.put("/{shipment_id}", response_model=ShipmentSchema)
-async def update_shipment(shipment_id: str, updated_shipment: ShipmentCreate, db: Session = Depends(get_db)):
+async def update_shipment(id: int, updated_shipment: ShipmentCreate, db: Session = Depends(get_db)):
     print("Received payload:", json.dumps(updated_shipment.dict(), indent=2, default=default_serializer))
 
-    shipment = db.query(ShipmentModel).filter(ShipmentModel.shipment_id == shipment_id).first()
+    shipment = db.query(ShipmentModel).filter(ShipmentModel.id == id).first()
     if not shipment:
         raise HTTPException(status_code=404, detail="Shipment not found")
 
@@ -131,8 +131,8 @@ async def update_shipment(shipment_id: str, updated_shipment: ShipmentCreate, db
 
 
 @router.post("/{shipment_id}/add_dewar", response_model=ShipmentSchema)
-async def add_dewar_to_shipment(shipment_id: str, dewar_id: str, db: Session = Depends(get_db)):
-    shipment = db.query(ShipmentModel).filter(ShipmentModel.shipment_id == shipment_id).first()
+async def add_dewar_to_shipment(id: int, dewar_id: int, db: Session = Depends(get_db)):
+    shipment = db.query(ShipmentModel).filter(ShipmentModel.id == id).first()
     if not shipment:
         raise HTTPException(status_code=404, detail="Shipment not found")
     dewar = db.query(DewarModel).filter(DewarModel.id == dewar_id).first()
@@ -146,11 +146,15 @@ async def add_dewar_to_shipment(shipment_id: str, dewar_id: str, db: Session = D
     return shipment
 
 @router.delete("/{shipment_id}/remove_dewar/{dewar_id}", response_model=ShipmentSchema)
-async def remove_dewar_from_shipment(shipment_id: str, dewar_id: str, db: Session = Depends(get_db)):
-    shipment = db.query(ShipmentModel).filter(ShipmentModel.shipment_id == shipment_id).first()
+async def remove_dewar_from_shipment(shipment_id: int, dewar_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")
 
+    dewar_exists = any(dw.id == dewar_id for dw in shipment.dewars)
+    if not dewar_exists:
+        raise HTTPException(status_code=404, detail=f"Dewar with ID {dewar_id} not found in shipment")
+
     shipment.dewars = [dw for dw in shipment.dewars if dw.id != dewar_id]
     db.commit()
     db.refresh(shipment)
@@ -162,8 +166,8 @@ async def get_shipment_contact_persons(db: Session = Depends(get_db)):
     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()
+def get_samples_in_shipment(id: int, db: Session = Depends(get_db)):
+    shipment = db.query(ShipmentModel).filter(ShipmentModel.id == id).first()
     if shipment is None:
         raise HTTPException(status_code=404, detail="Shipment not found")
 
@@ -175,12 +179,16 @@ def get_samples_in_shipment(shipment_id: str, db: Session = Depends(get_db)):
     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()
+def get_samples_in_dewar(
+        shipment_id: int, dewar_id: int, db: Session = Depends(get_db)
+):
+    shipment = db.query(ShipmentModel).filter(ShipmentModel.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()
+    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")
 
@@ -192,8 +200,8 @@ def get_samples_in_dewar(shipment_id: str, dewar_id: str, db: Session = Depends(
 
 
 @router.put("/{shipment_id}/comments", response_model=ShipmentSchema)
-async def update_shipment_comments(shipment_id: str, comments_data: UpdateShipmentComments, db: Session = Depends(get_db)):
-    shipment = db.query(ShipmentModel).filter(ShipmentModel.shipment_id == shipment_id).first()
+async def update_shipment_comments(id: int, comments_data: UpdateShipmentComments, db: Session = Depends(get_db)):
+    shipment = db.query(ShipmentModel).filter(ShipmentModel.id == id).first()
     if not shipment:
         raise HTTPException(status_code=404, detail="Shipment not found")