Merge pull request #70 from paytrail/fixReportValidation

Fix Report date validation
paytrail · Mar 15, 2023 · f9c3f04 · f9c3f04
2 parents 721e156 + e47789c
commit f9c3f04
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/Request/ReportRequest.php b/src/Request/ReportRequest.php
@@ -60,22 +60,19 @@ public function validate()
         }
 
         if (!empty($props['startDate'])) {
-            if (!(new \DateTime())->createFromFormat('Y-m-d', $props['startDate'])) {
-                throw new ValidationException('startDate must be in Y-m-d format');
+            if (!preg_match('/^\d{4}(-\d{2}){2}T\d{2}(:\d{2}){2}(\.\d+)?\+\d{2}:\d{2}/', $props['startDate'])) {
+                throw new ValidationException('startDate must be in ATOM, ISO8601 or RFC3339 format');
             }
         }
 
         if (!empty($props['endDate'])) {
-            if (!(new \DateTime())->createFromFormat('Y-m-d', $props['endDate'])) {
-                throw new ValidationException('endDate must be in Y-m-d format');
+            if (!preg_match('/^\d{4}(-\d{2}){2}T\d{2}(:\d{2}){2}(\.\d+)?\+\d{2}:\d{2}/', $props['endDate'])) {
+                throw new ValidationException('endDate must be in DateTimeInterface::ATOM, ISO8601 or RFC3339 format');
             }
         }
 
         if (!empty($props['startDate']) && !empty($props['endDate'])) {
-            if (
-                (new \DateTime())->createFromFormat('Y-m-d', $props['startDate'])
-                > (new \DateTime())->createFromFormat('Y-m-d', $props['endDate'])
-            ) {
+            if (substr($props['startDate'], 0, 10) > substr($props['endDate'], 0, 10)) {
                 throw new ValidationException('startDate cannot be lower than endDate');
             }
         }

diff --git a/src/Util/CurlClient.php b/src/Util/CurlClient.php
@@ -2,6 +2,7 @@
 
 namespace Paytrail\SDK\Util;
 
+use Paytrail\SDK\Exception\ClientException;
 use Paytrail\SDK\Response\CurlResponse;
 
 class CurlClient
@@ -47,12 +48,13 @@ public function request(string $method, string $uri, array $options)
         $header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
         $headers = rtrim(substr($response, 0, $header_size));
         $body = substr($response, $header_size);
-
-        $curlResponse = new CurlResponse($headers, $body, $statusCode);
-
         curl_close($curl);
 
-        return $curlResponse;
+        if ($statusCode == 400) {
+            throw new ClientException($body, $statusCode);
+        }
+
+        return new CurlResponse($headers, $body, $statusCode);
     }
 
     /**

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -570,8 +570,8 @@ public function testRequestPaymentReportThrowsExceptionWhenEndDateIsLowerThanSta
         $reportRequest = (new ReportRequest())
             ->setRequestType('json')
             ->setCallbackUrl('https://nourl.test')
-            ->setStartDate('2023-01-20')
-            ->setEndDate('2023-01-01');
+            ->setStartDate('2023-01-20T12:00:00+02:00')
+            ->setEndDate('2023-01-01T23:59:50+02:00');
         $this->client->requestPaymentReport($reportRequest);
     }