[WIP] Refactoring code.

Author: vuongxuongminh

src/AllInOneGateway.php

@@ -11,9 +11,9 @@
 use Omnipay\MoMo\Message\AllInOne\RefundRequest;
 use Omnipay\MoMo\Message\AllInOne\PurchaseRequest;
 use Omnipay\MoMo\Message\AllInOne\QueryRefundRequest;
+use Omnipay\MoMo\Message\AllInOne\NotificationRequest;
 use Omnipay\MoMo\Message\AllInOne\QueryTransactionRequest;
 use Omnipay\MoMo\Message\AllInOne\CompletePurchaseRequest;
-use Omnipay\MoMo\Message\AllInOne\CompletePurchaseNotifyRequest;
 
 /**
  * @author Vuong Minh <[email protected]>
@@ -43,14 +43,14 @@ public function completePurchase(array $options = []): CompletePurchaseRequest
     }
 
     /**
-     * Create complete purchase notify request.
+     * Create complete purchase notification request.
      *
      * @param  array  $options
-     * @return \Omnipay\Common\Message\RequestInterface|CompletePurchaseNotifyRequest
+     * @return \Omnipay\Common\Message\RequestInterface|NotificationRequest
      */
-    public function completePurchaseNotify(array $options = []): CompletePurchaseNotifyRequest
+    public function notification(array $options = []): NotificationRequest
     {
-        return $this->createRequest(CompletePurchaseNotifyRequest::class, $options);
+        return $this->createRequest(NotificationRequest::class, $options);
     }
 
     /**

src/Concerns/Parameters.php

@@ -32,13 +32,4 @@ public function setPartnerCode(string $code): void
     {
         $this->setParameter('partnerCode', $code);
     }
-
-    /**
-     * Phương thức trừu tượng thiết lập param.
-     *
-     * @param $key
-     * @param $value
-     * @return mixed
-     */
-    abstract public function setParameter($key, $value);
 }

src/Message/AbstractIncomingRequest.php

@@ -15,15 +15,13 @@
  */
 abstract class AbstractIncomingRequest extends AbstractRequest
 {
-    use Concerns\IncomingRequestParameters;
-
     /**
      * {@inheritdoc}
      * @throws \Omnipay\Common\Exception\InvalidRequestException
      */
     public function getData(): array
     {
-        $this->validate(array_keys($parameters = $this->getParameters()));
+        $this->validate(array_keys($parameters = $this->getIncomingParameters()));
 
         return $parameters;
     }
@@ -33,8 +31,17 @@ public function getData(): array
      */
     public function initialize(array $parameters = []): self
     {
+        parent::initialize();
+
         $this->parameters->replace($this->getIncomingParameters());
 
         return $this;
     }
+
+    /**
+     * Trả về danh sách parameters từ MoMo gửi sang.
+     *
+     * @return array
+     */
+    abstract protected function getIncomingParameters(): array;
 }

src/Message/AbstractResponse.php

@@ -15,4 +15,14 @@
  */
 abstract class AbstractResponse extends BaseAbstractResponse
 {
+    /**
+     * Phương thức hổ trợ tạo các thuộc tính của đối tượng từ dữ liệu gửi về từ MoMo.
+     *
+     * @param  string  $name
+     * @return |null
+     */
+    public function __get($name)
+    {
+        return $this->data[$name] ?? null;
+    }
 }

src/Message/AllInOne/AbstractIncomingRequest.php

@@ -15,5 +15,5 @@
  */
 abstract class AbstractIncomingRequest extends BaseAbstractIncomingRequest
 {
-    use Concerns\RequestParameters;
+    use Concerns\IncomingRequestParameters;
 }

src/Message/AllInOne/AbstractRequest.php

@@ -7,6 +7,8 @@
 
 namespace Omnipay\MoMo\Message\AllInOne;
 
+use InvalidArgumentException;
+use Omnipay\MoMo\Support\Signature;
 use Omnipay\MoMo\Message\AbstractRequest as BaseAbstractRequest;
 
 /**
@@ -15,9 +17,15 @@
  */
 abstract class AbstractRequest extends BaseAbstractRequest
 {
-    use Concerns\RequestSignature;
     use Concerns\RequestParameters;
 
+    /**
+     * Trả về lớp đối tượng phản hồi tương ứng của Request.
+     *
+     * @var string
+     */
+    protected $responseClass = Response::class;
+
     /**
      * {@inheritdoc}
      * @throws \Omnipay\Common\Exception\InvalidRequestException
@@ -41,16 +49,52 @@ public function sendData($data)
         $response = $this->httpClient->request('POST', $this->getEndpoint().'/gw_payment/transactionProcessor', [
             'Content-Type' => 'application/json; charset=UTF-8',
         ], json_encode($data));
-        $responseClass = $this->responseClass();
+        $responseClass = $this->responseClass;
         $responseData = json_decode($response->getBody()->getContents(), true);
 
         return $this->response = new $responseClass($this, $responseData);
     }
 
     /**
-     * Trả về lớp đối tượng phản hồi tương ứng của Request.
+     * Trả về chữ ký điện tử gửi đến MoMo dựa theo `$requestType` truyền vào.
      *
+     * @param  string  $requestType
      * @return string
      */
-    abstract protected function responseClass(): string;
+    protected function generateSignature(string $requestType): string
+    {
+        $data = [];
+        $signature = new Signature($this->getParameter('secretKey'));
+
+        foreach ($this->getSignatureParameters($requestType) as $parameter) {
+            $data[$parameter] = $this->getParameter($parameter);
+        }
+
+        return $signature->generate($data);
+    }
+
+    /**
+     * Trả về danh sách param dùng để tạo chữ ký số theo `$requestType`.
+     *
+     * @param  string  $requestType
+     * @return array
+     */
+    protected function getSignatureParameters(string $requestType): array
+    {
+        switch ($requestType) {
+            case 'captureMoMoWallet':
+                return [
+                    'partnerCode', 'accessKey', 'requestId', 'amount', 'orderId', 'orderInfo', 'returnUrl', 'notifyUrl',
+                    'extraData',
+                ];
+            case 'transactionStatus':
+            case 'refundMoMoWallet':
+            case 'refundStatus':
+                return [
+                    'partnerCode', 'accessKey', 'requestId', 'orderId', 'requestType',
+                ];
+            default:
+                throw new InvalidArgumentException(sprintf('Request type: (%s) is not valid!', $requestType));
+        }
+    }
 }

src/Message/AllInOne/AbstractResponse.php

@@ -18,7 +18,7 @@ class CompletePurchaseRequest extends AbstractIncomingRequest
     /**
      * {@inheritdoc}
      */
-    protected function getIncomingParameterBag(): ParameterBag
+    protected function getIncomingParametersBag(): ParameterBag
     {
         return $this->httpRequest->query;
     }
@@ -27,8 +27,8 @@ protected function getIncomingParameterBag(): ParameterBag
      * {@inheritdoc}
      * @throws \Omnipay\Common\Exception\InvalidResponseException
      */
-    public function sendData($data): CompletePurchaseResponse
+    public function sendData($data): IncomingResponse
     {
-        return $this->response = new CompletePurchaseResponse($this, $data);
+        return $this->response = new IncomingResponse($this, $data);
     }
 }