From 38eb3775f1bf4a78523052913a83419af80b5241 Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Wed, 20 Nov 2024 17:43:42 +0100 Subject: [PATCH] Updated database schema. Removed old versions --- config/api_platform/ImageRepository.yaml | 4 ++-- src/Controller/OgAgent/StatusAction.php | 5 +++++ src/Controller/OgRepository/GetCollectionAction.php | 4 ++-- src/Controller/OgRepository/SyncAction.php | 10 ++++++---- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/config/api_platform/ImageRepository.yaml b/config/api_platform/ImageRepository.yaml index 43010ef..7ff7d33 100644 --- a/config/api_platform/ImageRepository.yaml +++ b/config/api_platform/ImageRepository.yaml @@ -24,8 +24,8 @@ resources: image_ogrepository_sync: shortName: OgRepository Server - class: ApiPlatform\Metadata\Post - method: POST + class: ApiPlatform\Metadata\Get + method: GET input: false uriTemplate: /image-repositories/server/sync controller: App\Controller\OgRepository\SyncAction diff --git a/src/Controller/OgAgent/StatusAction.php b/src/Controller/OgAgent/StatusAction.php index a8f7211..201361d 100644 --- a/src/Controller/OgAgent/StatusAction.php +++ b/src/Controller/OgAgent/StatusAction.php @@ -50,6 +50,11 @@ class StatusAction extends AbstractController if ($client->getStatus() === ClientStatus::LINUX) { $this->getSOStatus($client); } + + return new JsonResponse( + data: ['status' => $client->getStatus()], + status: Response::HTTP_OK + ); } public function getOgLiveStatus (Client $client): JsonResponse diff --git a/src/Controller/OgRepository/GetCollectionAction.php b/src/Controller/OgRepository/GetCollectionAction.php index f99bde0..594385a 100644 --- a/src/Controller/OgRepository/GetCollectionAction.php +++ b/src/Controller/OgRepository/GetCollectionAction.php @@ -21,9 +21,9 @@ class GetCollectionAction extends AbstractOgRepositoryController * @throws RedirectionExceptionInterface * @throws ClientExceptionInterface */ - public function __invoke(ImageRepository $data, HttpClientInterface $httpClient): JsonResponse + public function __invoke(ImageRepository $data): JsonResponse { - $content = $this->createRequest($httpClient, 'GET', 'http://'.$data->getIp(). '/ogrepository/v1/images'); + $content = $this->createRequest('GET', 'http://'.$data->getIp(). ':8006/ogrepository/v1/images'); return new JsonResponse( data: $content, status: Response::HTTP_OK); } diff --git a/src/Controller/OgRepository/SyncAction.php b/src/Controller/OgRepository/SyncAction.php index 957c939..4fb4da5 100644 --- a/src/Controller/OgRepository/SyncAction.php +++ b/src/Controller/OgRepository/SyncAction.php @@ -4,7 +4,7 @@ namespace App\Controller\OgRepository; use App\Entity\Image; use App\Entity\ImageRepository; -use Doctrine\ORM\EntityManagerInterface; +use App\Model\ImageStatus; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Attribute\AsController; @@ -12,7 +12,6 @@ use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface; use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface; use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface; use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface; -use Symfony\Contracts\HttpClient\HttpClientInterface; #[AsController] class SyncAction extends AbstractOgRepositoryController @@ -23,9 +22,9 @@ class SyncAction extends AbstractOgRepositoryController * @throws RedirectionExceptionInterface * @throws ClientExceptionInterface */ - public function __invoke(ImageRepository $data, HttpClientInterface $httpClient, EntityManagerInterface $entityManager): JsonResponse + public function __invoke(ImageRepository $data): JsonResponse { - $content = $this->createRequest($httpClient, 'GET', 'http://'.$data->getIp(). '/ogrepository/v1/images'); + $content = $this->createRequest('GET', 'http://'.$data->getIp(). ':8006/ogrepository/v1/images'); if (!isset($content['output']['REPOSITORY']['images'])) { return new JsonResponse(data: 'No images found', status: Response::HTTP_NOT_FOUND); @@ -36,6 +35,9 @@ class SyncAction extends AbstractOgRepositoryController if (!$imageEntity) { $imageEntity = new Image(); $imageEntity->setName($image['name'].$image['type']); + $imageEntity->setStatus(ImageStatus::SUCCESS); + $imageEntity->setRepository($data); + $imageEntity->setCreated(true ); $imageEntity->setImageFullsum($image['fullsum']); $imageEntity->setRemotePc(false); }