Auto stash before merge of "feature/DIMOC-111/missingfields" and "ori…

…gin/feature/DIMOC-244/source-parameter"
ConductionNL · Aug 16, 2024 · 43761a4 · 43761a4
1 parent 23f7cb8
commit 43761a4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/lib/Db/ListingMapper.php b/lib/Db/ListingMapper.php
@@ -131,7 +131,7 @@ public function findAll(?int $limit = null, ?int $offset = null, ?array $filters
                 'o.pki AS organisation_pki'
             )
             ->from('listings', 'l')
-            ->leftJoin('l', 'organizations', 'o', 'l.organisation = o.id')
+			->leftJoin('l', 'organizations', 'o', 'l.organisation = o.id')
             ->setMaxResults($limit)
             ->setFirstResult($offset);
 

diff --git a/lib/Db/Organisation.php b/lib/Db/Organisation.php
@@ -52,7 +52,7 @@ public function hydrate(array $object): self
 
 			try {
 				$this->$method($value);
-			} catch (\Exception $exception) {
+			} catch (\Exception $exception) {}
 		}
 
 		return $this;

diff --git a/lib/Migration/Version6Date20240815105059.php b/lib/Migration/Version6Date20240815105059.php
@@ -61,14 +61,10 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 		$table->addColumn(
 			name: 'metadata',
-			typeName: Types::JSON,
-			options: [
-				'notNull' => false,
-				'default' => 'a:0:{}'
-			]);
+			typeName: Types::JSON)->setNotnull(notnull: false)->setDefault(default:'{}');
 
 		$output->info("Added 'metadata' column as JSON type with a default value of an empty array.");
-		
+
 		return $schema;
 	}
 

diff --git a/lib/Service/DirectoryService.php b/lib/Service/DirectoryService.php
@@ -252,6 +252,8 @@ public function listCatalog (array $catalog): array
 		$listing = $this->getDirectoryEntry(catalogId: $catalogId);
 
 		$listing['title']        = $catalog['title'];
+		$listing['description']  = $catalog['description'];
+		$listing['summary']      = $catalog['summary'];
 		$listing['organisation'] = $catalog['organisation'];
 		$listing['metadata']     = $catalog['metadata'];