changing contact person and address of a specific dewar is now possible

backend/main.py

@@ -1,5 +1,6 @@
-from fastapi import FastAPI, HTTPException, status
+from fastapi import FastAPI, HTTPException, status, Query
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.logger import logger
 from pydantic import BaseModel
 from typing import List, Optional
 import logging
@@ -265,7 +266,12 @@ async def get_proposals():
 
 
 @app.get("/shipments", response_model=List[Shipment])
-async def get_shipments():
+async def get_shipments(shipment_id: Optional[str] = Query(None, description="ID of the specific shipment to retrieve")):
+    if shipment_id:
+        shipment = next((sh for sh in shipments if sh.shipment_id == shipment_id), None)
+        if not shipment:
+            raise HTTPException(status_code=404, detail="Shipment not found")
+        return [shipment]
     return shipments
 
 
@@ -274,21 +280,17 @@ async def delete_shipment(shipment_id: str):
     global shipments  # Use global variable to access the shipments list
     shipments = [shipment for shipment in shipments if shipment.shipment_id != shipment_id]
 
+
 @app.post("/shipments/{shipment_id}/add_dewar", response_model=Shipment)
 async def add_dewar_to_shipment(shipment_id: str, dewar_id: str):
-    # Log received parameters for debugging
-    logging.info(f"Received request to add dewar {dewar_id} to shipment {shipment_id}")
-
     # Find the shipment by id
     shipment = next((sh for sh in shipments if sh.shipment_id == shipment_id), None)
     if not shipment:
-        logging.error("Shipment not found")
         raise HTTPException(status_code=404, detail="Shipment not found")
 
     # Find the dewar by id
     dewar = next((dw for dw in dewars if dw.id == dewar_id), None)
     if not dewar:
-        logging.error("Dewar not found")
         raise HTTPException(status_code=404, detail="Dewar not found")
 
     # Add the dewar to the shipment
@@ -298,6 +300,54 @@ async def add_dewar_to_shipment(shipment_id: str, dewar_id: str):
     return shipment
 
 
+@app.put("/shipments/{shipment_id}", response_model=Shipment)
+async def update_shipment(shipment_id: str, updated_shipment: Shipment):
+    global shipments
+    shipment = next((sh for sh in shipments if sh.shipment_id == shipment_id), None)
+
+    if not shipment:
+        raise HTTPException(status_code=404, detail="Shipment not found")
+
+    logger.info(f"Updating shipment: {shipment_id}")
+    logger.info(f"Updated shipment data: {updated_shipment}")
+
+    # Create a dictionary of existing dewars for fast lookup
+    existing_dewar_dict = {dewar.id: dewar for dewar in shipment.dewars}
+
+    # Update or add dewars from the updated shipment data
+    for updated_dewar in updated_shipment.dewars:
+        if updated_dewar.id in existing_dewar_dict:
+            # Update existing dewar
+            existing_dewar_dict[updated_dewar.id].dewar_name = updated_dewar.dewar_name
+            existing_dewar_dict[updated_dewar.id].tracking_number = updated_dewar.tracking_number
+            existing_dewar_dict[updated_dewar.id].number_of_pucks = updated_dewar.number_of_pucks
+            existing_dewar_dict[updated_dewar.id].number_of_samples = updated_dewar.number_of_samples
+            existing_dewar_dict[updated_dewar.id].return_address = updated_dewar.return_address
+            existing_dewar_dict[updated_dewar.id].contact_person = updated_dewar.contact_person
+            existing_dewar_dict[updated_dewar.id].status = updated_dewar.status
+            existing_dewar_dict[updated_dewar.id].ready_date = updated_dewar.ready_date
+            existing_dewar_dict[updated_dewar.id].shipping_date = updated_dewar.shipping_date
+            existing_dewar_dict[updated_dewar.id].arrival_date = updated_dewar.arrival_date
+            existing_dewar_dict[updated_dewar.id].returning_date = updated_dewar.returning_date
+            existing_dewar_dict[updated_dewar.id].qrcode = updated_dewar.qrcode
+        else:
+            # Add new dewar
+            shipment.dewars.append(updated_dewar)
+
+    # Update the shipment's fields
+    shipment.shipment_name = updated_shipment.shipment_name
+    shipment.shipment_date = updated_shipment.shipment_date
+    shipment.shipment_status = updated_shipment.shipment_status
+    shipment.contact_person = updated_shipment.contact_person
+    shipment.proposal_number = updated_shipment.proposal_number
+    shipment.return_address = updated_shipment.return_address
+    shipment.comments = updated_shipment.comments
+
+    logger.info(f"Shipment after update: {shipment}")
+
+    return shipment
+
+
 @app.get("/dewars", response_model=List[Dewar])
 async def get_dewars():
     return dewars
@@ -312,16 +362,13 @@ async def create_dewar(dewar: Dewar) -> Dewar:
 
     return dewar  # Return the newly created dewar
 
+
 @app.delete("/shipments/{shipment_id}/remove_dewar/{dewar_id}", response_model=Shipment)
 async def remove_dewar_from_shipment(shipment_id: str, dewar_id: str):
     """Remove a dewar from a shipment."""
-    # Log parameters
-    logging.info(f"Received request to remove dewar {dewar_id} from shipment {shipment_id}")
-
     # Find the shipment by ID
     shipment = next((sh for sh in shipments if sh.shipment_id == shipment_id), None)
     if not shipment:
-        logging.error(f"Shipment with ID {shipment_id} not found")
         raise HTTPException(status_code=404, detail="Shipment not found")
 
     # Remove the dewar from the shipment
@@ -350,7 +397,6 @@ async def create_shipment(shipment: Shipment):
 # Creation of a new contact
 @app.post("/contacts", response_model=ContactPerson, status_code=status.HTTP_201_CREATED)
 async def create_contact(contact: ContactPerson):
-    logging.info(f"Received contact creation request: {contact}")
     # Check for duplicate contact by email (or other unique fields)
     if any(c.email == contact.email for c in contacts):
         raise HTTPException(
@@ -372,7 +418,6 @@ async def create_contact(contact: ContactPerson):
 # Creation of a return address
 @app.post("/return_addresses", response_model=Address, status_code=status.HTTP_201_CREATED)
 async def create_return_address(address: Address):
-    logging.info(f"Received address creation request: {address}")
     # Check for duplicate address by city
     if any(a.city == address.city for a in return_addresses):
         raise HTTPException(
@@ -388,4 +433,4 @@ async def create_return_address(address: Address):
         address.id = 1 if address.id is None else address.id
 
     return_addresses.append(address)
-    return address
+    return address