Fixed the positions update for Amv and Objects compositions.

Author: ruslanbaidan

src/Controller/ApiAnrObjectsObjectsController.php

@@ -55,7 +55,7 @@ public function update($id, $data)
 
         $this->anrObjectObjectService->shiftPositionInComposition(
             $anr,
-            $id,
+            (int)$id,
             $this->movePositionDataInputValidator->getValidData()
         );
 

src/Entity/Amv.php

@@ -76,7 +76,13 @@ class Amv extends AmvSuperClass
 
     public function getImplicitPositionRelationsValues(): array
     {
-        return array_merge(['anr' => $this->anr], parent::getImplicitPositionRelationsValues());
+        return [
+            'anr' => $this->anr,
+            'asset' => [
+                'uuid' => $this->asset->getUuid(),
+                'anr' => $this->anr,
+            ]
+        ];
     }
 
     public function getAnr(): Anr

src/Entity/ObjectObject.php

@@ -54,7 +54,13 @@ class ObjectObject extends ObjectObjectSuperClass
 
     public function getImplicitPositionRelationsValues(): array
     {
-        return array_merge(['anr' => $this->anr], parent::getImplicitPositionRelationsValues());
+        return [
+            'anr' => $this->anr,
+            'parent' => [
+                'uuid' => $this->parent->getUuid(),
+                'anr' => $this->anr,
+            ]
+        ];
     }
 
     public function setAnr(Anr $anr): self

src/Service/AnrObjectObjectService.php

@@ -41,9 +41,9 @@ public function create(Entity\Anr $anr, array $data, bool $saveInDb = true): Ent
         }
 
         /** @var Entity\MonarcObject $parentObject */
-        $parentObject = $this->monarcObjectTable->findByIdAndAnr($data['parent'], $anr);
+        $parentObject = $this->monarcObjectTable->findByUuidAndAnr($data['parent'], $anr);
         /** @var Entity\MonarcObject $childObject */
-        $childObject = $this->monarcObjectTable->findByIdAndAnr($data['child'], $anr);
+        $childObject = $this->monarcObjectTable->findByUuidAndAnr($data['child'], $anr);
         if ($parentObject->hasChild($childObject)) {
             throw new Exception('The object is already presented in the composition.', 412);
         }
@@ -101,9 +101,16 @@ public function shiftPositionInComposition(Entity\Anr $anr, int $id, array $data
         );
         /* Some positions are not aligned in the DB, that's why we may have empty result. */
         if ($previousObjectCompositionLink !== null) {
-            $this->objectObjectTable->save($previousObjectCompositionLink->setPosition($objectObject->getPosition()));
+            $this->objectObjectTable->save(
+                $previousObjectCompositionLink->setPosition($objectObject->getPosition())->setUpdater(
+                    $this->connectedUser->getEmail()
+                ),
+                false
+            );
         }
-        $this->objectObjectTable->save($objectObject->setPosition($positionToBeSet));
+        $this->objectObjectTable->save(
+            $objectObject->setPosition($positionToBeSet)->setUpdater($this->connectedUser->getEmail())
+        );
     }
 
     public function delete(Entity\Anr $anr, int $id): void

src/Service/AnrObjectService.php

@@ -51,7 +51,7 @@ public function getList(FormattedInputParams $formattedInputParams): array
 
     public function getCount(FormattedInputParams $formattedInputParams): int
     {
-        return $this->monarcObjectTable->countByParams($formattedInputParams);
+        return $this->monarcObjectTable->countByParams($formattedInputParams, 'uuid');
     }
 
     public function getObjectData(Entity\Anr $anr, string $uuid, FormattedInputParams $formattedInputParams): array