From f7424493e438ff228a80c65faecd3dc167875d79 Mon Sep 17 00:00:00 2001
From: "gpt-engineer-app[bot]"
 <159125892+gpt-engineer-app[bot]@users.noreply.github.com>
Date: Fri, 17 Oct 2025 16:02:11 +0000
Subject: [PATCH] Fix: Extract correct entity ID for validation

---
 .../moderation/ValidationSummary.tsx          | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/components/moderation/ValidationSummary.tsx b/src/components/moderation/ValidationSummary.tsx
index ac3ab0c0..0a30b0e8 100644
--- a/src/components/moderation/ValidationSummary.tsx
+++ b/src/components/moderation/ValidationSummary.tsx
@@ -23,6 +23,23 @@ export function ValidationSummary({ item, onValidationChange, compact = false, v
   const [isExpanded, setIsExpanded] = useState(false);
   const [manualTriggerCount, setManualTriggerCount] = useState(0);
 
+  // Helper to extract the correct entity ID based on entity type
+  const getEntityId = (itemType: string, itemData: any, fallbackId?: string): string | undefined => {
+    // Try entity-specific ID fields first
+    const entityIdField = `${itemType}_id`;
+    if (itemData[entityIdField]) {
+      return itemData[entityIdField];
+    }
+    
+    // For companies, check company_id
+    if (['manufacturer', 'designer', 'operator', 'property_owner'].includes(itemType) && itemData.company_id) {
+      return itemData.company_id;
+    }
+    
+    // Fall back to generic id field or provided fallback
+    return itemData.id || fallbackId;
+  };
+
   // Create stable reference for item_data to prevent unnecessary re-validations
   const itemDataString = useMemo(
     () => JSON.stringify(item.item_data),
@@ -49,10 +66,13 @@ export function ValidationSummary({ item, onValidationChange, compact = false, v
           return;
         }
         
-        const result = await validateEntityData(
-          item.item_type as ValidEntityType,
-          { ...item.item_data, id: item.item_data.id || item.id }
-        );
+      const result = await validateEntityData(
+        item.item_type as ValidEntityType,
+        { 
+          ...item.item_data, 
+          id: getEntityId(item.item_type, item.item_data, item.id)
+        }
+      );
         
         setValidationResult(result);
         onValidationChange?.(result);