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

Modify create price custom logic to return FeesAndCredits

Browse source 
Previously DomainPricingCustomLogic#customizeCreatePrice takes in the create
price itself and modifies it. Change it to take in the entire FeesAndCredits (previously named EppCommandOperations) which may contain other fees related to domain creation,
such as EAP fees, and returns FeesAndCredits that may either change the
fees or add new type of fees.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=141600614
This commit is contained in:
jianglai 2016-12-09 14:30:03 -08:00 • committed by Ben McIlwain
parent a56a0677ba
commit 74d64f502e
7 changed files with 90 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

49
java/google/registry/flows/domain/DomainCreateFlow.java
View file

@ -61,7 +61,7 @@ import google.registry.flows.custom.DomainCreateFlowCustomLogic;
import google.registry.flows.custom.DomainCreateFlowCustomLogic.BeforeResponseParameters;
import google.registry.flows.custom.DomainCreateFlowCustomLogic.BeforeResponseReturnData;
import google.registry.flows.custom.EntityChanges;
import google.registry.flows.domain.DomainPricingLogic.EppCommandOperations;
import google.registry.flows.domain.DomainPricingLogic.FeesAndCredits;
import google.registry.model.ImmutableObject;
import google.registry.model.billing.BillingEvent;
import google.registry.model.billing.BillingEvent.Flag;
@ -211,10 +211,9 @@ public class DomainCreateFlow implements TransactionalFlow {
FeeCreateCommandExtension feeCreate =
eppInput.getSingleExtension(FeeCreateCommandExtension.class);
EppCommandOperations commandOperations =
pricingLogic.getCreatePrice(registry, targetId, now, years);
FeesAndCredits feesAndCredits = pricingLogic.getCreatePrice(registry, targetId, now, years);
validateFeeChallenge(
targetId, registry.getTldStr(), now, feeCreate, commandOperations.getTotalCost());
targetId, registry.getTldStr(), now, feeCreate, feesAndCredits.getTotalCost());
// Superusers can create reserved domains, force creations on domains that require a claims
// notice without specifying a claims key, ignore the registry phase, and override blocks on
// registering premium domains.
@ -242,8 +241,9 @@ public class DomainCreateFlow implements TransactionalFlow {
DateTime registrationExpirationTime = leapSafeAddYears(now, years);
HistoryEntry historyEntry = buildHistory(repoId, period, now);
// Bill for the create.
BillingEvent.OneTime createBillingEvent = createOneTimeBillingEvent(
registry, isAnchorTenant, years, commandOperations, historyEntry, now);
BillingEvent.OneTime createBillingEvent =
createOneTimeBillingEvent(
registry, isAnchorTenant, years, feesAndCredits, historyEntry, now);
// Create a new autorenew billing event and poll message starting at the expiration time.
BillingEvent.Recurring autorenewBillingEvent =
createAutorenewBillingEvent(historyEntry, registrationExpirationTime);
@ -256,8 +256,8 @@ public class DomainCreateFlow implements TransactionalFlow {
autorenewBillingEvent,
autorenewPollMessage);
// Bill for EAP cost, if any.
if (!commandOperations.getEapCost().isZero()) {
entitiesToSave.add(createEapBillingEvent(commandOperations, createBillingEvent));
if (!feesAndCredits.getEapCost().isZero()) {
entitiesToSave.add(createEapBillingEvent(feesAndCredits, createBillingEvent));
}
DomainResource newDomain = new DomainResource.Builder()
.setCreationClientId(clientId)
@ -308,7 +308,7 @@ public class DomainCreateFlow implements TransactionalFlow {
customLogic.beforeResponse(
BeforeResponseParameters.newBuilder()
.setResData(DomainCreateData.create(targetId, now, registrationExpirationTime))
.setResponseExtensions(createResponseExtensions(feeCreate, commandOperations))
.setResponseExtensions(createResponseExtensions(feeCreate, feesAndCredits))
.build());
return responseBuilder
.setResData(responseData.resData())
@ -352,7 +352,7 @@ public class DomainCreateFlow implements TransactionalFlow {
Registry registry,
boolean isAnchorTenant,
int years,
EppCommandOperations commandOperations,
FeesAndCredits feesAndCredits,
HistoryEntry historyEntry,
DateTime now) {
return new BillingEvent.OneTime.Builder()
@ -360,14 +360,17 @@ public class DomainCreateFlow implements TransactionalFlow {
.setTargetId(targetId)
.setClientId(clientId)
.setPeriodYears(years)
.setCost(commandOperations.getCreateCost())
.setCost(feesAndCredits.getCreateCost())
.setEventTime(now)
.setBillingTime(now.plus(isAnchorTenant
? registry.getAnchorTenantAddGracePeriodLength()
: registry.getAddGracePeriodLength()))
.setFlags(isAnchorTenant
? ImmutableSet.of(BillingEvent.Flag.ANCHOR_TENANT)
: ImmutableSet.<BillingEvent.Flag>of())
.setBillingTime(
now.plus(
isAnchorTenant
? registry.getAnchorTenantAddGracePeriodLength()
: registry.getAddGracePeriodLength()))
.setFlags(
isAnchorTenant
? ImmutableSet.of(BillingEvent.Flag.ANCHOR_TENANT)
: ImmutableSet.<BillingEvent.Flag>of())
.setParent(historyEntry)
.build();
}
@ -396,13 +399,13 @@ public class DomainCreateFlow implements TransactionalFlow {
.build();
}
private OneTime createEapBillingEvent(EppCommandOperations commandOperations,
BillingEvent.OneTime createBillingEvent) {
private static OneTime createEapBillingEvent(
FeesAndCredits feesAndCredits, BillingEvent.OneTime createBillingEvent) {
return new BillingEvent.OneTime.Builder()
.setReason(Reason.FEE_EARLY_ACCESS)
.setTargetId(createBillingEvent.getTargetId())
.setClientId(createBillingEvent.getClientId())
.setCost(commandOperations.getEapCost())
.setCost(feesAndCredits.getEapCost())
.setEventTime(createBillingEvent.getEventTime())
.setBillingTime(createBillingEvent.getBillingTime())
.setFlags(createBillingEvent.getFlags())
@ -424,11 +427,11 @@ public class DomainCreateFlow implements TransactionalFlow {
}
}
private ImmutableList<FeeTransformResponseExtension> createResponseExtensions(
FeeCreateCommandExtension feeCreate, EppCommandOperations commandOperations) {
private static ImmutableList<FeeTransformResponseExtension> createResponseExtensions(
FeeCreateCommandExtension feeCreate, FeesAndCredits feesAndCredits) {
return (feeCreate == null)
? ImmutableList.<FeeTransformResponseExtension>of()
: ImmutableList.of(createFeeCreateResponse(feeCreate, commandOperations));
: ImmutableList.of(createFeeCreateResponse(feeCreate, feesAndCredits));
}
/** There is an open application for this domain. */