Merge pull request #56 from Judopay/OneUseTokenPaymentPreauth-JR-4564

OneUseTokenPaymentPreauth-JR-4564
Judopay · Jan 27, 2021 · ac1ff78 · ac1ff78
2 parents 8b7dd89 + 9f0f6eb
commit ac1ff78
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 10 deletions.
diff --git a/spec/fixtures/transactions/check_card.json b/spec/fixtures/transactions/check_card.json
@@ -15,7 +15,7 @@
   "currency": "GBP",
   "cardDetails": {
     "cardLastfour": "3436",
-    "endDate": "1220",
+    "endDate": "1225",
     "cardToken": "123123123",
     "cardType": 1
   },

diff --git a/spec/fixtures/transactions/register_card.json b/spec/fixtures/transactions/register_card.json
@@ -15,7 +15,7 @@
   "currency": "GBP",
   "cardDetails": {
     "cardLastfour": "3436",
-    "endDate": "1220",
+    "endDate": "1225",
     "cardToken": "123123123",
     "cardType": 1
   },

diff --git a/spec/fixtures/transactions/save_card.json b/spec/fixtures/transactions/save_card.json
@@ -14,7 +14,7 @@
   "currency": "GBP",
   "cardDetails": {
     "cardLastfour": "3436",
-    "endDate": "1220",
+    "endDate": "1225",
     "cardToken": "abc",
     "cardType": 1
   },

diff --git a/spec/fixtures/transactions/voidtransaction.json b/spec/fixtures/transactions/voidtransaction.json
@@ -16,7 +16,7 @@
   "currency": "GBP",
   "cardDetails": {
     "cardLastfour": "3436",
-    "endDate": "1220",
+    "endDate": "1225",
     "cardToken": "xxxxxxxxxxxxxxxxxxxx",
     "cardType": 1
   },

diff --git a/src/Judopay/Model/OneUseTokenPayment.php b/src/Judopay/Model/OneUseTokenPayment.php
@@ -7,7 +7,7 @@
 
 class OneUseTokenPayment extends Model
 {
-    protected $resourcePath = 'transactions/preauths';
+    protected $resourcePath = 'transactions/payments';
     protected $validApiMethods = array('create');
     protected $attributes
         = array(

diff --git a/src/Judopay/Model/OneUseTokenPreauth.php b/src/Judopay/Model/OneUseTokenPreauth.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Judopay\Model;
+
+class OneUseTokenPreauth extends OneUseTokenPayment
+{
+    protected $resourcePath = 'transactions/preauths';
+    protected $validApiMethods = array('create');
+}
diff --git a/tests/AdditionsPaymentTest.php b/tests/AdditionsPaymentTest.php
@@ -5,6 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use Tests\Builders\EncryptDetailsBuilder;
 use Tests\Builders\OneUseTokenPaymentBuilder;
+use Tests\Builders\OneUseTokenPreauthBuilder;
 use Tests\Builders\SaveEncryptedCardBuilder;
 use Tests\Builders\RegisterEncryptedCardBuilder;
 use Tests\Builders\CheckEncryptedCardBuilder;
@@ -24,7 +25,7 @@ public function testOneUseTokenPayment()
         $tokenPaymentResult = $this->makePaymentWithOneUseToken($oneUseToken);
         $this->assertEquals('Success', $tokenPaymentResult['result']);
 
-        # Try and fail to make second payment with one use token
+        # Try and fail to make a second payment with one use token
         try {
             $this->makePaymentWithOneUseToken($oneUseToken);
         } catch (\Exception $e) {
@@ -34,6 +35,27 @@ public function testOneUseTokenPayment()
         $this->fail('An expected ApiException has not been raised.');
     }
 
+    public function testOneUseTokenPreauth()
+    {
+        # Generate one use token
+        $encryptionResult = $this->generateOneUseToken();
+        $oneUseToken = $encryptionResult['oneUseToken'];
+        $this->assertNotEmpty($oneUseToken);
+
+        # Make successful preauth with one use token
+        $tokenPreauthResult = $this->makePreauthWithOneUseToken($oneUseToken);
+        $this->assertEquals('Success', $tokenPreauthResult['result']);
+
+        # Try and fail to make a second preauth with one use token
+        try {
+            $this->makePreauthWithOneUseToken($oneUseToken);
+        } catch (\Exception $e) {
+            AssertionHelper::assertApiExceptionWithModelErrors($e, 0, 153, 400, 1);
+            return;
+        }
+        $this->fail('An expected ApiException has not been raised.');
+    }
+
     public function testOneUseTokenSaveCard()
     {
         # Generate one use token
@@ -124,6 +146,11 @@ protected function tokenPaymentRequestBuilder()
         return new OneUseTokenPaymentBuilder();
     }
 
+    protected function tokenPreauthRequestBuilder()
+    {
+        return new OneUseTokenPreauthBuilder();
+    }
+
     protected function saveEncryptedCardRequestBuilder()
     {
         return new SaveEncryptedCardBuilder();
@@ -148,6 +175,14 @@ protected function makePaymentWithOneUseToken($token)
         return $tokenPayment->create();
     }
 
+    protected function makePreauthWithOneUseToken($token)
+    {
+        $tokenPreauth = $this->tokenPreauthRequestBuilder()
+            ->setAttribute('oneUseToken', $token)
+            ->build(ConfigHelper::getConfig());
+        return $tokenPreauth->create();
+    }
+
     protected function saveCardWithOneUseToken($token)
     {
         $encryptedSaveCard = $this->saveEncryptedCardRequestBuilder()

diff --git a/tests/Builders/CardPaymentBuilder.php b/tests/Builders/CardPaymentBuilder.php
@@ -34,15 +34,15 @@ public function compile()
             case self::VALID_VISA_CARD:
                 $this->attributeValues += array(
                     'cardNumber' => '4976000000003436',
-                    'expiryDate' => '12/20',
+                    'expiryDate' => '12/25',
                     'cv2'        => 452,
                 );
                 break;
 
             case self::INVALID_VISA_CARD:
                 $this->attributeValues += array(
                     'cardNumber' => '4221690000004963',
-                    'expiryDate' => '12/20',
+                    'expiryDate' => '12/25',
                     'cv2'        => 125,
                 );
                 break;

diff --git a/tests/Builders/EncryptDetailsBuilder.php b/tests/Builders/EncryptDetailsBuilder.php
@@ -8,7 +8,7 @@ public function __construct()
     {
         $this->attributeValues = array(
             'cardNumber'            => '4976000000003436',
-            'expiryDate'            => '12/20',
+            'expiryDate'            => '12/25',
             'cv2'                   => 452,
         );
     }

diff --git a/tests/Builders/OneUseTokenPreauthBuilder.php b/tests/Builders/OneUseTokenPreauthBuilder.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Builders;
+
+class OneUseTokenPreauthBuilder extends AbstractModelBuilder
+{
+    public function __construct()
+    {
+        $this->attributeValues = array(
+            'yourConsumerReference' => 'oneUseTokenPhpTestConsumer',
+            'yourPaymentReference'  => substr(md5(rand()), 0, 7),
+            'amount'                => 1.01,
+            'currency'              => 'GBP'
+        );
+    }
+}
diff --git a/tests/Builders/SaveCardBuilder.php b/tests/Builders/SaveCardBuilder.php
@@ -9,7 +9,7 @@ public function __construct()
         $this->attributeValues = array(
             'yourConsumerReference' => '12345',
             'cardNumber'            => '4976000000003436',
-            'expiryDate'            => '12/20',
+            'expiryDate'            => '12/25',
             'cv2'                   => 452,
         );
     }