Handle metadata formats as entities

opencultureconsulting · Jan 6, 2024 · 1e27542 · 1e27542
1 parent 152bc90
commit 1e27542
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Database.php b/src/Database.php
@@ -219,17 +219,17 @@ public function getMetadataFormats(?string $identifier = null): Result
      * Get a single record.
      *
      * @param string $identifier The record identifier
-     * @param string $metadataPrefix The metadata prefix
+     * @param Format $format The metadata format
      *
      * @return ?Record The record or NULL on failure
      */
-    public function getRecord(string $identifier, string $metadataPrefix): ?Record
+    public function getRecord(string $identifier, Format $format): ?Record
     {
         return $this->entityManager->find(
             Record::class,
             [
                 'identifier' => $identifier,
-                'format' => $metadataPrefix
+                'format' => $format
             ]
         );
     }

diff --git a/src/Middleware/GetRecord.php b/src/Middleware/GetRecord.php
@@ -23,6 +23,7 @@
 namespace OCC\OaiPmh2\Middleware;
 
 use OCC\OaiPmh2\Database;
+use OCC\OaiPmh2\Database\Format;
 use OCC\OaiPmh2\Document;
 use OCC\OaiPmh2\Middleware;
 use Psr\Http\Message\ServerRequestInterface;
@@ -46,7 +47,9 @@ class GetRecord extends Middleware
     protected function prepareResponse(ServerRequestInterface $request): void
     {
         $params = $request->getAttributes();
-        $oaiRecord = Database::getInstance()->getRecord($params['identifier'], $params['metadataPrefix']);
+        /** @var Format */
+        $format = Database::getInstance()->getEntityManager()->getReference(Format::class, $params['metadataPrefix']);
+        $oaiRecord = Database::getInstance()->getRecord($params['identifier'], $format);
 
         if (!isset($oaiRecord)) {
             if (Database::getInstance()->idDoesExist($params['identifier'])) {