chore: refactoring

thanhtran468 · Sep 30, 2024 · 5c676f5 · 5c676f5
1 parent f63d951
commit 5c676f5
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 22 deletions.
diff --git a/src/Api/AuthenticatedApi.php b/src/Api/AuthenticatedApi.php
@@ -15,7 +15,7 @@
  *
  * @extends AbstractApi<AuthenticatedSession>
  */
-final class AuthenticatedApi extends AbstractApi
+final class AuthenticatedApi extends AbstractApi implements AuthenticatedApiInterface
 {
     use LazyGhostTrait;
 
@@ -49,9 +49,9 @@ private function populateLazyProperties(): void
 
     public function transactions(?string $accountNumber = null): TransactionBuilder
     {
-        return new TransactionBuilder(
-            ['accountNumber' => $accountNumber ?? $this->customer->accountNumber],
+        return TransactionBuilder::from(
             $this->getTransactions(...),
+            ['accountNumber' => $accountNumber ?? $this->customer->accountNumber],
         );
     }
 

diff --git a/src/Api/AuthenticatedApiInterface.php b/src/Api/AuthenticatedApiInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace IPay\Api;
+
+use IPay\Builder\TransactionBuilder;
+
+/**
+ * @property \IPay\Entity\Customer  $customer
+ * @property \IPay\Entity\Account[] $accounts
+ */
+interface AuthenticatedApiInterface
+{
+    public function transactions(?string $accountNumber = null): TransactionBuilder;
+}
diff --git a/src/Builder/TransactionBuilder.php b/src/Builder/TransactionBuilder.php
@@ -8,20 +8,36 @@
 /**
  * @psalm-import-type ParametersType from BodyBuilder
  *
+ * @psalm-type GetterType = \Closure(ParametersType):\Traversable<Transaction>
+ *
  * @implements \IteratorAggregate<int,Transaction>
  */
 final class TransactionBuilder implements \IteratorAggregate
 {
     /**
-     * @param ParametersType                                     $parameters
-     * @param \Closure(ParametersType):\Traversable<Transaction> $getter
+     * @param GetterType     $getter
+     * @param ParametersType $parameters
      */
-    public function __construct(
-        private array $parameters,
+    private function __construct(
         private \Closure $getter,
+        private array $parameters,
     ) {
     }
 
+    /**
+     * @param GetterType     $getter
+     * @param ParametersType $parameters
+     */
+    public static function from(
+        \Closure $getter,
+        array $parameters,
+    ): self {
+        return new self(
+            $getter,
+            $parameters,
+        );
+    }
+
     public function between(
         \DateTimeInterface $from,
         \DateTimeInterface $to,

diff --git a/src/Entity/Account.php b/src/Entity/Account.php
@@ -2,22 +2,50 @@
 
 namespace IPay\Entity;
 
+use EventSauce\ObjectHydrator\Constructor;
+
 readonly class AccountState
 {
-    public function __construct(
+    private function __construct(
         public int $availableBalance,
         public int $balance,
     ) {
     }
+
+    #[Constructor]
+    public static function create(
+        int $availableBalance,
+        int $balance,
+    ): self {
+        return new self(
+            $availableBalance,
+            $balance,
+        );
+    }
 }
 
 readonly class Account
 {
-    public function __construct(
+    private function __construct(
         public string $title,
         public string $number,
         public string $currencyCode,
         public AccountState $accountState,
     ) {
     }
+
+    #[Constructor]
+    public static function create(
+        string $title,
+        string $number,
+        string $currencyCode,
+        AccountState $accountState,
+    ): self {
+        return new self(
+            $title,
+            $number,
+            $currencyCode,
+            $accountState,
+        );
+    }
 }
diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php
@@ -2,21 +2,30 @@
 
 namespace IPay\Entity;
 
-use EventSauce\ObjectHydrator\MapFrom;
+use EventSauce\ObjectHydrator\Constructor;
 
-#[MapFrom([
-    'fullname' => 'name',
-    'phone' => 'phone',
-    'jobTitle' => 'job',
-    'feeAcctNo' => 'accountNumber',
-])]
 readonly class Customer
 {
-    public function __construct(
+    private function __construct(
         public string $name,
         public string $phone,
         public string $job,
         public string $accountNumber,
     ) {
     }
+
+    #[Constructor]
+    public static function create(
+        string $fullname,
+        string $phone,
+        string $jobTitle,
+        string $feeAcctNo,
+    ): self {
+        return new self(
+            $fullname,
+            $phone,
+            $jobTitle,
+            $feeAcctNo,
+        );
+    }
 }
diff --git a/src/Entity/Transaction.php b/src/Entity/Transaction.php
@@ -2,20 +2,40 @@
 
 namespace IPay\Entity;
 
+use EventSauce\ObjectHydrator\Constructor;
 use EventSauce\ObjectHydrator\PropertyCasters\CastToDateTimeImmutable;
 use EventSauce\ObjectHydrator\PropertyCasters\CastToType;
 
 readonly class Transaction
 {
-    public function __construct(
+    private function __construct(
         public string $currency,
-        #[CastToType('integer')]
         public int $amount,
         public string $remark,
         public string $corresponsiveAccount,
         public string $corresponsiveName,
-        #[CastToDateTimeImmutable('d-m-Y H:i:s')]
         public \DateTimeImmutable $processDate,
     ) {
     }
+
+    #[Constructor]
+    public static function create(
+        string $currency,
+        #[CastToType('integer')]
+        int $amount,
+        string $remark,
+        string $corresponsiveAccount,
+        string $corresponsiveName,
+        #[CastToDateTimeImmutable('d-m-Y H:i:s')]
+        \DateTimeImmutable $processDate,
+    ): self {
+        return new self(
+            $currency,
+            $amount,
+            $remark,
+            $corresponsiveAccount,
+            $corresponsiveName,
+            $processDate,
+        );
+    }
 }
diff --git a/src/IPayClient.php b/src/IPayClient.php
@@ -9,7 +9,7 @@
 use Http\Client\Common\PluginClient;
 use Http\Discovery\Psr17FactoryDiscovery;
 use Http\Discovery\Psr18ClientDiscovery;
-use IPay\Api\AuthenticatedApi;
+use IPay\Api\AuthenticatedApiInterface;
 use IPay\Api\UnauthenticatedApi;
 use IPay\Http\Plugin\ExceptionThrower;
 use IPay\Session\UnauthenticatedSession;
@@ -19,7 +19,7 @@ final class IPayClient
     /**
      * @throws Exception\LoginException
      */
-    public static function fromCredentials(string $username, string $password): AuthenticatedApi
+    public static function fromCredentials(string $username, string $password): AuthenticatedApiInterface
     {
         $ipayClient = new self(
             new HttpMethodsClient(