opengnsys
/
ogcore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #1472. Changes in images and imageRepo
testing/ogcore-api/pipeline/head This commit looks good Details

hotfix-timeout
Manuel Aranda Rosales 2025-02-13 07:45:57 +01:00
parent c381b32d09
commit acf772f139
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controller/OgRepository/Image/TransferAction.php
View File

@ -61,6 +61,7 @@ class TransferAction extends AbstractOgRepositoryController
$inputData = [ $inputData = [
'imageName' => $image->getName(), 'imageName' => $image->getName(),
'imageUuid' => $image->getUuid(), 'imageUuid' => $image->getUuid(),
'imageImageRepositoryUuid' => $imageImageRepository->getUuid(),
'repositoryUuid' => $repository->getUuid(), 'repositoryUuid' => $repository->getUuid(),
]; ];

18
src/Controller/OgRepository/Webhook/ResponseController.php
View File

@ -86,13 +86,10 @@ class ResponseController extends AbstractOgRepositoryController
{ {
$trace = $this->entityManager->getRepository(Trace::class)->findOneBy(['jobId' => $data['job_id']]); $trace = $this->entityManager->getRepository(Trace::class)->findOneBy(['jobId' => $data['job_id']]);
$imageUuid = $trace->getInput()['imageUuid']; $imageUuid = $trace->getInput()['imageUuid'];
$imageImageRepository = $trace->getInput()['imageImageRepositoryUuid'];
$repositoryUuid = $trace->getInput()['repositoryUuid']; $repositoryUuid = $trace->getInput()['repositoryUuid'];
$imageImageRepository = $this->entityManager->getRepository(ImageImageRepository::class)->findOneBy(['uuid' => $imageUuid]); $image = $this->entityManager->getRepository(Image::class)->findOneBy(['uuid' => $imageUuid]);
/** @var Image $image */
$image = $imageImageRepository->getImage();
$repository = $this->entityManager->getRepository(ImageRepository::class)->findOneBy(['uuid' => $repositoryUuid]); $repository = $this->entityManager->getRepository(ImageRepository::class)->findOneBy(['uuid' => $repositoryUuid]);
if ($image === null) { if ($image === null) {
@ -102,9 +99,16 @@ class ResponseController extends AbstractOgRepositoryController
$this->logger->info("Image $actionType successful", ['image' => $image->getName()]); $this->logger->info("Image $actionType successful", ['image' => $image->getName()]);
$imageImageRepository->setRepository($repository); // Creamos un objeto imagen nuevo, en el repositorio destino
$newImageImageRepository = new ImageImageRepository();
$newImageImageRepository->setImage($image);
$newImageImageRepository->setRepository($repository);
$newImageImageRepository->setStatus(ImageStatus::SUCCESS);
// Cambiamos el estado de la imagen anterior a SUCCESS
$imageImageRepository->setStatus(ImageStatus::SUCCESS); $imageImageRepository->setStatus(ImageStatus::SUCCESS);
$this->entityManager->persist($imageImageRepository); $this->entityManager->persist($newImageImageRepository);
$this->entityManager->persist($image);
$this->updateTraceStatus($trace, TraceStatus::SUCCESS); $this->updateTraceStatus($trace, TraceStatus::SUCCESS);
} }