Change DomainApplication to store period instead of year

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=137426843

java/google/registry/flows/domain/DomainApplicationCreateFlow.java

@@ -219,7 +219,7 @@ public final class DomainApplicationCreateFlow extends LoggedInFlow implements T
         .setLaunchNotice(launchCreate == null ? null : launchCreate.getNotice())
         .setIdnTableName(idnTableName)
         .setPhase(launchCreate.getPhase())
-        .setYears(command.getPeriod().getValue())
+        .setPeriod(command.getPeriod())
         .setApplicationStatus(ApplicationStatus.VALIDATED)
         .addStatusValue(StatusValue.PENDING_CREATE)
         .setDsData(secDnsCreate == null ? null : secDnsCreate.getDsData())

java/google/registry/model/domain/DomainApplication.java

@@ -69,9 +69,9 @@ public class DomainApplication extends DomainBase {
   @XmlTransient
   LaunchPhase phase;
 
-  /** The requested number of years of registration. */
+  /** The requested registration period. */
   @XmlTransient
-  int years;
+  Period period;
   
   /** The current status of this application. */
   @XmlTransient
@@ -98,8 +98,8 @@ public class DomainApplication extends DomainBase {
     return phase;
   }
 
-  public int getYears() {
+  public Period getPeriod() {
-    return years;
+    return period;
   }
 
   public ApplicationStatus getApplicationStatus() {
@@ -159,8 +159,8 @@ public class DomainApplication extends DomainBase {
       return this;
     }
     
-    public Builder setYears(int years) {
+    public Builder setPeriod(Period period) {
-      getInstance().years = years;
+      getInstance().period = period;
       return this;
     }
 

javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java

@@ -220,7 +220,7 @@ public class DomainApplicationCreateFlowTest
     assertAboutApplications().that(getLast(applications))
         .hasFullyQualifiedDomainName(getUniqueIdFromCommand()).and()
         .hasNumEncodedSignedMarks(sunriseApplication ? 1 : 0).and()
-        .hasYears(years).and()
+        .hasPeriodYears(years).and()
         .hasOnlyOneHistoryEntryWhich()
         .hasType(HistoryEntry.Type.DOMAIN_APPLICATION_CREATE).and()
         .hasPeriodYears(years);

javatests/google/registry/model/domain/DomainApplicationTest.java

@@ -60,7 +60,7 @@ public class DomainApplicationTest extends EntityTestCase {
   @Before
   public void setUp() throws Exception {
     createTld("com");
-    // Set up a new persisted domain entity.
+    // Set up a new persisted domain application entity.
     domainApplication = cloneAndSetAutoTimestamps(
         new DomainApplication.Builder()
             .setFullyQualifiedDomainName("example.com")
@@ -102,6 +102,7 @@ public class DomainApplicationTest extends EntityTestCase {
                     .build())
             .setCreationTrid(Trid.create("client creation trid"))
             .setPhase(LaunchPhase.LANDRUSH)
+            .setPeriod(Period.create(5, Period.Unit.YEARS))
             .setEncodedSignedMarks(ImmutableList.of(EncodedSignedMark.create("base64", "abcdefg=")))
             .setApplicationStatus(ApplicationStatus.ALLOCATED)
             .setAuctionPrice(Money.of(USD, 11))

javatests/google/registry/model/schema.txt

@@ -203,12 +203,12 @@ class google.registry.model.domain.DomainApplication {
   google.registry.model.CreateAutoTimestamp creationTime;
   google.registry.model.UpdateAutoTimestamp updateTimestamp;
   google.registry.model.domain.DomainAuthInfo authInfo;
+  google.registry.model.domain.Period period;
   google.registry.model.domain.launch.ApplicationStatus applicationStatus;
   google.registry.model.domain.launch.LaunchNotice launchNotice;
   google.registry.model.domain.launch.LaunchPhase phase;
   google.registry.model.eppcommon.Trid creationTrid;
   google.registry.model.transfer.TransferData transferData;
-  int years;
   java.lang.String creationClientId;
   java.lang.String currentSponsorClientId;
   java.lang.String fullyQualifiedDomainName;

javatests/google/registry/testing/DomainApplicationSubject.java

@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.truth.AbstractVerb.DelegatedVerb;
 import com.google.common.truth.FailureStrategy;
 import google.registry.model.domain.DomainApplication;
+import google.registry.model.domain.Period;
 import google.registry.model.domain.launch.ApplicationStatus;
 import google.registry.model.smd.EncodedSignedMark;
 import google.registry.testing.TruthChainer.And;
@@ -31,8 +32,10 @@ import java.util.Objects;
 public final class DomainApplicationSubject
     extends AbstractDomainBaseSubject<DomainApplication, DomainApplicationSubject> {
 
-  public And<DomainApplicationSubject> hasYears(int years) {
+  public And<DomainApplicationSubject> hasPeriodYears(int years) {
-    assertThat(actual().getYears()).isEqualTo(years);
+    assertThat(actual().getPeriod()).isNotNull();
+    assertThat(actual().getPeriod().getUnit()).isEqualTo(Period.Unit.YEARS);
+    assertThat(actual().getPeriod().getValue()).isEqualTo(years);
     return andChainer();
   }