killbill-uncached

analytics: add second_item_record_id to invoice item tables Signed-off-by:

4/10/2013 7:29:59 PM

Changes

Details

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java
index cfcd792..0f31692 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessInvoiceDao.java
@@ -23,6 +23,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.annotation.Nullable;
+
 import org.skife.jdbi.v2.Transaction;
 import org.skife.jdbi.v2.TransactionStatus;
 
@@ -106,7 +108,12 @@ public class BusinessInvoiceDao extends BusinessAnalyticsDaoBase {
 
             final List<BusinessInvoiceItemBaseModelDao> businessInvoiceItems = new ArrayList<BusinessInvoiceItemBaseModelDao>();
             for (final InvoiceItem invoiceItem : invoice.getInvoiceItems()) {
-                final BusinessInvoiceItemBaseModelDao businessInvoiceItem = createBusinessInvoiceItem(account, invoice, invoiceItem, context);
+                final BusinessInvoiceItemBaseModelDao businessInvoiceItem = createBusinessInvoiceItem(account,
+                                                                                                      invoice,
+                                                                                                      invoiceItem,
+                                                                                                      // TODO Will be used for REPAIR_ADJ
+                                                                                                      null,
+                                                                                                      context);
                 if (businessInvoiceItem != null) {
                     businessInvoiceItems.add(businessInvoiceItem);
                 }
@@ -158,6 +165,7 @@ public class BusinessInvoiceDao extends BusinessAnalyticsDaoBase {
     private BusinessInvoiceItemBaseModelDao createBusinessInvoiceItem(final Account account,
                                                                       final Invoice invoice,
                                                                       final InvoiceItem invoiceItem,
+                                                                      @Nullable final Long secondInvoiceItemRecordId,
                                                                       final TenantContext context) throws AnalyticsRefreshException {
         SubscriptionBundle bundle = null;
         // Subscription and bundle could be null for e.g. credits or adjustments
@@ -185,6 +193,7 @@ public class BusinessInvoiceDao extends BusinessAnalyticsDaoBase {
                                                       invoice,
                                                       invoiceItem,
                                                       invoiceItemRecordId,
+                                                      secondInvoiceItemRecordId,
                                                       bundle,
                                                       plan,
                                                       planPhase,
diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java
index 54eda07..14b70f7 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java
@@ -35,6 +35,7 @@ public class BusinessInvoiceAdjustmentModelDao extends BusinessInvoiceItemBaseMo
                                              final Invoice invoice,
                                              final InvoiceItem invoiceItem,
                                              final Long invoiceItemRecordId,
+                                             final Long secondInvoiceItemRecordId,
                                              @Nullable final SubscriptionBundle bundle,
                                              @Nullable final Plan plan,
                                              @Nullable final PlanPhase planPhase,
@@ -45,6 +46,7 @@ public class BusinessInvoiceAdjustmentModelDao extends BusinessInvoiceItemBaseMo
               invoice,
               invoiceItem,
               invoiceItemRecordId,
+              secondInvoiceItemRecordId,
               bundle,
               plan,
               planPhase,
diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java
index ab5ff93..3bcc420 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java
@@ -35,6 +35,7 @@ public class BusinessInvoiceItemAdjustmentModelDao extends BusinessInvoiceItemBa
                                                  final Invoice invoice,
                                                  final InvoiceItem invoiceItem,
                                                  final Long invoiceItemRecordId,
+                                                 final Long secondInvoiceItemRecordId,
                                                  @Nullable final SubscriptionBundle bundle,
                                                  @Nullable final Plan plan,
                                                  @Nullable final PlanPhase planPhase,
@@ -45,6 +46,7 @@ public class BusinessInvoiceItemAdjustmentModelDao extends BusinessInvoiceItemBa
               invoice,
               invoiceItem,
               invoiceItemRecordId,
+              secondInvoiceItemRecordId,
               bundle,
               plan,
               planPhase,
diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java
index e192184..9fac8f8 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java
@@ -43,6 +43,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
     public static final String[] ALL_INVOICE_ITEMS_TABLE_NAMES = new String[]{INVOICE_ADJUSTMENTS_TABLE_NAME, INVOICE_ITEMS_TABLE_NAME, INVOICE_ITEM_ADJUSTMENTS_TABLE_NAME, ACCOUNT_CREDITS_TABLE_NAME};
 
     private Long invoiceItemRecordId;
+    private Long secondInvoiceItemRecordId;
     private UUID itemId;
     private UUID invoiceId;
     private Integer invoiceNumber;
@@ -75,6 +76,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
                                                          final Invoice invoice,
                                                          final InvoiceItem invoiceItem,
                                                          final Long invoiceItemRecordId,
+                                                         final Long secondInvoiceItemRecordId,
                                                          @Nullable final SubscriptionBundle bundle,
                                                          @Nullable final Plan plan,
                                                          @Nullable final PlanPhase planPhase,
@@ -86,6 +88,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
                                                          invoice,
                                                          invoiceItem,
                                                          invoiceItemRecordId,
+                                                         secondInvoiceItemRecordId,
                                                          bundle,
                                                          plan,
                                                          planPhase,
@@ -99,6 +102,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
                                                    invoice,
                                                    invoiceItem,
                                                    invoiceItemRecordId,
+                                                   secondInvoiceItemRecordId,
                                                    bundle,
                                                    plan,
                                                    planPhase,
@@ -110,6 +114,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
                                                              invoice,
                                                              invoiceItem,
                                                              invoiceItemRecordId,
+                                                             secondInvoiceItemRecordId,
                                                              bundle,
                                                              plan,
                                                              planPhase,
@@ -122,6 +127,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
                                                          invoice,
                                                          invoiceItem,
                                                          invoiceItemRecordId,
+                                                         secondInvoiceItemRecordId,
                                                          bundle,
                                                          plan,
                                                          planPhase,
@@ -136,6 +142,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
     public BusinessInvoiceItemBaseModelDao() { /* When reading from the database */ }
 
     public BusinessInvoiceItemBaseModelDao(final Long invoiceItemRecordId,
+                                           final Long secondInvoiceItemRecordId,
                                            final UUID itemId,
                                            final UUID invoiceId,
                                            final Integer invoiceNumber,
@@ -181,6 +188,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
               accountRecordId,
               tenantRecordId);
         this.invoiceItemRecordId = invoiceItemRecordId;
+        this.secondInvoiceItemRecordId = secondInvoiceItemRecordId;
         this.itemId = itemId;
         this.invoiceId = invoiceId;
         this.invoiceNumber = invoiceNumber;
@@ -214,12 +222,14 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
                                            final Invoice invoice,
                                            final InvoiceItem invoiceItem,
                                            final Long invoiceItemRecordId,
+                                           final Long secondInvoiceItemRecordId,
                                            @Nullable final SubscriptionBundle bundle,
                                            @Nullable final Plan plan,
                                            @Nullable final PlanPhase planPhase,
                                            final AuditLog creationAuditLog,
                                            final Long tenantRecordId) {
         this(invoiceItemRecordId,
+             secondInvoiceItemRecordId,
              invoiceItem.getId(),
              invoice.getId(),
              invoice.getInvoiceNumber(),
@@ -262,6 +272,10 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
         return invoiceItemRecordId;
     }
 
+    public Long getSecondInvoiceItemRecordId() {
+        return secondInvoiceItemRecordId;
+    }
+
     public UUID getItemId() {
         return itemId;
     }
@@ -371,6 +385,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
         final StringBuilder sb = new StringBuilder();
         sb.append("BusinessInvoiceItemBaseModelDao");
         sb.append("{invoiceItemRecordId=").append(invoiceItemRecordId);
+        sb.append(", secondInvoiceItemRecordId=").append(secondInvoiceItemRecordId);
         sb.append(", itemId=").append(itemId);
         sb.append(", invoiceId=").append(invoiceId);
         sb.append(", invoiceNumber=").append(invoiceNumber);
@@ -490,6 +505,9 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
         if (revenueRecognizable != null ? !revenueRecognizable.equals(that.revenueRecognizable) : that.revenueRecognizable != null) {
             return false;
         }
+        if (secondInvoiceItemRecordId != null ? !secondInvoiceItemRecordId.equals(that.secondInvoiceItemRecordId) : that.secondInvoiceItemRecordId != null) {
+            return false;
+        }
         if (slug != null ? !slug.equals(that.slug) : that.slug != null) {
             return false;
         }
@@ -504,6 +522,7 @@ public abstract class BusinessInvoiceItemBaseModelDao extends BusinessModelDaoBa
     public int hashCode() {
         int result = super.hashCode();
         result = 31 * result + (invoiceItemRecordId != null ? invoiceItemRecordId.hashCode() : 0);
+        result = 31 * result + (secondInvoiceItemRecordId != null ? secondInvoiceItemRecordId.hashCode() : 0);
         result = 31 * result + (itemId != null ? itemId.hashCode() : 0);
         result = 31 * result + (invoiceId != null ? invoiceId.hashCode() : 0);
         result = 31 * result + (invoiceNumber != null ? invoiceNumber.hashCode() : 0);
diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java
index 2dba9a5..6115d34 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java
@@ -35,6 +35,7 @@ public class BusinessInvoiceItemCreditModelDao extends BusinessInvoiceItemBaseMo
                                              final Invoice invoice,
                                              final InvoiceItem invoiceItem,
                                              final Long invoiceItemRecordId,
+                                             final Long secondInvoiceItemRecordId,
                                              @Nullable final SubscriptionBundle bundle,
                                              @Nullable final Plan plan,
                                              @Nullable final PlanPhase planPhase,
@@ -45,6 +46,7 @@ public class BusinessInvoiceItemCreditModelDao extends BusinessInvoiceItemBaseMo
               invoice,
               invoiceItem,
               invoiceItemRecordId,
+              secondInvoiceItemRecordId,
               bundle,
               plan,
               planPhase,
diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemModelDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemModelDao.java
index cb9f231..715d452 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/model/BusinessInvoiceItemModelDao.java
@@ -35,6 +35,7 @@ public class BusinessInvoiceItemModelDao extends BusinessInvoiceItemBaseModelDao
                                        final Invoice invoice,
                                        final InvoiceItem invoiceItem,
                                        final Long invoiceItemRecordId,
+                                       final Long secondInvoiceItemRecordId,
                                        @Nullable final SubscriptionBundle bundle,
                                        @Nullable final Plan plan,
                                        @Nullable final PlanPhase planPhase,
@@ -45,6 +46,7 @@ public class BusinessInvoiceItemModelDao extends BusinessInvoiceItemBaseModelDao
               invoice,
               invoiceItem,
               invoiceItemRecordId,
+              secondInvoiceItemRecordId,
               bundle,
               plan,
               planPhase,
diff --git a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg
index 379ff21..9d389dd 100644
--- a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg
+++ b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg
@@ -205,6 +205,7 @@ insert into bin (
 createBia() ::= <<
 insert into bia (
 , invoice_item_record_id
+, second_invoice_item_record_id
 , item_id
 , invoice_id
 , invoice_number
@@ -242,6 +243,7 @@ insert into bia (
 , tenant_record_id
 ) values (
   :invoiceItemRecordId
+, :secondInvoiceItemRecordId
 , :itemId
 , :invoiceId
 , :invoiceNumber
@@ -283,6 +285,7 @@ insert into bia (
 createBii() ::= <<
 insert into bii (
   invoice_item_record_id
+, second_invoice_item_record_id
 , item_id
 , invoice_id
 , invoice_number
@@ -320,6 +323,7 @@ insert into bii (
 , tenant_record_id
 ) values (
   :invoiceItemRecordId
+, :secondInvoiceItemRecordId
 , :itemId
 , :invoiceId
 , :invoiceNumber
@@ -361,6 +365,7 @@ insert into bii (
 createBiia() ::= <<
 insert into biia (
   invoice_item_record_id
+, second_invoice_item_record_id
 , item_id
 , invoice_id
 , invoice_number
@@ -398,6 +403,7 @@ insert into biia (
 , tenant_record_id
 ) values (
   :invoiceItemRecordId
+, :secondInvoiceItemRecordId
 , :itemId
 , :invoiceId
 , :invoiceNumber
@@ -439,6 +445,7 @@ insert into biia (
 createBiic() ::= <<
 insert into biic (
   invoice_item_record_id
+, second_invoice_item_record_id
 , item_id
 , invoice_id
 , invoice_number
@@ -476,6 +483,7 @@ insert into biic (
 , tenant_record_id
 ) values (
   :invoiceItemRecordId
+, :secondInvoiceItemRecordId
 , :itemId
 , :invoiceId
 , :invoiceNumber
diff --git a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/ddl.sql b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/ddl.sql
index f20b09e..6f03b7b 100644
--- a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/ddl.sql
+++ b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/ddl.sql
@@ -132,6 +132,7 @@ drop table if exists bia;
 create table bia (
   record_id int(11) unsigned not null auto_increment
 , invoice_item_record_id int(11) unsigned default null
+, second_invoice_item_record_id int(11) unsigned default null
 , item_id char(36) not null
 , invoice_id char(36) not null
 , invoice_number bigint default null
@@ -180,6 +181,7 @@ drop table if exists bii;
 create table bii (
   record_id int(11) unsigned not null auto_increment
 , invoice_item_record_id int(11) unsigned default null
+, second_invoice_item_record_id int(11) unsigned default null
 , item_id char(36) not null
 , invoice_id char(36) not null
 , invoice_number bigint default null
@@ -228,6 +230,7 @@ drop table if exists biia;
 create table biia (
   record_id int(11) unsigned not null auto_increment
 , invoice_item_record_id int(11) unsigned default null
+, second_invoice_item_record_id int(11) unsigned default null
 , item_id char(36) not null
 , invoice_id char(36) not null
 , invoice_number bigint default null
@@ -276,6 +279,7 @@ drop table if exists biic;
 create table biic (
   record_id int(11) unsigned not null auto_increment
 , invoice_item_record_id int(11) unsigned default null
+, second_invoice_item_record_id int(11) unsigned default null
 , item_id char(36) not null
 , invoice_id char(36) not null
 , invoice_number bigint default null
diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteNoDB.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteNoDB.java
index e9cddb0..3d50daf 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteNoDB.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteNoDB.java
@@ -75,6 +75,7 @@ public abstract class AnalyticsTestSuiteNoDB {
     protected final Long subscriptionEventRecordId = 2L;
     protected final Long invoiceRecordId = 3L;
     protected final Long invoiceItemRecordId = 4L;
+    protected final Long secondInvoiceItemRecordId = 24L;
     protected final Long invoicePaymentRecordId = 5L;
     protected final Long blockingStateRecordId = 6L;
     protected final Long fieldRecordId = 7L;
diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoice.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoice.java
index bec57d8..aefcef0 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoice.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoice.java
@@ -40,6 +40,7 @@ public class TestBusinessInvoice extends AnalyticsTestSuiteNoDB {
                                                                                                                invoice,
                                                                                                                invoiceItem,
                                                                                                                invoiceItemRecordId,
+                                                                                                               secondInvoiceItemRecordId,
                                                                                                                bundle,
                                                                                                                plan,
                                                                                                                phase,
diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoiceItem.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoiceItem.java
index b2e8768..b3cad4c 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoiceItem.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessInvoiceItem.java
@@ -31,6 +31,7 @@ public class TestBusinessInvoiceItem extends AnalyticsTestSuiteNoDB {
                                                                                                                invoice,
                                                                                                                invoiceItem,
                                                                                                                invoiceItemRecordId,
+                                                                                                               secondInvoiceItemRecordId,
                                                                                                                bundle,
                                                                                                                plan,
                                                                                                                phase,
diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSnapshot.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSnapshot.java
index e16ba60..7775be0 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSnapshot.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/api/TestBusinessSnapshot.java
@@ -76,6 +76,7 @@ public class TestBusinessSnapshot extends AnalyticsTestSuiteNoDB {
                                                                                                                invoice,
                                                                                                                invoiceItem,
                                                                                                                invoiceItemRecordId,
+                                                                                                               secondInvoiceItemRecordId,
                                                                                                                bundle,
                                                                                                                plan,
                                                                                                                phase,
diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceItemModelDao.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceItemModelDao.java
index 8895b02..fda8860 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceItemModelDao.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/dao/model/TestBusinessInvoiceItemModelDao.java
@@ -30,6 +30,7 @@ public class TestBusinessInvoiceItemModelDao extends AnalyticsTestSuiteNoDB {
                                                                                                 invoice,
                                                                                                 invoiceItem,
                                                                                                 invoiceItemRecordId,
+                                                                                                secondInvoiceItemRecordId,
                                                                                                 null,
                                                                                                 null,
                                                                                                 null,
@@ -52,6 +53,7 @@ public class TestBusinessInvoiceItemModelDao extends AnalyticsTestSuiteNoDB {
                                                                                                 invoice,
                                                                                                 invoiceItem,
                                                                                                 invoiceItemRecordId,
+                                                                                                secondInvoiceItemRecordId,
                                                                                                 bundle,
                                                                                                 plan,
                                                                                                 phase,
@@ -71,6 +73,7 @@ public class TestBusinessInvoiceItemModelDao extends AnalyticsTestSuiteNoDB {
         verifyBusinessModelDaoBase(invoiceItemModelDao, accountRecordId, tenantRecordId);
         Assert.assertEquals(invoiceItemModelDao.getCreatedDate(), invoiceItem.getCreatedDate());
         Assert.assertEquals(invoiceItemModelDao.getInvoiceItemRecordId(), invoiceItemRecordId);
+        Assert.assertEquals(invoiceItemModelDao.getSecondInvoiceItemRecordId(), secondInvoiceItemRecordId);
         Assert.assertEquals(invoiceItemModelDao.getItemId(), invoiceItem.getId());
         Assert.assertEquals(invoiceItemModelDao.getInvoiceId(), invoice.getId());
         Assert.assertEquals(invoiceItemModelDao.getInvoiceNumber(), invoice.getInvoiceNumber());