killbill-memoizeit
Changes
account/src/main/java/org/killbill/billing/account/api/user/DefaultAccountCreationEvent.java 22(+2 -20)
account/src/main/resources/org/killbill/billing/account/migration/V20180625172110_account_is_notified_for_invoices.sql 2(+2 -0)
account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApiWithMocks.java 4(+1 -3)
entitlement/src/test/java/org/killbill/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java 1(+0 -1)
invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java 4(+0 -4)
profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccountEmailNotifications.java 59(+0 -59)
subscription/src/test/java/org/killbill/billing/subscription/DefaultSubscriptionTestInitializer.java 1(+0 -1)
util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java 4(+2 -2)
Details
diff --git a/account/src/main/java/org/killbill/billing/account/api/DefaultAccount.java b/account/src/main/java/org/killbill/billing/account/api/DefaultAccount.java
index 40647a9..5e8e383 100644
--- a/account/src/main/java/org/killbill/billing/account/api/DefaultAccount.java
+++ b/account/src/main/java/org/killbill/billing/account/api/DefaultAccount.java
@@ -55,7 +55,6 @@ public class DefaultAccount extends EntityBase implements Account {
private final String phone;
private final String notes;
private final Boolean isMigrated;
- private final Boolean isNotifiedForInvoices;
/**
* This call is used to update an existing account
@@ -86,8 +85,7 @@ public class DefaultAccount extends EntityBase implements Account {
data.getPostalCode(),
data.getPhone(),
data.getNotes(),
- data.isMigrated(),
- data.isNotifiedForInvoices());
+ data.isMigrated());
}
// This call is used for testing and update from an existing account
@@ -99,7 +97,7 @@ public class DefaultAccount extends EntityBase implements Account {
final String address1, final String address2, final String companyName,
final String city, final String stateOrProvince, final String country,
final String postalCode, final String phone, final String notes,
- final Boolean isMigrated, final Boolean isNotifiedForInvoices) {
+ final Boolean isMigrated) {
this(id,
null,
null,
@@ -124,8 +122,7 @@ public class DefaultAccount extends EntityBase implements Account {
postalCode,
phone,
notes,
- isMigrated,
- isNotifiedForInvoices);
+ isMigrated);
}
public DefaultAccount(final UUID id, @Nullable final DateTime createdDate, @Nullable final DateTime updatedDate,
@@ -137,7 +134,7 @@ public class DefaultAccount extends EntityBase implements Account {
final String address1, final String address2, final String companyName,
final String city, final String stateOrProvince, final String country,
final String postalCode, final String phone, final String notes,
- final Boolean isMigrated, final Boolean isNotifiedForInvoices) {
+ final Boolean isMigrated) {
super(id, createdDate, updatedDate);
this.externalKey = externalKey;
this.email = email;
@@ -161,7 +158,6 @@ public class DefaultAccount extends EntityBase implements Account {
this.phone = phone;
this.notes = notes;
this.isMigrated = isMigrated;
- this.isNotifiedForInvoices = isNotifiedForInvoices;
}
public DefaultAccount(final AccountModelDao accountModelDao) {
@@ -189,8 +185,7 @@ public class DefaultAccount extends EntityBase implements Account {
accountModelDao.getPostalCode(),
accountModelDao.getPhone(),
accountModelDao.getNotes(),
- accountModelDao.getMigrated(),
- accountModelDao.getIsNotifiedForInvoices());
+ accountModelDao.getMigrated());
}
@Override
@@ -290,11 +285,6 @@ public class DefaultAccount extends EntityBase implements Account {
}
@Override
- public Boolean isNotifiedForInvoices() {
- return isNotifiedForInvoices;
- }
-
- @Override
public String getPhone() {
return phone;
}
@@ -356,10 +346,6 @@ public class DefaultAccount extends EntityBase implements Account {
if (isMigrated != null) {
accountData.setIsMigrated(isMigrated);
}
- final Boolean isNotifiedForInvoices = this.isNotifiedForInvoices != null ? this.isNotifiedForInvoices : currentAccount.isNotifiedForInvoices();
- if (isNotifiedForInvoices != null) {
- accountData.setIsNotifiedForInvoices(isNotifiedForInvoices);
- }
return new DefaultAccount(currentAccount.getId(), accountData);
}
@@ -453,9 +439,6 @@ public class DefaultAccount extends EntityBase implements Account {
if (isMigrated != null ? !isMigrated.equals(that.isMigrated) : that.isMigrated != null) {
return false;
}
- if (isNotifiedForInvoices != null ? !isNotifiedForInvoices.equals(that.isNotifiedForInvoices) : that.isNotifiedForInvoices != null) {
- return false;
- }
if (locale != null ? !locale.equals(that.locale) : that.locale != null) {
return false;
}
@@ -512,7 +495,6 @@ public class DefaultAccount extends EntityBase implements Account {
result = 31 * result + (phone != null ? phone.hashCode() : 0);
result = 31 * result + (notes != null ? notes.hashCode() : 0);
result = 31 * result + (isMigrated != null ? isMigrated.hashCode() : 0);
- result = 31 * result + (isNotifiedForInvoices != null ? isNotifiedForInvoices.hashCode() : 0);
return result;
}
diff --git a/account/src/main/java/org/killbill/billing/account/api/DefaultMutableAccountData.java b/account/src/main/java/org/killbill/billing/account/api/DefaultMutableAccountData.java
index 6829226..92de58a 100644
--- a/account/src/main/java/org/killbill/billing/account/api/DefaultMutableAccountData.java
+++ b/account/src/main/java/org/killbill/billing/account/api/DefaultMutableAccountData.java
@@ -51,7 +51,6 @@ public class DefaultMutableAccountData implements MutableAccountData {
private String phone;
private String notes;
private Boolean isMigrated;
- private Boolean isNotifiedForInvoices;
public DefaultMutableAccountData(final String externalKey, final String email, final String name,
final int firstNameLength, final Currency currency,
@@ -60,7 +59,7 @@ public class DefaultMutableAccountData implements MutableAccountData {
final DateTimeZone timeZone, final String locale, final String address1, final String address2,
final String companyName, final String city, final String stateOrProvince,
final String country, final String postalCode, final String phone,
- final String notes, final boolean isMigrated, final boolean isNotifiedForInvoices) {
+ final String notes, final boolean isMigrated) {
this.externalKey = externalKey;
this.email = email;
this.name = name;
@@ -83,7 +82,6 @@ public class DefaultMutableAccountData implements MutableAccountData {
this.phone = phone;
this.notes = notes;
this.isMigrated = isMigrated;
- this.isNotifiedForInvoices = isNotifiedForInvoices;
}
public DefaultMutableAccountData(final AccountData accountData) {
@@ -109,7 +107,6 @@ public class DefaultMutableAccountData implements MutableAccountData {
this.phone = accountData.getPhone();
this.notes = accountData.getNotes();
this.isMigrated = accountData.isMigrated();
- this.isNotifiedForInvoices = accountData.isNotifiedForInvoices();
}
@Override
@@ -309,21 +306,11 @@ public class DefaultMutableAccountData implements MutableAccountData {
}
@Override
- public Boolean isNotifiedForInvoices() {
- return isNotifiedForInvoices;
- }
-
- @Override
public void setIsMigrated(final boolean isMigrated) {
this.isMigrated = isMigrated;
}
@Override
- public void setIsNotifiedForInvoices(final boolean isNotifiedForInvoices) {
- this.isNotifiedForInvoices = isNotifiedForInvoices;
- }
-
- @Override
public UUID getParentAccountId() {
return parentAccountId;
}
diff --git a/account/src/main/java/org/killbill/billing/account/api/user/DefaultAccountCreationEvent.java b/account/src/main/java/org/killbill/billing/account/api/user/DefaultAccountCreationEvent.java
index 54da302..ce191ed 100644
--- a/account/src/main/java/org/killbill/billing/account/api/user/DefaultAccountCreationEvent.java
+++ b/account/src/main/java/org/killbill/billing/account/api/user/DefaultAccountCreationEvent.java
@@ -131,7 +131,6 @@ public class DefaultAccountCreationEvent extends BusEventBase implements Account
private final String phone;
private final String notes;
private final Boolean isMigrated;
- private final Boolean isNotifiedForInvoices;
public DefaultAccountData(final AccountModelDao d) {
this(d.getExternalKey(),
@@ -155,8 +154,7 @@ public class DefaultAccountCreationEvent extends BusEventBase implements Account
d.getCountry(),
d.getPhone(),
d.getNotes(),
- d.getMigrated(),
- d.getIsNotifiedForInvoices());
+ d.getMigrated());
}
@JsonCreator
@@ -181,8 +179,7 @@ public class DefaultAccountCreationEvent extends BusEventBase implements Account
@JsonProperty("country") final String country,
@JsonProperty("phone") final String phone,
@JsonProperty("notes") final String notes,
- @JsonProperty("isMigrated") final Boolean isMigrated,
- @JsonProperty("isNotifiedForInvoices") final Boolean isNotifiedForInvoices) {
+ @JsonProperty("isMigrated") final Boolean isMigrated) {
this.externalKey = externalKey;
this.name = name;
this.firstNameLength = firstNameLength;
@@ -205,7 +202,6 @@ public class DefaultAccountCreationEvent extends BusEventBase implements Account
this.phone = phone;
this.notes = notes;
this.isMigrated = isMigrated;
- this.isNotifiedForInvoices = isNotifiedForInvoices;
}
@Override
@@ -334,22 +330,12 @@ public class DefaultAccountCreationEvent extends BusEventBase implements Account
return isMigrated;
}
- @Override
- @JsonIgnore
- public Boolean isNotifiedForInvoices() {
- return isNotifiedForInvoices;
- }
-
// These getters are for Jackson serialization only
public Boolean getIsMigrated() {
return isMigrated;
}
- public Boolean getIsNotifiedForInvoices() {
- return isNotifiedForInvoices;
- }
-
public Boolean getIsPaymentDelegatedToParent() {
return isPaymentDelegatedToParent;
}
@@ -371,9 +357,6 @@ public class DefaultAccountCreationEvent extends BusEventBase implements Account
if (isMigrated != null ? !isMigrated.equals(that.isMigrated) : that.isMigrated != null) {
return false;
}
- if (isNotifiedForInvoices != null ? !isNotifiedForInvoices.equals(that.isNotifiedForInvoices) : that.isNotifiedForInvoices != null) {
- return false;
- }
if (address1 != null ? !address1.equals(that.address1) : that.address1 != null) {
return false;
}
@@ -461,7 +444,6 @@ public class DefaultAccountCreationEvent extends BusEventBase implements Account
result = 31 * result + (phone != null ? phone.hashCode() : 0);
result = 31 * result + (notes != null ? notes.hashCode() : 0);
result = 31 * result + (isMigrated != null ? isMigrated.hashCode() : 0);
- result = 31 * result + (isNotifiedForInvoices != null ? isNotifiedForInvoices.hashCode() : 0);
return result;
}
}
diff --git a/account/src/main/java/org/killbill/billing/account/dao/AccountModelDao.java b/account/src/main/java/org/killbill/billing/account/dao/AccountModelDao.java
index 5d2ddfa..5154025 100644
--- a/account/src/main/java/org/killbill/billing/account/dao/AccountModelDao.java
+++ b/account/src/main/java/org/killbill/billing/account/dao/AccountModelDao.java
@@ -61,8 +61,6 @@ public class AccountModelDao extends EntityModelDaoBase implements TimeZoneAware
private String phone;
private String notes;
private Boolean migrated;
- private Boolean isNotifiedForInvoices;
-
public AccountModelDao() { /* For the DAO mapper */ }
@@ -72,7 +70,7 @@ public class AccountModelDao extends EntityModelDaoBase implements TimeZoneAware
final int billingCycleDayLocal, final UUID paymentMethodId, final DateTime referenceTime, final DateTimeZone timeZone,
final String locale, final String address1, final String address2, final String companyName,
final String city, final String stateOrProvince, final String country, final String postalCode,
- final String phone, final String notes, final Boolean migrated, final Boolean notifiedForInvoices) {
+ final String phone, final String notes, final Boolean migrated) {
super(id, createdDate, updatedDate);
this.externalKey = MoreObjects.firstNonNull(externalKey, id.toString());
this.email = email;
@@ -96,7 +94,6 @@ public class AccountModelDao extends EntityModelDaoBase implements TimeZoneAware
this.phone = phone;
this.notes = notes;
this.migrated = migrated;
- this.isNotifiedForInvoices = notifiedForInvoices;
}
private AccountModelDao(final UUID id, @Nullable final DateTime createdDate, @Nullable final DateTime updatedDate, final AccountData account) {
@@ -124,9 +121,7 @@ public class AccountModelDao extends EntityModelDaoBase implements TimeZoneAware
account.getPostalCode(),
account.getPhone(),
account.getNotes(),
- account.isMigrated(),
- // There is a NOT NULL constraint on the is_notified_for_invoices column
- MoreObjects.firstNonNull(account.isNotifiedForInvoices(), false));
+ account.isMigrated());
}
@@ -327,16 +322,6 @@ public class AccountModelDao extends EntityModelDaoBase implements TimeZoneAware
this.migrated = migrated;
}
- // TODO Required for making the BindBeanFactory with Introspector work
- // see Introspector line 571; they look at public method.
- public Boolean getIsNotifiedForInvoices() {
- return isNotifiedForInvoices;
- }
-
- public void setIsNotifiedForInvoices(final Boolean isNotifiedForInvoices) {
- this.isNotifiedForInvoices = isNotifiedForInvoices;
- }
-
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
@@ -363,7 +348,6 @@ public class AccountModelDao extends EntityModelDaoBase implements TimeZoneAware
sb.append(", phone='").append(phone).append('\'');
sb.append(", notes='").append(notes).append('\'');
sb.append(", migrated=").append(migrated);
- sb.append(", isNotifiedForInvoices=").append(isNotifiedForInvoices);
sb.append('}');
return sb.toString();
}
@@ -421,9 +405,6 @@ public class AccountModelDao extends EntityModelDaoBase implements TimeZoneAware
if (migrated != null ? !migrated.equals(that.migrated) : that.migrated != null) {
return false;
}
- if (isNotifiedForInvoices != null ? !isNotifiedForInvoices.equals(that.isNotifiedForInvoices) : that.isNotifiedForInvoices != null) {
- return false;
- }
if (locale != null ? !locale.equals(that.locale) : that.locale != null) {
return false;
}
@@ -479,7 +460,6 @@ public class AccountModelDao extends EntityModelDaoBase implements TimeZoneAware
result = 31 * result + (phone != null ? phone.hashCode() : 0);
result = 31 * result + (notes != null ? notes.hashCode() : 0);
result = 31 * result + (migrated != null ? migrated.hashCode() : 0);
- result = 31 * result + (isNotifiedForInvoices != null ? isNotifiedForInvoices.hashCode() : 0);
return result;
}
diff --git a/account/src/main/resources/org/killbill/billing/account/dao/AccountSqlDao.sql.stg b/account/src/main/resources/org/killbill/billing/account/dao/AccountSqlDao.sql.stg
index ddc38f6..34278c9 100644
--- a/account/src/main/resources/org/killbill/billing/account/dao/AccountSqlDao.sql.stg
+++ b/account/src/main/resources/org/killbill/billing/account/dao/AccountSqlDao.sql.stg
@@ -27,7 +27,6 @@ tableFields(prefix) ::= <<
, <prefix>phone
, <prefix>notes
, <prefix>migrated
-, <prefix>is_notified_for_invoices
, <prefix>created_by
, <prefix>created_date
, <prefix>updated_by
@@ -57,7 +56,6 @@ tableValues() ::= <<
, :phone
, :notes
, :migrated
-, :isNotifiedForInvoices
, :createdBy
, :createdDate
, :updatedBy
@@ -89,7 +87,6 @@ update accounts set
, postal_code = :postalCode
, phone = :phone
, notes = :notes
-, is_notified_for_invoices = :isNotifiedForInvoices
, updated_date = :updatedDate
, updated_by = :updatedBy
where id = :id
diff --git a/account/src/main/resources/org/killbill/billing/account/ddl.sql b/account/src/main/resources/org/killbill/billing/account/ddl.sql
index 55019dc..a0c686f 100644
--- a/account/src/main/resources/org/killbill/billing/account/ddl.sql
+++ b/account/src/main/resources/org/killbill/billing/account/ddl.sql
@@ -26,7 +26,6 @@ CREATE TABLE accounts (
phone varchar(25) DEFAULT NULL,
notes varchar(4096) DEFAULT NULL,
migrated boolean default false,
- is_notified_for_invoices boolean NOT NULL,
created_date datetime NOT NULL,
created_by varchar(50) NOT NULL,
updated_date datetime DEFAULT NULL,
@@ -70,7 +69,6 @@ CREATE TABLE account_history (
phone varchar(25) DEFAULT NULL,
notes varchar(4096) DEFAULT NULL,
migrated boolean default false,
- is_notified_for_invoices boolean NOT NULL,
change_type varchar(6) NOT NULL,
created_by varchar(50) NOT NULL,
created_date datetime NOT NULL,
diff --git a/account/src/main/resources/org/killbill/billing/account/migration/V20180625172110_account_is_notified_for_invoices.sql b/account/src/main/resources/org/killbill/billing/account/migration/V20180625172110_account_is_notified_for_invoices.sql
new file mode 100644
index 0000000..5a548ae
--- /dev/null
+++ b/account/src/main/resources/org/killbill/billing/account/migration/V20180625172110_account_is_notified_for_invoices.sql
@@ -0,0 +1,2 @@
+alter table accounts drop column is_notified_for_invoices;
+alter table account_history drop column is_notified_for_invoices;
diff --git a/account/src/test/java/org/killbill/billing/account/AccountTestUtils.java b/account/src/test/java/org/killbill/billing/account/AccountTestUtils.java
index f3cf489..9ed9352 100644
--- a/account/src/test/java/org/killbill/billing/account/AccountTestUtils.java
+++ b/account/src/test/java/org/killbill/billing/account/AccountTestUtils.java
@@ -19,7 +19,6 @@ package org.killbill.billing.account;
import java.util.Locale;
import java.util.UUID;
-import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.killbill.billing.account.api.AccountData;
import org.killbill.billing.account.api.DefaultMutableAccountData;
@@ -61,7 +60,6 @@ public abstract class AccountTestUtils {
Assert.assertEquals(retrievedAccount.getCountry(), account.getCountry());
Assert.assertEquals(retrievedAccount.getPostalCode(), account.getPostalCode());
Assert.assertEquals(retrievedAccount.getPhone(), account.getPhone());
- Assert.assertEquals(retrievedAccount.getIsNotifiedForInvoices(), account.getIsNotifiedForInvoices());
Assert.assertEquals(retrievedAccount.getMigrated(), account.getMigrated());
}
@@ -107,6 +105,6 @@ public abstract class AccountTestUtils {
return new DefaultMutableAccountData(externalKey, email, name, firstNameLength, currency, null, false,
billCycleDayLocal, paymentMethodId, null, timeZone,
locale, address1, address2, companyName, city, stateOrProvince,
- country, postalCode, phone, notes, false, true);
+ country, postalCode, phone, notes, false);
}
}
diff --git a/account/src/test/java/org/killbill/billing/account/api/TestDefaultAccount.java b/account/src/test/java/org/killbill/billing/account/api/TestDefaultAccount.java
index f5f3077..e64ef8e 100644
--- a/account/src/test/java/org/killbill/billing/account/api/TestDefaultAccount.java
+++ b/account/src/test/java/org/killbill/billing/account/api/TestDefaultAccount.java
@@ -54,7 +54,6 @@ public class TestDefaultAccount extends AccountTestSuiteNoDB {
Assert.assertNull(account.getPostalCode());
Assert.assertNull(account.getPhone());
Assert.assertNull(account.isMigrated());
- Assert.assertNull(account.isNotifiedForInvoices());
}
@Test(groups = "fast", description = "Test mergeWithDelegate Account api")
@@ -74,14 +73,12 @@ public class TestDefaultAccount extends AccountTestSuiteNoDB {
Mockito.when(accountDataUpdates2.getEmail()).thenReturn(UUID.randomUUID().toString());
Mockito.when(accountDataUpdates2.getName()).thenReturn(UUID.randomUUID().toString());
Mockito.when(accountDataUpdates2.getFirstNameLength()).thenReturn(12);
- Mockito.when(accountDataUpdates2.isNotifiedForInvoices()).thenReturn(true);
final Account accountUpdates2 = new DefaultAccount(UUID.randomUUID(), accountDataUpdates2);
final Account updatedAccount2 = accountUpdates2.mergeWithDelegate(updatedAccount1);
Assert.assertEquals(updatedAccount2.getEmail(), accountUpdates2.getEmail());
Assert.assertEquals(updatedAccount2.getName(), accountUpdates2.getName());
Assert.assertEquals(updatedAccount2.getFirstNameLength(), updatedAccount2.getFirstNameLength());
- Assert.assertEquals(updatedAccount2.isNotifiedForInvoices(), updatedAccount2.isNotifiedForInvoices());
Assert.assertEquals(updatedAccount2.getExternalKey(), updatedAccount1.getExternalKey());
Assert.assertEquals(updatedAccount2.getCurrency(), updatedAccount1.getCurrency());
Assert.assertEquals(updatedAccount2.getBillCycleDayLocal(), updatedAccount1.getBillCycleDayLocal());
@@ -156,7 +153,6 @@ public class TestDefaultAccount extends AccountTestSuiteNoDB {
Assert.assertEquals(finalAccount.getPhone(), delegateAccount.getPhone());
Assert.assertEquals(finalAccount.getNotes(), delegateAccount.getNotes());
Assert.assertEquals(finalAccount.isMigrated(), delegateAccount.isMigrated());
- Assert.assertEquals(finalAccount.isNotifiedForInvoices(), delegateAccount.isNotifiedForInvoices());
}
private AccountData getAccountData(final Integer bcd, final Currency currency, final String externalKey) {
@@ -179,7 +175,6 @@ public class TestDefaultAccount extends AccountTestSuiteNoDB {
Mockito.when(secondAccountData.getPostalCode()).thenReturn(UUID.randomUUID().toString());
Mockito.when(secondAccountData.getPhone()).thenReturn(UUID.randomUUID().toString());
Mockito.when(secondAccountData.isMigrated()).thenReturn(false);
- Mockito.when(secondAccountData.isNotifiedForInvoices()).thenReturn(true);
return secondAccountData;
}
diff --git a/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApi.java b/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApi.java
index 76627a0..6827b7b 100644
--- a/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApi.java
+++ b/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApi.java
@@ -139,7 +139,7 @@ public class TestDefaultAccountUserApi extends AccountTestSuiteWithEmbeddedDB {
// Update the address and leave other fields null
final MutableAccountData mutableAccountData = new DefaultMutableAccountData(null, null, null, 0, null, null, false, 0, null,
clock.getUTCNow(), null, null, null, null, null, null,
- null, null, null, null, null, false, false);
+ null, null, null, null, null, false);
final String newAddress1 = UUID.randomUUID().toString();
mutableAccountData.setAddress1(newAddress1);
@@ -214,7 +214,6 @@ public class TestDefaultAccountUserApi extends AccountTestSuiteWithEmbeddedDB {
Assert.assertEquals(retrievedAccount.getCountry(), account.getCountry());
Assert.assertEquals(retrievedAccount.getPhone(), account.getPhone());
Assert.assertEquals(retrievedAccount.isMigrated(), account.isMigrated());
- Assert.assertEquals(retrievedAccount.isNotifiedForInvoices(), account.isNotifiedForInvoices());
Assert.assertEquals(retrievedAccount.getParentAccountId(), account.getParentAccountId());
Assert.assertEquals(retrievedAccount.isPaymentDelegatedToParent(), account.isPaymentDelegatedToParent());
// Finally check account notes did get reset
diff --git a/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApiWithMocks.java b/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApiWithMocks.java
index 28e1ba0..adc7a52 100644
--- a/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApiWithMocks.java
+++ b/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApiWithMocks.java
@@ -80,10 +80,9 @@ public class TestDefaultAccountUserApiWithMocks extends AccountTestSuiteNoDB {
final String phone = UUID.randomUUID().toString();
final String notes = UUID.randomUUID().toString();
final Boolean isMigrated = true;
- final Boolean isNotifiedForInvoices = false;
final AccountData data = new DefaultAccount(id, externalKey, email, name, firstNameLength, currency, null, false, billCycleDay,
paymentMethodId, referenceTime, timeZone, locale, address1, address2, companyName,
- city, stateOrProvince, country, postalCode, phone, notes, isMigrated, isNotifiedForInvoices);
+ city, stateOrProvince, country, postalCode, phone, notes, isMigrated);
accountUserApi.createAccount(data, callContext);
@@ -106,7 +105,6 @@ public class TestDefaultAccountUserApiWithMocks extends AccountTestSuiteNoDB {
Assert.assertEquals(account.getPostalCode(), postalCode);
Assert.assertEquals(account.getPhone(), phone);
Assert.assertEquals(account.getMigrated(), isMigrated);
- Assert.assertEquals(account.getIsNotifiedForInvoices(), isNotifiedForInvoices);
}
@Test(groups = "fast", description = "Test ability to add email to Account")
diff --git a/account/src/test/java/org/killbill/billing/account/api/user/TestEventJson.java b/account/src/test/java/org/killbill/billing/account/api/user/TestEventJson.java
index 8e142cb..943ec2d 100644
--- a/account/src/test/java/org/killbill/billing/account/api/user/TestEventJson.java
+++ b/account/src/test/java/org/killbill/billing/account/api/user/TestEventJson.java
@@ -52,7 +52,7 @@ public class TestEventJson extends AccountTestSuiteNoDB {
@Test(groups = "fast", description="Test Account event serialization")
public void testAccountCreationEvent() throws Exception {
final DefaultAccountData data = new DefaultAccountData("dsfdsf", "bobo", 3, "bobo@yahoo.com", 12, "USD", null, false, UUID.randomUUID(),
- new DateTime().toString(), "UTC", "US", "21 avenue", "", "Gling", "San Franciso", "CA", "94110", "USA", "4126789887", "notes", false, false);
+ new DateTime().toString(), "UTC", "US", "21 avenue", "", "Gling", "San Franciso", "CA", "94110", "USA", "4126789887", "notes", false);
final DefaultAccountCreationEvent e = new DefaultAccountCreationEvent(data, UUID.randomUUID(), 1L, 2L, null);
final String json = mapper.writeValueAsString(e);
diff --git a/account/src/test/java/org/killbill/billing/account/dao/TestAccountDao.java b/account/src/test/java/org/killbill/billing/account/dao/TestAccountDao.java
index 8a97b2a..fabbe60 100644
--- a/account/src/test/java/org/killbill/billing/account/dao/TestAccountDao.java
+++ b/account/src/test/java/org/killbill/billing/account/dao/TestAccountDao.java
@@ -66,7 +66,7 @@ public class TestAccountDao extends AccountTestSuiteWithEmbeddedDB {
final AccountData accountData = new DefaultMutableAccountData(null, email, name, 0, null, null, false,
0, null, clock.getUTCNow(), null, null, null,
null, null, null, null, null,
- null, null, null, false, true);
+ null, null, null, false);
final AccountModelDao account = new AccountModelDao(UUID.randomUUID(), accountData);
accountDao.create(account, internalCallContext);
@@ -222,12 +222,10 @@ public class TestAccountDao extends AccountTestSuiteWithEmbeddedDB {
Assert.assertEquals(history1.getTenantRecordId(), createdAccount.getTenantRecordId());
Assert.assertEquals(history1.getExternalKey(), createdAccount.getExternalKey());
Assert.assertEquals(history1.getMigrated(), createdAccount.getMigrated());
- Assert.assertEquals(history1.getIsNotifiedForInvoices(), createdAccount.getIsNotifiedForInvoices());
Assert.assertEquals(history1.getTimeZone(), createdAccount.getTimeZone());
Assert.assertEquals(history1.getLocale(), createdAccount.getLocale());
final AccountData accountData = new MockAccountBuilder(new DefaultAccount(account)).migrated(false)
- .isNotifiedForInvoices(false)
.timeZone(DateTimeZone.forID("Australia/Darwin"))
.locale("FR-CA")
.build();
@@ -246,12 +244,10 @@ public class TestAccountDao extends AccountTestSuiteWithEmbeddedDB {
Assert.assertEquals(history2.getTenantRecordId(), retrievedAccount.getTenantRecordId());
Assert.assertEquals(history2.getExternalKey(), retrievedAccount.getExternalKey());
Assert.assertEquals(history2.getMigrated(), retrievedAccount.getMigrated());
- Assert.assertEquals(history2.getIsNotifiedForInvoices(), retrievedAccount.getIsNotifiedForInvoices());
Assert.assertEquals(history2.getTimeZone(), retrievedAccount.getTimeZone());
Assert.assertEquals(history2.getLocale(), retrievedAccount.getLocale());
- final AccountData accountData2 = new MockAccountBuilder(new DefaultAccount(updatedAccount)).isNotifiedForInvoices(true)
- .locale("en_US")
+ final AccountData accountData2 = new MockAccountBuilder(new DefaultAccount(updatedAccount)).locale("en_US")
.build();
final AccountModelDao updatedAccount2 = new AccountModelDao(account.getId(), accountData2);
accountDao.update(updatedAccount2, internalCallContext);
@@ -269,7 +265,6 @@ public class TestAccountDao extends AccountTestSuiteWithEmbeddedDB {
Assert.assertEquals(history3.getTenantRecordId(), retrievedAccount2.getTenantRecordId());
Assert.assertEquals(history3.getExternalKey(), retrievedAccount2.getExternalKey());
Assert.assertEquals(history3.getMigrated(), retrievedAccount2.getMigrated());
- Assert.assertEquals(history3.getIsNotifiedForInvoices(), retrievedAccount2.getIsNotifiedForInvoices());
Assert.assertEquals(history3.getTimeZone(), retrievedAccount2.getTimeZone());
Assert.assertEquals(history3.getLocale(), retrievedAccount2.getLocale());
}
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java
index 6abcdad..fb6b4e5 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java
@@ -1064,7 +1064,6 @@ public class TestIntegration extends TestIntegrationBase {
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(false)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.billingCycleDayLocal(1)
.currency(Currency.USD)
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
index 66eea8c..1326ecc 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
@@ -458,7 +458,6 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(false)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.currency(Currency.USD)
.referenceTime(clock.getUTCNow())
@@ -475,7 +474,6 @@ public class TestIntegrationBase extends BeatrixTestSuiteWithEmbeddedDB implemen
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(false)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.billingCycleDayLocal(billingDay)
.currency(Currency.USD)
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestWithTimeZones.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestWithTimeZones.java
index 53aba95..0da08be 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestWithTimeZones.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestWithTimeZones.java
@@ -32,13 +32,11 @@ import org.killbill.billing.api.TestApiListener.NextEvent;
import org.killbill.billing.beatrix.util.InvoiceChecker.ExpectedInvoiceItemCheck;
import org.killbill.billing.catalog.api.BillingPeriod;
import org.killbill.billing.catalog.api.Currency;
-import org.killbill.billing.catalog.api.PlanPhasePriceOverride;
import org.killbill.billing.catalog.api.PlanPhaseSpecifier;
import org.killbill.billing.catalog.api.ProductCategory;
import org.killbill.billing.entitlement.api.DefaultEntitlement;
import org.killbill.billing.entitlement.api.DefaultEntitlementSpecifier;
import org.killbill.billing.entitlement.api.Entitlement;
-import org.killbill.billing.entitlement.api.EntitlementSpecifier;
import org.killbill.billing.entitlement.api.SubscriptionEventType;
import org.killbill.billing.invoice.api.DryRunType;
import org.killbill.billing.invoice.api.Invoice;
@@ -67,7 +65,6 @@ public class TestWithTimeZones extends TestIntegrationBase {
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(false)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.billingCycleDayLocal(1)
.currency(Currency.USD)
@@ -127,7 +124,6 @@ public class TestWithTimeZones extends TestIntegrationBase {
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(false)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.billingCycleDayLocal(1)
.currency(Currency.USD)
@@ -174,7 +170,6 @@ public class TestWithTimeZones extends TestIntegrationBase {
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(false)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.billingCycleDayLocal(1)
.currency(Currency.USD)
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/util/AccountChecker.java b/beatrix/src/test/java/org/killbill/billing/beatrix/util/AccountChecker.java
index b6d9740..f44f174 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/util/AccountChecker.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/util/AccountChecker.java
@@ -51,7 +51,6 @@ public class AccountChecker {
Assert.assertEquals(account.getFirstNameLength(), accountData.getFirstNameLength());
Assert.assertEquals(account.getEmail(), accountData.getEmail());
Assert.assertEquals(account.getPhone(), accountData.getPhone());
- Assert.assertEquals(account.isNotifiedForInvoices(), accountData.isNotifiedForInvoices());
Assert.assertEquals(account.getExternalKey(), accountData.getExternalKey());
Assert.assertEquals(account.getBillCycleDayLocal(), accountData.getBillCycleDayLocal());
Assert.assertEquals(account.getCurrency(), accountData.getCurrency());
diff --git a/entitlement/src/test/java/org/killbill/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java b/entitlement/src/test/java/org/killbill/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java
index b8f8c94..ae6400d 100644
--- a/entitlement/src/test/java/org/killbill/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java
+++ b/entitlement/src/test/java/org/killbill/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java
@@ -278,7 +278,6 @@ public class EntitlementTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuiteWi
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(false)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.billingCycleDayLocal(billingDay)
.currency(Currency.USD)
diff --git a/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java b/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java
index ee9fe6c..b6ecfc5 100644
--- a/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java
+++ b/invoice/src/test/java/org/killbill/billing/invoice/generator/TestDefaultInvoiceGenerator.java
@@ -33,7 +33,6 @@ import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
import org.killbill.billing.account.api.Account;
-import org.killbill.billing.callcontext.InternalTenantContext;
import org.killbill.billing.catalog.DefaultPrice;
import org.killbill.billing.catalog.MockInternationalPrice;
import org.killbill.billing.catalog.MockPlan;
@@ -65,12 +64,10 @@ import org.killbill.billing.junction.BillingEventSet;
import org.killbill.billing.mock.MockAccountBuilder;
import org.killbill.billing.subscription.api.SubscriptionBase;
import org.killbill.billing.subscription.api.SubscriptionBaseTransitionType;
-import org.killbill.billing.util.config.definition.InvoiceConfig;
import org.killbill.billing.util.currency.KillBillMoney;
import org.killbill.clock.Clock;
import org.killbill.clock.DefaultClock;
import org.mockito.Mockito;
-import org.skife.config.TimeSpan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeClass;
@@ -119,7 +116,6 @@ public class TestDefaultInvoiceGenerator extends InvoiceTestSuiteNoDB {
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(true)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.billingCycleDayLocal(31)
.currency(Currency.USD)
diff --git a/invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceHelper.java b/invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceHelper.java
index c19fdce..2892e26 100644
--- a/invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceHelper.java
+++ b/invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceHelper.java
@@ -48,8 +48,6 @@ import org.killbill.billing.catalog.api.BillingPeriod;
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.catalog.api.Plan;
import org.killbill.billing.catalog.api.PlanPhase;
-import org.killbill.billing.catalog.api.PlanPhasePriceOverride;
-import org.killbill.billing.catalog.api.PlanPhaseSpecifier;
import org.killbill.billing.catalog.api.Usage;
import org.killbill.billing.entitlement.api.EntitlementSpecifier;
import org.killbill.billing.entitlement.api.SubscriptionEventType;
@@ -259,7 +257,6 @@ public class TestInvoiceHelper {
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(true)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.billingCycleDayLocal(31)
.currency(accountCurrency)
diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
index f019a15..d72ec1d 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/AccountJson.java
@@ -27,7 +27,6 @@ import javax.annotation.Nullable;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.killbill.billing.account.api.Account;
-import org.killbill.billing.account.api.AccountData;
import org.killbill.billing.account.api.MutableAccountData;
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.util.audit.AccountAuditLogs;
@@ -36,7 +35,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Strings;
import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
@ApiModel(value="Account", parent = JsonBase.class)
public class AccountJson extends JsonBase {
@@ -66,7 +64,6 @@ public class AccountJson extends JsonBase {
private final String phone;
private final String notes;
private final Boolean isMigrated;
- private final Boolean isNotifiedForInvoices;
public AccountJson(final Account account, final BigDecimal accountBalance, final BigDecimal accountCBA, @Nullable final AccountAuditLogs accountAuditLogs) {
super(toAuditLogJson(accountAuditLogs == null ? null : accountAuditLogs.getAuditLogsForAccount()));
@@ -95,7 +92,6 @@ public class AccountJson extends JsonBase {
this.phone = account.getPhone();
this.notes = account.getNotes();
this.isMigrated = account.isMigrated();
- this.isNotifiedForInvoices = account.isNotifiedForInvoices();
}
@JsonCreator
@@ -122,7 +118,6 @@ public class AccountJson extends JsonBase {
@JsonProperty("phone") final String phone,
@JsonProperty("notes") final String notes,
@JsonProperty("isMigrated") final Boolean isMigrated,
- @JsonProperty("isNotifiedForInvoices") final Boolean isNotifiedForInvoices,
@JsonProperty("accountBalance") final BigDecimal accountBalance,
@JsonProperty("accountCBA") final BigDecimal accountCBA,
@JsonProperty("auditLogs") @Nullable final List<AuditLogJson> auditLogs) {
@@ -151,7 +146,6 @@ public class AccountJson extends JsonBase {
this.phone = phone;
this.notes = notes;
this.isMigrated = isMigrated;
- this.isNotifiedForInvoices = isNotifiedForInvoices;
this.accountCBA = accountCBA;
}
@@ -198,11 +192,6 @@ public class AccountJson extends JsonBase {
}
@Override
- public Boolean isNotifiedForInvoices() {
- return isNotifiedForInvoices;
- }
-
- @Override
public UUID getPaymentMethodId() {
return paymentMethodId;
}
@@ -415,11 +404,6 @@ public class AccountJson extends JsonBase {
return isMigrated;
}
- @JsonProperty("isNotifiedForInvoices")
- public Boolean isNotifiedForInvoices() {
- return isNotifiedForInvoices;
- }
-
@Override
public String toString() {
return "AccountJson{" +
@@ -448,7 +432,6 @@ public class AccountJson extends JsonBase {
", phone='" + phone + '\'' +
", notes='" + notes + '\'' +
", isMigrated=" + isMigrated +
- ", isNotifiedForInvoices=" + isNotifiedForInvoices +
'}';
}
@@ -511,9 +494,6 @@ public class AccountJson extends JsonBase {
if (isMigrated != null ? !isMigrated.equals(that.isMigrated) : that.isMigrated != null) {
return false;
}
- if (isNotifiedForInvoices != null ? !isNotifiedForInvoices.equals(that.isNotifiedForInvoices) : that.isNotifiedForInvoices != null) {
- return false;
- }
if (locale != null ? !locale.equals(that.locale) : that.locale != null) {
return false;
}
@@ -571,7 +551,6 @@ public class AccountJson extends JsonBase {
result = 31 * result + (phone != null ? phone.hashCode() : 0);
result = 31 * result + (notes != null ? notes.hashCode() : 0);
result = 31 * result + (isMigrated != null ? isMigrated.hashCode() : 0);
- result = 31 * result + (isNotifiedForInvoices != null ? isNotifiedForInvoices.hashCode() : 0);
return result;
}
}
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 dd443c8..2b96656 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
@@ -60,7 +60,6 @@ import org.killbill.billing.account.api.AccountApiException;
import org.killbill.billing.account.api.AccountData;
import org.killbill.billing.account.api.AccountEmail;
import org.killbill.billing.account.api.AccountUserApi;
-import org.killbill.billing.account.api.MutableAccountData;
import org.killbill.billing.catalog.api.BillingActionPolicy;
import org.killbill.billing.catalog.api.CatalogApiException;
import org.killbill.billing.catalog.api.Currency;
@@ -87,7 +86,6 @@ import org.killbill.billing.jaxrs.json.AuditLogJson;
import org.killbill.billing.jaxrs.json.BlockingStateJson;
import org.killbill.billing.jaxrs.json.BundleJson;
import org.killbill.billing.jaxrs.json.CustomFieldJson;
-import org.killbill.billing.jaxrs.json.InvoiceEmailJson;
import org.killbill.billing.jaxrs.json.InvoiceJson;
import org.killbill.billing.jaxrs.json.InvoicePaymentJson;
import org.killbill.billing.jaxrs.json.OverdueStateJson;
@@ -631,53 +629,6 @@ public class AccountResource extends JaxRsResourceBase {
}
/*
- * ************************** EMAIL NOTIFICATIONS FOR INVOICES ********************************
- */
-
- @TimedResource
- @GET
- @Path("/{accountId:" + UUID_PATTERN + "}/" + EMAIL_NOTIFICATIONS)
- @Produces(APPLICATION_JSON)
- @ApiOperation(value = "Retrieve account email notification", response = InvoiceEmailJson.class)
- @ApiResponses(value = {@ApiResponse(code = 204, message = "Successful operation"),
- @ApiResponse(code = 400, message = "Invalid account id supplied"),
- @ApiResponse(code = 404, message = "Account not found")})
- public Response getEmailNotificationsForAccount(@PathParam("accountId") final UUID accountId,
- @javax.ws.rs.core.Context final HttpServletRequest request) throws AccountApiException {
- final Account account = accountUserApi.getAccountById(accountId, context.createTenantContextWithAccountId(accountId, request));
- final InvoiceEmailJson invoiceEmailJson = new InvoiceEmailJson(accountId, account.isNotifiedForInvoices());
-
- return Response.status(Status.OK).entity(invoiceEmailJson).build();
- }
-
- @TimedResource
- @PUT
- @Path("/{accountId:" + UUID_PATTERN + "}/" + EMAIL_NOTIFICATIONS)
- @Consumes(APPLICATION_JSON)
- @Produces(APPLICATION_JSON)
- @ApiOperation(value = "Set account email notification")
- @ApiResponses(value = {@ApiResponse(code = 204, message = "Successful operation"),
- @ApiResponse(code = 400, message = "Invalid account id supplied"),
- @ApiResponse(code = 404, message = "Account not found")})
- public Response setEmailNotificationsForAccount(@PathParam("accountId") final UUID accountId,
- final InvoiceEmailJson json,
- @HeaderParam(HDR_CREATED_BY) final String createdBy,
- @HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final HttpServletRequest request) throws AccountApiException {
- verifyNonNullOrEmpty(json, "InvoiceEmailJson body should be specified");
- final CallContext callContext = context.createCallContextWithAccountId(accountId, createdBy, reason, comment, request);
-
- final Account account = accountUserApi.getAccountById(accountId, callContext);
-
- final MutableAccountData mutableAccountData = account.toMutableAccountData();
- mutableAccountData.setIsNotifiedForInvoices(json.isNotifiedForInvoices());
- accountUserApi.updateAccount(accountId, mutableAccountData, callContext);
-
- return Response.status(Status.NO_CONTENT).build();
- }
-
- /*
* ************************** INVOICE CBA REBALANCING ********************************
*/
@TimedResource
diff --git a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountJson.java b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountJson.java
index 6d484bb..c021dbb 100644
--- a/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountJson.java
+++ b/jaxrs/src/test/java/org/killbill/billing/jaxrs/json/TestAccountJson.java
@@ -59,7 +59,7 @@ public class TestAccountJson extends JaxrsTestSuiteNoDB {
final AccountJson accountJson = new AccountJson(accountId, name, length, externalKey,
email, billCycleDayLocal, currency, parentAccountId, true, paymentMethodId,
referenceTime, timeZone, address1, address2, postalCode, company, city, state,
- country, locale, phone, notes, isMigrated, isNotifiedForInvoice, null, null, null);
+ country, locale, phone, notes, isMigrated, null, null, null);
Assert.assertEquals(accountJson.getAccountId(), accountId);
Assert.assertEquals(accountJson.getName(), name);
Assert.assertEquals(accountJson.getFirstNameLength(), length);
@@ -80,7 +80,6 @@ public class TestAccountJson extends JaxrsTestSuiteNoDB {
Assert.assertEquals(accountJson.getPhone(), phone);
Assert.assertEquals(accountJson.getNotes(), notes);
Assert.assertEquals(accountJson.isMigrated(), isMigrated);
- Assert.assertEquals(accountJson.isNotifiedForInvoices(), isNotifiedForInvoice);
Assert.assertEquals(accountJson.getParentAccountId(), parentAccountId);
Assert.assertEquals(accountJson.isPaymentDelegatedToParent(), Boolean.TRUE);
@@ -103,7 +102,6 @@ public class TestAccountJson extends JaxrsTestSuiteNoDB {
accountBuilder.email(UUID.randomUUID().toString());
accountBuilder.externalKey(UUID.randomUUID().toString());
accountBuilder.firstNameLength(12);
- accountBuilder.isNotifiedForInvoices(true);
accountBuilder.locale(UUID.randomUUID().toString());
accountBuilder.migrated(true);
accountBuilder.name(UUID.randomUUID().toString());
@@ -130,7 +128,6 @@ public class TestAccountJson extends JaxrsTestSuiteNoDB {
Assert.assertEquals(accountJson.getPaymentMethodId(), account.getPaymentMethodId());
Assert.assertEquals(accountJson.getPhone(), account.getPhone());
Assert.assertEquals(accountJson.isMigrated(), account.isMigrated());
- Assert.assertEquals(accountJson.isNotifiedForInvoices(), account.isNotifiedForInvoices());
Assert.assertEquals(accountJson.getState(), account.getStateOrProvince());
Assert.assertEquals(accountJson.getTimeZone(), account.getTimeZone().toString());
Assert.assertEquals(accountJson.getParentAccountId(), account.getParentAccountId());
diff --git a/junction/src/test/java/org/killbill/billing/junction/JunctionTestSuiteWithEmbeddedDB.java b/junction/src/test/java/org/killbill/billing/junction/JunctionTestSuiteWithEmbeddedDB.java
index 499fd9a..3df051e 100644
--- a/junction/src/test/java/org/killbill/billing/junction/JunctionTestSuiteWithEmbeddedDB.java
+++ b/junction/src/test/java/org/killbill/billing/junction/JunctionTestSuiteWithEmbeddedDB.java
@@ -208,7 +208,6 @@ public abstract class JunctionTestSuiteWithEmbeddedDB extends GuicyKillbillTestS
.email(UUID.randomUUID().toString().substring(1, 8))
.phone(UUID.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(false)
.externalKey(UUID.randomUUID().toString().substring(1, 8))
.billingCycleDayLocal(billingDay)
.currency(Currency.USD)
diff --git a/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java b/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java
index 0ecd4e3..1f7271d 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestPaymentHelper.java
@@ -144,7 +144,6 @@ public class TestPaymentHelper {
Mockito.when(accountData.getCurrency()).thenReturn(Currency.USD);
Mockito.when(accountData.getBillCycleDayLocal()).thenReturn(1);
Mockito.when(accountData.isMigrated()).thenReturn(false);
- Mockito.when(accountData.isNotifiedForInvoices()).thenReturn(false);
Mockito.when(accountData.getTimeZone()).thenReturn(DateTimeZone.UTC);
Mockito.when(accountData.getCreatedDate()).thenReturn(clock.getUTCNow());
Mockito.when(accountData.getReferenceTime()).thenReturn(clock.getUTCNow());
diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/KillbillClient.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/KillbillClient.java
index a34483e..c03d61c 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/KillbillClient.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/KillbillClient.java
@@ -356,6 +356,6 @@ public abstract class KillbillClient extends GuicyKillbillTestSuiteWithEmbeddedD
// Note: the accountId payload is ignored on account creation
return new Account(accountId, name, length, externalKey, email, null, currency, parentAccountId, isPaymentDelegatedToParent, null, null, timeZone,
- address1, address2, postalCode, company, city, state, country, locale, phone, notes, false, false, null, null, EMPTY_AUDIT_LOGS);
+ address1, address2, postalCode, company, city, state, country, locale, phone, notes, false, null, null, EMPTY_AUDIT_LOGS);
}
}
diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccount.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccount.java
index 68d41a0..d6bbd1b 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccount.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAccount.java
@@ -130,7 +130,7 @@ public class TestAccount extends TestJaxrsBase {
"zozo", 4, input.getExternalKey(), "rr@google.com", 18,
Currency.USD, null, false, null, null, "UTC",
"bl1", "bh2", "", "", "ca", "San Francisco", "usa", "en", "415-255-2991",
- "notes", false, false, null, null, EMPTY_AUDIT_LOGS);
+ "notes", false, null, null, EMPTY_AUDIT_LOGS);
accountApi.updateAccount(input.getAccountId(), newInput, requestOptions);
final Account updatedAccount = accountApi.getAccount(input.getAccountId(), requestOptions);
@@ -183,7 +183,6 @@ public class TestAccount extends TestJaxrsBase {
null,
null,
null,
- null,
EMPTY_AUDIT_LOGS);
// Update notes, all other fields remaining the same (value set to null but treatNullAsReset defaults to false)
diff --git a/subscription/src/test/java/org/killbill/billing/subscription/DefaultSubscriptionTestInitializer.java b/subscription/src/test/java/org/killbill/billing/subscription/DefaultSubscriptionTestInitializer.java
index 9186d88..bb89cc5 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/DefaultSubscriptionTestInitializer.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/DefaultSubscriptionTestInitializer.java
@@ -67,7 +67,6 @@ public class DefaultSubscriptionTestInitializer implements SubscriptionTestIniti
.email(UUIDs.randomUUID().toString().substring(1, 8))
.phone(UUIDs.randomUUID().toString().substring(1, 8))
.migrated(false)
- .isNotifiedForInvoices(false)
.externalKey(UUIDs.randomUUID().toString())
.billingCycleDayLocal(1)
.currency(Currency.USD)
diff --git a/util/src/test/java/org/killbill/billing/DBTestingHelper.java b/util/src/test/java/org/killbill/billing/DBTestingHelper.java
index d940406..c4d9ce0 100644
--- a/util/src/test/java/org/killbill/billing/DBTestingHelper.java
+++ b/util/src/test/java/org/killbill/billing/DBTestingHelper.java
@@ -110,7 +110,6 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
" phone varchar(25) DEFAULT NULL,\n" +
" notes varchar(4096) DEFAULT NULL,\n" +
" migrated boolean default false,\n" +
- " is_notified_for_invoices boolean NOT NULL,\n" +
" created_date datetime NOT NULL,\n" +
" created_by varchar(50) NOT NULL,\n" +
" updated_date datetime DEFAULT NULL,\n" +
diff --git a/util/src/test/java/org/killbill/billing/mock/api/MockAccountUserApi.java b/util/src/test/java/org/killbill/billing/mock/api/MockAccountUserApi.java
index 3773ee1..44b41bb 100644
--- a/util/src/test/java/org/killbill/billing/mock/api/MockAccountUserApi.java
+++ b/util/src/test/java/org/killbill/billing/mock/api/MockAccountUserApi.java
@@ -79,7 +79,6 @@ public class MockAccountUserApi implements AccountUserApi {
.postalCode(postalCode)
.phone(phone)
.notes(notes)
- .isNotifiedForInvoices(false)
.build();
accounts.add(result);
return result;
diff --git a/util/src/test/java/org/killbill/billing/mock/MockAccountBuilder.java b/util/src/test/java/org/killbill/billing/mock/MockAccountBuilder.java
index 3d125dc..599bad1 100644
--- a/util/src/test/java/org/killbill/billing/mock/MockAccountBuilder.java
+++ b/util/src/test/java/org/killbill/billing/mock/MockAccountBuilder.java
@@ -51,7 +51,6 @@ public class MockAccountBuilder {
private String phone = "";
private String notes = "";
private boolean migrated;
- private boolean isNotifiedForInvoices;
private DateTime createdDate = new DateTime(DateTimeZone.UTC);
private DateTime updatedDate = new DateTime(DateTimeZone.UTC);
@@ -76,7 +75,6 @@ public class MockAccountBuilder {
this.email(data.getEmail());
this.externalKey(data.getExternalKey());
this.firstNameLength(data.getFirstNameLength());
- this.isNotifiedForInvoices(data.isNotifiedForInvoices());
this.locale(data.getLocale());
this.migrated(data.isMigrated());
this.name(data.getName());
@@ -206,11 +204,6 @@ public class MockAccountBuilder {
return this;
}
- public MockAccountBuilder isNotifiedForInvoices(final boolean isNotifiedForInvoices) {
- this.isNotifiedForInvoices = isNotifiedForInvoices;
- return this;
- }
-
public MockAccountBuilder createdDate(final DateTime createdDate) {
this.createdDate = createdDate;
return this;
@@ -339,11 +332,6 @@ public class MockAccountBuilder {
}
@Override
- public Boolean isNotifiedForInvoices() {
- return isNotifiedForInvoices;
- }
-
- @Override
public UUID getParentAccountId() {
return parentAccountId;
}
diff --git a/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java b/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
index 436971a..5afce8e 100644
--- a/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
+++ b/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
@@ -88,8 +88,8 @@ public class TestInternalCallContextFactory extends UtilTestSuiteWithEmbeddedDB
@Override
public Void withHandle(final Handle handle) throws Exception {
// Note: we always create an accounts table, see MysqlTestingHelper
- handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, is_notified_for_invoices, created_date, created_by, updated_date, updated_by) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
- accountRecordId, accountId.toString(), accountId.toString(), "yo@t.com", "toto", 4, new Date(), "UTC", false, new Date(), "i", new Date(), "j");
+ handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, created_date, created_by, updated_date, updated_by) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ accountRecordId, accountId.toString(), accountId.toString(), "yo@t.com", "toto", 4, new Date(), "UTC", new Date(), "i", new Date(), "j");
return null;
}
});
diff --git a/util/src/test/java/org/killbill/billing/util/customfield/api/TestDefaultCustomFieldUserApi.java b/util/src/test/java/org/killbill/billing/util/customfield/api/TestDefaultCustomFieldUserApi.java
index 90f54ba..d3f981e 100644
--- a/util/src/test/java/org/killbill/billing/util/customfield/api/TestDefaultCustomFieldUserApi.java
+++ b/util/src/test/java/org/killbill/billing/util/customfield/api/TestDefaultCustomFieldUserApi.java
@@ -63,8 +63,8 @@ public class TestDefaultCustomFieldUserApi extends UtilTestSuiteWithEmbeddedDB {
@Override
public Void withHandle(final Handle handle) throws Exception {
// Note: we always create an accounts table, see MysqlTestingHelper
- handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, is_notified_for_invoices, created_date, created_by, updated_date, updated_by) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
- accountRecordId, accountId.toString(), accountId.toString(), "yo@t.com", "toto", 4, new Date(), "UTC", false, new Date(), "i", new Date(), "j");
+ handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, created_date, created_by, updated_date, updated_by) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ accountRecordId, accountId.toString(), accountId.toString(), "yo@t.com", "toto", 4, new Date(), "UTC", new Date(), "i", new Date(), "j");
return null;
}
diff --git a/util/src/test/java/org/killbill/billing/util/dao/TestNonEntityDao.java b/util/src/test/java/org/killbill/billing/util/dao/TestNonEntityDao.java
index c2228fd..f5c28c9 100644
--- a/util/src/test/java/org/killbill/billing/util/dao/TestNonEntityDao.java
+++ b/util/src/test/java/org/killbill/billing/util/dao/TestNonEntityDao.java
@@ -96,8 +96,8 @@ public class TestNonEntityDao extends UtilTestSuiteWithEmbeddedDB {
@Override
public Void withHandle(final Handle handle) throws Exception {
// Note: we always create an accounts table, see MysqlTestingHelper
- handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, is_notified_for_invoices, created_date, created_by, updated_date, updated_by, tenant_record_id) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
- accountRecordId, accountId.toString(), accountId.toString(), "zozo@tt.com", "zozo", 4, new Date(), "UTC", false, new Date(), "i", new Date(), "j", tenantRecordId);
+ handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, created_date, created_by, updated_date, updated_by, tenant_record_id) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ accountRecordId, accountId.toString(), accountId.toString(), "zozo@tt.com", "zozo", 4, new Date(), "UTC", new Date(), "i", new Date(), "j", tenantRecordId);
return null;
}
});
@@ -108,8 +108,8 @@ public class TestNonEntityDao extends UtilTestSuiteWithEmbeddedDB {
@Override
public Void withHandle(final Handle handle) throws Exception {
// Note: we always create an accounts table, see MysqlTestingHelper
- handle.execute("insert into account_history (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, is_notified_for_invoices, created_date, created_by, updated_date, updated_by, tenant_record_id) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
- accountRecordId, accountId.toString(), accountId.toString(), "zozo@tt.com", "zozo", 4, new Date(), "UTC", false, new Date(), "i", new Date(), "j", tenantRecordId);
+ handle.execute("insert into account_history (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, created_date, created_by, updated_date, updated_by, tenant_record_id) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ accountRecordId, accountId.toString(), accountId.toString(), "zozo@tt.com", "zozo", 4, new Date(), "UTC", new Date(), "i", new Date(), "j", tenantRecordId);
return null;
}
});
diff --git a/util/src/test/java/org/killbill/billing/util/export/dao/TestDatabaseExportDao.java b/util/src/test/java/org/killbill/billing/util/export/dao/TestDatabaseExportDao.java
index 3eec0b5..3e0df8f 100644
--- a/util/src/test/java/org/killbill/billing/util/export/dao/TestDatabaseExportDao.java
+++ b/util/src/test/java/org/killbill/billing/util/export/dao/TestDatabaseExportDao.java
@@ -22,16 +22,13 @@ import java.io.ByteArrayOutputStream;
import java.util.Date;
import java.util.UUID;
+import org.killbill.billing.util.UtilTestSuiteWithEmbeddedDB;
+import org.killbill.billing.util.api.DatabaseExportOutputStream;
import org.skife.jdbi.v2.Handle;
import org.skife.jdbi.v2.tweak.HandleCallback;
import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.killbill.billing.util.UtilTestSuiteWithEmbeddedDB;
-import org.killbill.billing.util.api.DatabaseExportOutputStream;
-import org.killbill.billing.util.validation.dao.DatabaseSchemaDao;
-
import com.ning.compress.lzf.LZFEncoder;
public class TestDatabaseExportDao extends UtilTestSuiteWithEmbeddedDB {
@@ -48,7 +45,6 @@ public class TestDatabaseExportDao extends UtilTestSuiteWithEmbeddedDB {
final String accountName = UUID.randomUUID().toString().substring(0, 4);
final int firstNameLength = 4;
final String timeZone = "UTC";
- final boolean isNotifiedForInvoices = false;
final Date createdDate = new Date(12421982000L);
final String createdBy = UUID.randomUUID().toString().substring(0, 4);
final Date updatedDate = new Date(382910622000L);
@@ -79,9 +75,9 @@ public class TestDatabaseExportDao extends UtilTestSuiteWithEmbeddedDB {
internalCallContext.getAccountRecordId(), internalCallContext.getTenantRecordId());
// Add row in accounts table
- handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, is_notified_for_invoices, created_date, created_by, updated_date, updated_by, tenant_record_id) " +
- "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
- internalCallContext.getAccountRecordId(), accountId, accountId, accountEmail, accountName, firstNameLength, createdDate, timeZone, isNotifiedForInvoices, createdDate, createdBy, updatedDate, updatedBy, internalCallContext.getTenantRecordId());
+ handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, created_date, created_by, updated_date, updated_by, tenant_record_id) " +
+ "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ internalCallContext.getAccountRecordId(), accountId, accountId, accountEmail, accountName, firstNameLength, createdDate, timeZone, createdDate, createdBy, updatedDate, updatedBy, internalCallContext.getTenantRecordId());
return null;
}
});
@@ -89,9 +85,9 @@ public class TestDatabaseExportDao extends UtilTestSuiteWithEmbeddedDB {
// Verify new dump
final String newDump = getDump();
- Assert.assertEquals(newDump, "-- accounts record_id|id|external_key|email|name|first_name_length|currency|billing_cycle_day_local|parent_account_id|is_payment_delegated_to_parent|payment_method_id|reference_time|time_zone|locale|address1|address2|company_name|city|state_or_province|country|postal_code|phone|notes|migrated|is_notified_for_invoices|created_date|created_by|updated_date|updated_by|tenant_record_id\n" +
- String.format("%s|%s|%s|%s|%s|%s||||false||%s|%s|||||||||||false|%s|%s|%s|%s|%s|%s", internalCallContext.getAccountRecordId(), accountId, accountId, accountEmail, accountName, firstNameLength, "1970-05-24T18:33:02.000+0000", timeZone,
- isNotifiedForInvoices, "1970-05-24T18:33:02.000+0000", createdBy, "1982-02-18T20:03:42.000+0000", updatedBy, internalCallContext.getTenantRecordId()) + "\n" +
+ Assert.assertEquals(newDump, "-- accounts record_id|id|external_key|email|name|first_name_length|currency|billing_cycle_day_local|parent_account_id|is_payment_delegated_to_parent|payment_method_id|reference_time|time_zone|locale|address1|address2|company_name|city|state_or_province|country|postal_code|phone|notes|migrated|created_date|created_by|updated_date|updated_by|tenant_record_id\n" +
+ String.format("%s|%s|%s|%s|%s|%s||||false||%s|%s|||||||||||false|%s|%s|%s|%s|%s", internalCallContext.getAccountRecordId(), accountId, accountId, accountEmail, accountName, firstNameLength, "1970-05-24T18:33:02.000+0000", timeZone,
+ "1970-05-24T18:33:02.000+0000", createdBy, "1982-02-18T20:03:42.000+0000", updatedBy, internalCallContext.getTenantRecordId()) + "\n" +
"-- " + tableNameA + " record_id|a_column|blob_column|account_record_id|tenant_record_id\n" +
"1|a|WlYAAARjYWZl|" + internalCallContext.getAccountRecordId() + "|" + internalCallContext.getTenantRecordId() + "\n" +
"-- " + tableNameB + " record_id|b_column|account_record_id|tenant_record_id\n" +
diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java b/util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java
index f7fdaf9..059101e 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java
@@ -52,8 +52,8 @@ public class TestDefaultTagUserApi extends UtilTestSuiteWithEmbeddedDB {
@Override
public Void withHandle(final Handle handle) throws Exception {
// Note: we always create an accounts table, see MysqlTestingHelper
- handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, is_notified_for_invoices, created_date, created_by, updated_date, updated_by) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
- accountRecordId, accountId.toString(), accountId.toString(), "yo@t.com", "toto", 4, new Date(), "UTC", false, new Date(), "i", new Date(), "j");
+ handle.execute("insert into accounts (record_id, id, external_key, email, name, first_name_length, reference_time, time_zone, created_date, created_by, updated_date, updated_by) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ accountRecordId, accountId.toString(), accountId.toString(), "yo@t.com", "toto", 4, new Date(), "UTC", new Date(), "i", new Date(), "j");
return null;
}