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

Change EAP fee billing event reason to EARLY_ACCESS

Browse source 
The reason field is 1:1 mapped to skus in billing reports. Need to add a new reason for EAP for this type of billing event for reporting to work correctly. Also map that reason to the correct SKU.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=134005364
This commit is contained in:
jianglai 2016-09-22 15:07:07 -07:00 • committed by Ben McIlwain
parent 414781e79b
commit add9474e9a
4 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
javatests/google/registry/flows/domain/DomainCreateFlowTest.java
View file

@ -217,20 +217,15 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
// If EAP is applied, a billing event for EAP should be present.
if (!eapFee.isZero()) {
ImmutableSet<BillingEvent.Flag> eapFlags =
isAnchorTenant
? ImmutableSet.of(BillingEvent.Flag.ANCHOR_TENANT, BillingEvent.Flag.EAP)
: ImmutableSet.of(BillingEvent.Flag.EAP);
BillingEvent.OneTime eapBillingEvent =
new BillingEvent.OneTime.Builder()
.setReason(Reason.CREATE)
.setReason(Reason.FEE_EARLY_ACCESS)
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setCost(eapFee)
.setPeriodYears(2)
.setEventTime(clock.nowUtc())
.setBillingTime(billingTime)
.setFlags(eapFlags)
.setFlags(billingFlags)
.setParent(historyEntry)
.build();
billingEvents = ImmutableSet.<BillingEvent>builder()

2
javatests/google/registry/model/schema.txt
View file

@ -24,7 +24,6 @@ enum google.registry.model.billing.BillingEvent$Flag {
ALLOCATION;
ANCHOR_TENANT;
AUTO_RENEW;
EAP;
LANDRUSH;
SUNRISE;
SYNTHETIC;
@ -59,6 +58,7 @@ enum google.registry.model.billing.BillingEvent$Reason {
AUTO_RENEW;
CREATE;
ERROR;
FEE_EARLY_ACCESS;
RENEW;
RESTORE;
SERVER_STATUS;