feat: route Amazon create request

Author: Justintime50

CHANGELOG.md

@@ -9,6 +9,7 @@
   - `referralCustomer.addCreditCardFromStripe`
   - `referralCustomer.addBankAccountFromStripe`
 - Adds `tracking_codes` param to tracker index endpoint
+- Routes `AmazonShippingAccount` to the correct endpoint
 - Fixes error parsing
   - Allows for alternative format of `errors` field (previously we deserialized the `errors` field into a list of `Error` objects; however, sometimes the errors are simply a list of strings. This change make the `errors` field a list of `Object` allowing for either the new `FieldError` object or a list of strings. Users will need to check for the type of error returned and handle appropriately)
   - Removed the unused `Error` model

src/main/java/com/easypost/Constants.java

@@ -61,13 +61,17 @@ public abstract static class ErrorCodes {
     }
 
     public abstract static class CarrierAccountTypes {
-        public static final List<String> CARRIER_TYPES_WITH_CUSTOM_WORKFLOW = ImmutableList.of("FedexAccount",
-                "FedexSmartpostAccount");
-    }
+        public static final List<String> CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_WORKFLOW = ImmutableList.of(
+            "FedexAccount", "FedexSmartpostAccount"
+        );
+
+        public static final List<String> UPS_OAUTH_CARRIER_ACCOUNT_TYPES = ImmutableList.of(
+            "UpsAccount", "UpsMailInnovationsAccount", "UpsSurepostAccount"
+        );
 
-    public abstract static class UpsAccountTypes {
-        public static final List<String> UPS_OAUTH_CARRIER_ACCOUNT_TYPES = ImmutableList.of("UpsAccount",
-                "UpsMailInnovationsAccount", "UpsSurepostAccount");
+        public static final List<String> CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH = ImmutableList.of(
+            "AmazonShippingAccount"
+        );
     }
 
     public abstract static class Http {

src/main/java/com/easypost/service/CarrierAccountService.java

@@ -93,7 +93,7 @@ public CarrierAccount update(String id, final Map<String, Object> params) throws
         Map<String, Object> wrappedParams = new HashMap<String, Object>();
         wrappedParams.put(selectTopLayerKey(type), params);
 
-        String endpoint = (Constants.UpsAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(type) 
+        String endpoint = (Constants.CarrierAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(type) 
                   ? "ups_oauth_registrations/"
                   : "carrier_accounts/") + id;
 
@@ -121,10 +121,12 @@ public void delete(String id) throws EasyPostException {
      * @return The endpoint for the carrier account creation request.
      */
     private static String selectCarrierAccountCreationEndpoint(final String carrierAccountType) {
-        if (Constants.CarrierAccountTypes.CARRIER_TYPES_WITH_CUSTOM_WORKFLOW.contains(carrierAccountType)) {
+        if (Constants.CarrierAccountTypes.CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_WORKFLOW.contains(carrierAccountType)) {
             return "carrier_accounts/register";
-        } else if (Constants.UpsAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(carrierAccountType)) {
+        } else if (Constants.CarrierAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(carrierAccountType)) {
             return "ups_oauth_registrations";
+        } else if (Constants.CarrierAccountTypes.CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH.contains(carrierAccountType)) {
+            return "carrier_accounts/register_oauth";
         } else {
             return "carrier_accounts";
         }
@@ -143,8 +145,12 @@ private static String selectTopLayerKey(final String carrierAccountType) throws
                     String.format(Constants.ErrorMessages.MISSING_REQUIRED_PARAMETER, "carrier account type"));
         }
 
-        return Constants.UpsAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(carrierAccountType)
-            ? "ups_oauth_registrations"
-            : "carrier_account";
+        if (Constants.CarrierAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(carrierAccountType)) {
+            return "ups_oauth_registrations";
+        } else if (Constants.CarrierAccountTypes.CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH.contains(carrierAccountType)) {
+            return "carrier_account_oauth_registrations";
+        } else {
+            return "carrier_account";
+        }
     }
 }

src/test/java/com/easypost/CarrierAccountTest.java

@@ -43,9 +43,18 @@ private static CarrierAccount createUpsCarrierAccount() throws EasyPostException
         data.put("type", "UpsAccount");
         data.put("account_number", "123456789");
 
-        CarrierAccount upsAccount = vcr.client.carrierAccount.create(data);
-        testCarrierAccountId = upsAccount.getId(); // trigger deletion after test
-        return upsAccount;
+        CarrierAccount carrierAccount = vcr.client.carrierAccount.create(data);
+        testCarrierAccountId = carrierAccount.getId(); // trigger deletion after test
+        return carrierAccount;
+    }
+
+    private static CarrierAccount createAmazonCarrierAccount() throws EasyPostException {
+        Map<String, Object> data = new HashMap<>();
+        data.put("type", "AmazonShippingAccount");
+
+        CarrierAccount carrierAccount = vcr.client.carrierAccount.create(data);
+        testCarrierAccountId = carrierAccount.getId(); // trigger deletion after test
+        return carrierAccount;
     }
 
     /**
@@ -126,11 +135,27 @@ public void testCreateWithCustomWorkflow() throws EasyPostException {
     public void testCreateWithUPS() throws EasyPostException {
         vcr.setUpTest("create_with_ups");
 
-        CarrierAccount upsAccount = createUpsCarrierAccount();
+        CarrierAccount carrierAccount = createUpsCarrierAccount();
 
-        assertInstanceOf(CarrierAccount.class, upsAccount);
-        assertTrue(upsAccount.getId().startsWith("ca_"));
-        assertEquals("UpsAccount", upsAccount.getType());
+        assertInstanceOf(CarrierAccount.class, carrierAccount);
+        assertTrue(carrierAccount.getId().startsWith("ca_"));
+        assertEquals("UpsAccount", carrierAccount.getType());
+    }
+
+    /**
+     * Test creating an Amazon carrier account.
+     *
+     * @throws EasyPostException when the request fails.
+     */
+    @Test
+    public void testCreateWithAmazon() throws EasyPostException {
+        // vcr.setUpTest("create_with_amazon");
+
+        CarrierAccount carrierAccount = createAmazonCarrierAccount();
+
+        assertInstanceOf(CarrierAccount.class, carrierAccount);
+        assertTrue(carrierAccount.getId().startsWith("ca_"));
+        assertEquals("AmazonShippingAccount", carrierAccount.getType());
     }
 
     /**
@@ -197,15 +222,15 @@ public void testUpdate() throws EasyPostException {
     public void testUpdateUpsAccount() throws EasyPostException {
         vcr.setUpTest("update_ups");
 
-        CarrierAccount upsAccount = createUpsCarrierAccount();
+        CarrierAccount carrierAccount = createUpsCarrierAccount();
         Map<String, Object> updateParams = new HashMap<>();
         updateParams.put("account_number", "987654321");
 
-        CarrierAccount updatedUpsAccount = vcr.client.carrierAccount.update(upsAccount.getId(), updateParams);
+        CarrierAccount updatedCarrierAccount = vcr.client.carrierAccount.update(carrierAccount.getId(), updateParams);
 
-        assertInstanceOf(CarrierAccount.class, updatedUpsAccount);
-        assertTrue(updatedUpsAccount.getId().startsWith("ca_"));
-        assertEquals("UpsAccount", updatedUpsAccount.getType());
+        assertInstanceOf(CarrierAccount.class, updatedCarrierAccount);
+        assertTrue(updatedCarrierAccount.getId().startsWith("ca_"));
+        assertEquals("UpsAccount", updatedCarrierAccount.getType());
     }
 
     /**