Details
diff --git a/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java b/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java
index 5ad1b4c..f52c25c 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java
@@ -39,7 +39,7 @@ import com.ning.billing.analytics.BusinessSubscriptionTransitionDao;
import com.ning.billing.analytics.BusinessTagDao;
import com.ning.billing.analytics.api.TimeSeriesData;
import com.ning.billing.analytics.dao.AnalyticsDao;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessAccountTag;
import com.ning.billing.analytics.model.BusinessInvoice;
import com.ning.billing.analytics.model.BusinessInvoiceItem;
@@ -280,7 +280,7 @@ public class DefaultAnalyticsUserApi implements AnalyticsUserApi {
// Note: the following is not exposed in api yet, as the models need to be extracted first
- public BusinessAccount getAccountByKey(final String accountKey, final TenantContext context) {
+ public BusinessAccountModelDao getAccountByKey(final String accountKey, final TenantContext context) {
return analyticsDao.getAccountByKey(accountKey, internalCallContextFactory.createInternalTenantContext(context));
}
diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountDao.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountDao.java
index 2977ace..f041e0c 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountDao.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import com.ning.billing.account.api.Account;
import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.analytics.dao.BusinessAccountSqlDao;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.invoice.api.Invoice;
import com.ning.billing.payment.api.Payment;
import com.ning.billing.payment.api.PaymentApi;
@@ -67,11 +67,11 @@ public class BusinessAccountDao {
try {
account = accountApi.getAccountById(accountId, context);
} catch (AccountApiException e) {
- log.warn("Error encountered creating BusinessAccount", e);
+ log.warn("Error encountered creating BusinessAccountModelDao", e);
return;
}
- final BusinessAccount bac = createBusinessAccountFromAccount(account, context);
+ final BusinessAccountModelDao bac = createBusinessAccountFromAccount(account, context);
sqlDao.inTransaction(new Transaction<Void, BusinessAccountSqlDao>() {
@Override
public Void inTransaction(final BusinessAccountSqlDao transactional, final TransactionStatus status) throws Exception {
@@ -82,16 +82,16 @@ public class BusinessAccountDao {
}
// Called also from BusinessInvoiceDao and BusinessInvoicePaymentDao.
- // Note: computing the BusinessAccount object is fairly expensive, hence should be done outside of the transaction
- public void updateAccountInTransaction(final BusinessAccount bac, final BusinessAccountSqlDao transactional, final InternalCallContext context) {
+ // Note: computing the BusinessAccountModelDao object is fairly expensive, hence should be done outside of the transaction
+ public void updateAccountInTransaction(final BusinessAccountModelDao bac, final BusinessAccountSqlDao transactional, final InternalCallContext context) {
log.info("ACCOUNT UPDATE " + bac);
transactional.deleteAccount(bac.getAccountId().toString(), context);
// Note! There is a window of doom here since we use read committed transactional level by default
transactional.createAccount(bac, context);
}
- public BusinessAccount createBusinessAccountFromAccount(final Account account, final InternalTenantContext context) {
- final BusinessAccount bac = new BusinessAccount(account);
+ public BusinessAccountModelDao createBusinessAccountFromAccount(final Account account, final InternalTenantContext context) {
+ final BusinessAccountModelDao bac = new BusinessAccountModelDao(account);
try {
LocalDate lastInvoiceDate = bac.getLastInvoiceDate();
diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoiceDao.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoiceDao.java
index 6d59d8c..067ef91 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoiceDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoiceDao.java
@@ -35,7 +35,7 @@ import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.analytics.dao.BusinessAccountSqlDao;
import com.ning.billing.analytics.dao.BusinessInvoiceItemSqlDao;
import com.ning.billing.analytics.dao.BusinessInvoiceSqlDao;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessInvoice;
import com.ning.billing.analytics.model.BusinessInvoiceItem;
import com.ning.billing.catalog.api.CatalogApiException;
@@ -111,7 +111,7 @@ public class BusinessInvoiceDao {
}
// Update the account record
- final BusinessAccount bac = businessAccountDao.createBusinessAccountFromAccount(account, context);
+ final BusinessAccountModelDao bac = businessAccountDao.createBusinessAccountFromAccount(account, context);
// Delete and recreate invoice and invoice items in the transaction
sqlDao.inTransaction(new Transaction<Void, BusinessInvoiceSqlDao>() {
diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java
index fca6f3f..9d547d0 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessInvoicePaymentDao.java
@@ -32,7 +32,7 @@ import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.analytics.dao.BusinessAccountSqlDao;
import com.ning.billing.analytics.dao.BusinessInvoicePaymentSqlDao;
import com.ning.billing.analytics.dao.BusinessInvoiceSqlDao;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessInvoicePayment;
import com.ning.billing.invoice.api.Invoice;
import com.ning.billing.invoice.api.InvoiceApiException;
@@ -167,7 +167,7 @@ public class BusinessInvoicePaymentDao {
linkedInvoicePaymentId);
// Update the account record
- final BusinessAccount bac = accountDao.createBusinessAccountFromAccount(account, context);
+ final BusinessAccountModelDao bac = accountDao.createBusinessAccountFromAccount(account, context);
// Make sure to limit the scope of the transaction to avoid InnoDB deadlocks
invoicePaymentSqlDao.inTransaction(new Transaction<Void, BusinessInvoicePaymentSqlDao>() {
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsDao.java
index 7c4ab6c..af54b2b 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/AnalyticsDao.java
@@ -19,7 +19,7 @@ package com.ning.billing.analytics.dao;
import java.util.List;
import com.ning.billing.analytics.api.TimeSeriesData;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessAccountTag;
import com.ning.billing.analytics.model.BusinessInvoice;
import com.ning.billing.analytics.model.BusinessInvoiceItem;
@@ -34,7 +34,7 @@ public interface AnalyticsDao {
TimeSeriesData getSubscriptionsCreatedOverTime(String productType, String slug, InternalTenantContext context);
- BusinessAccount getAccountByKey(String accountKey, InternalTenantContext context);
+ BusinessAccountModelDao getAccountByKey(String accountKey, InternalTenantContext context);
List<BusinessSubscriptionTransition> getTransitionsByKey(String externalKey, InternalTenantContext context);
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountBinder.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountBinder.java
index 5f062fa..6782a2c 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountBinder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountBinder.java
@@ -30,7 +30,7 @@ import org.skife.jdbi.v2.sqlobject.Binder;
import org.skife.jdbi.v2.sqlobject.BinderFactory;
import org.skife.jdbi.v2.sqlobject.BindingAnnotation;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
@BindingAnnotation(BusinessAccountBinder.BacBinderFactory.class)
@Retention(RetentionPolicy.RUNTIME)
@@ -38,8 +38,8 @@ import com.ning.billing.analytics.model.BusinessAccount;
public @interface BusinessAccountBinder {
public static class BacBinderFactory implements BinderFactory {
public Binder build(final Annotation annotation) {
- return new Binder<BusinessAccountBinder, BusinessAccount>() {
- public void bind(final SQLStatement q, final BusinessAccountBinder bind, final BusinessAccount account) {
+ return new Binder<BusinessAccountBinder, BusinessAccountModelDao>() {
+ public void bind(final SQLStatement q, final BusinessAccountBinder bind, final BusinessAccountModelDao account) {
final DateTime dateTimeNow = new DateTime(DateTimeZone.UTC);
if (account.getCreatedDt() != null) {
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountMapper.java
index 4c48746..0fe0cdc 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountMapper.java
@@ -26,14 +26,14 @@ import org.joda.time.DateTimeZone;
import org.skife.jdbi.v2.StatementContext;
import org.skife.jdbi.v2.tweak.ResultSetMapper;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.util.dao.MapperBase;
-public class BusinessAccountMapper extends MapperBase implements ResultSetMapper<BusinessAccount> {
+public class BusinessAccountMapper extends MapperBase implements ResultSetMapper<BusinessAccountModelDao> {
@Override
- public BusinessAccount map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
- return new BusinessAccount(
+ public BusinessAccountModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
+ return new BusinessAccountModelDao(
UUID.fromString(r.getString(1)),
r.getString(2),
r.getString(6),
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountSqlDao.java
index f223626..cc5f054 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountSqlDao.java
@@ -26,7 +26,7 @@ import org.skife.jdbi.v2.sqlobject.mixins.Transactional;
import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.util.callcontext.InternalCallContext;
import com.ning.billing.util.callcontext.InternalTenantContext;
import com.ning.billing.util.callcontext.InternalTenantContextBinder;
@@ -39,19 +39,19 @@ public interface BusinessAccountSqlDao extends Transactional<BusinessAccountSqlD
List<TimeSeriesTuple> getAccountsCreatedOverTime(@InternalTenantContextBinder final InternalTenantContext context);
@SqlQuery
- BusinessAccount getAccount(@Bind("account_id") final String accountId,
+ BusinessAccountModelDao getAccount(@Bind("account_id") final String accountId,
@InternalTenantContextBinder final InternalTenantContext context);
@SqlQuery
- BusinessAccount getAccountByKey(@Bind("account_key") String accountKey,
+ BusinessAccountModelDao getAccountByKey(@Bind("account_key") String accountKey,
@InternalTenantContextBinder final InternalTenantContext context);
@SqlUpdate
- int createAccount(@BusinessAccountBinder final BusinessAccount account,
+ int createAccount(@BusinessAccountBinder final BusinessAccountModelDao account,
@InternalTenantContextBinder final InternalCallContext context);
@SqlUpdate
- int saveAccount(@BusinessAccountBinder final BusinessAccount account,
+ int saveAccount(@BusinessAccountBinder final BusinessAccountModelDao account,
@InternalTenantContextBinder final InternalCallContext context);
@SqlUpdate
diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java
index e91c988..0de5ed3 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java
@@ -22,7 +22,7 @@ import javax.inject.Inject;
import com.ning.billing.analytics.api.DefaultTimeSeriesData;
import com.ning.billing.analytics.api.TimeSeriesData;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessAccountTag;
import com.ning.billing.analytics.model.BusinessInvoice;
import com.ning.billing.analytics.model.BusinessInvoiceItem;
@@ -69,7 +69,7 @@ public class DefaultAnalyticsDao implements AnalyticsDao {
}
@Override
- public BusinessAccount getAccountByKey(final String accountKey, final InternalTenantContext context) {
+ public BusinessAccountModelDao getAccountByKey(final String accountKey, final InternalTenantContext context) {
return accountSqlDao.getAccountByKey(accountKey, context);
}
diff --git a/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java b/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
index 6012be1..91274b3 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
@@ -46,7 +46,7 @@ import com.ning.billing.analytics.dao.BusinessInvoiceSqlDao;
import com.ning.billing.analytics.dao.BusinessOverdueStatusSqlDao;
import com.ning.billing.analytics.dao.BusinessSubscriptionTransitionSqlDao;
import com.ning.billing.analytics.dao.DefaultAnalyticsDao;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessSubscription;
import com.ning.billing.analytics.model.BusinessSubscriptionEvent;
import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
@@ -109,7 +109,7 @@ public class TestDefaultAnalyticsUserApi extends AnalyticsTestSuiteWithEmbeddedD
@Test(groups = "slow")
public void testAccountsCreatedOverTime() throws Exception {
- final BusinessAccount account = new BusinessAccount(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
+ final BusinessAccountModelDao account = new BusinessAccountModelDao(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "FRANCE", "USD", clock.getUTCNow(), clock.getUTCNow());
accountSqlDao.createAccount(account, internalCallContext);
diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
index a263962..611fe58 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
@@ -33,7 +33,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
import com.ning.billing.analytics.MockDuration;
import com.ning.billing.analytics.MockPhase;
import com.ning.billing.analytics.MockProduct;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessSubscription;
import com.ning.billing.analytics.model.BusinessSubscriptionEvent;
import com.ning.billing.analytics.model.BusinessSubscriptionTransition;
@@ -69,7 +69,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
private BusinessSubscriptionTransitionSqlDao businessSubscriptionTransitionSqlDao;
private BusinessSubscriptionTransition transition;
private BusinessAccountSqlDao businessAccountSqlDao;
- private BusinessAccount account;
+ private BusinessAccountModelDao account;
private final CatalogService catalogService = Mockito.mock(CatalogService.class);
private final Catalog catalog = Mockito.mock(Catalog.class);
@@ -106,7 +106,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
}
private void setupBusinessAccount() {
- account = new BusinessAccount(UUID.randomUUID(), ACCOUNT_KEY, UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
+ account = new BusinessAccountModelDao(UUID.randomUUID(), ACCOUNT_KEY, UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "FRANCE", CURRENCY, clock.getUTCNow(), clock.getUTCNow());
final IDBI dbi = helper.getDBI();
@@ -277,7 +277,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
public void testCreateSaveAndRetrieveAccounts() {
// Create and retrieve an account
businessAccountSqlDao.createAccount(account, internalCallContext);
- final BusinessAccount foundAccount = businessAccountSqlDao.getAccountByKey(ACCOUNT_KEY, internalCallContext);
+ final BusinessAccountModelDao foundAccount = businessAccountSqlDao.getAccountByKey(ACCOUNT_KEY, internalCallContext);
Assert.assertEquals(foundAccount.getCreatedDt().getMillis(), account.getCreatedDt().getMillis());
Assert.assertEquals(foundAccount.getUpdatedDt().getMillis(), account.getUpdatedDt().getMillis());
Assert.assertTrue(foundAccount.equals(account));
diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccount.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccount.java
index dfd5b5d..23a3132 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccount.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccount.java
@@ -33,11 +33,11 @@ public class TestBusinessAccount extends AnalyticsTestSuite {
private final Clock clock = new DefaultClock();
- private BusinessAccount account;
+ private BusinessAccountModelDao account;
@BeforeMethod(groups = "fast")
public void setUp() throws Exception {
- account = new BusinessAccount(UUID.randomUUID(), "pierre", UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
+ account = new BusinessAccountModelDao(UUID.randomUUID(), "pierre", UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "", UUID.randomUUID().toString(),
clock.getUTCNow(), clock.getUTCNow());
}
@@ -48,7 +48,7 @@ public class TestBusinessAccount extends AnalyticsTestSuite {
Assert.assertEquals(account, account);
Assert.assertTrue(account.equals(account));
- final BusinessAccount otherAccount = new BusinessAccount(UUID.randomUUID(), "pierre cardin", UUID.randomUUID().toString(),
+ final BusinessAccountModelDao otherAccount = new BusinessAccountModelDao(UUID.randomUUID(), "pierre cardin", UUID.randomUUID().toString(),
BigDecimal.ONE, clock.getUTCToday(),
BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa",
"", UUID.randomUUID().toString(), clock.getUTCNow(), clock.getUTCNow());
@@ -58,7 +58,7 @@ public class TestBusinessAccount extends AnalyticsTestSuite {
@Test(groups = "fast")
public void testDefaultBigDecimalValues() throws Exception {
final Account account = Mockito.mock(Account.class);
- final BusinessAccount bac = new BusinessAccount(account);
+ final BusinessAccountModelDao bac = new BusinessAccountModelDao(account);
Assert.assertEquals(bac.getBalance(), BigDecimal.ZERO);
Assert.assertEquals(bac.getTotalInvoiceBalance(), BigDecimal.ZERO);
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java
index 8be18d4..3a0a12b 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java
@@ -34,7 +34,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.MutableAccountData;
-import com.ning.billing.analytics.model.BusinessAccount;
+import com.ning.billing.analytics.model.BusinessAccountModelDao;
import com.ning.billing.analytics.model.BusinessAccountTag;
import com.ning.billing.analytics.model.BusinessInvoice;
import com.ning.billing.analytics.model.BusinessInvoiceItem;
@@ -350,7 +350,7 @@ public class TestAnalytics extends TestIntegrationBase {
waitALittle();
// Verify Analytics got the account creation event
- final BusinessAccount businessAccount = analyticsUserApi.getAccountByKey(account.getExternalKey(), callContext);
+ final BusinessAccountModelDao businessAccount = analyticsUserApi.getAccountByKey(account.getExternalKey(), callContext);
Assert.assertNotNull(businessAccount);
// No balance yet
Assert.assertEquals(businessAccount.getBalance().doubleValue(), Rounder.round(BigDecimal.ZERO));
@@ -387,7 +387,7 @@ public class TestAnalytics extends TestIntegrationBase {
waitALittle();
// Verify Analytics got the account update event
- final BusinessAccount businessAccount = analyticsUserApi.getAccountByKey(mutableAccountData.getExternalKey(), callContext);
+ final BusinessAccountModelDao businessAccount = analyticsUserApi.getAccountByKey(mutableAccountData.getExternalKey(), callContext);
Assert.assertNotNull(businessAccount);
// No balance yet
Assert.assertEquals(businessAccount.getBalance().doubleValue(), Rounder.round(BigDecimal.ZERO));
@@ -452,7 +452,7 @@ public class TestAnalytics extends TestIntegrationBase {
verifyBSTWithTrialAndEvergreenPhases(account, bundle, subscription);
// Make sure the account balance is still zero
- final BusinessAccount businessAccount = analyticsUserApi.getAccountByKey(account.getExternalKey(), callContext);
+ final BusinessAccountModelDao businessAccount = analyticsUserApi.getAccountByKey(account.getExternalKey(), callContext);
Assert.assertEquals(businessAccount.getBalance().doubleValue(), Rounder.round(BigDecimal.ZERO));
Assert.assertEquals(businessAccount.getTotalInvoiceBalance().doubleValue(), Rounder.round(BigDecimal.ZERO));
