From 8b068250d64340f214dd72de5815fa26b344922a Mon Sep 17 00:00:00 2001 From: mountford Date: Thu, 27 Oct 2016 12:32:39 -0700 Subject: [PATCH] Change DomainApplication to store period instead of year ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=137426843 --- .../flows/domain/DomainApplicationCreateFlow.java | 2 +- .../registry/model/domain/DomainApplication.java | 12 ++++++------ .../domain/DomainApplicationCreateFlowTest.java | 2 +- .../registry/model/domain/DomainApplicationTest.java | 3 ++- javatests/google/registry/model/schema.txt | 2 +- .../registry/testing/DomainApplicationSubject.java | 7 +++++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java index a5174bc09..4e68a2851 100644 --- a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java +++ b/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()) diff --git a/java/google/registry/model/domain/DomainApplication.java b/java/google/registry/model/domain/DomainApplication.java index 1ffb7041d..5bb948043 100644 --- a/java/google/registry/model/domain/DomainApplication.java +++ b/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() { - return years; + public Period getPeriod() { + return period; } public ApplicationStatus getApplicationStatus() { @@ -159,8 +159,8 @@ public class DomainApplication extends DomainBase { return this; } - public Builder setYears(int years) { - getInstance().years = years; + public Builder setPeriod(Period period) { + getInstance().period = period; return this; } diff --git a/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java index dda4caa7e..2db1dcd53 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java +++ b/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); diff --git a/javatests/google/registry/model/domain/DomainApplicationTest.java b/javatests/google/registry/model/domain/DomainApplicationTest.java index c76997ff2..4c62c98d8 100644 --- a/javatests/google/registry/model/domain/DomainApplicationTest.java +++ b/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)) diff --git a/javatests/google/registry/model/schema.txt b/javatests/google/registry/model/schema.txt index 60446e0be..3155a9711 100644 --- a/javatests/google/registry/model/schema.txt +++ b/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; diff --git a/javatests/google/registry/testing/DomainApplicationSubject.java b/javatests/google/registry/testing/DomainApplicationSubject.java index d5c2ca259..ba58c7b57 100644 --- a/javatests/google/registry/testing/DomainApplicationSubject.java +++ b/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 { - public And hasYears(int years) { - assertThat(actual().getYears()).isEqualTo(years); + public And hasPeriodYears(int years) { + assertThat(actual().getPeriod()).isNotNull(); + assertThat(actual().getPeriod().getUnit()).isEqualTo(Period.Unit.YEARS); + assertThat(actual().getPeriod().getValue()).isEqualTo(years); return andChainer(); }