Merge pull request #175 from tienvx/use-json-odm

Use json odm
tienvx · Mar 9, 2019 · 66851b1 · 66851b1
2 parents 1a80f8d + ac68237
commit 66851b1
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 60 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,8 @@
         "symfony/process": "^v4.2",
         "symfony/serializer": "^4.2",
         "doctrine/doctrine-bundle": "^1.10",
-        "doctrine/orm": "^2.6"
+        "doctrine/orm": "^2.6",
+        "dunglas/doctrine-json-odm": "^0.1.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.4",

diff --git a/src/Command/ExecuteTaskCommand.php b/src/Command/ExecuteTaskCommand.php
@@ -105,10 +105,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $path = new Path();
         $path->add(null, null, [$workflow->getDefinition()->getInitialPlace()]);
 
-        $metaData = json_decode($task->getMetaData());
-
         try {
-            foreach ($generator->getAvailableTransitions($workflow, $subject, $metaData) as $transitionName) {
+            foreach ($generator->getAvailableTransitions($workflow, $subject, $task->getMetaData()) as $transitionName) {
                 try {
                     if (!$generator->applyTransition($workflow, $subject, $transitionName)) {
                         throw new Exception(sprintf('Generator %s generated transition %s that can not be applied', $task->getGenerator(), $transitionName));

diff --git a/src/Entity/Task.php b/src/Entity/Task.php
@@ -75,11 +75,9 @@ class Task
     private $takeScreenshots = false;
 
     /**
-     * @ORM\Column(type="text")
-     * @Assert\NotBlank
-     * @MbtAssert\Json
+     * @ORM\Column(type="json_document", options={"jsonb": true}, nullable=true)
      */
-    private $metaData = '{}';
+    private $metaData;
 
     /**
      * @var \DateTime
@@ -215,7 +213,7 @@ public function getTakeScreenshots()
         return $this->takeScreenshots;
     }
 
-    public function setMetaData(string $metaData)
+    public function setMetaData($metaData)
     {
         $this->metaData = $metaData;
     }

diff --git a/src/Validator/Constraints/Json.php b/src/Validator/Constraints/Json.php
diff --git a/src/Validator/Constraints/JsonValidator.php b/src/Validator/Constraints/JsonValidator.php
diff --git a/tests/Message/ReplayTaskMessageTest.php b/tests/Message/ReplayTaskMessageTest.php
@@ -63,7 +63,7 @@ public function testConsumeMessage(string $model, string $generator, string $red
         $task->setTitle('Test regression task');
         $task->setModel($model);
         $task->setGenerator($generator);
-        $task->setMetaData(json_encode(['bugId' => $bug->getId()]));
+        $task->setMetaData((object) ['bugId' => $bug->getId()]);
         $task->setReducer($reducer);
         $task->setTakeScreenshots(false);
         $entityManager->persist($task);

diff --git a/tests/app/src/AppKernel.php b/tests/app/src/AppKernel.php
@@ -3,6 +3,7 @@
 namespace App;
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
+use Dunglas\DoctrineJsonOdm\Bundle\DunglasDoctrineJsonOdmBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\MakerBundle\MakerBundle;
 use Symfony\Bundle\MonologBundle\MonologBundle;
@@ -23,6 +24,7 @@ public function registerBundles()
             new DoctrineBundle(),
             new MonologBundle(),
             new MakerBundle(),
+            new DunglasDoctrineJsonOdmBundle(),
             new TienvxMbtBundle(),
         );