[People] People API Improvements for Developers (#23)

Co-authored-by: onairmarc <[email protected]>
EncoreDigitalGroup · Nov 28, 2024 · 813d493 · 813d493
1 parent a0c3b91
commit 813d493
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -3,3 +3,4 @@
 c98bbfd28bd7b34f22ade287046434127a6e200c
 de929a45798d68147fec3ab9527979a5e5f0fce1
 c90d7383de6e86260b6cc997b3d0af8e64826a11
+baa146cd798ade580c6a6f4f2cbf98d5b72cc19f
diff --git a/src/Objects/People/Email.php b/src/Objects/People/Email.php
@@ -42,7 +42,7 @@ public function get(): ClientResponse
     public function forPerson(): ClientResponse
     {
         $http = $this->client()
-            ->get($this->hostname() . Person::PEOPLE_ENDPOINT . "/" . $this->attributes->personId . "/emails");
+            ->get($this->hostname() . Person::PEOPLE_ENDPOINT . "/{$this->attributes->personId}/emails");
 
         $clientResponse = new ClientResponse($http);
 
@@ -58,7 +58,7 @@ public function forPerson(): ClientResponse
     public function update(): ClientResponse
     {
         $http = $this->client()
-            ->patch($this->hostname() . self::EMAIL_ENDPOINT . "/" . $this->attributes->emailAddressId, $this->mapToPco());
+            ->patch($this->hostname() . self::EMAIL_ENDPOINT . "/{$this->attributes->emailAddressId}", $this->mapToPco());
 
         return $this->processResponse($http);
     }

diff --git a/src/Objects/People/Person.php b/src/Objects/People/Person.php
@@ -32,6 +32,13 @@ public static function make(?string $clientId = null, ?string $clientSecret = nu
         return $person;
     }
 
+    public function forPersonId(string $personId): static
+    {
+        $this->attributes->personId = $personId;
+
+        return $this;
+    }
+
     public function all(?array $query = null): ClientResponse
     {
         $http = $this->client()
@@ -51,7 +58,7 @@ public function all(?array $query = null): ClientResponse
     public function get(?array $query = null): ClientResponse
     {
         $http = $this->client()
-            ->get($this->hostname() . self::PEOPLE_ENDPOINT . "/" . $this->attributes->personId, $query);
+            ->get($this->hostname() . self::PEOPLE_ENDPOINT . "/{$this->attributes->personId}", $query);
 
         return $this->processResponse($http);
     }
@@ -67,15 +74,15 @@ public function create(): ClientResponse
     public function update(): ClientResponse
     {
         $http = $this->client()
-            ->patch($this->hostname() . self::PEOPLE_ENDPOINT . "/" . $this->attributes->personId, $this->mapToPco());
+            ->patch($this->hostname() . self::PEOPLE_ENDPOINT . "/{$this->attributes->personId}", $this->mapToPco());
 
         return $this->processResponse($http);
     }
 
     public function delete(): ClientResponse
     {
         $http = $this->client()
-            ->delete($this->hostname() . self::PEOPLE_ENDPOINT . "/" . $this->attributes->personId);
+            ->delete($this->hostname() . self::PEOPLE_ENDPOINT . "/{$this->attributes->personId}");
 
         return $this->processResponse($http);
     }

diff --git a/src/Objects/People/PersonMerger/PersonMerger.php b/src/Objects/People/PersonMerger/PersonMerger.php
@@ -29,10 +29,17 @@ public static function make(string $clientId, string $clientSecret): PersonMerge
         return $personMerger;
     }
 
+    public function forPersonId(string $personId): static
+    {
+        $this->attributes->personMergerId = $personId;
+
+        return $this;
+    }
+
     public function get(?array $query = []): ClientResponse
     {
         $http = $this->client()
-            ->get($this->hostname() . self::PERSON_MERGER_ENDPOINT . "/" . $this->attributes->personMergerId, $query);
+            ->get($this->hostname() . self::PERSON_MERGER_ENDPOINT . "/{$this->attributes->personMergerId}", $query);
 
         return $this->processResponse($http);
     }

diff --git a/src/Traits/HasPlanningCenterClient.php b/src/Traits/HasPlanningCenterClient.php
@@ -26,7 +26,7 @@ public function __construct(?string $clientId = null, ?string $clientSecret = nu
         $this->clientId = $clientId ?? "";
         $this->clientSecret = $clientSecret ?? "";
 
-        $builder = new HttpClientBuilder;
+        new HttpClientBuilder;
     }
 
     public function client(): PendingRequest

diff --git a/tests/Unit/People/PersonTests.php b/tests/Unit/People/PersonTests.php
@@ -34,9 +34,8 @@
 
     test('People: Can Get Person By ID', function () {
         $person = Person::make(TestConstants::CLIENT_ID, TestConstants::CLIENT_SECRET);
-        $person->attributes->personId = "1";
 
-        $response = $person->get();
+        $response = $person->forPersonId("1")->get();
         /** @var Person $personProfile */
         $personProfile = $response->data->first();