Merge pull request #21 from leolll/main

Fix Contact 'email' property filtered due to 'Emails' HubSpot type

Author: jszobody

src/Api/Model.php

@@ -82,7 +82,7 @@ public function fill(array $properties): static
 
         $properties = array_filter(
             $properties,
-            static fn (string $key): bool => !(HubSpot::isType($key) || HubSpot::isType(Str::plural($key))),
+            fn (string $key): bool => $this->isAllowedProperty($key),
             ARRAY_FILTER_USE_KEY
         );
 
@@ -91,6 +91,12 @@ public function fill(array $properties): static
         return $this;
     }
 
+    private function isAllowedProperty(string $key): bool
+    {
+        return $key === 'email' || 
+               !(HubSpot::isType($key) || HubSpot::isType(Str::plural($key)));
+    }
+
     public function type(): string
     {
         return $this->type;
@@ -250,10 +256,9 @@ public function __get($key)
 
     public function __set($key, $value)
     {
-        if (HubSpot::isType($key) || HubSpot::isType(Str::plural($key))) {
-            return;
+        if ($this->isAllowedProperty($key)) {
+            $this->properties[$key] = $value;
         }
-        $this->properties[$key] = $value;
     }
 
     public function __isset($key)

tests/Unit/Api/ModelTest.php

@@ -42,13 +42,20 @@ public function fill(array $properties): static
     $this->addToAssertionCount(1);
 });
 
-test('fill does not fill hubspot types', function (string $type) {
+test('fill does not fill hubspot types except email', function (string $type) {
     $baseData = ['test_name' => $this->getName()];
     $model = (new class extends AbstractApiModel {
     })->fill([$type => sha1(random_bytes(11)), ...$baseData]);
 
     $properties = new ReflectionProperty($model, 'properties');
-    expect($properties->getValue($model))->toBe($baseData);
+    if ($type === 'email') {
+        expect($properties->getValue($model))
+            ->toBeArray()
+            ->toHaveKey('email')
+            ->toHaveKey('test_name');
+    } else {
+        expect($properties->getValue($model))->toBe($baseData);
+    }
 })->with('SdkTypes-both');
 
 test('update calls fill & save', function () {
@@ -104,11 +111,16 @@ protected function assertBacktraceIsUpdate(): void
 
     $model->$propName = $propValue;
 
-    expect($attributes->getValue($model))
-        ->toBeArray()
-        ->toBeEmpty();
-})
-    ->with('SdkTypes-both');
+    if ($propName === 'email') {
+        expect($attributes->getValue($model))
+            ->toBeArray()
+            ->toHaveKey('email', $propValue);
+    } else {
+        expect($attributes->getValue($model))
+            ->toBeArray()
+            ->toBeEmpty();
+    }
+})->with('SdkTypes-both');
 
 test('builder returns api builder', function () {
     $model = new class extends AbstractApiModel {