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

Add proper flagging for start-date sunrise billing

Browse source 
This will allow us to check in actual SUNRISE billing policies per launch (15% discount), instead of relying on ad-hoc timestamps.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=200077926
This commit is contained in:
larryruili 2018-06-11 10:57:14 -07:00 • committed by Ben McIlwain
parent 5fdd7a15ca
commit 446617e4e5
2 changed files with 42 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -310,7 +310,7 @@ public class DomainCreateFlow implements TransactionalFlow {
// Bill for the create.
BillingEvent.OneTime createBillingEvent =
createOneTimeBillingEvent(
registry, isAnchorTenant, years, feesAndCredits, historyEntry, now);
registry, isAnchorTenant, isSunriseCreate, years, feesAndCredits, historyEntry, now);
// Create a new autorenew billing event and poll message starting at the expiration time.
BillingEvent.Recurring autorenewBillingEvent =
createAutorenewBillingEvent(historyEntry, registrationExpirationTime);
@ -502,10 +502,19 @@ public class DomainCreateFlow implements TransactionalFlow {
private OneTime createOneTimeBillingEvent(
Registry registry,
boolean isAnchorTenant,
boolean isSunriseCreate,
int years,
FeesAndCredits feesAndCredits,
HistoryEntry historyEntry,
DateTime now) {
ImmutableSet.Builder<Flag> flagsBuilder = new ImmutableSet.Builder<>();
// Sunrise and anchor tenancy are orthogonal tags and thus both can be present together.
if (isSunriseCreate) {
flagsBuilder.add(Flag.SUNRISE);
}
if (isAnchorTenant) {
flagsBuilder.add(Flag.ANCHOR_TENANT);
}
return new BillingEvent.OneTime.Builder()
.setReason(Reason.CREATE)
.setTargetId(targetId)
@ -518,10 +527,7 @@ public class DomainCreateFlow implements TransactionalFlow {
isAnchorTenant
? registry.getAnchorTenantAddGracePeriodLength()
: registry.getAddGracePeriodLength()))
.setFlags(
isAnchorTenant
? ImmutableSet.of(BillingEvent.Flag.ANCHOR_TENANT)
: ImmutableSet.of())
.setFlags(flagsBuilder.build())
.setParent(historyEntry)
.build();
}