From 3fe870ba718303438b36000d16ebfcb994364bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 15 Sep 2023 14:16:58 +0200
Subject: [PATCH] Dav: refactor WebdavController

---
 .../Controller/WebdavController.php           | 67 +++++++++----------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php b/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php
index dbd4e11ec..8ef4ee71a 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php
@@ -92,24 +92,7 @@ final readonly class WebdavController
             throw new BadRequestHttpException("only 1 and 0 are accepted for Depth header");
         }
 
-        $content = $request->getContent();
-        $xml = new \DOMDocument();
-        $xml->loadXML($content);
-
-        $properties = $this->requestAnalyzer->getRequestedProperties($xml);
-        $requested = array_keys(array_filter($properties, fn ($item) => true === $item));
-
-        if (
-            in_array('lastModified', $requested, true)
-            || in_array('etag', $requested, true)
-        ) {
-            $lastModified = $this->storedObjectManager->getLastModified($storedObject);
-            $etag = $this->storedObjectManager->etag($storedObject);
-
-        }
-        if (in_array('contentLength', $requested, true)) {
-            $length = $this->storedObjectManager->getContentLength($storedObject);
-        }
+        [$properties, $lastModified, $etag, $length] = $this->parseDavRequest($request->getContent(), $storedObject);
 
         $response = new DavResponse(
             $this->engine->render('@ChillDocStore/Webdav/directory_propfind.xml.twig', [
@@ -185,23 +168,7 @@ final readonly class WebdavController
      */
     public function propfindDocument(StoredObject $storedObject, string $access_token, Request $request): Response
     {
-        $content = $request->getContent();
-        $xml = new \DOMDocument();
-        $xml->loadXML($content);
-
-        $properties = $this->requestAnalyzer->getRequestedProperties($xml);
-        $requested = array_keys(array_filter($properties, fn ($item) => true === $item));
-
-        if (
-            in_array('lastModified', $requested, true)
-            || in_array('etag', $requested, true)
-        ) {
-            $lastModified = $this->storedObjectManager->getLastModified($storedObject);
-            $etag = $this->storedObjectManager->etag($storedObject);
-        }
-        if (in_array('contentLength', $requested, true)) {
-            $length = $this->storedObjectManager->getContentLength($storedObject);
-        }
+        [$properties, $lastModified, $etag, $length] = $this->parseDavRequest($request->getContent(), $storedObject);
 
         $response = new DavResponse(
             $this->engine->render(
@@ -235,4 +202,34 @@ final readonly class WebdavController
 
         return (new DavResponse("", Response::HTTP_NO_CONTENT));
     }
+
+    /**
+     * @return array{0: array, 1: DateTimeInterface, 2: string, 3: int} properties, lastModified, etag, length
+     */
+    private function parseDavRequest(string $content, StoredObject $storedObject): array
+    {
+        $xml = new \DOMDocument();
+        $xml->loadXML($content);
+
+        $properties = $this->requestAnalyzer->getRequestedProperties($xml);
+        $requested = array_keys(array_filter($properties, fn ($item) => true === $item));
+
+        if (
+            in_array('lastModified', $requested, true)
+            || in_array('etag', $requested, true)
+        ) {
+            $lastModified = $this->storedObjectManager->getLastModified($storedObject);
+            $etag = $this->storedObjectManager->etag($storedObject);
+        }
+        if (in_array('contentLength', $requested, true)) {
+            $length = $this->storedObjectManager->getContentLength($storedObject);
+        }
+
+        return [
+            $properties,
+            $lastModified ?? null,
+            $etag ?? null,
+            $length ?? null
+        ];
+    }
 }