Improve integration for international validation (#14)

* Improve integration for international validation --------- Co-authored-by: Patricia Schott <[email protected]>
experianplc · Oct 23, 2023 · f564eef · f564eef
1 parent 8685c44
commit f564eef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/dist/js/experian-address-validation.js b/dist/js/experian-address-validation.js
diff --git a/dist/lib/address-search.d.ts b/dist/lib/address-search.d.ts
@@ -60,4 +60,5 @@ export default class AddressValidation {
     private searchSpinner;
     private toggleSearchInputs;
     private globalReset;
+    private isInternationalValidation;
 }
diff --git a/src/ts/address-search.ts b/src/ts/address-search.ts
@@ -359,8 +359,6 @@ export default class AddressValidation {
   private search(event: KeyboardEvent): void {
     event.preventDefault();
 
-    this.currentSearchTerm = this.inputs.map(input => input.value).join(',');
-
     // Grab the country ISO code and (if it is present) the dataset name from the current value of the countryList (format: {countryIsoCode};{dataset})
     const currentCountryInfo = this.countryCodeMapping[this.currentCountryCode] || this.currentCountryCode;
     const countryCodeAndDataset = currentCountryInfo.split(';');
@@ -378,6 +376,13 @@ export default class AddressValidation {
       this.hasSearchInputBeenReset = true;
     }
 
+    // Concatenating the input components depending on search type and dataset to maximize match results
+    if (this.isInternationalValidation()) {
+      this.currentSearchTerm = this.inputs.map(input => input.value).join('|');
+    } else {
+      this.currentSearchTerm = this.inputs.map(input => input.value).join(',');
+    }
+
     // Check if searching is permitted
     if (this.canSearch()) {
       // Abort any outstanding requests
@@ -1417,4 +1422,15 @@ export default class AddressValidation {
     // Fire an event after a reset
     this.events.trigger('post-reset');
   }
+
+  private isInternationalValidation(): boolean {
+    // Return true if the current dataset indicates this is a international data validation call
+    if (this.searchType === AddressValidationMode.VALIDATE
+      && !Array.isArray(this.currentDataSet) 
+      && this.currentDataSet.toUpperCase().endsWith("-ED")) {
+        return true;
+    }
+
+    return false;
+  }
 }