Typed SA collection now has typed datetime values (ImmutableDatetime)…

…; fix tests
temporalio · Jan 16, 2025 · 912c7e7 · 912c7e7
1 parent 401b621
commit 912c7e7
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 22 deletions.
diff --git a/src/Common/SearchAttributes/SearchAttributeKey/DatetimeValue.php b/src/Common/SearchAttributes/SearchAttributeKey/DatetimeValue.php
@@ -18,8 +18,11 @@ final class DatetimeValue extends SearchAttributeKey
      */
     public function valueSet(string|\DateTimeInterface $value): SearchAttributeUpdate
     {
-        $datetime = \is_string($value) ? new \DateTimeImmutable($value) : $value;
-        return $this->prepareValueSet($datetime->format(\DateTimeInterface::RFC3339));
+        return $this->prepareValueSet(match (true) {
+            \is_string($value) => new \DateTimeImmutable($value),
+            $value instanceof \DateTimeImmutable => $value,
+            default => \DateTimeImmutable::createFromInterface($value),
+        });
     }
 
     public function getType(): ValueType

diff --git a/src/Common/TypedSearchAttributes.php b/src/Common/TypedSearchAttributes.php
@@ -169,20 +169,6 @@ public function offsetGet(string $name): mixed
         return $key === null ? null : $this->collection[$key];
     }
 
-    /**
-     * @return array<non-empty-string, mixed>
-     */
-    public function toArray(): array
-    {
-        $result = [];
-        /** @var SearchAttributeKey $key */
-        foreach ($this as $key => $value) {
-            $result[$key->getName()] = $value;
-        }
-
-        return $result;
-    }
-
     /**
      * @param non-empty-string $name
      */

diff --git a/src/Internal/Transport/Request/UpsertTypedSearchAttributes.php b/src/Internal/Transport/Request/UpsertTypedSearchAttributes.php
@@ -37,7 +37,10 @@ private function prepareSearchAttributes(): array
                 ? [
                     'type' => $attr->type->value,
                     'operation' => 'set',
-                    'value' => $attr->value,
+                    'value' => match (true) {
+                        $attr->value instanceof \DateTimeInterface => $attr->value->format(\DateTimeInterface::RFC3339),
+                        default => $attr->value,
+                    },
                 ]
                 : [
                     'type' => $attr->type->value,

diff --git a/src/Internal/Workflow/ScopeContext.php b/src/Internal/Workflow/ScopeContext.php
@@ -117,6 +117,17 @@ public function rejectConditionGroup(string $conditionGroupId): void
     public function upsertSearchAttributes(array $searchAttributes): void
     {
         $this->request(new UpsertSearchAttributes($searchAttributes), waitResponse: false);
+
+        /** @psalm-suppress UnsupportedPropertyReferenceUsage $sa */
+        $sa = &$this->input->info->searchAttributes;
+        foreach ($searchAttributes as $name => $value) {
+            if ($value === null) {
+                unset($sa[$name]);
+                continue;
+            }
+
+            $sa[$name] = $value;
+        }
     }
 
     public function upsertTypedSearchAttributes(SearchAttributeUpdate ...$updates): void

diff --git a/tests/Acceptance/Extra/Workflow/TypedSearchAttributesTest.php b/tests/Acceptance/Extra/Workflow/TypedSearchAttributesTest.php
@@ -202,7 +202,15 @@ public function handle()
             fn(): bool => $this->exit,
         );
 
-        return Workflow::getInfo()->typedSearchAttributes->toArray();
+        $result = [];
+        /** @var SearchAttributeKey $key */
+        foreach (Workflow::getInfo()->typedSearchAttributes as $key => $value) {
+            $result[$key->getName()] = $value instanceof \DateTimeInterface
+                ? $value->format(\DateTimeInterface::RFC3339)
+                : $value;
+        }
+
+        return $result;
     }
 
     #[Workflow\UpdateMethod]

diff --git a/tests/Functional/ConcurrentWorkflowContextTestCase.php b/tests/Functional/ConcurrentWorkflowContextTestCase.php
@@ -81,7 +81,6 @@ public function testMocks(): void
                     unset($generators[$i]);
                 }
             }
-            // \shuffle($generators); // todo smart events merge
             \array_map(static fn(\Generator $g) => $g->next(), $generators);
 
             $stop or $addWorkflow();
@@ -137,7 +136,7 @@ private function iterateOtherWorkflow(bool $withQuery = true): iterable
                 [0m	[{"command":"InvokeQuery","options":{"runId":"$runId","name":"wakeup"},"payloads":"ChkKFwoIZW5jb2RpbmcSC2JpbmFyeS9udWxs"}] {"taskQueue":"default","tickTime":"2021-01-12T15:25:13.3987564Z"}
                 EVENT;
             yield <<<EVENT
-                [0m	[{"payloads":"ChwKFgoIZW5jb2RpbmcSCmpzb24vcGxhaW4SAltd"}]	{"receive": true}
+                [0m	[{"payloads":"CjUKFgoIZW5jb2RpbmcSCmpzb24vcGxhaW4SGyIyMDIxLTAxLTEyVDE1OjI1OjE4KzAwOjAwIg=="}]	{"receive": true}
                 EVENT;
         }
 

diff --git a/...Unit/Common/TypedSearchAttributesTest.php → .../Common/TypedSearchAttributesTestCase.php b/...Unit/Common/TypedSearchAttributesTest.php → .../Common/TypedSearchAttributesTestCase.php
@@ -8,7 +8,7 @@
 use Temporal\Common\TypedSearchAttributes;
 use PHPUnit\Framework\TestCase;
 
-class TypedSearchAttributesTest extends TestCase
+class TypedSearchAttributesTestCase extends TestCase
 {
     public function testCount(): void
     {
@@ -156,7 +156,7 @@ public function testFromJsonArray(): void
                 'value' => false,
             ],
             'name3' => [
-                'type' => 'int',
+                'type' => 'int64',
                 'value' => 42,
             ],
             'name4' => [
@@ -218,4 +218,22 @@ public function testFromUntypedCollection(): void
         self::assertSame('2021-01-01T00:00:00+00:00', $collection->get(SearchAttributeKey::forDatetime('name7'))->format(DATE_RFC3339));
         self::assertSame(['foo', 'bar'], $collection->get(SearchAttributeKey::forKeywordList('name8')));
     }
+
+    public function testValues()
+    {
+        $collection = TypedSearchAttributes::empty()
+            ->withValue(SearchAttributeKey::forFloat('testFloat'), 1.1)
+            ->withValue(SearchAttributeKey::forInteger('testInt'), -2)
+            ->withValue(SearchAttributeKey::forBool('testBool'), false)
+            ->withValue(SearchAttributeKey::forString('testString'), 'foo')
+            ->withValue(SearchAttributeKey::forKeyword('testKeyword'), 'bar')
+            ->withValue(SearchAttributeKey::forKeywordList('testKeywordList'), ['baz'])
+            ->withValue(
+                SearchAttributeKey::forDatetime('testDatetime'),
+                new \DateTimeImmutable('2019-01-01T00:00:00Z'),
+            );
+
+        self::assertSame(1.1, $collection->offsetGet('testFloat'));
+
+    }
 }
diff --git a/tests/Unit/DTO/WorkflowInfoTestCase.php b/tests/Unit/DTO/WorkflowInfoTestCase.php
@@ -44,6 +44,7 @@ public function testMarshalling(): void
             'ParentWorkflowNamespace' => null,
             'ParentWorkflowExecution' => null,
             'SearchAttributes' => null,
+            'TypedSearchAttributes' => [],
             'Memo' => null,
             'BinaryChecksum' => '',
         ];