Fixed the long objects' names generation issue and only add 'Imp #' within the same category.

Author: Ruslan Baidan

src/Model/Table/MonarcObjectTable.php

@@ -18,6 +18,7 @@
 use Monarc\Core\Service\ConnectedUserService;
 use Monarc\FrontOffice\Model\Entity\Anr;
 use Monarc\FrontOffice\Model\Entity\MonarcObject;
+use Monarc\FrontOffice\Model\Entity\ObjectCategory;
 
 /**
  * Class MonarcObjectTable
@@ -82,20 +83,27 @@ public function findOneByAnrAssetNameScopeAndCategory(
             ->getOneOrNullResult();
     }
 
-    public function findOneByAnrAndName(
+    public function findOneByAnrCategoryAndName(
         AnrSuperClass $anr,
+        ?ObjectCategory $objectCategory,
         string $nameKey,
         string $nameValue
     ): ?MonarcObject {
-        return $this->getRepository()
+        $queryBuilder = $this->getRepository()
             ->createQueryBuilder('mo')
             ->where('mo.anr = :anr')
             ->andWhere('mo.' . $nameKey . ' = :name')
             ->setParameter('anr', $anr)
             ->setParameter('name', $nameValue)
-            ->setMaxResults(1)
-            ->getQuery()
-            ->getOneOrNullResult();
+            ->setMaxResults(1);
+        if ($objectCategory === null) {
+            $queryBuilder->andWhere('mo.category IS NULL');
+        } else {
+            $queryBuilder->andWhere('mo.category = :category')
+                ->setParameter('category', $objectCategory);
+        }
+
+        return $queryBuilder->getQuery()->getOneOrNullResult();
     }
 
     /**

src/Service/InstanceImportService.php

@@ -2314,8 +2314,8 @@ private function createInstance(
         $instanceData = $data['instance'];
         $instance = (new Instance())
             ->setAnr($anr)
-            ->setLabels($instanceData)
-            ->setNames($instanceData)
+            ->setLabels($monarcObject->getLabels())
+            ->setNames($monarcObject->getNames())
             ->setDisponibility(!empty($instanceData['disponibility']) ? (float)$instanceData['disponibility'] : 0)
             ->setLevel($parentInstance === null ? Instance::LEVEL_ROOT : $instanceData['level'])
             ->setRoot($parentInstance === null ? null : ($parentInstance->getRoot() ?? $parentInstance))

src/Service/ObjectImportService.php

@@ -330,13 +330,18 @@ private function setMonarcObjectName(
         string $nameFiledKey,
         int $index = 1
     ): ObjectSuperClass {
-        $existedObject = $this->monarcObjectTable->findOneByAnrAndName(
+        $existedObject = $this->monarcObjectTable->findOneByAnrCategoryAndName(
             $monarcObject->getAnr(),
+            $monarcObject->getCategory(),
             $nameFiledKey,
             $objectData[$nameFiledKey]
         );
         if ($existedObject !== null) {
-            $objectData[$nameFiledKey] .= ' - Imp. #' . $index;
+            if (strpos($objectData[$nameFiledKey], ' - Imp. #') !== false) {
+                $objectData[$nameFiledKey] = preg_replace('/#\d+/', '#' . $index, $objectData[$nameFiledKey]);
+            } else {
+                $objectData[$nameFiledKey] .= ' - Imp. #' . $index;
+            }
 
             return $this->setMonarcObjectName($monarcObject, $objectData, $nameFiledKey, $index + 1);
         }