correct and dynamic id mapping

Author: reem-atalah

src/administrator/components/com_ccm/src/Helper/MigrationHelper.php

@@ -168,19 +168,20 @@ public static function isSupportedFileType($sourceUrl) {
      * @param mixed $migrationMap The migration map
      * @return mixed The mapped ID or original value if no mapping found
      */
-    public static function mapEntityId($value, $migrationMap) {
+    public static function mapEntityId($value, $migrationMap, $entityType = null) {
         if (empty($value)) {
             return $value;
         }
 
-        foreach ($migrationMap as $entityType => $mappings) {
-            // Check for ID mapping
-            if (isset($mappings['ids']) && isset($mappings['ids'][$value])) {
-                error_log("[MigrationHelper] 🔗 Mapping ID '$value' using entity type '$entityType' → '{$mappings['ids'][$value]}'");
+        if ($entityType && isset($migrationMap[$entityType]['ids'][$value])) {
+            return $migrationMap[$entityType]['ids'][$value];
+        }
+        // fallback: search all types (old behavior, optional)
+        foreach ($migrationMap as $type => $mappings) {
+            if (isset($mappings['ids'][$value])) {
                 return $mappings['ids'][$value];
             }
         }
-        
-        return $value; // Return original value if no mapping found
+        return $value;
     }
 }

src/administrator/components/com_ccm/src/Model/MigrationModel.php

@@ -290,10 +290,11 @@ private function convertCcmToTargetCms($ccmItems, $targetCms, $targetType) {
             $targetItem = [];
             foreach ($targetToCcm as $targetKey => $ccmMap) {
                 if (is_array($ccmMap)) {
-                    $ccmKey = $ccmMap['ccm'] ?? null;
-                    $type   = $ccmMap['type'] ?? null;
-                    $format = $ccmMap['format'] ?? null;
-                    $value  = null;
+                    $ccmKey     = $ccmMap['ccm'] ?? null;
+                    $type       = $ccmMap['type'] ?? null;
+                    $format     = $ccmMap['format'] ?? null;
+                    $entityType = $ccmMap['entityType'] ?? null;
+                    $value      = null;
 
                     if ($ccmKey && isset($ccmItem[$ccmKey])) {
                         $value = $ccmItem[$ccmKey];
@@ -450,21 +451,21 @@ private function convertCcmToTargetCms($ccmItems, $targetCms, $targetType) {
                                         foreach ($value as $arrayValue) {
                                             if (is_numeric($arrayValue) || (is_string($arrayValue) && ctype_digit(trim($arrayValue)))) {
                                                 $numericValue = intval($arrayValue);
-                                                $mappedValue = MigrationHelper::mapEntityId($numericValue, $this->migrationMap);
+                                                $mappedValue = MigrationHelper::mapEntityId($numericValue, $this->migrationMap, $entityType);
                                                 $mappedValues[] = $mappedValue;
                                             }
                                         }
                                         $value = $mappedValues;
                                     }
                                 } elseif (is_numeric($value) || (is_string($value) && ctype_digit(trim($value)))) {
-                                    $mappedValue = MigrationHelper::mapEntityId(intval($value), $this->migrationMap);
+                                    $mappedValue = MigrationHelper::mapEntityId(intval($value), $this->migrationMap, $entityType);
                                     $value = [$mappedValue];
                                 } elseif (is_string($value) && strpos($value, ',') !== false) {
                                     $ids = array_map('trim', explode(',', $value));
                                     $mappedValues = [];
                                     foreach ($ids as $id) {
                                         if (is_numeric($id) || ctype_digit($id)) {
-                                            $mappedValue = MigrationHelper::mapEntityId(intval($id), $this->migrationMap);
+                                            $mappedValue = MigrationHelper::mapEntityId(intval($id), $this->migrationMap, $entityType);
                                             $mappedValues[] = $mappedValue;
                                         }
                                     }
@@ -519,13 +520,13 @@ private function convertCcmToTargetCms($ccmItems, $targetCms, $targetType) {
                                         $value = $value->ID;
                                         error_log("[MigrationModel] Extracted ID from object for id_map: " . $value);
                                     }
-                                    $value = MigrationHelper::mapEntityId($value, $this->migrationMap);
+                                    $value = MigrationHelper::mapEntityId($value, $this->migrationMap, $entityType);
                                 }
                                 break;
                         }
                     } else {
                         if (($type === 'string' || $type === 'integer') && !empty($value)) {
-                            $value = MigrationHelper::mapEntityId($value, $this->migrationMap);
+                            $value = MigrationHelper::mapEntityId($value, $this->migrationMap, $entityType);
                         }
                     }
 

src/administrator/components/com_ccm/src/Schema/joomla-ccm.json

@@ -38,7 +38,8 @@
         "created_by": {
           "ccm": "author",
           "type": "string",
-          "format": "id_map"
+          "format": "id_map",
+          "entityType": "users"
         },
         "created_by_alias": null,
         "modified": {
@@ -75,7 +76,8 @@
           "ccm": "categories",
           "default": 2,
           "type": "string",
-          "format": "id_map"
+          "format": "id_map",
+          "entityType": "categories"
         },
         "tags": {
           "ccm": "tags",