Skip to content

Commit

Permalink
invoice: code review integration
Browse files Browse the repository at this point in the history 
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
  • Loading branch information
@pierre
pierre committed May 8, 2018
1 parent 76b3ab1 commit c34d9eb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 30 deletions.
1 change: 1 addition & 0 deletions beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestInvoiceNotifications.java
View file
Expand Up @@ -116,6 +116,7 @@ public void testInvoiceNotificationInThePast() throws Exception {

// Future create the entitlement
// Note: we need to use a plan without a trial to verify the fix, because we don't send invoice notifications for $0 invoices
// Also, even though we have the 7d dryRunNotificationSchedule configured, the system will not to set a dry run notification in the past (3/26/2012)
final DefaultEntitlement bpSubscription = createBaseEntitlementWithPriceOverrideAndCheckForCompletion(account.getId(),
"bundleKey",
"Pistol",
Expand Down
6 changes: 2 additions & 4 deletions invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
View file
Expand Up @@ -1006,10 +1006,8 @@ private void notifyOfFutureBillingEvents(final EntitySqlDaoWrapperFactory entity
final InternalCallContext internalCallContext) {
for (final LocalDate notificationDate : callbackDateTimePerSubscriptions.getNotificationsForTrigger().keySet()) {
final DateTime notificationDateTime = internalCallContext.toUTCDateTime(notificationDate);
if (notificationDateTime.compareTo(internalCallContext.getCreatedDate()) > 0) {
final Set<UUID> subscriptionIds = callbackDateTimePerSubscriptions.getNotificationsForTrigger().get(notificationDate);
nextBillingDatePoster.insertNextBillingNotificationFromTransaction(entitySqlDaoWrapperFactory, accountId, subscriptionIds, notificationDateTime, callbackDateTimePerSubscriptions.isRescheduled(), internalCallContext);
}
final Set<UUID> subscriptionIds = callbackDateTimePerSubscriptions.getNotificationsForTrigger().get(notificationDate);
nextBillingDatePoster.insertNextBillingNotificationFromTransaction(entitySqlDaoWrapperFactory, accountId, subscriptionIds, notificationDateTime, callbackDateTimePerSubscriptions.isRescheduled(), internalCallContext);
}

final long dryRunNotificationTime = invoiceConfig.getDryRunNotificationSchedule(internalCallContext).getMillis();
Expand Down
39 changes: 13 additions & 26 deletions ...ce/src/test/java/org/killbill/billing/invoice/notification/TestNextBillingDatePoster.java
View file
Expand Up @@ -23,7 +23,6 @@
import java.util.Set;
import java.util.UUID;

import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.killbill.billing.ObjectType;
import org.killbill.billing.account.api.Account;
Expand Down Expand Up @@ -57,22 +56,14 @@ public void testDryRunReInsertion() throws Exception {
final Account account = invoiceUtil.createAccount(callContext);
final Long accountRecordId = nonEntityDao.retrieveAccountRecordIdFromObject(account.getId(), ObjectType.ACCOUNT, null);

final DateTime now = clock.getUTCNow();
final LocalDate nowLocal = internalCallContext.toLocalDate(now);
final LocalDate notificationDate = clock.getUTCToday().plusDays(30);

final SubscriptionBase subscription = invoiceUtil.createSubscription();
final UUID subscriptionId = subscription.getId();

final FutureAccountNotifications futureAccountNotifications = createFutureAccountNotifications(subscriptionId, nowLocal);

// Add 3 seconds to make it more interesting
clock.addDeltaFromReality(3000);
final FutureAccountNotifications futureAccountNotifications = createFutureAccountNotifications(subscriptionId, notificationDate);

invoiceDao.setFutureAccountNotificationsForEmptyInvoice(account.getId(), futureAccountNotifications, internalCallContext);


// Add 3 seconds to make it more interesting
clock.addDeltaFromReality(3000);
invoiceDao.setFutureAccountNotificationsForEmptyInvoice(account.getId(), futureAccountNotifications, internalCallContext);

final NotificationQueue nextBillingQueue = notificationQueueService.getNotificationQueue(DefaultInvoiceService.INVOICE_SERVICE_NAME,
Expand All @@ -83,7 +74,7 @@ public void testDryRunReInsertion() throws Exception {

// We expect only one notification for which effectiveDate matches our original effectiveDate (conversion DateTime -> LocalDate -> DateTime)
final NotificationEventWithMetadata<NextBillingDateNotificationKey> notification = futureNotificationsList.get(0);
Assert.assertEquals(notification.getEffectiveDate(), internalCallContext.toUTCDateTime(nowLocal));
Assert.assertEquals(notification.getEffectiveDate(), internalCallContext.toUTCDateTime(notificationDate));

final Iterable<UUID> uuidKeys = notification.getEvent().getUuidKeys();
Assert.assertFalse(Iterables.isEmpty(uuidKeys));
Expand All @@ -97,19 +88,18 @@ public void testDryRunUpdateWithNewSubscription() throws Exception {
final Account account = invoiceUtil.createAccount(callContext);
final Long accountRecordId = nonEntityDao.retrieveAccountRecordIdFromObject(account.getId(), ObjectType.ACCOUNT, null);

final DateTime now = clock.getUTCNow();
final LocalDate nowLocal = internalCallContext.toLocalDate(now);
final LocalDate notificationDate = clock.getUTCToday().plusDays(30);

final SubscriptionBase subscription1 = invoiceUtil.createSubscription();
final UUID subscriptionId1 = subscription1.getId();

final FutureAccountNotifications futureAccountNotifications1 = createFutureAccountNotifications(subscriptionId1, nowLocal);
final FutureAccountNotifications futureAccountNotifications1 = createFutureAccountNotifications(subscriptionId1, notificationDate);
invoiceDao.setFutureAccountNotificationsForEmptyInvoice(account.getId(), futureAccountNotifications1, internalCallContext);

final SubscriptionBase subscription2 = invoiceUtil.createSubscription();
final UUID subscriptionId2 = subscription2.getId();

final FutureAccountNotifications futureAccountNotifications2 = createFutureAccountNotifications(subscriptionId2, nowLocal);
final FutureAccountNotifications futureAccountNotifications2 = createFutureAccountNotifications(subscriptionId2, notificationDate);
invoiceDao.setFutureAccountNotificationsForEmptyInvoice(account.getId(), futureAccountNotifications2, internalCallContext);


Expand All @@ -122,7 +112,7 @@ public void testDryRunUpdateWithNewSubscription() throws Exception {

// We expect only one notification but this time we should see a list with both subscriptionIds.
final NotificationEventWithMetadata<NextBillingDateNotificationKey> notification = futureNotificationsList.get(0);
Assert.assertEquals(notification.getEffectiveDate(), internalCallContext.toUTCDateTime(nowLocal));
Assert.assertEquals(notification.getEffectiveDate(), internalCallContext.toUTCDateTime(notificationDate));

final Iterable<UUID> uuidKeys = notification.getEvent().getUuidKeys();
Assert.assertFalse(Iterables.isEmpty(uuidKeys));
Expand All @@ -138,25 +128,22 @@ public void testDryRunWithSameSubscriptionLater() throws Exception {
final Account account = invoiceUtil.createAccount(callContext);
final Long accountRecordId = nonEntityDao.retrieveAccountRecordIdFromObject(account.getId(), ObjectType.ACCOUNT, null);

final DateTime now = clock.getUTCNow();
final LocalDate nowLocal = internalCallContext.toLocalDate(now);
final LocalDate notificationDate1 = clock.getUTCToday().plusDays(30);

final SubscriptionBase subscription = invoiceUtil.createSubscription();
final UUID subscriptionId = subscription.getId();

final FutureAccountNotifications futureAccountNotifications1 = createFutureAccountNotifications(subscriptionId, nowLocal);
final FutureAccountNotifications futureAccountNotifications1 = createFutureAccountNotifications(subscriptionId, notificationDate1);

// Add 3 seconds to make it more interesting
clock.addDeltaFromReality(3000);

invoiceDao.setFutureAccountNotificationsForEmptyInvoice(account.getId(), futureAccountNotifications1, internalCallContext);


clock.addDays(1);
final DateTime newNow = clock.getUTCNow();
final LocalDate newNowLocal = internalCallContext.toLocalDate(newNow);
final LocalDate notificationDate2 = clock.getUTCToday().plusDays(30);

final FutureAccountNotifications futureAccountNotifications2 = createFutureAccountNotifications(subscriptionId, newNowLocal);
final FutureAccountNotifications futureAccountNotifications2 = createFutureAccountNotifications(subscriptionId, notificationDate2);


invoiceDao.setFutureAccountNotificationsForEmptyInvoice(account.getId(), futureAccountNotifications2, internalCallContext);
Expand All @@ -169,7 +156,7 @@ public void testDryRunWithSameSubscriptionLater() throws Exception {
Assert.assertEquals(futureNotificationsList.size(), 2);

final NotificationEventWithMetadata<NextBillingDateNotificationKey> notification1 = futureNotificationsList.get(0);
Assert.assertEquals(notification1.getEffectiveDate(), internalCallContext.toUTCDateTime(nowLocal));
Assert.assertEquals(notification1.getEffectiveDate(), internalCallContext.toUTCDateTime(notificationDate1));

final Iterable<UUID> uuidKeys1 = notification1.getEvent().getUuidKeys();
Assert.assertFalse(Iterables.isEmpty(uuidKeys1));
Expand All @@ -179,7 +166,7 @@ public void testDryRunWithSameSubscriptionLater() throws Exception {


final NotificationEventWithMetadata<NextBillingDateNotificationKey> notification2 = futureNotificationsList.get(1);
Assert.assertEquals(notification2.getEffectiveDate(), internalCallContext.toUTCDateTime(newNowLocal));
Assert.assertEquals(notification2.getEffectiveDate(), internalCallContext.toUTCDateTime(notificationDate2));

final Iterable<UUID> uuidKeys2 = notification2.getEvent().getUuidKeys();
Assert.assertFalse(Iterables.isEmpty(uuidKeys2));
Expand Down

0 comments on commit c34d9eb

Please sign in to comment.