zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 00:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Create a separate billing event when EAP is applied

Browse source 
When EAP is involed we current have one billing event for domain create that
has the create fee and EAP fee lumped together. Change it to record two
separate billing events for each.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=132335349
This commit is contained in:
jianglai 2016-09-06 10:28:56 -07:00 • committed by Ben McIlwain
parent 969d9483ae
commit 6641f105b7
12 changed files with 196 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

43
java/google/registry/pricing/TldSpecificLogicProxy.java
View file

@ -26,6 +26,7 @@ import com.googlecode.objectify.Key;
import google.registry.model.ImmutableObject;
import google.registry.model.domain.DomainCommand.Create;
import google.registry.model.domain.LrpToken;
import google.registry.model.domain.fee.BaseFee.FeeType;
import google.registry.model.domain.fee.EapFee;
import google.registry.model.domain.fee.Fee;
import google.registry.model.pricing.PremiumPricingEngine.DomainPrices;
@ -39,9 +40,6 @@ import org.joda.time.DateTime;
* implementations on a per-TLD basis.
*/
public final class TldSpecificLogicProxy {
private static final String EAP_DESCRIPTION_FORMAT = "Early Access Period, fee expires: %s";
/**
* A collection of fees for a specific event.
*/
@ -56,9 +54,18 @@ public final class TldSpecificLogicProxy {
this.fees = checkArgumentNotNull(fees, "Fees may not be null in EppCommandOperations.");
}
/**
* Returns the total cost of all fees for the event.
*/
private Money getTotalCostForType(FeeType type) {
Money result = Money.zero(currency);
checkArgumentNotNull(type);
for (Fee fee : fees) {
if (fee.getType() == type) {
result = result.plus(fee.getCost());
}
}
return result;
}
/** Returns the total cost of all fees for the event. */
public Money getTotalCost() {
Money result = Money.zero(currency);
for (Fee fee : fees) {
@ -67,6 +74,16 @@ public final class TldSpecificLogicProxy {
return result;
}
/** Returns the create cost for the event. */
public Money getCreateCost() {
return getTotalCostForType(FeeType.CREATE);
}
/** Returns the EAP cost for the event. */
public Money getEapCost() {
return getTotalCostForType(FeeType.EAP);
}
/**
* Returns all costs for the event as a list of fees.
*/
@ -94,7 +111,8 @@ public final class TldSpecificLogicProxy {
ImmutableList.Builder<Fee> feeBuilder = new ImmutableList.Builder<>();
// Add Create cost.
feeBuilder.add(Fee.create(prices.getCreateCost().multipliedBy(years).getAmount(), "create"));
feeBuilder.add(
Fee.create(prices.getCreateCost().multipliedBy(years).getAmount(), FeeType.CREATE));
// Add EAP Fee.
EapFee eapFee = registry.getEapFeeFor(date);
@ -103,8 +121,7 @@ public final class TldSpecificLogicProxy {
if (!eapFeeCost.getAmount().equals(Money.zero(currency).getAmount())) {
feeBuilder.add(
Fee.create(
eapFeeCost.getAmount(),
String.format(EAP_DESCRIPTION_FORMAT, eapFee.getPeriod().upperEndpoint())));
eapFeeCost.getAmount(), FeeType.EAP, eapFee.getPeriod().upperEndpoint()));
}
return new EppCommandOperations(currency, feeBuilder.build());
@ -119,7 +136,8 @@ public final class TldSpecificLogicProxy {
return new EppCommandOperations(
registry.getCurrency(),
ImmutableList.of(
Fee.create(prices.getRenewCost().multipliedBy(years).getAmount(), "renew")));
Fee.create(
prices.getRenewCost().multipliedBy(years).getAmount(), FeeType.RENEW)));
}
/**
@ -131,8 +149,9 @@ public final class TldSpecificLogicProxy {
return new EppCommandOperations(
registry.getCurrency(),
ImmutableList.of(
Fee.create(prices.getRenewCost().multipliedBy(years).getAmount(), "renew"),
Fee.create(registry.getStandardRestoreCost().getAmount(), "restore")));
Fee.create(
prices.getRenewCost().multipliedBy(years).getAmount(), FeeType.RENEW),
Fee.create(registry.getStandardRestoreCost().getAmount(), FeeType.RESTORE)));
}
/**