killbill-uncached

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/user/AnalyticsUserApi.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/user/AnalyticsUserApi.java
index 8826361..1f14af8 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/user/AnalyticsUserApi.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/user/AnalyticsUserApi.java
@@ -23,7 +23,6 @@ import org.osgi.service.log.LogService;
 
 import com.ning.billing.ObjectType;
 import com.ning.billing.osgi.bundles.analytics.AnalyticsRefreshException;
-import com.ning.billing.osgi.bundles.analytics.BusinessAnalyticsBase;
 import com.ning.billing.osgi.bundles.analytics.api.BusinessAccount;
 import com.ning.billing.osgi.bundles.analytics.api.BusinessField;
 import com.ning.billing.osgi.bundles.analytics.api.BusinessInvoice;
@@ -45,10 +44,10 @@ import com.ning.killbill.osgi.libs.killbill.OSGIKillbillAPI;
 import com.ning.killbill.osgi.libs.killbill.OSGIKillbillDataSource;
 import com.ning.killbill.osgi.libs.killbill.OSGIKillbillLogService;
 
-public class AnalyticsUserApi extends BusinessAnalyticsBase {
+public class AnalyticsUserApi {
 
+    private final LogService logService;
     private final AnalyticsDao analyticsDao;
-    private final BusinessAccountDao bacDao;
     private final BusinessSubscriptionTransitionDao bstDao;
     private final BusinessInvoiceAndInvoicePaymentDao binAndBipDao;
     private final BusinessOverdueStatusDao bosDao;
@@ -58,9 +57,10 @@ public class AnalyticsUserApi extends BusinessAnalyticsBase {
     public AnalyticsUserApi(final OSGIKillbillLogService logService,
                             final OSGIKillbillAPI osgiKillbillAPI,
                             final OSGIKillbillDataSource osgiKillbillDataSource) {
-        super(logService, osgiKillbillAPI);
+        this.logService = logService;
         this.analyticsDao = new AnalyticsDao(osgiKillbillAPI, osgiKillbillDataSource);
-        this.bacDao = new BusinessAccountDao(logService, osgiKillbillAPI, osgiKillbillDataSource);
+
+        final BusinessAccountDao bacDao = new BusinessAccountDao(logService, osgiKillbillAPI, osgiKillbillDataSource);
         this.bstDao = new BusinessSubscriptionTransitionDao(logService, osgiKillbillAPI, osgiKillbillDataSource, bacDao);
         this.binAndBipDao = new BusinessInvoiceAndInvoicePaymentDao(logService, osgiKillbillAPI, osgiKillbillDataSource, bacDao);
         this.bosDao = new BusinessOverdueStatusDao(logService, osgiKillbillAPI, osgiKillbillDataSource);

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessFactoryBase.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessFactoryBase.java
index 77f0969..5c724dc 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessFactoryBase.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/factory/BusinessFactoryBase.java
@@ -16,14 +16,579 @@
 
 package com.ning.billing.osgi.bundles.analytics.dao.factory;
 
-import com.ning.billing.osgi.bundles.analytics.BusinessAnalyticsBase;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+
+import org.osgi.service.log.LogService;
+
+import com.ning.billing.ObjectType;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountApiException;
+import com.ning.billing.account.api.AccountUserApi;
+import com.ning.billing.catalog.api.Catalog;
+import com.ning.billing.catalog.api.CatalogApiException;
+import com.ning.billing.catalog.api.CatalogUserApi;
+import com.ning.billing.catalog.api.Plan;
+import com.ning.billing.catalog.api.PlanPhase;
+import com.ning.billing.entitlement.api.user.EntitlementUserApi;
+import com.ning.billing.entitlement.api.user.EntitlementUserApiException;
+import com.ning.billing.entitlement.api.user.Subscription;
+import com.ning.billing.entitlement.api.user.SubscriptionBundle;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.api.InvoiceApiException;
+import com.ning.billing.invoice.api.InvoiceItem;
+import com.ning.billing.invoice.api.InvoicePayment;
+import com.ning.billing.invoice.api.InvoicePaymentApi;
+import com.ning.billing.invoice.api.InvoiceUserApi;
+import com.ning.billing.junction.api.BlockingState;
+import com.ning.billing.junction.api.JunctionApi;
+import com.ning.billing.osgi.bundles.analytics.AnalyticsRefreshException;
+import com.ning.billing.osgi.bundles.analytics.dao.model.BusinessModelDaoBase.ReportGroup;
+import com.ning.billing.payment.api.Payment;
+import com.ning.billing.payment.api.PaymentApi;
+import com.ning.billing.payment.api.PaymentApiException;
+import com.ning.billing.payment.api.PaymentMethod;
+import com.ning.billing.payment.api.Refund;
+import com.ning.billing.util.api.AuditLevel;
+import com.ning.billing.util.api.AuditUserApi;
+import com.ning.billing.util.api.CustomFieldUserApi;
+import com.ning.billing.util.api.RecordIdApi;
+import com.ning.billing.util.api.TagDefinitionApiException;
+import com.ning.billing.util.api.TagUserApi;
+import com.ning.billing.util.audit.AuditLog;
+import com.ning.billing.util.audit.AuditLogsForAccount;
+import com.ning.billing.util.audit.ChangeType;
+import com.ning.billing.util.callcontext.CallContext;
+import com.ning.billing.util.callcontext.TenantContext;
+import com.ning.billing.util.customfield.CustomField;
+import com.ning.billing.util.tag.ControlTagType;
+import com.ning.billing.util.tag.Tag;
+import com.ning.billing.util.tag.TagDefinition;
 import com.ning.killbill.osgi.libs.killbill.OSGIKillbillAPI;
 import com.ning.killbill.osgi.libs.killbill.OSGIKillbillLogService;
 
-public class BusinessFactoryBase extends BusinessAnalyticsBase {
+/**
+ * Wrapper around Kill Bill APIs
+ * <p/>
+ * Note: the code is merciful in case audit logs cannot be retrieved. This is because the auditing code
+ * is fairly recent, and we want this plugin to support early versions of Kill Bill (with non audited data).
+ */
+public abstract class BusinessFactoryBase {
+
+    protected final OSGIKillbillLogService logService;
+    protected final OSGIKillbillAPI osgiKillbillAPI;
+
+    public BusinessFactoryBase(final OSGIKillbillLogService logService, final OSGIKillbillAPI osgiKillbillAPI) {
+        this.logService = logService;
+        this.osgiKillbillAPI = osgiKillbillAPI;
+    }
+
+    //
+    // TENANT
+    //
+
+    private static final long INTERNAL_TENANT_RECORD_ID = 0L;
+
+    protected Long getTenantRecordId(final TenantContext context) throws AnalyticsRefreshException {
+        // See convention in InternalCallContextFactory
+        if (context.getTenantId() == null) {
+            return INTERNAL_TENANT_RECORD_ID;
+        } else {
+            final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+            return recordIdUserApi.getRecordId(context.getTenantId(), ObjectType.TENANT, context);
+        }
+    }
+
+    //
+    // ACCOUNT
+    //
+
+    protected Account getAccount(final UUID accountId, final TenantContext context) throws AnalyticsRefreshException {
+        final AccountUserApi accountUserApi = getAccountUserApi();
+
+        try {
+            return accountUserApi.getAccountById(accountId, context);
+        } catch (AccountApiException e) {
+            logService.log(LogService.LOG_WARNING, "Error retrieving account for id " + accountId, e);
+            throw new AnalyticsRefreshException(e);
+        }
+    }
+
+    protected AuditLog getAccountCreationAuditLog(final UUID accountId, final TenantContext context) throws AnalyticsRefreshException {
+        final AuditLogsForAccount auditLogsForAccount = getAuditUserApi().getAuditLogsForAccount(accountId, AuditLevel.MINIMAL, context);
+        for (final AuditLog auditLog : auditLogsForAccount.getAccountAuditLogs()) {
+            if (auditLog.getChangeType().equals(ChangeType.INSERT)) {
+                return auditLog;
+            }
+        }
+
+        logService.log(LogService.LOG_WARNING, "Unable to find Account creation audit log for id " + accountId);
+        return null;
+    }
+
+    protected Long getAccountRecordId(final UUID accountId, final TenantContext context) throws AnalyticsRefreshException {
+        final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+        return recordIdUserApi.getRecordId(accountId, ObjectType.ACCOUNT, context);
+    }
+
+    protected ReportGroup getReportGroup(final UUID accountId, final TenantContext context) throws AnalyticsRefreshException {
+        final TagUserApi tagUserApi = getTagUserApi();
+        boolean isTestAccount = false;
+        boolean isPartnerAccount = false;
+
+        final List<Tag> tagForAccount = tagUserApi.getTagsForObject(accountId, ObjectType.TAG, context);
+        for (final Tag tag : tagForAccount) {
+            if (ControlTagType.TEST.getId().equals(tag.getTagDefinitionId())) {
+                isTestAccount = true;
+            } else if (ControlTagType.PARTNER.getId().equals(tag.getTagDefinitionId())) {
+                isPartnerAccount = true;
+            }
+        }
+
+        // Test group has precedence
+        if (isTestAccount) {
+            return ReportGroup.test;
+        } else if (isPartnerAccount) {
+            return ReportGroup.partner;
+        } else {
+            return null;
+        }
+    }
+
+    //
+    // SUBSCRIPTION
+    //
+
+    protected SubscriptionBundle getSubscriptionBundle(final UUID bundleId, final TenantContext context) throws AnalyticsRefreshException {
+        final EntitlementUserApi entitlementUserApi = getEntitlementUserApi();
+
+        try {
+            return entitlementUserApi.getBundleFromId(bundleId, context);
+        } catch (EntitlementUserApiException e) {
+            logService.log(LogService.LOG_WARNING, "Error retrieving bundle for id " + bundleId, e);
+            throw new AnalyticsRefreshException(e);
+        }
+    }
+
+    protected Collection<Subscription> getSubscriptionsForBundle(final UUID bundleId, final TenantContext context) throws AnalyticsRefreshException {
+        final EntitlementUserApi entitlementUserApi = getEntitlementUserApi();
+        return entitlementUserApi.getSubscriptionsForBundle(bundleId, context);
+    }
+
+    protected List<SubscriptionBundle> getSubscriptionBundlesForAccount(final UUID accountId, final TenantContext context) throws AnalyticsRefreshException {
+        final EntitlementUserApi entitlementUserApi = getEntitlementUserApi();
+        return entitlementUserApi.getBundlesForAccount(accountId, context);
+    }
+
+    protected Long getBundleRecordId(final UUID bundleId, final TenantContext context) throws AnalyticsRefreshException {
+        final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+        return recordIdUserApi.getRecordId(bundleId, ObjectType.BUNDLE, context);
+    }
+
+    protected AuditLog getBundleCreationAuditLog(final UUID bundleId, final TenantContext context) throws AnalyticsRefreshException {
+        final List<AuditLog> auditLogsForBundle = getAuditUserApi().getAuditLogs(bundleId, ObjectType.BUNDLE, AuditLevel.MINIMAL, context);
+        for (final AuditLog auditLog : auditLogsForBundle) {
+            if (auditLog.getChangeType().equals(ChangeType.INSERT)) {
+                return auditLog;
+            }
+        }
+
+        logService.log(LogService.LOG_WARNING, "Unable to find Bundle creation audit log for id " + bundleId);
+        return null;
+    }
+
+    protected Subscription getSubscription(final UUID subscriptionId, final TenantContext context) throws AnalyticsRefreshException {
+        final EntitlementUserApi entitlementUserApi = getEntitlementUserApi();
+
+        try {
+            return entitlementUserApi.getSubscriptionFromId(subscriptionId, context);
+        } catch (EntitlementUserApiException e) {
+            logService.log(LogService.LOG_WARNING, "Error retrieving subscription for id " + subscriptionId, e);
+            throw new AnalyticsRefreshException(e);
+        }
+    }
+
+    protected AuditLog getSubscriptionEventCreationAuditLog(final UUID subscriptionEventId, final TenantContext context) throws AnalyticsRefreshException {
+        final List<AuditLog> auditLogsForSubscriptionEvent = getAuditUserApi().getAuditLogs(subscriptionEventId, ObjectType.SUBSCRIPTION_EVENT, AuditLevel.MINIMAL, context);
+        for (final AuditLog auditLog : auditLogsForSubscriptionEvent) {
+            if (auditLog.getChangeType().equals(ChangeType.INSERT)) {
+                return auditLog;
+            }
+        }
+
+        logService.log(LogService.LOG_WARNING, "Unable to find Subscription event creation audit log for id " + subscriptionEventId);
+        return null;
+    }
+
+    protected Long getSubscriptionEventRecordId(final UUID subscriptionEventId, final TenantContext context) throws AnalyticsRefreshException {
+        final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+        return recordIdUserApi.getRecordId(subscriptionEventId, ObjectType.SUBSCRIPTION_EVENT, context);
+    }
+
+    //
+    // OVERDUE
+    //
+
+    protected List<BlockingState> getBlockingHistory(final UUID overdueableId, final TenantContext context) throws AnalyticsRefreshException {
+        final JunctionApi junctionUserApi = getJunctionUserApi();
+        return junctionUserApi.getBlockingHistory(overdueableId, context);
+    }
+
+    //
+    // BLOCKING STATES
+    //
+
+    protected AuditLog getBlockingStateCreationAuditLog(final UUID blockingStateId, final TenantContext context) throws AnalyticsRefreshException {
+        final List<AuditLog> auditLogsForBlockingState = getAuditUserApi().getAuditLogs(blockingStateId, ObjectType.BLOCKING_STATES, AuditLevel.MINIMAL, context);
+        for (final AuditLog auditLog : auditLogsForBlockingState) {
+            if (auditLog.getChangeType().equals(ChangeType.INSERT)) {
+                return auditLog;
+            }
+        }
+
+        logService.log(LogService.LOG_WARNING, "Unable to find Blocking state creation audit log for id " + blockingStateId);
+        return null;
+    }
+
+    protected Long getBlockingStateRecordId(final UUID blockingStateId, final TenantContext context) throws AnalyticsRefreshException {
+        final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+        return recordIdUserApi.getRecordId(blockingStateId, ObjectType.BLOCKING_STATES, context);
+    }
+
+    //
+    // INVOICE
+    //
+
+    protected Invoice getInvoice(final UUID invoiceId, final TenantContext context) throws AnalyticsRefreshException {
+        final InvoiceUserApi invoiceUserApi = getInvoiceUserApi();
+        try {
+            return invoiceUserApi.getInvoice(invoiceId, context);
+        } catch (InvoiceApiException e) {
+            logService.log(LogService.LOG_WARNING, "Error retrieving subscription for id " + invoiceId, e);
+            throw new AnalyticsRefreshException(e);
+        }
+    }
+
+    protected AuditLog getInvoiceCreationAuditLog(final UUID invoiceId, final TenantContext context) throws AnalyticsRefreshException {
+        final List<AuditLog> auditLogsForInvoice = getAuditUserApi().getAuditLogs(invoiceId, ObjectType.INVOICE, AuditLevel.MINIMAL, context);
+        for (final AuditLog auditLog : auditLogsForInvoice) {
+            if (auditLog.getChangeType().equals(ChangeType.INSERT)) {
+                return auditLog;
+            }
+        }
+
+        logService.log(LogService.LOG_WARNING, "Unable to find Invoice creation audit log for id " + invoiceId);
+        return null;
+    }
+
+    protected Long getInvoiceRecordId(final UUID invoiceId, final TenantContext context) throws AnalyticsRefreshException {
+        final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+        return recordIdUserApi.getRecordId(invoiceId, ObjectType.INVOICE, context);
+    }
+
+    protected AuditLog getInvoiceItemCreationAuditLog(final UUID invoiceItemId, final TenantContext context) throws AnalyticsRefreshException {
+        final List<AuditLog> auditLogsForInvoiceItem = getAuditUserApi().getAuditLogs(invoiceItemId, ObjectType.INVOICE_ITEM, AuditLevel.MINIMAL, context);
+        for (final AuditLog auditLog : auditLogsForInvoiceItem) {
+            if (auditLog.getChangeType().equals(ChangeType.INSERT)) {
+                return auditLog;
+            }
+        }
+
+        logService.log(LogService.LOG_WARNING, "Unable to find Invoice item creation audit log for id " + invoiceItemId);
+        return null;
+    }
+
+    protected Long getInvoiceItemRecordId(final UUID invoiceItemId, final TenantContext context) throws AnalyticsRefreshException {
+        final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+        return recordIdUserApi.getRecordId(invoiceItemId, ObjectType.INVOICE_ITEM, context);
+    }
+
+    protected Collection<Invoice> getInvoicesByAccountId(final UUID accountId, final CallContext context) throws AnalyticsRefreshException {
+        final InvoiceUserApi invoiceUserApi = getInvoiceUserApi();
+        return invoiceUserApi.getInvoicesByAccount(accountId, context);
+    }
+
+    protected BigDecimal getAccountBalance(final UUID accountId, final CallContext context) throws AnalyticsRefreshException {
+        final InvoiceUserApi invoiceUserApi = getInvoiceUserApi();
+        return invoiceUserApi.getAccountBalance(accountId, context);
+    }
+
+    protected Plan getPlanFromInvoiceItem(final InvoiceItem invoiceItem, final TenantContext context) throws AnalyticsRefreshException {
+        try {
+            final Catalog catalog = getCatalog(context);
+            return catalog.findPlan(invoiceItem.getPlanName(), invoiceItem.getStartDate().toDateTimeAtStartOfDay());
+        } catch (CatalogApiException e) {
+            logService.log(LogService.LOG_INFO, "Unable to retrieve plan for invoice item " + invoiceItem.getId(), e);
+            return null;
+        }
+    }
+
+    protected PlanPhase getPlanPhaseFromInvoiceItem(final InvoiceItem invoiceItem, final TenantContext context) throws AnalyticsRefreshException {
+        final Subscription subscription = getSubscription(invoiceItem.getSubscriptionId(), context);
+
+        try {
+            final Catalog catalog = getCatalog(context);
+            return catalog.findPhase(invoiceItem.getPhaseName(), invoiceItem.getStartDate().toDateTimeAtStartOfDay(), subscription.getStartDate());
+        } catch (CatalogApiException e) {
+            logService.log(LogService.LOG_INFO, "Unable to retrieve phase for invoice item " + invoiceItem.getId(), e);
+            return null;
+        }
+    }
+
+    //
+    // CATALOG
+    //
+
+    protected Catalog getCatalog(final TenantContext context) throws AnalyticsRefreshException {
+        final CatalogUserApi catalogUserApi = getCatalogUserApi();
+        return catalogUserApi.getCatalog(null, context);
+    }
+
+    //
+    // INVOICE PAYMENT
+    //
+
+    protected Collection<InvoicePayment> getAccountInvoicePayments(final UUID accountId, final TenantContext context) throws AnalyticsRefreshException {
+        final InvoicePaymentApi invoicePaymentApi = getInvoicePaymentUserApi();
+        final Collection<Payment> payments = getPaymentsByAccountId(accountId, context);
+
+        final Collection<InvoicePayment> allInvoicePayments = new LinkedList<InvoicePayment>();
+        for (final Payment payment : payments) {
+            // Retrieve all invoice payment types (including refunds and chargebacks) for that payment
+            allInvoicePayments.addAll(invoicePaymentApi.getInvoicePayments(payment.getId(), context));
+        }
+
+        return allInvoicePayments;
+    }
+
+    protected AuditLog getInvoicePaymentCreationAuditLog(final UUID invoicePaymentId, final TenantContext context) throws AnalyticsRefreshException {
+        final List<AuditLog> auditLogsForInvoicePayment = getAuditUserApi().getAuditLogs(invoicePaymentId, ObjectType.INVOICE_PAYMENT, AuditLevel.MINIMAL, context);
+        for (final AuditLog auditLog : auditLogsForInvoicePayment) {
+            if (auditLog.getChangeType().equals(ChangeType.INSERT)) {
+                return auditLog;
+            }
+        }
+
+        logService.log(LogService.LOG_WARNING, "Unable to find Invoice payment creation audit log for id " + invoicePaymentId);
+        return null;
+    }
+
+    protected Long getInvoicePaymentRecordId(final UUID invoicePaymentId, final TenantContext context) throws AnalyticsRefreshException {
+        final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+        return recordIdUserApi.getRecordId(invoicePaymentId, ObjectType.INVOICE_PAYMENT, context);
+    }
+
+    //
+    // PAYMENT
+    //
+
+    protected Collection<Payment> getPaymentsByAccountId(final UUID accountId, final TenantContext context) throws AnalyticsRefreshException {
+        final PaymentApi paymentApi = getPaymentUserApi();
+        try {
+            return paymentApi.getAccountPayments(accountId, context);
+        } catch (PaymentApiException e) {
+            logService.log(LogService.LOG_WARNING, "Error retrieving payments for account id " + accountId, e);
+            throw new AnalyticsRefreshException(e);
+        }
+    }
+
+    protected Payment getPaymentWithPluginInfo(final UUID paymentId, final TenantContext context) throws AnalyticsRefreshException {
+        final PaymentApi paymentApi = getPaymentUserApi();
+
+        try {
+            return paymentApi.getPayment(paymentId, true, context);
+        } catch (PaymentApiException e) {
+            logService.log(LogService.LOG_WARNING, "Error retrieving payment for id " + paymentId, e);
+            throw new AnalyticsRefreshException(e);
+        }
+    }
+
+    protected Refund getRefundWithPluginInfo(final UUID refundId, final TenantContext context) throws AnalyticsRefreshException {
+        final PaymentApi paymentApi = getPaymentUserApi();
+
+        try {
+            return paymentApi.getRefund(refundId, true, context);
+        } catch (PaymentApiException e) {
+            logService.log(LogService.LOG_WARNING, "Error retrieving refund for id " + refundId, e);
+            throw new AnalyticsRefreshException(e);
+        }
+    }
+
+    protected PaymentMethod getPaymentMethod(final UUID paymentMethodId, final TenantContext context) throws AnalyticsRefreshException {
+        final PaymentApi paymentApi = getPaymentUserApi();
+
+        try {
+            // Try to get all payment methods, including deleted ones, with plugin information
+            return paymentApi.getPaymentMethodById(paymentMethodId, true, true, context);
+        } catch (PaymentApiException e) {
+            logService.log(LogService.LOG_INFO, "Error retrieving payment method for id " + paymentMethodId + " (already deleted?)", e);
+        }
+
+        try {
+            // If we come here, it is possible that the plugin couldn't answer about the payment method, maybe
+            // because it was deleted in the gateway. Try to return the Kill Bill specific info only
+            return paymentApi.getPaymentMethodById(paymentMethodId, true, false, context);
+        } catch (PaymentApiException e) {
+            logService.log(LogService.LOG_INFO, "Error retrieving payment method for id " + paymentMethodId, e);
+            return null;
+        }
+    }
+
+    //
+    // FIELD
+    //
+
+    protected Collection<CustomField> getFieldsForAccount(final UUID accountId, final TenantContext context) throws AnalyticsRefreshException {
+        final CustomFieldUserApi tagUserApi = getCustomFieldUserApi();
+        return tagUserApi.getCustomFieldsForAccount(accountId, context);
+    }
+
+    protected AuditLog getFieldCreationAuditLog(final UUID fieldId, final TenantContext context) throws AnalyticsRefreshException {
+        final List<AuditLog> auditLogsForTag = getAuditUserApi().getAuditLogs(fieldId, ObjectType.CUSTOM_FIELD, AuditLevel.MINIMAL, context);
+        for (final AuditLog auditLog : auditLogsForTag) {
+            if (auditLog.getChangeType().equals(ChangeType.INSERT)) {
+                return auditLog;
+            }
+        }
+
+        logService.log(LogService.LOG_WARNING, "Unable to find Field creation audit log for id " + fieldId);
+        return null;
+    }
+
+    protected Long getFieldRecordId(final UUID fieldId, final TenantContext context) throws AnalyticsRefreshException {
+        final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+        return recordIdUserApi.getRecordId(fieldId, ObjectType.CUSTOM_FIELD, context);
+    }
+
+    //
+    // TAG
+    //
+
+    protected Collection<Tag> getTagsForAccount(final UUID accountId, final TenantContext context) throws AnalyticsRefreshException {
+        final TagUserApi tagUserApi = getTagUserApi();
+        return tagUserApi.getTagsForAccount(accountId, context);
+    }
+
+    protected TagDefinition getTagDefinition(final UUID tagDefinitionId, final TenantContext context) throws AnalyticsRefreshException {
+        final TagUserApi tagUserApi = getTagUserApi();
+
+        try {
+            return tagUserApi.getTagDefinition(tagDefinitionId, context);
+        } catch (TagDefinitionApiException e) {
+            logService.log(LogService.LOG_WARNING, "Error retrieving tag definition for id " + tagDefinitionId, e);
+            throw new AnalyticsRefreshException(e);
+        }
+    }
+
+    protected AuditLog getTagCreationAuditLog(final UUID tagId, final TenantContext context) throws AnalyticsRefreshException {
+        final List<AuditLog> auditLogsForTag = getAuditUserApi().getAuditLogs(tagId, ObjectType.TAG, AuditLevel.MINIMAL, context);
+        for (final AuditLog auditLog : auditLogsForTag) {
+            if (auditLog.getChangeType().equals(ChangeType.INSERT)) {
+                return auditLog;
+            }
+        }
+
+        logService.log(LogService.LOG_WARNING, "Unable to find Tag creation audit log for id " + tagId);
+        return null;
+    }
+
+    protected Long getTagRecordId(final UUID tagId, final TenantContext context) throws AnalyticsRefreshException {
+        final RecordIdApi recordIdUserApi = getRecordIdUserApi();
+        return recordIdUserApi.getRecordId(tagId, ObjectType.TAG, context);
+    }
+
+    //
+    // APIs
+    //
+
+    private AccountUserApi getAccountUserApi() throws AnalyticsRefreshException {
+        final AccountUserApi accountUserApi = osgiKillbillAPI.getAccountUserApi();
+        if (accountUserApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving accountUserApi");
+        }
+        return accountUserApi;
+    }
+
+    private AuditUserApi getAuditUserApi() throws AnalyticsRefreshException {
+        final AuditUserApi auditUserApi = osgiKillbillAPI.getAuditUserApi();
+        if (auditUserApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving auditUserApi");
+        }
+        return auditUserApi;
+    }
+
+    private EntitlementUserApi getEntitlementUserApi() throws AnalyticsRefreshException {
+        final EntitlementUserApi entitlementUserApi = osgiKillbillAPI.getEntitlementUserApi();
+        if (entitlementUserApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving entitlementUserApi");
+        }
+        return entitlementUserApi;
+    }
+
+    private JunctionApi getJunctionUserApi() throws AnalyticsRefreshException {
+        final JunctionApi junctionApi = osgiKillbillAPI.getJunctionApi();
+        if (junctionApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving junctionApi");
+        }
+        return junctionApi;
+    }
+
+    private InvoiceUserApi getInvoiceUserApi() throws AnalyticsRefreshException {
+        final InvoiceUserApi invoiceUserApi = osgiKillbillAPI.getInvoiceUserApi();
+        if (invoiceUserApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving invoiceUserApi");
+        }
+        return invoiceUserApi;
+    }
+
+    private CatalogUserApi getCatalogUserApi() throws AnalyticsRefreshException {
+        final CatalogUserApi catalogUserApi = osgiKillbillAPI.getCatalogUserApi();
+        if (catalogUserApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving catalogUserApi");
+        }
+        return catalogUserApi;
+    }
+
+    private PaymentApi getPaymentUserApi() throws AnalyticsRefreshException {
+        final PaymentApi paymentApi = osgiKillbillAPI.getPaymentApi();
+        if (paymentApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving paymentApi");
+        }
+        return paymentApi;
+    }
+
+    private InvoicePaymentApi getInvoicePaymentUserApi() throws AnalyticsRefreshException {
+        final InvoicePaymentApi invoicePaymentApi = osgiKillbillAPI.getInvoicePaymentApi();
+        if (invoicePaymentApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving invoicePaymentApi");
+        }
+        return invoicePaymentApi;
+    }
+
+    private CustomFieldUserApi getCustomFieldUserApi() throws AnalyticsRefreshException {
+        final CustomFieldUserApi fieldUserApi = osgiKillbillAPI.getCustomFieldUserApi();
+        if (fieldUserApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving fieldUserApi");
+        }
+        return fieldUserApi;
+    }
+
+    private TagUserApi getTagUserApi() throws AnalyticsRefreshException {
+        final TagUserApi tagUserApi = osgiKillbillAPI.getTagUserApi();
+        if (tagUserApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving tagUserApi");
+        }
+        return tagUserApi;
+    }
 
-    public BusinessFactoryBase(final OSGIKillbillLogService logService,
-                               final OSGIKillbillAPI osgiKillbillAPI) {
-        super(logService, osgiKillbillAPI);
+    private RecordIdApi getRecordIdUserApi() throws AnalyticsRefreshException {
+        final RecordIdApi recordIdApi = osgiKillbillAPI.getRecordIdApi();
+        if (recordIdApi == null) {
+            throw new AnalyticsRefreshException("Error retrieving recordIdApi");
+        }
+        return recordIdApi;
     }
 }