killbill-uncached
Changes
invoice/src/main/java/org/killbill/billing/invoice/api/migration/DefaultInvoiceMigrationApi.java 2(+1 -1)
invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceItemFormatter.java 5(+5 -0)
Details
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/api/migration/DefaultInvoiceMigrationApi.java b/invoice/src/main/java/org/killbill/billing/invoice/api/migration/DefaultInvoiceMigrationApi.java
index 42dabfd..159701c 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/api/migration/DefaultInvoiceMigrationApi.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/api/migration/DefaultInvoiceMigrationApi.java
@@ -73,7 +73,7 @@ public class DefaultInvoiceMigrationApi implements InvoiceMigrationApi {
final InvoiceModelDao migrationInvoice = new InvoiceModelDao(accountId, clock.getUTCToday(), targetDate, currency, true);
final InvoiceItemModelDao migrationInvoiceItem = new InvoiceItemModelDao(context.getCreatedDate(), InvoiceItemType.FIXED, migrationInvoice.getId(), accountId, null, null,
- MigrationPlan.MIGRATION_PLAN_NAME, MigrationPlan.MIGRATION_PLAN_PHASE_NAME,
+ MigrationPlan.MIGRATION_PLAN_NAME, MigrationPlan.MIGRATION_PLAN_PHASE_NAME, null,
targetDate, null, balance, null, currency, null);
dao.createInvoice(migrationInvoice, ImmutableList.<InvoiceItemModelDao>of(migrationInvoiceItem),
ImmutableList.<InvoicePaymentModelDao>of(), true, ImmutableMap.<UUID, DateTime>of(), internalCallContextFactory.createInternalCallContext(accountId, context));
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
index 695f05b..39ff308 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
@@ -402,7 +402,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
final BigDecimal requestedPositiveAmountToAdjust = requestedPositiveAmount.compareTo(maxBalanceToAdjust) > 0 ? maxBalanceToAdjust : requestedPositiveAmount;
if (requestedPositiveAmountToAdjust.compareTo(BigDecimal.ZERO) > 0) {
final InvoiceItemModelDao adjItem = new InvoiceItemModelDao(context.getCreatedDate(), InvoiceItemType.REFUND_ADJ, invoice.getId(), invoice.getAccountId(),
- null, null, null, null, context.getCreatedDate().toLocalDate(), null,
+ null, null, null, null, null, context.getCreatedDate().toLocalDate(), null,
requestedPositiveAmountToAdjust.negate(), null, invoice.getCurrency(), null);
transInvoiceItemDao.create(adjItem, context);
}
@@ -570,7 +570,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
final InvoiceItemModelDao externalCharge = new InvoiceItemModelDao(context.getCreatedDate(), InvoiceItemType.EXTERNAL_CHARGE,
invoiceIdForExternalCharge, accountId,
- bundleId, null, description, null,
+ bundleId, null, description, null, null,
effectiveDate, null, amount, null,
currency, null);
final InvoiceItemSqlDao transInvoiceItemDao = entitySqlDaoWrapperFactory.become(InvoiceItemSqlDao.class);
@@ -620,7 +620,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
// Note! The amount is negated here!
final InvoiceItemModelDao credit = new InvoiceItemModelDao(context.getCreatedDate(), InvoiceItemType.CREDIT_ADJ, invoiceIdForCredit,
- accountId, null, null, null, null, effectiveDate,
+ accountId, null, null, null, null, null, effectiveDate,
null, positiveCreditAmount.negate(), null,
currency, null);
invoiceDaoHelper.insertItem(entitySqlDaoWrapperFactory, credit, context);
@@ -677,8 +677,8 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
// First, adjust the same invoice with the CBA amount to "delete"
final InvoiceItemModelDao cbaAdjItem = new InvoiceItemModelDao(context.getCreatedDate(), InvoiceItemType.CBA_ADJ, invoice.getId(), invoice.getAccountId(),
- null, null, null, null, context.getCreatedDate().toLocalDate(),
- null, cbaItem.getAmount().negate(), null, cbaItem.getCurrency(), cbaItem.getId());
+ null, null, null, null, null, context.getCreatedDate().toLocalDate(),
+ null, cbaItem.getAmount().negate(), null, cbaItem.getCurrency(), cbaItem.getId());
invoiceItemSqlDao.create(cbaAdjItem, context);
// Verify the final invoice balance is not negative
@@ -733,7 +733,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
// Add the adjustment on that invoice
final InvoiceItemModelDao nextCBAAdjItem = new InvoiceItemModelDao(context.getCreatedDate(), InvoiceItemType.CBA_ADJ, invoiceFollowing.getId(),
- invoice.getAccountId(), null, null, null, null,
+ invoice.getAccountId(), null, null, null, null, null,
context.getCreatedDate().toLocalDate(), null,
positiveCBAAdjItemAmount, null, cbaItem.getCurrency(), cbaItem.getId());
invoiceItemSqlDao.create(nextCBAAdjItem, context);
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java
index 7460118..00290d1 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDaoHelper.java
@@ -203,7 +203,7 @@ public class InvoiceDaoHelper {
// Finally, create the adjustment
// Note! The amount is negated here!
return new InvoiceItemModelDao(context.getCreatedDate(), InvoiceItemType.ITEM_ADJ, invoiceItemToBeAdjusted.getInvoiceId(), invoiceItemToBeAdjusted.getAccountId(),
- null, null, null, null, effectiveDate, effectiveDate, amountToAdjust.negate(), null, currencyForAdjustment, invoiceItemToBeAdjusted.getId());
+ null, null, null, null, null, effectiveDate, effectiveDate, amountToAdjust.negate(), null, currencyForAdjustment, invoiceItemToBeAdjusted.getId());
}
/**
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceItemModelDao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceItemModelDao.java
index 2729793..84177e8 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceItemModelDao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceItemModelDao.java
@@ -38,6 +38,7 @@ public class InvoiceItemModelDao extends EntityBase implements EntityModelDao<In
private UUID subscriptionId;
private String planName;
private String phaseName;
+ private String usageName;
private LocalDate startDate;
private LocalDate endDate;
private BigDecimal amount;
@@ -49,7 +50,7 @@ public class InvoiceItemModelDao extends EntityBase implements EntityModelDao<In
public InvoiceItemModelDao(final UUID id, final DateTime createdDate, final InvoiceItemType type, final UUID invoiceId,
final UUID accountId, final UUID bundleId, final UUID subscriptionId, final String planName,
- final String phaseName, final LocalDate startDate, final LocalDate endDate, final BigDecimal amount,
+ final String phaseName, final String usageName, final LocalDate startDate, final LocalDate endDate, final BigDecimal amount,
final BigDecimal rate, final Currency currency, final UUID linkedItemId) {
super(id, createdDate, createdDate);
this.type = type;
@@ -59,6 +60,7 @@ public class InvoiceItemModelDao extends EntityBase implements EntityModelDao<In
this.subscriptionId = subscriptionId;
this.planName = planName;
this.phaseName = phaseName;
+ this.usageName = usageName;
this.startDate = startDate;
this.endDate = endDate;
this.amount = amount;
@@ -69,15 +71,15 @@ public class InvoiceItemModelDao extends EntityBase implements EntityModelDao<In
public InvoiceItemModelDao(final DateTime createdDate, final InvoiceItemType type, final UUID invoiceId, final UUID accountId,
final UUID bundleId, final UUID subscriptionId, final String planName,
- final String phaseName, final LocalDate startDate, final LocalDate endDate, final BigDecimal amount,
+ final String phaseName, final String usageName, final LocalDate startDate, final LocalDate endDate, final BigDecimal amount,
final BigDecimal rate, final Currency currency, final UUID linkedItemId) {
- this(UUID.randomUUID(), createdDate, type, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName,
+ this(UUID.randomUUID(), createdDate, type, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName,
startDate, endDate, amount, rate, currency, linkedItemId);
}
public InvoiceItemModelDao(final InvoiceItem invoiceItem) {
this(invoiceItem.getId(), invoiceItem.getCreatedDate(), invoiceItem.getInvoiceItemType(), invoiceItem.getInvoiceId(), invoiceItem.getAccountId(), invoiceItem.getBundleId(),
- invoiceItem.getSubscriptionId(), invoiceItem.getPlanName(), invoiceItem.getPhaseName(), invoiceItem.getStartDate(), invoiceItem.getEndDate(),
+ invoiceItem.getSubscriptionId(), invoiceItem.getPlanName(), invoiceItem.getPhaseName(), invoiceItem.getUsageName(), invoiceItem.getStartDate(), invoiceItem.getEndDate(),
invoiceItem.getAmount(), invoiceItem.getRate(), invoiceItem.getCurrency(), invoiceItem.getLinkedItemId());
}
@@ -109,6 +111,10 @@ public class InvoiceItemModelDao extends EntityBase implements EntityModelDao<In
return phaseName;
}
+ public String getUsageName() {
+ return usageName;
+ }
+
public LocalDate getStartDate() {
return startDate;
}
@@ -161,6 +167,10 @@ public class InvoiceItemModelDao extends EntityBase implements EntityModelDao<In
this.phaseName = phaseName;
}
+ public void setUsageName(final String usageName) {
+ this.usageName = usageName;
+ }
+
public void setStartDate(final LocalDate startDate) {
this.startDate = startDate;
}
@@ -196,6 +206,7 @@ public class InvoiceItemModelDao extends EntityBase implements EntityModelDao<In
sb.append(", subscriptionId=").append(subscriptionId);
sb.append(", planName='").append(planName).append('\'');
sb.append(", phaseName='").append(phaseName).append('\'');
+ sb.append(", usageName='").append(usageName).append('\'');
sb.append(", startDate=").append(startDate);
sb.append(", endDate=").append(endDate);
sb.append(", amount=").append(amount);
@@ -247,6 +258,9 @@ public class InvoiceItemModelDao extends EntityBase implements EntityModelDao<In
if (planName != null ? !planName.equals(that.planName) : that.planName != null) {
return false;
}
+ if (usageName != null ? !usageName.equals(that.usageName) : that.usageName != null) {
+ return false;
+ }
if (rate != null ? rate.compareTo(that.rate) != 0 : that.rate != null) {
return false;
}
@@ -273,6 +287,7 @@ public class InvoiceItemModelDao extends EntityBase implements EntityModelDao<In
result = 31 * result + (subscriptionId != null ? subscriptionId.hashCode() : 0);
result = 31 * result + (planName != null ? planName.hashCode() : 0);
result = 31 * result + (phaseName != null ? phaseName.hashCode() : 0);
+ result = 31 * result + (usageName != null ? usageName.hashCode() : 0);
result = 31 * result + (startDate != null ? startDate.hashCode() : 0);
result = 31 * result + (endDate != null ? endDate.hashCode() : 0);
result = 31 * result + (amount != null ? amount.hashCode() : 0);
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/AdjInvoiceItem.java b/invoice/src/main/java/org/killbill/billing/invoice/model/AdjInvoiceItem.java
index 5cd34c5..ec14a46 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/model/AdjInvoiceItem.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/model/AdjInvoiceItem.java
@@ -37,7 +37,7 @@ public abstract class AdjInvoiceItem extends InvoiceItemBase {
AdjInvoiceItem(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId,
final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency, @Nullable final UUID reversingId) {
- super(id, createdDate, invoiceId, accountId, null, null, null, null, startDate, endDate, amount, currency, reversingId);
+ super(id, createdDate, invoiceId, accountId, null, null, null, null, null, startDate, endDate, amount, currency, reversingId);
}
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/ExternalChargeInvoiceItem.java b/invoice/src/main/java/org/killbill/billing/invoice/model/ExternalChargeInvoiceItem.java
index 715030f..e2c92c5 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/model/ExternalChargeInvoiceItem.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/model/ExternalChargeInvoiceItem.java
@@ -42,7 +42,7 @@ public class ExternalChargeInvoiceItem extends InvoiceItemBase {
public ExternalChargeInvoiceItem(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId,
@Nullable final String description, final LocalDate date, final BigDecimal amount, final Currency currency) {
- super(id, createdDate, invoiceId, accountId, bundleId, null, description, null, date, null, amount, currency);
+ super(id, createdDate, invoiceId, accountId, bundleId, null, description, null, null, date, null, amount, currency);
}
@Override
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/FixedPriceInvoiceItem.java b/invoice/src/main/java/org/killbill/billing/invoice/model/FixedPriceInvoiceItem.java
index cad9f73..16c2c13 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/model/FixedPriceInvoiceItem.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/model/FixedPriceInvoiceItem.java
@@ -39,7 +39,7 @@ public class FixedPriceInvoiceItem extends InvoiceItemBase {
public FixedPriceInvoiceItem(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, final UUID bundleId,
final UUID subscriptionId, final String planName, final String phaseName,
final LocalDate date, final BigDecimal amount, final Currency currency) {
- super(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, date, null, amount, currency);
+ super(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, null, date, null, amount, currency);
}
@Override
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemBase.java b/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemBase.java
index 175bfec..f874ec0 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemBase.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemBase.java
@@ -51,6 +51,10 @@ public abstract class InvoiceItemBase extends EntityBase implements InvoiceItem
/* RepairAdjInvoiceItem */
protected final UUID linkedItemId;
+ /* Usage specific */
+ protected final String usageName;
+
+
@Override
public String toString() {
// Note: we don't use all fields here, as the output would be overwhelming
@@ -72,27 +76,27 @@ public abstract class InvoiceItemBase extends EntityBase implements InvoiceItem
*/
// No rate and no reversing item
public InvoiceItemBase(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId,
- @Nullable final UUID subscriptionId, @Nullable final String planName, @Nullable final String phaseName,
+ @Nullable final UUID subscriptionId, @Nullable final String planName, @Nullable final String phaseName, @Nullable final String usageName,
final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency) {
- this(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, null, currency, null);
+ this(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, amount, null, currency, null);
}
// With rate but no reversing item
public InvoiceItemBase(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId,
- @Nullable final UUID subscriptionId, @Nullable final String planName, @Nullable final String phaseName,
+ @Nullable final UUID subscriptionId, @Nullable final String planName, @Nullable final String phaseName, @Nullable final String usageName,
final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final BigDecimal rate, final Currency currency) {
- this(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, rate, currency, null);
+ this(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, amount, rate, currency, null);
}
// With reversing item, no rate
public InvoiceItemBase(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId,
- @Nullable final UUID subscriptionId, @Nullable final String planName, @Nullable final String phaseName,
+ @Nullable final UUID subscriptionId, @Nullable final String planName, @Nullable final String phaseName, @Nullable final String usageName,
final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency, final UUID reversedItemId) {
- this(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, null, currency, reversedItemId);
+ this(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, amount, null, currency, reversedItemId);
}
private InvoiceItemBase(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId,
- @Nullable final UUID subscriptionId, @Nullable final String planName, @Nullable final String phaseName,
+ @Nullable final UUID subscriptionId, @Nullable final String planName, @Nullable final String phaseName, @Nullable final String usageName,
final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final BigDecimal rate, final Currency currency,
final UUID reversedItemId) {
super(id, createdDate, createdDate);
@@ -102,6 +106,7 @@ public abstract class InvoiceItemBase extends EntityBase implements InvoiceItem
this.bundleId = bundleId;
this.planName = planName;
this.phaseName = phaseName;
+ this.usageName = usageName;
this.startDate = startDate;
this.endDate = endDate;
this.amount = amount;
@@ -170,6 +175,10 @@ public abstract class InvoiceItemBase extends EntityBase implements InvoiceItem
return linkedItemId;
}
+ @Override
+ public String getUsageName() {
+ return usageName;
+ }
@Override
public boolean equals(final Object o) {
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java b/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java
index a75c782..01175dd 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java
@@ -44,6 +44,7 @@ public class InvoiceItemFactory {
final UUID subscriptionId = invoiceItemModelDao.getSubscriptionId();
final String planName = invoiceItemModelDao.getPlanName();
final String phaseName = invoiceItemModelDao.getPhaseName();
+ final String usageName = invoiceItemModelDao.getUsageName();
final LocalDate startDate = invoiceItemModelDao.getStartDate();
final LocalDate endDate = invoiceItemModelDao.getEndDate();
final BigDecimal amount = invoiceItemModelDao.getAmount();
@@ -79,8 +80,7 @@ public class InvoiceItemFactory {
item = new ItemAdjInvoiceItem(id, createdDate, invoiceId, accountId, startDate, amount, currency, linkedItemId);
break;
case USAGE:
- // STEPH_USAGE should we add unitType in schema or override fields (planName,..) Same for unitAmount
- item = new UsageInvoiceItem(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, currency,"unitType");
+ item = new UsageInvoiceItem(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, amount, currency);
break;
default:
throw new RuntimeException("Unexpected type of event item " + type);
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/RecurringInvoiceItem.java b/invoice/src/main/java/org/killbill/billing/invoice/model/RecurringInvoiceItem.java
index 5194814..b858e8c 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/model/RecurringInvoiceItem.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/model/RecurringInvoiceItem.java
@@ -39,7 +39,7 @@ public class RecurringInvoiceItem extends InvoiceItemBase {
public RecurringInvoiceItem(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, final UUID bundleId, final UUID subscriptionId,
final String planName, final String phaseName, final LocalDate startDate, final LocalDate endDate,
final BigDecimal amount, final BigDecimal rate, final Currency currency) {
- super(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, rate, currency);
+ super(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, null, startDate, endDate, amount, rate, currency);
}
@Override
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/UsageInvoiceItem.java b/invoice/src/main/java/org/killbill/billing/invoice/model/UsageInvoiceItem.java
index f9d8892..ab32e4b 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/model/UsageInvoiceItem.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/model/UsageInvoiceItem.java
@@ -28,19 +28,16 @@ import org.killbill.billing.invoice.api.InvoiceItemType;
public class UsageInvoiceItem extends InvoiceItemBase {
- private final String usageName;
-
public UsageInvoiceItem(final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId, @Nullable final UUID subscriptionId,
- final String planName, final String phaseName,
- final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency, final String usageName) {
- this(UUID.randomUUID(), null, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, currency, usageName);
+ final String planName, final String phaseName, final String usageName,
+ final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency) {
+ this(UUID.randomUUID(), null, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, amount, currency);
}
public UsageInvoiceItem(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, final UUID bundleId,
- final UUID subscriptionId, final String planName, final String phaseName,
- final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency, final String usageName) {
- super(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, currency);
- this.usageName = usageName;
+ final UUID subscriptionId, final String planName, final String phaseName, final String usageName,
+ final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency) {
+ super(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, amount, currency);
}
@Override
@@ -53,7 +50,4 @@ public class UsageInvoiceItem extends InvoiceItemBase {
return String.format("%s (usage item)", usageName);
}
- public String getUsageName() {
- return usageName;
- }
}
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceItemFormatter.java b/invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceItemFormatter.java
index 45b1f53..ef0cca6 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceItemFormatter.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/template/formatters/DefaultInvoiceItemFormatter.java
@@ -135,6 +135,11 @@ public class DefaultInvoiceItemFormatter implements InvoiceItemFormatter {
}
@Override
+ public String getUsageName() {
+ return Strings.nullToEmpty(translator.getTranslation(locale, item.getUsageName()));
+ }
+
+ @Override
public UUID getId() {
return item.getId();
}
diff --git a/invoice/src/main/java/org/killbill/billing/invoice/usage/ContiguousInArrearUsageInterval.java b/invoice/src/main/java/org/killbill/billing/invoice/usage/ContiguousInArrearUsageInterval.java
index b05f6d9..59d4878 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/usage/ContiguousInArrearUsageInterval.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/usage/ContiguousInArrearUsageInterval.java
@@ -140,7 +140,7 @@ public class ContiguousInArrearUsageInterval {
if (billedUsage.compareTo(toBeBilledUsage) < 0) {
InvoiceItem item = new UsageInvoiceItem(invoiceId, getAccountId(), getBundleId(), getSubscriptionId(), getPlanName(),
- getPhaseName(), ru.getStartDate(), ru.getEndDate(), toBeBilledUsage.subtract(billedUsage), getCurrency(), usage.getName());
+ getPhaseName(), usage.getName(), ru.getStartDate(), ru.getEndDate(), toBeBilledUsage.subtract(billedUsage), getCurrency());
result.add(item);
}
}
diff --git a/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql b/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
index beb05f1..b940549 100644
--- a/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
+++ b/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
@@ -11,6 +11,7 @@ CREATE TABLE invoice_items (
subscription_id char(36),
plan_name varchar(50),
phase_name varchar(50),
+ usage_name varchar(50),
start_date date NOT NULL,
end_date date,
amount numeric(15,9) NOT NULL,
diff --git a/invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceDispatcher.java b/invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceDispatcher.java
index dd313de..cf263e3 100644
--- a/invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceDispatcher.java
+++ b/invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceDispatcher.java
@@ -199,16 +199,14 @@ public class TestInvoiceDispatcher extends InvoiceTestSuiteWithEmbeddedDB {
final DateAndTimeZoneContext dateAndTimeZoneContext = new DateAndTimeZoneContext(clock.getUTCNow(), DateTimeZone.forID("Pacific/Pitcairn"), clock);
final InvoiceItemModelDao item = new InvoiceItemModelDao(UUID.randomUUID(), clock.getUTCNow(), InvoiceItemType.RECURRING, UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID(),
- "planName", "phaseName", startDate, endDate, new BigDecimal("23.9"), new BigDecimal("23.9"), Currency.EUR, null);
+ "planName", "phaseName", null, startDate, endDate, new BigDecimal("23.9"), new BigDecimal("23.9"), Currency.EUR, null);
final InvoiceNotifier invoiceNotifier = new NullInvoiceNotifier();
final InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountApi, billingApi, subscriptionApi, invoiceDao,
nonEntityDao, invoiceNotifier, locker, busService.getBus(),
clock);
- final DateTime expectedBefore = clock.getUTCNow();
final Map<UUID, DateTime> result = dispatcher.createNextFutureNotificationDate(Collections.singletonList(item), dateAndTimeZoneContext);
- final DateTime expectedAfter = clock.getUTCNow();
Assert.assertEquals(result.size(), 1);
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java
index ab424d5..e280dc8 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java
@@ -40,6 +40,7 @@ public class InvoiceItemJson extends JsonBase {
private final String subscriptionId;
private final String planName;
private final String phaseName;
+ private final String usageName;
private final String itemType;
private final String description;
private final LocalDate startDate;
@@ -56,6 +57,7 @@ public class InvoiceItemJson extends JsonBase {
@JsonProperty("subscriptionId") final String subscriptionId,
@JsonProperty("planName") final String planName,
@JsonProperty("phaseName") final String phaseName,
+ @JsonProperty("usageName") final String usageName,
@JsonProperty("itemType") final String itemType,
@JsonProperty("description") final String description,
@JsonProperty("startDate") final LocalDate startDate,
@@ -72,6 +74,7 @@ public class InvoiceItemJson extends JsonBase {
this.subscriptionId = subscriptionId;
this.planName = planName;
this.phaseName = phaseName;
+ this.usageName = usageName;
this.itemType = itemType;
this.description = description;
this.startDate = startDate;
@@ -83,7 +86,7 @@ public class InvoiceItemJson extends JsonBase {
public InvoiceItemJson(final InvoiceItem item, @Nullable final List<AuditLog> auditLogs) {
this(toString(item.getId()), toString(item.getInvoiceId()), toString(item.getLinkedItemId()),
toString(item.getAccountId()), toString(item.getBundleId()), toString(item.getSubscriptionId()),
- item.getPlanName(), item.getPhaseName(), item.getInvoiceItemType().toString(),
+ item.getPlanName(), item.getPhaseName(), item.getUsageName(), item.getInvoiceItemType().toString(),
item.getDescription(), item.getStartDate(), item.getEndDate(),
item.getAmount(), item.getCurrency(), toAuditLogJson(auditLogs));
}
@@ -124,6 +127,10 @@ public class InvoiceItemJson extends JsonBase {
return phaseName;
}
+ public String getUsageName() {
+ return usageName;
+ }
+
public String getItemType() {
return itemType;
}
@@ -160,6 +167,7 @@ public class InvoiceItemJson extends JsonBase {
sb.append(", subscriptionId='").append(subscriptionId).append('\'');
sb.append(", planName='").append(planName).append('\'');
sb.append(", phaseName='").append(phaseName).append('\'');
+ sb.append(", usageName='").append(usageName).append('\'');
sb.append(", description='").append(description).append('\'');
sb.append(", startDate=").append(startDate);
sb.append(", endDate=").append(endDate);
@@ -212,6 +220,9 @@ public class InvoiceItemJson extends JsonBase {
if (phaseName != null ? !phaseName.equals(that.phaseName) : that.phaseName != null) {
return false;
}
+ if (usageName != null ? !usageName.equals(that.usageName) : that.usageName != null) {
+ return false;
+ }
if (planName != null ? !planName.equals(that.planName) : that.planName != null) {
return false;
}
@@ -236,6 +247,7 @@ public class InvoiceItemJson extends JsonBase {
result = 31 * result + (subscriptionId != null ? subscriptionId.hashCode() : 0);
result = 31 * result + (planName != null ? planName.hashCode() : 0);
result = 31 * result + (phaseName != null ? phaseName.hashCode() : 0);
+ result = 31 * result + (usageName != null ? usageName.hashCode() : 0);
result = 31 * result + (description != null ? description.hashCode() : 0);
result = 31 * result + (startDate != null ? startDate.hashCode() : 0);
result = 31 * result + (endDate != null ? endDate.hashCode() : 0);
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceItemJsonSimple.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceItemJsonSimple.java
index 798c454..9e3f7ab 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceItemJsonSimple.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestInvoiceItemJsonSimple.java
@@ -44,6 +44,7 @@ public class TestInvoiceItemJsonSimple extends JaxrsTestSuiteNoDB {
final String subscriptionId = UUID.randomUUID().toString();
final String planName = UUID.randomUUID().toString();
final String phaseName = UUID.randomUUID().toString();
+ final String usageName = UUID.randomUUID().toString();
final String type = "FIXED";
final String description = UUID.randomUUID().toString();
final LocalDate startDate = clock.getUTCToday();
@@ -52,7 +53,7 @@ public class TestInvoiceItemJsonSimple extends JaxrsTestSuiteNoDB {
final Currency currency = Currency.MXN;
final List<AuditLogJson> auditLogs = createAuditLogsJson(clock.getUTCNow());
final InvoiceItemJson invoiceItemJson = new InvoiceItemJson(invoiceItemId, invoiceId, linkedInvoiceItemId, accountId,
- bundleId, subscriptionId, planName, phaseName, type, description,
+ bundleId, subscriptionId, planName, phaseName, usageName, type, description,
startDate, endDate, amount, currency, auditLogs);
Assert.assertEquals(invoiceItemJson.getInvoiceItemId(), invoiceItemId);
Assert.assertEquals(invoiceItemJson.getInvoiceId(), invoiceId);
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestRefundJson.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestRefundJson.java
index 2e13a40..2c99fcc 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestRefundJson.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestRefundJson.java
@@ -73,6 +73,7 @@ public class TestRefundJson extends JaxrsTestSuiteNoDB {
final String subscriptionId = UUID.randomUUID().toString();
final String planName = UUID.randomUUID().toString();
final String phaseName = UUID.randomUUID().toString();
+ final String usageName = UUID.randomUUID().toString();
final String description = UUID.randomUUID().toString();
final LocalDate startDate = clock.getUTCToday();
final LocalDate endDate = clock.getUTCToday();
@@ -81,7 +82,7 @@ public class TestRefundJson extends JaxrsTestSuiteNoDB {
final Currency currency = Currency.MXN;
final List<AuditLogJson> auditLogs = createAuditLogsJson(clock.getUTCNow());
return new InvoiceItemJson(invoiceItemId, invoiceId, linkedInvoiceItemId, accountId, bundleId, subscriptionId,
- planName, phaseName, type, description, startDate, endDate,
+ planName, phaseName, usageName, type, description, startDate, endDate,
amount, currency, auditLogs);
}
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
index 1b38d97..25bd6dd 100644
--- a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
@@ -60,7 +60,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
invoice.addInvoiceItem(new MockRecurringInvoiceItem(invoice.getId(), account.getId(),
subscriptionId,
bundleId,
- "test plan", "test phase",
+ "test plan", "test phase", null,
now,
now.plusMonths(1),
requestedAmount,
diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiNoDB.java b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiNoDB.java
index e45c453..5d85e82 100644
--- a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiNoDB.java
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiNoDB.java
@@ -108,7 +108,7 @@ public class TestPaymentApiNoDB extends PaymentTestSuiteNoDB {
invoice.addInvoiceItem(new MockRecurringInvoiceItem(invoice.getId(), account.getId(),
subscriptionId,
bundleId,
- "test plan", "test phase",
+ "test plan", "test phase", null,
now,
now.plusMonths(1),
invoiceAmount,
diff --git a/payment/src/test/java/org/killbill/billing/payment/MockRecurringInvoiceItem.java b/payment/src/test/java/org/killbill/billing/payment/MockRecurringInvoiceItem.java
index 864b402..cf3eb92 100644
--- a/payment/src/test/java/org/killbill/billing/payment/MockRecurringInvoiceItem.java
+++ b/payment/src/test/java/org/killbill/billing/payment/MockRecurringInvoiceItem.java
@@ -41,43 +41,44 @@ public class MockRecurringInvoiceItem extends EntityBase implements InvoiceItem
protected final LocalDate endDate;
protected final BigDecimal amount;
protected final Currency currency;
+ protected final String usageName;
public MockRecurringInvoiceItem(final UUID invoiceId, final UUID accountId, final UUID bundleId, final UUID subscriptionId,
- final String planName, final String phaseName, final LocalDate startDate, final LocalDate endDate,
+ final String planName, final String phaseName, final String usageName, final LocalDate startDate, final LocalDate endDate,
final BigDecimal amount, final BigDecimal rate, final Currency currency) {
- this(invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, currency, rate, null);
+ this(invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, amount, currency, rate, null);
}
public MockRecurringInvoiceItem(final UUID invoiceId, final UUID accountId, final UUID bundleId, final UUID subscriptionId,
- final String planName, final String phaseName, final LocalDate startDate, final LocalDate endDate,
+ final String planName, final String phaseName, final String usageName, final LocalDate startDate, final LocalDate endDate,
final BigDecimal amount, final BigDecimal rate, final Currency currency, final UUID reversedItemId) {
- this(invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate,
+ this(invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate,
amount, currency, rate, reversedItemId);
}
public MockRecurringInvoiceItem(final UUID id, final UUID invoiceId, final UUID accountId, final UUID bundleId,
- final UUID subscriptionId, final String planName, final String phaseName,
+ final UUID subscriptionId, final String planName, final String phaseName, final String usageName,
final LocalDate startDate, final LocalDate endDate, final BigDecimal amount,
final BigDecimal rate, final Currency currency) {
- this(id, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, currency, rate, null);
+ this(id, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, amount, currency, rate, null);
}
public MockRecurringInvoiceItem(final UUID id, final UUID invoiceId, final UUID accountId, final UUID bundleId,
- final UUID subscriptionId, final String planName, final String phaseName,
+ final UUID subscriptionId, final String planName, final String phaseName, final String usageName,
final LocalDate startDate, final LocalDate endDate, final BigDecimal amount,
final BigDecimal rate, final Currency currency, final UUID reversedItemId) {
- this(id, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount, currency, rate, reversedItemId);
+ this(id, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, amount, currency, rate, reversedItemId);
}
- public MockRecurringInvoiceItem(final UUID invoiceId, final UUID accountId, final UUID bundleId, final UUID subscriptionId, final String planName, final String phaseName,
+ public MockRecurringInvoiceItem(final UUID invoiceId, final UUID accountId, final UUID bundleId, final UUID subscriptionId, final String planName, final String phaseName, final String usageName,
final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency, final BigDecimal rate, final UUID reversedItemId) {
- this(UUID.randomUUID(), invoiceId, accountId, bundleId, subscriptionId, planName, phaseName,
+ this(UUID.randomUUID(), invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName,
startDate, endDate, amount, currency, rate, reversedItemId);
}
public MockRecurringInvoiceItem(final UUID id, final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId, @Nullable final UUID subscriptionId, final String planName, final String phaseName,
- final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency,
+ final String usageName, final LocalDate startDate, final LocalDate endDate, final BigDecimal amount, final Currency currency,
final BigDecimal rate, final UUID reversedItemId) {
super(id);
this.invoiceId = invoiceId;
@@ -86,6 +87,7 @@ public class MockRecurringInvoiceItem extends EntityBase implements InvoiceItem
this.bundleId = bundleId;
this.planName = planName;
this.phaseName = phaseName;
+ this.usageName = usageName;
this.startDate = startDate;
this.endDate = endDate;
this.amount = amount;
@@ -130,6 +132,11 @@ public class MockRecurringInvoiceItem extends EntityBase implements InvoiceItem
}
@Override
+ public String getUsageName() {
+ return usageName;
+ }
+
+ @Override
public BigDecimal getAmount() {
return amount;
}
diff --git a/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java b/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java
index fb6fffe..9bdb5fe 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java
@@ -82,6 +82,7 @@ public class TestPaymentHelper {
recurringInvoiceItem.getSubscriptionId(),
recurringInvoiceItem.getPlanName(),
recurringInvoiceItem.getPhaseName(),
+ null,
recurringInvoiceItem.getStartDate(),
recurringInvoiceItem.getEndDate(),
recurringInvoiceItem.getAmount(),
diff --git a/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java b/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
index b64e047..be4208a 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
@@ -123,7 +123,7 @@ public class TestRetryService extends PaymentTestSuiteNoDB {
account.getId(),
subscriptionId,
bundleId,
- "test plan", "test phase",
+ "test plan", "test phase", null,
startDate,
endDate,
amount,