fix!: Unify include entities (#15)

Adds missing import meta where it was missing Removes legacy entities Rename "WithIncludes" entities to simpler entity names Refactor uses BREAKING CHANGE: Classes <Entity>WithIncludes will now be <Entity>
PaddleHQ · Feb 2, 2024 · 92af891 · 92af891
1 parent 9a5f316
commit 92af891
Show file tree

Hide file tree

Showing 35 changed files with 129 additions and 615 deletions.
diff --git a/examples/catalog_management.php b/examples/catalog_management.php
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Paddle\SDK\Entities\Price;
-use Paddle\SDK\Entities\PriceWithIncludes;
 use Paddle\SDK\Entities\Shared\CountryCode;
 use Paddle\SDK\Entities\Shared\CurrencyCode;
 use Paddle\SDK\Entities\Shared\CustomData;
@@ -135,7 +134,7 @@
 echo sprintf(
     "Read product '%s' with prices %s \n",
     $product->id,
-    implode(', ', array_map(fn (PriceWithIncludes $price) => $price->id, iterator_to_array($product->prices))),
+    implode(', ', array_map(fn (Price $price) => $price->id, iterator_to_array($product->prices))),
 );
 
 // ┌───

diff --git a/src/Entities/Collections/CustomerIncludesCollection.php b/src/Entities/Collections/CustomerIncludesCollection.php
diff --git a/src/Entities/Collections/PriceWithIncludesCollection.php b/src/Entities/Collections/PriceWithIncludesCollection.php
diff --git a/src/Entities/Collections/ProductWithIncludesCollection.php b/src/Entities/Collections/ProductWithIncludesCollection.php
diff --git a/src/Entities/Collections/SubscriptionWithIncludesCollection.php b/src/Entities/Collections/SubscriptionWithIncludesCollection.php
diff --git a/src/Entities/Collections/TransactionWithIncludesCollection.php b/src/Entities/Collections/TransactionWithIncludesCollection.php
diff --git a/src/Entities/CustomerIncludes.php b/src/Entities/CustomerIncludes.php
diff --git a/src/Entities/Price.php b/src/Entities/Price.php
@@ -34,13 +34,14 @@ public function __construct(
         public CatalogType|null $type,
         public TimePeriod|null $billingCycle,
         public TimePeriod|null $trialPeriod,
-        public TaxMode $taxMode,
+        public TaxMode|null $taxMode,
         public Money $unitPrice,
         public array $unitPriceOverrides,
         public PriceQuantity $quantity,
         public Status $status,
         public CustomData|null $customData,
         public ImportMeta|null $importMeta,
+        public Product|null $product,
     ) {
     }
 
@@ -51,7 +52,7 @@ public static function from(array $data): self
             productId: $data['product_id'],
             name: $data['name'] ?? null,
             description: $data['description'],
-            type: CatalogType::tryFrom($data['type'] ?? CatalogType::Standard->value),
+            type: CatalogType::tryFrom($data['type'] ?? ''),
             billingCycle: isset($data['billing_cycle']) ? TimePeriod::from($data['billing_cycle']) : null,
             trialPeriod: isset($data['trial_period']) ? TimePeriod::from($data['trial_period']) : null,
             taxMode: isset($data['tax_mode']) ? TaxMode::from($data['tax_mode']) : null,
@@ -64,6 +65,7 @@ public static function from(array $data): self
             status: Status::from($data['status']),
             customData: isset($data['custom_data']) ? new CustomData($data['custom_data']) : null,
             importMeta: isset($data['import_meta']) ? ImportMeta::from($data['import_meta']) : null,
+            product: isset($data['product']) ? Product::from($data['product']) : null,
         );
     }
 }
diff --git a/src/Entities/PriceWithIncludes.php b/src/Entities/PriceWithIncludes.php
diff --git a/src/Entities/Product.php b/src/Entities/Product.php
@@ -11,6 +11,7 @@
 
 namespace Paddle\SDK\Entities;
 
+use Paddle\SDK\Entities\Collections\PriceCollection;
 use Paddle\SDK\Entities\Shared\CatalogType;
 use Paddle\SDK\Entities\Shared\CustomData;
 use Paddle\SDK\Entities\Shared\ImportMeta;
@@ -30,6 +31,7 @@ public function __construct(
         public Status $status,
         public \DateTimeInterface|null $createdAt,
         public ImportMeta|null $importMeta,
+        public PriceCollection $prices,
     ) {
     }
 
@@ -46,6 +48,7 @@ public static function from(array $data): self
             status: Status::from($data['status']),
             createdAt: isset($data['created_at']) ? DateTime::from($data['created_at']) : null,
             importMeta: isset($data['import_meta']) ? ImportMeta::from($data['import_meta']) : null,
+            prices: PriceCollection::from($data['prices'] ?? []),
         );
     }
 }
diff --git a/src/Entities/ProductWithIncludes.php b/src/Entities/ProductWithIncludes.php