mirror of
https://github.com/google/nomulus.git
synced 2025-08-04 00:42:12 +02:00
Extract premium pricing to a PricingEngine interface
This refactors the existing premium list functionality into the new class StaticPremiumListPricingEngine, which implements PricingEngine. A backfill @OnLoad is provided to default existing Registry entities into the static implementation. For now there is just this one implementation. Dagger map multibinding is used to generate the total set of allowed pricing engines, and allows other parties to plug in their own implementations. The pricing engine is a required field on the Registry object. If you don't want a particular Registry to actually have a premium list, then use the static pricing engine but don't actually set a premium list. A subsequent CL will refactor the Key<PremiumList> field on the Registry entity class to be handled solely by the StaticPremiumListPricingEngine implementation. Going forward, all configuration and implementation details that are specific to a given pricing engine should be handled by that pricing engine, and not as fields on the Registry object. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=121850176
This commit is contained in:
mcilwain
Justine Tunney
parent
87961fbb12
commit
047bbf186e
32 changed files with 659 additions and 200 deletions
|
|
@ -16,9 +16,9 @@ package google.registry.model;
|
|||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.model.RoidSuffixes.getRoidSuffixForTld;
|
||||
import static google.registry.testing.DatastoreHelper.newRegistry;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
|
||||
import google.registry.model.registry.Registry;
|
||||
import google.registry.testing.AppEngineRule;
|
||||
|
||||
import org.junit.Rule;
|
||||
|
|
@ -37,7 +37,7 @@ public class RoidSuffixesTest {
|
|||
|
||||
@Test
|
||||
public void test_newlyCreatedRegistry_isAddedToRoidSuffixesList() {
|
||||
persistResource(new Registry.Builder().setTldStr("tld").setRoidSuffix("MEOW").build());
|
||||
persistResource(newRegistry("tld", "MEOW"));
|
||||
assertThat(getRoidSuffixForTld("tld")).isEqualTo("MEOW");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
|
|||
import static google.registry.model.ofy.ObjectifyService.ofy;
|
||||
import static google.registry.model.registry.label.ReservedListTest.GET_NAME_FUNCTION;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.newRegistry;
|
||||
import static google.registry.testing.DatastoreHelper.persistPremiumList;
|
||||
import static google.registry.testing.DatastoreHelper.persistReservedList;
|
||||
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
||||
|
|
@ -115,9 +116,11 @@ public class RegistryTest extends EntityTestCase {
|
|||
"tld-reserved16",
|
||||
"port,FULLY_BLOCKED",
|
||||
"manteau,FULLY_BLOCKED");
|
||||
Registry registry1 = new Registry.Builder()
|
||||
.setTldStr("propter")
|
||||
.setReservedLists(ImmutableSet.of(rl15)).build();
|
||||
Registry registry1 =
|
||||
newRegistry("propter", "PROPTER")
|
||||
.asBuilder()
|
||||
.setReservedLists(ImmutableSet.of(rl15))
|
||||
.build();
|
||||
assertThat(registry1.getReservedLists()).hasSize(1);
|
||||
Registry registry2 = registry1.asBuilder()
|
||||
.setReservedLists(ImmutableSet.of(rl15, rl16))
|
||||
|
|
@ -128,7 +131,7 @@ public class RegistryTest extends EntityTestCase {
|
|||
|
||||
@Test
|
||||
public void testGetReservedLists_doesntReturnNullWhenUninitialized() throws Exception {
|
||||
Registry registry = new Registry.Builder().setTldStr("foo").build();
|
||||
Registry registry = newRegistry("foo", "FOO");
|
||||
assertThat(registry.getReservedLists()).isNotNull();
|
||||
assertThat(registry.getReservedLists()).isEmpty();
|
||||
}
|
||||
|
|
@ -307,57 +310,6 @@ public class RegistryTest extends EntityTestCase {
|
|||
assertThat(registry.getStandardRenewCost(END_OF_TIME)).isEqualTo(Money.of(USD, 11));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testIsPremiumDomain() throws Exception {
|
||||
createTld("example");
|
||||
Registry registry = Registry.get("example");
|
||||
assertThat(registry.isPremiumName("poor.example", clock.nowUtc(), "TheRegistrar")).isFalse();
|
||||
assertThat(registry.isPremiumName("rich.example", clock.nowUtc(), "TheRegistrar")).isTrue();
|
||||
assertThat(registry.isPremiumName("richer.example", clock.nowUtc(), "TheRegistrar")).isTrue();
|
||||
}
|
||||
|
||||
public void testGetDomainCreateCost() throws Exception {
|
||||
// The example tld has a premium price for "rich".
|
||||
createTld("example");
|
||||
Registry registry = Registry.get("example");
|
||||
// The default value of 17 is set in createTld().
|
||||
assertThat(registry.getDomainCreateCost("poor.example", clock.nowUtc(), "TheRegistrar", 1))
|
||||
.isEqualTo(Money.of(USD, 13));
|
||||
assertThat(registry.getDomainCreateCost("poor.example", clock.nowUtc(), "TheRegistrar", 2))
|
||||
.isEqualTo(Money.of(USD, 26));
|
||||
assertThat(registry.getDomainCreateCost("rich.example", clock.nowUtc(), "TheRegistrar", 1))
|
||||
.isEqualTo(Money.of(USD, 100));
|
||||
assertThat(registry.getDomainCreateCost("rich.example", clock.nowUtc(), "TheRegistrar", 2))
|
||||
.isEqualTo(Money.of(USD, 200));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetDomainRenewCost() throws Exception {
|
||||
// The example tld has a premium price for "rich".
|
||||
createTld("example");
|
||||
Registry registry = Registry.get("example").asBuilder()
|
||||
.setRenewBillingCostTransitions(ImmutableSortedMap.of(
|
||||
START_OF_TIME, Money.of(USD, 8),
|
||||
clock.nowUtc(), Money.of(USD, 10)))
|
||||
.build();
|
||||
assertThat(registry.getDomainRenewCost("poor.example", START_OF_TIME, "TheRegistrar", 1))
|
||||
.isEqualTo(Money.of(USD, 8));
|
||||
assertThat(registry.getDomainRenewCost("poor.example", START_OF_TIME, "TheRegistrar", 2))
|
||||
.isEqualTo(Money.of(USD, 16));
|
||||
assertThat(registry.getDomainRenewCost("poor.example", clock.nowUtc(), "TheRegistrar", 1))
|
||||
.isEqualTo(Money.of(USD, 10));
|
||||
assertThat(registry.getDomainRenewCost("poor.example", clock.nowUtc(), "TheRegistrar", 2))
|
||||
.isEqualTo(Money.of(USD, 20));
|
||||
assertThat(registry.getDomainRenewCost("rich.example", START_OF_TIME, "TheRegistrar", 1))
|
||||
.isEqualTo(Money.of(USD, 100));
|
||||
assertThat(registry.getDomainRenewCost("rich.example", START_OF_TIME, "TheRegistrar", 2))
|
||||
.isEqualTo(Money.of(USD, 200));
|
||||
assertThat(registry.getDomainRenewCost("rich.example", clock.nowUtc(), "TheRegistrar", 1))
|
||||
.isEqualTo(Money.of(USD, 100));
|
||||
assertThat(registry.getDomainRenewCost("rich.example", clock.nowUtc(), "TheRegistrar", 2))
|
||||
.isEqualTo(Money.of(USD, 200));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_tldNeverSet() {
|
||||
thrown.expect(IllegalArgumentException.class, "No registry TLD specified.");
|
||||
|
|
@ -404,6 +356,13 @@ public class RegistryTest extends EntityTestCase {
|
|||
.build();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_pricingEngineIsRequired() {
|
||||
thrown.expect(
|
||||
IllegalArgumentException.class, "All registries must have a configured pricing engine");
|
||||
new Registry.Builder().setTldStr("invalid").build();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_negativeRenewBillingCostTransitionValue() {
|
||||
thrown.expect(IllegalArgumentException.class, "billing cost cannot be negative");
|
||||
|
|
@ -454,45 +413,4 @@ public class RegistryTest extends EntityTestCase {
|
|||
thrown.expect(IllegalArgumentException.class, "cost must be in the registry's currency");
|
||||
Registry.get("tld").asBuilder().setServerStatusChangeBillingCost(Money.of(EUR, 42)).build();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_isPremiumNameForSldNotUnderTld() {
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
Registry.get("tld").isPremiumName("test.example", clock.nowUtc(), "TheRegistrar");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_isPremiumNameForSldSubdomain() throws Exception {
|
||||
createTld("example");
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
Registry.get("example").isPremiumName("rich.sld.example", clock.nowUtc(), "TheRegistrar");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_getCreateCostForSldNotUnderTld() {
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
Registry.get("tld").getDomainCreateCost("test.example", clock.nowUtc(), "TheRegistrar", 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_getCreateCostForSldSubdomain() throws Exception {
|
||||
createTld("example");
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
Registry.get("example")
|
||||
.getDomainCreateCost("rich.sld.example", clock.nowUtc(), "TheRegistrar", 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_getRenewCostForSldNotUnderTld() {
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
Registry.get("tld").getDomainRenewCost("test.example", clock.nowUtc(), "TheRegistrar", 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_getRenewCostForSldSubdomain() throws Exception {
|
||||
createTld("example");
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
Registry.get("example")
|
||||
.getDomainRenewCost("rich.sld.example", clock.nowUtc(), "TheRegistrar", 1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableList;
|
|||
|
||||
import com.googlecode.objectify.Key;
|
||||
|
||||
import google.registry.model.pricing.StaticPremiumListPricingEngine;
|
||||
import google.registry.model.registry.Registry;
|
||||
import google.registry.model.registry.label.PremiumList.PremiumListEntry;
|
||||
import google.registry.model.registry.label.PremiumList.PremiumListRevision;
|
||||
|
|
@ -70,7 +71,11 @@ public class PremiumListTest {
|
|||
@Test
|
||||
public void testGetPremiumPrice_returnsNoPriceWhenNoPremiumListConfigured() throws Exception {
|
||||
createTld("ghost");
|
||||
persistResource(new Registry.Builder().setTldStr("ghost").build());
|
||||
persistResource(
|
||||
new Registry.Builder()
|
||||
.setTldStr("ghost")
|
||||
.setPricingEngineClass(StaticPremiumListPricingEngine.class)
|
||||
.build());
|
||||
assertThat(Registry.get("ghost").getPremiumList()).isNull();
|
||||
assertThat(getPremiumPrice("blah", "ghost")).isAbsent();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue