fix: update to delphiselect2

Author: craigAtCD

src/Clients/DelphiSelect.php

@@ -12,7 +12,7 @@ class DelphiSelect
 {
     use UsesOAuth;
 
-    protected $url = '/risk/consumer/v1/dataselect/';
+    protected $url = '/risk/consumer/v2/dataselect/';
 
 
     /**
@@ -24,6 +24,9 @@ public function create(Submission $submission): Response
         $res = $this->client()
             ->withBody(json_encode($submission), 'application/json')
             ->post('application');
+
+      //  dd($res->json());
+
         $res->throw();
         $response =  new Response($res->json()['Response']);
         $response->Metrics = $res->json()['Metrics'];
@@ -76,7 +79,7 @@ public function expinscvSubmission()
     }
 }
 
-/**
+/*
  * With info about client
  * - get credt
  */

src/ExperianModels/AffordabilityIQ.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace CustomD\LaravelExperian\ExperianModels;
+
+/**
+ * Other name the applicant may be known by.
+ * For example, Bill may be an alias of William. Each applicant may submit up to three Alias
+*
+* @property string $MainApplicantNMI - Main Applicant Supplied - Net Monthly Income in GBP
+* @property string $JointApplicantNMI - Joint Applicant Supplied - Net Monthly Income in GBP
+*/
+class AffordabilityIQ extends Base
+{
+    protected $fields = [
+        "JointApplicantNMI" => "integer",
+        "MainApplicantNMI"  => "integer",
+    ];
+
+    protected $defaults = [
+        "JointApplicantNMI" => 0,
+        "MainApplicantNMI"  => 0,
+    ];
+}

src/ExperianModels/Applicant.php

@@ -2,11 +2,17 @@
 
 namespace CustomD\LaravelExperian\ExperianModels;
 
-/**
+/*
  * Containing the the financial and personal information of the applicants to be targeted as part of the Consumer Application.
  * Data will be used for Identity Authentication and Affordability calculations (e.g. income, number of dependants, telephone number etc.).
  * The first submitted applicant will be the main applicant.
- */
+ *
+ * @property string $ApplicantIdentifier
+ * @property string $Person
+ * @property string $Alias
+ * @property string $Association
+ * @property string $ApplicantData
+*/
 class Applicant extends Base
 {
     protected $fields = [

src/ExperianModels/ApplicantData.php

@@ -9,6 +9,7 @@ class ApplicantData extends Base
         'PersonalDetails'   => PersonalDetails::class,
         'BankDetails'       => BankDetails::class,
         'EmploymentDetails' => EmploymentDetails::class,
-        'AdditionalData'    => AdditionalData::class
+        'AdditionalData'    => AdditionalData::class,
+        'AffordabilityIQ'   => AffordabilityIQ::class
     ];
 }

src/ExperianModels/Base.php

@@ -29,14 +29,13 @@ public function __get(string $key)
         return $this->attributes[$key] ?? null;
     }
 
-    public function __set(string $key, $value): self
+    public function __set(string $key, $value): void
     {
         if ($this->hasSetMutator($key)) {
             $this->setMutatedAttributeValue($key, $value);
         } else {
             $this->setAttribute($key, $value);
         }
-        return $this;
     }
 
     public function getAttribute($key)

src/ExperianModels/Submission.php

@@ -15,6 +15,17 @@ class Submission extends Base
         'Options'        => Options::class
     ];
 
+    protected $defaults = [
+  //      'Options' => new Options()
+    ];
+
+
+    protected function fillDefaults(): void
+    {
+        parent::fillDefaults();
+        $this->Options = new Options();
+    }
+
 
     public function jsonSerialize()
     {

tests/LaravelExperianTest.php

@@ -22,7 +22,9 @@
 use CustomD\LaravelExperian\ExperianModels\Application;
 use CustomD\LaravelExperian\ExperianModels\Residencies;
 use CustomD\LaravelExperian\ExperianModels\LocationItem;
+use CustomD\LaravelExperian\ExperianModels\ApplicantData;
 use CustomD\LaravelExperian\ExperianModels\ResidencyItem;
+use CustomD\LaravelExperian\ExperianModels\AffordabilityIQ;
 
 class LaravelExperianTest extends TestCase
 {
@@ -38,10 +40,6 @@ protected function getPackageAliases($app)
         ];
     }
 
-    public function testExample()
-    {
-        $this->assertEquals(1, 1);
-    }
 
     protected function buildSubmission()
     {
@@ -54,6 +52,11 @@ protected function buildSubmission()
             'Surname'     => 'Mayer',
             'DateOfBirth' => '1981-06-19'
         ]);
+
+        $applicant->ApplicantData = new ApplicantData([
+            'AffordabilityIQ' => new AffordabilityIQ(),
+        ]);
+
         $submission->Applicants = new Applicants([$applicant]);
 
         $uklocation = new UKLocation([
@@ -100,6 +103,13 @@ public function testBuildsASubmissionBasic()
 
         $this->assertEquals('{
     "Submission": {
+        "Options": {
+            "ProductCode": "DelphiSelect",
+            "FullFBLRequired": true,
+            "AuthenticatePlusRequired": true,
+            "DetectRequired": true,
+            "TestDatabase": "A"
+        },
         "Applicants": [
             {
                 "ApplicantIdentifier": 1,
@@ -108,6 +118,12 @@ public function testBuildsASubmissionBasic()
                     "Forename": "Alexander",
                     "Surname": "Mayer",
                     "DateOfBirth": "1981-06-19"
+                },
+                "ApplicantData": {
+                    "AffordabilityIQ": {
+                        "JointApplicantNMI": 0,
+                        "MainApplicantNMI": 0
+                    }
                 }
             }
         ],
@@ -138,27 +154,15 @@ public function testBuildsASubmissionBasic()
             "ManualAuthenticationRequired": false,
             "SearchConsent": true
         },
-        "Options": {
-            "ProductCode": "DelphiSelect",
-            "FullFBLRequired": true,
-            "AuthenticatePlusRequired": true,
-            "DetectRequired": true,
-            "TestDatabase": "A"
-        },
         "ClientData": {
             "ClientAccountNumber": "A1234"
         }
     }
 }', json_encode($this->buildSubmission(), JSON_PRETTY_PRINT));
     }
 
-    public function DisabledtestCall()
     {
         Config::set('experian.credentials', [
-            'client_id'     => "xxx",
-            'client_secret' => "xxx",
-            'username'      => "xxx",
-            'password'      => "xxx",
         ]);
 
         Response::macro('getScore', function () {