2/10/2015 5:33:58 PM
main goal of this patch it to expose the subscription events from the Subscription
object. Before, the ordering logic was encapsulated in DefaultSubscriptionBundleTimeline,
as only the SubscriptionBundle object exported the events, across all subscriptions for
the bundle.
The ordering logic has been taken out of DefaultSubscriptionBundleTimeline into two
pieces: SubscriptionEventOrdering (to order base subscription events) and BlockingStateOrdering
(to insert the blocking states ordered). The code has been moved pretty much as-is.
Besides wiring, the timeline test TestDefaultSubscriptionBundleTimeline is untouched
and passes.
In JAX-RS, the main change is in the SubscriptionJson constructor. While before
we had to extract the events for a given subscription from the bundle timeline,
we can now simply retrieve them from the Subscription object itself. This automatically
fixes https://github.com/killbill/killbill/issues/244.
The full bundle timeline is now exported in BundleTimelineJson as well (the old BundleTimelineJson
format wasn't used).
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/9/2015 3:37:28 PM
isBlockedBilling, isBlockedEntitlement, serviceName and serviceStateName
fields in EventSubscriptionJson.
This also removes the newEvents and deletedEvents fields which weren't populated.
Associated integration test: https://github.com/killbill/killbill-integration-tests/commit/a6f364c0cb19906e5aba485d1648b8c412be55b3
This fixes https://github.com/killbill/killbill/issues/137.
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
|
|
|
|
2/7/2015 3:16:07 PM
is a workaround for https://github.com/killbill/killbill/issues/270.
See also 5f5ef1d7ca652eb2650f0415551e4cb0eb9c6a8f.
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/6/2015 9:32:04 PM
DisabledDuration if the duration is less than a day.
This fixes https://github.com/killbill/killbill/issues/267.
Integration test: https://github.com/killbill/killbill-integration-tests/commit/d8495f963660bf356256afa95c258e6004aefaff.
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/6/2015 8:15:14 PM
is a follow-up of cbd89342ce5e8d623822662494e6b0c1a65b6fc8.
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/6/2015 7:07:05 PM
Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/6/2015 7:00:22 PM
of timing issues, add-ons cancelled by the base plan would not always
be reflected in the add-on events list.
This patch revisits the creation of these events by not caring about the time,
but simply looking for any change or cancellation event for the base plan,
which would trigger a cancellation. If the add-on is not yet cancelled,
the earliest event found is now used to add the in-memory cancellation event.
This fixes https://github.com/killbill/killbill/issues/268.
Corresponding integration test: https://github.com/killbill/killbill-integration-tests/commit/d7ec9355d405e384390341c40b38f6e4be827950.
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
2/6/2015 11:57:55 AM
release
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
|
