From f131572344f175249bdb3ea3e68ae00330ecaaf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 12 Dec 2023 12:01:51 +0100 Subject: [PATCH] Remove references to old async upload bundle --- composer.json | 1 - .../ChillDocStoreExtension.php | 1 - .../Entity/StoredObject.php | 3 +- .../Object/ObjectToAsyncFileTransformer.php | 47 ------------------- .../Object/PersistenceChecker.php | 40 ---------------- .../Tests/StoredObjectManagerTest.php | 10 ++-- .../config/services/media.yaml | 9 ---- 7 files changed, 8 insertions(+), 103 deletions(-) delete mode 100644 src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php delete mode 100644 src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php delete mode 100644 src/Bundle/ChillDocStoreBundle/config/services/media.yaml diff --git a/composer.json b/composer.json index 3195f732b..3a12f5617 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,6 @@ "ext-json": "*", "ext-openssl": "*", "ext-redis": "*", - "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290", "champs-libres/wopi-bundle": "dev-master@dev", "champs-libres/wopi-lib": "dev-master@dev", "doctrine/doctrine-bundle": "^2.1", diff --git a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php index 70c479456..7ae5dcbe1 100644 --- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php +++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php @@ -36,7 +36,6 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config')); $loader->load('services.yaml'); - $loader->load('services/media.yaml'); $loader->load('services/controller.yaml'); $loader->load('services/menu.yaml'); $loader->load('services/fixtures.yaml'); diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php index abccdccc7..e937b2539 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php @@ -11,7 +11,6 @@ declare(strict_types=1); namespace Chill\DocStoreBundle\Entity; -use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface; use Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists; use ChampsLibres\WopiLib\Contract\Entity\Document; use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate; @@ -33,7 +32,7 @@ use Symfony\Component\Serializer\Annotation as Serializer; * message="The file is not stored properly" * ) */ -class StoredObject implements AsyncFileInterface, Document, TrackCreationInterface +class StoredObject implements Document, TrackCreationInterface { use TrackCreationTrait; final public const STATUS_READY = 'ready'; diff --git a/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php b/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php deleted file mode 100644 index 8755b1c61..000000000 --- a/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php +++ /dev/null @@ -1,47 +0,0 @@ -em = $em; - } - - public function toAsyncFile($data) - { - if ($data instanceof StoredObject) { - return $data; - } - } - - public function toData(AsyncFileInterface $asyncFile) - { - $object = $this->em - ->getRepository(StoredObject::class) - ->findByFilename($asyncFile->getObjectName()); - - return $object ?? (new StoredObject()) - ->setFilename($asyncFile->getObjectName()); - } -} diff --git a/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php b/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php deleted file mode 100644 index 97dfdfa92..000000000 --- a/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php +++ /dev/null @@ -1,40 +0,0 @@ -em = $em; - } - - public function isPersisted($object_name): bool - { - $qb = $this->em->createQueryBuilder(); - $qb->select('COUNT(m)') - ->from(StoredObject::class, 'm') - ->where($qb->expr()->eq('m.filename', ':object_name')) - ->setParameter('object_name', $object_name); - - return 1 === $qb->getQuery()->getSingleScalarResult(); - } -} diff --git a/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php index bf659ba9b..226f67118 100644 --- a/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php +++ b/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php @@ -11,7 +11,8 @@ declare(strict_types=1); namespace Chill\DocStoreBundle\Tests; -use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface; +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; @@ -163,8 +164,11 @@ final class StoredObjectManagerTest extends TestCase private function getTempUrlGenerator(StoredObject $storedObject): TempUrlGeneratorInterface { - $response = new \stdClass(); - $response->url = $storedObject->getFilename(); + $response = new SignedUrl( + 'PUT', + 'https://example.com/'.$storedObject->getFilename(), + new \DateTimeImmutable('1 hours') + ); $tempUrlGenerator = $this->createMock(TempUrlGeneratorInterface::class); diff --git a/src/Bundle/ChillDocStoreBundle/config/services/media.yaml b/src/Bundle/ChillDocStoreBundle/config/services/media.yaml deleted file mode 100644 index e6afe2155..000000000 --- a/src/Bundle/ChillDocStoreBundle/config/services/media.yaml +++ /dev/null @@ -1,9 +0,0 @@ -services: - chill_doc_store.persistence_checker: - class: Chill\DocStoreBundle\Object\PersistenceChecker - arguments: - $em: '@Doctrine\ORM\EntityManagerInterface' - - Chill\DocStoreBundle\Object\ObjectToAsyncFileTransformer: - arguments: - $em: '@Doctrine\ORM\EntityManagerInterface'