killbill-uncached
jaxrs: Add audit logs for bundle endpoints. See 3b41858ca99cf4d4aa7d5bfd966c7ba57c97e2e9
11/13/2016 12:40:22 AM
Details
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
index fe76cbf..982e965 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
@@ -267,6 +267,7 @@ public class AccountResource extends JaxRsResourceBase {
public Response getAccountBundles(@PathParam("accountId") final String accountId,
@QueryParam(QUERY_EXTERNAL_KEY) final String externalKey,
@QueryParam(QUERY_BUNDLES_FILTER) final String bundlesFilter,
+ @QueryParam(QUERY_AUDIT) @DefaultValue("NONE") final AuditMode auditMode,
@javax.ws.rs.core.Context final HttpServletRequest request) throws AccountApiException, SubscriptionApiException {
final TenantContext tenantContext = context.createContext(request);
@@ -277,6 +278,10 @@ public class AccountResource extends JaxRsResourceBase {
subscriptionApi.getSubscriptionBundlesForAccountIdAndExternalKey(uuid, externalKey, tenantContext) :
subscriptionApi.getSubscriptionBundlesForAccountId(uuid, tenantContext);
+
+ final AccountAuditLogs accountAuditLogs = auditUserApi.getAccountAuditLogs(account.getId(), auditMode.getLevel(), tenantContext);
+
+
boolean filter = (null != bundlesFilter && !bundlesFilter.isEmpty());
final Collection<BundleJson> result = Collections2.transform(
@@ -284,7 +289,7 @@ public class AccountResource extends JaxRsResourceBase {
@Override
public BundleJson apply(final SubscriptionBundle input) {
try {
- return new BundleJson(input, account.getCurrency(), null);
+ return new BundleJson(input, account.getCurrency(), accountAuditLogs);
} catch (final CatalogApiException e) {
// Not the cleanest thing, but guava Api don't allow throw..
throw new RuntimeException(e);