Fix id formatting

Author: chapterjason

src/Turbo/src/Bridge/Mercure/Broadcaster.php

@@ -99,7 +99,9 @@ public function broadcast(object $entity, string $action, array $options): void
                 throw new \InvalidArgumentException(sprintf('Cannot broadcast entity of class "%s": the option "topics" is empty and "id" is missing.', $entityClass));
             }
 
-            $options['topics'] = (array) sprintf(self::TOPIC_PATTERN, rawurlencode($entityClass), rawurlencode(implode('-', (array) $options['id'])));
+            $id = $options['id_formatted'] ?? implode('-', (array) $options['id']);
+
+            $options['topics'] = (array) sprintf(self::TOPIC_PATTERN, rawurlencode($entityClass), rawurlencode($id));
         }
 
         $update = new Update(

src/Turbo/src/Broadcaster/IdAccessor.php

@@ -34,6 +34,7 @@ public function getEntityId(object $entity): ?array
         $entityClass = $entity::class;
 
         if ($this->doctrine && $em = $this->doctrine->getManagerForClass($entityClass)) {
+            // @todo: Not sure how to use the same method like in the BroadcastListener without duplicating the code.
             return $em->getClassMetadata($entityClass)->getIdentifierValues($entity);
         }
 

src/Turbo/src/Broadcaster/TwigBroadcaster.php

@@ -41,6 +41,7 @@ public function broadcast(object $entity, string $action, array $options): void
     {
         if (!isset($options['id']) && null !== $id = $this->idAccessor->getEntityId($entity)) {
             $options['id'] = $id;
+            $options['id_formatted'] = $id;
         }
 
         $class = ClassUtil::getEntityClass($entity);
@@ -63,7 +64,7 @@ public function broadcast(object $entity, string $action, array $options): void
             ->renderBlock($action, [
                 'entity' => $entity,
                 'action' => $action,
-                'id' => implode('-', (array) ($options['id'] ?? [])),
+                'id' => $options['id_formatted'],
             ] + $options);
 
         $this->broadcaster->broadcast($entity, $action, $options);

src/Turbo/src/Doctrine/BroadcastListener.php

@@ -94,9 +94,10 @@ public function postFlush(EventArgs $eventArgs): void
         try {
             foreach ($this->createdEntities as $entity) {
                 $options = $this->createdEntities[$entity];
-                $id = $em->getClassMetadata($entity::class)->getIdentifierValues($entity);
+                $id = $this->getIdentifierValues($em, $entity);
                 foreach ($options as $option) {
                     $option['id'] = $id;
+                    $options['id_formatted'] = $this->formatId($id);
                     $this->broadcaster->broadcast($entity, Broadcast::ACTION_CREATE, $option);
                 }
             }
@@ -147,13 +148,37 @@ private function storeEntitiesToPublish(EntityManagerInterface $em, object $enti
 
         if ($options = $this->broadcastedClasses[$class]) {
             if ('createdEntities' !== $property) {
-                $id = $em->getClassMetadata($class)->getIdentifierValues($entity);
+                $id = $this->getIdentifierValues($em, $entity);
                 foreach ($options as $k => $option) {
                     $options[$k]['id'] = $id;
+                    $options[$k]['id_formatted'] = $this->formatId($id);
                 }
             }
 
             $this->{$property}->attach($entity, $options);
         }
     }
+
+    private function getIdentifierValues(EntityManagerInterface $em, object $entity): array
+    {
+        $class = ClassUtil::getEntityClass($entity);
+
+        $values = $em->getClassMetadata($class)->getIdentifierValues($entity);
+
+        foreach ($values as $key => $value) {
+            if (\is_object($value)) {
+                $values[$key] = $this->getIdentifierValues($em, $value);
+            }
+        }
+
+        return $values;
+    }
+
+    private function formatId(array $id): string
+    {
+        $flatten = [];
+        array_walk_recursive($id, static function ($item) use (&$flatten) { $flatten[] = $item; });
+
+        return implode('-', $flatten);
+    }
 }

src/Turbo/tests/BroadcastTest.php

@@ -111,12 +111,12 @@ public function testBroadcastWithCompositePrimaryKey(): void
 
         // submit first to create the entities
         $client->submitForm('Submit', ['title' => 'product 1']);
-        $this->assertSelectorWillContain('#cartProducts', 'product 1');
+        $this->assertSelectorWillContain('#cart_products', 'product 1');
 
         // submit again to update the quantity
         $client->submitForm('Submit');
-        $this->assertSelectorWillContain('#cartProducts', '2x product 1');
+        $this->assertSelectorWillContain('#cart_products', '2x product 1');
         // this part is from the stream template
-        $this->assertSelectorWillContain('#cartProducts', ', updated)');
+        $this->assertSelectorWillContain('#cart_products', ', updated)');
     }
 }

src/Turbo/tests/app/Kernel.php

@@ -336,7 +336,7 @@ public function cartProducts(Request $request, EntityManagerInterface $doctrine,
                 $doctrine->persist($cartProduct);
                 $doctrine->flush();
             } else {
-                $cartProduct = $doctrine->find(CartProduct::class, [$cartId, $productId]);
+                $cartProduct = $doctrine->find(CartProduct::class, ['cart' => $cartId, 'product' => $productId]);
 
                 if (!$cartProduct) {
                     throw new NotFoundHttpException();

src/Turbo/tests/app/templates/cart_products.html.twig

@@ -3,7 +3,7 @@
 {% block body %}
     <h1>Create Cart, Product and CartProduct, increase quantity on update</h1>
 
-    <div id="cart_products" {{ turbo_stream_listen('App\\Entity\\CartProducts') }}></div>
+    <div id="cart_products" {{ turbo_stream_listen('App\\Entity\\CartProduct') }}></div>
 
     <turbo-frame id="api">
         <form method="post" enctype="application/x-www-form-urlencoded">