diff --git a/java/google/registry/flows/domain/DomainRestoreRequestFlow.java b/java/google/registry/flows/domain/DomainRestoreRequestFlow.java index a516127ce..f109feaa8 100644 --- a/java/google/registry/flows/domain/DomainRestoreRequestFlow.java +++ b/java/google/registry/flows/domain/DomainRestoreRequestFlow.java @@ -239,7 +239,6 @@ public final class DomainRestoreRequestFlow implements TransactionalFlow { private OneTime createRenewBillingEvent( HistoryEntry historyEntry, Money renewCost, DateTime now) { return prepareBillingEvent(historyEntry, renewCost, now) - .setPeriodYears(1) .setReason(Reason.RENEW) .build(); } @@ -257,6 +256,7 @@ public final class DomainRestoreRequestFlow implements TransactionalFlow { .setClientId(clientId) .setEventTime(now) .setBillingTime(now) + .setPeriodYears(1) .setCost(cost) .setParent(historyEntry); } diff --git a/java/google/registry/model/billing/BillingEvent.java b/java/google/registry/model/billing/BillingEvent.java index d0cfcfeb6..f64deef29 100644 --- a/java/google/registry/model/billing/BillingEvent.java +++ b/java/google/registry/model/billing/BillingEvent.java @@ -305,10 +305,12 @@ public abstract class BillingEvent extends ImmutableObject Sets.immutableEnumSet( Reason.CREATE, Reason.RENEW, + Reason.RESTORE, Reason.TRANSFER); checkState( reasonsWithPeriods.contains(instance.reason) == (instance.periodYears != null), - "Period years must be set if and only if reason is CREATE, RENEW, or TRANSFER."); + "Period years must be set if and only if reason is " + + "CREATE, RENEW, RESTORE or TRANSFER."); checkState( instance.getFlags().contains(Flag.SYNTHETIC) == (instance.syntheticCreationTime != null), diff --git a/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java b/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java index 21494bc55..4f51018c9 100644 --- a/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java @@ -183,6 +183,7 @@ public class DomainRestoreRequestFlowTest .setTargetId("example.tld") .setClientId("TheRegistrar") .setCost(Money.of(USD, 17)) + .setPeriodYears(1) .setEventTime(clock.nowUtc()) .setBillingTime(clock.nowUtc()) .setParent(historyEntryDomainRestore)