killbill-aplcache
Changes
analytics/pom.xml 1(+1 -0)
analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionRecorder.java 4(+2 -2)
entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java 3(+2 -1)
invoice/src/main/resources/com/ning/billing/invoice/dao/FixedPriceInvoiceItemSqlDao.sql.stg 6(+3 -3)
Details
analytics/pom.xml 1(+1 -0)
diff --git a/analytics/pom.xml b/analytics/pom.xml
index d5fff4c..b6f27c9 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -65,6 +65,7 @@
<dependency>
<groupId>com.ning.billing</groupId>
<artifactId>killbill-catalog</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscription.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscription.java
index 5df945e..ddcc9c7 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscription.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscription.java
@@ -91,7 +91,7 @@ public class BusinessSubscription
*/
BusinessSubscription(final Subscription subscription, final Currency currency)
{
- this(subscription.getCurrentPriceList().getName(), subscription.getCurrentPlan(), subscription.getCurrentPhase(), currency, subscription.getStartDate(), subscription.getState(), subscription.getId(), subscription.getBundleId());
+ this(subscription.getCurrentPriceList() == null ? null : subscription.getCurrentPriceList().getName(), subscription.getCurrentPlan(), subscription.getCurrentPhase(), currency, subscription.getStartDate(), subscription.getState(), subscription.getId(), subscription.getBundleId());
}
public BusinessSubscription(final String priceList, final Plan currentPlan, final PlanPhase currentPhase, final Currency currency, final DateTime startDate, final SubscriptionState state, final UUID subscriptionId, final UUID bundleId)
diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionRecorder.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionRecorder.java
index f95b75c..69b289d 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionRecorder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionRecorder.java
@@ -115,7 +115,7 @@ public class BusinessSubscriptionTransitionRecorder
prevSubscription = null;
}
else {
- prevSubscription = new BusinessSubscription(transition.getPreviousPriceList().getName(), transition.getPreviousPlan(), transition.getPreviousPhase(), currency, previousEffectiveTransitionTime, transition.getPreviousState(), transition.getSubscriptionId(), transition.getBundleId());
+ prevSubscription = new BusinessSubscription(transition.getPreviousPriceList() == null ? null : transition.getPreviousPriceList().getName(), transition.getPreviousPlan(), transition.getPreviousPhase(), currency, previousEffectiveTransitionTime, transition.getPreviousState(), transition.getSubscriptionId(), transition.getBundleId());
}
final BusinessSubscription nextSubscription;
@@ -124,7 +124,7 @@ public class BusinessSubscriptionTransitionRecorder
nextSubscription = null;
}
else {
- nextSubscription = new BusinessSubscription(transition.getNextPriceList().getName(), transition.getNextPlan(), transition.getNextPhase(), currency, transition.getEffectiveTransitionTime(), transition.getNextState(), transition.getSubscriptionId(), transition.getBundleId());
+ nextSubscription = new BusinessSubscription(transition.getNextPriceList() == null ? null : transition.getNextPriceList().getName(), transition.getNextPlan(), transition.getNextPhase(), currency, transition.getEffectiveTransitionTime(), transition.getNextState(), transition.getSubscriptionId(), transition.getBundleId());
}
record(transition.getId(), transitionKey, accountKey, transition.getRequestedTransitionTime(), event, prevSubscription, nextSubscription);
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
index b7c3e7d..86303ab 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
@@ -27,6 +27,7 @@ import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.inject.Inject;
import com.ning.billing.account.api.Account;
import com.ning.billing.account.api.AccountUserApi;
import com.ning.billing.account.api.MutableAccountData;
@@ -51,7 +52,7 @@ public class DefaultEntitlementBillingApi implements EntitlementBillingApi {
private final AccountUserApi accountApi;
private final BillCycleDayCalculator bcdCalculator;
-
+ @Inject
public DefaultEntitlementBillingApi(final CallContextFactory factory, final EntitlementDao dao, final AccountUserApi accountApi, final BillCycleDayCalculator bcdCalculator) {
super();
this.factory = factory;
diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
index 13272c4..9601455 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
@@ -372,9 +372,11 @@ public class DefaultInvoiceDao implements InvoiceDao {
addInvoiceItemsToChargeThroughDates(chargeThroughDates, recurringItems);
for (UUID subscriptionId : chargeThroughDates.keySet()) {
- DateTime chargeThroughDate = chargeThroughDates.get(subscriptionId);
- log.info("Setting CTD for subscription {} to {}", subscriptionId.toString(), chargeThroughDate.toString());
- entitlementBillingApi.setChargedThroughDateFromTransaction(dao, subscriptionId, chargeThroughDate);
+ if(subscriptionId != null) {
+ DateTime chargeThroughDate = chargeThroughDates.get(subscriptionId);
+ log.info("Setting CTD for subscription {} to {}", subscriptionId.toString(), chargeThroughDate.toString());
+ entitlementBillingApi.setChargedThroughDateFromTransaction(dao, subscriptionId, chargeThroughDate);
+ }
}
}
diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/FixedPriceInvoiceItemSqlDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/FixedPriceInvoiceItemSqlDao.java
index a895102..b89c68b 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/FixedPriceInvoiceItemSqlDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/FixedPriceInvoiceItemSqlDao.java
@@ -81,8 +81,8 @@ public interface FixedPriceInvoiceItemSqlDao extends EntityDao<InvoiceItem> {
q.bind("id", item.getId().toString());
q.bind("accountId", item.getAccountId().toString());
q.bind("invoiceId", item.getInvoiceId().toString());
- q.bind("bundleId", item.getBundleId().toString());
- q.bind("subscriptionId", item.getSubscriptionId().toString());
+ q.bind("bundleId", item.getBundleId() == null ? null : item.getBundleId().toString());
+ q.bind("subscriptionId", item.getSubscriptionId() == null ? null : item.getSubscriptionId().toString());
q.bind("planName", item.getPlanName());
q.bind("phaseName", item.getPhaseName());
q.bind("startDate", item.getStartDate().toDate());
@@ -101,8 +101,8 @@ public interface FixedPriceInvoiceItemSqlDao extends EntityDao<InvoiceItem> {
UUID id = UUID.fromString(result.getString("id"));
UUID invoiceId = UUID.fromString(result.getString("invoice_id"));
UUID accountId = UUID.fromString(result.getString("account_id"));
- UUID bundleId = UUID.fromString(result.getString("bundle_id"));
- UUID subscriptionId = UUID.fromString(result.getString("subscription_id"));
+ UUID bundleId = result.getString("bundle_id") == null ? null :UUID.fromString(result.getString("bundle_id"));
+ UUID subscriptionId = result.getString("subscription_id") == null ? null : UUID.fromString(result.getString("subscription_id"));
String planName = result.getString("plan_name");
String phaseName = result.getString("phase_name");
DateTime startDate = new DateTime(result.getTimestamp("start_date"));
diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.java
index c00d613..46c5153 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.java
@@ -80,8 +80,8 @@ public interface RecurringInvoiceItemSqlDao extends EntityDao<InvoiceItem> {
q.bind("id", item.getId().toString());
q.bind("invoiceId", item.getInvoiceId().toString());
q.bind("accountId", item.getAccountId().toString());
- q.bind("bundleId", item.getBundleId().toString());
- q.bind("subscriptionId", item.getSubscriptionId().toString());
+ q.bind("bundleId", item.getBundleId() == null ? null : item.getBundleId().toString());
+ q.bind("subscriptionId", item.getSubscriptionId() == null ? null : item.getSubscriptionId().toString());
q.bind("planName", item.getPlanName());
q.bind("phaseName", item.getPhaseName());
q.bind("startDate", item.getStartDate().toDate());
@@ -102,8 +102,8 @@ public interface RecurringInvoiceItemSqlDao extends EntityDao<InvoiceItem> {
UUID id = UUID.fromString(result.getString("id"));
UUID invoiceId = UUID.fromString(result.getString("invoice_id"));
UUID accountId = UUID.fromString(result.getString("account_id"));
- UUID subscriptionId = UUID.fromString(result.getString("subscription_id"));
- UUID bundleId = UUID.fromString(result.getString("bundle_id"));
+ UUID subscriptionId = result.getString("subscription_id") == null ? null : UUID.fromString(result.getString("subscription_id"));
+ UUID bundleId = result.getString("bundle_id") == null ? null : UUID.fromString(result.getString("bundle_id"));
String planName = result.getString("plan_name");
String phaseName = result.getString("phase_name");
DateTime startDate = new DateTime(result.getTimestamp("start_date"));
diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/FixedPriceInvoiceItem.java b/invoice/src/main/java/com/ning/billing/invoice/model/FixedPriceInvoiceItem.java
index 643e2b4..8c2398b 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/FixedPriceInvoiceItem.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/FixedPriceInvoiceItem.java
@@ -16,13 +16,14 @@
package com.ning.billing.invoice.model;
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.invoice.api.InvoiceItem;
-import org.joda.time.DateTime;
-
import java.math.BigDecimal;
import java.util.UUID;
+import org.joda.time.DateTime;
+
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.invoice.api.InvoiceItem;
+
public class FixedPriceInvoiceItem extends InvoiceItemBase {
public FixedPriceInvoiceItem(UUID invoiceId, UUID accountId, UUID bundleId, UUID subscriptionId, String planName, String phaseName,
@@ -30,7 +31,7 @@ public class FixedPriceInvoiceItem extends InvoiceItemBase {
super(invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, currency);
}
- public FixedPriceInvoiceItem(UUID id, UUID invoiceId, UUID bundleId, UUID accountId, UUID subscriptionId, String planName, String phaseName,
+ public FixedPriceInvoiceItem(UUID id, UUID invoiceId, UUID accountId, UUID bundleId, UUID subscriptionId, String planName, String phaseName,
DateTime startDate, DateTime endDate, BigDecimal amount, Currency currency,
String createdBy, DateTime createdDate) {
super(id, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, currency, createdBy, createdDate);
@@ -50,6 +51,7 @@ public class FixedPriceInvoiceItem extends InvoiceItemBase {
public int hashCode() {
int result = accountId.hashCode();
result = 31 * result + (subscriptionId != null ? subscriptionId.hashCode() : 0);
+ result = 31 * result + (bundleId != null ? bundleId.hashCode() : 0);
result = 31 * result + (planName != null ? planName.hashCode() : 0);
result = 31 * result + (phaseName != null ? phaseName.hashCode() : 0);
result = 31 * result + (startDate != null ? startDate.hashCode() : 0);
@@ -67,12 +69,17 @@ public class FixedPriceInvoiceItem extends InvoiceItemBase {
FixedPriceInvoiceItem that = (FixedPriceInvoiceItem) item;
int compareAccounts = getAccountId().compareTo(that.getAccountId());
- if (compareAccounts == 0) {
- int compareSubscriptions = getSubscriptionId().compareTo(that.getSubscriptionId());
- if (compareSubscriptions == 0) {
- return getStartDate().compareTo(that.getStartDate());
+ if (compareAccounts == 0 && bundleId != null) {
+ int compareBundles = getBundleId().compareTo(that.getBundleId());
+ if (compareBundles == 0 && subscriptionId != null) {
+ int compareSubscriptions = getSubscriptionId().compareTo(that.getSubscriptionId());
+ if (compareSubscriptions == 0) {
+ return getStartDate().compareTo(that.getStartDate());
+ } else {
+ return compareSubscriptions;
+ }
} else {
- return compareSubscriptions;
+ return compareBundles;
}
} else {
return compareAccounts;
@@ -85,7 +92,8 @@ public class FixedPriceInvoiceItem extends InvoiceItemBase {
sb.append("InvoiceItem = {").append("id = ").append(id.toString()).append(", ");
sb.append("invoiceId = ").append(invoiceId.toString()).append(", ");
sb.append("accountId = ").append(accountId.toString()).append(", ");
- sb.append("subscriptionId = ").append(subscriptionId.toString()).append(", ");
+ sb.append("subscriptionId = ").append(subscriptionId == null ? null : subscriptionId.toString()).append(", ");
+ sb.append("bundleId = ").append(bundleId == null ? null : bundleId.toString()).append(", ");
sb.append("planName = ").append(planName).append(", ");
sb.append("phaseName = ").append(phaseName).append(", ");
sb.append("startDate = ").append(startDate.toString()).append(", ");
@@ -111,6 +119,8 @@ public class FixedPriceInvoiceItem extends InvoiceItemBase {
if (accountId.compareTo(that.accountId) != 0) return false;
if (subscriptionId != null ? !subscriptionId.equals(that.subscriptionId) : that.subscriptionId != null)
return false;
+ if (bundleId != null ? !bundleId.equals(that.bundleId) : that.bundleId != null)
+ return false;
if (amount != null ? amount.compareTo(that.amount) != 0 : that.amount != null) return false;
if (currency != that.currency) return false;
if (startDate != null ? startDate.compareTo(that.startDate) != 0 : that.startDate != null) return false;
diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/RecurringInvoiceItem.java b/invoice/src/main/java/com/ning/billing/invoice/model/RecurringInvoiceItem.java
index b3c47fc..683a610 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/RecurringInvoiceItem.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/RecurringInvoiceItem.java
@@ -102,17 +102,23 @@ public class RecurringInvoiceItem extends InvoiceItemBase {
RecurringInvoiceItem that = (RecurringInvoiceItem) item;
int compareAccounts = getAccountId().compareTo(that.getAccountId());
- if (compareAccounts == 0) {
- int compareSubscriptions = getSubscriptionId().compareTo(that.getSubscriptionId());
- if (compareSubscriptions == 0) {
- int compareStartDates = getStartDate().compareTo(that.getStartDate());
- if (compareStartDates == 0) {
- return getEndDate().compareTo(that.getEndDate());
+ if (compareAccounts == 0 && bundleId != null) {
+ int compareBundles = getBundleId().compareTo(that.getBundleId());
+ if (compareBundles == 0 && subscriptionId != null) {
+
+ int compareSubscriptions = getSubscriptionId().compareTo(that.getSubscriptionId());
+ if (compareSubscriptions == 0) {
+ int compareStartDates = getStartDate().compareTo(that.getStartDate());
+ if (compareStartDates == 0) {
+ return getEndDate().compareTo(that.getEndDate());
+ } else {
+ return compareStartDates;
+ }
} else {
- return compareStartDates;
+ return compareSubscriptions;
}
} else {
- return compareSubscriptions;
+ return compareBundles;
}
} else {
return compareAccounts;
@@ -136,7 +142,10 @@ public class RecurringInvoiceItem extends InvoiceItemBase {
if (rate.compareTo(that.rate) != 0) return false;
if (reversedItemId != null ? !reversedItemId.equals(that.reversedItemId) : that.reversedItemId != null)
return false;
- if (!subscriptionId.equals(that.subscriptionId)) return false;
+ if (subscriptionId != null ? !subscriptionId.equals(that.subscriptionId) : that.subscriptionId != null)
+ return false;
+ if (bundleId != null ? !bundleId.equals(that.bundleId) : that.bundleId != null)
+ return false;
return true;
}
@@ -145,6 +154,7 @@ public class RecurringInvoiceItem extends InvoiceItemBase {
public int hashCode() {
int result = accountId.hashCode();
result = 31 * result + (subscriptionId != null ? subscriptionId.hashCode() : 0);
+ result = 31 * result + (bundleId != null ? bundleId.hashCode() : 0);
result = 31 * result + planName.hashCode();
result = 31 * result + phaseName.hashCode();
result = 31 * result + startDate.hashCode();
@@ -164,6 +174,8 @@ public class RecurringInvoiceItem extends InvoiceItemBase {
sb.append(startDate.toString()).append(", ");
sb.append(endDate.toString()).append(", ");
sb.append(amount.toString()).append(", ");
+ sb.append("subscriptionId = ").append(subscriptionId == null ? null : subscriptionId.toString()).append(", ");
+ sb.append("bundleId = ").append(bundleId == null ? null : bundleId.toString()).append(", ");
return sb.toString();
}
diff --git a/invoice/src/main/resources/com/ning/billing/invoice/dao/FixedPriceInvoiceItemSqlDao.sql.stg b/invoice/src/main/resources/com/ning/billing/invoice/dao/FixedPriceInvoiceItemSqlDao.sql.stg
index f0a06a7..659d876 100644
--- a/invoice/src/main/resources/com/ning/billing/invoice/dao/FixedPriceInvoiceItemSqlDao.sql.stg
+++ b/invoice/src/main/resources/com/ning/billing/invoice/dao/FixedPriceInvoiceItemSqlDao.sql.stg
@@ -4,8 +4,8 @@ fields(prefix) ::= <<
<prefix>id,
<prefix>invoice_id,
<prefix>account_id,
- <prefix>subscription_id,
<prefix>bundle_id,
+ <prefix>subscription_id,
<prefix>plan_name,
<prefix>phase_name,
<prefix>start_date,
@@ -43,13 +43,13 @@ getInvoiceItemsBySubscription() ::= <<
create() ::= <<
INSERT INTO fixed_invoice_items(<fields()>)
- VALUES(:id, :invoiceId, :accountId, :subscriptionId, :planName, :phaseName,
+ VALUES(:id, :invoiceId, :accountId, :bundleId, :subscriptionId, :planName, :phaseName,
:startDate, :endDate, :amount, :currency, :userName, :createdDate);
>>
batchCreateFromTransaction() ::= <<
INSERT INTO fixed_invoice_items(<fields()>)
- VALUES(:id, :invoiceId, :accountId, :subscriptionId, :planName, :phaseName,
+ VALUES(:id, :invoiceId, :accountId, :bundleId, :subscriptionId, :planName, :phaseName,
:startDate, :endDate, :amount, :currency, :userName, :createdDate);
>>
diff --git a/invoice/src/main/resources/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.sql.stg b/invoice/src/main/resources/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.sql.stg
index fbc610b..7573ef3 100644
--- a/invoice/src/main/resources/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.sql.stg
+++ b/invoice/src/main/resources/com/ning/billing/invoice/dao/RecurringInvoiceItemSqlDao.sql.stg
@@ -4,8 +4,8 @@ fields(prefix) ::= <<
<prefix>id,
<prefix>invoice_id,
<prefix>account_id,
- <prefix>subscription_id,
<prefix>bundle_id,
+ <prefix>subscription_id,
<prefix>plan_name,
<prefix>phase_name,
<prefix>start_date,
@@ -45,13 +45,13 @@ getInvoiceItemsBySubscription() ::= <<
create() ::= <<
INSERT INTO recurring_invoice_items(<fields()>)
- VALUES(:id, :invoiceId, :accountId, :subscriptionId, :planName, :phaseName, :startDate, :endDate,
+ VALUES(:id, :invoiceId, :accountId, :bundleId, :subscriptionId, :planName, :phaseName, :startDate, :endDate,
:amount, :rate, :currency, :reversedItemId, :userName, :createdDate);
>>
batchCreateFromTransaction() ::= <<
INSERT INTO recurring_invoice_items(<fields()>)
- VALUES(:id, :invoiceId, :accountId, :subscriptionId, :planName, :phaseName, :startDate, :endDate,
+ VALUES(:id, :invoiceId, :accountId, :bundleId, :subscriptionId, :planName, :phaseName, :startDate, :endDate,
:amount, :rate, :currency, :reversedItemId, :userName, :createdDate);
>>
diff --git a/invoice/src/main/resources/com/ning/billing/invoice/ddl.sql b/invoice/src/main/resources/com/ning/billing/invoice/ddl.sql
index 1df70c8..d04806a 100644
--- a/invoice/src/main/resources/com/ning/billing/invoice/ddl.sql
+++ b/invoice/src/main/resources/com/ning/billing/invoice/ddl.sql
@@ -4,8 +4,8 @@ CREATE TABLE recurring_invoice_items (
id char(36) NOT NULL,
invoice_id char(36) NOT NULL,
account_id char(36) NOT NULL,
- subscription_id char(36) NOT NULL,
- bundle_id char(36) NOT NULL,
+ bundle_id char(36),
+ subscription_id char(36),
plan_name varchar(50) NOT NULL,
phase_name varchar(50) NOT NULL,
start_date datetime NOT NULL,
@@ -26,8 +26,8 @@ CREATE TABLE fixed_invoice_items (
id char(36) NOT NULL,
invoice_id char(36) NOT NULL,
account_id char(36) NOT NULL,
- subscription_id char(36) NOT NULL,
- bundle_id char(36) NOT NULL,
+ bundle_id char(36),
+ subscription_id char(36),
plan_name varchar(50) NOT NULL,
phase_name varchar(50) NOT NULL,
start_date datetime NOT NULL,
diff --git a/invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java b/invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java
index 212ff58..f82eaef 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java
@@ -171,7 +171,8 @@ public class TestDefaultInvoiceMigrationApi {
((ZombieControl)account).addResult("getId", accountId);
Subscription subscription = BrainDeadProxyFactory.createBrainDeadProxyFor(Subscription.class);
- ((ZombieControl)subscription).addResult("getId", subscriptionId);
+ ((ZombieControl)subscription).addResult("getId", subscriptionId);
+ ((ZombieControl)subscription).addResult("getBundleId", new UUID(0L,0L));
SortedSet<BillingEvent> events = new TreeSet<BillingEvent>();
Plan plan = MockPlan.createBicycleNoTrialEvergreen1USD();
PlanPhase planPhase = MockPlanPhase.create1USDMonthlyEvergreen();
diff --git a/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java b/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
index eeeea97..4f5f991 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
@@ -141,7 +141,8 @@ public class TestInvoiceDispatcher {
((ZombieControl)account).addResult("getId", accountId);
Subscription subscription = BrainDeadProxyFactory.createBrainDeadProxyFor(Subscription.class);
- ((ZombieControl)subscription).addResult("getId", subscriptionId);
+ ((ZombieControl)subscription).addResult("getId", subscriptionId);
+ ((ZombieControl)subscription).addResult("getBundleId", new UUID(0L,0L));
SortedSet<BillingEvent> events = new TreeSet<BillingEvent>();
Plan plan = MockPlan.createBicycleNoTrialEvergreen1USD();
PlanPhase planPhase = MockPlanPhase.create1USDMonthlyEvergreen();