From e25c1e1816fda8515639c4929e281635b5dfefa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sun, 15 Dec 2024 22:37:45 +0100
Subject: [PATCH] Refactor object storage to separate local storage and
 openstack storage

---
 .../Driver/OpenstackObjectStore}/StoredObjectManager.php    | 3 ++-
 .../OpenstackObjectStore}/StoredObjectManagerTest.php       | 6 +++---
 .../ChillWopiBundle/src/Controller/ConvertController.php    | 4 ----
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename src/Bundle/ChillDocStoreBundle/{Service => AsyncUpload/Driver/OpenstackObjectStore}/StoredObjectManager.php (98%)
 rename src/Bundle/ChillDocStoreBundle/Tests/{Service => AsyncUpload/Driver/OpenstackObjectStore}/StoredObjectManagerTest.php (98%)

diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php b/src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/OpenstackObjectStore/StoredObjectManager.php
similarity index 98%
rename from src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
rename to src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/OpenstackObjectStore/StoredObjectManager.php
index 098746efa..875a6f4fb 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
+++ b/src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/OpenstackObjectStore/StoredObjectManager.php
@@ -9,13 +9,14 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\DocStoreBundle\Service;
+namespace Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore;
 
 use Base64Url\Base64Url;
 use Chill\DocStoreBundle\AsyncUpload\TempUrlGeneratorInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Entity\StoredObjectVersion;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectManagerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/StoredObjectManagerTest.php
similarity index 98%
rename from src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectManagerTest.php
rename to src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/StoredObjectManagerTest.php
index 39412b9f7..d0cb6cb02 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectManagerTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/StoredObjectManagerTest.php
@@ -9,13 +9,13 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\DocStoreBundle\Tests\Service;
+namespace Chill\DocStoreBundle\Tests\AsyncUpload\Driver\OpenstackObjectStore;
 
+use Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\StoredObjectManager;
 use Chill\DocStoreBundle\AsyncUpload\SignedUrl;
 use Chill\DocStoreBundle\AsyncUpload\TempUrlGeneratorInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
-use Chill\DocStoreBundle\Service\StoredObjectManager;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\Exception\TransportException;
@@ -27,7 +27,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
 /**
  * @internal
  *
- * @covers \Chill\DocStoreBundle\Service\StoredObjectManager
+ * @covers \Chill\DocStoreBundle\AsyncUpload\Driver\OpenstackObjectStore\StoredObjectManager
  */
 final class StoredObjectManagerTest extends TestCase
 {
diff --git a/src/Bundle/ChillWopiBundle/src/Controller/ConvertController.php b/src/Bundle/ChillWopiBundle/src/Controller/ConvertController.php
index 3b97dc6fe..247abfa13 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/ConvertController.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/ConvertController.php
@@ -13,7 +13,6 @@ namespace Chill\WopiBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
-use Chill\DocStoreBundle\Service\StoredObjectManager;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\WopiBundle\Service\WopiConverter;
 use Psr\Log\LoggerInterface;
@@ -26,9 +25,6 @@ class ConvertController
 {
     private const LOG_PREFIX = '[convert] ';
 
-    /**
-     * @param StoredObjectManager $storedObjectManager
-     */
     public function __construct(
         private readonly Security $security,
         private readonly StoredObjectManagerInterface $storedObjectManager,