Merge pull request #16 from Piggy-Loyalty/develop

added promotionUuid; contactUuid; and status as parameters for vouche…
Piggy-Loyalty · Jan 16, 2024 · 57d802d · 57d802d
2 parents 47e1074 + b90625c
commit 57d802d
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/src/Mappers/Vouchers/PromotionMapper.php b/src/Mappers/Vouchers/PromotionMapper.php
@@ -22,7 +22,8 @@ public function map($data): Promotion
             $data->description,
             $data->voucher_limit ?? null,
             $data->limit_per_contact ?? null,
-            $data->expiration_duration ?? null
+            $data->expiration_duration ?? null,
+            isset($data->attributes) ? get_object_vars($data->attributes) : []
         );
     }
 }
diff --git a/src/Mappers/Vouchers/VoucherMapper.php b/src/Mappers/Vouchers/VoucherMapper.php
@@ -39,7 +39,8 @@ public function map($data): Voucher
             isset($data->redeemed_at) ? $this->parseDate($data->redeemed_at) : null,
             $data->is_redeemed ?? null,
             isset($data->activation_date) ? $this->parseDate($data->activation_date) : null,
-            isset($data->expiration_date) ? $this->parseDate($data->expiration_date) : null
+            isset($data->expiration_date) ? $this->parseDate($data->expiration_date) : null,
+            isset($data->attributes) ? get_object_vars($data->attributes) : []
         );
     }
 }
diff --git a/src/Models/Vouchers/Promotion.php b/src/Models/Vouchers/Promotion.php
@@ -38,7 +38,7 @@ class Promotion
     protected $expiration_duration;
 
     /**
-     * @var stdClass|null
+     * @var array
      */
     protected $attributes;
 
@@ -63,7 +63,7 @@ public function __construct(
         ?int   $voucher_limit = null,
         ?int   $limit_per_contact = null,
         ?int   $expiration_duration = null,
-        ?stdClass $attributes = null
+        array  $attributes = []
     )
     {
         $this->uuid = $uuid;
@@ -123,7 +123,7 @@ public function getUuid(): string
         return $this->uuid;
     }
 
-    public function getAttributes(): ?stdClass
+    public function getAttributes(): array
     {
         return $this->attributes;
     }

diff --git a/src/Models/Vouchers/Voucher.php b/src/Models/Vouchers/Voucher.php
@@ -70,6 +70,9 @@ class Voucher
      */
     protected $contact;
 
+    /** @var array  */
+    protected $attributes;
+
     /**
      * @var string
      */
@@ -99,7 +102,8 @@ public function __construct(
         ?DateTime  $redeemedAt,
         ?bool      $isRedeemed,
         ?DateTime  $activationDate,
-        ?DateTime  $expirationDate
+        ?DateTime  $expirationDate,
+        array  $attributes = []
     )
     {
         $this->uuid = $uuid;
@@ -113,6 +117,7 @@ public function __construct(
         $this->is_redeemed = $isRedeemed;
         $this->activation_date = $activationDate;
         $this->expiration_date = $expirationDate;
+        $this->attributes = $attributes;
     }
 
     /**
@@ -203,6 +208,14 @@ public function getContact(): ?Contact
         return $this->contact;
     }
 
+    /**
+     * @return array
+     */
+    public function getAttributes(): array
+    {
+        return $this->attributes;
+    }
+
     /**
      * @param array $body
      * @return Voucher

diff --git a/src/Resources/OAuth/Vouchers/VouchersResource.php b/src/Resources/OAuth/Vouchers/VouchersResource.php
@@ -74,11 +74,14 @@ public function batch(string $promotionUuid, string $quantity, ?string $contactU
      * @return array
      * @throws PiggyRequestException
      */
-    public function list(int $page = 1, int $limit = 30): array
+    public function list(int $page = 1, int $limit = 30, ?string $promotionUuid = null, ?string $contactUuid = null, ?string $status = null): array
     {
         $response = $this->client->get($this->resourceUri, [
             "page" => $page,
             "limit" => $limit,
+            "promotion_uuid" => $promotionUuid,
+            "contact_uuid" => $contactUuid,
+            "status" => $status
         ]);
 
         $mapper = new VouchersMapper();

diff --git a/src/StaticMappers/Vouchers/PromotionMapper.php b/src/StaticMappers/Vouchers/PromotionMapper.php
@@ -23,7 +23,7 @@ public static function map($data): Promotion
             $data->voucher_limit ?? null,
             $data->limit_per_contact ?? null,
             $data->expiration_duration ?? null,
-            $data->attributes ?? null
+            isset($data->attributes) ? get_object_vars($data->attributes) : []
         );
     }
 }
diff --git a/src/StaticMappers/Vouchers/VoucherMapper.php b/src/StaticMappers/Vouchers/VoucherMapper.php
@@ -37,7 +37,8 @@ public static function map($data): Voucher
             isset($data->redeemed_at) ? self::parseDate($data->redeemed_at) : null,
             $data->is_redeemed ?? null,
             isset($data->activation_date) ? self::parseDate($data->activation_date) : null,
-            isset($data->expiration_date) ? self::parseDate($data->expiration_date) : null
+            isset($data->expiration_date) ? self::parseDate($data->expiration_date) : null,
+            isset($data->attributes) ? get_object_vars($data->attributes) : []
         );
     }
 }