improve code base and add more tests

Author: gaalferov

src/Api/General/Contact.php

@@ -107,7 +107,7 @@ private function updateContact(string $contactIdOrEmail, UpdateContact $contact)
     {
         return $this->handleResponse(
             $this->httpPut(
-                path: $this->getBasePath() . '/' . $contactIdOrEmail,
+                path: $this->getBasePath() . '/' . urlencode($contactIdOrEmail),
                 body: ['contact' => $contact->toArray()]
             )
         );
@@ -122,7 +122,7 @@ private function updateContact(string $contactIdOrEmail, UpdateContact $contact)
     private function deleteContact(string $idOrEmail): ResponseInterface
     {
         return $this->handleResponse(
-            $this->httpDelete($this->getBasePath() . '/' . $idOrEmail)
+            $this->httpDelete($this->getBasePath() . '/' . urlencode($idOrEmail))
         );
     }
 

src/DTO/Request/Contact/UpdateContact.php

@@ -55,12 +55,15 @@ public function getUnsubscribed(): ?bool
 
     public function toArray(): array
     {
-        return [
-            'email' => $this->getEmail(),
-            'fields' => $this->getFields(),
-            'list_ids_included' => $this->getListIdsIncluded(),
-            'list_ids_excluded' => $this->getListIdsExcluded(),
-            'unsubscribed' => $this->getUnsubscribed(),
-        ];
+        return array_filter(
+            [
+                'email'                => $this->getEmail(),
+                'fields'               => $this->getFields(),
+                'list_ids_included'    => $this->getListIdsIncluded(),
+                'list_ids_excluded'    => $this->getListIdsExcluded(),
+                'unsubscribed'         => $this->getUnsubscribed(),
+            ],
+            fn($value) => $value !== null
+        );
     }
 }

tests/Api/General/ContactTest.php

@@ -117,7 +117,7 @@ public function testUpdateContactByEmail(): void
         $this->contact->expects($this->once())
             ->method('httpPut')
             ->with(
-                AbstractApi::DEFAULT_HOST . '/api/accounts/' . self::FAKE_ACCOUNT_ID . '/contacts/' . $contactEmail,
+                AbstractApi::DEFAULT_HOST . '/api/accounts/' . self::FAKE_ACCOUNT_ID . '/contacts/' . urlencode($contactEmail),
                 [],
                 ['contact' => $contactDTO->toArray()]
             )
@@ -132,6 +132,33 @@ public function testUpdateContactByEmail(): void
         $this->assertEquals($contactEmail, $responseData['email']);
     }
 
+    public function testUpdateContactExcludesNullUnsubscribed(): void
+    {
+        $contactEmail = 'test@example.com';
+        $contactDTO = new UpdateContact($contactEmail, ['last_name' => 'Smith'], [3], [1, 2]);
+
+        $this->contact->expects($this->once())
+            ->method('httpPut')
+            ->with(
+                AbstractApi::DEFAULT_HOST . '/api/accounts/' . self::FAKE_ACCOUNT_ID . '/contacts/' . urlencode($contactEmail),
+                [],
+                $this->callback(function (array $payload) {
+                    $this->assertArrayHasKey('contact', $payload);
+                    $this->assertArrayNotHasKey('unsubscribed', $payload['contact']);
+                    return true;
+                })
+            )
+            ->willReturn(
+                new Response(200, ['Content-Type' => 'application/json'], json_encode($this->getExpectedUpdateContactData()))
+            );
+
+        $response = $this->contact->updateContactByEmail($contactEmail, $contactDTO);
+        $responseData = ResponseHelper::toArray($response)['data'];
+
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals('unsubscribed', $responseData['status']);
+    }
+
     public function testDeleteContactById(): void
     {
         $contactId = '019706a8-9612-77be-8586-4f26816b467a';
@@ -151,7 +178,7 @@ public function testDeleteContactByEmail(): void
         $contactEmail = 'test@example.com';
         $this->contact->expects($this->once())
             ->method('httpDelete')
-            ->with(AbstractApi::DEFAULT_HOST . '/api/accounts/' . self::FAKE_ACCOUNT_ID . '/contacts/' . $contactEmail)
+            ->with(AbstractApi::DEFAULT_HOST . '/api/accounts/' . self::FAKE_ACCOUNT_ID . '/contacts/' . urlencode($contactEmail))
             ->willReturn(new Response(204));
 
         $response = $this->contact->deleteContactByEmail($contactEmail);