feat: add blacklist for delivery countries (#203)

INT-325
myparcelnl · Jan 18, 2024 · 5386e5c · 5386e5c
1 parent 66696ee
commit 5386e5c
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 5 deletions.
diff --git a/src/data/carriers/abstractCarrierConfiguration.js b/src/data/carriers/abstractCarrierConfiguration.js
@@ -40,7 +40,8 @@ export class AbstractCarrierConfiguration {
    * @returns {boolean}
    */
   allowsDeliveryIn(country) {
-    return this.getCountriesForDelivery().includes(country.toUpperCase()) || this.hasFakeDelivery();
+    return this.getCountriesForDelivery().includes(country.toUpperCase())
+      || (this.hasFakeDelivery() && !this.getCountriesBlacklist().includes(country.toUpperCase()));
   }
 
   /**
@@ -82,6 +83,10 @@ export class AbstractCarrierConfiguration {
     return [];
   }
 
+  getCountriesBlacklist() {
+    return [];
+  }
+
   /**
    * The countries this carrier can find pickup locations in.
    *

diff --git a/src/data/carriers/upsCarrierConfiguration.js b/src/data/carriers/upsCarrierConfiguration.js
@@ -4,10 +4,8 @@ import {
   BULGARIA,
   CROATIA,
   CZECH_REPUBLIC,
-  DENMARK,
   ESTONIA,
   FINLAND,
-  FRANCE,
   GERMANY,
   GREECE,
   HUNGARY,
@@ -16,17 +14,17 @@ import {
   LATVIA,
   LITHUANIA,
   LUXEMBOURG,
+  NETHERLANDS,
   POLAND,
   PORTUGAL,
   ROMANIA,
   SLOVAKIA,
   SLOVENIA,
   SPAIN,
-  SWEDEN,
 } from '@myparcel/js-sdk/dist/constant/countries-iso2';
 import { CITY, POSTAL_CODE, STREET } from '../keys/addressKeys';
-import { MYPARCEL, SENDMYPARCEL } from '@/data/keys/platformKeys';
 import { AbstractCarrierConfiguration } from '@/data/carriers/abstractCarrierConfiguration';
+import { MYPARCEL } from '@/data/keys/platformKeys';
 import { UPS } from '../keys/carrierKeys';
 
 export class UpsCarrierConfiguration extends AbstractCarrierConfiguration {
@@ -67,6 +65,10 @@ export class UpsCarrierConfiguration extends AbstractCarrierConfiguration {
     return true;
   }
 
+  getCountriesBlacklist() {
+    return [NETHERLANDS];
+  }
+
   getCountriesForPickup() {
     return [
       GERMANY,

diff --git a/tests/unit/delivery-options/__snapshots__/carrierConfigurationFactory.spec.js.snap b/tests/unit/delivery-options/__snapshots__/carrierConfigurationFactory.spec.js.snap
@@ -2,6 +2,7 @@
 
 exports[`CarrierConfigurationFactory should create a configuration for bpost 1`] = `
 Object {
+  "countriesBlacklist": Array [],
   "countriesForDelivery": Array [
     "BE",
     "NL",
@@ -45,13 +46,19 @@ Object {
       ],
     ],
   },
+  "getDefaultRequestParameters": Array [
+    "city",
+    "postalCode",
+  ],
+  "hasFakeDelivery": false,
   "name": "bpost",
   "platformFeatures": Array [],
 }
 `;
 
 exports[`CarrierConfigurationFactory should create a configuration for dhl 1`] = `
 Object {
+  "countriesBlacklist": Array [],
   "countriesForDelivery": Array [
     "AT",
     "BG",
@@ -101,6 +108,11 @@ Object {
       ],
     ],
   },
+  "getDefaultRequestParameters": Array [
+    "city",
+    "postalCode",
+  ],
+  "hasFakeDelivery": false,
   "name": "dhl",
   "platformFeatures": Array [
     Array [
@@ -120,6 +132,7 @@ Object {
 
 exports[`CarrierConfigurationFactory should create a configuration for dhleuroplus 1`] = `
 Object {
+  "countriesBlacklist": Array [],
   "countriesForDelivery": Array [
     "BE",
     "BG",
@@ -157,6 +170,12 @@ Object {
       ],
     ],
   },
+  "getDefaultRequestParameters": Array [
+    "city",
+    "postalCode",
+    "street",
+  ],
+  "hasFakeDelivery": false,
   "name": "dhleuroplus",
   "platformFeatures": Array [
     Array [
@@ -169,6 +188,7 @@ Object {
 
 exports[`CarrierConfigurationFactory should create a configuration for dhlforyou 1`] = `
 Object {
+  "countriesBlacklist": Array [],
   "countriesForDelivery": Array [
     "NL",
     "BE",
@@ -213,6 +233,11 @@ Object {
       ],
     ],
   },
+  "getDefaultRequestParameters": Array [
+    "city",
+    "postalCode",
+  ],
+  "hasFakeDelivery": false,
   "name": "dhlforyou",
   "platformFeatures": Array [
     Array [
@@ -254,6 +279,7 @@ Object {
 
 exports[`CarrierConfigurationFactory should create a configuration for dhlparcelconnect 1`] = `
 Object {
+  "countriesBlacklist": Array [],
   "countriesForDelivery": Array [
     "BG",
     "DE",
@@ -314,6 +340,12 @@ Object {
       ],
     ],
   },
+  "getDefaultRequestParameters": Array [
+    "city",
+    "postalCode",
+    "street",
+  ],
+  "hasFakeDelivery": false,
   "name": "dhlparcelconnect",
   "platformFeatures": Array [
     Array [
@@ -330,6 +362,7 @@ Object {
 
 exports[`CarrierConfigurationFactory should create a configuration for dpd 1`] = `
 Object {
+  "countriesBlacklist": Array [],
   "countriesForDelivery": Array [
     "AT",
     "BE",
@@ -404,6 +437,12 @@ Object {
       ],
     ],
   },
+  "getDefaultRequestParameters": Array [
+    "postalCode",
+    "street",
+    "city",
+  ],
+  "hasFakeDelivery": false,
   "name": "dpd",
   "platformFeatures": Array [
     Array [
@@ -416,6 +455,7 @@ Object {
 
 exports[`CarrierConfigurationFactory should create a configuration for postnl 1`] = `
 Object {
+  "countriesBlacklist": Array [],
   "countriesForDelivery": Array [
     "NL",
     "BE",
@@ -510,6 +550,12 @@ Object {
       ],
     ],
   },
+  "getDefaultRequestParameters": Array [
+    "postalCode",
+    "street",
+    "city",
+  ],
+  "hasFakeDelivery": true,
   "name": "postnl",
   "platformFeatures": Array [
     Array [
@@ -567,6 +613,9 @@ Object {
 
 exports[`CarrierConfigurationFactory should create a configuration for ups 1`] = `
 Object {
+  "countriesBlacklist": Array [
+    "NL",
+  ],
   "countriesForDelivery": Array [
     "BG",
     "DE",
@@ -600,6 +649,12 @@ Object {
       ],
     ],
   },
+  "getDefaultRequestParameters": Array [
+    "postalCode",
+    "street",
+    "city",
+  ],
+  "hasFakeDelivery": true,
   "name": "ups",
   "platformFeatures": Array [
     Array [

diff --git a/tests/unit/delivery-options/carrierConfigurationFactory.spec.js b/tests/unit/delivery-options/carrierConfigurationFactory.spec.js
@@ -11,7 +11,10 @@ describe('CarrierConfigurationFactory', () => {
       features: config.getFeatures(),
       platformFeatures: config.getPlatformFeatures(),
       countriesForDelivery: config.getCountriesForDelivery(),
+      countriesBlacklist: config.getCountriesBlacklist(),
       countriesForPickup: config.getCountriesForPickup(),
+      hasFakeDelivery: config.hasFakeDelivery(),
+      getDefaultRequestParameters: config.getDefaultRequestParameters(),
     }).toMatchSnapshot();
   });