Merge pull request #1549 from ConductionNL/feature/XZ-163/couple-async

Add new message to the messenger, render stringValue if objectValue has not been set yet
ConductionNL · Sep 15, 2023 · 7f93648 · 7f93648
2 parents d94a549 + ca7baeb
commit 7f93648
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/api/config/packages/messenger.yaml b/api/config/packages/messenger.yaml
@@ -29,4 +29,3 @@ framework:
             'App\Message\ActionMessage': async
             'App\Message\NotificationMessage': async
             'App\Message\SyncPageMessage': async
-            'CommonGateway\CoreBundle\Message\CacheMessage': async
diff --git a/api/config/packages/prod/messenger.yaml b/api/config/packages/prod/messenger.yaml
@@ -0,0 +1,33 @@
+parameters:
+    env(MESSENGER_TRANSPORT_DSN): "amqp://%env(RABBITMQ_USERNAME)%:%env(RABBITMQ_PASSWORD)%@%env(RABBITMQ_HOST)%:%env(RABBITMQ_PORT)%/%2f/messages"
+
+framework:
+    messenger:
+        # Uncomment this (and the failed transport below) to send failed messages to this transport for later handling.
+        failure_transport: failed
+
+        transports:
+            # https://symfony.com/doc/current/messenger.html#transport-configuration
+            async:
+                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
+
+                retry_strategy:
+                    max_retries: 5
+                    delay: 5000
+                    multiplier: 2
+                    max_delay: 300000
+            failed: 'doctrine://default'
+        buses:
+            messenger.bus.default:
+                middleware:
+                    - router_context
+
+
+
+        routing:
+            # Route your messages to the transports
+            'App\Message\ActionMessage': async
+            'App\Message\NotificationMessage': async
+            'App\Message\SyncPageMessage': async
+            'CommonGateway\CoreBundle\Message\CacheMessage': async
+            'CommonGateway\CoreBundle\Message\ValueMessage': async
diff --git a/api/src/Entity/ObjectEntity.php b/api/src/Entity/ObjectEntity.php
@@ -1162,6 +1162,11 @@ public function toArray(array $configuration = []): array
                     $array[$attribute->getName()] = "Attribute {$attribute->getId()->toString()} of type 'object' has not Entity connected through Attribute->object";
                 } elseif ($valueObject->getValue() == null) {
                     $array[$attribute->getName()] = null;
+                    if($valueObject->getStringValue() !== null) {
+                        $array[$attribute->getName()] = $valueObject->getStringValue();
+                    } elseif($valueObject->getArrayValue() !== []) {
+                        $array[$attribute->getName()] = $valueObject->getArrayValue();
+                    }
                 } elseif (!$attribute->getMultiple()) {
                     if (count($valueObject->getObjects()) === 0) {
                         $array[$attribute->getName()][] = null;