Merge branch 'hotfix/sync-publication-types'

ConductionNL · Oct 20, 2024 · e753a29 · e753a29
2 parents b46e6a8 + 364e3dd
commit e753a29
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -16,9 +16,9 @@
 		['name' => 'directory#index', 'url' => '/api/directory', 'verb' => 'GET'],
 		['name' => 'directory#show', 'url' => '/api/directory/{id}', 'verb' => 'GET', 'requirements' => ['path' => '.+']],
 		['name' => 'directory#update', 'url' => '/api/directory', 'verb' => 'POST'],
-		['name' => 'directory#syncPublicationType', 'url' => '/api/directory/copy_pubpication_type', 'verb' => 'POST'], // Should be in directory becouse its public
+		['name' => 'directory#publicationType', 'url' => '/api/directory/publication_types/{id}', 'verb' => 'GET'], // Should be in directory becouse its public
 		// Publication
-		['name' => 'synchronise#synchronise', 'url' => '/api/publication_types/synchronise/{id}', 'verb' => 'POST'],
+		['name' => 'synchronise#synchronise', 'url' => '/api/publication_types/synchronise', 'verb' => 'POST'],
 		// Dashboard
 		['name' => 'dashboard#index', 'url' => '/index', 'verb' => 'GET'],
 		['name' => 'dashboard#page', 'url' => '/', 'verb' => 'GET'],

diff --git a/lib/Service/DirectoryService.php b/lib/Service/DirectoryService.php
@@ -124,6 +124,18 @@ private function getDirectoryFromListing(Listing|array $listing): array
 //			$listing['uuid'], //@todo this breaks stuff when trying to find and update a listing
 			$listing['hash']);
 
+		// Process publication types
+		if (isset($listing['publicationTypes']) && is_array($listing['publicationTypes'])) {
+			foreach ($listing['publicationTypes'] as &$publicationType) {
+				// Convert publicationType to array if it's an object
+				if ($publicationType instanceof \JsonSerializable) {
+					$publicationType = $publicationType->jsonSerialize();
+				}
+
+
+			}
+		}
+
 		// TODO: This should be mapped to the stoplight documentation
 		return $listing;
 	}
@@ -158,6 +170,21 @@ private function getDirectoryFromCatalog(Catalog|array $catalog): array
 		$catalog['search'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("opencatalogi.search.index"));
 		$catalog['directory'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("opencatalogi.directory.index"));
 
+		// Process publication types
+		if (isset($catalog['publicationTypes']) && is_array($catalog['publicationTypes'])) {
+			foreach ($catalog['publicationTypes'] as &$publicationType) {
+				// Convert publicationType to array if it's an object
+				if ($publicationType instanceof \JsonSerializable) {
+					$publicationType = $publicationType->jsonSerialize();
+				}
+				$publicationType['listed'] = true;
+				$publicationType['owner'] = true;
+				if (!isset($publicationType['source']) || empty($publicationType['source'])) {
+					$publicationType['source'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("opencatalogi.directory.publicationType", ['id' => $publicationType['id']]));
+				}
+			}
+		}
+
 		// TODO: This should be mapped to the stoplight documentation
 		return $catalog;
 	}
@@ -200,7 +227,7 @@ public function getDirectories(): array
 		// TODO: Define when a listed item should not be shown (e.g. when secret or trusted is true), this is a product decision
 
 		// Get all the catalogi
-		$catalogi = $this->objectService->getObjects(objectType: 'catalog',  extend: ['publicationTypes','organization']);
+		$catalogi = $this->objectService->getObjects(objectType: 'catalog', extend: ['publicationTypes', 'organization']);
 		$catalogi = array_map([$this, 'getDirectoryFromCatalog'], $catalogi);
 
 		// Filter out the catalogi that are not listed
@@ -406,6 +433,9 @@ public function syncPublicationType(string $url): array
 		if (json_last_error() !== JSON_ERROR_NONE) {
 			throw new \InvalidArgumentException('Invalid JSON data received from the URL');
 		}
+
+		// Set the source to the URL
+		$publicationType['source'] = $url;
 
 		// Check if a publication type with the same name already exists
 		$existingPublicationType = $this->objectService->getObjects(