Skip to content

Commit

Permalink
invoice: CR integration. See #774
Browse files Browse the repository at this point in the history 
Remove unused code
Fix tests
  • Loading branch information
@sbrossie
sbrossie committed Dec 14, 2017
1 parent b60d2b8 commit 3c55d2f
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 169 deletions.
3 changes: 0 additions & 3 deletions api/src/main/java/org/killbill/billing/subscription/api/SubscriptionBaseInternalApi.java
View file
Expand Up @@ -93,9 +93,6 @@ public List<EntitlementAOStatusDryRun> getDryRunChangePlanStatus(UUID subscripti

public void updateExternalKey(UUID bundleId, String newExternalKey, InternalCallContext context);

public Map<UUID, DateTime> getNextFutureEventForSubscriptions(final List<SubscriptionBaseTransitionType> eventTypes, final InternalCallContext internalCallContext);


public void updateBCD(final UUID subscriptionId, final int bcd, @Nullable final LocalDate effectiveFromDate, final InternalCallContext internalCallContext) throws SubscriptionBaseApiException;

public int getDefaultBillCycleDayLocal(final Map<UUID, Integer> bcdCache, final SubscriptionBase subscription, final SubscriptionBase baseSubscription, final PlanPhaseSpecifier planPhaseSpecifier, final int accountBillCycleDayLocal, final DateTime effectiveDate, final InternalTenantContext context) throws SubscriptionBaseApiException;
Expand Down
136 changes: 31 additions & 105 deletions .../src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationDryRunInvoice.java
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>killbill-oss-parent</artifactId>
<groupId>org.kill-bill.billing</groupId>
<version>0.140.45</version>
<version>0.140.46</version>
</parent>
<artifactId>killbill</artifactId>
<version>0.18.15-SNAPSHOT</version>
Expand Down
15 changes: 0 additions & 15 deletions .../main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
View file
Expand Up @@ -59,7 +59,6 @@
import org.killbill.billing.subscription.api.SubscriptionBase;
import org.killbill.billing.subscription.api.SubscriptionBaseApiService;
import org.killbill.billing.subscription.api.SubscriptionBaseInternalApi;
import org.killbill.billing.subscription.api.SubscriptionBaseTransitionType;
import org.killbill.billing.subscription.api.SubscriptionBaseWithAddOns;
import org.killbill.billing.subscription.api.user.DefaultEffectiveSubscriptionEvent;
import org.killbill.billing.subscription.api.user.DefaultSubscriptionBase;
Expand Down Expand Up @@ -97,7 +96,6 @@
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;

Expand Down Expand Up @@ -751,19 +749,6 @@ private DateTime getDryRunEffectiveDate(@Nullable final LocalDate inputDate, fin
}
}

@Override
public Map<UUID, DateTime> getNextFutureEventForSubscriptions(final List<SubscriptionBaseTransitionType> eventTypes, final InternalCallContext internalCallContext) {
final Iterable<SubscriptionBaseEvent> filteredEvents = dao.getFutureEventsForAccount(eventTypes, internalCallContext);
final Map<UUID, DateTime> result = filteredEvents.iterator().hasNext() ? new HashMap<UUID, DateTime>() : ImmutableMap.<UUID, DateTime>of();
for (final SubscriptionBaseEvent cur : filteredEvents) {
final DateTime targetDate = result.get(cur.getSubscriptionId());
if (targetDate == null || targetDate.compareTo(cur.getEffectiveDate()) > 0) {
result.put(cur.getSubscriptionId(), cur.getEffectiveDate());
}
}
return result;
}

@Override
public void updateBCD(final UUID subscriptionId, final int bcd, @Nullable final LocalDate effectiveFromDate, final InternalCallContext internalCallContext) throws SubscriptionBaseApiException {
final DefaultSubscriptionBase subscription = (DefaultSubscriptionBase) getSubscriptionFromId(subscriptionId, internalCallContext);
Expand Down
33 changes: 0 additions & 33 deletions ...on/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
View file
Expand Up @@ -529,39 +529,6 @@ public List<SubscriptionBaseEvent> inTransaction(final EntitySqlDaoWrapperFactor
});
}

@Override
public Iterable<SubscriptionBaseEvent> getFutureEventsForAccount(final List<SubscriptionBaseTransitionType> eventTypes, final InternalTenantContext context) {


return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<Iterable<SubscriptionBaseEvent>>() {
@Override
public Iterable<SubscriptionBaseEvent> inTransaction(final EntitySqlDaoWrapperFactory entitySqlDaoWrapperFactory) throws Exception {
final SubscriptionEventSqlDao transactional = entitySqlDaoWrapperFactory.become(SubscriptionEventSqlDao.class);
final List<SubscriptionEventModelDao> activeEvents = transactional.getFutureActiveEventsForAccount(clock.getUTCNow().toDate(), context);

final Iterable<SubscriptionEventModelDao> filteredActiveEvents = Iterables.filter(activeEvents, new Predicate<SubscriptionEventModelDao>() {
@Override
public boolean apply(final SubscriptionEventModelDao input) {
for (final SubscriptionBaseTransitionType e : eventTypes) {
if (input.isOfSubscriptionBaseTransitionType(e)) {
return true;
}
}
return false;
}
});

return Iterables.transform(filteredActiveEvents, new Function<SubscriptionEventModelDao, SubscriptionBaseEvent>() {

@Override
public SubscriptionBaseEvent apply(final SubscriptionEventModelDao input) {
return SubscriptionEventModelDao.toSubscriptionEvent(input);
}
});
}
});
}

@Override
public List<SubscriptionBaseEvent> getPendingEventsForSubscription(final UUID subscriptionId, final InternalTenantContext context) {
final Date now = clock.getUTCNow().toDate();
Expand Down
2 changes: 0 additions & 2 deletions subscription/src/main/java/org/killbill/billing/subscription/engine/dao/SubscriptionDao.java
View file
Expand Up @@ -76,8 +76,6 @@ public interface SubscriptionDao extends EntityDao<SubscriptionBundleModelDao, S

public SubscriptionBaseEvent getEventById(UUID eventId, InternalTenantContext context);

public Iterable<SubscriptionBaseEvent> getFutureEventsForAccount(List<SubscriptionBaseTransitionType> eventTypes, InternalTenantContext context);

public List<SubscriptionBaseEvent> getEventsForSubscription(UUID subscriptionId, InternalTenantContext context);

public List<SubscriptionBaseEvent> getPendingEventsForSubscription(UUID subscriptionId, InternalTenantContext context);
Expand Down
10 changes: 0 additions & 10 deletions ...src/test/java/org/killbill/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java
View file
Expand Up @@ -38,14 +38,12 @@
import org.killbill.billing.dao.MockNonEntityDao;
import org.killbill.billing.entitlement.api.SubscriptionApiException;
import org.killbill.billing.subscription.api.SubscriptionBase;
import org.killbill.billing.subscription.api.SubscriptionBaseTransitionType;
import org.killbill.billing.subscription.api.SubscriptionBaseWithAddOns;
import org.killbill.billing.subscription.api.transfer.BundleTransferData;
import org.killbill.billing.subscription.api.transfer.TransferCancelData;
import org.killbill.billing.subscription.api.user.DefaultEffectiveSubscriptionEvent;
import org.killbill.billing.subscription.api.user.DefaultSubscriptionBase;
import org.killbill.billing.subscription.api.user.DefaultSubscriptionBaseBundle;
import org.killbill.billing.subscription.api.user.DefaultSubscriptionBaseWithAddOns;
import org.killbill.billing.subscription.api.user.SubscriptionBaseBundle;
import org.killbill.billing.subscription.api.user.SubscriptionBaseTransitionData;
import org.killbill.billing.subscription.api.user.SubscriptionBuilder;
Expand All @@ -71,9 +69,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;

public class MockSubscriptionDaoMemory extends MockEntityDaoBase<SubscriptionBundleModelDao, SubscriptionBaseBundle, SubscriptionApiException> implements SubscriptionDao {
Expand Down Expand Up @@ -472,11 +467,6 @@ public SubscriptionBaseEvent getEventById(final UUID eventId, final InternalTena
return null;
}

@Override
public Iterable<SubscriptionBaseEvent> getFutureEventsForAccount(final List<SubscriptionBaseTransitionType> eventTypes, final InternalTenantContext context) {
return null;
}

private void recordFutureNotificationFromTransaction(final EntitySqlDaoWrapperFactory transactionalDao, final DateTime effectiveDate,
final NotificationEvent notificationKey, final InternalCallContext context) {
try {
Expand Down

1 comment on commit 3c55d2f

@pierre
Copy link
Member

@pierre pierre commented on 3c55d2f Dec 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Please sign in to comment.