Media versioning

Milliner/src/Controller/MillinerController.php

@@ -166,12 +166,55 @@ public function saveExternal($uuid, Request $request)
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function createVersion($uuid, Request $request)
+    public function createNodeVersion($uuid, Request $request)
     {
         $token = $request->headers->get("Authorization", null);
         try {
+            $this->log->info("in create Node version with " . $uuid);
+            $urls = $this->milliner->getGeminiUrls($uuid, $token);
+            $this->log->info($urls);
+            $this->log->info("fedora url is " . $urls['fedora']);
+            if (!empty($urls)) {
+                $fedora_url = $urls['fedora'];
+                $response = $this->milliner->createVersion(
+                    $fedora_url,
+                    $token
+                );
+                return new Response(
+                    $response->getBody(),
+                    $response->getStatusCode()
+                );
+            } else {
+                return new Response(404);
+            }
+        } catch (\Exception $e) {
+            $this->log->error("", ['Exception' => $e]);
+            $code = $e->getCode() == 0 ? 500 : $e->getCode();
+            return new Response($e->getMessage(), $code);
+        }
+    }
+
+    /**
+     * @param string $source_field
+     * @param \Symfony\Component\HttpFoundation\Request $request
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function createMediaVersion($source_field, Request $request)
+    {
+        $token = $request->headers->get("Authorization", null);
+        $json_url = $request->headers->get("Content-Location");
+
+        if (empty($json_url)) {
+            $this->log->info("json url is EMPTY");
+            return new Response("Expected JSON url in Content-Location header", 400);
+        } else {
+            $this->log->info("json url is" . $json_url);
+        }
+        try {
+            $urls = $this->milliner->getFileFromMedia($source_field, $json_url, $token);
+            $fedora_file_url = $urls['fedora'];
             $response = $this->milliner->createVersion(
-                $uuid,
+                $fedora_file_url,
                 $token
             );
             return new Response(

Milliner/src/Service/MillinerService.php

@@ -194,6 +194,7 @@ protected function updateNode(
         $fedora_url,
         $token = null
     ) {
+
         // Get the RDF from Fedora.
         $headers = empty($token) ? [] : ['Authorization' => $token];
         $headers['Accept'] = 'application/ld+json';
@@ -375,38 +376,10 @@ public function saveMedia(
         $json_url,
         $token = null
     ) {
-        // First get the media json from Drupal.
         $headers = empty($token) ? [] : ['Authorization' => $token];
-        $drupal_response = $this->drupal->get(
-            $json_url,
-            ['headers' => $headers]
-        );
-
-        $jsonld_url = $this->getLinkHeader($drupal_response, "alternate", "application/ld+json");
-
-        $media_json = json_decode(
-            $drupal_response->getBody(),
-            true
-        );
-
-        if (!isset($media_json[$source_field]) || empty($media_json[$source_field])) {
-            throw new \RuntimeException(
-                "Cannot parse file UUID from $json_url.  Ensure $source_field exists on the media and is populated.",
-                500
-            );
-        }
-        $file_uuid = $media_json[$source_field][0]['target_uuid'];
-
-        // Get the file's LDP-NR counterpart in Fedora.
-        $urls = $this->gemini->getUrls($file_uuid, $token);
-        if (empty($urls)) {
-            $file_url = $media_json[$source_field][0]['url'];
-            throw new \RuntimeException(
-                "$file_url has not been mapped in Gemini with uuid $file_uuid",
-                404
-            );
-        }
+        $urls = $this->getFileFromMedia($source_field, $json_url, $token);
         $fedora_file_url = $urls['fedora'];
+        $jsonld_url = $urls['jsonld'];
 
         // Now look for the 'describedby' link header on the file in Fedora.
         // I'm using the drupal http client because I have the full
@@ -554,39 +527,86 @@ public function saveExternal(
      * {@inheritDoc}
      */
     public function createVersion(
-        $uuid,
+        $fedora_url,
         $token = null
     ) {
-        $urls = $this->gemini->getUrls($uuid, $token);
-        if (!empty($urls)) {
-            $fedora_url = $urls['fedora'];
-            $headers = empty($token) ? [] : ['Authorization' => $token];
-            $date = new DateTime();
-            $timestamp = $date->format("D, d M Y H:i:s O");
-            // create version in Fedora.
-            try {
-                $response = $this->fedora->createVersion(
-                    $fedora_url,
-                    $timestamp,
-                    null,
-                    $headers
+        $this->log->error("the fedora url in service is " . $fedora_url);
+        $headers = empty($token) ? [] : ['Authorization' => $token];
+        $date = new DateTime();
+        $timestamp = $date->format("D, d M Y H:i:s O");
+        // create version in Fedora.
+        try {
+            $response = $this->fedora->createVersion(
+                $fedora_url,
+                $timestamp,
+                null,
+                $headers
+            );
+            $status = $response->getStatusCode();
+            if (!in_array($status, [201])) {
+                $reason = $response->getReasonPhrase();
+                throw new \RuntimeException(
+                    "Client error: `POST $fedora_url` resulted in `$status $reason` response: " .
+                    $response->getBody(),
+                    $status
                 );
-                $status = $response->getStatusCode();
-                if (!in_array($status, [201])) {
-                    $reason = $response->getReasonPhrase();
-                    throw new \RuntimeException(
-                        "Client error: `POST $fedora_url` resulted in `$status $reason` response: " .
-                        $response->getBody(),
-                        $status
-                    );
-                }
-                // Return the response from Fedora.
-                return $response;
-            } catch (Exception $e) {
-                $this->log->error('Caught exception when creating version: ', $e->getMessage(), "\n");
             }
-        } else {
-            return new Response(404);
+            // Return the response from Fedora.
+            return $response;
+        } catch (Exception $e) {
+            $this->log->error('Caught exception when creating version: ', $e->getMessage(), "\n");
         }
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getFileFromMedia(
+        $source_field,
+        $json_url,
+        $token = null
+    ) {
+        // First get the media json from Drupal.
+        $headers = empty($token) ? [] : ['Authorization' => $token];
+        $drupal_response = $this->drupal->get(
+            $json_url,
+            ['headers' => $headers]
+        );
+
+        $jsonld_url = $this->getLinkHeader($drupal_response, "alternate", "application/ld+json");
+        $media_json = json_decode(
+            $drupal_response->getBody(),
+            true
+        );
+
+        if (!isset($media_json[$source_field]) || empty($media_json[$source_field])) {
+            throw new \RuntimeException(
+                "Cannot parse file UUID from $json_url.  Ensure $source_field exists on the media and is populated.",
+                500
+            );
+        }
+        $file_uuid = $media_json[$source_field][0]['target_uuid'];
+
+        // Get the file's LDP-NR counterpart in Fedora.
+        $urls = $this->gemini->getUrls($file_uuid, $token);
+        if (empty($urls)) {
+            $file_url = $media_json[$source_field][0]['url'];
+            throw new \RuntimeException(
+                "$file_url has not been mapped in Gemini with uuid $file_uuid",
+                404
+            );
+        }
+        return array('fedora'=>$urls['fedora'], 'jsonld' =>$jsonld_url, 'drupal'=>$urls['drupal']);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getGeminiUrls(
+        $uuid,
+        $token = null
+    ) {
+        $urls = $this->gemini->getUrls($uuid, $token);
+        return $urls;
+    }
 }

Milliner/src/Service/MillinerServiceInterface.php

@@ -71,14 +71,42 @@ public function saveExternal(
     );
 
     /**
-     * @param $uuid
+     * @param $fedora_url
      * @param $token
      *
      * @throws \Exception
      *
      * @return \GuzzleHttp\Psr7\Response
      */
     public function createVersion(
+        $fedora_url,
+        $token = null
+    );
+
+    /**
+     * @param $json_url
+     * @param $jsonld_url
+     * @param $token
+     *
+     * @throws \Exception
+     *
+     * @return array
+     */
+    public function getFileFromMedia(
+        $source_field,
+        $json_url,
+        $token = null
+    );
+
+        /**
+     * @param $uuid
+     * @param $token
+     *
+     * @throws \Exception
+     *
+     * @return array
+     */
+    public function getGeminiUrls(
         $uuid,
         $token = null
     );

Milliner/src/app.php

@@ -47,8 +47,9 @@
 
 $app->post('/node/{uuid}', "milliner.controller:saveNode");
 $app->delete('/node/{uuid}', "milliner.controller:deleteNode");
+$app->post('/node/{uuid}/version', "milliner.controller:createNodeVersion");
 $app->post('/media/{source_field}', "milliner.controller:saveMedia");
+$app->post('/media/{source_field}/version', 'milliner.controller:createMediaVersion');
 $app->post('/external/{uuid}', "milliner.controller:saveExternal");
-$app->post('/version/{uuid}', "milliner.controller:createVersion");
 
 return $app;

Milliner/tests/Islandora/Milliner/Tests/CreateVersionTest.php

@@ -88,7 +88,7 @@ public function testCreateVersionReturnsFedora201()
         );
 
         $response = $milliner->createVersion(
-            "9541c0c1-5bee-4973-a9d0-e55c1658bc81",
+            $mapping['fedora'],
             "Bearer islandora"
         );
 
@@ -145,7 +145,7 @@ public function testCreateVersionReturnsFedora404()
         );
 
         $response = $milliner->createVersion(
-            "9541c0c1-5bee-4973-a9d0-9998",
+            $mapping['fedora'],
             "Bearer islandora"
         );
 
@@ -206,7 +206,7 @@ public function testcreateVersionThrowsOnFedoraSaveError()
         );
 
         $response = $milliner->createVersion(
-            "9541c0c1-5bee-4973-a9d0-e55c1658bc81",
+            $mapping['fedora'],
             "Bearer islandora"
         );
 
@@ -216,57 +216,4 @@ public function testcreateVersionThrowsOnFedoraSaveError()
             "Milliner must return 403 when Fedora returns 403.  Received: $status"
         );
     }
-
-    /**
-     * @covers ::__construct
-     * @covers ::createVersion
-     * @expectedExceptionCode 404
-     */
-
-    public function testCreateVersionReturns404IfNotInGemini()
-    {
-        $mapping = [];
-        $gemini = $this->prophesize(GeminiClient::class);
-        $gemini->getUrls(Argument::any(), Argument::any())
-            ->willReturn($mapping);
-        $gemini->saveUrls(Argument::any(), Argument::any(), Argument::any(), Argument::any())
-            ->willReturn(true);
-        $gemini = $gemini->reveal();
-
-        $drupal_response = new Response(
-            200,
-            ['Content-Type' => 'application/ld+json'],
-            file_get_contents(__DIR__ . '/../../../../static/Content.jsonld')
-        );
-        $drupal = $this->prophesize(Client::class);
-        $drupal->get(Argument::any(), Argument::any())
-            ->willReturn($drupal_response);
-        $drupal = $drupal->reveal();
-
-        $fedora_response = new Response(404);
-        $fedora = $this->prophesize(IFedoraApi::class);
-        $fedora->createVersion(Argument::any(), Argument::any(), Argument::any(), Argument::any())
-            ->willReturn($fedora_response);
-        $fedora = $fedora->reveal();
-
-        $milliner = new MillinerService(
-            $fedora,
-            $drupal,
-            $gemini,
-            $this->logger,
-            $this->modifiedDatePredicate,
-            false
-        );
-
-        $response = $milliner->createVersion(
-            "9541c0c1-5bee-4973-a9d0-9998",
-            "Bearer islandora"
-        );
-
-        $status = $response->getStatusCode();
-        $this->assertTrue(
-            $status == 404,
-            "Milliner must return 404 when not in Gemini.  Received: $status"
-        );
-    }
 }