Details
diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
index 8e5c0b3..2b916bf 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
@@ -19,16 +19,15 @@ package com.ning.billing.account.api;
import java.util.List;
import java.util.UUID;
-import com.google.inject.Inject;
-import com.ning.billing.util.clock.Clock;
import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.util.customfield.CustomizableEntityBase;
import com.ning.billing.util.tag.DefaultTagStore;
import com.ning.billing.util.tag.DescriptiveTag;
import com.ning.billing.util.tag.Tag;
import com.ning.billing.util.tag.TagDefinition;
-import org.joda.time.DateTimeZone;
public class DefaultAccount extends CustomizableEntityBase implements Account {
//public final static String OBJECT_TYPE = "Account";
@@ -68,13 +67,19 @@ public class DefaultAccount extends CustomizableEntityBase implements Account {
data.getPostalCode(), data.getPhone(), createdDate, createdDate);
}
- /**
- * This call is used to migrate an account
- * @param data
- * @param createdDate
- */
- public DefaultAccount(final AccountData data, DateTime createdDate, DateTime updatedDate) {
- this(UUID.randomUUID(), data.getExternalKey(), data.getEmail(), data.getName(), data.getFirstNameLength(),
+ //intended for creation
+ public DefaultAccount(final AccountData data) {
+ this(UUID.randomUUID(), data, null, null);
+ }
+
+ // Intended for migration
+ public DefaultAccount(final AccountData data, DateTime createdDate, DateTime updatedDate) {
+ this(UUID.randomUUID(), data, createdDate, updatedDate);
+ }
+
+ //intended for update
+ public DefaultAccount(final UUID id, final AccountData data, DateTime createdDate, DateTime updatedDate) {
+ this(id, data.getExternalKey(), data.getEmail(), data.getName(), data.getFirstNameLength(),
data.getCurrency(), data.getBillCycleDay(), data.getPaymentProviderName(),
data.getTimeZone(), data.getLocale(),
data.getAddress1(), data.getAddress2(), data.getCompanyName(),
diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
index a6e2b7e..f2943b5 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
@@ -24,6 +24,7 @@ import com.ning.billing.account.api.Account;
import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.account.api.AccountData;
import com.ning.billing.account.api.DefaultAccount;
+import com.ning.billing.account.api.MigrationAccountData;
import com.ning.billing.account.dao.AccountDao;
import com.ning.billing.util.clock.Clock;
import com.ning.billing.util.customfield.CustomField;
@@ -78,4 +79,17 @@ public class DefaultAccountUserApi implements com.ning.billing.account.api.Accou
public void deleteAccountByKey(String externalKey) throws AccountApiException {
dao.deleteByKey(externalKey);
}
+
+ @Override
+ public Account migrateAccount(MigrationAccountData data,
+ List<CustomField> fields, List<Tag> tags)
+ throws AccountApiException {
+
+ Account account = new DefaultAccount(data);
+ account.addFields(fields);
+ account.addTags(tags);
+
+ dao.create(account);
+ return account;
+ }
}
diff --git a/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java b/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java
index 28f0107..26239aa 100644
--- a/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java
+++ b/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java
@@ -117,4 +117,13 @@ public class MockAccountUserApi implements AccountUserApi {
}
}
+
+ @Override
+ public Account migrateAccount(MigrationAccountData data,
+ List<CustomField> fields, List<Tag> tags)
+ throws AccountApiException {
+ Account result = new DefaultAccount(data, data.getCreatedDate(), data.getUpdatedDate());
+ accounts.add(result);
+ return result;
+ }
}
diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockIAccountUserApi.java b/analytics/src/test/java/com/ning/billing/analytics/MockIAccountUserApi.java
index 0722494..647599e 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockIAccountUserApi.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockIAccountUserApi.java
@@ -20,9 +20,11 @@ import java.util.List;
import java.util.UUID;
import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.account.api.AccountData;
import com.ning.billing.account.api.AccountUserApi;
import com.ning.billing.account.api.DefaultAccount;
+import com.ning.billing.account.api.MigrationAccountData;
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.util.clock.Clock;
import com.ning.billing.util.customfield.CustomField;
@@ -78,4 +80,11 @@ public class MockIAccountUserApi implements AccountUserApi
public void deleteAccountByKey(String externalKey) {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public Account migrateAccount(MigrationAccountData data,
+ List<CustomField> fields, List<Tag> tags)
+ throws AccountApiException {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/api/src/main/java/com/ning/billing/account/api/AccountUserApi.java b/api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
index e208c83..1af57dc 100644
--- a/api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
+++ b/api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
@@ -25,6 +25,8 @@ public interface AccountUserApi {
public Account createAccount(AccountData data, List<CustomField> fields, List<Tag> tags) throws AccountApiException;
+ public Account migrateAccount(MigrationAccountData data, List<CustomField> fields, List<Tag> tags) throws AccountApiException;
+
/***
*
* Note: does not update the external key
diff --git a/api/src/main/java/com/ning/billing/account/api/MigrationAccountData.java b/api/src/main/java/com/ning/billing/account/api/MigrationAccountData.java
new file mode 100644
index 0000000..34f7023
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/account/api/MigrationAccountData.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.account.api;
+
+import org.joda.time.DateTime;
+
+public interface MigrationAccountData extends AccountData {
+
+ public DateTime getCreatedDate();
+
+ public DateTime getUpdatedDate();
+}
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
index 967d8b6..514779c 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
@@ -23,6 +23,7 @@ import com.ning.billing.account.api.Account;
import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.account.api.AccountData;
import com.ning.billing.account.api.AccountUserApi;
+import com.ning.billing.account.api.MigrationAccountData;
import com.ning.billing.util.customfield.CustomField;
import com.ning.billing.util.tag.Tag;
@@ -66,4 +67,11 @@ public class BrainDeadAccountUserApi implements AccountUserApi {
throw new UnsupportedOperationException();
}
+ @Override
+ public Account migrateAccount(MigrationAccountData data,
+ List<CustomField> fields, List<Tag> tags)
+ throws AccountApiException {
+ throw new UnsupportedOperationException();
+ }
+
}
