Add project_id to subscriptions

Author: collimarco

README.md

@@ -214,6 +214,7 @@ Load a specific subscription when you already know its id:
 $subscription = Pushpad\Subscription::find(123);
 
 echo $subscription->id;
+echo $subscription->project_id;
 echo $subscription->endpoint;
 echo $subscription->uid;
 echo $subscription->tags;

lib/Pushpad.php

@@ -12,7 +12,7 @@
 class Pushpad
 {
     /** Current library version. */
-    public const VERSION = '3.0.0';
+    public const VERSION = '3.1.0';
 
     /**
      * API token used to authenticate every request performed by the SDK.

lib/Subscription.php

@@ -11,6 +11,7 @@ class Subscription extends Resource
 {
     protected const ATTRIBUTES = [
         'id',
+        'project_id',
         'endpoint',
         'p256dh',
         'auth',
@@ -23,6 +24,7 @@ class Subscription extends Resource
 
     protected const READ_ONLY_ATTRIBUTES = [
         'id',
+        'project_id',
         'last_click_at',
         'created_at',
         'project_id',
@@ -58,7 +60,7 @@ public static function findAll(array $query = [], ?int $projectId = null): array
         $items = $response['body'];
 
         return array_map(
-            fn (array $item) => new self(self::injectProjectId($item, $resolvedProjectId)),
+            fn (array $item) => new self($item),
             $items
         );
     }
@@ -104,7 +106,7 @@ public static function find(int $subscriptionId, ?int $projectId = null): self
         self::ensureStatus($response, 200);
         $data = $response['body'];
 
-        return new self(self::injectProjectId($data, $resolvedProjectId));
+        return new self($data);
     }
 
     /**
@@ -124,7 +126,7 @@ public static function create(array $payload, ?int $projectId = null): self
         self::ensureStatus($response, 201);
         $data = $response['body'];
 
-        return new self(self::injectProjectId($data, $resolvedProjectId));
+        return new self($data);
     }
 
     /**
@@ -138,7 +140,7 @@ public function refresh(?int $projectId = null): self
         $response = self::httpGet("/projects/{$project}/subscriptions/{$this->requireId()}");
         self::ensureStatus($response, 200);
         $data = $response['body'];
-        $this->setAttributes(self::injectProjectId($data, $project));
+        $this->setAttributes($data);
         return $this;
     }
 
@@ -158,7 +160,7 @@ public function update(array $payload, ?int $projectId = null): self
         ]);
         self::ensureStatus($response, 200);
         $data = $response['body'];
-        $this->setAttributes(self::injectProjectId($data, $project));
+        $this->setAttributes($data);
         return $this;
     }
 
@@ -181,28 +183,16 @@ public function delete(?int $projectId = null): void
      */
     private function determineProjectId(?int $projectId = null): int
     {
-        if ($projectId !== null) {
-            return $projectId;
-        }
-
         if (isset($this->attributes['project_id'])) {
             return (int) $this->attributes['project_id'];
         }
 
-        return Pushpad::resolveProjectId(null);
+        return Pushpad::resolveProjectId($projectId);
     }
 
     /**
      * @param array<string, mixed> $data
      * @param int $projectId
      * @return array<string, mixed>
      */
-    private static function injectProjectId(array $data, int $projectId): array
-    {
-        if (!isset($data['project_id'])) {
-            $data['project_id'] = $projectId;
-        }
-
-        return $data;
-    }
 }

tests/SubscriptionTest.php

@@ -90,6 +90,7 @@ public function testFindReturnsSubscription(): void
                 'status' => 200,
                 'body' => [
                     'id' => 7,
+                    'project_id' => 321,
                     'endpoint' => 'https://example.com/push/f7Q1Eyf',
                     'uid' => 'user-123',
                     'tags' => ['tag1'],
@@ -169,6 +170,7 @@ public function testUpdateSubscriptionSendsPayload(): void
                 'status' => 200,
                 'body' => [
                     'id' => 7,
+                    'project_id' => 321,
                     'uid' => 'user-updated',
                     'endpoint' => 'https://example.com/push/f7Q1Eyf',
                 ],