diff --git a/src/Controller/OgRepository/Image/SyncAction.php b/src/Controller/OgRepository/Image/SyncAction.php index 0c34fd7..26c2237 100644 --- a/src/Controller/OgRepository/Image/SyncAction.php +++ b/src/Controller/OgRepository/Image/SyncAction.php @@ -28,23 +28,24 @@ class SyncAction extends AbstractOgRepositoryController { $content = $this->createRequest('GET', 'http://' . $input->getIp() . ':8006/ogrepository/v1/images'); - if (!isset($content['output']['REPOSITORY']['images'])) { + if (!isset($content['details']['REPOSITORY']['images'])) { return new JsonResponse(data: 'No images found', status: Response::HTTP_NOT_FOUND); } - $repository = $this->entityManager->getRepository(ImageImageRepository::class); + $imageImageRepositoryRepo = $this->entityManager->getRepository(ImageImageRepository::class); + $imageRepo = $this->entityManager->getRepository(Image::class); - $existingImages = $repository->findBy(['repository' => $input]); + $existingMappings = $imageImageRepositoryRepo->findBy(['repository' => $input]); - $newImageFullsums = array_column($content['output']['REPOSITORY']['images'], 'fullsum'); + $repoImageNames = array_column($content['details']['REPOSITORY']['images'], 'name'); - foreach ($content['output']['REPOSITORY']['images'] as $image) { - $imageImageRepositoryEntity = $repository->findOneBy([ - 'imageFullsum' => $image['fullsum'], - 'repository' => $input + foreach ($content['details']['REPOSITORY']['images'] as $image) { + $imageImageRepositoryEntity = $imageImageRepositoryRepo->findOneBy([ + 'name' => $image['name'], + 'repository' => $input, ]); - $imageEntity = $this->entityManager->getRepository(Image::class)->findOneBy(['name' => $image['name']]); + $imageEntity = $imageRepo->findOneBy(['name' => $image['name']]); if (!$imageEntity) { $imageEntity = new Image(); @@ -58,22 +59,22 @@ class SyncAction extends AbstractOgRepositoryController if (!$imageImageRepositoryEntity) { $imageImageRepositoryEntity = new ImageImageRepository(); + $imageImageRepositoryEntity->setImage($imageEntity); + $imageImageRepositoryEntity->setRepository($input); } $imageImageRepositoryEntity->setName($image['name']); - $imageImageRepositoryEntity->setImageFullsum($image['fullsum']); - $imageImageRepositoryEntity->setDatasize($image['datasize']); + $imageImageRepositoryEntity->setImageFullsum($image['fullsum'] ?? null); + $imageImageRepositoryEntity->setDatasize(isset($image['datasize']) ? (string) $image['datasize'] : null); + $imageImageRepositoryEntity->setSize(isset($image['size']) ? (string) $image['size'] : null); $imageImageRepositoryEntity->setStatus(ImageStatus::SUCCESS); - $imageImageRepositoryEntity->setImage($imageEntity); - $imageImageRepositoryEntity->setRepository($input); $this->entityManager->persist($imageImageRepositoryEntity); - } - foreach ($existingImages as $existingImage) { - if (!in_array($existingImage->getImageFullsum(), $newImageFullsums)) { - $this->entityManager->remove($existingImage); + foreach ($existingMappings as $existingMapping) { + if (!in_array($existingMapping->getName(), $repoImageNames, true)) { + $this->entityManager->remove($existingMapping); } }