killbill-aplcache
Changes
account/pom.xml 2(+1 -1)
account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeNotification.java 20(+16 -4)
analytics/pom.xml 2(+1 -1)
api/pom.xml 10(+9 -1)
beatrix/pom.xml 2(+1 -1)
catalog/pom.xml 2(+1 -1)
entitlement/pom.xml 7(+6 -1)
entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java 2(+1 -1)
entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java 17(+17 -0)
entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccount.java 82(+65 -17)
entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java 6(+6 -0)
invoice/pom.xml 2(+1 -1)
invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceCreationNotification.java 8(+8 -0)
payment/pom.xml 100(+97 -3)
payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPluginRegistry.java 49(+49 -0)
payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPluginModule.java 36(+36 -0)
payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPluginProvider.java 42(+42 -0)
payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModuleWithEmbeddedDb.java 41(+41 -0)
payment/src/test/resources/log4j.xml 30(+30 -0)
pom.xml 86(+75 -11)
util/pom.xml 18(+16 -2)
Details
account/pom.xml 2(+1 -1)
diff --git a/account/pom.xml b/account/pom.xml
index 44b4543..0146205 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-account</artifactId>
diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
index b953707..0c22000 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2010-2011 Ning, Inc.
*
* Ning licenses this file to you under the Apache License, version 2.0
@@ -16,150 +16,253 @@
package com.ning.billing.account.api;
-import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
+
import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.util.customfield.CustomizableEntityBase;
-import com.ning.billing.util.tag.DefaultTag;
import com.ning.billing.util.tag.DefaultTagStore;
+import com.ning.billing.util.tag.DescriptiveTag;
import com.ning.billing.util.tag.Tag;
-import com.ning.billing.util.tag.TagDescription;
+import com.ning.billing.util.tag.TagDefinition;
public class DefaultAccount extends CustomizableEntityBase implements Account {
- public final static String OBJECT_TYPE = "Account";
-
- private final String externalKey;
- private final String email;
- private final String name;
- private final int firstNameLength;
- private final String phone;
- private final Currency currency;
- private final int billCycleDay;
- private final String paymentProviderName;
- private final BigDecimal balance;
- private final DefaultTagStore tags;
-
- public DefaultAccount(AccountData data) {
- this(UUID.randomUUID(), data.getExternalKey(), data.getEmail(), data.getName(),
- data.getFirstNameLength(), data.getPhone(), data.getCurrency(), data.getBillCycleDay(),
- data.getPaymentProviderName(), BigDecimal.ZERO);
- }
-
- public DefaultAccount(UUID id, AccountData data) {
- this(id, data.getExternalKey(), data.getEmail(), data.getName(),
- data.getFirstNameLength(), data.getPhone(), data.getCurrency(), data.getBillCycleDay(),
- data.getPaymentProviderName(), BigDecimal.ZERO);
- }
-
- public DefaultAccount(UUID id, String externalKey, String email, String name, int firstNameLength,
- String phone, Currency currency, int billCycleDay, String paymentProviderName,
- BigDecimal balance) {
- super(id);
- this.externalKey = externalKey;
- this.email = email;
- this.name = name;
- this.firstNameLength = firstNameLength;
- this.phone = phone;
- this.currency = currency;
- this.billCycleDay = billCycleDay;
- this.paymentProviderName = paymentProviderName;
- this.balance = balance;
-
- this.tags = new DefaultTagStore(id, getObjectName());
- }
-
- @Override
- public String getObjectName() {
- return OBJECT_TYPE;
- }
-
- @Override
- public String getExternalKey() {
- return externalKey;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public String getEmail() {
- return email;
- }
-
- @Override
- public int getFirstNameLength() {
- return firstNameLength;
- }
-
- @Override
- public String getPhone() {
- return phone;
- }
-
- @Override
- public Currency getCurrency() {
- return currency;
- }
-
- @Override
- public int getBillCycleDay() {
- return billCycleDay;
- }
-
- @Override
- public String getPaymentProviderName() {
- return paymentProviderName;
- }
-
- @Override
- public List<Tag> getTagList() {
- return tags.getEntityList();
- }
-
- @Override
- public boolean hasTag(String tagName) {
- return tags.containsTag(tagName);
- }
-
- @Override
- public void addTag(TagDescription description, String addedBy, DateTime dateAdded) {
- Tag tag = new DefaultTag(description, addedBy, dateAdded);
- tags.add(tag) ;
- }
-
- @Override
- public void addTags(List<Tag> tags) {
- if (tags != null) {
- this.tags.add(tags);
- }
- }
-
- @Override
- public void clearTags() {
- this.tags.clear();
- }
-
- @Override
- public void removeTag(TagDescription description) {
- tags.remove(description.getName());
- }
-
- @Override
- public boolean generateInvoice() {
- return tags.generateInvoice();
- }
-
- @Override
- public boolean processPayment() {
- return tags.processPayment();
- }
-
- @Override
- public BigDecimal getBalance() {
- return balance;
- }
+ //public final static String OBJECT_TYPE = "Account";
+
+ private final String externalKey;
+ private final String email;
+ private final String name;
+ private final int firstNameLength;
+ private final Currency currency;
+ private final int billCycleDay;
+ private final String paymentProviderName;
+ private final DefaultTagStore tags;
+ private final DateTimeZone timeZone;
+ private final String locale;
+ private final String address1;
+ private final String address2;
+ private final String companyName;
+ private final String city;
+ private final String stateOrProvince;
+ private final String country;
+ private final String postalCode;
+ private final String phone;
+ private final DateTime createdDate;
+ private final DateTime updatedDate;
+
+ public DefaultAccount(final AccountData data) {
+ this(UUID.randomUUID(), data, null, null);
+ }
+
+ public DefaultAccount(final UUID id, final AccountData data, DateTime createdDate, DateTime updatedDate) {
+ this(id, data.getExternalKey(), data.getEmail(), data.getName(), data.getFirstNameLength(),
+ data.getCurrency(), data.getBillCycleDay(), data.getPaymentProviderName(),
+ data.getTimeZone(), data.getLocale(),
+ data.getAddress1(), data.getAddress2(), data.getCompanyName(),
+ data.getCity(), data.getStateOrProvince(), data.getCountry(),
+ data.getPostalCode(), data.getPhone(), createdDate, updatedDate);
+ }
+
+ public DefaultAccount(final UUID id, final String externalKey, final String email, final String name, final int firstNameLength,
+ final Currency currency, final int billCycleDay, final String paymentProviderName,
+ 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, DateTime createdDate, DateTime updatedDate) {
+
+ super(id);
+ this.externalKey = externalKey;
+ this.email = email;
+ this.name = name;
+ this.firstNameLength = firstNameLength;
+ this.currency = currency;
+ this.billCycleDay = billCycleDay;
+ this.paymentProviderName = paymentProviderName;
+ this.timeZone = timeZone;
+ this.locale = locale;
+ this.address1 = address1;
+ this.address2 = address2;
+ this.companyName = companyName;
+ this.city = city;
+ this.stateOrProvince = stateOrProvince;
+ this.postalCode = postalCode;
+ this.country = country;
+ this.phone = phone;
+ this.createdDate = createdDate == null ? new DateTime(DateTimeZone.UTC) : createdDate;
+ this.updatedDate = updatedDate == null ? new DateTime(DateTimeZone.UTC) : updatedDate;
+ this.tags = new DefaultTagStore(id, getObjectName());
+ }
+
+ @Override
+ public String getObjectName() {
+ return "Account";
+ }
+
+ @Override
+ public String getExternalKey() {
+ return externalKey;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String getEmail() {
+ return email;
+ }
+
+ public DefaultTagStore getTags() {
+ return tags;
+ }
+
+ @Override
+ public DateTime getCreatedDate() {
+ return createdDate;
+ }
+
+ @Override
+ public DateTime getUpdatedDate() {
+ return updatedDate;
+ }
+
+ @Override
+ public int getFirstNameLength() {
+ return firstNameLength;
+ }
+
+ @Override
+ public Currency getCurrency() {
+ return currency;
+ }
+
+ @Override
+ public int getBillCycleDay() {
+ return billCycleDay;
+ }
+
+ @Override
+ public String getPaymentProviderName() {
+ return paymentProviderName;
+ }
+
+ @Override
+ public DateTimeZone getTimeZone() {
+ return timeZone;
+ }
+
+ @Override
+ public String getLocale() {
+ return locale;
+ }
+
+ @Override
+ public String getAddress1() {
+ return address1;
+ }
+
+ @Override
+ public String getAddress2() {
+ return address2;
+ }
+
+ @Override
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ @Override
+ public String getCity() {
+ return city;
+ }
+
+ @Override
+ public String getStateOrProvince() {
+ return stateOrProvince;
+ }
+
+ @Override
+ public String getPostalCode() {
+ return postalCode;
+ }
+
+ @Override
+ public String getCountry() {
+ return country;
+ }
+
+ @Override
+ public String getPhone() {
+ return phone;
+ }
+
+ @Override
+ public List<Tag> getTagList() {
+ return tags.getEntityList();
+ }
+
+ @Override
+ public boolean hasTag(String tagName) {
+ return tags.containsTag(tagName);
+ }
+
+ @Override
+ public void addTag(TagDefinition definition, String addedBy, DateTime dateAdded) {
+ Tag tag = new DescriptiveTag(definition, addedBy, dateAdded);
+ tags.add(tag) ;
+ }
+
+ @Override
+ public void addTags(List<Tag> tags) {
+ if (tags != null) {
+ this.tags.add(tags);
+ }
+ }
+
+ @Override
+ public void clearTags() {
+ this.tags.clear();
+ }
+
+ @Override
+ public void removeTag(TagDefinition definition) {
+ tags.remove(definition.getName());
+ }
+
+ @Override
+ public boolean generateInvoice() {
+ return tags.generateInvoice();
+ }
+
+ @Override
+ public boolean processPayment() {
+ return tags.processPayment();
+ }
+
+ @Override
+ public String toString() {
+ return "DefaultAccount [externalKey=" + externalKey + ", email=" + email +
+ ", name=" + name + ", " +
+ "firstNameLength=" + firstNameLength +
+ ", phone=" + phone + ", " +
+ "currency=" + currency +
+ ", billCycleDay=" + billCycleDay +
+ ", paymentProviderName=" + paymentProviderName +
+ ", timezone=" + timeZone +
+ ", locale=" + locale +
+ ", address1" + address1 +
+ ", address2" + address2 +
+ ", companyName" + companyName +
+ ", city" + city +
+ ", stateOrProvince" + stateOrProvince +
+ ", postalCode" + postalCode +
+ ", country" +
+ ", tags=" + tags +
+ ", createdDate=" + createdDate +
+ ", updatedDate=" + updatedDate + "]";
+ }
}
\ No newline at end of file
diff --git a/account/src/main/java/com/ning/billing/account/api/user/AccountBuilder.java b/account/src/main/java/com/ning/billing/account/api/user/AccountBuilder.java
index e05e967..95eb5d8 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/AccountBuilder.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/AccountBuilder.java
@@ -16,79 +16,145 @@
package com.ning.billing.account.api.user;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
import com.ning.billing.account.api.DefaultAccount;
import com.ning.billing.catalog.api.Currency;
-import java.math.BigDecimal;
-import java.util.UUID;
-
public class AccountBuilder {
- private UUID id;
+ private final UUID id;
private String externalKey;
private String email;
private String name;
private int firstNameLength;
- private String phone;
private Currency currency;
private int billingCycleDay;
private String paymentProviderName;
- private BigDecimal balance;
+ private DateTimeZone timeZone;
+ private String locale;
+ private String address1;
+ private String address2;
+ private String companyName;
+ private String city;
+ private String stateOrProvince;
+ private String country;
+ private String postalCode;
+ private String phone;
+ private DateTime createdDate;
+ private DateTime updatedDate;
public AccountBuilder() {
this(UUID.randomUUID());
}
- public AccountBuilder(UUID id) {
+ public AccountBuilder(final UUID id) {
this.id = id;
}
- public AccountBuilder externalKey(String externalKey) {
+ public AccountBuilder externalKey(final String externalKey) {
this.externalKey = externalKey;
return this;
}
- public AccountBuilder email(String email) {
+ public AccountBuilder email(final String email) {
this.email = email;
return this;
}
- public AccountBuilder name(String name) {
+ public AccountBuilder name(final String name) {
this.name = name;
return this;
}
- public AccountBuilder firstNameLength(int firstNameLength) {
+ public AccountBuilder firstNameLength(final int firstNameLength) {
this.firstNameLength = firstNameLength;
return this;
}
- public AccountBuilder phone(String phone) {
- this.phone = phone;
- return this;
- }
-
- public AccountBuilder billingCycleDay(int billingCycleDay) {
+ public AccountBuilder billingCycleDay(final int billingCycleDay) {
this.billingCycleDay = billingCycleDay;
return this;
}
- public AccountBuilder currency(Currency currency) {
+ public AccountBuilder currency(final Currency currency) {
this.currency = currency;
return this;
}
- public AccountBuilder paymentProviderName(String paymentProviderName) {
+ public AccountBuilder paymentProviderName(final String paymentProviderName) {
this.paymentProviderName = paymentProviderName;
return this;
}
- public AccountBuilder balance(BigDecimal balance) {
- this.balance = balance;
+ public AccountBuilder timeZone(final DateTimeZone timeZone) {
+ this.timeZone = timeZone;
+ return this;
+ }
+
+ public AccountBuilder locale(final String locale) {
+ this.locale = locale;
+ return this;
+ }
+
+ public AccountBuilder address1(final String address1) {
+ this.address1 = address1;
+ return this;
+ }
+
+ public AccountBuilder address2(final String address2) {
+ this.address2 = address2;
+ return this;
+ }
+
+ public AccountBuilder companyName(final String companyName) {
+ this.companyName = companyName;
+ return this;
+ }
+
+ public AccountBuilder city(final String city) {
+ this.city = city;
+ return this;
+ }
+
+ public AccountBuilder stateOrProvince(final String stateOrProvince) {
+ this.stateOrProvince = stateOrProvince;
+ return this;
+ }
+
+ public AccountBuilder postalCode(final String postalCode) {
+ this.postalCode = postalCode;
+ return this;
+ }
+
+ public AccountBuilder country(final String country) {
+ this.country = country;
+ return this;
+ }
+
+ public AccountBuilder phone(final String phone) {
+ this.phone = phone;
+ return this;
+ }
+
+ public AccountBuilder createdDate(DateTime createdDate) {
+ this.createdDate = createdDate;
+ return this;
+ }
+
+ public AccountBuilder updatedDate(DateTime updatedDate) {
+ this.updatedDate = updatedDate;
return this;
}
public DefaultAccount build() {
return new DefaultAccount(id, externalKey, email, name, firstNameLength,
- phone, currency, billingCycleDay, paymentProviderName, balance);
+ currency, billingCycleDay, paymentProviderName,
+ timeZone, locale,
+ address1, address2, companyName, city, stateOrProvince, country,
+ postalCode, phone,
+ createdDate, updatedDate);
}
}
diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeNotification.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeNotification.java
index 178100f..11a5a39 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeNotification.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeNotification.java
@@ -62,9 +62,6 @@ public class DefaultAccountChangeNotification implements AccountChangeNotificati
addIfValueChanged(tmpChangedFields, "firstName",
oldData.getName(), newData.getName());
- addIfValueChanged(tmpChangedFields, "phone",
- oldData.getPhone(), newData.getPhone());
-
addIfValueChanged(tmpChangedFields, "currency",
(oldData.getCurrency() != null) ? oldData.getCurrency().toString() : null,
(newData.getCurrency() != null) ? newData.getCurrency().toString() : null);
@@ -75,6 +72,21 @@ public class DefaultAccountChangeNotification implements AccountChangeNotificati
addIfValueChanged(tmpChangedFields,"paymentProviderName",
oldData.getPaymentProviderName(), newData.getPaymentProviderName());
+
+ addIfValueChanged(tmpChangedFields, "locale", oldData.getLocale(), newData.getLocale());
+
+ addIfValueChanged(tmpChangedFields, "timeZone",
+ (oldData.getTimeZone() == null) ? null : oldData.getTimeZone().toString(),
+ (newData.getTimeZone() == null) ? null : newData.getTimeZone().toString());
+
+ addIfValueChanged(tmpChangedFields, "address1", oldData.getAddress1(), newData.getAddress1());
+ addIfValueChanged(tmpChangedFields, "address2", oldData.getAddress2(), newData.getAddress2());
+ addIfValueChanged(tmpChangedFields, "city", oldData.getCity(), newData.getCity());
+ addIfValueChanged(tmpChangedFields, "stateOrProvince", oldData.getStateOrProvince(), newData.getStateOrProvince());
+ addIfValueChanged(tmpChangedFields, "country", oldData.getCountry(), newData.getCountry());
+ addIfValueChanged(tmpChangedFields, "postalCode", oldData.getPostalCode(), newData.getPostalCode());
+ addIfValueChanged(tmpChangedFields, "phone", oldData.getPhone(), newData.getPhone());
+
return tmpChangedFields;
}
@@ -85,7 +97,7 @@ public class DefaultAccountChangeNotification implements AccountChangeNotificati
// If only one is null
} else if (newData == null || oldData == null) {
inputList.add(new DefaultChangedField(key, oldData, newData));
- // If non are null we can safely compare values
+ // If neither are null we can safely compare values
} else if (!newData.equals(oldData)) {
inputList.add(new DefaultChangedField(key, oldData, newData));
}
diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
index d6bf995..fdc70e6 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
@@ -26,6 +26,7 @@ import com.ning.billing.account.api.AccountData;
import com.ning.billing.account.api.DefaultAccount;
import com.ning.billing.account.dao.AccountDao;
import com.ning.billing.util.customfield.CustomField;
+import com.ning.billing.util.eventbus.EventBus;
import com.ning.billing.util.tag.Tag;
public class DefaultAccountUserApi implements com.ning.billing.account.api.AccountUserApi {
@@ -38,19 +39,12 @@ public class DefaultAccountUserApi implements com.ning.billing.account.api.Accou
@Override
public Account createAccount(final AccountData data, final List<CustomField> fields, List<Tag> tags) throws AccountApiException {
- String key = data.getExternalKey();
- Account existingAccount = dao.getAccountByKey(key);
+ Account account = new DefaultAccount(data);
+ account.addFields(fields);
+ account.addTags(tags);
- if (existingAccount == null) {
- Account account = new DefaultAccount(data);
- account.addFields(fields);
- account.addTags(tags);
-
- dao.create(account);
- return account;
- } else {
- throw new AccountApiException(ErrorCode.ACCOUNT_ALREADY_EXISTS, key);
- }
+ dao.create(account);
+ return account;
}
@Override
@@ -69,12 +63,17 @@ public class DefaultAccountUserApi implements com.ning.billing.account.api.Accou
}
@Override
- public UUID getIdFromKey(final String externalKey) {
+ public UUID getIdFromKey(final String externalKey) throws AccountApiException {
return dao.getIdFromKey(externalKey);
}
@Override
- public void updateAccount(final Account account) {
+ public void updateAccount(final Account account) throws AccountApiException {
dao.update(account);
}
+
+ @Override
+ public void deleteAccountByKey(String externalKey) throws AccountApiException {
+ dao.deleteByKey(externalKey);
+ }
}
diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
index 04b50e3..74a8d51 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
@@ -18,10 +18,19 @@ package com.ning.billing.account.dao;
import java.util.UUID;
import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.util.entity.EntityDao;
public interface AccountDao extends EntityDao<Account> {
public Account getAccountByKey(String key);
- public UUID getIdFromKey(String externalKey);
-}
+ /***
+ *
+ * @param externalKey
+ * @return
+ * @throws AccountApiException when externalKey is null
+ */
+ public UUID getIdFromKey(String externalKey) throws AccountApiException;
+
+ public void deleteByKey(String externalKey) throws AccountApiException;
+}
\ No newline at end of file
diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
index 21122e2..42ec5a8 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountSqlDao.java
@@ -16,12 +16,19 @@
package com.ning.billing.account.dao;
-import com.ning.billing.account.api.Account;
-import com.ning.billing.account.api.AccountApiException;
-import com.ning.billing.account.api.user.AccountBuilder;
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.UuidMapper;
-import com.ning.billing.util.entity.EntityDao;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
import org.skife.jdbi.v2.SQLStatement;
import org.skife.jdbi.v2.StatementContext;
import org.skife.jdbi.v2.sqlobject.Bind;
@@ -36,15 +43,11 @@ import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3;
import org.skife.jdbi.v2.tweak.ResultSetMapper;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.UUID;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.user.AccountBuilder;
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.UuidMapper;
+import com.ning.billing.util.entity.EntityDao;
@ExternalizedSqlViaStringTemplate3
@RegisterMapper({UuidMapper.class, AccountSqlDao.AccountMapper.class})
@@ -63,25 +66,60 @@ public interface AccountSqlDao extends EntityDao<Account>, Transactional<Account
@SqlUpdate
public void update(@AccountBinder Account account);
+ @Override
+ @SqlUpdate
+ public void deleteByKey(@Bind("externalKey") final String key);
+
public static class AccountMapper implements ResultSetMapper<Account> {
+
+ private DateTime getDate(ResultSet rs, String fieldName) throws SQLException {
+ final Timestamp resultStamp = rs.getTimestamp(fieldName);
+ return rs.wasNull() ? null : new DateTime(resultStamp).toDateTime(DateTimeZone.UTC);
+ }
+
@Override
public Account map(int index, ResultSet result, StatementContext context) throws SQLException {
+
UUID id = UUID.fromString(result.getString("id"));
String externalKey = result.getString("external_key");
String email = result.getString("email");
String name = result.getString("name");
int firstNameLength = result.getInt("first_name_length");
- String phone = result.getString("phone");
int billingCycleDay = result.getInt("billing_cycle_day");
+
String currencyString = result.getString("currency");
Currency currency = (currencyString == null) ? null : Currency.valueOf(currencyString);
+
String paymentProviderName = result.getString("payment_provider_name");
+ DateTime createdDate = getDate(result, "created_dt");
+ DateTime updatedDate = getDate(result, "updated_dt");
+
+ String timeZoneId = result.getString("time_zone");
+ DateTimeZone timeZone = (timeZoneId == null) ? null : DateTimeZone.forID(timeZoneId);
+
+ String locale = result.getString("locale");
+
+ String address1 = result.getString("address1");
+ String address2 = result.getString("address2");
+ String companyName = result.getString("company_name");
+ String city = result.getString("city");
+ String stateOrProvince = result.getString("state_or_province");
+ String postalCode = result.getString("postal_code");
+ String country = result.getString("country");
+ String phone = result.getString("phone");
return new AccountBuilder(id).externalKey(externalKey).email(email)
.name(name).firstNameLength(firstNameLength)
.phone(phone).currency(currency)
.billingCycleDay(billingCycleDay)
.paymentProviderName(paymentProviderName)
+ .timeZone(timeZone).locale(locale)
+ .address1(address1).address2(address2)
+ .companyName(companyName)
+ .city(city).stateOrProvince(stateOrProvince)
+ .postalCode(postalCode).country(country)
+ .createdDate(createdDate)
+ .updatedDate(updatedDate)
.build();
}
}
@@ -91,19 +129,37 @@ public interface AccountSqlDao extends EntityDao<Account>, Transactional<Account
@Target({ElementType.PARAMETER})
public @interface AccountBinder {
public static class AccountBinderFactory implements BinderFactory {
- public Binder build(Annotation annotation) {
+ @Override
+ public Binder<AccountBinder, Account> build(Annotation annotation) {
return new Binder<AccountBinder, Account>() {
- public void bind(SQLStatement q, AccountBinder bind, Account account) {
+ private Date getDate(DateTime dateTime) {
+ return dateTime == null ? null : dateTime.toDate();
+ }
+
+ @Override
+ public void bind(@SuppressWarnings("rawtypes") SQLStatement q, AccountBinder bind, Account account) {
q.bind("id", account.getId().toString());
q.bind("externalKey", account.getExternalKey());
q.bind("email", account.getEmail());
q.bind("name", account.getName());
q.bind("firstNameLength", account.getFirstNameLength());
- q.bind("phone", account.getPhone());
Currency currency = account.getCurrency();
q.bind("currency", (currency == null) ? null : currency.toString());
q.bind("billingCycleDay", account.getBillCycleDay());
q.bind("paymentProviderName", account.getPaymentProviderName());
+ DateTimeZone timeZone = account.getTimeZone();
+ q.bind("timeZone", (timeZone == null) ? null : timeZone.toString());
+ q.bind("locale", account.getLocale());
+ q.bind("address1", account.getAddress1());
+ q.bind("address2", account.getAddress2());
+ q.bind("companyName", account.getCompanyName());
+ q.bind("city", account.getCity());
+ q.bind("stateOrProvince", account.getStateOrProvince());
+ q.bind("country", account.getCountry());
+ q.bind("postalCode", account.getPostalCode());
+ q.bind("phone", account.getPhone());
+ q.bind("createdDate", getDate(account.getCreatedDate()));
+ q.bind("updatedDate", getDate(account.getUpdatedDate()));
}
};
}
diff --git a/account/src/main/java/com/ning/billing/account/dao/DefaultAccountDao.java b/account/src/main/java/com/ning/billing/account/dao/DefaultAccountDao.java
index c4671ea..f501267 100644
--- a/account/src/main/java/com/ning/billing/account/dao/DefaultAccountDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/DefaultAccountDao.java
@@ -18,28 +18,31 @@ package com.ning.billing.account.dao;
import java.util.List;
import java.util.UUID;
+
import org.skife.jdbi.v2.IDBI;
import org.skife.jdbi.v2.Transaction;
import org.skife.jdbi.v2.TransactionStatus;
+
import com.google.inject.Inject;
+import com.ning.billing.ErrorCode;
import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.account.api.AccountChangeNotification;
import com.ning.billing.account.api.AccountCreationNotification;
-import com.ning.billing.account.api.DefaultAccount;
import com.ning.billing.account.api.user.DefaultAccountChangeNotification;
import com.ning.billing.account.api.user.DefaultAccountCreationEvent;
import com.ning.billing.util.customfield.CustomField;
import com.ning.billing.util.customfield.dao.FieldStoreDao;
import com.ning.billing.util.eventbus.EventBus;
import com.ning.billing.util.tag.Tag;
-import com.ning.billing.util.tag.dao.TagStoreDao;
+import com.ning.billing.util.tag.dao.TagStoreSqlDao;
public class DefaultAccountDao implements AccountDao {
private final AccountSqlDao accountDao;
private final EventBus eventBus;
@Inject
- public DefaultAccountDao(IDBI dbi, EventBus eventBus) {
+ public DefaultAccountDao(final IDBI dbi, final EventBus eventBus) {
this.eventBus = eventBus;
this.accountDao = dbi.onDemand(AccountSqlDao.class);
}
@@ -48,7 +51,7 @@ public class DefaultAccountDao implements AccountDao {
public Account getAccountByKey(final String key) {
return accountDao.inTransaction(new Transaction<Account, AccountSqlDao>() {
@Override
- public Account inTransaction(AccountSqlDao accountSqlDao, TransactionStatus status) throws Exception {
+ public Account inTransaction(final AccountSqlDao accountSqlDao, final TransactionStatus status) throws Exception {
Account account = accountSqlDao.getAccountByKey(key);
if (account != null) {
setCustomFieldsFromWithinTransaction(account, accountSqlDao);
@@ -60,7 +63,10 @@ public class DefaultAccountDao implements AccountDao {
}
@Override
- public UUID getIdFromKey(final String externalKey) {
+ public UUID getIdFromKey(final String externalKey) throws AccountApiException {
+ if (externalKey == null) {
+ throw new AccountApiException(ErrorCode.ACCOUNT_CANNOT_MAP_NULL_KEY, "");
+ }
return accountDao.getIdFromKey(externalKey);
}
@@ -68,7 +74,7 @@ public class DefaultAccountDao implements AccountDao {
public Account getById(final String id) {
return accountDao.inTransaction(new Transaction<Account, AccountSqlDao>() {
@Override
- public Account inTransaction(AccountSqlDao accountSqlDao, TransactionStatus status) throws Exception {
+ public Account inTransaction(final AccountSqlDao accountSqlDao, final TransactionStatus status) throws Exception {
Account account = accountSqlDao.getById(id);
if (account != null) {
setCustomFieldsFromWithinTransaction(account, accountSqlDao);
@@ -86,56 +92,93 @@ public class DefaultAccountDao implements AccountDao {
}
@Override
- public void create(final Account account) {
- final String accountId = account.getId().toString();
- final String objectType = DefaultAccount.OBJECT_TYPE;
-
- accountDao.inTransaction(new Transaction<Void, AccountSqlDao>() {
- @Override
- public Void inTransaction(AccountSqlDao accountSqlDao, TransactionStatus status) throws Exception {
- accountSqlDao.create(account);
-
- FieldStoreDao fieldStoreDao = accountSqlDao.become(FieldStoreDao.class);
- fieldStoreDao.save(accountId, objectType, account.getFieldList());
-
- TagStoreDao tagStoreDao = accountSqlDao.become(TagStoreDao.class);
- tagStoreDao.save(accountId, objectType, account.getTagList());
-
- AccountCreationNotification creationEvent = new DefaultAccountCreationEvent(account);
- eventBus.post(creationEvent);
- return null;
+ public void create(final Account account) throws AccountApiException {
+ final String key = account.getExternalKey();
+ try {
+ accountDao.inTransaction(new Transaction<Void, AccountSqlDao>() {
+ @Override
+ public Void inTransaction(final AccountSqlDao accountSqlDao, final TransactionStatus status) throws AccountApiException, EventBus.EventBusException {
+ Account currentAccount = accountSqlDao.getAccountByKey(key);
+ if (currentAccount != null) {
+ throw new AccountApiException(ErrorCode.ACCOUNT_ALREADY_EXISTS, key);
+ }
+ accountSqlDao.create(account);
+
+ saveTagsFromWithinTransaction(account, accountSqlDao, true);
+ saveCustomFieldsFromWithinTransaction(account, accountSqlDao, true);
+
+ AccountCreationNotification creationEvent = new DefaultAccountCreationEvent(account);
+ eventBus.post(creationEvent);
+ return null;
+ }
+ });
+ } catch (RuntimeException re) {
+ if (re.getCause() instanceof AccountApiException) {
+ throw (AccountApiException) re.getCause();
+ } else {
+ throw re;
}
- });
+ }
}
@Override
- public void update(final Account account) {
- final String accountId = account.getId().toString();
- final String objectType = DefaultAccount.OBJECT_TYPE;
-
- accountDao.inTransaction(new Transaction<Void, AccountSqlDao>() {
- @Override
- public Void inTransaction(AccountSqlDao accountSqlDao, TransactionStatus status) throws Exception {
- Account currentAccount = accountSqlDao.getById(accountId);
-
- accountSqlDao.update(account);
+ public void update(final Account account) throws AccountApiException {
+ try {
+ accountDao.inTransaction(new Transaction<Void, AccountSqlDao>() {
+ @Override
+ public Void inTransaction(final AccountSqlDao accountSqlDao, final TransactionStatus status) throws AccountApiException, EventBus.EventBusException {
+ String accountId = account.getId().toString();
+ Account currentAccount = accountSqlDao.getById(accountId);
+ if (currentAccount == null) {
+ throw new AccountApiException(ErrorCode.ACCOUNT_DOES_NOT_EXIST_FOR_ID, accountId);
+ }
+
+ String currentKey = currentAccount.getExternalKey();
+ if (!currentKey.equals(account.getExternalKey())) {
+ throw new AccountApiException(ErrorCode.ACCOUNT_CANNOT_CHANGE_EXTERNAL_KEY, currentKey);
+ }
+
+ accountSqlDao.update(account);
+
+ saveTagsFromWithinTransaction(account, accountSqlDao, false);
+ saveCustomFieldsFromWithinTransaction(account, accountSqlDao, false);
+
+ AccountChangeNotification changeEvent = new DefaultAccountChangeNotification(account.getId(), currentAccount, account);
+ if (changeEvent.hasChanges()) {
+ eventBus.post(changeEvent);
+ }
+ return null;
+ }
+ });
+ } catch (RuntimeException re) {
+ if (re.getCause() instanceof AccountApiException) {
+ throw (AccountApiException) re.getCause();
+ } else {
+ throw re;
+ }
+ }
+ }
- FieldStoreDao fieldStoreDao = accountSqlDao.become(FieldStoreDao.class);
- fieldStoreDao.clear(accountId, objectType);
- fieldStoreDao.save(accountId, objectType, account.getFieldList());
+ @Override
+ public void deleteByKey(final String externalKey) throws AccountApiException {
+ try {
+ accountDao.inTransaction(new Transaction<Void, AccountSqlDao>() {
+ @Override
+ public Void inTransaction(final AccountSqlDao accountSqlDao, final TransactionStatus status) throws AccountApiException, EventBus.EventBusException {
- TagStoreDao tagStoreDao = fieldStoreDao.become(TagStoreDao.class);
- tagStoreDao.clear(accountId, objectType);
- tagStoreDao.save(accountId, objectType, account.getTagList());
+ accountSqlDao.deleteByKey(externalKey);
- AccountChangeNotification changeEvent = new DefaultAccountChangeNotification(account.getId(), currentAccount, account);
- if (changeEvent.hasChanges()) {
- eventBus.post(changeEvent);
+ return null;
}
- return null;
+ });
+ } catch (RuntimeException re) {
+ if (re.getCause() instanceof AccountApiException) {
+ throw (AccountApiException) re.getCause();
+ } else {
+ throw re;
}
- });
- }
+ }
+ }
@Override
public void test() {
@@ -148,14 +191,12 @@ public class DefaultAccountDao implements AccountDao {
account.clearFields();
if (fields != null) {
- for (CustomField field : fields) {
- account.setFieldValue(field.getName(), field.getValue());
- }
+ account.addFields(fields);
}
}
private void setTagsFromWithinTransaction(final Account account, final AccountSqlDao transactionalDao) {
- TagStoreDao tagStoreDao = transactionalDao.become(TagStoreDao.class);
+ TagStoreSqlDao tagStoreDao = transactionalDao.become(TagStoreSqlDao.class);
List<Tag> tags = tagStoreDao.load(account.getId().toString(), account.getObjectName());
account.clearTags();
@@ -163,4 +204,36 @@ public class DefaultAccountDao implements AccountDao {
account.addTags(tags);
}
}
+
+ private void saveTagsFromWithinTransaction(final Account account, final AccountSqlDao transactionalDao, final boolean isCreation) {
+ String accountId = account.getId().toString();
+ String objectType = account.getObjectName();
+
+ TagStoreSqlDao tagStoreDao = transactionalDao.become(TagStoreSqlDao.class);
+ if (!isCreation) {
+ tagStoreDao.clear(accountId, objectType);
+ }
+
+ List<Tag> tagList = account.getTagList();
+ if (tagList != null) {
+ tagStoreDao.save(accountId, objectType, tagList);
+ }
+ }
+
+ private void saveCustomFieldsFromWithinTransaction(final Account account, final AccountSqlDao transactionalDao, final boolean isCreation) {
+ String accountId = account.getId().toString();
+ String objectType = account.getObjectName();
+
+ FieldStoreDao fieldStoreDao = transactionalDao.become(FieldStoreDao.class);
+ if (!isCreation) {
+ fieldStoreDao.clear(accountId, objectType);
+ }
+
+ List<CustomField> fieldList = account.getFieldList();
+ if (fieldList != null) {
+ fieldStoreDao.save(accountId, objectType, fieldList);
+ }
+ }
+
+
}
diff --git a/account/src/main/java/com/ning/billing/account/glue/AccountModule.java b/account/src/main/java/com/ning/billing/account/glue/AccountModule.java
index 345e2a1..f6e51f4 100644
--- a/account/src/main/java/com/ning/billing/account/glue/AccountModule.java
+++ b/account/src/main/java/com/ning/billing/account/glue/AccountModule.java
@@ -16,15 +16,15 @@
package com.ning.billing.account.glue;
+import org.skife.config.ConfigurationObjectFactory;
+
import com.google.inject.AbstractModule;
import com.ning.billing.account.api.AccountService;
import com.ning.billing.account.api.AccountUserApi;
import com.ning.billing.account.api.DefaultAccountService;
import com.ning.billing.account.api.user.DefaultAccountUserApi;
import com.ning.billing.account.dao.AccountDao;
-import com.ning.billing.account.dao.AccountSqlDao;
import com.ning.billing.account.dao.DefaultAccountDao;
-import org.skife.config.ConfigurationObjectFactory;
public class AccountModule extends AbstractModule {
@@ -33,11 +33,11 @@ public class AccountModule extends AbstractModule {
bind(AccountConfig.class).toInstance(config);
}
- private void installAccountDao() {
+ protected void installAccountDao() {
bind(AccountDao.class).to(DefaultAccountDao.class).asEagerSingleton();
}
- private void installAccountUserApi() {
+ protected void installAccountUserApi() {
bind(AccountUserApi.class).to(DefaultAccountUserApi.class).asEagerSingleton();
}
diff --git a/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg b/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg
index 7c0e76e..7e93ff2 100644
--- a/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg
+++ b/account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg
@@ -1,45 +1,80 @@
group AccountDaoSql;
+accountFields(prefix) ::= <<
+ <prefix>id,
+ <prefix>external_key,
+ <prefix>email,
+ <prefix>name,
+ <prefix>first_name_length,
+ <prefix>currency,
+ <prefix>billing_cycle_day,
+ <prefix>payment_provider_name,
+ <prefix>time_zone,
+ <prefix>locale,
+ <prefix>address1,
+ <prefix>address2,
+ <prefix>company_name,
+ <prefix>city,
+ <prefix>state_or_province,
+ <prefix>country,
+ <prefix>postal_code,
+ <prefix>phone,
+ <prefix>created_dt,
+ <prefix>updated_dt
+>>
+
+
create() ::= <<
INSERT INTO accounts
- (id, external_key, email, name, first_name_length, phone, currency, billing_cycle_day, payment_provider_name)
+ (<accountFields()>)
VALUES
- (:id, :externalKey, :email, :name, :firstNameLength, :phone, :currency, :billingCycleDay, :paymentProviderName);
+ (:id, :externalKey, :email, :name, :firstNameLength, :currency, :billingCycleDay,
+ :paymentProviderName, :timeZone, :locale,
+ :address1, :address2, :companyName, :city, :stateOrProvince, :country, :postalCode, :phone,
+ :createdDate, :updatedDate);
>>
update() ::= <<
UPDATE accounts
- SET email = :email, name = :name, first_name_length = :firstNameLength, phone = :phone,
- currency = :currency, billing_cycle_day = :billingCycleDay, payment_provider_name = :paymentProviderName
+ SET external_key = :externalKey, email = :email, name = :name, first_name_length = :firstNameLength,
+ currency = :currency, billing_cycle_day = :billingCycleDay, payment_provider_name = :paymentProviderName,
+ time_zone = :timeZone, locale = :locale,
+ address1 = :address1, address2 = :address2, company_name = :companyName, city = :city, state_or_province = :stateOrProvince,
+ country = :country, postal_code = :postalCode, phone = :phone,
+ updated_dt = NOW()
WHERE id = :id;
>>
+deleteByKey() ::= <<
+ DELETE FROM accounts
+ WHERE external_key = :externalKey;
+>>
+
+
getAccountByKey() ::= <<
- select id, external_key, email, name, first_name_length, phone, currency, billing_cycle_day, payment_provider_name
+ select <accountFields()>
from accounts
where external_key = :externalKey;
>>
getById() ::= <<
- select
- a.id, a.external_key, a.email, a.name, a.first_name_length,
- a.phone, a.currency, a.billing_cycle_day, a.payment_provider_name
- from accounts a
- where a.id = :id;
+ SELECT <accountFields()>
+ FROM accounts
+ WHERE id = :id;
>>
get() ::= <<
- select id, external_key, email, name, first_name_length, phone, currency, billing_cycle_day, payment_provider_name
- from accounts;
+ SELECT <accountFields()>
+ FROM accounts;
>>
getIdFromKey() ::= <<
- select id
- from accounts
- where external_key = :externalKey;
+ SELECT id
+ FROM accounts
+ WHERE external_key = :externalKey;
>>
test() ::= <<
- select 1 from accounts;
+ SELECT 1 FROM accounts;
>>
;
\ No newline at end of file
diff --git a/account/src/main/resources/com/ning/billing/account/ddl.sql b/account/src/main/resources/com/ning/billing/account/ddl.sql
index ccfed72..58b47f0 100644
--- a/account/src/main/resources/com/ning/billing/account/ddl.sql
+++ b/account/src/main/resources/com/ning/billing/account/ddl.sql
@@ -5,11 +5,23 @@ CREATE TABLE accounts (
email varchar(50) NOT NULL,
name varchar(100) NOT NULL,
first_name_length int NOT NULL,
- phone varchar(13) DEFAULT NULL,
currency char(3) DEFAULT NULL,
billing_cycle_day int DEFAULT NULL,
payment_provider_name varchar(20) DEFAULT NULL,
+ time_zone varchar(50) DEFAULT NULL,
+ locale varchar(5) DEFAULT NULL,
+ address1 varchar(100) DEFAULT NULL,
+ address2 varchar(100) DEFAULT NULL,
+ company_name varchar(50) DEFAULT NULL,
+ city varchar(50) DEFAULT NULL,
+ state_or_province varchar(50) DEFAULT NULL,
+ country varchar(50) DEFAULT NULL,
+ postal_code varchar(11) DEFAULT NULL,
+ phone varchar(13) DEFAULT NULL,
+ created_dt datetime,
+ updated_dt datetime,
PRIMARY KEY(id)
) ENGINE=innodb;
CREATE UNIQUE INDEX accounts_external_key ON accounts(external_key);
-CREATE UNIQUE INDEX accounts_email ON accounts(email);
\ No newline at end of file
+CREATE UNIQUE INDEX accounts_email ON accounts(email);
+
diff --git a/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java b/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java
new file mode 100644
index 0000000..433a663
--- /dev/null
+++ b/account/src/test/java/com/ning/billing/account/api/MockAccountUserApi.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.account.api;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.joda.time.DateTimeZone;
+
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.customfield.CustomField;
+import com.ning.billing.util.tag.Tag;
+
+public class MockAccountUserApi implements AccountUserApi {
+ private final CopyOnWriteArrayList<Account> accounts = new CopyOnWriteArrayList<Account>();
+
+ public Account createAccount(UUID id,
+ String externalKey,
+ String email,
+ String name,
+ int firstNameLength,
+ Currency currency,
+ int billCycleDay,
+ String paymentProviderName,
+ BigDecimal balance,
+ 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) {
+
+ Account result = new DefaultAccount(id, externalKey, email, name,
+ firstNameLength, currency, billCycleDay, paymentProviderName,
+ timeZone, locale, address1, address2, companyName, city,
+ stateOrProvince, country, postalCode, phone, null, null);
+ accounts.add(result);
+ return result;
+ }
+
+ @Override
+ public Account createAccount(AccountData data, List<CustomField> fields, List<Tag> tags) throws AccountApiException {
+ Account result = new DefaultAccount(data);
+ accounts.add(result);
+ return result;
+ }
+
+ @Override
+ public Account getAccountByKey(String key) {
+ for (Account account : accounts) {
+ if (key.equals(account.getExternalKey())) {
+ return account;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public Account getAccountById(UUID uid) {
+ for (Account account : accounts) {
+ if (uid.equals(account.getId())) {
+ return account;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public List<Account> getAccounts() {
+ return new ArrayList<Account>(accounts);
+ }
+
+ @Override
+ public UUID getIdFromKey(String externalKey) {
+ for (Account account : accounts) {
+ if (externalKey.equals(account.getExternalKey())) {
+ return account.getId();
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void updateAccount(Account account) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void deleteAccountByKey(String externalKey)
+ throws AccountApiException {
+ for (Account account : accounts) {
+ if (externalKey.equals(account.getExternalKey())) {
+ accounts.remove(account.getId());
+ }
+ }
+
+ }
+}
diff --git a/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java b/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
index b18a41b..0a1c642 100644
--- a/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
+++ b/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
@@ -16,23 +16,24 @@
package com.ning.billing.account.dao;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Stage;
-import com.ning.billing.account.glue.AccountModuleMock;
-import com.ning.billing.util.eventbus.DefaultEventBusService;
-import com.ning.billing.util.eventbus.EventBusService;
+import static org.testng.Assert.fail;
+
+import java.io.IOException;
+
import org.apache.commons.io.IOUtils;
import org.skife.jdbi.v2.IDBI;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
-import java.io.IOException;
-
-import static org.testng.Assert.fail;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Stage;
+import com.ning.billing.account.glue.AccountModuleWithEmbeddedDb;
+import com.ning.billing.util.eventbus.DefaultEventBusService;
+import com.ning.billing.util.eventbus.EventBusService;
public abstract class AccountDaoTestBase {
- protected AccountModuleMock module;
+ protected AccountModuleWithEmbeddedDb module;
protected AccountDao accountDao;
protected IDBI dbi;
@@ -40,14 +41,12 @@ public abstract class AccountDaoTestBase {
protected void setup() throws IOException {
// Health check test to make sure MySQL is setup properly
try {
- module = new AccountModuleMock();
+ module = new AccountModuleWithEmbeddedDb();
final String accountDdl = IOUtils.toString(AccountSqlDao.class.getResourceAsStream("/com/ning/billing/account/ddl.sql"));
- final String invoiceDdl = IOUtils.toString(AccountSqlDao.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
final String utilDdl = IOUtils.toString(AccountSqlDao.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
module.startDb();
module.initDb(accountDdl);
- module.initDb(invoiceDdl);
module.initDb(utilDdl);
final Injector injector = Guice.createInjector(Stage.DEVELOPMENT, module);
diff --git a/account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java b/account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
new file mode 100644
index 0000000..d80a05e
--- /dev/null
+++ b/account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.account.dao;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.google.inject.Inject;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountApiException;
+import com.ning.billing.account.api.AccountChangeNotification;
+import com.ning.billing.account.api.user.DefaultAccountChangeNotification;
+import com.ning.billing.account.api.user.DefaultAccountCreationEvent;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
+
+public class MockAccountDao implements AccountDao {
+ private final EventBus eventBus;
+ private final Map<String, Account> accounts = new ConcurrentHashMap<String, Account>();
+
+ @Inject
+ public MockAccountDao(EventBus eventBus) {
+ this.eventBus = eventBus;
+ }
+
+ @Override
+ public void create(Account account) {
+ accounts.put(account.getId().toString(), account);
+
+ try {
+ eventBus.post(new DefaultAccountCreationEvent(account));
+ }
+ catch (EventBusException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ @Override
+ public Account getById(String id) {
+ return accounts.get(id);
+ }
+
+ @Override
+ public List<Account> get() {
+ return new ArrayList<Account>(accounts.values());
+ }
+
+ @Override
+ public void test() {
+ }
+
+ @Override
+ public Account getAccountByKey(String key) {
+ for (Account account : accounts.values()) {
+ if (key.equals(account.getExternalKey())) {
+ return account;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public UUID getIdFromKey(String externalKey) {
+ Account account = getAccountByKey(externalKey);
+ return account == null ? null : account.getId();
+ }
+
+ @Override
+ public void update(Account account) {
+ Account currentAccount = accounts.put(account.getId().toString(), account);
+
+ AccountChangeNotification changeEvent = new DefaultAccountChangeNotification(account.getId(), currentAccount, account);
+ if (changeEvent.hasChanges()) {
+ try {
+ eventBus.post(changeEvent);
+ }
+ catch (EventBusException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ }
+
+ @Override
+ public void deleteByKey(String externalKey) throws AccountApiException {
+ for (Account account : accounts.values()) {
+ if (externalKey.equals(account.getExternalKey())) {
+ accounts.remove(account.getId());
+ }
+ }
+ }
+}
diff --git a/account/src/test/java/com/ning/billing/account/dao/TestSimpleAccountDao.java b/account/src/test/java/com/ning/billing/account/dao/TestSimpleAccountDao.java
index a4b0b98..fd5350b 100644
--- a/account/src/test/java/com/ning/billing/account/dao/TestSimpleAccountDao.java
+++ b/account/src/test/java/com/ning/billing/account/dao/TestSimpleAccountDao.java
@@ -16,45 +16,60 @@
package com.ning.billing.account.dao;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
import java.util.List;
import java.util.UUID;
+
import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
import org.testng.annotations.Test;
+
import com.ning.billing.account.api.Account;
import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.account.api.AccountData;
import com.ning.billing.account.api.DefaultAccount;
-import com.ning.billing.util.tag.DefaultTagDescription;
-import com.ning.billing.util.tag.Tag;
-import com.ning.billing.util.tag.TagDescription;
import com.ning.billing.account.api.user.AccountBuilder;
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.util.clock.DefaultClock;
-import com.ning.billing.util.tag.dao.TagDescriptionDao;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import com.ning.billing.util.tag.DefaultTagDefinition;
+import com.ning.billing.util.tag.Tag;
+import com.ning.billing.util.tag.TagDefinition;
+import com.ning.billing.util.tag.dao.TagDefinitionSqlDao;
@Test(groups = {"account-dao"})
public class TestSimpleAccountDao extends AccountDaoTestBase {
- private final String key = "test1234";
- private final String firstName = "Wesley";
- private final String email = "me@me.com";
-
private DefaultAccount createTestAccount() {
- String thisKey = key + UUID.randomUUID().toString();
+ String thisKey = "test" + UUID.randomUUID().toString();
String lastName = UUID.randomUUID().toString();
- String thisEmail = email + " " + UUID.randomUUID();
+ String thisEmail = "me@me.com" + " " + UUID.randomUUID();
+ String firstName = "Bob";
String name = firstName + " " + lastName;
String phone = "123-456-7890";
+ String locale = "EN-US";
+ DateTimeZone timeZone = DateTimeZone.forID("America/Los_Angeles");
+
+ DateTime createdDate = new DateTime(DateTimeZone.UTC);
+ DateTime updatedDate = new DateTime(DateTimeZone.UTC);
int firstNameLength = firstName.length();
- return new AccountBuilder().externalKey(thisKey).name(name).phone(phone).firstNameLength(firstNameLength)
- .email(thisEmail).currency(Currency.USD).build();
+ return new AccountBuilder().externalKey(thisKey)
+ .name(name)
+ .phone(phone)
+ .firstNameLength(firstNameLength)
+ .email(thisEmail)
+ .currency(Currency.USD)
+ .locale(locale)
+ .timeZone(timeZone)
+ .createdDate(createdDate)
+ .updatedDate(updatedDate)
+ .build();
}
- public void testBasic() {
+ public void testBasic() throws AccountApiException {
Account a = createTestAccount();
accountDao.create(a);
@@ -93,7 +108,7 @@ public class TestSimpleAccountDao extends AccountDaoTestBase {
}
@Test
- public void testCustomFields() {
+ public void testCustomFields() throws AccountApiException {
Account account = createTestAccount();
String fieldName = "testField1";
String fieldValue = "testField1_value";
@@ -108,15 +123,15 @@ public class TestSimpleAccountDao extends AccountDaoTestBase {
}
@Test
- public void testTags() {
+ public void testTags() throws AccountApiException {
Account account = createTestAccount();
- TagDescription description = new DefaultTagDescription("Test Tag", "For testing only", true, true, "Test System", new DateTime());
- TagDescriptionDao tagDescriptionDao = dbi.onDemand(TagDescriptionDao.class);
- tagDescriptionDao.create(description);
+ TagDefinition definition = new DefaultTagDefinition("Test Tag", "For testing only", "Test System", new DateTime());
+ TagDefinitionSqlDao tagDescriptionDao = dbi.onDemand(TagDefinitionSqlDao.class);
+ tagDescriptionDao.create(definition);
String addedBy = "testTags()";
DateTime dateAdded = new DefaultClock().getUTCNow();
- account.addTag(description, addedBy, dateAdded);
+ account.addTag(definition, addedBy, dateAdded);
assertEquals(account.getTagList().size(), 1);
accountDao.create(account);
@@ -124,25 +139,31 @@ public class TestSimpleAccountDao extends AccountDaoTestBase {
List<Tag> tagList = thisAccount.getTagList();
assertEquals(tagList.size(), 1);
Tag tag = tagList.get(0);
- assertEquals(tag.getName(), description.getName());
- assertEquals(tag.getGenerateInvoice(), description.getGenerateInvoice());
- assertEquals(tag.getProcessPayment(), description.getProcessPayment());
- assertEquals(tag.getTagDescriptionId(), description.getId());
+ assertEquals(tag.getTagDefinitionName(), definition.getName());
assertEquals(tag.getAddedBy(), addedBy);
- assertEquals(tag.getDateAdded().compareTo(dateAdded), 0);
+ assertEquals(tag.getAddedDate().compareTo(dateAdded), 0);
}
@Test
- public void testGetIdFromKey() {
+ public void testGetIdFromKey() throws AccountApiException {
Account account = createTestAccount();
accountDao.create(account);
- UUID accountId = accountDao.getIdFromKey(account.getExternalKey());
- assertEquals(accountId, account.getId());
+ try {
+ UUID accountId = accountDao.getIdFromKey(account.getExternalKey());
+ assertEquals(accountId, account.getId());
+ } catch (AccountApiException a) {
+ fail("Retrieving account failed.");
+ }
+ }
+
+ @Test(expectedExceptions = AccountApiException.class)
+ public void testGetIdFromKeyForNullKey() throws AccountApiException {
+ accountDao.getIdFromKey(null);
}
@Test
- public void testUpdate() throws AccountApiException {
+ public void testUpdate() throws Exception {
final Account account = createTestAccount();
accountDao.create(account);
@@ -151,37 +172,87 @@ public class TestSimpleAccountDao extends AccountDaoTestBase {
public String getExternalKey() {
return account.getExternalKey();
}
+
@Override
public String getName() {
return "Jane Doe";
}
+
@Override
public int getFirstNameLength() {
return 4;
}
+
@Override
public String getEmail() {
return account.getEmail();
}
+
@Override
public String getPhone() {
return account.getPhone();
}
+
@Override
public int getBillCycleDay() {
return account.getBillCycleDay();
}
+
@Override
public Currency getCurrency() {
return account.getCurrency();
}
+
@Override
public String getPaymentProviderName() {
return account.getPaymentProviderName();
}
+ @Override
+ public DateTimeZone getTimeZone() {
+ return DateTimeZone.forID("Australia/Darwin");
+ }
+
+ @Override
+ public String getLocale() {
+ return "FR-CA";
+ }
+ @Override
+ public String getAddress1() {
+ return null;
+ }
+
+ @Override
+ public String getAddress2() {
+ return null;
+ }
+
+ @Override
+ public String getCompanyName() {
+ return null;
+ }
+
+ @Override
+ public String getCity() {
+ return null;
+ }
+
+ @Override
+ public String getStateOrProvince() {
+ return null;
+ }
+
+ @Override
+ public String getPostalCode() {
+ return null;
+ }
+
+ @Override
+ public String getCountry() {
+ return null;
+ }
};
- Account updatedAccount = new DefaultAccount(account.getId(), accountData);
+ Account updatedAccount = new DefaultAccount(account.getId(), accountData, null, null);
accountDao.update(updatedAccount);
Account savedAccount = accountDao.getAccountByKey(account.getExternalKey());
@@ -189,10 +260,124 @@ public class TestSimpleAccountDao extends AccountDaoTestBase {
assertNotNull(savedAccount);
assertEquals(savedAccount.getName(), updatedAccount.getName());
assertEquals(savedAccount.getEmail(), updatedAccount.getEmail());
- assertEquals(savedAccount.getPhone(), updatedAccount.getPhone());
assertEquals(savedAccount.getPaymentProviderName(), updatedAccount.getPaymentProviderName());
assertEquals(savedAccount.getBillCycleDay(), updatedAccount.getBillCycleDay());
assertEquals(savedAccount.getFirstNameLength(), updatedAccount.getFirstNameLength());
+ assertEquals(savedAccount.getTimeZone(), updatedAccount.getTimeZone());
+ assertEquals(savedAccount.getLocale(), updatedAccount.getLocale());
+ assertEquals(savedAccount.getAddress1(), updatedAccount.getAddress1());
+ assertEquals(savedAccount.getAddress2(), updatedAccount.getAddress2());
+ assertEquals(savedAccount.getCity(), updatedAccount.getCity());
+ assertEquals(savedAccount.getStateOrProvince(), updatedAccount.getStateOrProvince());
+ assertEquals(savedAccount.getCountry(), updatedAccount.getCountry());
+ assertEquals(savedAccount.getPostalCode(), updatedAccount.getPostalCode());
+ assertEquals(savedAccount.getPhone(), updatedAccount.getPhone());
+ }
+
+ @Test
+ public void testAddingContactInformation() throws Exception {
+ UUID accountId = UUID.randomUUID();
+ DefaultAccount account = new DefaultAccount(accountId, "extKey123456", "myemail123456@glam.com",
+ "John Smith", 4, Currency.USD, 15, null,
+ DateTimeZone.forID("America/Cambridge_Bay"), "EN-CA",
+ null, null, null, null, null, null, null, null,null,null);
+ accountDao.create(account);
+
+ String address1 = "123 address 1";
+ String address2 = "456 address 2";
+ String companyName = "Some Company";
+ String city = "Cambridge Bay";
+ String stateOrProvince = "Nunavut";
+ String country = "Canada";
+ String postalCode = "X0B 0C0";
+ String phone = "18001112222";
+
+ DefaultAccount updatedAccount = new DefaultAccount(accountId, "extKey123456", "myemail123456@glam.com",
+ "John Smith", 4, Currency.USD, 15, null,
+ DateTimeZone.forID("America/Cambridge_Bay"), "EN-CA",
+ address1, address2, companyName, city, stateOrProvince, country,
+ postalCode, phone, null,null);
+
+ accountDao.update(updatedAccount);
+
+ Account savedAccount = accountDao.getById(accountId.toString());
+
+ assertNotNull(savedAccount);
+ assertEquals(savedAccount.getId(), accountId);
+ assertEquals(savedAccount.getAddress1(), address1);
+ assertEquals(savedAccount.getAddress2(), address2);
+ assertEquals(savedAccount.getCompanyName(), companyName);
+ assertEquals(savedAccount.getCity(), city);
+ assertEquals(savedAccount.getStateOrProvince(), stateOrProvince);
+ assertEquals(savedAccount.getCity(), city);
+ assertEquals(savedAccount.getPostalCode(), postalCode);
+ assertEquals(savedAccount.getPhone(), phone);
+ }
+
+ @Test
+ public void testRemovingContactInformation() throws Exception {
+ UUID accountId = UUID.randomUUID();
+
+ DefaultAccount account = new DefaultAccount(accountId, "extKey654321", "myemail654321@glam.com",
+ "John Smith", 4, Currency.USD, 15, null,
+ DateTimeZone.forID("America/Cambridge_Bay"), "EN-CA",
+ "123 address 1", "456 address 2", null, "Cambridge Bay",
+ "Nunavut", "Canada", "X0B 0C0", "18001112222", null, null);
+ accountDao.create(account);
+ DefaultAccount updatedAccount = new DefaultAccount(accountId, "extKey654321", "myemail654321@glam.com",
+ "John Smith", 4, Currency.USD, 15, null,
+ DateTimeZone.forID("America/Cambridge_Bay"), "EN-CA",
+ null, null, null, null, null, null, null, null, null, null);
+
+ accountDao.update(updatedAccount);
+
+ Account savedAccount = accountDao.getById(accountId.toString());
+
+ assertNotNull(savedAccount);
+ assertEquals(savedAccount.getId(), accountId);
+ assertEquals(savedAccount.getAddress1(), null);
+ assertEquals(savedAccount.getAddress2(), null);
+ assertEquals(savedAccount.getCompanyName(), null);
+ assertEquals(savedAccount.getCity(), null);
+ assertEquals(savedAccount.getStateOrProvince(), null);
+ assertEquals(savedAccount.getCity(), null);
+ assertEquals(savedAccount.getPostalCode(), null);
+ assertEquals(savedAccount.getPhone(), null);
+ }
+
+ @Test(expectedExceptions = AccountApiException.class)
+ public void testExternalKeyCannotBeUpdated() throws Exception {
+ UUID accountId = UUID.randomUUID();
+ String originalExternalKey = "extKey1337";
+
+ DefaultAccount account = new DefaultAccount(accountId, originalExternalKey, "myemail1337@glam.com",
+ "John Smith", 4, Currency.USD, 15, null,
+ null, null, null, null, null, null, null, null, null, null, null, null);
+ accountDao.create(account);
+
+ DefaultAccount updatedAccount = new DefaultAccount(accountId, "extKey1338", "myemail1337@glam.com",
+ "John Smith", 4, Currency.USD, 15, null,
+ null, null, null, null, null, null, null, null, null, null,null, null);
+ accountDao.update(updatedAccount);
}
+
+ @Test(groups={"slow"},enabled=true)
+ public void testDelete() throws AccountApiException {
+
+ Account a = createTestAccount();
+ accountDao.create(a);
+ String key = a.getExternalKey();
+
+ Account r = accountDao.getAccountByKey(key);
+ assertNotNull(r);
+ assertEquals(r.getExternalKey(), a.getExternalKey());
+
+ accountDao.deleteByKey(key);
+
+ Account s = accountDao.getAccountByKey(key);
+ assertTrue(s==null);
+
+ }
+
}
diff --git a/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java b/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
new file mode 100644
index 0000000..fb72404
--- /dev/null
+++ b/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.account.glue;
+
+import com.ning.billing.account.dao.AccountDao;
+import com.ning.billing.account.dao.MockAccountDao;
+
+public class AccountModuleWithMocks extends AccountModule {
+ @Override
+ protected void installAccountDao() {
+ bind(MockAccountDao.class).asEagerSingleton();
+ bind(AccountDao.class).to(MockAccountDao.class);
+ }
+}
analytics/pom.xml 2(+1 -1)
diff --git a/analytics/pom.xml b/analytics/pom.xml
index 278348b..4cd7332 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-analytics</artifactId>
diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
index 23fbcf4..f7081c7 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
@@ -50,7 +50,7 @@ public class BusinessAccountRecorder
final List<String> tags = new ArrayList<String>();
for (final Tag tag : account.getTagList()) {
- tags.add(tag.getName());
+ tags.add(tag.getTagDefinitionName());
}
// TODO Need payment and invoice api to fill most fields
diff --git a/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java b/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
index c146de7..621243f 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
@@ -48,10 +48,10 @@ import com.ning.billing.entitlement.api.user.SubscriptionTransitionData;
import com.ning.billing.entitlement.events.EntitlementEvent;
import com.ning.billing.entitlement.events.user.ApiEventType;
import com.ning.billing.util.eventbus.EventBus;
-import com.ning.billing.util.tag.DefaultTag;
-import com.ning.billing.util.tag.DefaultTagDescription;
+import com.ning.billing.util.tag.DescriptiveTag;
+import com.ning.billing.util.tag.DefaultTagDefinition;
import com.ning.billing.util.tag.Tag;
-import com.ning.billing.util.tag.dao.TagDescriptionDao;
+import com.ning.billing.util.tag.dao.TagDefinitionSqlDao;
import org.apache.commons.io.IOUtils;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
@@ -74,8 +74,8 @@ public class TestAnalyticsService
{
private static final String KEY = "12345";
private static final String ACCOUNT_KEY = "pierre-12345";
- private static final DefaultTagDescription TAG_ONE = new DefaultTagDescription("batch20", "something", false, false, "pierre", new DateTime(DateTimeZone.UTC));
- private static final DefaultTagDescription TAG_TWO = new DefaultTagDescription("awesome", "something", false, false, "pierre", new DateTime(DateTimeZone.UTC));
+ private static final DefaultTagDefinition TAG_ONE = new DefaultTagDefinition("batch20", "something", "pierre", new DateTime(DateTimeZone.UTC));
+ private static final DefaultTagDefinition TAG_TWO = new DefaultTagDefinition("awesome", "something", "pierre", new DateTime(DateTimeZone.UTC));
@Inject
private AccountUserApi accountApi;
@@ -84,7 +84,7 @@ public class TestAnalyticsService
private EntitlementUserApi entitlementApi;
@Inject
- private TagDescriptionDao tagDao;
+ private TagDefinitionSqlDao tagDao;
@Inject
private AnalyticsService service;
@@ -118,8 +118,8 @@ public class TestAnalyticsService
final MockAccount account = new MockAccount(UUID.randomUUID(), ACCOUNT_KEY, Currency.USD);
try {
List<Tag> tags = new ArrayList<Tag>();
- tags.add(new DefaultTag(TAG_ONE, "pierre", new DateTime(DateTimeZone.UTC)));
- tags.add(new DefaultTag(TAG_TWO, "pierre", new DateTime(DateTimeZone.UTC)));
+ tags.add(new DescriptiveTag(TAG_ONE, "pierre", new DateTime(DateTimeZone.UTC)));
+ tags.add(new DescriptiveTag(TAG_TWO, "pierre", new DateTime(DateTimeZone.UTC)));
final Account storedAccount = accountApi.createAccount(account, null, tags);
diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/MockBusinessAccountDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/MockBusinessAccountDao.java
new file mode 100644
index 0000000..f3dead0
--- /dev/null
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/MockBusinessAccountDao.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.analytics.dao;
+
+import com.ning.billing.analytics.BusinessAccount;
+
+public class MockBusinessAccountDao implements BusinessAccountDao {
+
+ @Override
+ public BusinessAccount getAccount(String key) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public int createAccount(BusinessAccount account) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public int saveAccount(BusinessAccount account) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public void test() {
+ }
+}
diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockAccount.java b/analytics/src/test/java/com/ning/billing/analytics/MockAccount.java
index 3b38c8c..d57de25 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockAccount.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockAccount.java
@@ -16,18 +16,18 @@
package com.ning.billing.analytics;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
-import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
+
+import org.apache.commons.lang.NotImplementedException;
import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
import com.ning.billing.account.api.Account;
-import com.ning.billing.account.api.AccountData;
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.util.customfield.CustomField;
import com.ning.billing.util.tag.Tag;
-import com.ning.billing.util.tag.TagDescription;
+import com.ning.billing.util.tag.TagDefinition;
public class MockAccount implements Account
{
@@ -88,6 +88,51 @@ public class MockAccount implements Account
}
@Override
+ public DateTimeZone getTimeZone() {
+ return DateTimeZone.forID("Pacific/Fiji");
+ }
+
+ @Override
+ public String getLocale() {
+ return "EN-US";
+ }
+
+ @Override
+ public String getAddress1() {
+ return null;
+ }
+
+ @Override
+ public String getAddress2() {
+ return null;
+ }
+
+ @Override
+ public String getCompanyName() {
+ return null;
+ }
+
+ @Override
+ public String getCity() {
+ return null;
+ }
+
+ @Override
+ public String getStateOrProvince() {
+ return null;
+ }
+
+ @Override
+ public String getPostalCode() {
+ return null;
+ }
+
+ @Override
+ public String getCountry() {
+ return null;
+ }
+
+ @Override
public UUID getId()
{
return id;
@@ -134,7 +179,7 @@ public class MockAccount implements Account
}
@Override
- public void addTag(TagDescription description, String addedBy, DateTime dateAdded) {
+ public void addTag(TagDefinition definition, String addedBy, DateTime dateAdded) {
throw new NotImplementedException();
}
@@ -149,7 +194,7 @@ public class MockAccount implements Account
}
@Override
- public void removeTag(TagDescription description) {
+ public void removeTag(TagDefinition definition) {
throw new NotImplementedException();
}
@@ -164,7 +209,13 @@ public class MockAccount implements Account
}
@Override
- public BigDecimal getBalance() {
- return BigDecimal.ZERO;
+ public DateTime getCreatedDate() {
+ return new DateTime(DateTimeZone.UTC);
}
+
+ @Override
+ public DateTime getUpdatedDate() {
+ return new DateTime(DateTimeZone.UTC);
+ }
+
}
diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockIAccountUserApi.java b/analytics/src/test/java/com/ning/billing/analytics/MockIAccountUserApi.java
index 791d191..2ce98b8 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockIAccountUserApi.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockIAccountUserApi.java
@@ -16,12 +16,10 @@
package com.ning.billing.analytics;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
import java.util.List;
import java.util.UUID;
+
import com.ning.billing.account.api.Account;
-import com.ning.billing.account.api.AccountApiException;
import com.ning.billing.account.api.AccountData;
import com.ning.billing.account.api.AccountUserApi;
import com.ning.billing.account.api.DefaultAccount;
@@ -72,4 +70,9 @@ public class MockIAccountUserApi implements AccountUserApi
public UUID getIdFromKey(String externalKey) {
return id;
}
+
+ @Override
+ public void deleteAccountByKey(String externalKey) {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockIEntitlementUserApi.java b/analytics/src/test/java/com/ning/billing/analytics/MockIEntitlementUserApi.java
index 12b6f77..bde1bcb 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockIEntitlementUserApi.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockIEntitlementUserApi.java
@@ -115,4 +115,9 @@ public class MockIEntitlementUserApi implements EntitlementUserApi
public SubscriptionBundle getBundleForKey(String bundleKey) {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public DateTime getNextBillingDate(UUID account) {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java b/analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java
index 6420325..7197ec6 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java
@@ -137,4 +137,14 @@ public class MockSubscription implements Subscription
public SubscriptionTransition getPendingTransition() {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public DateTime getChargedThroughDate() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public DateTime getPaidThroughDate() {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessAccount.java b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessAccount.java
index 5bdba44..7696723 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessAccount.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessAccount.java
@@ -34,7 +34,7 @@ public class TestBusinessAccount
account = new BusinessAccount("pierre", BigDecimal.ONE, Collections.singletonList("batch15"), new DateTime(), BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "");
}
- @Test(groups = "fast")
+ @Test(groups = "fast", enabled = false)
public void testEquals() throws Exception
{
Assert.assertSame(account, account);
api/pom.xml 10(+9 -1)
diff --git a/api/pom.xml b/api/pom.xml
index dce65e7..89f3a43 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-api</artifactId>
@@ -50,6 +50,14 @@
<groupId>org.skife.config</groupId>
<artifactId>config-magic</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/api/src/main/java/com/ning/billing/account/api/Account.java b/api/src/main/java/com/ning/billing/account/api/Account.java
index 543f280..68909c3 100644
--- a/api/src/main/java/com/ning/billing/account/api/Account.java
+++ b/api/src/main/java/com/ning/billing/account/api/Account.java
@@ -16,10 +16,15 @@
package com.ning.billing.account.api;
-import java.math.BigDecimal;
+import org.joda.time.DateTime;
+
import com.ning.billing.util.customfield.CustomizableEntity;
import com.ning.billing.util.tag.Taggable;
public interface Account extends AccountData, CustomizableEntity, Taggable {
- public BigDecimal getBalance();
+
+ public DateTime getCreatedDate();
+
+ public DateTime getUpdatedDate();
+
}
diff --git a/api/src/main/java/com/ning/billing/account/api/AccountData.java b/api/src/main/java/com/ning/billing/account/api/AccountData.java
index 9b8f399..654400b 100644
--- a/api/src/main/java/com/ning/billing/account/api/AccountData.java
+++ b/api/src/main/java/com/ning/billing/account/api/AccountData.java
@@ -16,8 +16,9 @@
package com.ning.billing.account.api;
+import org.joda.time.DateTimeZone;
+
import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.entity.Entity;
public interface AccountData {
@@ -29,11 +30,29 @@ public interface AccountData {
public String getEmail();
- public String getPhone();
-
public int getBillCycleDay();
public Currency getCurrency();
public String getPaymentProviderName();
+
+ public DateTimeZone getTimeZone();
+
+ public String getLocale();
+
+ public String getAddress1();
+
+ public String getAddress2();
+
+ public String getCompanyName();
+
+ public String getCity();
+
+ public String getStateOrProvince();
+
+ public String getPostalCode();
+
+ public String getCountry();
+
+ public String getPhone();
}
diff --git a/api/src/main/java/com/ning/billing/account/api/AccountUserApi.java b/api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
index a535ada..fcdbcd9 100644
--- a/api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
+++ b/api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
@@ -19,13 +19,19 @@ package com.ning.billing.account.api;
import java.util.List;
import java.util.UUID;
import com.ning.billing.util.customfield.CustomField;
+import com.ning.billing.util.eventbus.EventBus;
import com.ning.billing.util.tag.Tag;
public interface AccountUserApi {
public Account createAccount(AccountData data, List<CustomField> fields, List<Tag> tags) throws AccountApiException;
- public void updateAccount(Account account);
+ /***
+ *
+ * Note: does not update the external key
+ * @param account
+ */
+ public void updateAccount(Account account) throws AccountApiException;
public Account getAccountByKey(String key);
@@ -33,5 +39,7 @@ public interface AccountUserApi {
public List<Account> getAccounts();
- public UUID getIdFromKey(String externalKey);
+ public UUID getIdFromKey(String externalKey) throws AccountApiException;
+
+ public void deleteAccountByKey(String externalKey) throws AccountApiException;
}
diff --git a/api/src/main/java/com/ning/billing/account/api/ControlTagType.java b/api/src/main/java/com/ning/billing/account/api/ControlTagType.java
new file mode 100644
index 0000000..23c23ae
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/account/api/ControlTagType.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.account.api;
+
+public enum ControlTagType {
+ AUTO_BILLING_OFF("Suspends billing until removed.", true, false),
+ AUTO_INVOICING_OFF("Suspends invoicing until removed.", false, true);
+
+ private final String description;
+ private final boolean autoPaymentOff;
+ private final boolean autoInvoicingOff;
+
+ ControlTagType(final String description, final boolean autoPaymentOff, final boolean autoInvoicingOff) {
+ this.description = description;
+ this.autoPaymentOff = autoPaymentOff;
+ this.autoInvoicingOff = autoInvoicingOff;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public boolean autoPaymentOff() {
+ return this.autoPaymentOff;
+ }
+
+ public boolean autoInvoicingOff() {
+ return this.autoInvoicingOff;
+ }
+}
diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java b/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
index 22b9830..1867cfe 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/EntitlementUserApi.java
@@ -42,4 +42,5 @@ public interface EntitlementUserApi {
public Subscription createSubscription(UUID bundleId, PlanPhaseSpecifier spec, DateTime requestedDate)
throws EntitlementUserApiException;
+ public DateTime getNextBillingDate(UUID account);
}
diff --git a/api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java b/api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
index d19de5f..41ecd78 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java
@@ -64,6 +64,11 @@ public interface Subscription {
public String getCurrentPriceList();
public PlanPhase getCurrentPhase();
+
+ public DateTime getChargedThroughDate();
+
+ public DateTime getPaidThroughDate();
+
public List<SubscriptionTransition> getActiveTransitions();
diff --git a/api/src/main/java/com/ning/billing/ErrorCode.java b/api/src/main/java/com/ning/billing/ErrorCode.java
index 254df9f..d1f5ed9 100644
--- a/api/src/main/java/com/ning/billing/ErrorCode.java
+++ b/api/src/main/java/com/ning/billing/ErrorCode.java
@@ -102,9 +102,24 @@ public enum ErrorCode {
*
*/
ACCOUNT_ALREADY_EXISTS(3000, "Account already exists for key %s"),
- ACCOUNT_INVALID_NAME(3001, "An invalid name was specified when creating or updating an account.")
+ ACCOUNT_INVALID_NAME(3001, "An invalid name was specified when creating or updating an account."),
+ ACCOUNT_DOES_NOT_EXIST_FOR_ID(3002, "Account does not exist for id %s"),
+ ACCOUNT_DOES_NOT_EXIST_FOR_KEY(3003, "Account does not exist for key %s"),
+ ACCOUNT_CANNOT_MAP_NULL_KEY(3004, "An attempt was made to get the id for a <null> external key."),
+ ACCOUNT_CANNOT_CHANGE_EXTERNAL_KEY(3005, "External keys cannot be updated. Original key remains: %s"),
+
+ /*
+ *
+ * Range 3900: Tag definitions
+ *
+ */
+ TAG_DEFINITION_CONFLICTS_WITH_CONTROL_TAG(3900, "The tag definition name conflicts with a reserved name (name %s)"),
+ TAG_DEFINITION_ALREADY_EXISTS(3901, "The tag definition name already exists (name: %s)"),
+ TAG_DEFINITION_DOES_NOT_EXIST(3902, "The tag definition name does not exist (name: %s)"),
+ TAG_DEFINITION_IN_USE(3903, "The tag definition name is currently in use (name: %s)")
;
+
private int code;
private String format;
diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java b/api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java
index 89c0d87..5ecd311 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java
@@ -16,17 +16,19 @@
package com.ning.billing.invoice.api;
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.util.eventbus.EventBusNotification;
-import org.joda.time.DateTime;
-
import java.math.BigDecimal;
import java.util.UUID;
+import org.joda.time.DateTime;
+
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.util.eventbus.EventBusNotification;
+
public interface InvoiceCreationNotification extends EventBusNotification {
public UUID getInvoiceId();
public UUID getAccountId();
public BigDecimal getAmountOwed();
public Currency getCurrency();
public DateTime getInvoiceCreationDate();
+
}
\ No newline at end of file
diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoicePaymentApi.java b/api/src/main/java/com/ning/billing/invoice/api/InvoicePaymentApi.java
index bde12a9..aaa89a5 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoicePaymentApi.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoicePaymentApi.java
@@ -16,19 +16,29 @@
package com.ning.billing.invoice.api;
-import com.ning.billing.catalog.api.Currency;
-
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
+
import org.joda.time.DateTime;
-public interface InvoicePaymentApi {
- public void paymentSuccessful(UUID invoiceId, BigDecimal amount, Currency currency, UUID paymentId, DateTime paymentAttemptDate);
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.payment.api.InvoicePayment;
- public void paymentFailed(UUID invoiceId, UUID paymentId, DateTime paymentAttemptDate);
+public interface InvoicePaymentApi {
public List<Invoice> getInvoicesByAccount(UUID accountId);
public Invoice getInvoice(UUID invoiceId);
+
+ public Invoice getInvoiceForPaymentAttemptId(UUID paymentAttemptId);
+
+ public InvoicePayment getInvoicePayment(UUID paymentAttemptId);
+
+ public void notifyOfPaymentAttempt(InvoicePayment invoicePayment);
+
+ public void notifyOfPaymentAttempt(UUID invoiceId, BigDecimal amountOutstanding, Currency currency, UUID paymentAttemptId, DateTime paymentAttemptDate);
+
+ public void notifyOfPaymentAttempt(UUID invoiceId, UUID paymentAttemptId, DateTime paymentAttemptDate);
+
}
diff --git a/api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java b/api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
index 2c8d02e..94b28e5 100644
--- a/api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
+++ b/api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
@@ -16,12 +16,13 @@
package com.ning.billing.invoice.api;
-import org.joda.time.DateTime;
-
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
-import com.ning.billing.catalog.api.Currency;
+
+import org.joda.time.DateTime;
+
+import com.ning.billing.payment.api.InvoicePayment;
public interface InvoiceUserApi {
public List<UUID> getInvoicesForPayment(DateTime targetDate, int numberOfDays);
@@ -30,8 +31,13 @@ public interface InvoiceUserApi {
public Invoice getInvoice(UUID invoiceId);
- public void paymentAttemptFailed(UUID invoiceId, UUID paymentId, DateTime paymentAttemptDate);
+ public void notifyOfPaymentAttempt(InvoicePayment invoicePayment);
+
+// public void paymentAttemptFailed(UUID invoiceId, UUID paymentId, DateTime paymentAttemptDate);
+//
+// public void paymentAttemptSuccessful(UUID invoiceId, BigDecimal amount, Currency currency,
+// UUID paymentId, DateTime paymentDate);
+
+ public BigDecimal getAccountBalance(UUID accountId);
- public void paymentAttemptSuccessful(UUID invoiceId, BigDecimal amount, Currency currency,
- UUID paymentId, DateTime paymentDate);
}
diff --git a/api/src/main/java/com/ning/billing/payment/api/CreditCardPaymentMethodInfo.java b/api/src/main/java/com/ning/billing/payment/api/CreditCardPaymentMethodInfo.java
new file mode 100644
index 0000000..6f767ff
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/CreditCardPaymentMethodInfo.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+
+public final class CreditCardPaymentMethodInfo extends PaymentMethodInfo {
+ public static final class Builder extends BuilderBase<CreditCardPaymentMethodInfo, Builder> {
+ private String cardHolderName;
+ private String cardType;
+ private String expirationDate;
+ private String maskNumber;
+ private String cardAddress1;
+ private String cardAddress2;
+ private String cardCity;
+ private String cardState;
+ private String cardPostalCode;
+ private String cardCountry;
+
+ public Builder() {
+ super(Builder.class);
+ }
+
+ public Builder(CreditCardPaymentMethodInfo src) {
+ super(Builder.class, src);
+ }
+
+ public Builder setCardHolderName(String cardHolderName) {
+ this.cardHolderName = cardHolderName;
+ return this;
+ }
+
+ public Builder setCardType(String cardType) {
+ this.cardType = cardType;
+ return this;
+ }
+
+ public Builder setExpirationDateStr(String expirationDateStr) {
+ this.expirationDate = expirationDateStr;
+ return this;
+ }
+
+ public Builder setCardAddress1(String creditCardAddress1) {
+ this.cardAddress1 = creditCardAddress1;
+ return this;
+ }
+
+ public Builder setCardAddress2(String creditCardAddress2) {
+ this.cardAddress2 = creditCardAddress2;
+ return this;
+ }
+
+ public Builder setCardCity(String creditCardCity) {
+ this.cardCity = creditCardCity;
+ return this;
+ }
+
+ public Builder setCardState(String creditCardState) {
+ this.cardState = creditCardState;
+ return this;
+ }
+
+ public Builder setCardPostalCode(String creditCardPostalCode) {
+ this.cardPostalCode = creditCardPostalCode;
+ return this;
+ }
+
+ public Builder setCardCountry(String creditCardCountry) {
+ this.cardCountry = creditCardCountry;
+ return this;
+ }
+
+ public Builder setMaskNumber(String maskNumber) {
+ this.maskNumber = maskNumber;
+ return this;
+ }
+
+ public CreditCardPaymentMethodInfo build() {
+ return new CreditCardPaymentMethodInfo(id,
+ accountId,
+ defaultMethod,
+ cardHolderName,
+ cardType,
+ expirationDate,
+ maskNumber,
+ cardAddress1,
+ cardAddress2,
+ cardCity,
+ cardState,
+ cardPostalCode,
+ cardCountry);
+ }
+ }
+
+ private final String cardHolderName;
+ private final String cardType;
+ private final String expirationDate;
+ private final String maskNumber;
+ private final String cardAddress1;
+ private final String cardAddress2;
+ private final String cardCity;
+ private final String cardState;
+ private final String cardPostalCode;
+ private final String cardCountry;
+
+ public CreditCardPaymentMethodInfo(String id,
+ String accountId,
+ Boolean defaultMethod,
+ String cardHolderName,
+ String cardType,
+ String expirationDate,
+ String maskNumber,
+ String cardAddress1,
+ String cardAddress2,
+ String cardCity,
+ String cardState,
+ String cardPostalCode,
+ String cardCountry) {
+
+ super(id, accountId, defaultMethod, "CreditCard");
+ this.cardHolderName = cardHolderName;
+ this.cardType = cardType;
+ this.expirationDate = expirationDate;
+ this.maskNumber = maskNumber;
+ this.cardAddress1 = cardAddress1;
+ this.cardAddress2 = cardAddress2;
+ this.cardCity = cardCity;
+ this.cardState = cardState;
+ this.cardPostalCode = cardPostalCode;
+ this.cardCountry = cardCountry;
+ }
+
+ public String getCardHolderName() {
+ return cardHolderName;
+ }
+
+ public String getCardType() {
+ return cardType;
+ }
+
+ public String getCardAddress1() {
+ return cardAddress1;
+ }
+
+ public String getCardAddress2() {
+ return cardAddress2;
+ }
+
+ public String getCardCity() {
+ return cardCity;
+ }
+
+ public String getCardState() {
+ return cardState;
+ }
+
+ public String getCardPostalCode() {
+ return cardPostalCode;
+ }
+
+ public String getCardCountry() {
+ return cardCountry;
+ }
+
+ public String getExpirationDate() {
+ return expirationDate;
+ }
+
+ public String getMaskNumber() {
+ return maskNumber;
+ }
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/Either.java b/api/src/main/java/com/ning/billing/payment/api/Either.java
new file mode 100644
index 0000000..25ce8f8
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/Either.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import org.codehaus.jackson.annotate.JsonValue;
+
+public abstract class Either<T, V> {
+ public static <T, V> Either<T, V> left(T value) {
+ return new Left<T, V>(value);
+ }
+ public static <T, V> Either<T, V> right(V value) {
+ return new Right<T, V>(value);
+ }
+
+ private Either() {
+ }
+
+ public boolean isLeft() {
+ return false;
+ }
+ public boolean isRight() {
+ return false;
+ }
+ public T getLeft() {
+ throw new UnsupportedOperationException();
+ }
+ public V getRight() {
+ throw new UnsupportedOperationException();
+ }
+
+ public static class Left<T, V> extends Either<T, V> {
+ private final T value;
+
+ public Left(T value) {
+ this.value = value;
+ }
+ @Override
+ public boolean isLeft() {
+ return true;
+ }
+ @Override
+ @JsonValue
+ public T getLeft() {
+ return value;
+ }
+ }
+
+ public static class Right<T, V> extends Either<T, V> {
+ private final V value;
+
+ public Right(V value) {
+ this.value = value;
+ }
+ @Override
+ public boolean isRight() {
+ return true;
+ }
+
+ @Override
+ @JsonValue
+ public V getRight() {
+ return value;
+ }
+ }
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/InvoicePayment.java b/api/src/main/java/com/ning/billing/payment/api/InvoicePayment.java
new file mode 100644
index 0000000..c43c179
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/InvoicePayment.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+
+import com.ning.billing.catalog.api.Currency;
+
+public class InvoicePayment {
+ private final UUID invoiceId;
+ private final UUID paymentAttemptId;
+ private final DateTime paymentAttemptDate;
+ private final BigDecimal amount;
+ private final Currency currency;
+
+ public InvoicePayment(UUID invoiceId, BigDecimal amount, Currency currency, UUID paymentAttemptId, DateTime paymentAttemptDate) {
+ this.invoiceId = invoiceId;
+ this.amount = amount;
+ this.currency = currency;
+ this.paymentAttemptId = paymentAttemptId;
+ this.paymentAttemptDate = paymentAttemptDate;
+ }
+
+ public InvoicePayment(UUID invoiceId, UUID paymentAttemptId, DateTime paymentAttemptDate) {
+ this(invoiceId, null, null, paymentAttemptId, paymentAttemptDate);
+ }
+
+ public UUID getInvoiceId() {
+ return invoiceId;
+ }
+
+ public UUID getPaymentAttemptId() {
+ return paymentAttemptId;
+ }
+
+ public DateTime getPaymentAttemptDate() {
+ return paymentAttemptDate;
+ }
+
+ public BigDecimal getAmount() {
+ return amount;
+ }
+
+ public Currency getCurrency() {
+ return currency;
+ }
+
+ @Override
+ public String toString() {
+ return "InvoicePayment [invoiceId=" + invoiceId + ", paymentAttemptId=" + paymentAttemptId + ", paymentAttemptDate=" + paymentAttemptDate + ", amount=" + amount + ", currency=" + currency + "]";
+ }
+
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentApi.java b/api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
new file mode 100644
index 0000000..be1f649
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import com.ning.billing.account.api.Account;
+
+public interface PaymentApi {
+
+ Either<PaymentError, Void> updatePaymentGateway(String accountKey);
+
+ Either<PaymentError, PaymentMethodInfo> getPaymentMethod(@Nullable String accountKey, String paymentMethodId);
+
+ Either<PaymentError, List<PaymentMethodInfo>> getPaymentMethods(String accountKey);
+
+ Either<PaymentError, String> addPaymentMethod(@Nullable String accountKey, PaymentMethodInfo paymentMethod);
+
+ Either<PaymentError, PaymentMethodInfo> updatePaymentMethod(String accountKey, PaymentMethodInfo paymentMethodInfo);
+
+ Either<PaymentError, Void> deletePaymentMethod(String accountKey, String paymentMethodId);
+
+ List<Either<PaymentError, PaymentInfo>> createPayment(String accountKey, List<String> invoiceIds);
+ List<Either<PaymentError, PaymentInfo>> createPayment(Account account, List<String> invoiceIds);
+
+ List<Either<PaymentError, PaymentInfo>> createRefund(Account account, List<String> invoiceIds); //TODO
+
+ Either<PaymentError, PaymentProviderAccount> getPaymentProviderAccount(String accountKey);
+
+ Either<PaymentError, String> createPaymentProviderAccount(Account account);
+
+ Either<PaymentError, Void> updatePaymentProviderAccount(Account account);
+
+ PaymentAttempt getPaymentAttemptForPaymentId(String id);
+
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentAttempt.java b/api/src/main/java/com/ning/billing/payment/api/PaymentAttempt.java
new file mode 100644
index 0000000..0c8f8c4
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentAttempt.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
+import com.google.common.base.Objects;
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.invoice.api.Invoice;
+
+public class PaymentAttempt {
+ private final UUID paymentAttemptId;
+ private final UUID invoiceId;
+ private final UUID accountId;
+ private final BigDecimal amount;
+ private final Currency currency;
+ private final String paymentId;
+ private final DateTime invoiceDate;
+ private final DateTime paymentAttemptDate;
+ private final DateTime createdDate;
+ private final DateTime updatedDate;
+
+ public PaymentAttempt(UUID paymentAttemptId,
+ UUID invoiceId,
+ UUID accountId,
+ BigDecimal amount,
+ Currency currency,
+ DateTime invoiceDate,
+ DateTime paymentAttemptDate,
+ String paymentId,
+ DateTime createdDate,
+ DateTime updatedDate) {
+ this.paymentAttemptId = paymentAttemptId;
+ this.invoiceId = invoiceId;
+ this.accountId = accountId;
+ this.amount = amount;
+ this.currency = currency;
+ this.invoiceDate = invoiceDate;
+ this.paymentAttemptDate = paymentAttemptDate == null ? new DateTime(DateTimeZone.UTC) : paymentAttemptDate;
+ this.paymentId = paymentId;
+ this.createdDate = createdDate;
+ this.updatedDate = updatedDate;
+ }
+
+ public PaymentAttempt(UUID paymentAttemptId,
+ UUID invoiceId,
+ UUID accountId,
+ BigDecimal amount,
+ Currency currency,
+ DateTime invoiceDate,
+ DateTime paymentAttemptDate,
+ String paymentId) {
+ this(paymentAttemptId, invoiceId, accountId, amount, currency, invoiceDate, paymentAttemptDate, paymentId, new DateTime(DateTimeZone.UTC), new DateTime(DateTimeZone.UTC));
+ }
+
+ public PaymentAttempt(UUID paymentAttemptId, UUID invoiceId, UUID accountId, BigDecimal amount, Currency currency, DateTime invoiceDate, DateTime paymentAttemptDate) {
+ this(paymentAttemptId, invoiceId, accountId, amount, currency, invoiceDate, paymentAttemptDate, null);
+ }
+
+ public PaymentAttempt(UUID paymentAttemptId, UUID invoiceId, UUID accountId, DateTime invoiceDate, DateTime paymentAttemptDate) {
+ this(paymentAttemptId, invoiceId, accountId, null, null, invoiceDate, paymentAttemptDate, null);
+ }
+
+ public PaymentAttempt(UUID paymentAttemptId, Invoice invoice) {
+ this(paymentAttemptId, invoice.getId(), invoice.getAccountId(), invoice.getAmountOutstanding(), invoice.getCurrency(), invoice.getInvoiceDate(), null);
+ }
+
+ public DateTime getInvoiceDate() {
+ return invoiceDate;
+ }
+
+ public UUID getPaymentAttemptId() {
+ return paymentAttemptId;
+ }
+
+ public String getPaymentId() {
+ return paymentId;
+ }
+
+ public DateTime getPaymentAttemptDate() {
+ return paymentAttemptDate;
+ }
+
+ public UUID getInvoiceId() {
+ return invoiceId;
+ }
+
+ public UUID getAccountId() {
+ return accountId;
+ }
+
+ public DateTime getCreatedDate() {
+ return createdDate;
+ }
+
+ public DateTime getUpdatedDate() {
+ return updatedDate;
+ }
+
+ public BigDecimal getAmount() {
+ return amount;
+ }
+
+ public Currency getCurrency() {
+ return currency;
+ }
+
+ @Override
+ public String toString() {
+ return "PaymentAttempt [paymentAttemptId=" + paymentAttemptId + ", invoiceId=" + invoiceId + ", amount=" + amount + ", currency=" + currency + ", paymentId=" + paymentId + ", paymentAttemptDate=" + paymentAttemptDate + "]";
+ }
+
+ public Builder cloner() {
+ return new Builder(this);
+ }
+
+ public static class Builder {
+ private UUID paymentAttemptId;
+ private UUID invoiceId;
+ private UUID accountId;
+ private BigDecimal amount;
+ private Currency currency;
+ private DateTime invoiceDate;
+ private DateTime paymentAttemptDate;
+ private String paymentId;
+ private DateTime createdDate;
+ private DateTime updatedDate;
+
+ public Builder() {
+ }
+
+ public Builder(PaymentAttempt src) {
+ this.paymentAttemptId = src.paymentAttemptId;
+ this.invoiceId = src.invoiceId;
+ this.accountId = src.accountId;
+ this.amount = src.amount;
+ this.currency = src.currency;
+ this.invoiceDate = src.invoiceDate;
+ this.paymentAttemptDate = src.paymentAttemptDate;
+ this.paymentId = src.paymentId;
+ this.createdDate = src.createdDate;
+ this.updatedDate = src.updatedDate;
+ }
+
+ public Builder setPaymentAttemptId(UUID paymentAttemptId) {
+ this.paymentAttemptId = paymentAttemptId;
+ return this;
+ }
+
+ public Builder setInvoiceId(UUID invoiceId) {
+ this.invoiceId = invoiceId;
+ return this;
+ }
+
+ public Builder setAccountId(UUID accountId) {
+ this.accountId = accountId;
+ return this;
+ }
+
+ public Builder setAmount(BigDecimal amount) {
+ this.amount = amount;
+ return this;
+ }
+
+ public Builder setCurrency(Currency currency) {
+ this.currency = currency;
+ return this;
+ }
+
+ public Builder setCreatedDate(DateTime createdDate) {
+ this.createdDate = createdDate;
+ return this;
+ }
+
+ public Builder setUpdatedDate(DateTime updatedDate) {
+ this.updatedDate = updatedDate;
+ return this;
+ }
+
+ public Builder setInvoiceDate(DateTime invoiceDate) {
+ this.invoiceDate = invoiceDate;
+ return this;
+ }
+
+ public Builder setPaymentAttemptDate(DateTime paymentAttemptDate) {
+ this.paymentAttemptDate = paymentAttemptDate;
+ return this;
+ }
+
+ public Builder setPaymentId(String paymentId) {
+ this.paymentId = paymentId;
+ return this;
+ }
+
+ public PaymentAttempt build() {
+ return new PaymentAttempt(paymentAttemptId,
+ invoiceId,
+ accountId,
+ amount,
+ currency,
+ invoiceDate,
+ paymentAttemptDate,
+ paymentId,
+ createdDate,
+ updatedDate);
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(paymentAttemptId,
+ invoiceId,
+ accountId,
+ amount,
+ currency,
+ invoiceDate,
+ paymentAttemptDate,
+ paymentId);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (getClass() == obj.getClass()) {
+ PaymentAttempt other = (PaymentAttempt)obj;
+ if (obj == other) {
+ return true;
+ }
+ else {
+ return Objects.equal(paymentAttemptId, other.paymentAttemptId) &&
+ Objects.equal(invoiceId, other.invoiceId) &&
+ Objects.equal(accountId, other.accountId) &&
+ Objects.equal(amount, other.amount) &&
+ Objects.equal(currency, other.currency) &&
+ Objects.equal(invoiceDate, other.invoiceDate) &&
+ Objects.equal(paymentAttemptDate, other.paymentAttemptDate) &&
+ Objects.equal(paymentId, other.paymentId);
+ }
+ }
+ return false;
+ }
+
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentError.java b/api/src/main/java/com/ning/billing/payment/api/PaymentError.java
new file mode 100644
index 0000000..45e8555
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentError.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+import org.codehaus.jackson.annotate.JsonTypeInfo;
+import org.codehaus.jackson.annotate.JsonTypeInfo.Id;
+
+import com.ning.billing.util.eventbus.EventBusNotification;
+
+@JsonTypeInfo(use = Id.NAME, property = "error")
+public class PaymentError implements EventBusNotification {
+ private final String type;
+ private final String message;
+
+ public PaymentError(PaymentError src) {
+ this.type = src.type;
+ this.message = src.message;
+ }
+
+ public PaymentError(String type, String message) {
+ this.type = type;
+ this.message = message;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((message == null) ? 0 : message.hashCode());
+ result = prime * result + ((type == null) ? 0 : type.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ PaymentError other = (PaymentError) obj;
+ if (message == null) {
+ if (other.message != null)
+ return false;
+ }
+ else if (!message.equals(other.message))
+ return false;
+ if (type == null) {
+ if (other.type != null)
+ return false;
+ }
+ else if (!type.equals(other.type))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "PaymentError [type=" + type + ", message=" + message + "]";
+ }
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentInfo.java b/api/src/main/java/com/ning/billing/payment/api/PaymentInfo.java
new file mode 100644
index 0000000..9cfa71f
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentInfo.java
@@ -0,0 +1,271 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import java.math.BigDecimal;
+
+import org.codehaus.jackson.annotate.JsonCreator;
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.joda.time.DateTime;
+
+import com.google.common.base.Objects;
+import com.ning.billing.util.eventbus.EventBusNotification;
+
+public class PaymentInfo implements EventBusNotification {
+ private final String paymentId;
+ private final BigDecimal amount;
+ private final BigDecimal refundAmount;
+ private final String paymentNumber;
+ private final String bankIdentificationNumber;
+ private final String status;
+ private final String type;
+ private final String referenceId;
+ private final DateTime effectiveDate;
+ private final DateTime createdDate;
+ private final DateTime updatedDate;
+
+ public PaymentInfo(PaymentInfo src) {
+ this.paymentId = src.paymentId;
+ this.amount = src.amount;
+ this.refundAmount = src.refundAmount;
+ this.paymentNumber = src.paymentNumber;
+ this.bankIdentificationNumber = src.bankIdentificationNumber;
+ this.status = src.status;
+ this.type = src.type;
+ this.referenceId = src.referenceId;
+ this.effectiveDate = src.effectiveDate;
+ this.createdDate = src.createdDate;
+ this.updatedDate = src.updatedDate;
+ }
+
+ @JsonCreator
+ public PaymentInfo(@JsonProperty("paymentId") String paymentId,
+ @JsonProperty("amount") BigDecimal amount,
+ @JsonProperty("refundAmount") BigDecimal refundAmount,
+ @JsonProperty("bankIdentificationNumber") String bankIdentificationNumber,
+ @JsonProperty("paymentNumber") String paymentNumber,
+ @JsonProperty("status") String status,
+ @JsonProperty("type") String type,
+ @JsonProperty("referenceId") String referenceId,
+ @JsonProperty("effectiveDate") DateTime effectiveDate,
+ @JsonProperty("createdDate") DateTime createdDate,
+ @JsonProperty("updatedDate") DateTime updatedDate) {
+ this.paymentId = paymentId;
+ this.amount = amount;
+ this.refundAmount = refundAmount;
+ this.bankIdentificationNumber = bankIdentificationNumber;
+ this.effectiveDate = effectiveDate;
+ this.paymentNumber = paymentNumber;
+ this.referenceId = referenceId;
+ this.status = status;
+ this.type = type;
+ this.createdDate = createdDate;
+ this.updatedDate = updatedDate;
+ }
+
+ public Builder cloner() {
+ return new Builder(this);
+ }
+
+ public String getPaymentId() {
+ return paymentId;
+ }
+
+ public BigDecimal getAmount() {
+ return amount;
+ }
+
+ public String getBankIdentificationNumber() {
+ return bankIdentificationNumber;
+ }
+
+ public DateTime getCreatedDate() {
+ return createdDate;
+ }
+
+ public DateTime getEffectiveDate() {
+ return effectiveDate;
+ }
+
+ public String getPaymentNumber() {
+ return paymentNumber;
+ }
+
+ public String getReferenceId() {
+ return referenceId;
+ }
+
+ public BigDecimal getRefundAmount() {
+ return refundAmount;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public DateTime getUpdatedDate() {
+ return updatedDate;
+ }
+
+ public static class Builder {
+ private String paymentId;
+ private BigDecimal amount;
+ private BigDecimal refundAmount;
+ private String paymentNumber;
+ private String bankIdentificationNumber;
+ private String type;
+ private String status;
+ private String referenceId;
+ private DateTime effectiveDate;
+ private DateTime createdDate;
+ private DateTime updatedDate;
+
+ public Builder() {
+ }
+
+ public Builder(PaymentInfo src) {
+ this.paymentId = src.paymentId;
+ this.amount = src.amount;
+ this.refundAmount = src.refundAmount;
+ this.paymentNumber = src.paymentNumber;
+ this.bankIdentificationNumber = src.bankIdentificationNumber;
+ this.type = src.type;
+ this.status = src.status;
+ this.effectiveDate = src.effectiveDate;
+ this.referenceId = src.referenceId;
+ this.createdDate = src.createdDate;
+ this.updatedDate = src.updatedDate;
+ }
+
+ public Builder setPaymentId(String paymentId) {
+ this.paymentId = paymentId;
+ return this;
+ }
+
+ public Builder setAmount(BigDecimal amount) {
+ this.amount = amount;
+ return this;
+ }
+
+ public Builder setBankIdentificationNumber(String bankIdentificationNumber) {
+ this.bankIdentificationNumber = bankIdentificationNumber;
+ return this;
+ }
+
+ public Builder setCreatedDate(DateTime createdDate) {
+ this.createdDate = createdDate;
+ return this;
+ }
+
+ public Builder setEffectiveDate(DateTime effectiveDate) {
+ this.effectiveDate = effectiveDate;
+ return this;
+ }
+
+ public Builder setPaymentNumber(String paymentNumber) {
+ this.paymentNumber = paymentNumber;
+ return this;
+ }
+
+ public Builder setReferenceId(String referenceId) {
+ this.referenceId = referenceId;
+ return this;
+ }
+
+ public Builder setRefundAmount(BigDecimal refundAmount) {
+ this.refundAmount = refundAmount;
+ return this;
+ }
+
+ public Builder setStatus(String status) {
+ this.status = status;
+ return this;
+ }
+
+ public Builder setType(String type) {
+ this.type = type;
+ return this;
+ }
+
+ public Builder setUpdatedDate(DateTime updatedDate) {
+ this.updatedDate = updatedDate;
+ return this;
+ }
+
+ public PaymentInfo build() {
+ return new PaymentInfo(paymentId,
+ amount,
+ refundAmount,
+ bankIdentificationNumber,
+ paymentNumber,
+ type,
+ status,
+ referenceId,
+ effectiveDate,
+ createdDate,
+ updatedDate);
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(amount,
+ bankIdentificationNumber,
+ createdDate,
+ effectiveDate,
+ paymentId,
+ paymentNumber,
+ referenceId,
+ refundAmount,
+ status,
+ type,
+ updatedDate);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (getClass() == obj.getClass()) {
+ PaymentInfo other = (PaymentInfo)obj;
+ if (obj == other) {
+ return true;
+ }
+ else {
+ return Objects.equal(amount, other.amount) &&
+ Objects.equal(bankIdentificationNumber, other.bankIdentificationNumber) &&
+ Objects.equal(createdDate, other.createdDate) &&
+ Objects.equal(effectiveDate, other.effectiveDate) &&
+ Objects.equal(paymentId, other.paymentId) &&
+ Objects.equal(paymentNumber, other.paymentNumber) &&
+ Objects.equal(referenceId, other.referenceId) &&
+ Objects.equal(refundAmount, other.refundAmount) &&
+ Objects.equal(status, other.status) &&
+ Objects.equal(type, other.type) &&
+ Objects.equal(updatedDate, other.updatedDate);
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return "PaymentInfo [paymentId=" + paymentId + ", amount=" + amount + ", refundAmount=" + refundAmount + ", paymentNumber=" + paymentNumber + ", bankIdentificationNumber=" + bankIdentificationNumber + ", status=" + status + ", type=" + type + ", referenceId=" + referenceId + ", effectiveDate=" + effectiveDate + ", createdDate=" + createdDate + ", updatedDate=" + updatedDate + "]";
+ }
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentMethodInfo.java b/api/src/main/java/com/ning/billing/payment/api/PaymentMethodInfo.java
new file mode 100644
index 0000000..78f73d3
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentMethodInfo.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import com.google.common.base.Objects;
+
+public class PaymentMethodInfo {
+ private final String id;
+ private final String accountId;
+ private final Boolean defaultMethod;
+ private final String type;
+
+ public PaymentMethodInfo(String id,
+ String accountId,
+ Boolean defaultMethod,
+ String type) {
+ this.id = id;
+ this.accountId = accountId;
+ this.defaultMethod = defaultMethod;
+ this.type = type;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public String getAccountId() {
+ return accountId;
+ }
+
+ public Boolean getDefaultMethod() {
+ return defaultMethod;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(id,
+ accountId,
+ defaultMethod,
+ type);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (getClass() == obj.getClass()) {
+ PaymentMethodInfo other = (PaymentMethodInfo)obj;
+ if (obj == other) {
+ return true;
+ }
+ else {
+ return Objects.equal(id, other.id) &&
+ Objects.equal(accountId, other.accountId) &&
+ Objects.equal(defaultMethod, other.defaultMethod) &&
+ Objects.equal(type, other.type);
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return "PaymentMethodInfo [id=" + id + ", accountId=" + accountId + ", defaultMethod=" + defaultMethod + ", type=" + type + "]";
+ }
+
+ protected abstract static class BuilderBase<T extends PaymentMethodInfo, V extends BuilderBase<T, V>> {
+ protected final Class<V> builderClazz;
+ protected String id;
+ protected String accountId;
+ protected Boolean defaultMethod;
+
+ protected BuilderBase(Class<V> builderClazz) {
+ this.builderClazz = builderClazz;
+ }
+
+ protected BuilderBase(Class<V> builderClazz, T src) {
+ this(builderClazz);
+ this.id = src.id;
+ this.accountId = src.accountId;
+ this.defaultMethod = src.defaultMethod;
+ }
+
+ public V setId(String id) {
+ this.id = id;
+ return builderClazz.cast(this);
+ }
+
+ public V setAccountId(String accountId) {
+ this.accountId = accountId;
+ return builderClazz.cast(this);
+ }
+
+ public V setDefaultMethod(Boolean defaultMethod) {
+ this.defaultMethod = defaultMethod;
+ return builderClazz.cast(this);
+ }
+ }
+
+ public static class Builder extends BuilderBase<PaymentMethodInfo, Builder> {
+ private String type;
+
+ public Builder() {
+ super(Builder.class);
+ }
+
+ public Builder(PaymentMethodInfo src) {
+ super(Builder.class, src);
+ this.type = src.type;
+ }
+
+ public Builder setType(String type) {
+ this.type = type;
+ return this;
+ }
+
+ public PaymentMethodInfo build() {
+ return new PaymentMethodInfo(id, accountId, defaultMethod, type);
+ }
+ }
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java
new file mode 100644
index 0000000..553d6a2
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import com.google.common.base.Objects;
+
+public class PaymentProviderAccount {
+ private final String id;
+ private final String accountNumber;
+ private final String accountName;
+ private final String phoneNumber;
+ private final String defaultPaymentMethodId;
+
+ public PaymentProviderAccount(String id,
+ String accountNumber,
+ String accountName,
+ String phoneNumber,
+ String defaultPaymentMethodId) {
+ this.id = id;
+ this.accountNumber = accountNumber;
+ this.accountName = accountName;
+ this.phoneNumber = phoneNumber;
+ this.defaultPaymentMethodId = defaultPaymentMethodId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public String getAccountNumber() {
+ return accountNumber;
+ }
+
+ public String getAccountName() {
+ return accountName;
+ }
+
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+
+ public String getDefaultPaymentMethodId() {
+ return defaultPaymentMethodId;
+ }
+
+ public static class Builder {
+ private String id;
+ private String accountNumber;
+ private String accountName;
+ private String phoneNumber;
+ private String defaultPaymentMethodId;
+
+ public Builder setId(String id) {
+ this.id = id;
+ return this;
+ }
+
+ public Builder setAccountNumber(String accountNumber) {
+ this.accountNumber = accountNumber;
+ return this;
+ }
+
+ public Builder setAccountName(String accountName) {
+ this.accountName = accountName;
+ return this;
+ }
+
+ public Builder setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ return this;
+ }
+
+ public Builder setDefaultPaymentMethod(String defaultPaymentMethod) {
+ this.defaultPaymentMethodId = defaultPaymentMethod;
+ return this;
+ }
+
+ public PaymentProviderAccount build() {
+ return new PaymentProviderAccount(id, accountNumber, accountName, phoneNumber, defaultPaymentMethodId);
+ }
+
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(id,
+ accountNumber,
+ accountName,
+ phoneNumber,
+ defaultPaymentMethodId);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (getClass() == obj.getClass()) {
+ PaymentProviderAccount other = (PaymentProviderAccount)obj;
+ if (obj == other) {
+ return true;
+ }
+ else {
+ return Objects.equal(id, other.id) &&
+ Objects.equal(accountNumber, other.accountNumber) &&
+ Objects.equal(phoneNumber, other.phoneNumber) &&
+ Objects.equal(defaultPaymentMethodId, other.defaultPaymentMethodId);
+ }
+ }
+ return false;
+ }
+
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentProviderContactData.java b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderContactData.java
new file mode 100644
index 0000000..7be9908
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderContactData.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.google.common.base.Objects;
+import com.ning.billing.catalog.api.Currency;
+
+public class PaymentProviderContactData {
+ private final String firstName;
+ private final String lastName;
+ private final String email;
+ private final String phoneNumber;
+ private final String externalKey;
+ private final String locale;
+ private final Currency currency;
+
+ public PaymentProviderContactData(String firstName,
+ String lastName,
+ String email,
+ String phoneNumber,
+ String externalKey,
+ String locale,
+ Currency currency) {
+ this.firstName = StringUtils.substring(firstName, 0, 100);
+ this.lastName = StringUtils.substring(lastName, 0, 100);
+ this.email = StringUtils.substring(email, 0, 80);
+ this.phoneNumber = phoneNumber;
+ this.externalKey = externalKey;
+ this.locale = locale;
+ this.currency = currency;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+
+ public String getExternalKey() {
+ return externalKey;
+ }
+
+ public String getLocale() {
+ return locale;
+ }
+
+ public Currency getCurrency() {
+ return currency;
+ }
+
+ public static class Builder {
+ private String firstName;
+ private String lastName;
+ private String email;
+ private String phoneNumber;
+ private String externalKey;
+ private String locale;
+ private Currency currency;
+
+ public Builder setExternalKey(String externalKey) {
+ this.externalKey = externalKey;
+ return this;
+ }
+
+ public Builder setFirstName(String firstName) {
+ this.firstName = firstName;
+ return this;
+ }
+
+ public Builder setLastName(String lastName) {
+ this.lastName = lastName;
+ return this;
+ }
+
+ public Builder setEmail(String email) {
+ this.email = email;
+ return this;
+ }
+
+ public Builder setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ return this;
+ }
+
+ public Builder setLocale(String locale) {
+ this.locale = locale;
+ return this;
+ }
+
+ public Builder setCurrency(Currency currency) {
+ this.currency = currency;
+ return this;
+ }
+
+ public PaymentProviderContactData build() {
+ return new PaymentProviderContactData(firstName, lastName, email, phoneNumber, externalKey, locale, currency);
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(firstName,
+ lastName,
+ email,
+ phoneNumber,
+ externalKey,
+ locale,
+ currency);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (getClass() == obj.getClass()) {
+ PaymentProviderContactData other = (PaymentProviderContactData)obj;
+ if (obj == other) {
+ return true;
+ }
+ else {
+ return Objects.equal(firstName, other.firstName) &&
+ Objects.equal(lastName, other.lastName) &&
+ Objects.equal(email, other.email) &&
+ Objects.equal(phoneNumber, other.phoneNumber) &&
+ Objects.equal(externalKey, other.externalKey) &&
+ Objects.equal(locale, other.locale) &&
+ Objects.equal(currency, other.currency);
+ }
+ }
+ return false;
+ }
+
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentService.java b/api/src/main/java/com/ning/billing/payment/api/PaymentService.java
new file mode 100644
index 0000000..988a00a
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentService.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import com.ning.billing.lifecycle.KillbillService;
+
+public interface PaymentService extends KillbillService {
+ @Override
+ String getName();
+
+ PaymentApi getPaymentApi();
+}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaypalPaymentMethodInfo.java b/api/src/main/java/com/ning/billing/payment/api/PaypalPaymentMethodInfo.java
new file mode 100644
index 0000000..8b94f15
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaypalPaymentMethodInfo.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import com.google.common.base.Strings;
+
+
+public final class PaypalPaymentMethodInfo extends PaymentMethodInfo {
+ public static final String TYPE = "PayPal";
+
+ public static final class Builder extends BuilderBase<PaypalPaymentMethodInfo, Builder> {
+ private String baid;
+ private String email;
+
+ public Builder() {
+ super(Builder.class);
+ }
+
+ public Builder(PaypalPaymentMethodInfo src) {
+ super(Builder.class, src);
+ }
+
+ public Builder setBaid(String baid) {
+ this.baid = baid;
+ return this;
+ }
+
+ public Builder setEmail(String email) {
+ this.email = email;
+ return this;
+ }
+
+ public PaypalPaymentMethodInfo build() {
+ return new PaypalPaymentMethodInfo(id, accountId, defaultMethod, baid, email);
+ }
+ }
+
+ private final String baid;
+ private final String email;
+
+ public PaypalPaymentMethodInfo(String id,
+ String accountId,
+ Boolean defaultMethod,
+ String baid,
+ String email) {
+ super(id, accountId, defaultMethod, TYPE);
+
+ if (Strings.isNullOrEmpty(accountId) || Strings.isNullOrEmpty(baid) || Strings.isNullOrEmpty(email)) {
+ throw new IllegalArgumentException("accountId, baid and email should be present");
+ }
+
+ this.baid = baid;
+ this.email = email;
+ }
+
+ public String getBaid() {
+ return baid;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+}
diff --git a/api/src/main/java/com/ning/billing/util/api/TagDefinitionApiException.java b/api/src/main/java/com/ning/billing/util/api/TagDefinitionApiException.java
new file mode 100644
index 0000000..81750cb
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/util/api/TagDefinitionApiException.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.api;
+
+import com.ning.billing.BillingExceptionBase;
+import com.ning.billing.ErrorCode;
+
+public class TagDefinitionApiException extends BillingExceptionBase {
+ public TagDefinitionApiException(Throwable cause, int code, final String msg) {
+ super(cause, code, msg);
+ }
+
+ public TagDefinitionApiException(Throwable cause, ErrorCode code, final Object... args) {
+ super(cause, code, args);
+ }
+
+ public TagDefinitionApiException(ErrorCode code, final Object... args) {
+ super(code, args);
+ }
+}
\ No newline at end of file
diff --git a/api/src/main/java/com/ning/billing/util/api/TagDefinitionService.java b/api/src/main/java/com/ning/billing/util/api/TagDefinitionService.java
new file mode 100644
index 0000000..1434f8f
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/util/api/TagDefinitionService.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.api;
+
+import com.ning.billing.lifecycle.KillbillService;
+
+public interface TagDefinitionService extends KillbillService {
+ public TagDefinitionUserApi getTagDefinitionUserApi();
+}
diff --git a/api/src/main/java/com/ning/billing/util/api/TagDefinitionUserApi.java b/api/src/main/java/com/ning/billing/util/api/TagDefinitionUserApi.java
new file mode 100644
index 0000000..0bd985c
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/util/api/TagDefinitionUserApi.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.api;
+
+import java.util.List;
+import java.util.UUID;
+import com.ning.billing.util.tag.TagDefinition;
+
+public interface TagDefinitionUserApi {
+ /***
+ *
+ * @return
+ */
+ public List<TagDefinition> getTagDefinitions();
+
+ /***
+ *
+ * @param name Identifies the definition.
+ * @param description Describes the use of the definition.
+ * @param createdBy The name of person who created the definition.
+ * @return
+ * @throws TagDefinitionApiException
+ */
+ public TagDefinition create(String name, String description, String createdBy) throws TagDefinitionApiException;
+
+ /***
+ *
+ * @param definitionName Identifies the definition.
+ * @throws TagDefinitionApiException
+ */
+ public void deleteAllTagsForDefinition(String definitionName) throws TagDefinitionApiException;
+
+ /***
+ *
+ * @param definitionName Identifies the definition.
+ * @throws TagDefinitionApiException
+ */
+ public void deleteTagDefinition(String definitionName) throws TagDefinitionApiException;
+}
diff --git a/api/src/main/java/com/ning/billing/util/tag/ControlTag.java b/api/src/main/java/com/ning/billing/util/tag/ControlTag.java
new file mode 100644
index 0000000..a933cff
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/util/tag/ControlTag.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag;
+
+import com.ning.billing.account.api.ControlTagType;
+
+public interface ControlTag extends Tag {
+ public ControlTagType getControlTagType();
+}
diff --git a/api/src/main/java/com/ning/billing/util/tag/Tag.java b/api/src/main/java/com/ning/billing/util/tag/Tag.java
index 9fb15ed..5e9008b 100644
--- a/api/src/main/java/com/ning/billing/util/tag/Tag.java
+++ b/api/src/main/java/com/ning/billing/util/tag/Tag.java
@@ -21,15 +21,9 @@ import org.joda.time.DateTime;
import com.ning.billing.util.entity.Entity;
public interface Tag extends Entity {
- UUID getTagDescriptionId();
-
- String getName();
-
- boolean getProcessPayment();
-
- boolean getGenerateInvoice();
+ String getTagDefinitionName();
String getAddedBy();
- DateTime getDateAdded();
+ DateTime getAddedDate();
}
diff --git a/api/src/main/java/com/ning/billing/util/tag/Taggable.java b/api/src/main/java/com/ning/billing/util/tag/Taggable.java
index f274294..5e2f425 100644
--- a/api/src/main/java/com/ning/billing/util/tag/Taggable.java
+++ b/api/src/main/java/com/ning/billing/util/tag/Taggable.java
@@ -22,10 +22,10 @@ import org.joda.time.DateTime;
public interface Taggable {
public List<Tag> getTagList();
public boolean hasTag(String tagName);
- public void addTag(TagDescription description, String addedBy, DateTime dateAdded);
+ public void addTag(TagDefinition definition, String addedBy, DateTime dateAdded);
public void addTags(List<Tag> tags);
public void clearTags();
- public void removeTag(TagDescription description);
+ public void removeTag(TagDefinition definition);
public boolean generateInvoice();
public boolean processPayment();
}
beatrix/pom.xml 2(+1 -1)
diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 32ceef9..9e2fdba 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-beatrix</artifactId>
catalog/pom.xml 2(+1 -1)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 1b5b8d6..1324140 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-catalog</artifactId>
entitlement/pom.xml 7(+6 -1)
diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index f0d0aae..4ed28e9 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-entitlement</artifactId>
@@ -52,6 +52,11 @@
</dependency>
<dependency>
<groupId>com.ning.billing</groupId>
+ <artifactId>killbill-account</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
<artifactId>killbill-util</artifactId>
<type>test-jar</type>
<scope>test</scope>
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
index fd130a9..a228a37 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Ning, Inc.
+w * Copyright 2010-2011 Ning, Inc.
*
* Ning licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java
index f54f902..42d34ad 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java
@@ -148,4 +148,21 @@ public class DefaultEntitlementUserApi implements EntitlementUserApi {
throw new EntitlementUserApiException(e);
}
}
+
+ @Override
+ public DateTime getNextBillingDate(UUID accountId) {
+ List<SubscriptionBundle> bundles = getBundlesForAccount(accountId);
+ DateTime result = null;
+ for(SubscriptionBundle bundle : bundles) {
+ List<Subscription> subscriptions = getSubscriptionsForBundle(bundle.getId());
+ for(Subscription subscription : subscriptions) {
+ DateTime chargedThruDate = subscription.getChargedThroughDate();
+ if(result == null ||
+ (chargedThruDate != null && chargedThruDate.isBefore(result))) {
+ result = subscription.getChargedThroughDate();
+ }
+ }
+ }
+ return result;
+ }
}
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccount.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccount.java
index cc08699..73b7369 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccount.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccount.java
@@ -16,17 +16,17 @@
package com.ning.billing.entitlement.api.billing;
-import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
import com.ning.billing.account.api.Account;
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.util.customfield.CustomField;
import com.ning.billing.util.tag.Tag;
-import com.ning.billing.util.tag.TagDescription;
+import com.ning.billing.util.tag.TagDefinition;
public class BrainDeadAccount implements Account {
@@ -69,7 +69,52 @@ public class BrainDeadAccount implements Account {
throw new UnsupportedOperationException();
}
- @Override
+ @Override
+ public DateTimeZone getTimeZone() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getLocale() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getAddress1() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getAddress2() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getCompanyName() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getCity() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getStateOrProvince() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getPostalCode() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getCountry() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public String getFieldValue(String fieldName) {
throw new UnsupportedOperationException();
}
@@ -109,13 +154,12 @@ public class BrainDeadAccount implements Account {
throw new UnsupportedOperationException();
}
- @Override
- public void addTag(TagDescription description, String addedBy,
- DateTime dateAdded) {
- throw new UnsupportedOperationException();
- }
+ @Override
+ public void addTag(final TagDefinition definition, final String addedBy, final DateTime dateAdded) {
+ throw new UnsupportedOperationException();
+ }
- @Override
+ @Override
public void addTags(List<Tag> tags) {
throw new UnsupportedOperationException();
}
@@ -126,7 +170,7 @@ public class BrainDeadAccount implements Account {
}
@Override
- public void removeTag(TagDescription description) {
+ public void removeTag(TagDefinition definition) {
throw new UnsupportedOperationException();
}
@@ -139,16 +183,20 @@ public class BrainDeadAccount implements Account {
public boolean processPayment() {
throw new UnsupportedOperationException();
}
-
- @Override
- public BigDecimal getBalance() {
- throw new UnsupportedOperationException();
- }
-
@Override
public void addFields(List<CustomField> fields) {
throw new UnsupportedOperationException();
-
+
}
+ @Override
+ public DateTime getCreatedDate() {
+ return new DateTime(DateTimeZone.UTC);
+ }
+
+ @Override
+ public DateTime getUpdatedDate() {
+ return new DateTime(DateTimeZone.UTC);
+ }
+
}
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
index 94f0ea7..967d8b6 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
@@ -60,4 +60,10 @@ public class BrainDeadAccountUserApi implements AccountUserApi {
throw new UnsupportedOperationException();
}
+ @Override
+ public void deleteAccountByKey(String externalKey)
+ throws AccountApiException {
+ throw new UnsupportedOperationException();
+ }
+
}
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
index 9a9d80b..b0483bb 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
@@ -16,12 +16,18 @@
package com.ning.billing.entitlement.api;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
import java.io.IOException;
-import java.lang.reflect.Method;
import java.net.URL;
import java.util.List;
import java.util.UUID;
+
import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
@@ -29,6 +35,7 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
+
import com.google.inject.Injector;
import com.ning.billing.account.api.AccountData;
import com.ning.billing.catalog.DefaultCatalogService;
@@ -43,7 +50,6 @@ import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.catalog.api.TimeUnit;
import com.ning.billing.config.EntitlementConfig;
import com.ning.billing.entitlement.api.ApiTestListener.NextEvent;
-import com.ning.billing.entitlement.api.EntitlementService;
import com.ning.billing.entitlement.api.billing.EntitlementBillingApi;
import com.ning.billing.entitlement.api.migration.EntitlementMigrationApi;
import com.ning.billing.entitlement.api.user.EntitlementUserApi;
@@ -64,11 +70,6 @@ import com.ning.billing.util.clock.ClockMock;
import com.ning.billing.util.eventbus.DefaultEventBusService;
import com.ning.billing.util.eventbus.EventBusService;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
public abstract class TestApiBase {
@@ -290,26 +291,75 @@ public abstract class TestApiBase {
public String getEmail() {
return "accountName@yahoo.com";
}
+
@Override
public String getPhone() {
return "4152876341";
}
+
@Override
public String getExternalKey() {
return "k123456";
}
+
@Override
public int getBillCycleDay() {
return 1;
}
+
@Override
public Currency getCurrency() {
return Currency.USD;
}
+
@Override
public String getPaymentProviderName() {
return "Paypal";
}
+ @Override
+ public DateTimeZone getTimeZone() {
+ return DateTimeZone.forID("Europe/Paris");
+ }
+
+ @Override
+ public String getLocale() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getAddress1() {
+ return null;
+ }
+
+ @Override
+ public String getAddress2() {
+ return null;
+ }
+
+ @Override
+ public String getCompanyName() {
+ return null;
+ }
+
+ @Override
+ public String getCity() {
+ return null;
+ }
+
+ @Override
+ public String getStateOrProvince() {
+ return null;
+ }
+
+ @Override
+ public String getPostalCode() {
+ return null;
+ }
+
+ @Override
+ public String getCountry() {
+ return null;
+ }
};
return accountData;
}
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java b/entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java
index 1555bdb..24bad2c 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java
@@ -16,7 +16,7 @@
package com.ning.billing.entitlement.glue;
-import com.ning.billing.account.glue.AccountModuleMock;
+import com.ning.billing.account.glue.AccountModuleWithMocks;
import com.ning.billing.catalog.glue.CatalogModule;
import com.ning.billing.util.clock.Clock;
import com.ning.billing.util.clock.ClockMock;
@@ -35,7 +35,7 @@ public class MockEngineModule extends EntitlementModule {
super.configure();
install(new EventBusModule());
install(new CatalogModule());
- install(new AccountModuleMock());
+ install(new AccountModuleWithMocks());
}
}
invoice/pom.xml 2(+1 -1)
diff --git a/invoice/pom.xml b/invoice/pom.xml
index 8c939ca..cdc1725 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-invoice</artifactId>
diff --git a/invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java b/invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java
index fac63ba..31006ea 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java
@@ -1,4 +1,5 @@
/*
+
* Copyright 2010-2011 Ning, Inc.
*
* Ning licenses this file to you under the Apache License, version 2.0
@@ -19,13 +20,15 @@ package com.ning.billing.invoice.api.invoice;
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
+
import org.joda.time.DateTime;
-import org.skife.jdbi.v2.IDBI;
+
import com.google.inject.Inject;
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.invoice.api.Invoice;
import com.ning.billing.invoice.api.InvoicePaymentApi;
import com.ning.billing.invoice.dao.InvoiceDao;
+import com.ning.billing.payment.api.InvoicePayment;
public class DefaultInvoicePaymentApi implements InvoicePaymentApi {
private final InvoiceDao dao;
@@ -36,14 +39,14 @@ public class DefaultInvoicePaymentApi implements InvoicePaymentApi {
}
@Override
- public void paymentSuccessful(UUID invoiceId, BigDecimal amount, Currency currency, UUID paymentId, DateTime paymentAttemptDate) {
- dao.notifySuccessfulPayment(invoiceId.toString(), amount, currency.toString(), paymentId.toString(), paymentAttemptDate.toDate());
+ public void notifyOfPaymentAttempt(InvoicePayment invoicePayment) {
+ dao.notifyOfPaymentAttempt(invoicePayment);
}
- @Override
- public void paymentFailed(UUID invoiceId, UUID paymentId, DateTime paymentAttemptDate) {
- dao.notifyFailedPayment(invoiceId.toString(), paymentId.toString(), paymentAttemptDate.toDate());
- }
+// @Override
+// public void paymentFailed(UUID invoiceId, UUID paymentId, DateTime paymentAttemptDate) {
+// dao.notifyFailedPayment(invoiceId.toString(), paymentId.toString(), paymentAttemptDate.toDate());
+// }
@Override
public List<Invoice> getInvoicesByAccount(UUID accountId) {
@@ -54,4 +57,28 @@ public class DefaultInvoicePaymentApi implements InvoicePaymentApi {
public Invoice getInvoice(UUID invoiceId) {
return dao.getById(invoiceId.toString());
}
+
+ @Override
+ public Invoice getInvoiceForPaymentAttemptId(UUID paymentAttemptId) {
+ String invoiceIdStr = dao.getInvoiceIdByPaymentAttemptId(paymentAttemptId);
+ return invoiceIdStr == null ? null : dao.getById(invoiceIdStr);
+ }
+
+ @Override
+ public InvoicePayment getInvoicePayment(UUID paymentAttemptId) {
+ return dao.getInvoicePayment(paymentAttemptId);
+ }
+
+ @Override
+ public void notifyOfPaymentAttempt(UUID invoiceId, BigDecimal amountOutstanding, Currency currency, UUID paymentAttemptId, DateTime paymentAttemptDate) {
+ InvoicePayment invoicePayment = new InvoicePayment(invoiceId, amountOutstanding, currency, paymentAttemptId, paymentAttemptDate);
+ dao.notifyOfPaymentAttempt(invoicePayment);
+ }
+
+ @Override
+ public void notifyOfPaymentAttempt(UUID invoiceId, UUID paymentAttemptId, DateTime paymentAttemptDate) {
+ InvoicePayment invoicePayment = new InvoicePayment(invoiceId, null, null, paymentAttemptId, paymentAttemptDate);
+ dao.notifyOfPaymentAttempt(invoicePayment);
+ }
+
}
diff --git a/invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceCreationNotification.java b/invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceCreationNotification.java
index 094e6f1..5c6785c 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceCreationNotification.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceCreationNotification.java
@@ -18,7 +18,9 @@ package com.ning.billing.invoice.api.user;
import java.math.BigDecimal;
import java.util.UUID;
+
import org.joda.time.DateTime;
+
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.invoice.api.InvoiceCreationNotification;
@@ -61,4 +63,10 @@ public class DefaultInvoiceCreationNotification implements InvoiceCreationNotifi
public DateTime getInvoiceCreationDate() {
return invoiceCreationDate;
}
+
+ @Override
+ public String toString() {
+ return "DefaultInvoiceCreationNotification [invoiceId=" + invoiceId + ", accountId=" + accountId + ", amountOwed=" + amountOwed + ", currency=" + currency + ", invoiceCreationDate=" + invoiceCreationDate + "]";
+ }
+
}
diff --git a/invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java b/invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java
index 22f4990..3bf9846 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java
@@ -16,19 +16,17 @@
package com.ning.billing.invoice.api.user;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+
import com.google.inject.Inject;
-import com.ning.billing.catalog.api.Currency;
import com.ning.billing.invoice.api.Invoice;
import com.ning.billing.invoice.api.InvoiceUserApi;
-import com.ning.billing.invoice.dao.DefaultInvoiceDao;
import com.ning.billing.invoice.dao.InvoiceDao;
-import com.ning.billing.util.eventbus.EventBus;
-import org.joda.time.DateTime;
-import org.skife.jdbi.v2.IDBI;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.UUID;
+import com.ning.billing.payment.api.InvoicePayment;
public class DefaultInvoiceUserApi implements InvoiceUserApi {
private final InvoiceDao dao;
@@ -54,12 +52,14 @@ public class DefaultInvoiceUserApi implements InvoiceUserApi {
}
@Override
- public void paymentAttemptFailed(UUID invoiceId, UUID paymentId, DateTime paymentAttemptDate) {
- dao.notifyFailedPayment(invoiceId.toString(), paymentId.toString(), paymentAttemptDate.toDate());
+ public void notifyOfPaymentAttempt(InvoicePayment invoicePayment) {
+ dao.notifyOfPaymentAttempt(invoicePayment);
}
- @Override
- public void paymentAttemptSuccessful(UUID invoiceId, BigDecimal amount, Currency currency, UUID paymentId, DateTime paymentDate) {
- dao.notifySuccessfulPayment(invoiceId.toString(), amount, currency.toString(), paymentId.toString(), paymentDate.toDate());
- }
+ @Override
+ public BigDecimal getAccountBalance(UUID accountId) {
+ BigDecimal result = dao.getAccountBalance(accountId);
+ return result == null ? BigDecimal.ZERO : result;
+ }
+
}
diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
index 20f33c7..35f03c2 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
@@ -16,24 +16,24 @@
package com.ning.billing.invoice.dao;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
-import com.google.inject.Inject;
-import com.ning.billing.invoice.api.Invoice;
-import com.ning.billing.invoice.api.InvoiceCreationNotification;
-import com.ning.billing.invoice.api.InvoiceItem;
-import com.ning.billing.invoice.api.user.DefaultInvoiceCreationNotification;
-import com.ning.billing.util.eventbus.EventBus;
import org.skife.jdbi.v2.IDBI;
import org.skife.jdbi.v2.Transaction;
import org.skife.jdbi.v2.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import com.google.inject.Inject;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.api.InvoiceCreationNotification;
+import com.ning.billing.invoice.api.InvoiceItem;
+import com.ning.billing.invoice.api.user.DefaultInvoiceCreationNotification;
+import com.ning.billing.payment.api.InvoicePayment;
+import com.ning.billing.util.eventbus.EventBus;
public class DefaultInvoiceDao implements InvoiceDao {
private final InvoiceSqlDao invoiceDao;
@@ -138,17 +138,28 @@ public class DefaultInvoiceDao implements InvoiceDao {
}
@Override
- public void notifySuccessfulPayment(String invoiceId, BigDecimal paymentAmount, String currency, String paymentId, Date paymentDate) {
- invoiceDao.notifySuccessfulPayment(invoiceId, paymentAmount, currency, paymentId, paymentDate);
+ public void notifyOfPaymentAttempt(InvoicePayment invoicePayment) {
+ invoiceDao.notifyOfPaymentAttempt(invoicePayment);
+ }
+
+ @Override
+ public void test() {
+ invoiceDao.test();
}
@Override
- public void notifyFailedPayment(String invoiceId, String paymentId, Date paymentAttemptDate) {
- invoiceDao.notifyFailedPayment(invoiceId, paymentId, paymentAttemptDate);
+ public String getInvoiceIdByPaymentAttemptId(UUID paymentAttemptId) {
+ return invoiceDao.getInvoiceIdByPaymentAttemptId(paymentAttemptId.toString());
}
@Override
- public void test() {
- invoiceDao.test();
+ public InvoicePayment getInvoicePayment(UUID paymentAttemptId) {
+ return invoiceDao.getInvoicePayment(paymentAttemptId);
}
+
+ @Override
+ public BigDecimal getAccountBalance(UUID accountId) {
+ return invoiceDao.getAccountBalance(accountId.toString());
+ }
+
}
diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java
index e9306b2..322c286 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java
@@ -20,7 +20,9 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.UUID;
+
import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.payment.api.InvoicePayment;
public interface InvoiceDao {
void create(Invoice invoice);
@@ -36,15 +38,14 @@ public interface InvoiceDao {
List<UUID> getInvoicesForPayment(final Date targetDate,
final int numberOfDays);
- void notifySuccessfulPayment(final String invoiceId,
- final BigDecimal paymentAmount,
- final String currency,
- final String paymentId,
- final Date paymentDate);
-
- void notifyFailedPayment(final String invoiceId,
- final String paymentId,
- final Date paymentAttemptDate);
+ String getInvoiceIdByPaymentAttemptId(UUID paymentAttemptId);
void test();
+
+ InvoicePayment getInvoicePayment(UUID paymentAttemptId);
+
+ void notifyOfPaymentAttempt(InvoicePayment invoicePayment);
+
+ BigDecimal getAccountBalance(UUID accountId);
+
}
diff --git a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
index 9ede145..1f37102 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
@@ -16,13 +16,22 @@
package com.ning.billing.invoice.dao;
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.invoice.api.Invoice;
-import com.ning.billing.invoice.api.InvoiceItem;
-import com.ning.billing.invoice.model.DefaultInvoice;
-import com.ning.billing.util.UuidMapper;
-import com.ning.billing.util.entity.EntityDao;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
import org.skife.jdbi.v2.SQLStatement;
import org.skife.jdbi.v2.StatementContext;
import org.skife.jdbi.v2.sqlobject.Bind;
@@ -38,15 +47,13 @@ import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3;
import org.skife.jdbi.v2.tweak.ResultSetMapper;
-import java.lang.annotation.*;
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.api.InvoiceItem;
+import com.ning.billing.invoice.model.DefaultInvoice;
+import com.ning.billing.payment.api.InvoicePayment;
+import com.ning.billing.util.UuidMapper;
+import com.ning.billing.util.entity.EntityDao;
@ExternalizedSqlViaStringTemplate3()
@RegisterMapper({UuidMapper.class, InvoiceSqlDao.InvoiceMapper.class})
@@ -66,29 +73,50 @@ public interface InvoiceSqlDao extends EntityDao<Invoice>, Transactional<Invoice
List<Invoice> getInvoicesBySubscription(@Bind("subscriptionId") final String subscriptionId);
@SqlQuery
+ String getInvoiceIdByPaymentAttemptId(@Bind("paymentAttemptId") final String paymentAttemptId);
+
+ @SqlQuery
List<UUID> getInvoicesForPayment(@Bind("targetDate") final Date targetDate,
@Bind("numberOfDays") final int numberOfDays);
- @SqlUpdate
- void notifySuccessfulPayment(@Bind("invoiceId") final String invoiceId,
- @Bind("amount") final BigDecimal paymentAmount,
- @Bind("currency") final String currency,
- @Bind("paymentId") final String paymentId,
- @Bind("paymentDate") final Date paymentDate);
+ @SqlQuery
+ InvoicePayment getInvoicePayment(@Bind("paymentAttemptId") UUID paymentAttemptId);
@SqlUpdate
- void notifyFailedPayment(@Bind("invoiceId") final String invoiceId,
- @Bind("paymentId") final String paymentId,
- @Bind("paymentAttemptDate") final Date paymentAttemptDate);
+ void notifyOfPaymentAttempt(@Bind(binder = InvoicePaymentBinder.class) InvoicePayment invoicePayment);
+
+ @SqlQuery
+ @RegisterMapper(BalanceMapper.class)
+ BigDecimal getAccountBalance(@Bind("accountId") final String accountId);
+
+ public static class BalanceMapper implements ResultSetMapper<BigDecimal> {
+ @Override
+ public BigDecimal map(final int index, final ResultSet result, final StatementContext context) throws SQLException {
+ BigDecimal amount_invoiced = result.getBigDecimal("amount_invoiced");
+ BigDecimal amount_paid = result.getBigDecimal("amount_paid");
+
+ if (amount_invoiced == null) {
+ amount_invoiced = BigDecimal.ZERO;
+ }
+
+ if (amount_paid == null) {
+ amount_paid = BigDecimal.ZERO;
+ }
+
+ return amount_invoiced.subtract(amount_paid);
+ };
+ }
@BindingAnnotation(InvoiceBinder.InvoiceBinderFactory.class)
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.PARAMETER})
public @interface InvoiceBinder {
public static class InvoiceBinderFactory implements BinderFactory {
- public Binder build(Annotation annotation) {
+ @Override
+ public Binder<InvoiceBinder, Invoice> build(Annotation annotation) {
return new Binder<InvoiceBinder, Invoice>() {
- public void bind(SQLStatement q, InvoiceBinder bind, Invoice invoice) {
+ @Override
+ public void bind(@SuppressWarnings("rawtypes") SQLStatement q, InvoiceBinder bind, Invoice invoice) {
q.bind("id", invoice.getId().toString());
q.bind("accountId", invoice.getAccountId().toString());
q.bind("invoiceDate", invoice.getInvoiceDate().toDate());
@@ -122,5 +150,43 @@ public interface InvoiceSqlDao extends EntityDao<Invoice>, Transactional<Invoice
return new DefaultInvoice(id, accountId, invoiceDate, targetDate, currency, lastPaymentAttempt, amountPaid, new ArrayList<InvoiceItem>());
}
}
+
+ @SqlUpdate
+ void notifyFailedPayment(@Bind(binder = InvoicePaymentBinder.class) InvoicePayment invoicePayment);
+
+ public static final class InvoicePaymentBinder implements Binder<Bind, InvoicePayment> {
+
+ @Override
+ public void bind(@SuppressWarnings("rawtypes") SQLStatement stmt, Bind bind, InvoicePayment invoicePayment) {
+ stmt.bind("invoice_id", invoicePayment.getInvoiceId().toString());
+ stmt.bind("amount", invoicePayment.getAmount());
+ stmt.bind("currency", invoicePayment.getCurrency().toString());
+ stmt.bind("payment_attempt_id", invoicePayment.getPaymentAttemptId().toString());
+ stmt.bind("payment_attempt_date", invoicePayment.getPaymentAttemptDate() == null ? null : invoicePayment.getPaymentAttemptDate().toDate());
+ }
+ }
+
+
+ public static class InvoicePaymentMapper implements ResultSetMapper<InvoicePayment> {
+
+ private DateTime getDate(ResultSet rs, String fieldName) throws SQLException {
+ final Timestamp resultStamp = rs.getTimestamp(fieldName);
+ return rs.wasNull() ? null : new DateTime(resultStamp).toDateTime(DateTimeZone.UTC);
+ }
+
+ @Override
+ public InvoicePayment map(int index, ResultSet rs, StatementContext ctx) throws SQLException {
+
+ UUID invoiceId = UUID.fromString(rs.getString("invoice_id"));
+ BigDecimal amount = rs.getBigDecimal("amount");
+ Currency currency = Currency.valueOf(rs.getString("currency"));
+ UUID paymentAttemptId = UUID.fromString(rs.getString("payment_attempt_id"));
+ DateTime paymentAttemptDate = getDate(rs, "payment_attempt_date");
+
+ return new InvoicePayment(invoiceId, amount, currency, paymentAttemptId, paymentAttemptDate);
+ }
+ }
+
+
}
diff --git a/invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java b/invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java
index 54990c5..0e1c657 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java
@@ -18,14 +18,14 @@ package com.ning.billing.invoice.glue;
import com.google.inject.AbstractModule;
import com.ning.billing.invoice.api.InvoicePaymentApi;
+import com.ning.billing.invoice.api.InvoiceUserApi;
import com.ning.billing.invoice.api.invoice.DefaultInvoicePaymentApi;
import com.ning.billing.invoice.api.user.DefaultInvoiceUserApi;
-import com.ning.billing.invoice.api.InvoiceUserApi;
import com.ning.billing.invoice.dao.DefaultInvoiceDao;
import com.ning.billing.invoice.dao.InvoiceDao;
public class InvoiceModule extends AbstractModule {
- private void installInvoiceDao() {
+ protected void installInvoiceDao() {
bind(InvoiceDao.class).to(DefaultInvoiceDao.class).asEagerSingleton();
}
diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java b/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
index 97f82e0..17926f7 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
@@ -16,26 +16,27 @@
package com.ning.billing.invoice.model;
-import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.invoice.api.Invoice;
-import com.ning.billing.invoice.api.InvoiceItem;
-import com.ning.billing.util.clock.DefaultClock;
-import org.joda.time.DateTime;
-
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import org.joda.time.DateTime;
+
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.api.InvoiceItem;
+import com.ning.billing.util.clock.DefaultClock;
+
public class DefaultInvoice implements Invoice {
private final InvoiceItemList items = new InvoiceItemList();
private final UUID id;
- private UUID accountId;
+ private final UUID accountId;
private final DateTime invoiceDate;
private final DateTime targetDate;
- private Currency currency;
- private BigDecimal amountPaid;
- private DateTime lastPaymentAttempt;
+ private final Currency currency;
+ private final BigDecimal amountPaid;
+ private final DateTime lastPaymentAttempt;
public DefaultInvoice(UUID accountId, DateTime targetDate, Currency currency) {
this(UUID.randomUUID(), accountId, new DefaultClock().getUTCNow(), targetDate, currency, null, BigDecimal.ZERO, new ArrayList<InvoiceItem>());
@@ -136,5 +137,11 @@ public class DefaultInvoice implements Invoice {
return lastPaymentAttempt.plusDays(numberOfDays).isBefore(targetDate);
}
+
+ @Override
+ public String toString() {
+ return "DefaultInvoice [items=" + items + ", id=" + id + ", accountId=" + accountId + ", invoiceDate=" + invoiceDate + ", targetDate=" + targetDate + ", currency=" + currency + ", amountPaid=" + amountPaid + ", lastPaymentAttempt=" + lastPaymentAttempt + "]";
+ }
+
}
diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java b/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java
index 3b9311e..34a63b2 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceGenerator.java
@@ -33,7 +33,6 @@ import com.ning.billing.catalog.api.CatalogApiException;
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.entitlement.api.billing.BillingEvent;
import com.ning.billing.entitlement.api.billing.BillingModeType;
-import com.ning.billing.invoice.api.BillingEventSet;
import com.ning.billing.invoice.api.Invoice;
import com.ning.billing.invoice.api.InvoiceItem;
diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java b/invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java
index 6066a75..b4d81a7 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/InvoiceGenerator.java
@@ -17,7 +17,6 @@
package com.ning.billing.invoice.model;
import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.invoice.api.BillingEventSet;
import com.ning.billing.invoice.api.Invoice;
import org.joda.time.DateTime;
diff --git a/invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg b/invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
index 8766e18..5d5725d 100644
--- a/invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
+++ b/invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
@@ -2,7 +2,7 @@ group InvoiceDao;
get() ::= <<
SELECT i.id, i.account_id, i.invoice_date, i.target_date, i.currency, SUM(ii.amount) AS amount,
- SUM(ip.amount) AS amount_paid, MAX(ip.payment_date) AS last_payment_attempt
+ SUM(ip.amount) AS amount_paid, MAX(ip.payment_attempt_date) AS last_payment_attempt
FROM invoices i
LEFT JOIN invoice_payments ip ON ip.invoice_id = i.id
LEFT JOIN invoice_items ii ON ii.invoice_id = i.id
@@ -12,7 +12,7 @@ get() ::= <<
getInvoicesByAccount() ::= <<
SELECT i.id, i.account_id, i.invoice_date, i.target_date, i.currency, SUM(ii.amount) AS amount,
- SUM(ip.amount) AS amount_paid, MAX(ip.payment_date) AS last_payment_attempt
+ SUM(ip.amount) AS amount_paid, MAX(ip.payment_attempt_date) AS last_payment_attempt
FROM invoices i
LEFT JOIN invoice_payments ip ON ip.invoice_id = i.id
LEFT JOIN invoice_items ii ON ii.invoice_id = i.id
@@ -23,7 +23,7 @@ getInvoicesByAccount() ::= <<
getInvoicesBySubscription() ::= <<
SELECT i.id, i.account_id, i.invoice_date, i.target_date, i.currency, SUM(ii.amount) AS amount,
- SUM(ip.amount) AS amount_paid, MAX(ip.payment_date) AS last_payment_attempt
+ SUM(ip.amount) AS amount_paid, MAX(ip.payment_attempt_date) AS last_payment_attempt
FROM invoices i
LEFT JOIN invoice_items ii ON i.id = ii.invoice_id
LEFT JOIN invoice_payments ip ON ip.invoice_id = i.id
@@ -44,7 +44,7 @@ getInvoicesForPayment() ::= <<
getById() ::= <<
SELECT i.id, i.account_id, i.invoice_date, i.target_date, i.currency, SUM(ii.amount) AS amount,
- SUM(ip.amount) AS amount_paid, MAX(ip.payment_date) AS last_payment_attempt
+ SUM(ip.amount) AS amount_paid, MAX(ip.payment_attempt_date) AS last_payment_attempt
FROM invoices i
LEFT JOIN invoice_items ii ON i.id = ii.invoice_id
LEFT JOIN invoice_payments ip ON ip.invoice_id = i.id
@@ -57,20 +57,37 @@ create() ::= <<
VALUES (:id, :accountId, :invoiceDate, :targetDate, :currency);
>>
+getInvoiceIdByPaymentAttemptId() ::= <<
+ SELECT i.id
+ FROM invoices i, invoice_payments ip
+ WHERE ip.invoice_id = i.id
+ AND ip.payment_attempt_id = :paymentAttemptId
+>>
+
update() ::= <<
UPDATE invoices
SET account_id = :accountId, invoice_date = :invoiceDate, target_date = :targetDate, currency = :currency
WHERE id = :id;
>>
-notifySuccessfulPayment() ::= <<
- INSERT INTO invoice_payments(invoice_id, payment_id, payment_date, amount, currency)
- VALUES(:invoiceId, :paymentId, :paymentDate, :amount, :currency);
+notifyOfPaymentAttempt() ::= <<
+ INSERT INTO invoice_payments(invoice_id, payment_attempt_id, payment_attempt_date, amount, currency, created_date, updated_date)
+ VALUES(:invoice_id, :payment_attempt_id, :payment_attempt_date, :amount, :currency, NOW(), NOW());
>>
-notifyFailedPayment() ::= <<
- INSERT INTO invoice_payments(invoice_id, payment_id, payment_date)
- VALUES(:invoiceId, :paymentId, :paymentAttemptDate);
+getInvoicePayment() ::= <<
+ SELECT invoice_id, payment_attempt_id, payment_attempt_date, amount, currency, created_date, updated_date
+ FROM invoice_payments
+ WHERE payment_id = :payment_id
+>>
+
+getAccountBalance() ::= <<
+ SELECT SUM(iis.total_amount) AS amount_invoiced, SUM(ips.total_paid) AS amount_paid
+ FROM invoices i
+ LEFT JOIN invoice_payment_summary ips ON i.id = ips.invoice_id
+ LEFT JOIN invoice_item_summary iis ON i.id = iis.invoice_id
+ WHERE i.account_id = :accountId
+ GROUP BY i.account_id;
>>
test() ::= <<
diff --git a/invoice/src/main/resources/com/ning/billing/invoice/ddl.sql b/invoice/src/main/resources/com/ning/billing/invoice/ddl.sql
index a3ff37d..651e9d4 100644
--- a/invoice/src/main/resources/com/ning/billing/invoice/ddl.sql
+++ b/invoice/src/main/resources/com/ning/billing/invoice/ddl.sql
@@ -11,7 +11,6 @@ CREATE TABLE invoice_items (
currency char(3) NOT NULL,
PRIMARY KEY(id)
) ENGINE=innodb;
-
CREATE INDEX invoice_items_subscription_id ON invoice_items(subscription_id ASC);
DROP TABLE IF EXISTS invoices;
@@ -23,23 +22,24 @@ CREATE TABLE invoices (
currency char(3) NOT NULL,
PRIMARY KEY(id)
) ENGINE=innodb;
-
CREATE INDEX invoices_account_id ON invoices(account_id ASC);
DROP TABLE IF EXISTS invoice_payments;
CREATE TABLE invoice_payments (
invoice_id char(36) NOT NULL,
- payment_id char(36) NOT NULL,
- payment_date datetime NOT NULL,
+ payment_attempt_id char(36) COLLATE utf8_bin NOT NULL,
+ payment_attempt_date datetime,
amount numeric(10,4),
currency char(3),
- PRIMARY KEY(invoice_id, payment_id)
+ created_date datetime NOT NULL,
+ updated_date datetime NOT NULL,
+ PRIMARY KEY(invoice_id, payment_attempt_id)
) ENGINE=innodb;
-CREATE UNIQUE INDEX invoice_payments_unique ON invoice_payments(invoice_id, payment_id);
+CREATE UNIQUE INDEX invoice_payments_unique ON invoice_payments(invoice_id, payment_attempt_id);
DROP VIEW IF EXISTS invoice_payment_summary;
CREATE VIEW invoice_payment_summary AS
-SELECT invoice_id, SUM(amount) AS total_paid, MAX(payment_date) AS last_payment_date
+SELECT invoice_id, SUM(amount) AS total_paid, MAX(payment_attempt_date) AS last_payment_date
FROM invoice_payments
GROUP BY invoice_id;
diff --git a/invoice/src/test/java/com/ning/billing/invoice/api/MockInvoicePaymentApi.java b/invoice/src/test/java/com/ning/billing/invoice/api/MockInvoicePaymentApi.java
new file mode 100644
index 0000000..37d5f0c
--- /dev/null
+++ b/invoice/src/test/java/com/ning/billing/invoice/api/MockInvoicePaymentApi.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.invoice.api;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.joda.time.DateTime;
+
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.payment.api.InvoicePayment;
+
+public class MockInvoicePaymentApi implements InvoicePaymentApi
+{
+ private final CopyOnWriteArrayList<Invoice> invoices = new CopyOnWriteArrayList<Invoice>();
+ private final CopyOnWriteArrayList<InvoicePayment> invoicePayments = new CopyOnWriteArrayList<InvoicePayment>();
+
+ public void add(Invoice invoice) {
+ invoices.add(invoice);
+ }
+
+ @Override
+ public void notifyOfPaymentAttempt(InvoicePayment invoicePayment) {
+ for (InvoicePayment existingInvoicePayment : invoicePayments) {
+ if (existingInvoicePayment.getInvoiceId().equals(invoicePayment.getInvoiceId()) && existingInvoicePayment.getPaymentAttemptId().equals(invoicePayment.getPaymentAttemptId())) {
+ invoicePayments.remove(existingInvoicePayment);
+ }
+ }
+ invoicePayments.add(invoicePayment);
+ }
+
+ @Override
+ public List<Invoice> getInvoicesByAccount(UUID accountId) {
+ ArrayList<Invoice> result = new ArrayList<Invoice>();
+
+ for (Invoice invoice : invoices) {
+ if (accountId.equals(invoice.getAccountId())) {
+ result.add(invoice);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Invoice getInvoice(UUID invoiceId) {
+ for (Invoice invoice : invoices) {
+ if (invoiceId.equals(invoice.getId())) {
+ return invoice;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public Invoice getInvoiceForPaymentAttemptId(UUID paymentAttemptId) {
+ for (InvoicePayment invoicePayment : invoicePayments) {
+ if (invoicePayment.getPaymentAttemptId().equals(paymentAttemptId)) {
+ return getInvoice(invoicePayment.getInvoiceId());
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public InvoicePayment getInvoicePayment(UUID paymentAttemptId) {
+ for (InvoicePayment invoicePayment : invoicePayments) {
+ if (paymentAttemptId.equals(invoicePayment.getPaymentAttemptId())) {
+ return invoicePayment;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void notifyOfPaymentAttempt(UUID invoiceId, BigDecimal amountOutstanding, Currency currency, UUID paymentAttemptId, DateTime paymentAttemptDate) {
+ InvoicePayment invoicePayment = new InvoicePayment(invoiceId, amountOutstanding, currency, paymentAttemptId, paymentAttemptDate);
+ notifyOfPaymentAttempt(invoicePayment);
+ }
+
+ @Override
+ public void notifyOfPaymentAttempt(UUID invoiceId, UUID paymentAttemptId, DateTime paymentAttemptDate) {
+ InvoicePayment invoicePayment = new InvoicePayment(invoiceId, null, null, paymentAttemptId, paymentAttemptDate);
+ notifyOfPaymentAttempt(invoicePayment);
+ }
+}
diff --git a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
index 268aaf5..ed5497f 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
@@ -16,27 +16,32 @@
package com.ning.billing.invoice.dao;
+import static org.testng.Assert.fail;
+
import java.io.IOException;
+
import org.apache.commons.io.IOUtils;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
+
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Stage;
-import com.ning.billing.invoice.glue.InvoiceModuleMock;
+import com.ning.billing.invoice.glue.InvoiceModuleWithEmbeddedDb;
import com.ning.billing.util.eventbus.DefaultEventBusService;
import com.ning.billing.util.eventbus.EventBusService;
-import static org.testng.Assert.fail;
-
public abstract class InvoiceDaoTestBase {
protected InvoiceDao invoiceDao;
protected InvoiceItemSqlDao invoiceItemDao;
+ private InvoiceModuleWithEmbeddedDb module;
@BeforeClass()
protected void setup() throws IOException {
// Health check test to make sure MySQL is setup properly
try {
- InvoiceModuleMock module = new InvoiceModuleMock();
+
+ module = new InvoiceModuleWithEmbeddedDb();
final String ddl = IOUtils.toString(DefaultInvoiceDao.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
module.createDb(ddl);
@@ -54,4 +59,10 @@ public abstract class InvoiceDaoTestBase {
fail(t.toString());
}
}
+
+ @AfterClass(alwaysRun = true)
+ public void stopMysql()
+ {
+ module.stopDb();
+ }
}
diff --git a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
index 3fe72ed..859e09b 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
@@ -16,25 +16,28 @@
package com.ning.billing.invoice.dao;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+
import org.joda.time.DateTime;
-import org.joda.time.Days;
+import org.joda.time.DateTimeZone;
import org.testng.annotations.Test;
+
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.invoice.api.Invoice;
import com.ning.billing.invoice.api.InvoiceItem;
import com.ning.billing.invoice.model.DefaultInvoice;
import com.ning.billing.invoice.model.DefaultInvoiceItem;
+import com.ning.billing.payment.api.InvoicePayment;
import com.ning.billing.util.clock.DefaultClock;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
@Test(groups = {"invoicing", "invoicing-invoiceDao"})
public class InvoiceDaoTests extends InvoiceDaoTestBase {
private final int NUMBER_OF_DAY_BETWEEN_RETRIES = 8;
@@ -78,8 +81,9 @@ public class InvoiceDaoTests extends InvoiceDaoTestBase {
assertEquals(savedInvoice.getItems().size(), 1);
BigDecimal paymentAmount = new BigDecimal("11.00");
- String paymentId = UUID.randomUUID().toString();
- invoiceDao.notifySuccessfulPayment(invoiceId.toString(), paymentAmount, Currency.USD.toString(), paymentId, new DefaultClock().getUTCNow().plusDays(12).toDate());
+ UUID paymentAttemptId = UUID.randomUUID();
+
+ invoiceDao.notifyOfPaymentAttempt(new InvoicePayment(invoiceId, paymentAmount, Currency.USD, paymentAttemptId, new DateTime(DateTimeZone.UTC).plusDays(12)));
Invoice retrievedInvoice = invoiceDao.getById(invoiceId.toString());
assertNotNull(retrievedInvoice);
@@ -101,12 +105,13 @@ public class InvoiceDaoTests extends InvoiceDaoTestBase {
DateTime targetDate = new DateTime(2011, 10, 6, 0, 0, 0, 0);
Invoice invoice = new DefaultInvoice(accountId, targetDate, Currency.USD);
- String paymentId = UUID.randomUUID().toString();
+ UUID paymentAttemptId = UUID.randomUUID();
DateTime paymentAttemptDate = new DateTime(2011, 6, 24, 12, 14, 36, 0);
BigDecimal paymentAmount = new BigDecimal("14.0");
invoiceDao.create(invoice);
- invoiceDao.notifySuccessfulPayment(invoice.getId().toString(), paymentAmount, Currency.USD.toString(), paymentId, paymentAttemptDate.toDate());
+
+ invoiceDao.notifyOfPaymentAttempt(new InvoicePayment(invoice.getId(), paymentAmount, Currency.USD, paymentAttemptId, paymentAttemptDate));
invoice = invoiceDao.getById(invoice.getId().toString());
assertEquals(invoice.getAmountPaid().compareTo(paymentAmount), 0);
@@ -122,7 +127,7 @@ public class InvoiceDaoTests extends InvoiceDaoTestBase {
DateTime paymentAttemptDate = new DateTime(2011, 6, 24, 12, 14, 36, 0);
invoiceDao.create(invoice);
- invoiceDao.notifyFailedPayment(invoice.getId().toString(), UUID.randomUUID().toString(), paymentAttemptDate.toDate());
+ invoiceDao.notifyOfPaymentAttempt(new InvoicePayment(invoice.getId(), UUID.randomUUID(), paymentAttemptDate));
invoice = invoiceDao.getById(invoice.getId().toString());
assertTrue(invoice.getLastPaymentAttempt().equals(paymentAttemptDate));
@@ -132,11 +137,11 @@ public class InvoiceDaoTests extends InvoiceDaoTestBase {
public void testGetInvoicesForPaymentWithNoResults() {
DateTime notionalDate = new DateTime();
DateTime targetDate = new DateTime(2011, 10, 6, 0, 0, 0, 0);
-
+
// determine the number of existing invoices available for payment (to avoid side effects from other tests)
List<UUID> invoices = invoiceDao.getInvoicesForPayment(notionalDate.toDate(), NUMBER_OF_DAY_BETWEEN_RETRIES);
int existingInvoiceCount = invoices.size();
-
+
UUID accountId = UUID.randomUUID();
Invoice invoice = new DefaultInvoice(accountId, targetDate, Currency.USD);
@@ -174,7 +179,7 @@ public class InvoiceDaoTests extends InvoiceDaoTestBase {
// attempt a payment; ensure that the number of invoices for payment has decreased by 1
// (no retries for NUMBER_OF_DAYS_BETWEEN_RETRIES days)
- invoiceDao.notifyFailedPayment(invoice.getId().toString(), UUID.randomUUID().toString(), notionalDate.toDate());
+ invoiceDao.notifyOfPaymentAttempt(new InvoicePayment(invoice.getId(), UUID.randomUUID(), notionalDate));
invoices = invoiceDao.getInvoicesForPayment(notionalDate.toDate(), NUMBER_OF_DAY_BETWEEN_RETRIES);
count = getInvoicesDueForPaymentAttempt(invoiceDao.get(), notionalDate).size();
assertEquals(invoices.size(), count);
@@ -187,7 +192,8 @@ public class InvoiceDaoTests extends InvoiceDaoTestBase {
assertEquals(invoices.size(), count);
// post successful partial payment; ensure that number of invoices for payment has decreased by 1
- invoiceDao.notifySuccessfulPayment(invoiceId.toString(), new BigDecimal("22.0000"), Currency.USD.toString(), UUID.randomUUID().toString(), notionalDate.toDate());
+ invoiceDao.notifyOfPaymentAttempt(new InvoicePayment(invoice.getId(), new BigDecimal("22.0000"), Currency.USD, UUID.randomUUID(), notionalDate));
+
invoices = invoiceDao.getInvoicesForPayment(notionalDate.toDate(), NUMBER_OF_DAY_BETWEEN_RETRIES);
count = getInvoicesDueForPaymentAttempt(invoiceDao.get(), notionalDate).size();
assertEquals(invoices.size(), count);
@@ -204,7 +210,8 @@ public class InvoiceDaoTests extends InvoiceDaoTestBase {
assertEquals(invoices.size(), count);
// post completed payment; ensure that the number of invoices for payment has decreased by 1
- invoiceDao.notifySuccessfulPayment(invoiceId.toString(), new BigDecimal("5.0000"), Currency.USD.toString(), UUID.randomUUID().toString(), notionalDate.toDate());
+ invoiceDao.notifyOfPaymentAttempt(new InvoicePayment(invoice.getId(), new BigDecimal("5.0000"), Currency.USD, UUID.randomUUID(), notionalDate));
+
invoices = invoiceDao.getInvoicesForPayment(notionalDate.toDate(), NUMBER_OF_DAY_BETWEEN_RETRIES);
count = getInvoicesDueForPaymentAttempt(invoiceDao.get(), notionalDate).size();
assertEquals(invoices.size(), count);
@@ -299,4 +306,73 @@ public class InvoiceDaoTests extends InvoiceDaoTestBase {
assertEquals(items4.size(), 1);
}
+ @Test
+ public void testAccountBalance() {
+ UUID accountId = UUID.randomUUID();
+ DateTime targetDate1 = new DateTime(2011, 10, 6, 0, 0, 0, 0);
+ Invoice invoice1 = new DefaultInvoice(accountId, targetDate1, Currency.USD);
+ invoiceDao.create(invoice1);
+
+ DateTime startDate = new DateTime(2011, 3, 1, 0, 0, 0, 0);
+ DateTime endDate = startDate.plusMonths(1);
+
+ BigDecimal rate1 = new BigDecimal("17.0");
+ BigDecimal rate2 = new BigDecimal("42.0");
+
+ DefaultInvoiceItem item1 = new DefaultInvoiceItem(invoice1.getId(), UUID.randomUUID(), startDate, endDate, "test A", rate1, rate1, Currency.USD);
+ invoiceItemDao.create(item1);
+
+ DefaultInvoiceItem item2 = new DefaultInvoiceItem(invoice1.getId(), UUID.randomUUID(), startDate, endDate, "test B", rate2, rate2, Currency.USD);
+ invoiceItemDao.create(item2);
+
+ BigDecimal payment1 = new BigDecimal("48.0");
+
+ // TODO - reenable when DefaultInvoicePayement is visible in this branch
+ //InvoicePayment payment = new DefaultInvoicePayment(invoice1.getId(), new DateTime(), payment1, Currency.USD);
+ //invoicePaymentDao.create(payment);
+ //
+ //BigDecimal balance = invoiceDao.getAccountBalance(accountId);
+ //assertEquals(balance.compareTo(rate1.add(rate2).subtract(payment1)), 0);
+
+ }
+
+ @Test
+ public void testAccountBalanceWithNoPayments() {
+ UUID accountId = UUID.randomUUID();
+ DateTime targetDate1 = new DateTime(2011, 10, 6, 0, 0, 0, 0);
+ Invoice invoice1 = new DefaultInvoice(accountId, targetDate1, Currency.USD);
+ invoiceDao.create(invoice1);
+
+ DateTime startDate = new DateTime(2011, 3, 1, 0, 0, 0, 0);
+ DateTime endDate = startDate.plusMonths(1);
+
+ BigDecimal rate1 = new BigDecimal("17.0");
+ BigDecimal rate2 = new BigDecimal("42.0");
+
+ DefaultInvoiceItem item1 = new DefaultInvoiceItem(invoice1.getId(), UUID.randomUUID(), startDate, endDate, "test A", rate1, rate1, Currency.USD);
+ invoiceItemDao.create(item1);
+
+ DefaultInvoiceItem item2 = new DefaultInvoiceItem(invoice1.getId(), UUID.randomUUID(), startDate, endDate, "test B", rate2, rate2, Currency.USD);
+ invoiceItemDao.create(item2);
+
+ BigDecimal balance = invoiceDao.getAccountBalance(accountId);
+ assertEquals(balance.compareTo(rate1.add(rate2)), 0);
+ }
+
+
+ @Test
+ public void testAccountBalanceWithNoInvoiceItems() {
+ UUID accountId = UUID.randomUUID();
+ DateTime targetDate1 = new DateTime(2011, 10, 6, 0, 0, 0, 0);
+ Invoice invoice1 = new DefaultInvoice(accountId, targetDate1, Currency.USD);
+ invoiceDao.create(invoice1);
+
+ // TODO - reenable when DefaultInvoicePayement is visible in this branch
+ //BigDecimal payment1 = new BigDecimal("48.0");
+ //InvoicePayment payment = new DefaultInvoicePayment(invoice1.getId(), new DateTime(), payment1, Currency.USD);
+ //invoicePaymentDao.create(payment);
+ //
+ //BigDecimal balance = invoiceDao.getAccountBalance(accountId);
+ //assertEquals(balance.compareTo(BigDecimal.ZERO.subtract(payment1)), 0);
+ }
}
diff --git a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceItemDaoTests.java b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceItemDaoTests.java
index fa743ff..dc2afd8 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceItemDaoTests.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceItemDaoTests.java
@@ -21,7 +21,7 @@ import com.google.inject.Injector;
import com.google.inject.Stage;
import com.ning.billing.catalog.api.Currency;
import com.ning.billing.invoice.api.InvoiceItem;
-import com.ning.billing.invoice.glue.InvoiceModuleMock;
+import com.ning.billing.invoice.glue.InvoiceModuleWithEmbeddedDb;
import com.ning.billing.invoice.model.DefaultInvoice;
import com.ning.billing.invoice.model.DefaultInvoiceItem;
import org.apache.commons.io.IOUtils;
diff --git a/invoice/src/test/java/com/ning/billing/invoice/dao/MockInvoiceDao.java b/invoice/src/test/java/com/ning/billing/invoice/dao/MockInvoiceDao.java
new file mode 100644
index 0000000..2ef150c
--- /dev/null
+++ b/invoice/src/test/java/com/ning/billing/invoice/dao/MockInvoiceDao.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.invoice.dao;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+
+import com.google.inject.Inject;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.api.InvoiceItem;
+import com.ning.billing.invoice.api.user.DefaultInvoiceCreationNotification;
+import com.ning.billing.invoice.model.DefaultInvoice;
+import com.ning.billing.payment.api.InvoicePayment;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
+
+public class MockInvoiceDao implements InvoiceDao {
+ private final EventBus eventBus;
+ private final Object monitor = new Object();
+ private final Map<String, Invoice> invoices = new LinkedHashMap<String, Invoice>();
+ private final Map<UUID, InvoicePayment> invoicePayments = new LinkedHashMap<UUID, InvoicePayment>();
+
+ @Inject
+ public MockInvoiceDao(EventBus eventBus) {
+ this.eventBus = eventBus;
+ }
+
+ @Override
+ public void create(Invoice invoice) {
+ synchronized (monitor) {
+ invoices.put(invoice.getId().toString(), invoice);
+ }
+ try {
+ eventBus.post(new DefaultInvoiceCreationNotification(invoice.getId(), invoice.getAccountId(),
+ invoice.getAmountOutstanding(), invoice.getCurrency(),
+ invoice.getInvoiceDate()));
+ }
+ catch (EventBusException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ private Invoice munge(Invoice invoice) {
+ if (invoice == null) {
+ return null;
+ }
+
+ DateTime lastPaymentDate = null;
+ BigDecimal amountPaid = new BigDecimal("0");
+
+ for (InvoicePayment invoicePayment : invoicePayments.values()) {
+ if (invoicePayment.getInvoiceId().equals(invoice.getId().toString())) {
+ if (lastPaymentDate == null || lastPaymentDate.isBefore(invoicePayment.getPaymentAttemptDate())) {
+ lastPaymentDate = invoicePayment.getPaymentAttemptDate();
+ }
+ if (invoicePayment.getAmount() != null) {
+ amountPaid.add(invoicePayment.getAmount());
+ }
+ }
+ }
+ return new DefaultInvoice(invoice.getId(),
+ invoice.getAccountId(),
+ invoice.getInvoiceDate(),
+ invoice.getTargetDate(),
+ invoice.getCurrency(),
+ lastPaymentDate,
+ amountPaid,
+ invoice.getItems());
+ }
+
+ private List<Invoice> munge(Collection<Invoice> invoices) {
+ List<Invoice> result = new ArrayList<Invoice>();
+ for (Invoice invoice : invoices) {
+ result.add(munge(invoice));
+ }
+ return result;
+ }
+
+ @Override
+ public Invoice getById(String id) {
+ synchronized (monitor) {
+ return munge(invoices.get(id));
+ }
+ }
+
+ @Override
+ public List<Invoice> get() {
+ synchronized (monitor) {
+ return munge(invoices.values());
+ }
+ }
+
+ @Override
+ public List<Invoice> getInvoicesByAccount(String accountId) {
+ List<Invoice> result = new ArrayList<Invoice>();
+
+ synchronized (monitor) {
+ for (Invoice invoice : invoices.values()) {
+ if (accountId.equals(invoice.getAccountId().toString())) {
+ result.add(invoice);
+ }
+ }
+ }
+ return munge(result);
+ }
+
+ @Override
+ public List<Invoice> getInvoicesBySubscription(String subscriptionId) {
+ List<Invoice> result = new ArrayList<Invoice>();
+
+ synchronized (monitor) {
+ for (Invoice invoice : invoices.values()) {
+ for (InvoiceItem item : invoice.getItems()) {
+ if (subscriptionId.equals(item.getSubscriptionId().toString())) {
+ result.add(invoice);
+ break;
+ }
+ }
+ }
+ }
+ return munge(result);
+ }
+
+ @Override
+ public List<UUID> getInvoicesForPayment(Date targetDate, int numberOfDays) {
+ Set<UUID> result = new LinkedHashSet<UUID>();
+
+ synchronized (monitor) {
+ for (InvoicePayment invoicePayment : invoicePayments.values()) {
+ Invoice invoice = invoices.get(invoicePayment.getInvoiceId());
+ if ((invoice != null) &&
+ (((invoicePayment.getPaymentAttemptDate() == null) || !invoicePayment.getPaymentAttemptDate().plusDays(numberOfDays).isAfter(targetDate.getTime())) &&
+ (invoice.getTotalAmount() != null) && invoice.getTotalAmount().doubleValue() >= 0) &&
+ ((invoicePayment.getAmount() == null) || invoicePayment.getAmount().doubleValue() >= invoice.getTotalAmount().doubleValue())) {
+ result.add(invoice.getId());
+ }
+ }
+ }
+
+ return new ArrayList<UUID>(result);
+ }
+
+ @Override
+ public void test() {
+ }
+
+ @Override
+ public String getInvoiceIdByPaymentAttemptId(UUID paymentAttemptId) {
+ synchronized(monitor) {
+ for (InvoicePayment invoicePayment : invoicePayments.values()) {
+ if (paymentAttemptId.toString().equals(invoicePayment.getPaymentAttemptId())) {
+ return invoicePayment.getInvoiceId().toString();
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public InvoicePayment getInvoicePayment(UUID paymentAttemptId) {
+ synchronized(monitor) {
+ return invoicePayments.get(paymentAttemptId);
+ }
+ }
+
+ @Override
+ public void notifyOfPaymentAttempt(InvoicePayment invoicePayment) {
+ synchronized (monitor) {
+ invoicePayments.put(invoicePayment.getPaymentAttemptId(), invoicePayment);
+ }
+ }
+
+ @Override
+ public BigDecimal getAccountBalance(UUID accountId) {
+ List<Invoice> invoices = getInvoicesByAccount(accountId.toString());
+ BigDecimal result = BigDecimal.ZERO;
+ for(Invoice invoice : invoices) {
+ result = result.add(invoice.getAmountOutstanding());
+ }
+ return result;
+ }
+}
diff --git a/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithMocks.java b/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithMocks.java
new file mode 100644
index 0000000..d01301b
--- /dev/null
+++ b/invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithMocks.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.invoice.glue;
+
+import com.ning.billing.invoice.dao.InvoiceDao;
+import com.ning.billing.invoice.dao.MockInvoiceDao;
+
+public class InvoiceModuleWithMocks extends InvoiceModule {
+ @Override
+ protected void installInvoiceDao() {
+ bind(MockInvoiceDao.class).asEagerSingleton();
+ bind(InvoiceDao.class).to(MockInvoiceDao.class);
+ }
+}
diff --git a/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java b/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
index 5d36d55..bf88c72 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
@@ -36,9 +36,9 @@ import com.ning.billing.entitlement.api.billing.DefaultBillingEvent;
import com.ning.billing.entitlement.api.user.Subscription;
import com.ning.billing.entitlement.api.user.SubscriptionData;
import com.ning.billing.entitlement.api.user.SubscriptionFactory.SubscriptionBuilder;
-import com.ning.billing.invoice.api.BillingEventSet;
import com.ning.billing.invoice.api.Invoice;
import com.ning.billing.invoice.api.InvoiceItem;
+import com.ning.billing.invoice.model.BillingEventSet;
import com.ning.billing.invoice.model.DefaultInvoiceGenerator;
import com.ning.billing.invoice.model.DefaultInvoiceItem;
import com.ning.billing.invoice.model.InvoiceGenerator;
payment/pom.xml 100(+97 -3)
diff --git a/payment/pom.xml b/payment/pom.xml
index 3d6356e..5baa4d4 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -13,14 +13,108 @@
<parent>
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-payment</artifactId>
<name>killbill-payment</name>
<packaging>jar</packaging>
<dependencies>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-invoice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-account</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-util</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-account</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-invoice</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>management</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>management-dbfiles</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <build>
- </build>
</project>
diff --git a/payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java b/payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
new file mode 100644
index 0000000..74ad7f1
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.Inject;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountUserApi;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.api.InvoicePaymentApi;
+import com.ning.billing.payment.dao.PaymentDao;
+import com.ning.billing.payment.provider.PaymentProviderPlugin;
+import com.ning.billing.payment.provider.PaymentProviderPluginRegistry;
+
+public class DefaultPaymentApi implements PaymentApi {
+ private final PaymentProviderPluginRegistry pluginRegistry;
+ private final AccountUserApi accountUserApi;
+ private final InvoicePaymentApi invoicePaymentApi;
+ private final PaymentDao paymentDao;
+
+ private static final Logger log = LoggerFactory.getLogger(DefaultPaymentApi.class);
+
+ @Inject
+ public DefaultPaymentApi(PaymentProviderPluginRegistry pluginRegistry,
+ AccountUserApi accountUserApi,
+ InvoicePaymentApi invoicePaymentApi,
+ PaymentDao paymentDao) {
+ this.pluginRegistry = pluginRegistry;
+ this.accountUserApi = accountUserApi;
+ this.invoicePaymentApi = invoicePaymentApi;
+ this.paymentDao = paymentDao;
+ }
+
+ @Override
+ public Either<PaymentError, PaymentMethodInfo> getPaymentMethod(@Nullable String accountKey, String paymentMethodId) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin(accountKey);
+ return plugin.getPaymentMethodInfo(paymentMethodId);
+ }
+
+ private PaymentProviderPlugin getPaymentProviderPlugin(String accountKey) {
+ String paymentProviderName = null;
+
+ if (accountKey != null) {
+ final Account account = accountUserApi.getAccountByKey(accountKey);
+ if (account != null) {
+ return getPaymentProviderPlugin(account);
+ }
+ }
+
+ return pluginRegistry.getPlugin(paymentProviderName);
+ }
+
+ private PaymentProviderPlugin getPaymentProviderPlugin(Account account) {
+ String paymentProviderName = null;
+
+ if (account != null) {
+ paymentProviderName = account.getPaymentProviderName();
+ }
+
+ return pluginRegistry.getPlugin(paymentProviderName);
+ }
+
+ @Override
+ public Either<PaymentError, List<PaymentMethodInfo>> getPaymentMethods(String accountKey) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin(accountKey);
+ return plugin.getPaymentMethods(accountKey);
+ }
+
+ @Override
+ public Either<PaymentError, Void> updatePaymentGateway(String accountKey) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin(accountKey);
+ return plugin.updatePaymentGateway(accountKey);
+ }
+
+ @Override
+ public Either<PaymentError, PaymentProviderAccount> getPaymentProviderAccount(String accountKey) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin(accountKey);
+ return plugin.getPaymentProviderAccount(accountKey);
+ }
+
+ @Override
+ public Either<PaymentError, String> addPaymentMethod(@Nullable String accountKey, PaymentMethodInfo paymentMethod) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin(accountKey);
+ return plugin.addPaymentMethod(accountKey, paymentMethod);
+ }
+
+ @Override
+ public Either<PaymentError, Void> deletePaymentMethod(String accountKey, String paymentMethodId) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin(accountKey);
+ return plugin.deletePaymentMethod(accountKey, paymentMethodId);
+ }
+
+ @Override
+ public Either<PaymentError, PaymentMethodInfo> updatePaymentMethod(String accountKey, PaymentMethodInfo paymentMethodInfo) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin(accountKey);
+ return plugin.updatePaymentMethod(accountKey, paymentMethodInfo);
+ }
+
+ @Override
+ public List<Either<PaymentError, PaymentInfo>> createPayment(String accountKey, List<String> invoiceIds) {
+ final Account account = accountUserApi.getAccountByKey(accountKey);
+ return createPayment(account, invoiceIds);
+ }
+
+ @Override
+ public List<Either<PaymentError, PaymentInfo>> createPayment(Account account, List<String> invoiceIds) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin(account);
+
+ List<Either<PaymentError, PaymentInfo>> processedPaymentsOrErrors = new ArrayList<Either<PaymentError, PaymentInfo>>(invoiceIds.size());
+
+ for (String invoiceId : invoiceIds) {
+ Invoice invoice = invoicePaymentApi.getInvoice(UUID.fromString(invoiceId));
+
+ if (invoice.getAmountOutstanding().compareTo(BigDecimal.ZERO) == 0 ) {
+ // TODO: send a notification that invoice was ignored?
+ log.info("Received invoice for payment with outstanding amount of 0 {} ", invoice);
+ }
+ else if (invoiceId.equals(paymentDao.getPaymentAttemptForInvoiceId(invoiceId))) {
+ //TODO: do equals on invoice instead and only reject when invoice is exactly the same?
+ log.info("Duplicate invoice payment event, already received invoice {} ", invoice);
+ }
+ else {
+ PaymentAttempt paymentAttempt = paymentDao.createPaymentAttempt(invoice);
+ Either<PaymentError, PaymentInfo> paymentOrError = plugin.processInvoice(account, invoice);
+ processedPaymentsOrErrors.add(paymentOrError);
+
+ PaymentInfo paymentInfo = null;
+
+ if (paymentOrError.isRight()) {
+ paymentInfo = paymentOrError.getRight();
+
+ paymentDao.savePaymentInfo(paymentInfo);
+
+ if (paymentInfo.getPaymentId() != null) {
+ paymentDao.updatePaymentAttemptWithPaymentId(paymentAttempt.getPaymentAttemptId(), paymentInfo.getPaymentId());
+ }
+ }
+
+ invoicePaymentApi.notifyOfPaymentAttempt(new InvoicePayment(invoice.getId(),
+ paymentInfo == null ? null : paymentInfo.getAmount(),
+// paymentInfo.getRefundAmount(), TODO
+ paymentInfo == null ? null : invoice.getCurrency(),
+ paymentAttempt.getPaymentAttemptId(),
+ paymentAttempt.getPaymentAttemptDate()));
+
+ }
+ }
+
+ return processedPaymentsOrErrors;
+ }
+
+ @Override
+ public Either<PaymentError, String> createPaymentProviderAccount(Account account) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin((Account)null);
+ return plugin.createPaymentProviderAccount(account);
+ }
+
+ @Override
+ public Either<PaymentError, Void> updatePaymentProviderAccount(Account account) {
+ final PaymentProviderPlugin plugin = getPaymentProviderPlugin(account);
+ return plugin.updatePaymentProviderAccountWithExistingContact(account);
+ }
+
+ @Override
+ public PaymentAttempt getPaymentAttemptForPaymentId(String id) {
+ return paymentDao.getPaymentAttemptForPaymentId(id);
+ }
+
+ @Override
+ public List<Either<PaymentError, PaymentInfo>> createRefund(Account account, List<String> invoiceIds) {
+ //TODO
+ throw new UnsupportedOperationException();
+ }
+
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/dao/DefaultPaymentDao.java b/payment/src/main/java/com/ning/billing/payment/dao/DefaultPaymentDao.java
new file mode 100644
index 0000000..ceba7a7
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/dao/DefaultPaymentDao.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.dao;
+
+import java.util.UUID;
+
+import org.skife.jdbi.v2.IDBI;
+
+import com.google.inject.Inject;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.payment.api.PaymentAttempt;
+import com.ning.billing.payment.api.PaymentInfo;
+
+public class DefaultPaymentDao implements PaymentDao {
+ private final PaymentSqlDao sqlDao;
+
+ @Inject
+ public DefaultPaymentDao(IDBI dbi) {
+ this.sqlDao = dbi.onDemand(PaymentSqlDao.class);
+ }
+
+ @Override
+ public PaymentAttempt getPaymentAttemptForPaymentId(String paymentId) {
+ return sqlDao.getPaymentAttemptForPaymentId(paymentId);
+ }
+
+ @Override
+ public PaymentAttempt getPaymentAttemptForInvoiceId(String invoiceId) {
+ return sqlDao.getPaymentAttemptForInvoiceId(invoiceId);
+ }
+
+ @Override
+ public PaymentAttempt createPaymentAttempt(Invoice invoice) {
+ final PaymentAttempt paymentAttempt = new PaymentAttempt(UUID.randomUUID(), invoice);
+
+ sqlDao.insertPaymentAttempt(paymentAttempt);
+ return paymentAttempt;
+ }
+
+ @Override
+ public void savePaymentInfo(PaymentInfo info) {
+ sqlDao.insertPaymentInfo(info);
+ }
+
+ @Override
+ public void updatePaymentAttemptWithPaymentId(UUID paymentAttemptId, String paymentId) {
+ sqlDao.updatePaymentAttemptWithPaymentId(paymentAttemptId.toString(), paymentId);
+ }
+
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/dao/PaymentDao.java b/payment/src/main/java/com/ning/billing/payment/dao/PaymentDao.java
new file mode 100644
index 0000000..d40b264
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/dao/PaymentDao.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.dao;
+
+import java.util.UUID;
+
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.payment.api.PaymentAttempt;
+import com.ning.billing.payment.api.PaymentInfo;
+
+public interface PaymentDao {
+
+ PaymentAttempt createPaymentAttempt(Invoice invoice);
+
+ void savePaymentInfo(PaymentInfo right);
+
+ PaymentAttempt getPaymentAttemptForPaymentId(String paymentId);
+
+ void updatePaymentAttemptWithPaymentId(UUID paymentAttemptId, String paymentId);
+
+ PaymentAttempt getPaymentAttemptForInvoiceId(String invoiceId);
+
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java b/payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java
new file mode 100644
index 0000000..7cd8adb
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.dao;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.skife.jdbi.v2.SQLStatement;
+import org.skife.jdbi.v2.StatementContext;
+import org.skife.jdbi.v2.sqlobject.Bind;
+import org.skife.jdbi.v2.sqlobject.Binder;
+import org.skife.jdbi.v2.sqlobject.SqlQuery;
+import org.skife.jdbi.v2.sqlobject.SqlUpdate;
+import org.skife.jdbi.v2.sqlobject.customizers.Mapper;
+import org.skife.jdbi.v2.sqlobject.mixins.CloseMe;
+import org.skife.jdbi.v2.sqlobject.mixins.Transactional;
+import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
+import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3;
+import org.skife.jdbi.v2.tweak.ResultSetMapper;
+
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.payment.api.PaymentAttempt;
+import com.ning.billing.payment.api.PaymentInfo;
+
+@ExternalizedSqlViaStringTemplate3()
+public interface PaymentSqlDao extends Transactional<PaymentSqlDao>, CloseMe, Transmogrifier {
+ @SqlUpdate
+ void insertPaymentAttempt(@Bind(binder = PaymentAttemptBinder.class) PaymentAttempt paymentAttempt);
+
+ @SqlQuery
+ @Mapper(PaymentAttemptMapper.class)
+ PaymentAttempt getPaymentAttemptForPaymentId(@Bind("payment_id") String paymentId);
+
+ @SqlQuery
+ @Mapper(PaymentAttemptMapper.class)
+ PaymentAttempt getPaymentAttemptForInvoiceId(@Bind("invoice_id") String invoiceId);
+
+ @SqlUpdate
+ void updatePaymentAttemptWithPaymentId(@Bind("payment_attempt_id") String paymentAttemptId,
+ @Bind("payment_id") String payment_id);
+
+ @SqlUpdate
+ void insertPaymentInfo(@Bind(binder = PaymentInfoBinder.class) PaymentInfo paymentInfo);
+
+ public static final class PaymentAttemptBinder implements Binder<Bind, PaymentAttempt> {
+
+ private Date getDate(DateTime dateTime) {
+ return dateTime == null ? null : dateTime.toDate();
+ }
+
+ @Override
+ public void bind(@SuppressWarnings("rawtypes") SQLStatement stmt, Bind bind, PaymentAttempt paymentAttempt) {
+ stmt.bind("payment_attempt_id", paymentAttempt.getPaymentAttemptId().toString());
+ stmt.bind("invoice_id", paymentAttempt.getInvoiceId().toString());
+ stmt.bind("account_id", paymentAttempt.getAccountId().toString());
+ stmt.bind("amount", paymentAttempt.getAmount()); //TODO: suppport partial payments
+ stmt.bind("currency", paymentAttempt.getCurrency().toString());
+ stmt.bind("invoice_dt", getDate(paymentAttempt.getInvoiceDate()));
+ stmt.bind("payment_attempt_dt", getDate(paymentAttempt.getPaymentAttemptDate()));
+ stmt.bind("payment_id", paymentAttempt.getPaymentId());
+ stmt.bind("created_dt", getDate(paymentAttempt.getCreatedDate()));
+ stmt.bind("updated_dt", getDate(paymentAttempt.getUpdatedDate()));
+ }
+ }
+
+ public static class PaymentAttemptMapper implements ResultSetMapper<PaymentAttempt> {
+
+ private DateTime getDate(ResultSet rs, String fieldName) throws SQLException {
+ final Timestamp resultStamp = rs.getTimestamp(fieldName);
+ return rs.wasNull() ? null : new DateTime(resultStamp).toDateTime(DateTimeZone.UTC);
+ }
+
+ @Override
+ public PaymentAttempt map(int index, ResultSet rs, StatementContext ctx) throws SQLException {
+
+ UUID paymentAttemptId = UUID.fromString(rs.getString("payment_attempt_id"));
+ UUID invoiceId = UUID.fromString(rs.getString("invoice_id"));
+ UUID accountId = UUID.fromString(rs.getString("account_id"));
+ BigDecimal amount = rs.getBigDecimal("amount");
+ Currency currency = Currency.valueOf(rs.getString("currency"));
+ DateTime invoiceDate = getDate(rs, "invoice_dt");
+ DateTime paymentAttemptDate = getDate(rs, "payment_attempt_dt");
+ String paymentId = rs.getString("payment_id");
+ DateTime createdDate = getDate(rs, "created_dt");
+ DateTime updatedDate = getDate(rs, "updated_dt");
+
+ return new PaymentAttempt(paymentAttemptId, invoiceId, accountId, amount, currency, invoiceDate, paymentAttemptDate, paymentId, createdDate, updatedDate);
+ }
+ }
+
+ public static final class PaymentInfoBinder implements Binder<Bind, PaymentInfo> {
+
+ private Date getDate(DateTime dateTime) {
+ return dateTime == null ? null : dateTime.toDate();
+ }
+
+ @Override
+ public void bind(@SuppressWarnings("rawtypes") SQLStatement stmt, Bind bind, PaymentInfo paymentInfo) {
+ stmt.bind("payment_id", paymentInfo.getPaymentId().toString());
+ stmt.bind("amount", paymentInfo.getAmount());
+ stmt.bind("refund_amount", paymentInfo.getRefundAmount());
+ stmt.bind("payment_number", paymentInfo.getPaymentNumber());
+ stmt.bind("bank_identification_number", paymentInfo.getBankIdentificationNumber());
+ stmt.bind("status", paymentInfo.getStatus());
+ stmt.bind("payment_type", paymentInfo.getType());
+ stmt.bind("reference_id", paymentInfo.getReferenceId());
+ stmt.bind("effective_dt", getDate(paymentInfo.getEffectiveDate()));
+ stmt.bind("created_dt", getDate(paymentInfo.getCreatedDate()));
+ stmt.bind("updated_dt", getDate(paymentInfo.getUpdatedDate()));
+ }
+ }
+
+ public static class PaymentInfoMapper implements ResultSetMapper<PaymentInfo> {
+
+ private DateTime getDate(ResultSet rs, String fieldName) throws SQLException {
+ final Timestamp resultStamp = rs.getTimestamp(fieldName);
+ return rs.wasNull() ? null : new DateTime(resultStamp).toDateTime(DateTimeZone.UTC);
+ }
+
+ @Override
+ public PaymentInfo map(int index, ResultSet rs, StatementContext ctx) throws SQLException {
+
+ String paymentId = rs.getString("payment_id");
+ BigDecimal amount = rs.getBigDecimal("amount");
+ BigDecimal refundAmount = rs.getBigDecimal("refund_amount");
+ String paymentNumber = rs.getString("payment_number");
+ String bankIdentificationNumber = rs.getString("bank_identification_number");
+ String status = rs.getString("status");
+ String type = rs.getString("payment_type");
+ String referenceId = rs.getString("reference_id");
+ DateTime effectiveDate = getDate(rs, "effective_dt");
+ DateTime createdDate = getDate(rs, "created_dt");
+ DateTime updatedDate = getDate(rs, "updated_dt");
+
+ return new PaymentInfo(paymentId,
+ amount,
+ refundAmount,
+ bankIdentificationNumber,
+ paymentNumber,
+ status,
+ type,
+ referenceId,
+ effectiveDate,
+ createdDate,
+ updatedDate);
+ }
+ }
+
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/PaymentAttempt.java b/payment/src/main/java/com/ning/billing/payment/PaymentAttempt.java
new file mode 100644
index 0000000..353587d
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/PaymentAttempt.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
+import com.ning.billing.invoice.api.Invoice;
+
+public class PaymentAttempt {
+ private final UUID paymentAttemptId;
+ private final UUID accountId;
+ private final UUID invoiceId;
+ private final BigDecimal paymentAttemptAmount;
+ private final DateTime paymentAttemptDate;
+
+ public PaymentAttempt(UUID paymentAttemptId, Invoice invoice) {
+ this.paymentAttemptId = paymentAttemptId;
+ this.accountId = invoice.getAccountId();
+ this.invoiceId = invoice.getId();
+ this.paymentAttemptAmount = invoice.getAmountOutstanding();
+ this.paymentAttemptDate = new DateTime(DateTimeZone.UTC);
+ }
+
+ public UUID getPaymentAttemptId() {
+ return paymentAttemptId;
+ }
+
+ public UUID getAccountId() {
+ return accountId;
+ }
+
+ public UUID getInvoiceId() {
+ return invoiceId;
+ }
+
+ public BigDecimal getPaymentAttemptAmount() {
+ return paymentAttemptAmount;
+ }
+
+ public DateTime getPaymentAttemptDate() {
+ return paymentAttemptDate;
+ }
+
+ @Override
+ public String toString() {
+ return "PaymentAttempt [paymentAttemptId=" + paymentAttemptId + ", accountId=" + accountId + ", invoiceId=" + invoiceId + ", paymentAttemptAmount=" + paymentAttemptAmount + "]";
+ }
+
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/PaymentInfoRequest.java b/payment/src/main/java/com/ning/billing/payment/PaymentInfoRequest.java
new file mode 100644
index 0000000..22098ed
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/PaymentInfoRequest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment;
+
+import java.util.UUID;
+
+import com.ning.billing.util.eventbus.EventBusNotification;
+
+public class PaymentInfoRequest implements EventBusNotification {
+ private final UUID accountId;
+ private final String paymentId;
+
+ public PaymentInfoRequest(UUID accountId, String paymentId) {
+ this.accountId = accountId;
+ this.paymentId = paymentId;
+ }
+
+ public UUID getAccountId() {
+ return accountId;
+ }
+
+ public String getPaymentId() {
+ return paymentId;
+ }
+
+ @Override
+ public String toString() {
+ return "PaymentInfoRequest [accountId=" + accountId + ", paymentId=" + paymentId + "]";
+ }
+
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPlugin.java b/payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPlugin.java
new file mode 100644
index 0000000..e1bc1c3
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPlugin.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.provider;
+
+import java.util.List;
+
+import com.ning.billing.account.api.Account;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.payment.api.Either;
+import com.ning.billing.payment.api.PaymentError;
+import com.ning.billing.payment.api.PaymentInfo;
+import com.ning.billing.payment.api.PaymentMethodInfo;
+import com.ning.billing.payment.api.PaymentProviderAccount;
+
+public interface PaymentProviderPlugin {
+ Either<PaymentError, PaymentInfo> processInvoice(Account account, Invoice invoice);
+ Either<PaymentError, String> createPaymentProviderAccount(Account account);
+
+ Either<PaymentError, PaymentInfo> getPaymentInfo(String paymentId);
+ Either<PaymentError, PaymentProviderAccount> getPaymentProviderAccount(String accountKey);
+ Either<PaymentError, Void> updatePaymentGateway(String accountKey);
+
+ Either<PaymentError, PaymentMethodInfo> getPaymentMethodInfo(String paymentMethodId);
+ Either<PaymentError, List<PaymentMethodInfo>> getPaymentMethods(String accountKey);
+ Either<PaymentError, String> addPaymentMethod(String accountKey, PaymentMethodInfo paymentMethod);
+ Either<PaymentError, PaymentMethodInfo> updatePaymentMethod(String accountKey, PaymentMethodInfo paymentMethodInfo);
+ Either<PaymentError, Void> deletePaymentMethod(String accountKey, String paymentMethodId);
+
+ Either<PaymentError, Void> updatePaymentProviderAccountWithExistingContact(Account account);
+ Either<PaymentError, Void> updatePaymentProviderAccountWithNewContact(Account account);
+
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPluginRegistry.java b/payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPluginRegistry.java
new file mode 100644
index 0000000..fc9c149
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPluginRegistry.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.provider;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.google.inject.Inject;
+import com.ning.billing.payment.setup.PaymentConfig;
+
+public class PaymentProviderPluginRegistry {
+ private final String defaultPlugin;
+ private final Map<String, PaymentProviderPlugin> pluginsByName = new ConcurrentHashMap<String, PaymentProviderPlugin>();
+
+ @Inject
+ public PaymentProviderPluginRegistry(PaymentConfig config) {
+ this.defaultPlugin = config.getDefaultPaymentProvider();
+ }
+
+ public void register(PaymentProviderPlugin plugin, String name) {
+ pluginsByName.put(name.toLowerCase(), plugin);
+ }
+
+ public PaymentProviderPlugin getPlugin(String name) {
+ PaymentProviderPlugin plugin = pluginsByName.get(StringUtils.defaultIfEmpty(name, defaultPlugin).toLowerCase());
+
+ if (plugin == null) {
+ throw new IllegalArgumentException("No payment provider plugin is configured for " + name);
+ }
+
+ return plugin;
+ }
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/RequestProcessor.java b/payment/src/main/java/com/ning/billing/payment/RequestProcessor.java
new file mode 100644
index 0000000..466f297
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/RequestProcessor.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountUserApi;
+import com.ning.billing.invoice.api.InvoiceCreationNotification;
+import com.ning.billing.payment.api.Either;
+import com.ning.billing.payment.api.PaymentApi;
+import com.ning.billing.payment.api.PaymentError;
+import com.ning.billing.payment.api.PaymentInfo;
+import com.ning.billing.payment.provider.PaymentProviderPlugin;
+import com.ning.billing.payment.provider.PaymentProviderPluginRegistry;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
+
+public class RequestProcessor {
+ public static final String PAYMENT_PROVIDER_KEY = "paymentProvider";
+ private final AccountUserApi accountUserApi;
+ private final PaymentApi paymentApi;
+ private final PaymentProviderPluginRegistry pluginRegistry;
+ private final EventBus eventBus;
+
+ private static final Logger log = LoggerFactory.getLogger(RequestProcessor.class);
+
+ @Inject
+ public RequestProcessor(AccountUserApi accountUserApi,
+ PaymentApi paymentApi,
+ PaymentProviderPluginRegistry pluginRegistry,
+ EventBus eventBus) {
+ this.accountUserApi = accountUserApi;
+ this.paymentApi = paymentApi;
+ this.pluginRegistry = pluginRegistry;
+ this.eventBus = eventBus;
+ }
+
+ @Subscribe
+ public void receiveInvoice(InvoiceCreationNotification event) {
+ log.info("Received invoice creation notification for account {} and invoice {}", event.getAccountId(), event.getInvoiceId());
+ try {
+ final Account account = accountUserApi.getAccountById(event.getAccountId());
+
+ if (account == null) {
+ log.info("could not process invoice payment: could not find a valid account for event {}", event);
+ }
+ else {
+ List<Either<PaymentError, PaymentInfo>> results = paymentApi.createPayment(account, Arrays.asList(event.getInvoiceId().toString()));
+
+ if (results.isEmpty()) {
+ eventBus.post(new PaymentError("unknown", "No payment processed"));
+ }
+ else {
+ Either<PaymentError, PaymentInfo> result = results.get(0);
+ eventBus.post(result.isLeft() ? result.getLeft() : result.getRight());
+ }
+ }
+ }
+ catch (EventBusException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ @Subscribe
+ public void receivePaymentInfoRequest(PaymentInfoRequest paymentInfoRequest) throws EventBusException {
+ final Account account = accountUserApi.getAccountById(paymentInfoRequest.getAccountId());
+ if (account == null) {
+ log.info("could not process payment info request: could not find a valid account for event {}", paymentInfoRequest);
+ }
+ else {
+ final String paymentProviderName = account.getFieldValue(PAYMENT_PROVIDER_KEY);
+ final PaymentProviderPlugin plugin = pluginRegistry.getPlugin(paymentProviderName);
+
+ Either<PaymentError, PaymentInfo> result = plugin.getPaymentInfo(paymentInfoRequest.getPaymentId());
+
+ eventBus.post(result.isLeft() ? result.getLeft() : result.getRight());
+ }
+ }
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/setup/PaymentConfig.java b/payment/src/main/java/com/ning/billing/payment/setup/PaymentConfig.java
new file mode 100644
index 0000000..cdc5384
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/setup/PaymentConfig.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.setup;
+
+import org.skife.config.Config;
+import org.skife.config.DefaultNull;
+
+public interface PaymentConfig {
+ @Config("killbill.payment.provider.default")
+ @DefaultNull
+ public String getDefaultPaymentProvider();
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/setup/PaymentModule.java b/payment/src/main/java/com/ning/billing/payment/setup/PaymentModule.java
new file mode 100644
index 0000000..3c05c13
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/setup/PaymentModule.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.setup;
+
+import java.util.Properties;
+
+import org.skife.config.ConfigurationObjectFactory;
+
+import com.google.inject.AbstractModule;
+import com.ning.billing.payment.api.DefaultPaymentApi;
+import com.ning.billing.payment.api.PaymentApi;
+import com.ning.billing.payment.dao.DefaultPaymentDao;
+import com.ning.billing.payment.dao.PaymentDao;
+import com.ning.billing.payment.provider.PaymentProviderPluginRegistry;
+
+public class PaymentModule extends AbstractModule {
+ private final Properties props;
+
+ public PaymentModule() {
+ this.props = System.getProperties();
+ }
+
+ public PaymentModule(Properties props) {
+ this.props = props;
+ }
+
+ protected void installPaymentDao() {
+ bind(PaymentDao.class).to(DefaultPaymentDao.class).asEagerSingleton();
+ }
+
+ protected void installPaymentProviderPlugins(PaymentConfig config) {
+ }
+
+ @Override
+ protected void configure() {
+ final ConfigurationObjectFactory factory = new ConfigurationObjectFactory(props);
+ final PaymentConfig paymentConfig = factory.build(PaymentConfig.class);
+
+ bind(PaymentConfig.class).toInstance(paymentConfig);
+ bind(PaymentProviderPluginRegistry.class).asEagerSingleton();
+ bind(PaymentApi.class).to(DefaultPaymentApi.class).asEagerSingleton();
+ installPaymentProviderPlugins(paymentConfig);
+ installPaymentDao();
+ }
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/util/EventBusFuture.java b/payment/src/main/java/com/ning/billing/payment/util/EventBusFuture.java
new file mode 100644
index 0000000..d82a9a7
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/util/EventBusFuture.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.util;
+
+import javax.annotation.Nullable;
+
+import com.google.common.eventbus.Subscribe;
+import com.google.common.util.concurrent.AbstractFuture;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
+
+public class EventBusFuture<T, V extends EventBusResponse<T>> extends AbstractFuture<V> {
+ public static <V, W extends EventBusRequest<V>, X extends EventBusResponse<V>> EventBusFuture<V, X> post(final EventBus eventBus, final W event) throws EventBusException {
+ final EventBusFuture<V, X> responseFuture = new EventBusFuture<V, X>(eventBus, event.getId());
+
+ eventBus.register(responseFuture);
+ eventBus.post(event);
+ return responseFuture;
+ }
+
+ private final EventBus eventBus;
+ private final T requestId;
+
+ private EventBusFuture(EventBus eventBus, T requestId) {
+ this.eventBus = eventBus;
+ this.requestId = requestId;
+ }
+
+ @Subscribe
+ public void handleResponse(V response) {
+ if (requestId.equals(response.getRequestId())) {
+ set(response);
+ }
+ }
+
+ @Override
+ public boolean set(@Nullable V value) {
+ boolean result = super.set(value);
+
+ try {
+ eventBus.unregister(this);
+ }
+ catch (EventBusException ex) {
+ throw new RuntimeException(ex);
+ }
+ return result;
+ }
+
+ @Override
+ public boolean setException(Throwable throwable) {
+ boolean result = super.setException(throwable);
+
+ try {
+ eventBus.unregister(this);
+ }
+ catch (EventBusException ex) {
+ throw new RuntimeException(ex);
+ }
+ return result;
+ }
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/util/EventBusRequest.java b/payment/src/main/java/com/ning/billing/payment/util/EventBusRequest.java
new file mode 100644
index 0000000..b9dab5c
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/util/EventBusRequest.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.util;
+
+import com.ning.billing.util.eventbus.EventBusNotification;
+
+public interface EventBusRequest<T> extends EventBusNotification {
+ T getId();
+}
diff --git a/payment/src/main/java/com/ning/billing/payment/util/EventBusResponse.java b/payment/src/main/java/com/ning/billing/payment/util/EventBusResponse.java
new file mode 100644
index 0000000..d8a70b1
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/util/EventBusResponse.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.util;
+
+import com.ning.billing.util.eventbus.EventBusNotification;
+
+public interface EventBusResponse<T> extends EventBusNotification {
+ T getRequestId();
+}
diff --git a/payment/src/main/resources/com/ning/billing/payment/dao/PaymentSqlDao.sql.stg b/payment/src/main/resources/com/ning/billing/payment/dao/PaymentSqlDao.sql.stg
new file mode 100644
index 0000000..5156b03
--- /dev/null
+++ b/payment/src/main/resources/com/ning/billing/payment/dao/PaymentSqlDao.sql.stg
@@ -0,0 +1,57 @@
+group PaymentSqlDao;
+
+paymentAttemptFields(prefix) ::= <<
+ <prefix>payment_attempt_id,
+ <prefix>invoice_id,
+ <prefix>account_id,
+ <prefix>amount,
+ <prefix>currency,
+ <prefix>payment_id,
+ <prefix>payment_attempt_dt,
+ <prefix>invoice_dt,
+ <prefix>created_dt,
+ <prefix>updated_dt
+>>
+
+paymentInfoFields(prefix) ::= <<
+ <prefix>payment_id,
+ <prefix>amount,
+ <prefix>refund_amount,
+ <prefix>bank_identification_number,
+ <prefix>payment_number,
+ <prefix>payment_type,
+ <prefix>status,
+ <prefix>reference_id,
+ <prefix>effective_dt,
+ <prefix>created_dt,
+ <prefix>updated_dt
+>>
+
+insertPaymentAttempt() ::= <<
+ INSERT INTO payment_attempts (<paymentAttemptFields()>)
+ VALUES (:payment_attempt_id, :invoice_id, :account_id, :amount, :currency, :payment_id, :payment_attempt_dt, :invoice_dt, :created_dt, :updated_dt);
+>>
+
+getPaymentAttemptForPaymentId() ::= <<
+ SELECT <paymentAttemptFields()>
+ FROM payment_attempts
+ WHERE payment_id = :payment_id
+>>
+
+getPaymentAttemptForInvoiceId() ::= <<
+ SELECT <paymentAttemptFields()>
+ FROM payment_attempts
+ WHERE invoice_id = :invoice_id
+>>
+
+updatePaymentAttemptWithPaymentId() ::= <<
+ UPDATE payment_attempts
+ SET payment_id = :payment_id,
+ updated_dt = NOW()
+ WHERE payment_attempt_id = :payment_attempt_id
+>>
+
+insertPaymentInfo() ::= <<
+ INSERT INTO payments (<paymentInfoFields()>)
+ VALUES (:payment_id, :amount, :refund_amount, :bank_identification_number, :payment_number, :payment_type, :status, :reference_id, :effective_dt, NOW(), NOW());
+>>
diff --git a/payment/src/main/resources/com/ning/billing/payment/ddl.sql b/payment/src/main/resources/com/ning/billing/payment/ddl.sql
new file mode 100644
index 0000000..fd6a1ea
--- /dev/null
+++ b/payment/src/main/resources/com/ning/billing/payment/ddl.sql
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS payment_attempts;
+CREATE TABLE payment_attempts (
+ payment_attempt_id char(36) COLLATE utf8_bin NOT NULL,
+ account_id char(36) COLLATE utf8_bin NOT NULL,
+ invoice_id char(36) COLLATE utf8_bin NOT NULL,
+ amount decimal(8,2),
+ currency char(3),
+ payment_attempt_dt datetime NOT NULL,
+ payment_id varchar(36) COLLATE utf8_bin,
+ invoice_dt datetime NOT NULL,
+ created_dt datetime NOT NULL,
+ updated_dt datetime NOT NULL,
+ PRIMARY KEY (payment_attempt_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+DROP TABLE IF EXISTS payments;
+CREATE TABLE payments (
+ payment_id varchar(36) COLLATE utf8_bin NOT NULL,
+ amount decimal(8,2),
+ refund_amount decimal(8,2),
+ payment_number varchar(36) COLLATE utf8_bin,
+ bank_identification_number varchar(36) COLLATE utf8_bin,
+ status varchar(20) COLLATE utf8_bin,
+ payment_type varchar(20) COLLATE utf8_bin,
+ reference_id varchar(36) COLLATE utf8_bin,
+ effective_dt datetime,
+ created_dt datetime NOT NULL,
+ updated_dt datetime NOT NULL,
+ PRIMARY KEY (payment_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
diff --git a/payment/src/test/java/com/ning/billing/payment/api/TestMockPaymentApi.java b/payment/src/test/java/com/ning/billing/payment/api/TestMockPaymentApi.java
new file mode 100644
index 0000000..b9f761a
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/api/TestMockPaymentApi.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import com.ning.billing.account.glue.AccountModuleWithMocks;
+import com.ning.billing.invoice.glue.InvoiceModuleWithMocks;
+import com.ning.billing.payment.setup.PaymentTestModuleWithMocks;
+
+@Guice(modules = { PaymentTestModuleWithMocks.class, AccountModuleWithMocks.class, InvoiceModuleWithMocks.class })
+@Test(groups = "fast")
+public class TestMockPaymentApi extends TestPaymentApi {
+
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java b/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
new file mode 100644
index 0000000..a1b02b3
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.api;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.inject.Inject;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountApiException;
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.model.DefaultInvoiceItem;
+import com.ning.billing.payment.TestHelper;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
+
+public abstract class TestPaymentApi {
+ @Inject
+ private EventBus eventBus;
+ @Inject
+ protected PaymentApi paymentApi;
+ @Inject
+ protected TestHelper testHelper;
+
+ @BeforeMethod(alwaysRun = true)
+ public void setUp() throws EventBusException {
+ eventBus.start();
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws EventBusException {
+ eventBus.stop();
+ }
+
+// @Test(groups = "fast")
+ @Test
+ public void testCreatePayment() throws AccountApiException {
+ final DateTime now = new DateTime();
+ final Account account = testHelper.createTestAccount();
+ final Invoice invoice = testHelper.createTestInvoice(account, now, Currency.USD);
+ final BigDecimal amount = new BigDecimal("10.00");
+ final UUID subscriptionId = UUID.randomUUID();
+
+ invoice.add(new DefaultInvoiceItem(invoice.getId(),
+ subscriptionId,
+ now,
+ now.plusMonths(1),
+ "Test",
+ amount,
+ new BigDecimal("1.0"),
+ Currency.USD));
+
+ List<Either<PaymentError, PaymentInfo>> results = paymentApi.createPayment(account.getExternalKey(), Arrays.asList(invoice.getId().toString()));
+
+ assertEquals(results.size(), 1);
+ assertTrue(results.get(0).isRight());
+
+ PaymentInfo paymentInfo = results.get(0).getRight();
+
+ assertNotNull(paymentInfo.getPaymentId());
+ assertEquals(paymentInfo.getAmount().doubleValue(), amount.doubleValue());
+ }
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/dao/MockPaymentDao.java b/payment/src/test/java/com/ning/billing/payment/dao/MockPaymentDao.java
new file mode 100644
index 0000000..74d8552
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/dao/MockPaymentDao.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.dao;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.payment.api.PaymentAttempt;
+import com.ning.billing.payment.api.PaymentInfo;
+
+public class MockPaymentDao implements PaymentDao {
+ private final Map<String, PaymentInfo> payments = new ConcurrentHashMap<String, PaymentInfo>();
+ private final Map<UUID, PaymentAttempt> paymentAttempts = new ConcurrentHashMap<UUID, PaymentAttempt>();
+
+ @Override
+ public PaymentAttempt getPaymentAttemptForPaymentId(String paymentId) {
+ for (PaymentAttempt paymentAttempt : paymentAttempts.values()) {
+ if (paymentId.equals(paymentAttempt.getPaymentId())) {
+ return paymentAttempt;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public PaymentAttempt createPaymentAttempt(Invoice invoice) {
+ PaymentAttempt paymentAttempt = new PaymentAttempt(UUID.randomUUID(), invoice);
+ paymentAttempts.put(paymentAttempt.getPaymentAttemptId(), paymentAttempt);
+ return paymentAttempt;
+ }
+
+ @Override
+ public void savePaymentInfo(PaymentInfo paymentInfo) {
+ payments.put(paymentInfo.getPaymentId(), paymentInfo);
+ }
+
+ @Override
+ public void updatePaymentAttemptWithPaymentId(UUID paymentAttemptId, String paymentId) {
+ PaymentAttempt existingPaymentAttempt = paymentAttempts.get(paymentAttemptId);
+
+ if (existingPaymentAttempt != null) {
+ paymentAttempts.put(existingPaymentAttempt.getPaymentAttemptId(),
+ existingPaymentAttempt.cloner().setPaymentId(paymentId).build());
+ }
+ }
+
+ @Override
+ public PaymentAttempt getPaymentAttemptForInvoiceId(String invoiceId) {
+ for (PaymentAttempt paymentAttempt : paymentAttempts.values()) {
+ if (invoiceId.equals(paymentAttempt.getInvoiceId())) {
+ return paymentAttempt;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/MockPaymentInfoReceiver.java b/payment/src/test/java/com/ning/billing/payment/MockPaymentInfoReceiver.java
new file mode 100644
index 0000000..cf2494d
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/MockPaymentInfoReceiver.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.google.common.eventbus.Subscribe;
+import com.ning.billing.payment.api.PaymentError;
+import com.ning.billing.payment.api.PaymentInfo;
+
+public class MockPaymentInfoReceiver {
+ private final List<PaymentInfo> processedPayments = Collections.synchronizedList(new ArrayList<PaymentInfo>());
+ private final List<PaymentError> errors = Collections.synchronizedList(new ArrayList<PaymentError>());
+
+ @Subscribe
+ public void processedPayment(PaymentInfo paymentInfo) {
+ processedPayments.add(paymentInfo);
+ }
+
+ @Subscribe
+ public void processedPaymentError(PaymentError paymentError) {
+ errors.add(paymentError);
+ }
+
+ public List<PaymentInfo> getProcessedPayments() {
+ return new ArrayList<PaymentInfo>(processedPayments);
+ }
+
+ public List<PaymentError> getErrors() {
+ return new ArrayList<PaymentError>(errors);
+ }
+
+ public void clear() {
+ processedPayments.clear();
+ errors.clear();
+ }
+}
\ No newline at end of file
diff --git a/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java b/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java
new file mode 100644
index 0000000..583fc1a
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.commons.lang.RandomStringUtils;
+import org.joda.time.DateTime;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.payment.api.CreditCardPaymentMethodInfo;
+import com.ning.billing.payment.api.Either;
+import com.ning.billing.payment.api.PaymentError;
+import com.ning.billing.payment.api.PaymentInfo;
+import com.ning.billing.payment.api.PaymentMethodInfo;
+import com.ning.billing.payment.api.PaymentProviderAccount;
+import com.ning.billing.payment.api.PaypalPaymentMethodInfo;
+
+public class MockPaymentProviderPlugin implements PaymentProviderPlugin {
+ private final Map<String, PaymentInfo> payments = new ConcurrentHashMap<String, PaymentInfo>();
+ private final Map<String, PaymentProviderAccount> accounts = new ConcurrentHashMap<String, PaymentProviderAccount>();
+ private final Map<String, PaymentMethodInfo> paymentMethods = new ConcurrentHashMap<String, PaymentMethodInfo>();
+
+ @Override
+ public Either<PaymentError, PaymentInfo> processInvoice(Account account, Invoice invoice) {
+ PaymentInfo payment = new PaymentInfo.Builder().setPaymentId(UUID.randomUUID().toString())
+ .setAmount(invoice.getAmountOutstanding())
+ .setStatus("Processed")
+ .setBankIdentificationNumber("1234")
+ .setCreatedDate(new DateTime())
+ .setEffectiveDate(new DateTime())
+ .setPaymentNumber("12345")
+ .setReferenceId("12345")
+ .setType("Electronic")
+ .build();
+
+ payments.put(payment.getPaymentId(), payment);
+ return Either.right(payment);
+ }
+
+ @Override
+ public Either<PaymentError, PaymentInfo> getPaymentInfo(String paymentId) {
+ PaymentInfo payment = payments.get(paymentId);
+
+ if (payment == null) {
+ return Either.left(new PaymentError("notfound", "No payment found for id " + paymentId));
+ }
+ else {
+ return Either.right(payment);
+ }
+ }
+
+ @Override
+ public Either<PaymentError, String> createPaymentProviderAccount(Account account) {
+ if (account != null) {
+ String id = String.valueOf(RandomStringUtils.random(10));
+ accounts.put(account.getExternalKey(),
+ new PaymentProviderAccount.Builder().setAccountNumber(String.valueOf(RandomStringUtils.random(10)))
+ .setDefaultPaymentMethod(String.valueOf(RandomStringUtils.random(10)))
+ .setId(id)
+ .build());
+
+ return Either.right(id);
+ }
+ else {
+ return Either.left(new PaymentError("unknown", "Did not get account to create payment provider account"));
+ }
+ }
+
+ @Override
+ public Either<PaymentError, PaymentProviderAccount> getPaymentProviderAccount(String accountKey) {
+ if (accountKey != null) {
+ return Either.right(accounts.get(accountKey));
+ }
+ else {
+ return Either.left(new PaymentError("unknown", "Did not get account for accountKey " + accountKey));
+ }
+ }
+
+ @Override
+ public Either<PaymentError, String> addPaymentMethod(String accountKey, PaymentMethodInfo paymentMethod) {
+ if (paymentMethod != null) {
+ String paymentMethodId = RandomStringUtils.random(10);
+ PaymentMethodInfo realPaymentMethod = null;
+
+ if (paymentMethod instanceof PaypalPaymentMethodInfo) {
+ PaypalPaymentMethodInfo paypalPaymentMethod = (PaypalPaymentMethodInfo)paymentMethod;
+ realPaymentMethod = new PaypalPaymentMethodInfo.Builder(paypalPaymentMethod).setId(paymentMethodId).build();
+ }
+ else if (paymentMethod instanceof CreditCardPaymentMethodInfo) {
+ CreditCardPaymentMethodInfo ccPaymentMethod = (CreditCardPaymentMethodInfo)paymentMethod;
+ realPaymentMethod = new CreditCardPaymentMethodInfo.Builder(ccPaymentMethod).setId(paymentMethodId).build();
+ }
+ if (realPaymentMethod == null) {
+ return Either.left(new PaymentError("unsupported", "Payment method " + paymentMethod.getType() + " not supported by the plugin"));
+ }
+ else {
+ paymentMethods.put(paymentMethodId, paymentMethod);
+ return Either.right(paymentMethodId);
+ }
+ }
+ else {
+ return Either.left(new PaymentError("unknown", "Could not create add payment method " + paymentMethod + " for " + accountKey));
+ }
+ }
+
+ @Override
+ public Either<PaymentError, PaymentMethodInfo> updatePaymentMethod(String accountKey, PaymentMethodInfo paymentMethod) {
+ if (paymentMethod != null) {
+ PaymentMethodInfo realPaymentMethod = null;
+
+ if (paymentMethod instanceof PaypalPaymentMethodInfo) {
+ PaypalPaymentMethodInfo paypalPaymentMethod = (PaypalPaymentMethodInfo)paymentMethod;
+ realPaymentMethod = new PaypalPaymentMethodInfo.Builder(paypalPaymentMethod).build();
+ }
+ else if (paymentMethod instanceof CreditCardPaymentMethodInfo) {
+ CreditCardPaymentMethodInfo ccPaymentMethod = (CreditCardPaymentMethodInfo)paymentMethod;
+ realPaymentMethod = new CreditCardPaymentMethodInfo.Builder(ccPaymentMethod).build();
+ }
+ if (realPaymentMethod == null) {
+ return Either.left(new PaymentError("unsupported", "Payment method " + paymentMethod.getType() + " not supported by the plugin"));
+ }
+ else {
+ paymentMethods.put(paymentMethod.getId(), paymentMethod);
+ return Either.right(realPaymentMethod);
+ }
+ }
+ else {
+ return Either.left(new PaymentError("unknown", "Could not create add payment method " + paymentMethod + " for " + accountKey));
+ }
+ }
+
+ @Override
+ public Either<PaymentError, Void> deletePaymentMethod(String accountKey, String paymentMethodId) {
+ if (paymentMethods.remove(paymentMethodId) == null) {
+ return Either.left(new PaymentError("unknown", "Did not get any result back"));
+ }
+ else {
+ return Either.right(null);
+ }
+ }
+
+ @Override
+ public Either<PaymentError, PaymentMethodInfo> getPaymentMethodInfo(String paymentMethodId) {
+ if (paymentMethodId != null) {
+ return Either.left(new PaymentError("unknown", "Could not retrieve payment method for paymentMethodId " + paymentMethodId));
+ }
+
+ return Either.right(paymentMethods.get(paymentMethodId));
+ }
+
+ @Override
+ public Either<PaymentError, List<PaymentMethodInfo>> getPaymentMethods(final String accountId) {
+
+ Collection<PaymentMethodInfo> filteredPaymentMethods = Collections2.filter(paymentMethods.values(), new Predicate<PaymentMethodInfo>() {
+ @Override
+ public boolean apply(PaymentMethodInfo input) {
+ return accountId.equals(input.getAccountId());
+ }
+ });
+ List<PaymentMethodInfo> result = new ArrayList<PaymentMethodInfo>(filteredPaymentMethods);
+ return Either.right(result);
+ }
+
+ @Override
+ public Either<PaymentError, Void> updatePaymentGateway(String accountKey) {
+ return Either.right(null);
+ }
+
+ @Override
+ public Either<PaymentError, Void> updatePaymentProviderAccountWithExistingContact(Account account) {
+ // nothing to do here
+ return Either.right(null);
+ }
+
+ @Override
+ public Either<PaymentError, Void> updatePaymentProviderAccountWithNewContact(Account account) {
+ // nothing to do here
+ return Either.right(null);
+ }
+
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPluginModule.java b/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPluginModule.java
new file mode 100644
index 0000000..441fcf8
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPluginModule.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.provider;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.name.Names;
+
+public class MockPaymentProviderPluginModule extends AbstractModule {
+ private final String instanceName;
+
+ public MockPaymentProviderPluginModule(String instanceName) {
+ this.instanceName = instanceName;
+ }
+
+ @Override
+ protected void configure() {
+ bind(MockPaymentProviderPlugin.class)
+ .annotatedWith(Names.named(instanceName))
+ .toProvider(new MockPaymentProviderPluginProvider(instanceName))
+ .asEagerSingleton();
+ }
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPluginProvider.java b/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPluginProvider.java
new file mode 100644
index 0000000..1170007
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPluginProvider.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.provider;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+public class MockPaymentProviderPluginProvider implements Provider<MockPaymentProviderPlugin> {
+ private PaymentProviderPluginRegistry registry;
+ private final String instanceName;
+
+ public MockPaymentProviderPluginProvider(String instanceName) {
+ this.instanceName = instanceName;
+ }
+
+ @Inject
+ public void setPaymentProviderPluginRegistry(PaymentProviderPluginRegistry registry) {
+ this.registry = registry;
+ }
+
+ @Override
+ public MockPaymentProviderPlugin get() {
+ MockPaymentProviderPlugin plugin = new MockPaymentProviderPlugin();
+
+ registry.register(plugin, instanceName);
+ return plugin;
+ }
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/setup/PaymentModuleWithMocks.java b/payment/src/test/java/com/ning/billing/payment/setup/PaymentModuleWithMocks.java
new file mode 100644
index 0000000..e051440
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/setup/PaymentModuleWithMocks.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.setup;
+
+import com.ning.billing.payment.dao.MockPaymentDao;
+import com.ning.billing.payment.dao.PaymentDao;
+
+public class PaymentModuleWithMocks extends PaymentModule {
+ @Override
+ protected void installPaymentDao() {
+ bind(PaymentDao.class).to(MockPaymentDao.class).asEagerSingleton();
+ }
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModuleWithEmbeddedDb.java b/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModuleWithEmbeddedDb.java
new file mode 100644
index 0000000..39a080c
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModuleWithEmbeddedDb.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.setup;
+
+import org.apache.commons.collections.MapUtils;
+
+import com.google.common.collect.ImmutableMap;
+import com.ning.billing.payment.provider.MockPaymentProviderPluginModule;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.MemoryEventBus;
+
+public class PaymentTestModuleWithEmbeddedDb extends PaymentModule {
+ public PaymentTestModuleWithEmbeddedDb() {
+ super(MapUtils.toProperties(ImmutableMap.of("killbill.payment.provider.default", "my-mock")));
+ }
+
+ @Override
+ protected void installPaymentProviderPlugins(PaymentConfig config) {
+ install(new MockPaymentProviderPluginModule("my-mock"));
+ }
+
+ @Override
+ protected void configure() {
+ super.configure();
+ bind(EventBus.class).to(MemoryEventBus.class).asEagerSingleton();
+ }
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModuleWithMocks.java b/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModuleWithMocks.java
new file mode 100644
index 0000000..ce7f502
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/setup/PaymentTestModuleWithMocks.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.setup;
+
+import org.apache.commons.collections.MapUtils;
+
+import com.google.common.collect.ImmutableMap;
+import com.ning.billing.account.dao.AccountDao;
+import com.ning.billing.account.dao.MockAccountDao;
+import com.ning.billing.invoice.dao.InvoiceDao;
+import com.ning.billing.invoice.dao.MockInvoiceDao;
+import com.ning.billing.payment.dao.MockPaymentDao;
+import com.ning.billing.payment.dao.PaymentDao;
+import com.ning.billing.payment.provider.MockPaymentProviderPluginModule;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.MemoryEventBus;
+
+public class PaymentTestModuleWithMocks extends PaymentModule {
+ public PaymentTestModuleWithMocks() {
+ super(MapUtils.toProperties(ImmutableMap.of("killbill.payment.provider.default", "my-mock")));
+ }
+
+ @Override
+ protected void installPaymentDao() {
+ bind(PaymentDao.class).to(MockPaymentDao.class).asEagerSingleton();
+ }
+
+ @Override
+ protected void installPaymentProviderPlugins(PaymentConfig config) {
+ install(new MockPaymentProviderPluginModule("my-mock"));
+ }
+
+ @Override
+ protected void configure() {
+ super.configure();
+ bind(EventBus.class).to(MemoryEventBus.class).asEagerSingleton();
+ bind(MockAccountDao.class).asEagerSingleton();
+ bind(AccountDao.class).to(MockAccountDao.class);
+ bind(MockInvoiceDao.class).asEagerSingleton();
+ bind(InvoiceDao.class).to(MockInvoiceDao.class);
+ }
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/TestHelper.java b/payment/src/test/java/com/ning/billing/payment/TestHelper.java
new file mode 100644
index 0000000..862d98c
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/TestHelper.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import org.apache.commons.lang.RandomStringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
+import com.google.inject.Inject;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountApiException;
+import com.ning.billing.account.api.user.AccountBuilder;
+import com.ning.billing.account.dao.AccountDao;
+import com.ning.billing.catalog.api.Currency;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.api.InvoiceItem;
+import com.ning.billing.invoice.dao.InvoiceDao;
+import com.ning.billing.invoice.model.DefaultInvoice;
+import com.ning.billing.invoice.model.DefaultInvoiceItem;
+
+public class TestHelper {
+ protected final AccountDao accountDao;
+ protected final InvoiceDao invoiceDao;
+
+ @Inject
+ public TestHelper(AccountDao accountDao, InvoiceDao invoiceDao) {
+ this.accountDao = accountDao;
+ this.invoiceDao = invoiceDao;
+ }
+
+ public Account createTestAccount() throws AccountApiException {
+ final String name = "First" + RandomStringUtils.random(5) + " " + "Last" + RandomStringUtils.random(5);
+ final Account account = new AccountBuilder(UUID.randomUUID()).name(name)
+ .firstNameLength(name.length())
+ .externalKey("12345")
+ .phone("123-456-7890")
+ .email("user@example.com")
+ .currency(Currency.USD)
+ .billingCycleDay(1)
+ .build();
+ accountDao.create(account);
+ return account;
+ }
+
+ public Invoice createTestInvoice(Account account,
+ DateTime targetDate,
+ Currency currency,
+ InvoiceItem... items) {
+ Invoice invoice = new DefaultInvoice(UUID.randomUUID(), account.getId(), new DateTime(), targetDate, currency, null, new BigDecimal("0"));
+
+ for (InvoiceItem item : items) {
+ invoice.add(new DefaultInvoiceItem(invoice.getId(),
+ item.getSubscriptionId(),
+ item.getStartDate(),
+ item.getEndDate(),
+ item.getDescription(),
+ item.getAmount(),
+ item.getRate(),
+ item.getCurrency()));
+ }
+ invoiceDao.create(invoice);
+ return invoice;
+ }
+
+ public Invoice createTestInvoice(Account account) {
+ final DateTime now = new DateTime(DateTimeZone.UTC);
+ final UUID subscriptionId = UUID.randomUUID();
+ final BigDecimal amount = new BigDecimal("10.00");
+ final InvoiceItem item = new DefaultInvoiceItem(null, subscriptionId, now, now.plusMonths(1), "Test", amount, new BigDecimal("1.0"), Currency.USD);
+
+ return createTestInvoice(account, now, Currency.USD, item);
+ }
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/TestNotifyInvoicePaymentApi.java b/payment/src/test/java/com/ning/billing/payment/TestNotifyInvoicePaymentApi.java
new file mode 100644
index 0000000..e6d1334
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/TestNotifyInvoicePaymentApi.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment;
+
+import static org.testng.Assert.assertNotNull;
+
+import java.util.UUID;
+
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import com.google.inject.Inject;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.api.AccountApiException;
+import com.ning.billing.account.glue.AccountModuleWithMocks;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.api.InvoicePaymentApi;
+import com.ning.billing.invoice.glue.InvoiceModuleWithMocks;
+import com.ning.billing.payment.api.InvoicePayment;
+import com.ning.billing.payment.setup.PaymentTestModuleWithMocks;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
+
+@Test
+@Guice(modules = { PaymentTestModuleWithMocks.class, AccountModuleWithMocks.class, InvoiceModuleWithMocks.class })
+public class TestNotifyInvoicePaymentApi {
+ @Inject
+ private EventBus eventBus;
+ @Inject
+ private RequestProcessor invoiceProcessor;
+ @Inject
+ private InvoicePaymentApi invoicePaymentApi;
+ @Inject
+ private TestHelper testHelper;
+
+ @BeforeMethod(alwaysRun = true)
+ public void setUp() throws EventBusException {
+ eventBus.start();
+ eventBus.register(invoiceProcessor);
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws EventBusException {
+ eventBus.unregister(invoiceProcessor);
+ eventBus.stop();
+ }
+
+ @Test
+ public void testNotifyPaymentSuccess() throws AccountApiException {
+ final Account account = testHelper.createTestAccount();
+ final Invoice invoice = testHelper.createTestInvoice(account);
+
+ PaymentAttempt paymentAttempt = new PaymentAttempt(UUID.randomUUID(), invoice);
+
+ invoicePaymentApi.notifyOfPaymentAttempt(invoice.getId(),
+ invoice.getAmountOutstanding(),
+ invoice.getCurrency(),
+ paymentAttempt.getPaymentAttemptId(),
+ paymentAttempt.getPaymentAttemptDate());
+
+ InvoicePayment invoicePayment = invoicePaymentApi.getInvoicePayment(paymentAttempt.getPaymentAttemptId());
+
+ assertNotNull(invoicePayment);
+ }
+
+ @Test
+ public void testNotifyPaymentFailure() throws AccountApiException {
+ final Account account = testHelper.createTestAccount();
+ final Invoice invoice = testHelper.createTestInvoice(account);
+
+ PaymentAttempt paymentAttempt = new PaymentAttempt(UUID.randomUUID(), invoice);
+ invoicePaymentApi.notifyOfPaymentAttempt(invoice.getId(),
+ paymentAttempt.getPaymentAttemptId(),
+ paymentAttempt.getPaymentAttemptDate());
+
+ InvoicePayment invoicePayment = invoicePaymentApi.getInvoicePayment(paymentAttempt.getPaymentAttemptId());
+
+ assertNotNull(invoicePayment);
+ }
+
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/TestPaymentInvoiceIntegration.java b/payment/src/test/java/com/ning/billing/payment/TestPaymentInvoiceIntegration.java
new file mode 100644
index 0000000..1027abe
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/TestPaymentInvoiceIntegration.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment;
+
+import static com.jayway.awaitility.Awaitility.await;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import org.apache.commons.io.IOUtils;
+import org.skife.jdbi.v2.IDBI;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.glue.AccountModule;
+import com.ning.billing.dbi.MysqlTestingHelper;
+import com.ning.billing.invoice.api.Invoice;
+import com.ning.billing.invoice.api.InvoicePaymentApi;
+import com.ning.billing.invoice.glue.InvoiceModule;
+import com.ning.billing.payment.api.PaymentApi;
+import com.ning.billing.payment.api.PaymentAttempt;
+import com.ning.billing.payment.api.PaymentError;
+import com.ning.billing.payment.api.PaymentInfo;
+import com.ning.billing.payment.setup.PaymentTestModuleWithEmbeddedDb;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
+
+public class TestPaymentInvoiceIntegration {
+ // create payment for received invoice and save it -- positive and negative
+ // check that notification for payment attempt is created
+ // check that invoice-payment is saved
+ @Inject
+ private EventBus eventBus;
+ @Inject
+ private RequestProcessor invoiceProcessor;
+ @Inject
+ private InvoicePaymentApi invoicePaymentApi;
+ @Inject
+ private PaymentApi paymentApi;
+ @Inject
+ private TestHelper testHelper;
+
+ private MockPaymentInfoReceiver paymentInfoReceiver;
+
+ private IDBI dbi;
+ private MysqlTestingHelper helper;
+
+ @BeforeClass(alwaysRun = true)
+ public void startMysql() throws IOException {
+ final String accountddl = IOUtils.toString(MysqlTestingHelper.class.getResourceAsStream("/com/ning/billing/account/ddl.sql"));
+ final String utilddl = IOUtils.toString(MysqlTestingHelper.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
+ final String invoiceddl = IOUtils.toString(MysqlTestingHelper.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
+ final String paymentddl = IOUtils.toString(MysqlTestingHelper.class.getResourceAsStream("/com/ning/billing/payment/ddl.sql"));
+
+ helper = new MysqlTestingHelper();
+ helper.startMysql();
+ helper.initDb(accountddl + "\n" + invoiceddl + "\n" + utilddl + "\n" + paymentddl);
+ dbi = helper.getDBI();
+ }
+
+ @AfterClass(alwaysRun = true)
+ public void stopMysql() {
+ helper.stopMysql();
+ }
+
+ @BeforeMethod(alwaysRun = true)
+ public void setUp() throws EventBusException {
+ Injector injector = Guice.createInjector(new PaymentTestModuleWithEmbeddedDb(),
+ new AccountModule(),
+ new InvoiceModule(),
+ new AbstractModule() {
+ @Override
+ protected void configure() {
+ bind(IDBI.class).toInstance(dbi);
+ }
+ });
+ injector.injectMembers(this);
+
+ paymentInfoReceiver = new MockPaymentInfoReceiver();
+
+ eventBus.start();
+ eventBus.register(invoiceProcessor);
+ eventBus.register(paymentInfoReceiver);
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws EventBusException {
+ eventBus.unregister(invoiceProcessor);
+ eventBus.unregister(paymentInfoReceiver);
+ eventBus.stop();
+ }
+
+ @Test
+ public void testInvoiceIntegration() throws Exception {
+ final Account account = testHelper.createTestAccount();
+ final Invoice invoice = testHelper.createTestInvoice(account);
+
+ await().atMost(1, MINUTES).until(new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws Exception {
+ List<PaymentInfo> processedPayments = paymentInfoReceiver.getProcessedPayments();
+ List<PaymentError> errors = paymentInfoReceiver.getErrors();
+
+ return processedPayments.size() == 1 || errors.size() == 1;
+ }
+ });
+
+ assertFalse(paymentInfoReceiver.getProcessedPayments().isEmpty());
+ assertTrue(paymentInfoReceiver.getErrors().isEmpty());
+
+ List<PaymentInfo> payments = paymentInfoReceiver.getProcessedPayments();
+ PaymentAttempt paymentAttempt = paymentApi.getPaymentAttemptForPaymentId(payments.get(0).getPaymentId());
+ Assert.assertNotNull(paymentAttempt);
+
+ Invoice invoiceForPayment = invoicePaymentApi.getInvoiceForPaymentAttemptId(paymentAttempt.getPaymentAttemptId());
+
+ Assert.assertNotNull(invoiceForPayment);
+ Assert.assertEquals(invoiceForPayment.getId(), invoice.getId());
+ Assert.assertEquals(invoiceForPayment.getAccountId(), account.getId());
+ Assert.assertTrue(invoiceForPayment.getLastPaymentAttempt().isEqual(paymentAttempt.getPaymentAttemptDate()));
+ Assert.assertEquals(invoiceForPayment.getAmountOutstanding().floatValue(), new BigDecimal("0").floatValue());
+ Assert.assertEquals(invoiceForPayment.getAmountPaid().floatValue(), invoice.getAmountOutstanding().floatValue());
+ }
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java b/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java
new file mode 100644
index 0000000..9f9720c
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/TestPaymentProvider.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment;
+
+import static com.jayway.awaitility.Awaitility.await;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import com.google.inject.Inject;
+import com.ning.billing.account.api.Account;
+import com.ning.billing.account.glue.AccountModuleWithMocks;
+import com.ning.billing.invoice.glue.InvoiceModuleWithMocks;
+import com.ning.billing.payment.api.PaymentError;
+import com.ning.billing.payment.api.PaymentInfo;
+import com.ning.billing.payment.setup.PaymentTestModuleWithMocks;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.EventBus.EventBusException;
+
+@Guice(modules = { PaymentTestModuleWithMocks.class, AccountModuleWithMocks.class, InvoiceModuleWithMocks.class })
+public class TestPaymentProvider {
+ @Inject
+ private EventBus eventBus;
+ @Inject
+ private RequestProcessor invoiceProcessor;
+ @Inject
+ private TestHelper testHelper;
+
+ private MockPaymentInfoReceiver paymentInfoReceiver;
+
+ @BeforeMethod(alwaysRun = true)
+ public void setUp() throws EventBusException {
+ paymentInfoReceiver = new MockPaymentInfoReceiver();
+
+ eventBus.start();
+ eventBus.register(invoiceProcessor);
+ eventBus.register(paymentInfoReceiver);
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws EventBusException {
+ eventBus.unregister(invoiceProcessor);
+ eventBus.unregister(paymentInfoReceiver);
+ eventBus.stop();
+ }
+
+ @Test
+ public void testSimpleInvoice() throws Exception {
+ final Account account = testHelper.createTestAccount();
+
+ testHelper.createTestInvoice(account);
+
+ await().atMost(1, MINUTES).until(new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws Exception {
+ List<PaymentInfo> processedPayments = paymentInfoReceiver.getProcessedPayments();
+ List<PaymentError> errors = paymentInfoReceiver.getErrors();
+
+ return processedPayments.size() == 1 || errors.size() == 1;
+ }
+ });
+
+ assertFalse(paymentInfoReceiver.getProcessedPayments().isEmpty());
+ assertTrue(paymentInfoReceiver.getErrors().isEmpty());
+
+ final PaymentInfo paymentInfo = paymentInfoReceiver.getProcessedPayments().get(0);
+ final PaymentInfoRequest paymentInfoRequest = new PaymentInfoRequest(account.getId(), paymentInfo.getPaymentId());
+
+ paymentInfoReceiver.clear();
+ eventBus.post(paymentInfoRequest);
+ await().atMost(5, MINUTES).until(new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws Exception {
+ List<PaymentInfo> processedPayments = paymentInfoReceiver.getProcessedPayments();
+ List<PaymentError> errors = paymentInfoReceiver.getErrors();
+
+ return processedPayments.size() == 1 || errors.size() == 1;
+ }
+ });
+
+ assertFalse(paymentInfoReceiver.getProcessedPayments().isEmpty());
+ assertTrue(paymentInfoReceiver.getErrors().isEmpty());
+ assertEquals(paymentInfoReceiver.getProcessedPayments().get(0), paymentInfo);
+ }
+}
diff --git a/payment/src/test/java/com/ning/billing/payment/util/TestSyncWaitOnEventBus.java b/payment/src/test/java/com/ning/billing/payment/util/TestSyncWaitOnEventBus.java
new file mode 100644
index 0000000..3e446cf
--- /dev/null
+++ b/payment/src/test/java/com/ning/billing/payment/util/TestSyncWaitOnEventBus.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.payment.util;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.UUID;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.common.eventbus.Subscribe;
+import com.ning.billing.util.eventbus.EventBus;
+import com.ning.billing.util.eventbus.MemoryEventBus;
+
+@Test
+public class TestSyncWaitOnEventBus {
+ private static final class TestEvent implements EventBusRequest<UUID> {
+ private final UUID id;
+ private final String msg;
+
+ public TestEvent(UUID id, String msg) {
+ this.id = id;
+ this.msg = msg;
+ }
+
+ @Override
+ public UUID getId() {
+ return id;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+ }
+
+ private static final class TestResponse implements EventBusResponse<UUID> {
+ private final UUID id;
+ private final String msg;
+
+ public TestResponse(UUID id, String msg) {
+ this.id = id;
+ this.msg = msg;
+ }
+
+ @Override
+ public UUID getRequestId() {
+ return id;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+ }
+
+ private EventBus eventBus;
+
+ @BeforeMethod(alwaysRun = true)
+ public void setUp() throws Exception {
+ eventBus = new MemoryEventBus();
+ eventBus.start();
+ eventBus.register(new Object() {
+ @Subscribe
+ public void handleEvent(TestEvent event) throws Exception {
+ Thread.sleep(100);
+ eventBus.post(new TestResponse(event.getId(), event.getMsg()));
+ }
+ });
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() {
+ eventBus.stop();
+ }
+
+ public void test() throws Exception {
+ final TestEvent event = new TestEvent(UUID.randomUUID(), "Hello World!");
+
+ Future<TestResponse> future = EventBusFuture.post(eventBus, event);
+ TestResponse response = future.get(1, TimeUnit.SECONDS);
+
+ assertEquals(response.getRequestId(), event.getId());
+ assertEquals(response.getMsg(), event.getMsg());
+ }
+}
payment/src/test/resources/log4j.xml 30(+30 -0)
diff --git a/payment/src/test/resources/log4j.xml b/payment/src/test/resources/log4j.xml
new file mode 100644
index 0000000..82b5a26
--- /dev/null
+++ b/payment/src/test/resources/log4j.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Copyright 2010 Ning, Inc.
+ ~
+ ~ Ning licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<!DOCTYPE log4j:configuration SYSTEM "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd">
+<log4j:configuration debug="false"
+ xmlns:log4j='http://jakarta.apache.org/log4j/'>
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%p %d{ISO8601} %t %c %m%n"/>
+ </layout>
+ </appender>
+
+ <root>
+ <level value="info"/>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</log4j:configuration>
pom.xml 86(+75 -11)
diff --git a/pom.xml b/pom.xml
index 8c8fbb3..7b8944a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
<packaging>pom</packaging>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<name>killbill</name>
<description>Library for managing recurring subscriptions and the associated billing</description>
<url>http://github.com/ning/killbill</url>
@@ -29,7 +29,7 @@
</license>
</licenses>
<scm>
- <connection>scm:git:git://github.com/stephane/killbill.git</connection>
+ <connection>scm:git:git://github.com/ning/killbill.git</connection>
<developerConnection>scm:git:git@github.com:ning/killbill.git</developerConnection>
<url>http://github.com/ning/killbill/tree/master</url>
</scm>
@@ -56,6 +56,12 @@
</dependency>
<dependency>
<groupId>com.ning.billing</groupId>
+ <artifactId>killbill-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
<artifactId>killbill-account</artifactId>
<version>${project.version}</version>
</dependency>
@@ -64,7 +70,6 @@
<artifactId>killbill-account</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.ning.billing</groupId>
@@ -73,6 +78,12 @@
</dependency>
<dependency>
<groupId>com.ning.billing</groupId>
+ <artifactId>killbill-entitlement</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
<artifactId>killbill-catalog</artifactId>
<version>${project.version}</version>
</dependency>
@@ -81,14 +92,17 @@
<artifactId>killbill-catalog</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.ning.billing</groupId>
- <artifactId>killbill-util</artifactId>
+ <artifactId>killbill-invoice</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-invoice</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.ning.billing</groupId>
@@ -96,19 +110,25 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.ning.billing</groupId>
+ <artifactId>killbill-util</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.9.0</version>
+ <version>1.9.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>1.9.0</version>
+ <version>1.9.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.0</version>
+ <version>1.9.2</version>
</dependency>
<dependency>
<groupId>com.jolbox</groupId>
@@ -134,9 +154,15 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.mogwee</groupId>
<artifactId>mogwee-executors</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
@@ -176,6 +202,11 @@
<version>2.5</version>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.0</version>
@@ -231,7 +262,13 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.0</version>
+ <version>6.3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>1.3.3</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -284,6 +321,18 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.3</version>
@@ -391,6 +440,21 @@
<attachClasses>true</attachClasses>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
util/pom.xml 18(+16 -2)
diff --git a/util/pom.xml b/util/pom.xml
index 74d243c..2b23ebb 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>com.ning.billing</groupId>
<artifactId>killbill</artifactId>
- <version>0.1.2-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-util</artifactId>
@@ -55,6 +55,15 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
@@ -62,7 +71,12 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>management</artifactId>
- <version>5.0.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>management-dbfiles</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/util/src/main/java/com/ning/billing/util/entity/EntityDao.java b/util/src/main/java/com/ning/billing/util/entity/EntityDao.java
index 3b5dd46..3e68158 100644
--- a/util/src/main/java/com/ning/billing/util/entity/EntityDao.java
+++ b/util/src/main/java/com/ning/billing/util/entity/EntityDao.java
@@ -16,20 +16,21 @@
package com.ning.billing.util.entity;
+import java.util.List;
+
import org.skife.jdbi.v2.sqlobject.Bind;
import org.skife.jdbi.v2.sqlobject.BindBean;
-import org.skife.jdbi.v2.sqlobject.SqlBatch;
import org.skife.jdbi.v2.sqlobject.SqlQuery;
import org.skife.jdbi.v2.sqlobject.SqlUpdate;
-import java.util.List;
+import com.ning.billing.account.api.AccountApiException;
public interface EntityDao<T extends Entity> {
@SqlUpdate
- public void create(@BindBean T entity);
+ public void create(@BindBean final T entity) throws AccountApiException;
@SqlUpdate
- public void update(@BindBean T entity);
+ public void update(@BindBean final T entity) throws AccountApiException;
@SqlQuery
public T getById(@Bind("id") final String id);
@@ -39,4 +40,7 @@ public interface EntityDao<T extends Entity> {
@SqlUpdate
public void test();
+
+ @SqlUpdate
+ public void deleteByKey(String key) throws AccountApiException;
}
diff --git a/util/src/main/java/com/ning/billing/util/eventbus/MemoryEventBus.java b/util/src/main/java/com/ning/billing/util/eventbus/MemoryEventBus.java
index 259736d..3f7c026 100644
--- a/util/src/main/java/com/ning/billing/util/eventbus/MemoryEventBus.java
+++ b/util/src/main/java/com/ning/billing/util/eventbus/MemoryEventBus.java
@@ -80,9 +80,9 @@ public class MemoryEventBus implements EventBus {
}
@Override
- public void register(Object handlerInstnace) throws EventBusException {
+ public void register(Object handlerInstance) throws EventBusException {
checkInitialized("register");
- delegate.register(handlerInstnace);
+ delegate.register(handlerInstance);
}
@Override
@@ -111,7 +111,6 @@ public class MemoryEventBus implements EventBus {
}
}
-
private void checkInitialized(String operation) throws EventBusException {
if (!isInitialized.get()) {
throw new EventBusException(String.format("Attempting operation %s on an non initialized eventbus",
@@ -124,7 +123,7 @@ public class MemoryEventBus implements EventBus {
log.info("MemoryEventBus stopping...");
delegate.completeDispatch();
delegate.stop();
- log.info("MemoryEventBus stoped...");
+ log.info("MemoryEventBus stopped...");
}
}
}
diff --git a/util/src/main/java/com/ning/billing/util/glue/EventBusModule.java b/util/src/main/java/com/ning/billing/util/glue/EventBusModule.java
index 078c331..bae0311 100644
--- a/util/src/main/java/com/ning/billing/util/glue/EventBusModule.java
+++ b/util/src/main/java/com/ning/billing/util/glue/EventBusModule.java
@@ -28,7 +28,6 @@ public class EventBusModule extends AbstractModule {
protected void configure() {
bind(EventBusService.class).to(DefaultEventBusService.class);
bind(EventBus.class).to(MemoryEventBus.class).asEagerSingleton();
-
}
}
diff --git a/util/src/main/java/com/ning/billing/util/glue/TagDescriptionDaoProvider.java b/util/src/main/java/com/ning/billing/util/glue/TagDescriptionDaoProvider.java
index 31fb306..560a09f 100644
--- a/util/src/main/java/com/ning/billing/util/glue/TagDescriptionDaoProvider.java
+++ b/util/src/main/java/com/ning/billing/util/glue/TagDescriptionDaoProvider.java
@@ -18,10 +18,10 @@ package com.ning.billing.util.glue;
import com.google.inject.Inject;
import com.google.inject.Provider;
-import com.ning.billing.util.tag.dao.TagDescriptionDao;
+import com.ning.billing.util.tag.dao.TagDefinitionSqlDao;
import org.skife.jdbi.v2.IDBI;
-public class TagDescriptionDaoProvider implements Provider<TagDescriptionDao>
+public class TagDescriptionDaoProvider implements Provider<TagDefinitionSqlDao>
{
private final IDBI dbi;
@@ -32,8 +32,8 @@ public class TagDescriptionDaoProvider implements Provider<TagDescriptionDao>
}
@Override
- public TagDescriptionDao get()
+ public TagDefinitionSqlDao get()
{
- return dbi.onDemand(TagDescriptionDao.class);
+ return dbi.onDemand(TagDefinitionSqlDao.class);
}
}
diff --git a/util/src/main/java/com/ning/billing/util/glue/TagStoreDaoProvider.java b/util/src/main/java/com/ning/billing/util/glue/TagStoreDaoProvider.java
index 2c612e6..aa0f080 100644
--- a/util/src/main/java/com/ning/billing/util/glue/TagStoreDaoProvider.java
+++ b/util/src/main/java/com/ning/billing/util/glue/TagStoreDaoProvider.java
@@ -18,10 +18,10 @@ package com.ning.billing.util.glue;
import com.google.inject.Inject;
import com.google.inject.Provider;
-import com.ning.billing.util.tag.dao.TagStoreDao;
+import com.ning.billing.util.tag.dao.TagStoreSqlDao;
import org.skife.jdbi.v2.IDBI;
-public class TagStoreDaoProvider implements Provider<TagStoreDao>
+public class TagStoreDaoProvider implements Provider<TagStoreSqlDao>
{
private final IDBI dbi;
@@ -32,8 +32,8 @@ public class TagStoreDaoProvider implements Provider<TagStoreDao>
}
@Override
- public TagStoreDao get()
+ public TagStoreSqlDao get()
{
- return dbi.onDemand(TagStoreDao.class);
+ return dbi.onDemand(TagStoreSqlDao.class);
}
}
diff --git a/util/src/main/java/com/ning/billing/util/glue/TagStoreModule.java b/util/src/main/java/com/ning/billing/util/glue/TagStoreModule.java
index ae14782..039ce2b 100644
--- a/util/src/main/java/com/ning/billing/util/glue/TagStoreModule.java
+++ b/util/src/main/java/com/ning/billing/util/glue/TagStoreModule.java
@@ -17,15 +17,24 @@
package com.ning.billing.util.glue;
import com.google.inject.AbstractModule;
-import com.ning.billing.util.tag.dao.TagDescriptionDao;
-import com.ning.billing.util.tag.dao.TagStoreDao;
+import com.ning.billing.util.api.TagDefinitionUserApi;
+import com.ning.billing.util.clock.Clock;
+import com.ning.billing.util.clock.DefaultClock;
+import com.ning.billing.util.tag.api.DefaultTagDefinitionUserApi;
+import com.ning.billing.util.tag.dao.DefaultTagDefinitionDao;
+import com.ning.billing.util.tag.dao.TagDefinitionDao;
+import com.ning.billing.util.tag.dao.TagDefinitionSqlDao;
+import com.ning.billing.util.tag.dao.TagStoreSqlDao;
public class TagStoreModule extends AbstractModule
{
@Override
protected void configure()
{
- bind(TagDescriptionDao.class).toProvider(TagDescriptionDaoProvider.class).asEagerSingleton();
- bind(TagStoreDao.class).toProvider(TagStoreDaoProvider.class).asEagerSingleton();
+ bind(Clock.class).to(DefaultClock.class).asEagerSingleton();
+ bind(TagDefinitionSqlDao.class).toProvider(TagDescriptionDaoProvider.class).asEagerSingleton();
+ bind(TagDefinitionDao.class).to(DefaultTagDefinitionDao.class).asEagerSingleton();
+ bind(TagStoreSqlDao.class).toProvider(TagStoreDaoProvider.class).asEagerSingleton();
+ bind(TagDefinitionUserApi.class).to(DefaultTagDefinitionUserApi.class).asEagerSingleton();
}
}
diff --git a/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionService.java b/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionService.java
new file mode 100644
index 0000000..0e1f99e
--- /dev/null
+++ b/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionService.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag.api;
+
+import com.google.inject.Inject;
+import com.ning.billing.util.api.TagDefinitionService;
+import com.ning.billing.util.api.TagDefinitionUserApi;
+
+public class DefaultTagDefinitionService implements TagDefinitionService {
+ private static final String TAG_DEFINITION_SERVICE_NAME = "tag-service";
+ private final TagDefinitionUserApi api;
+
+ @Inject
+ public DefaultTagDefinitionService(final TagDefinitionUserApi api) {
+ this.api = api;
+ }
+
+ @Override
+ public TagDefinitionUserApi getTagDefinitionUserApi() {
+ return api;
+ }
+
+ @Override
+ public String getName() {
+ return TAG_DEFINITION_SERVICE_NAME;
+ }
+}
diff --git a/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java b/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java
new file mode 100644
index 0000000..452eb5e
--- /dev/null
+++ b/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag.api;
+
+import java.util.List;
+import com.google.inject.Inject;
+import com.ning.billing.util.api.TagDefinitionApiException;
+import com.ning.billing.util.api.TagDefinitionUserApi;
+import com.ning.billing.util.tag.TagDefinition;
+import com.ning.billing.util.tag.dao.TagDefinitionDao;
+
+public class DefaultTagDefinitionUserApi implements TagDefinitionUserApi {
+ private TagDefinitionDao dao;
+
+ @Inject
+ public DefaultTagDefinitionUserApi(TagDefinitionDao dao) {
+ this.dao = dao;
+ }
+
+ @Override
+ public List<TagDefinition> getTagDefinitions() {
+ return dao.getTagDefinitions();
+ }
+
+ @Override
+ public TagDefinition create(final String name, final String description, final String createdBy) throws TagDefinitionApiException {
+ return dao.create(name, description, createdBy);
+ }
+
+ @Override
+ public void deleteAllTagsForDefinition(final String definitionName) throws TagDefinitionApiException {
+ dao.deleteAllTagsForDefinition(definitionName);
+ }
+
+ @Override
+ public void deleteTagDefinition(final String definitionName) throws TagDefinitionApiException {
+ dao.deleteAllTagsForDefinition(definitionName);
+ }
+}
diff --git a/util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java b/util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java
new file mode 100644
index 0000000..57ca679
--- /dev/null
+++ b/util/src/main/java/com/ning/billing/util/tag/dao/DefaultTagDefinitionDao.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag.dao;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.skife.jdbi.v2.IDBI;
+import com.google.inject.Inject;
+import com.ning.billing.ErrorCode;
+import com.ning.billing.account.api.ControlTagType;
+import com.ning.billing.util.api.TagDefinitionApiException;
+import com.ning.billing.util.clock.Clock;
+import com.ning.billing.util.tag.DefaultTagDefinition;
+import com.ning.billing.util.tag.Tag;
+import com.ning.billing.util.tag.TagDefinition;
+
+public class DefaultTagDefinitionDao implements TagDefinitionDao {
+ private final TagDefinitionSqlDao dao;
+ private final Clock clock;
+
+ @Inject
+ public DefaultTagDefinitionDao(IDBI dbi, Clock clock) {
+ this.dao = dbi.onDemand(TagDefinitionSqlDao.class);
+ this.clock = clock;
+ }
+
+ @Override
+ public List<TagDefinition> getTagDefinitions() {
+ // get user definitions from the database
+ List<TagDefinition> definitionList = new ArrayList<TagDefinition>();
+ definitionList.addAll(dao.get());
+
+ // add control tag definitions
+ for (ControlTagType controlTag : ControlTagType.values()) {
+ definitionList.add(new DefaultTagDefinition(controlTag.toString(), controlTag.getDescription(), null, null));
+ }
+
+ return definitionList;
+ }
+
+ @Override
+ public TagDefinition getByName(final String definitionName) {
+ return dao.getByName(definitionName);
+ }
+
+ @Override
+ public TagDefinition create(final String definitionName, final String description, final String createdBy) throws TagDefinitionApiException {
+ if (isControlTagName(definitionName)) {
+ throw new TagDefinitionApiException(ErrorCode.TAG_DEFINITION_CONFLICTS_WITH_CONTROL_TAG, definitionName);
+ }
+
+ TagDefinition existingDefinition = dao.getByName(definitionName);
+
+ if (existingDefinition != null) {
+ throw new TagDefinitionApiException(ErrorCode.TAG_DEFINITION_ALREADY_EXISTS, definitionName);
+ }
+
+ TagDefinition definition = new DefaultTagDefinition(definitionName, description, createdBy, clock.getUTCNow());
+ dao.create(definition);
+ return definition;
+ }
+
+ private boolean isControlTagName(final String definitionName) {
+ for (ControlTagType controlTagName : ControlTagType.values()) {
+ if (controlTagName.toString().equals(definitionName)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ @Override
+ public void deleteAllTagsForDefinition(final String definitionName) throws TagDefinitionApiException {
+ TagDefinition existingDefinition = dao.getByName(definitionName);
+ if (existingDefinition == null) {
+ throw new TagDefinitionApiException(ErrorCode.TAG_DEFINITION_DOES_NOT_EXIST, definitionName);
+ }
+
+ dao.deleteAllTagsForDefinition(definitionName);
+ }
+
+ @Override
+ public void deleteTagDefinition(final String definitionName) throws TagDefinitionApiException {
+ if (dao.tagDefinitionUsageCount(definitionName) > 0) {
+ throw new TagDefinitionApiException(ErrorCode.TAG_DEFINITION_IN_USE, definitionName);
+ }
+
+ TagDefinition existingDefinition = dao.getByName(definitionName);
+
+ if (existingDefinition == null) {
+ throw new TagDefinitionApiException(ErrorCode.TAG_DEFINITION_DOES_NOT_EXIST, definitionName);
+ }
+
+ dao.deleteTagDefinition(definitionName);
+ }
+}
diff --git a/util/src/main/java/com/ning/billing/util/tag/dao/TagBinder.java b/util/src/main/java/com/ning/billing/util/tag/dao/TagBinder.java
new file mode 100644
index 0000000..d56257d
--- /dev/null
+++ b/util/src/main/java/com/ning/billing/util/tag/dao/TagBinder.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag.dao;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.skife.jdbi.v2.SQLStatement;
+import org.skife.jdbi.v2.sqlobject.Binder;
+import org.skife.jdbi.v2.sqlobject.BinderFactory;
+import org.skife.jdbi.v2.sqlobject.BindingAnnotation;
+import com.ning.billing.util.tag.Tag;
+
+@BindingAnnotation(TagBinder.TagBinderFactory.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface TagBinder {
+ public static class TagBinderFactory implements BinderFactory {
+ public Binder build(Annotation annotation) {
+ return new Binder<TagBinder, Tag>() {
+ public void bind(SQLStatement q, TagBinder bind, Tag tag) {
+ q.bind("id", tag.getId().toString());
+ q.bind("tagDefinitionName", tag.getTagDefinitionName());
+ q.bind("addedDate", tag.getAddedDate().toDate());
+ q.bind("addedBy", tag.getAddedBy());
+ }
+ };
+ }
+ }
+}
diff --git a/util/src/main/java/com/ning/billing/util/tag/dao/TagDefinitionDao.java b/util/src/main/java/com/ning/billing/util/tag/dao/TagDefinitionDao.java
new file mode 100644
index 0000000..3164518
--- /dev/null
+++ b/util/src/main/java/com/ning/billing/util/tag/dao/TagDefinitionDao.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag.dao;
+
+import java.util.List;
+import com.ning.billing.util.api.TagDefinitionApiException;
+import com.ning.billing.util.tag.TagDefinition;
+
+public interface TagDefinitionDao {
+ public List<TagDefinition> getTagDefinitions();
+
+ public TagDefinition getByName(String definitionName);
+
+ public TagDefinition create(String definitionName, String description, String createdBy) throws TagDefinitionApiException;
+
+ public void deleteAllTagsForDefinition(String definitionName) throws TagDefinitionApiException;
+
+ public void deleteTagDefinition(String definitionName) throws TagDefinitionApiException;
+}
diff --git a/util/src/main/java/com/ning/billing/util/tag/dao/TagMapper.java b/util/src/main/java/com/ning/billing/util/tag/dao/TagMapper.java
new file mode 100644
index 0000000..1296083
--- /dev/null
+++ b/util/src/main/java/com/ning/billing/util/tag/dao/TagMapper.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag.dao;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+import org.joda.time.DateTime;
+import org.skife.jdbi.v2.StatementContext;
+import org.skife.jdbi.v2.tweak.ResultSetMapper;
+import com.ning.billing.account.api.ControlTagType;
+import com.ning.billing.util.tag.DefaultControlTag;
+import com.ning.billing.util.tag.DefaultTagDefinition;
+import com.ning.billing.util.tag.DescriptiveTag;
+import com.ning.billing.util.tag.Tag;
+import com.ning.billing.util.tag.TagDefinition;
+
+public class TagMapper implements ResultSetMapper<Tag> {
+ @Override
+ public Tag map(final int index, final ResultSet result, final StatementContext context) throws SQLException {
+ String name = result.getString("tag_definition_name");
+
+ UUID id = UUID.fromString(result.getString("id"));
+ String addedBy = result.getString("added_by");
+ DateTime addedDate = new DateTime(result.getTimestamp("added_date"));
+
+ Tag tag;
+ try {
+ ControlTagType controlTagType = ControlTagType.valueOf(name);
+ tag = new DefaultControlTag(id, addedBy, addedDate, controlTagType);
+ } catch (Throwable t) {
+ String description = result.getString("tag_description");
+ String createdBy = result.getString("created_by");
+ DateTime creationDate = new DateTime(result.getDate("creation_date"));
+
+ UUID tagDefinitionId = UUID.fromString(result.getString("tag_definition_id"));
+ TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, name, description, createdBy, creationDate);
+ tag = new DescriptiveTag(id, tagDefinition, addedBy, addedDate);
+ }
+
+ return tag;
+ }
+}
diff --git a/util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java b/util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java
new file mode 100644
index 0000000..707526d
--- /dev/null
+++ b/util/src/main/java/com/ning/billing/util/tag/DefaultControlTag.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag;
+
+import java.util.UUID;
+import org.joda.time.DateTime;
+import com.ning.billing.account.api.ControlTagType;
+
+public class DefaultControlTag extends DescriptiveTag implements ControlTag {
+ private final ControlTagType controlTagType;
+
+ public DefaultControlTag(final String addedBy,
+ final DateTime addedDate, final ControlTagType controlTagType) {
+ this(UUID.randomUUID(), addedBy, addedDate, controlTagType);
+ }
+
+ public DefaultControlTag(final UUID id, final String addedBy,
+ final DateTime addedDate, final ControlTagType controlTagType) {
+
+ super(id, controlTagType.toString(), addedBy, addedDate);
+ this.controlTagType = controlTagType;
+ }
+
+ @Override
+ public ControlTagType getControlTagType() {
+ return controlTagType;
+ }
+}
diff --git a/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java b/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java
index 5d49fb2..2fd8144 100644
--- a/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java
+++ b/util/src/main/java/com/ning/billing/util/tag/DefaultTagStore.java
@@ -17,6 +17,7 @@
package com.ning.billing.util.tag;
import java.util.UUID;
+import com.ning.billing.account.api.ControlTagType;
import com.ning.billing.util.entity.EntityCollectionBase;
public class DefaultTagStore extends EntityCollectionBase<Tag> implements TagStore {
@@ -26,7 +27,7 @@ public class DefaultTagStore extends EntityCollectionBase<Tag> implements TagSto
@Override
public String getEntityKey(final Tag entity) {
- return entity.getName();
+ return entity.getTagDefinitionName();
}
@Override
@@ -36,10 +37,14 @@ public class DefaultTagStore extends EntityCollectionBase<Tag> implements TagSto
*/
public boolean processPayment() {
for (Tag tag : entities.values()) {
- if (!tag.getProcessPayment()) {
- return false;
+ if (tag instanceof ControlTag) {
+ ControlTag controlTag = (ControlTag) tag;
+ if (controlTag.getControlTagType() == ControlTagType.AUTO_BILLING_OFF) {
+ return false;
+ }
}
}
+
return true;
}
@@ -50,10 +55,14 @@ public class DefaultTagStore extends EntityCollectionBase<Tag> implements TagSto
@Override
public boolean generateInvoice() {
for (Tag tag : entities.values()) {
- if (!tag.getGenerateInvoice()) {
- return false;
+ if (tag instanceof ControlTag) {
+ ControlTag controlTag = (ControlTag) tag;
+ if (controlTag.getControlTagType() == ControlTagType.AUTO_INVOICING_OFF) {
+ return false;
+ }
}
}
+
return true;
}
@@ -65,7 +74,7 @@ public class DefaultTagStore extends EntityCollectionBase<Tag> implements TagSto
@Override
public boolean containsTag(final String tagName) {
for (Tag tag : entities.values()) {
- if (tag.getName().equals(tagName)) {
+ if (tag.getTagDefinitionName().equals(tagName)) {
return true;
}
}
diff --git a/util/src/main/java/com/ning/billing/util/tag/TagBuilder.java b/util/src/main/java/com/ning/billing/util/tag/TagBuilder.java
index cd4247f..626acd3 100644
--- a/util/src/main/java/com/ning/billing/util/tag/TagBuilder.java
+++ b/util/src/main/java/com/ning/billing/util/tag/TagBuilder.java
@@ -21,10 +21,7 @@ import org.joda.time.DateTime;
public class TagBuilder {
private UUID id = UUID.randomUUID();
- private UUID tagDescriptionId;
private String name;
- private boolean processPayment;
- private boolean generateInvoice;
private String addedBy;
private DateTime dateAdded;
@@ -33,23 +30,8 @@ public class TagBuilder {
return this;
}
- public TagBuilder tagDescriptionId(UUID tagDescriptionId) {
- this.tagDescriptionId = tagDescriptionId;
- return this;
- }
-
- public TagBuilder name(String name) {
- this.name = name;
- return this;
- }
-
- public TagBuilder processPayment(boolean processPayment) {
- this.processPayment = processPayment;
- return this;
- }
-
- public TagBuilder generateInvoice(boolean generateInvoice) {
- this.generateInvoice = generateInvoice;
+ public TagBuilder tagDescriptionName(String tagDescriptionName) {
+ this.name = tagDescriptionName;
return this;
}
@@ -64,6 +46,6 @@ public class TagBuilder {
}
public Tag build() {
- return new DefaultTag(id, tagDescriptionId, name, processPayment, generateInvoice, addedBy, dateAdded);
+ return new DescriptiveTag(id, name, addedBy, dateAdded);
}
}
diff --git a/util/src/main/resources/com/ning/billing/util/customfield/dao/FieldStoreDao.sql.stg b/util/src/main/resources/com/ning/billing/util/customfield/dao/FieldStoreDao.sql.stg
index 57163a9..883f61b 100644
--- a/util/src/main/resources/com/ning/billing/util/customfield/dao/FieldStoreDao.sql.stg
+++ b/util/src/main/resources/com/ning/billing/util/customfield/dao/FieldStoreDao.sql.stg
@@ -1,4 +1,4 @@
-group IFieldStoreDao;
+group FieldStoreDao;
save() ::= <<
INSERT INTO custom_fields(id, object_id, object_type, field_name, field_value)
diff --git a/util/src/main/resources/com/ning/billing/util/ddl.sql b/util/src/main/resources/com/ning/billing/util/ddl.sql
index 30471c7..a65e0cd 100644
--- a/util/src/main/resources/com/ning/billing/util/ddl.sql
+++ b/util/src/main/resources/com/ning/billing/util/ddl.sql
@@ -10,31 +10,29 @@ CREATE TABLE custom_fields (
CREATE INDEX custom_fields_object_id_object_type ON custom_fields(object_id, object_type);
CREATE UNIQUE INDEX custom_fields_unique ON custom_fields(object_id, object_type, field_name);
-DROP TABLE IF EXISTS tag_descriptions;
-CREATE TABLE tag_descriptions (
+DROP TABLE IF EXISTS tag_definitions;
+CREATE TABLE tag_definitions (
id char(36) NOT NULL,
name varchar(20) NOT NULL,
created_by varchar(50) NOT NULL,
creation_date datetime NOT NULL,
description varchar(200) NOT NULL,
- generate_invoice boolean DEFAULT false,
- process_payment boolean DEFAULT false,
PRIMARY KEY(id)
) ENGINE=innodb;
-CREATE UNIQUE INDEX tag_descriptions_name ON tag_descriptions(name);
+CREATE UNIQUE INDEX tag_definitions_name ON tag_definitions(name);
DROP TABLE IF EXISTS tags;
CREATE TABLE tags (
id char(36) NOT NULL,
- tag_description_id char(36) NOT NULL,
+ tag_definition_name varchar(20) NOT NULL,
object_id char(36) NOT NULL,
object_type varchar(30) NOT NULL,
- date_added datetime NOT NULL,
+ added_date datetime NOT NULL,
added_by varchar(50) NOT NULL,
PRIMARY KEY(id)
) ENGINE = innodb;
CREATE INDEX tags_by_object ON tags(object_id);
-CREATE UNIQUE INDEX tags_unique ON tags(tag_description_id, object_id);
+CREATE UNIQUE INDEX tags_unique ON tags(tag_definition_name, object_id);
DROP TABLE IF EXISTS notifications;
CREATE TABLE notifications (
diff --git a/util/src/main/resources/com/ning/billing/util/tag/dao/TagDefinitionSqlDao.sql.stg b/util/src/main/resources/com/ning/billing/util/tag/dao/TagDefinitionSqlDao.sql.stg
new file mode 100644
index 0000000..72268d0
--- /dev/null
+++ b/util/src/main/resources/com/ning/billing/util/tag/dao/TagDefinitionSqlDao.sql.stg
@@ -0,0 +1,49 @@
+group TagDefinitionDao;
+
+get() ::= <<
+ SELECT id, name, created_by, creation_date, description
+ FROM tag_definitions;
+>>
+
+create() ::= <<
+ INSERT INTO tag_definitions(id, name, created_by, creation_date, description)
+ VALUES(:id, :name, :createdBy, :creationDate, :description);
+>>
+
+update() ::= <<
+ UPDATE tag_definitions
+ SET name = :name, created_by = :createdBy, creation_date = :creationDate,
+ description = :description)
+ WHERE id = :id;
+>>
+
+load() ::= <<
+ SELECT id, name, created_by, creation_date, description
+ FROM tag_definitions
+ WHERE id = :id;
+>>
+
+deleteAllTagsForDefinition() ::= <<
+ DELETE FROM tags
+ WHERE tag_definition_name = :name;
+>>
+
+deleteTagDefinition() ::= <<
+ DELETE FROM tag_definitions
+ WHERE name = :name;
+>>
+
+tagDefinitionUsageCount() ::= <<
+ SELECT COUNT(id)
+ FROM tags
+ WHERE tag_definition_name = :name
+>>
+
+getByName() ::= <<
+ SELECT id, name, created_by, creation_date, description
+ FROM tag_definitions
+ WHERE name = :name;
+>>
+;
+
+
diff --git a/util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java b/util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java
index e8a77f6..be53073 100644
--- a/util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java
+++ b/util/src/test/java/com/ning/billing/dbi/MysqlTestingHelper.java
@@ -16,8 +16,12 @@
package com.ning.billing.dbi;
-import com.mysql.management.MysqldResource;
-import com.mysql.management.MysqldResourceI;
+import java.io.File;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.commons.io.FileUtils;
import org.skife.jdbi.v2.DBI;
import org.skife.jdbi.v2.Handle;
@@ -27,11 +31,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
-import java.io.File;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.util.HashMap;
-import java.util.Map;
+import com.mysql.management.MysqldResource;
+import com.mysql.management.MysqldResourceI;
/**
* Utility class to embed MySQL for testing purposes
@@ -73,7 +74,7 @@ public class MysqlTestingHelper
dbOpts.put(MysqldResourceI.PORT, Integer.toString(port));
dbOpts.put(MysqldResourceI.INITIALIZE_USER, "true");
dbOpts.put(MysqldResourceI.INITIALIZE_USER_NAME, USERNAME);
- dbOpts.put(MysqldResourceI.INITIALIZE_PASSWORD, PASSWORD);
+ dbOpts.put("default-time-zone", "+00:00");
mysqldResource.start("test-mysqld-thread", dbOpts);
if (!mysqldResource.isRunning()) {
diff --git a/util/src/test/java/com/ning/billing/util/eventbus/TestEventBus.java b/util/src/test/java/com/ning/billing/util/eventbus/TestEventBus.java
index 4b0f4a2..ba9f76a 100644
--- a/util/src/test/java/com/ning/billing/util/eventbus/TestEventBus.java
+++ b/util/src/test/java/com/ning/billing/util/eventbus/TestEventBus.java
@@ -52,6 +52,16 @@ public class TestEventBus {
}
}
+ public static final class MyOtherEvent implements EventBusNotification {
+ String name;
+ Long value;
+
+ public MyOtherEvent(String name, Long value) {
+ this.name = name;
+ this.value = value;
+ }
+ }
+
public static class MyEventHandler {
private final int expectedEvents;
@@ -87,8 +97,8 @@ public class TestEventBus {
}
}
- @Test()
- public void test() {
+ @Test
+ public void testSimple() {
try {
int nbEvents = 127;
@@ -104,6 +114,25 @@ public class TestEventBus {
} catch (Exception e) {
Assert.fail("",e);
}
+ }
+
+ @Test
+ public void testDifferentType() {
+ try {
+
+ MyEventHandler handler = new MyEventHandler(1);
+ eventBus.register(handler);
+
+ for (int i = 0; i < 10; i++) {
+ eventBus.post(new MyOtherEvent("my-other-event", (long) i));
+ }
+ eventBus.post(new MyEvent("my-event", 11l));
+
+ boolean completed = handler.waitForCompletion(3000);
+ Assert.assertEquals(completed, true);
+ } catch (Exception e) {
+ Assert.fail("",e);
+ }
}
}
diff --git a/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java b/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java
new file mode 100644
index 0000000..9fc4c78
--- /dev/null
+++ b/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag;
+
+import java.io.IOException;
+import org.skife.jdbi.v2.IDBI;
+import com.ning.billing.dbi.MysqlTestingHelper;
+import com.ning.billing.util.glue.TagStoreModule;
+
+public class TagStoreModuleMock extends TagStoreModule {
+ private final MysqlTestingHelper helper = new MysqlTestingHelper();
+
+ public void startDb() throws IOException {
+ helper.startMysql();
+ }
+
+ public void initDb(String ddl) throws IOException {
+ helper.initDb(ddl);
+ }
+
+ public void stopDb() {
+ helper.stopMysql();
+ }
+
+ @Override
+ protected void configure() {
+ bind(IDBI.class).toInstance(helper.getDBI());
+ super.configure();
+ }
+}
diff --git a/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
new file mode 100644
index 0000000..633095f
--- /dev/null
+++ b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
@@ -0,0 +1,341 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.tag;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import org.apache.commons.io.IOUtils;
+import org.skife.jdbi.v2.IDBI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Stage;
+import com.ning.billing.account.api.ControlTagType;
+import com.ning.billing.util.api.TagDefinitionApiException;
+import com.ning.billing.util.clock.Clock;
+import com.ning.billing.util.clock.DefaultClock;
+import com.ning.billing.util.tag.dao.TagDefinitionDao;
+import com.ning.billing.util.tag.dao.TagStoreSqlDao;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+@Test(groups={"util"})
+public class TestTagStore {
+ private final static String ACCOUNT_TYPE = "ACCOUNT";
+ private final Clock clock = new DefaultClock();
+ private IDBI dbi;
+ private TagDefinition tag1;
+ private TagDefinition tag2;
+ private TagStoreModuleMock module;
+ private TagStoreSqlDao tagStoreSqlDao;
+ private TagDefinitionDao tagDefinitionDao;
+ private Logger log = LoggerFactory.getLogger(TestTagStore.class);
+
+ @BeforeClass(alwaysRun = true)
+ protected void setup() throws IOException {
+ // Health check test to make sure MySQL is setup properly
+ try {
+ module = new TagStoreModuleMock();
+ final String utilDdl = IOUtils.toString(TestTagStore.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
+
+ module.startDb();
+ module.initDb(utilDdl);
+
+ final Injector injector = Guice.createInjector(Stage.DEVELOPMENT, module);
+ dbi = injector.getInstance(IDBI.class);
+
+ tagStoreSqlDao = injector.getInstance(TagStoreSqlDao.class);
+ tagStoreSqlDao.test();
+
+ tagDefinitionDao = injector.getInstance(TagDefinitionDao.class);
+ tag1 = tagDefinitionDao.create("tag1", "First tag", "test");
+ tag2 = tagDefinitionDao.create("tag2", "Second tag", "test");
+ }
+ catch (Throwable t) {
+ log.error("Failed to start tag store tests", t);
+ fail(t.toString());
+ }
+ }
+
+ @AfterClass(alwaysRun = true)
+ public void stopMysql()
+ {
+ module.stopDb();
+ }
+
+ @Test
+ public void testTagCreationAndRetrieval() {
+ UUID accountId = UUID.randomUUID();
+
+ TagStore tagStore = new DefaultTagStore(accountId, ACCOUNT_TYPE);
+ Tag tag = new DescriptiveTag(tag2, "test", clock.getUTCNow());
+ tagStore.add(tag);
+
+ TagStoreSqlDao dao = dbi.onDemand(TagStoreSqlDao.class);
+ dao.save(accountId.toString(), ACCOUNT_TYPE, tagStore.getEntityList());
+
+ List<Tag> savedTags = dao.load(accountId.toString(), ACCOUNT_TYPE);
+ assertEquals(savedTags.size(), 1);
+
+ Tag savedTag = savedTags.get(0);
+ assertEquals(savedTag.getAddedBy(), tag.getAddedBy());
+ assertEquals(savedTag.getAddedDate().compareTo(tag.getAddedDate()), 0);
+ assertEquals(savedTag.getTagDefinitionName(), tag.getTagDefinitionName());
+ assertEquals(savedTag.getId(), tag.getId());
+ }
+
+ @Test
+ public void testControlTagCreation() {
+ UUID accountId = UUID.randomUUID();
+ TagStore tagStore = new DefaultTagStore(accountId, ACCOUNT_TYPE);
+
+ ControlTag tag = new DefaultControlTag("testUser", clock.getUTCNow(), ControlTagType.AUTO_INVOICING_OFF);
+ tagStore.add(tag);
+ assertEquals(tagStore.generateInvoice(), false);
+
+ List<Tag> tagList = tagStore.getEntityList();
+ tagStoreSqlDao.save(accountId.toString(), ACCOUNT_TYPE, tagList);
+
+ tagStore.clear();
+ assertEquals(tagStore.getEntityList().size(), 0);
+
+ tagList = tagStoreSqlDao.load(accountId.toString(), ACCOUNT_TYPE);
+ tagStore.add(tagList);
+ assertEquals(tagList.size(), 1);
+
+ assertEquals(tagStore.generateInvoice(), false);
+ }
+
+ @Test
+ public void testDescriptiveTagCreation() {
+ UUID accountId = UUID.randomUUID();
+ TagStore tagStore = new DefaultTagStore(accountId, ACCOUNT_TYPE);
+
+ String definitionName = "SomeTestTag";
+ TagDefinition tagDefinition = null;
+ try {
+ tagDefinition = tagDefinitionDao.create(definitionName, "Test tag for some test purpose", "testUser");
+ } catch (TagDefinitionApiException e) {
+ fail("Tag definition creation failed.", e);
+ }
+
+ DescriptiveTag tag = new DescriptiveTag(tagDefinition, "testUser", clock.getUTCNow());
+ tagStore.add(tag);
+ assertEquals(tagStore.generateInvoice(), true);
+
+ List<Tag> tagList = tagStore.getEntityList();
+ tagStoreSqlDao.save(accountId.toString(), ACCOUNT_TYPE, tagList);
+
+ tagStore.clear();
+ assertEquals(tagStore.getEntityList().size(), 0);
+
+ tagList = tagStoreSqlDao.load(accountId.toString(), ACCOUNT_TYPE);
+ tagStore.add(tagList);
+ assertEquals(tagList.size(), 1);
+
+ assertEquals(tagStore.generateInvoice(), true);
+ }
+
+ @Test
+ public void testMixedTagCreation() {
+ UUID accountId = UUID.randomUUID();
+ TagStore tagStore = new DefaultTagStore(accountId, ACCOUNT_TYPE);
+
+ String definitionName = "MixedTagTest";
+ TagDefinition tagDefinition = null;
+ try {
+ tagDefinition = tagDefinitionDao.create(definitionName, "Test tag for some test purpose", "testUser");
+ } catch (TagDefinitionApiException e) {
+ fail("Tag definition creation failed.", e);
+ }
+
+ DescriptiveTag descriptiveTag = new DescriptiveTag(tagDefinition, "testUser", clock.getUTCNow());
+ tagStore.add(descriptiveTag);
+ assertEquals(tagStore.generateInvoice(), true);
+
+ ControlTag controlTag = new DefaultControlTag("testUser", clock.getUTCNow(), ControlTagType.AUTO_INVOICING_OFF);
+ tagStore.add(controlTag);
+ assertEquals(tagStore.generateInvoice(), false);
+
+ List<Tag> tagList = tagStore.getEntityList();
+ tagStoreSqlDao.save(accountId.toString(), ACCOUNT_TYPE, tagList);
+
+ tagStore.clear();
+ assertEquals(tagStore.getEntityList().size(), 0);
+
+ tagList = tagStoreSqlDao.load(accountId.toString(), ACCOUNT_TYPE);
+ tagStore.add(tagList);
+ assertEquals(tagList.size(), 2);
+
+ assertEquals(tagStore.generateInvoice(), false);
+ }
+
+ @Test
+ public void testControlTags() {
+ UUID accountId = UUID.randomUUID();
+ TagStore tagStore = new DefaultTagStore(accountId, ACCOUNT_TYPE);
+ assertEquals(tagStore.generateInvoice(), true);
+ assertEquals(tagStore.processPayment(), true);
+
+ ControlTag invoiceTag = new DefaultControlTag("testUser", clock.getUTCNow(), ControlTagType.AUTO_INVOICING_OFF);
+ tagStore.add(invoiceTag);
+ assertEquals(tagStore.generateInvoice(), false);
+ assertEquals(tagStore.processPayment(), true);
+
+ ControlTag paymentTag = new DefaultControlTag("testUser", clock.getUTCNow(), ControlTagType.AUTO_BILLING_OFF);
+ tagStore.add(paymentTag);
+ assertEquals(tagStore.generateInvoice(), false);
+ assertEquals(tagStore.processPayment(), false);
+ }
+
+ @Test(expectedExceptions = TagDefinitionApiException.class)
+ public void testTagDefinitionCreationWithControlTagName() throws TagDefinitionApiException {
+ String definitionName = ControlTagType.AUTO_BILLING_OFF.toString();
+ tagDefinitionDao.create(definitionName, "This should break", "test");
+ }
+
+ @Test
+ public void testTagDefinitionDeletionForUnusedDefinition() throws TagDefinitionApiException {
+ String definitionName = "TestTag1234";
+ tagDefinitionDao.create(definitionName, "Some test tag", "test");
+
+ TagDefinition tagDefinition = tagDefinitionDao.getByName(definitionName);
+ assertNotNull(tagDefinition);
+
+ tagDefinitionDao.deleteTagDefinition(definitionName);
+ tagDefinition = tagDefinitionDao.getByName(definitionName);
+ assertNull(tagDefinition);
+ }
+
+ @Test(expectedExceptions = TagDefinitionApiException.class)
+ public void testTagDefinitionDeletionForDefinitionInUse() throws TagDefinitionApiException {
+ String definitionName = "TestTag12345";
+ tagDefinitionDao.create(definitionName, "Some test tag", "test");
+
+ TagDefinition tagDefinition = tagDefinitionDao.getByName(definitionName);
+ assertNotNull(tagDefinition);
+
+ UUID objectId = UUID.randomUUID();
+ String objectType = "TestType";
+ TagStore tagStore = new DefaultTagStore(objectId, objectType);
+ Tag tag = new DescriptiveTag(tagDefinition, "test", clock.getUTCNow());
+ tagStore.add(tag);
+
+ tagStoreSqlDao.save(objectId.toString(), objectType, tagStore.getEntityList());
+ List<Tag> tags = tagStoreSqlDao.load(objectId.toString(), objectType);
+ assertEquals(tags.size(), 1);
+
+ tagDefinitionDao.deleteTagDefinition(definitionName);
+ }
+
+ @Test
+ public void testDeleteAllTagsForDefinitionInUse() {
+ String definitionName = "TestTag1234567";
+ try {
+ tagDefinitionDao.create(definitionName, "Some test tag", "test");
+ } catch (TagDefinitionApiException e) {
+ fail("Could not create tag definition", e);
+ }
+
+ TagDefinition tagDefinition = tagDefinitionDao.getByName(definitionName);
+ assertNotNull(tagDefinition);
+
+ UUID objectId = UUID.randomUUID();
+ String objectType = "TestType";
+ TagStore tagStore = new DefaultTagStore(objectId, objectType);
+ Tag tag = new DescriptiveTag(tagDefinition, "test", clock.getUTCNow());
+ tagStore.add(tag);
+
+ tagStoreSqlDao.save(objectId.toString(), objectType, tagStore.getEntityList());
+ List<Tag> tags = tagStoreSqlDao.load(objectId.toString(), objectType);
+ assertEquals(tags.size(), 1);
+
+ try {
+ tagDefinitionDao.deleteAllTagsForDefinition(definitionName);
+ } catch (TagDefinitionApiException e) {
+ fail("Could not delete tags for tag definition", e);
+ }
+
+ try {
+ tagDefinitionDao.deleteTagDefinition(definitionName);
+ } catch (TagDefinitionApiException e) {
+ fail("Could not delete tag definition", e);
+ }
+ }
+
+ @Test
+ public void testDeleteAllTagsForDefinitionNotInUse() {
+ String definitionName = "TestTag4321";
+ try {
+ tagDefinitionDao.create(definitionName, "Some test tag", "test");
+ } catch (TagDefinitionApiException e) {
+ fail("Could not create tag definition", e);
+ }
+
+ TagDefinition tagDefinition = tagDefinitionDao.getByName(definitionName);
+ assertNotNull(tagDefinition);
+
+ try {
+ tagDefinitionDao.deleteAllTagsForDefinition(definitionName);
+ } catch (TagDefinitionApiException e) {
+ fail("Could not delete tags for tag definition", e);
+ }
+
+ try {
+ tagDefinitionDao.deleteTagDefinition(definitionName);
+ } catch (TagDefinitionApiException e) {
+ fail("Could not delete tag definition", e);
+ }
+ }
+
+ @Test(expectedExceptions = TagDefinitionApiException.class)
+ public void testDeleteAllTagsForDefinitionWithWrongName() throws TagDefinitionApiException {
+ String definitionName = "TestTag654321";
+ String wrongDefinitionName = "TestTag564321";
+ try {
+ tagDefinitionDao.create(definitionName, "Some test tag", "test");
+ } catch (TagDefinitionApiException e) {
+ fail("Could not create tag definition", e);
+ }
+
+ TagDefinition tagDefinition = tagDefinitionDao.getByName(definitionName);
+ assertNotNull(tagDefinition);
+
+ tagDefinitionDao.deleteAllTagsForDefinition(wrongDefinitionName);
+
+ try {
+ tagDefinitionDao.deleteTagDefinition(definitionName);
+ } catch (TagDefinitionApiException e) {
+ fail("Could not delete tag definition", e);
+ }
+ }
+
+ @Test
+ public void testGetTagDefinitions() {
+ List<TagDefinition> definitionList = tagDefinitionDao.getTagDefinitions();
+ assertTrue(definitionList.size() >= ControlTagType.values().length);
+ }
+}