Merge remote-tracking branch 'origin/development'

ConductionNL · Aug 22, 2024 · ca4260d · ca4260d
2 parents 7acd049 + 1eee7d4
commit ca4260d
Show file tree

Hide file tree

Showing 64 changed files with 1,870 additions and 759 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -13,7 +13,9 @@
 	<bugs>https://github.com/OpenCatalogi/.github/issues</bugs>
 	<dependencies>
 		<nextcloud min-version="26" max-version="30"/>
-	</dependencies>
+	</dependencies><background-jobs>
+		<job>OCA\OpenCatalogi\Cron\DirectorySync</job>
+	</background-jobs>
 	<navigations>
 		<navigation>
 			<id>opencatalogi</id>

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -21,7 +21,7 @@
 		['name' => 'search#index', 'url' => '/api/search', 'verb' => 'GET'],
 		['name' => 'search#show', 'url' => '/api/search/{id}', 'verb' => 'GET'],
 		['name' => 'directory#page', 'url' => '/directory', 'verb' => 'GET'],
-		['name' => 'directory#add', 'url' => '/api/directory/add', 'verb' => 'POST'],
+		['name' => 'directory#synchronise', 'url' => '/api/directory/{id}/sync', 'verb' => 'GET'],
         ['name' => 'configuration#index', 'url' => '/configuration', 'verb' => 'GET'],
         ['name' => 'configuration#create', 'url' => '/configuration', 'verb' => 'POST'],
 		['name' => 'search#preflighted_cors', 'url' => '/api/{path}', 'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']]

diff --git a/lib/Controller/ConfigurationController.php b/lib/Controller/ConfigurationController.php
@@ -10,18 +10,6 @@
 
 class ConfigurationController extends Controller
 {
-	const TEST_ARRAY = [
-		"5137a1e5-b54d-43ad-abd1-4b5bff5fcd3f" => [
-			"id" => "5137a1e5-b54d-43ad-abd1-4b5bff5fcd3f",
-			"name" => "Configuration one",
-			"summary" => "summary for one"
-		],
-		"7782b511-7034-4d49-a005-e827d5ae603f" => [
-			"id" => "7782b511-7034-4d49-a005-e827d5ae603f",
-			"name" => "Configuration two",
-			"summary" => "summary for two"
-		]
-	];
 
 	public function __construct(
 		$appName,

diff --git a/lib/Controller/DashboardController.php b/lib/Controller/DashboardController.php
@@ -6,21 +6,10 @@
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
+use OCP\AppFramework\Http\ContentSecurityPolicy;
 
 class DashboardController extends Controller
 {
-    const TEST_ARRAY = [
-        "d021c5ff-a254-4114-a1fb-7a18db152270" => [
-            "id" => "d021c5ff-a254-4114-a1fb-7a18db152270",
-            "name" => "Dashboard one",
-            "summary" => "summary for one"
-        ],
-        "79c02b33-78ba-4d65-aabd-ff9aae6654f7" => [
-            "id" => "79c02b33-78ba-4d65-aabd-ff9aae6654f7",
-            "name" => "Dashboard two",
-            "summary" => "summary for two"
-        ]
-    ];
 
     public function __construct($appName, IRequest $request)
     {
@@ -34,11 +23,17 @@ public function __construct($appName, IRequest $request)
     public function page(?string $getParameter)
     {
         try {
-            return new TemplateResponse(
+            $response =new TemplateResponse(
                 $this->appName,
                 'index',
                 []
             );
+
+            $csp = new ContentSecurityPolicy();
+            $csp->addAllowedConnectDomain('*');
+            $response->setContentSecurityPolicy($csp);
+
+            return $response;
         } catch (\Exception $e) {
             return new TemplateResponse(
                 $this->appName,

diff --git a/lib/Controller/DirectoryController.php b/lib/Controller/DirectoryController.php
@@ -15,35 +15,6 @@
 
 class DirectoryController extends Controller
 {
-    const TEST_ARRAY = [
-        "64996753-5109-4396-9f07-17040d7fb137" => [
-            "id" => "64996753-5109-4396-9f07-17040d7fb137",
-			"title" => "Directory test 1",
-			"summary" => "A testing directory",
-			"description" => "A testing directory description",
-			"search" => "string",
-			"metadata" => "string",
-			"status" => "A status",
-			"lastSync" => "string",
-			"default" => "string",
-			"available" => "true"
-
-        ],
-        "0dcb7be0-ce06-4453-9ea7-6d66f67aa4ea" =>[
-            "id" => "0dcb7be0-ce06-4453-9ea7-6d66f67aa4ea",
-			"title" => "Directory test 2",
-			"summary" => "A testing directory",
-			"description" => "A testing directory description",
-			"search" => "string",
-			"metadata" => "string",
-			"status" => "A status",
-			"lastSync" => "string",
-			"default" => "string",
-			"available" => "true"
-
-        ]
-    ];
-
     public function __construct(
 		$appName,
 		IRequest $request,
@@ -213,4 +184,35 @@ public function destroy(string|int $id, ObjectService $objectService): JSONRespo
 		// get post from requests
 		return new JSONResponse($returnData);
 	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function synchronise(string|int $id, DirectoryService $directoryService, ObjectService $objectService): JSONResponse
+	{
+		if($this->config->hasKey($this->appName, 'mongoStorage') === false
+			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
+		) {
+			try {
+				$object = $this->listingMapper->find(id: (int) $id)->jsonSerialize();
+			} catch (DoesNotExistException $exception) {
+				return new JSONResponse(data: ['error' => 'Not Found'], statusCode: 404);
+			}
+		} else {
+			$dbConfig['base_uri'] = $this->config->getValueString(app: $this->appName, key: 'mongodbLocation');
+			$dbConfig['headers']['api-key'] = $this->config->getValueString(app: $this->appName, key: 'mongodbKey');
+			$dbConfig['mongodbCluster'] = $this->config->getValueString(app: $this->appName, key: 'mongodbCluster');
+
+			$filters['_id'] = (string) $id;
+
+			$object = $objectService->findObject(filters: $filters, config: $dbConfig);
+		}
+
+		$url = $object['directory'];
+
+		$directoryService->fetchFromExternalDirectory(url: $url, update: true);
+
+		return new JsonResponse(data: $object, statusCode: 200);
+	}
 }
diff --git a/lib/Controller/MetaDataController.php b/lib/Controller/MetaDataController.php
@@ -11,6 +11,7 @@
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IAppConfig;
 use OCP\IRequest;
+use OCP\IURLGenerator;
 
 class MetaDataController extends Controller
 {
@@ -43,6 +44,7 @@ public function page(?string $getParameter)
     }
 
     /**
+	 * @PublicPage
      * @NoAdminRequired
      * @NoCSRFRequired
      */
@@ -77,6 +79,7 @@ public function index(ObjectService $objectService, SearchService $searchService
 	}
 
 	/**
+	 * @PublicPage
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
@@ -107,13 +110,15 @@ public function show(string|int $id, ObjectService $objectService): JSONResponse
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function create(ObjectService $objectService): JSONResponse
+	public function create(ObjectService $objectService, IURLGenerator $urlGenerator): JSONResponse
 	{
 
 		$data = $this->request->getParams();
 
 		// Remove fields we should never post
 		unset($data['id']);
+
+
 		foreach($data as $key => $value) {
 			if(str_starts_with($key, '_')) {
 				unset($data[$key]);
@@ -123,7 +128,18 @@ public function create(ObjectService $objectService): JSONResponse
 		if($this->config->hasKey($this->appName, 'mongoStorage') === false
 			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
 		) {
-			return new JSONResponse($this->metaDataMapper->createFromArray(object: $data));
+			$object = $this->metaDataMapper->createFromArray(object: $data);
+
+			$id = $object->getId();
+
+			if($object->getSource() === null) {
+				$source = $urlGenerator->getAbsoluteURL($urlGenerator->linkToRoute(routeName:"opencatalogi.metadata.show", arguments: ['id' => $id]));
+				$object->setSource($source);
+				$this->metaDataMapper->update($object);
+			}
+
+
+			return new JSONResponse($object);
 		}
 		$dbConfig['base_uri'] = $this->config->getValueString(app: $this->appName, key: 'mongodbLocation');
 		$dbConfig['headers']['api-key'] = $this->config->getValueString(app: $this->appName, key: 'mongodbKey');
@@ -136,6 +152,14 @@ public function create(ObjectService $objectService): JSONResponse
 			config: $dbConfig
 		);
 
+		if(isset($data['source']) === false || $data['source'] === null) {
+			$returnData['source'] = $urlGenerator->getAbsoluteURL($urlGenerator->linkToRoute(routeName:"opencatalogi.metadata.show", arguments: ['id' => $returnData['id']]));
+			$returnData = $objectService->saveObject(
+				data: $data,
+				config: $dbConfig
+			);
+		}
+
 		// get post from requests
 		return new JSONResponse($returnData);
 	}
@@ -149,7 +173,7 @@ public function update(string|int $id, ObjectService $objectService): JSONRespon
 		$data = $this->request->getParams();
 
 		// Remove fields we should never post
-		unset($data['id']);
+		unset($data['id'],$data['source']);
 		foreach($data as $key => $value) {
 			if(str_starts_with($key, '_')) {
 				unset($data[$key]);

diff --git a/lib/Controller/PublicationsController.php b/lib/Controller/PublicationsController.php
@@ -13,10 +13,13 @@
 use OCA\OpenCatalogi\Service\FileService;
 use OCA\OpenCatalogi\Service\ObjectService;
 use OCA\OpenCatalogi\Service\SearchService;
+use OCA\OpenCatalogi\Service\ValidationService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\OCS\OCSBadRequestException;
+use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\IAppConfig;
 use OCP\IRequest;
 use Symfony\Component\Uid\Uuid;
@@ -458,7 +461,7 @@ public function download(string|int $id, ObjectService $objectService): JSONResp
      * @NoAdminRequired
      * @NoCSRFRequired
      */
-    public function create(ObjectService $objectService, ElasticSearchService $elasticSearchService): JSONResponse
+    public function create(ObjectService $objectService, ElasticSearchService $elasticSearchService, ValidationService $validationService): JSONResponse
     {
 		$data = $this->request->getParams();
 
@@ -470,6 +473,12 @@ public function create(ObjectService $objectService, ElasticSearchService $elast
 			}
 		}
 
+		try {
+			$data = $validationService->validatePublication($data);
+		} catch (OCSBadRequestException|OCSNotFoundException $exception) {
+			return new JSONResponse(data: ['message' => $exception->getMessage()], statusCode: 400);
+		}
+
 		if($this->config->hasKey($this->appName, 'mongoStorage') === false
 			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
 		) {

diff --git a/lib/Controller/ThemesController.php b/lib/Controller/ThemesController.php
@@ -14,19 +14,6 @@
 
 class ThemesController extends Controller
 {
-    const TEST_ARRAY = [
-        "354980e5-c967-4ba5-989b-65c2b0cd2ff4" => [
-            "id" => "354980e5-c967-4ba5-989b-65c2b0cd2ff4",
-            "name" => "Input voor OpenCatalogi",
-            "summary" => "Dit is een selectie van high-value datasets in DCAT-AP 2.0 standaard x"
-        ],
-        "2ab0011e-9b4c-4c50-a50d-a16fc0be0178" => [
-            "id" => "2ab0011e-9b4c-4c50-a50d-a16fc0be0178",
-            "title" => "Publication two",
-            "description" => "summary for two"
-        ]
-    ];
-
     public function __construct
 	(
 		$appName,

diff --git a/lib/Cron/DirectorySync.php b/lib/Cron/DirectorySync.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace OCA\OpenCatalogi\Cron;
+
+use OCA\OpenCatalogi\Service\DirectoryService;
+use OCP\BackgroundJob\TimedJob;
+use OCP\AppFramework\Utility\ITimeFactory;
+
+/**
+ * 
+ * Docs: https://docs.nextcloud.com/server/latest/developer_manual/basics/backgroundjobs.html
+ */
+class DirectorySync extends TimedJob {
+
+    private DirectoryService $directoryService;
+
+    public function __construct(ITimeFactory $time, DirectoryService $directoryService) {
+        parent::__construct($time);
+        $this->directoryService = $directoryService;
+
+        // Run once an hour
+        $this->setInterval(3600);
+
+        // Only run one instance of this job at a time
+        $this->setAllowParallelRuns(false);
+    }
+
+    protected function run($arguments) {
+        $this->directoryService->doCronSync();
+    }
+
+
+}
diff --git a/lib/Db/Listing.php b/lib/Db/Listing.php
@@ -9,29 +9,30 @@
 class Listing extends Entity implements JsonSerializable
 {
 
-	protected ?string $title 	   = null;
-	protected ?string $reference   = null;
-	protected ?string $summary     = null;
-	protected ?string $description = null;
-	protected ?string $search	   = null;
-	protected ?string $directory   = null;
-	protected ?string $metadata    = null;
-	protected ?string $catalogId   = null;
-	protected ?string $status	   = null;
+	protected ?string   $title 	   = null;
+	protected ?string   $summary     = null;
+	protected ?string   $description = null;
+	protected ?string   $search	   = null;
+	protected ?string   $directory   = null;
+	protected ?array $metadata     = null;
+	protected ?string   $catalogId   = null;
+	protected ?string   $status	   = null;
+	protected ?int      $statusCode  = null;
 	protected ?DateTime $lastSync  = null;
-	protected ?bool    $default	   = false;
-	protected ?bool    $available  = false;
-	protected ?string $organisation = null;
+	protected ?bool     $default	   = false;
+	protected ?bool     $available  = false;
+	protected ?string   $organisation = null;
 
 	public function __construct() {
 		$this->addType(fieldName: 'title', type: 'string');
 		$this->addType(fieldName: 'summary', type: 'string');
 		$this->addType(fieldName: 'description', type: 'string');
 		$this->addType(fieldName: 'search', type: 'string');
 		$this->addType(fieldName: 'directory', type: 'string');
-		$this->addType(fieldName: 'metadata', type: 'string');
+		$this->addType(fieldName: 'metadata', type: 'json');
 		$this->addType(fieldName: 'catalogId', type: 'string');
 		$this->addType(fieldName: 'status', type: 'string');
+		$this->addType(fieldName: 'statusCode', type: 'integer');
 		$this->addType(fieldName: 'lastSync', type: 'datetime');
 		$this->addType(fieldName: 'default', type: 'boolean');
 		$this->addType(fieldName: 'available', type: 'boolean');
@@ -51,6 +52,10 @@ public function hydrate(array $object): self
 	{
 		$jsonFields = $this->getJsonFields();
 
+		if(isset($object['metadata']) === false) {
+			$object['metadata'] = [];
+		}
+
 		foreach($object as $key => $value) {
 			if (in_array($key, $jsonFields) === true && $value === []) {
 				$value = null;
@@ -79,6 +84,7 @@ public function jsonSerialize(): array
 			'metadata'	  => $this->metadata,
 			'catalogId'	  => $this->catalogId,
 			'status' 	  => $this->status,
+			'statusCode'  => $this->statusCode,
 			'lastSync' 	  => $this->lastSync?->format('c'),
 			'default' 	  => $this->default,
 			'available'   => $this->available,