fix hardcoded routers

frontend/src/pages/MapDetailsPage/MapDetailPage.tsx

@@ -91,6 +91,13 @@ export default function MapDetailPage() {
   ];
 
   const fetchMapData = useCallback(async (id: string) => {
+    // Validate the ID before making the request
+    if (!id || id === 'undefined' || id === 'null' || id.trim() === '') {
+      setError('Invalid Map ID');
+      setLoading(false);
+      return;
+    }
+
     setIsNavigating(true);
     setLoading(true);
     
@@ -112,7 +119,7 @@ export default function MapDetailPage() {
   }, []);
 
   useEffect(() => {
-    if (!mapId) {
+    if (!mapId || mapId === 'undefined' || mapId === 'null') {
       setError('Map ID is required');
       setLoading(false);
       return;
@@ -177,6 +184,11 @@ export default function MapDetailPage() {
   }, [map, search, srcFilter, catFilter, regionFilter, countryFilter, imageTypeFilter, showReferenceExamples, mapId, navigate, loading, isDeleting]);
 
   const checkNavigationAvailability = async (currentId: string) => {
+    // Validate the ID before making the request
+    if (!currentId || currentId === 'undefined' || currentId === 'null' || currentId.trim() === '') {
+      return;
+    }
+
     try {
       const response = await fetch('/api/images');
       if (response.ok) {

py_backend/app/crud.py

@@ -141,7 +141,7 @@ def get_all_captions_with_images(db: Session):
     return (
         db.query(models.Captions)
         .options(
-            joinedload(models.Captions.images),
+            joinedload(models.Captions.images).joinedload(models.Images.countries),
         )
         .all()
     )

py_backend/app/routers/caption.py

@@ -242,14 +242,8 @@ def get_all_captions_legacy_format(
         # Get the associated image for this caption
         if caption.images:
             for image in caption.images:
-                # Create a response in the old format where caption data is embedded in image
                 from .upload import convert_image_to_dict
-                try:
-                    url = storage.get_object_url(image.file_key)
-                    if url.startswith('/') and settings.STORAGE_PROVIDER == "local":
-                        url = f"http://localhost:8000{url}"
-                except Exception:
-                    url = f"/api/images/{image.image_id}/file"
+                url = f"/api/images/{image.image_id}/file"
                 
                 img_dict = convert_image_to_dict(image, url)
                 

py_backend/app/routers/upload.py

@@ -166,6 +166,16 @@ def list_images(db: Session = Depends(get_db)):
 @router.get("/{image_id}", response_model=schemas.ImageOut)
 def get_image(image_id: str, db: Session = Depends(get_db)):
     """Get a single image by ID"""
+    # Validate image_id before querying database
+    if not image_id or image_id in ['undefined', 'null', '']:
+        raise HTTPException(400, "Invalid image ID")
+    
+    # Validate UUID format
+    import re
+    uuid_pattern = re.compile(r'^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$', re.IGNORECASE)
+    if not uuid_pattern.match(image_id):
+        raise HTTPException(400, "Invalid image ID format")
+    
     img = crud.get_image(db, image_id)
     if not img:
         raise HTTPException(404, "Image not found")