feat: Use ramsey/uuid for Webhook ID generation, doctrine/dbal remo…

…ved AutoGenerated uuids
roadiz · Jul 24, 2023 · 3b409d3 · 3b409d3
1 parent 3e3c259
commit 3b409d3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -65,6 +65,7 @@
         "pimple/pimple": "^3.3.1",
         "psr/cache": ">=1.0.1",
         "psr/log": ">=1.1",
+        "ramsey/uuid": "^4.7",
         "rezozero/crypto": "^1.0.0",
         "rezozero/intervention-request-bundle": "~3.0.0",
         "rezozero/liform-bundle": "^0.19",

diff --git a/lib/RoadizCoreBundle/composer.json b/lib/RoadizCoreBundle/composer.json
@@ -37,6 +37,7 @@
         "lexik/jwt-authentication-bundle": "^2.19",
         "phpdocumentor/reflection-docblock": "^5.2",
         "phpoffice/phpspreadsheet": "^1.15",
+        "ramsey/uuid": "^4.7",
         "rezozero/crypto": "^1.0.0",
         "rezozero/intervention-request-bundle": "~3.0.0",
         "rezozero/liform-bundle": "^0.19",

diff --git a/lib/RoadizCoreBundle/src/Api/Filter/ArchiveFilter.php b/lib/RoadizCoreBundle/src/Api/Filter/ArchiveFilter.php
@@ -24,7 +24,14 @@ final class ArchiveFilter extends AbstractFilter
      */
     protected function isDateField(string $property, string $resourceClass): bool
     {
-        return isset(DateFilter::DOCTRINE_DATE_TYPES[(string) $this->getDoctrineFieldType($property, $resourceClass)]);
+        $type = $this->getDoctrineFieldType($property, $resourceClass);
+        if (null === $type) {
+            return false;
+        }
+        if (\is_string($type)) {
+            return \in_array($type, \array_keys(DateFilter::DOCTRINE_DATE_TYPES), true);
+        }
+        return $type->getName() === 'datetime' || $type->getName() === 'date';
     }
 
     /**

diff --git a/lib/RoadizCoreBundle/src/Bag/NodeTypes.php b/lib/RoadizCoreBundle/src/Bag/NodeTypes.php
@@ -4,7 +4,6 @@
 
 namespace RZ\Roadiz\CoreBundle\Bag;
 
-use Doctrine\DBAL\DBALException;
 use Doctrine\Persistence\ManagerRegistry;
 use RZ\Roadiz\Bag\LazyParameterBag;
 use RZ\Roadiz\Contracts\NodeType\NodeTypeResolverInterface;
@@ -46,7 +45,7 @@ protected function populateParameters(): void
                 $this->parameters[$nodeType->getName()] = $nodeType;
                 $this->parameters[$nodeType->getSourceEntityFullQualifiedClassName()] = $nodeType;
             }
-        } catch (DBALException $e) {
+        } catch (\Exception $e) {
             $this->parameters = [];
         }
         $this->ready = true;

diff --git a/lib/RoadizCoreBundle/src/Bag/Roles.php b/lib/RoadizCoreBundle/src/Bag/Roles.php
@@ -4,7 +4,6 @@
 
 namespace RZ\Roadiz\CoreBundle\Bag;
 
-use Doctrine\DBAL\DBALException;
 use Doctrine\Persistence\ManagerRegistry;
 use RZ\Roadiz\Bag\LazyParameterBag;
 use RZ\Roadiz\CoreBundle\Entity\Role;
@@ -44,7 +43,7 @@ protected function populateParameters(): void
             foreach ($roles as $role) {
                 $this->parameters[$role->getRole()] = $role;
             }
-        } catch (DBALException $e) {
+        } catch (\Exception $e) {
             $this->parameters = [];
         }
         $this->ready = true;
@@ -57,8 +56,6 @@ protected function populateParameters(): void
      * @param null   $default
      *
      * @return Role
-     * @throws \Doctrine\ORM\ORMException
-     * @throws \Doctrine\ORM\OptimisticLockException
      */
     public function get($key, $default = null): Role
     {

diff --git a/lib/RoadizCoreBundle/src/Bag/Settings.php b/lib/RoadizCoreBundle/src/Bag/Settings.php
@@ -4,7 +4,6 @@
 
 namespace RZ\Roadiz\CoreBundle\Bag;
 
-use Doctrine\DBAL\DBALException;
 use Doctrine\Persistence\ManagerRegistry;
 use RZ\Roadiz\Bag\LazyParameterBag;
 use RZ\Roadiz\CoreBundle\Entity\Document;
@@ -46,7 +45,7 @@ protected function populateParameters(): void
             foreach ($settings as $setting) {
                 $this->parameters[$setting->getName()] = $setting->getValue();
             }
-        } catch (DBALException $e) {
+        } catch (\Exception $e) {
             $this->parameters = [];
         }
         $this->ready = true;

diff --git a/lib/RoadizCoreBundle/src/Entity/Webhook.php b/lib/RoadizCoreBundle/src/Entity/Webhook.php
@@ -28,7 +28,6 @@ class Webhook extends AbstractDateTimed implements WebhookInterface
     #[
         ORM\Id,
         ORM\Column(type:"string", length:36),
-        ORM\GeneratedValue(strategy: "UUID"),
         Serializer\Groups(["id"]),
         SymfonySerializer\Groups(["id"]),
         Serializer\Type("string")
@@ -100,6 +99,11 @@ class Webhook extends AbstractDateTimed implements WebhookInterface
     #[SymfonySerializer\Ignore]
     protected ?Node $rootNode = null;
 
+    public function __construct(?string $uuid = null)
+    {
+        $this->id = $uuid ?? \Ramsey\Uuid\Uuid::uuid4()->toString();
+    }
+
     /**
      * @return string|null
      */

diff --git a/lib/Rozier/src/package.json b/lib/Rozier/src/package.json
@@ -107,6 +107,7 @@
     "postcss-import": "^11.0.0",
     "postcss-loader": "^2.0.8",
     "prettier": "^2.7.1",
+    "ramsey/uuid": "^4.7",
     "resolve-url-loader": "^2.2.0",
     "rimraf": "^2.6.0",
     "sass-loader": "^6.0.6",