Fixed normalisation for expression fields

src/Cloud/Pipeline.php

@@ -35,11 +35,20 @@ public static function fromLegacyConfiguration(array $configuration): DTO\Pipeli
                     $code = $stepConfig['code'] ?? sprintf('step%d', $order);
                     unset($stepConfig['name'], $stepConfig['code']);
 
-                    array_walk_recursive($stepConfig, function (&$value): void {
-                        if ($value instanceof Expression) {
-                            $value = '@='.$value;
+                    array_walk_recursive(
+                        $stepConfig,
+                        function (&$value, $key) {
+                            if ($value instanceof Expression && $key === 'expression') {
+                                $value = (string) $value;
+                            }
+
+                            if ($value instanceof Expression) {
+                                $value = '@=' . $value;
+                            }
+
+                            return $value;
                         }
-                    });
+                    );
 
                     return new DTO\Step(
                         $name,

src/Cloud/Workflow.php

@@ -40,11 +40,20 @@ function (array $config, int $order) {
                             $code = $config['pipeline']['code'] ?? sprintf('pipeline%d', $order);
                             unset($config['pipeline']['name'], $config['pipeline']['code']);
 
-                            array_walk_recursive($config, function (&$value): void {
-                                if ($value instanceof Expression) {
-                                    $value = '@='.$value;
+                            array_walk_recursive(
+                                $config,
+                                function (&$value, $key) {
+                                    if ($value instanceof Expression && $key === 'expression') {
+                                        $value = (string) $value;
+                                    }
+
+                                    if ($value instanceof Expression) {
+                                        $value = '@=' . $value;
+                                    }
+
+                                    return $value;
                                 }
-                            });
+                            );
 
                             return new DTO\Workflow\Pipeline(
                                 $name,
@@ -70,11 +79,20 @@ function (array $config, int $order) {
                             $code = $config['action']['code'] ?? sprintf('action%d', $order);
                             unset($config['action']['name'], $config['action']['code']);
 
-                            array_walk_recursive($config, function (&$value): void {
-                                if ($value instanceof Expression) {
-                                    $value = '@='.$value;
+                            array_walk_recursive(
+                                $config,
+                                function (&$value, $key) {
+                                    if ($value instanceof Expression && $key === 'expression') {
+                                        $value = (string) $value;
+                                    }
+
+                                    if ($value instanceof Expression) {
+                                        $value = '@=' . $value;
+                                    }
+
+                                    return $value;
                                 }
-                            });
+                            );
 
                             $configuration = $config['action'];
                             unset($config['action']);

tests/unit/Cloud/Client/GetWorkflowItem.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace unit\Kiboko\Component\Satellite\Cloud\CLient;
+
+use Gyroscops;
+use Gyroscops\Api\Model\WorkflowRead;
+
+class GetWorkflowItem extends Gyroscops\Api\Client
+{
+    public function getWorkflowItem(string $id, string $fetch = self::FETCH_OBJECT, array $accept = []): WorkflowRead
+    {
+        $workflowRead = new WorkflowRead();
+        $workflowRead->setId($id);
+        $workflowRead->setLabel('Extract data from Akeneo');
+        $workflowRead->setCode('from_akeneo');
+
+        return $workflowRead;
+    }
+}

tests/unit/Cloud/Client/GetWorkflowItemThrowNotFoundException.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace unit\Kiboko\Component\Satellite\Cloud\CLient;
+
+use Gyroscops\Api\Client;
+use Gyroscops\Api\Exception\GetWorkflowItemNotFoundException;
+
+class GetWorkflowItemThrowNotFoundException extends Client
+{
+    public function getWorkflowItem($id, string $fetch = self::FETCH_OBJECT, array $accept = [])
+    {
+        throw new GetWorkflowItemNotFoundException();
+    }
+}

tests/unit/Cloud/DummyContext.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace unit\Kiboko\Component\Satellite\Cloud;
+
+use Kiboko\Component\Satellite\Cloud\ContextInterface;
+use Kiboko\Component\Satellite\Cloud\DTO\OrganizationId;
+use Kiboko\Component\Satellite\Cloud\DTO\WorkspaceId;
+
+final readonly class DummyContext implements ContextInterface
+{
+    public function changeOrganization(OrganizationId $organization): void
+    {
+        // Todo: write this method
+    }
+
+    public function organization(): OrganizationId
+    {
+        return new OrganizationId('93af28a3-c7f9-4392-a013-b4ece257ecf5');
+    }
+
+    public function changeWorkspace(WorkspaceId $workspace): void
+    {
+        // Todo: write this method
+    }
+
+    public function workspace(): WorkspaceId
+    {
+        return new WorkspaceId('eb6ed674-5198-4be2-a8b9-8ef5d5292be4');
+    }
+}