killbill-memoizeit

Fix usage endpoint to verify that we can only record usage on …

9/26/2014 10:05:13 PM

active subscriptions

stephane brossier

Commit: 7a71ebf

Tree: c214953

Parents: 724d7d6

Changes

jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java 7(+6 -1)

Details

jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java 7(+6 -1)

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java
index 71ade06..f053d3d 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/UsageResource.java
@@ -37,6 +37,8 @@ import javax.ws.rs.core.UriInfo;
 import org.joda.time.LocalDate;
 import org.killbill.billing.account.api.AccountApiException;
 import org.killbill.billing.account.api.AccountUserApi;
+import org.killbill.billing.entitlement.api.Entitlement;
+import org.killbill.billing.entitlement.api.Entitlement.EntitlementState;
 import org.killbill.billing.entitlement.api.EntitlementApi;
 import org.killbill.billing.entitlement.api.EntitlementApiException;
 import org.killbill.billing.jaxrs.json.RolledUpUsageJson;
@@ -100,7 +102,10 @@ public class UsageResource extends JaxRsResourceBase {
 
         final CallContext callContext = context.createContext(createdBy, reason, comment, request);
         // Verify subscription exists..
-        entitlementApi.getEntitlementForId(UUID.fromString(json.getSubscriptionId()), callContext);
+        final Entitlement entitlement = entitlementApi.getEntitlementForId(UUID.fromString(json.getSubscriptionId()), callContext);
+        if (entitlement.getState() != EntitlementState.ACTIVE) {
+            return Response.status(Status.BAD_REQUEST).build();
+        }
 
         final SubscriptionUsageRecord record = json.toSubscriptionUsageRecord();
         usageUserApi.recordRolledUpUsage(record, callContext);