mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-19 22:44:26 +00:00
Code Issues Releases Wiki Activity

Remove ofy support from BillingEvent (#1710)

Browse Source 
This PR turns out to be more massive than I would have liked but it
  deals with all billing event related stuff, which are more or link all
  intertwined:

  * Remove all billing events as Ofy entities.
  * Add a temporary annotation to allow BillingEvent's ID to be
    auto-allocated by ofy while not lacking the Ofy @Id annotation.
  * Remove Modification, which is only used in ofy.
  * Remove BillingVKey, as we do not need to store the ofy key parent
     information anymore. The VKey for a billing event now just contain
     its primary key, and can be converted by VKeyConverter.
  * Remove BigQuery related code in the billing pipeline.

  Note that after BillingVKey is removed, several columns in
  BillingCancellation are no longer needed. The change to database schema
  will be handled in https://github.com/google/nomulus/pull/1721 after
  this PR is deployed to production.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/google/nomulus/1710)
<!-- Reviewable:end -->
This commit is contained in:
Lai Jiang
2022-08-02 11:36:28 -04:00
committed by GitHub
parent 950d12577f
commit 1aefd9a78d
65 changed files with 472 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/google/registry/batch/DeleteExpiredDomainsActionTest.java
+1 -1
View File
@@ -200,7 +200,7 @@ class DeleteExpiredDomainsActionTest {
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc().plusYears(1))
.setRecurrenceEndTime(END_OF_TIME)
.setParent(createHistoryEntry);
.setDomainHistory(createHistoryEntry);
}
private PollMessage.Autorenew.Builder createAutorenewPollMessage(
core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java
+1 -1
View File
@@ -296,7 +296,7 @@ class DeleteProberDataActionTest {
BillingEvent.OneTime billingEvent =
persistSimpleResource(
new BillingEvent.OneTime.Builder()
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.setBillingTime(DELETION_TIME.plusYears(1))
.setCost(Money.parse("USD 10"))
.setPeriodYears(1)
core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
+58 -48
View File
@@ -105,7 +105,7 @@ public class ExpandRecurringBillingEventsActionTest {
.build());
recurring =
new BillingEvent.Recurring.Builder()
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.setRegistrarId(domain.getCreationRegistrarId())
.setEventTime(DateTime.parse("2000-01-05T00:00:00Z"))
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
@@ -171,7 +171,7 @@ public class ExpandRecurringBillingEventsActionTest {
.setPeriodYears(1)
.setReason(Reason.RENEW)
.setSyntheticCreationTime(currentTestTime)
.setCancellationMatchingBillingEvent(recurring.createVKey())
.setCancellationMatchingBillingEvent(recurring)
.setTargetId(domain.getDomainName());
}
@@ -184,7 +184,8 @@ public class ExpandRecurringBillingEventsActionTest {
getOnlyHistoryEntryOfType(domain, DOMAIN_AUTORENEW, DomainHistory.class);
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected = defaultOneTimeBuilder().setParent(persistedEntry).build();
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setDomainHistory(persistedEntry).build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@@ -204,7 +205,7 @@ public class ExpandRecurringBillingEventsActionTest {
recurring =
persistResource(
new BillingEvent.Recurring.Builder()
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.setRegistrarId(deletedDomain.getCreationRegistrarId())
.setEventTime(DateTime.parse("2000-01-05T00:00:00Z"))
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
@@ -225,7 +226,7 @@ public class ExpandRecurringBillingEventsActionTest {
true);
BillingEvent.OneTime expected =
defaultOneTimeBuilder()
.setParent(persistedEntry)
.setDomainHistory(persistedEntry)
.setTargetId(deletedDomain.getDomainName())
.build();
assertBillingEventsForResource(deletedDomain, expected, recurring);
@@ -241,7 +242,8 @@ public class ExpandRecurringBillingEventsActionTest {
getOnlyHistoryEntryOfType(domain, DOMAIN_AUTORENEW, DomainHistory.class);
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected = defaultOneTimeBuilder().setParent(persistedEntry).build();
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setDomainHistory(persistedEntry).build();
assertCursorAt(currentTestTime);
DateTime beginningOfSecondRun = clock.nowUtc();
action.response = new FakeResponse();
@@ -254,7 +256,7 @@ public class ExpandRecurringBillingEventsActionTest {
void testSuccess_expandSingleEvent_idempotentForExistingOneTime() throws Exception {
persistResource(recurring);
BillingEvent.OneTime persisted =
persistResource(defaultOneTimeBuilder().setParent(historyEntry).build());
persistResource(defaultOneTimeBuilder().setDomainHistory(historyEntry).build());
action.cursorTimeParam = Optional.of(START_OF_TIME);
runAction();
// No new history entries should be generated
@@ -273,7 +275,8 @@ public class ExpandRecurringBillingEventsActionTest {
getOnlyHistoryEntryOfType(domain, DOMAIN_AUTORENEW, DomainHistory.class);
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected = defaultOneTimeBuilder().setParent(persistedEntry).build();
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setDomainHistory(persistedEntry).build();
// Persist an otherwise identical billing event that differs only in billing time (and ID).
BillingEvent.OneTime persisted =
persistResource(
@@ -301,13 +304,13 @@ public class ExpandRecurringBillingEventsActionTest {
}
assertThat(persistedEntries).hasSize(2);
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setParent(persistedEntries.get(0)).build();
defaultOneTimeBuilder().setDomainHistory(persistedEntries.get(0)).build();
// Persist an otherwise identical billing event that differs only in recurring event key.
BillingEvent.OneTime persisted =
expected
.asBuilder()
.setParent(persistedEntries.get(1))
.setCancellationMatchingBillingEvent(recurring2.createVKey())
.setDomainHistory(persistedEntries.get(1))
.setCancellationMatchingBillingEvent(recurring2)
.build();
assertCursorAt(currentTestTime);
assertBillingEventsForResource(domain, persisted, expected, recurring, recurring2);
@@ -350,7 +353,8 @@ public class ExpandRecurringBillingEventsActionTest {
getOnlyHistoryEntryOfType(domain, DOMAIN_AUTORENEW, DomainHistory.class);
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected = defaultOneTimeBuilder().setParent(persistedEntry).build();
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setDomainHistory(persistedEntry).build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@@ -364,7 +368,8 @@ public class ExpandRecurringBillingEventsActionTest {
getOnlyHistoryEntryOfType(domain, DOMAIN_AUTORENEW, DomainHistory.class);
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected = defaultOneTimeBuilder().setParent(persistedEntry).build();
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setDomainHistory(persistedEntry).build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@@ -401,7 +406,7 @@ public class ExpandRecurringBillingEventsActionTest {
defaultOneTimeBuilder()
.setBillingTime(DateTime.parse("2002-02-19T00:00:00Z"))
.setEventTime(DateTime.parse("2002-01-05T00:00:00Z"))
.setParent(persistedEntry)
.setDomainHistory(persistedEntry)
.build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
@@ -416,7 +421,8 @@ public class ExpandRecurringBillingEventsActionTest {
getOnlyHistoryEntryOfType(domain, DOMAIN_AUTORENEW, DomainHistory.class);
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected = defaultOneTimeBuilder().setParent(persistedEntry).build();
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setDomainHistory(persistedEntry).build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@@ -482,7 +488,7 @@ public class ExpandRecurringBillingEventsActionTest {
defaultOneTimeBuilder()
.setBillingTime(billingDate.plusYears(year))
.setEventTime(eventDate.plusYears(year))
.setParent(persistedEntries.get(year))
.setDomainHistory(persistedEntries.get(year))
.build());
}
assertBillingEventsForResource(domain, Iterables.toArray(expectedEvents, BillingEvent.class));
@@ -508,7 +514,7 @@ public class ExpandRecurringBillingEventsActionTest {
expectedEvents.add(
defaultOneTimeBuilder()
.setBillingTime(billingDate.plusYears(year))
.setParent(persistedEntries.get(year))
.setDomainHistory(persistedEntries.get(year))
.setEventTime(eventDate.plusYears(year))
.build());
}
@@ -554,7 +560,7 @@ public class ExpandRecurringBillingEventsActionTest {
BillingEvent.OneTime expected =
defaultOneTimeBuilder()
.setBillingTime(DateTime.parse("2000-02-19T00:00:00Z"))
.setParent(persistedEntry)
.setDomainHistory(persistedEntry)
.build();
assertBillingEventsForResource(domain, recurring, expected);
assertCursorAt(currentTestTime);
@@ -583,7 +589,7 @@ public class ExpandRecurringBillingEventsActionTest {
BillingEvent.OneTime expected =
defaultOneTimeBuilder()
.setBillingTime(DateTime.parse("2000-02-19T00:00:00Z"))
.setParent(persistedEntry)
.setDomainHistory(persistedEntry)
.build();
assertBillingEventsForResource(domain, recurring, expected);
assertCursorAt(currentTestTime);
@@ -604,7 +610,7 @@ public class ExpandRecurringBillingEventsActionTest {
defaultOneTimeBuilder()
.setBillingTime(DateTime.parse("2000-02-29T00:00:00Z"))
.setEventTime(DateTime.parse("2000-01-15T00:00:00Z"))
.setParent(persistedEntry)
.setDomainHistory(persistedEntry)
.build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
@@ -626,7 +632,7 @@ public class ExpandRecurringBillingEventsActionTest {
defaultOneTimeBuilder()
.setBillingTime(DateTime.parse("2001-03-01T00:00:00Z"))
.setEventTime(DateTime.parse("2001-01-15T00:00:00Z"))
.setParent(persistedEntry)
.setDomainHistory(persistedEntry)
.build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
@@ -652,7 +658,7 @@ public class ExpandRecurringBillingEventsActionTest {
BillingEvent.Recurring recurring2 =
persistResource(
new BillingEvent.Recurring.Builder()
.setParent(historyEntry2)
.setDomainHistory(historyEntry2)
.setRegistrarId(domain2.getCreationRegistrarId())
.setEventTime(DateTime.parse("2000-04-05T00:00:00Z"))
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
@@ -677,7 +683,7 @@ public class ExpandRecurringBillingEventsActionTest {
BillingEvent.Recurring recurring3 =
persistResource(
new BillingEvent.Recurring.Builder()
.setParent(historyEntry3)
.setDomainHistory(historyEntry3)
.setRegistrarId(domain3.getCreationRegistrarId())
.setEventTime(DateTime.parse("2000-06-05T00:00:00Z"))
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
@@ -694,8 +700,8 @@ public class ExpandRecurringBillingEventsActionTest {
domain, persistedHistory1, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected =
defaultOneTimeBuilder()
.setParent(persistedHistory1)
.setCancellationMatchingBillingEvent(recurring.createVKey())
.setDomainHistory(persistedHistory1)
.setCancellationMatchingBillingEvent(recurring)
.build();
DomainHistory persistedHistory2 =
getOnlyHistoryEntryOfType(domain2, DOMAIN_AUTORENEW, DomainHistory.class);
@@ -705,9 +711,9 @@ public class ExpandRecurringBillingEventsActionTest {
defaultOneTimeBuilder()
.setBillingTime(DateTime.parse("2000-05-20T00:00:00Z"))
.setEventTime(DateTime.parse("2000-04-05T00:00:00Z"))
.setParent(persistedHistory2)
.setDomainHistory(persistedHistory2)
.setTargetId(domain2.getDomainName())
.setCancellationMatchingBillingEvent(recurring2.createVKey())
.setCancellationMatchingBillingEvent(recurring2)
.build();
DomainHistory persistedHistory3 =
getOnlyHistoryEntryOfType(domain3, DOMAIN_AUTORENEW, DomainHistory.class);
@@ -718,8 +724,8 @@ public class ExpandRecurringBillingEventsActionTest {
.setBillingTime(DateTime.parse("2000-07-20T00:00:00Z"))
.setEventTime(DateTime.parse("2000-06-05T00:00:00Z"))
.setTargetId(domain3.getDomainName())
.setParent(persistedHistory3)
.setCancellationMatchingBillingEvent(recurring3.createVKey())
.setDomainHistory(persistedHistory3)
.setCancellationMatchingBillingEvent(recurring3)
.build();
assertBillingEventsForResource(domain, expected, recurring);
assertBillingEventsForResource(domain2, expected2, recurring2);
@@ -755,8 +761,8 @@ public class ExpandRecurringBillingEventsActionTest {
true);
BillingEvent.OneTime expected =
defaultOneTimeBuilder()
.setParent(persistedEntries.get(0))
.setCancellationMatchingBillingEvent(recurring.createVKey())
.setDomainHistory(persistedEntries.get(0))
.setCancellationMatchingBillingEvent(recurring)
.build();
assertHistoryEntryMatches(
domain,
@@ -768,8 +774,8 @@ public class ExpandRecurringBillingEventsActionTest {
defaultOneTimeBuilder()
.setBillingTime(DateTime.parse("2000-05-20T00:00:00Z"))
.setEventTime(DateTime.parse("2000-04-05T00:00:00Z"))
.setParent(persistedEntries.get(1))
.setCancellationMatchingBillingEvent(recurring2.createVKey())
.setDomainHistory(persistedEntries.get(1))
.setCancellationMatchingBillingEvent(recurring2)
.build();
assertBillingEventsForResource(domain, expected, expected2, recurring, recurring2);
assertCursorAt(currentTestTime);
@@ -812,8 +818,8 @@ public class ExpandRecurringBillingEventsActionTest {
BillingEvent.OneTime expected =
defaultOneTimeBuilder()
.setCost(Money.of(USD, 4))
.setParent(persistedEntries.get(0))
.setCancellationMatchingBillingEvent(recurring.createVKey())
.setDomainHistory(persistedEntries.get(0))
.setCancellationMatchingBillingEvent(recurring)
.build();
assertHistoryEntryMatches(
domain,
@@ -826,8 +832,8 @@ public class ExpandRecurringBillingEventsActionTest {
.setCost(Money.of(USD, 4))
.setBillingTime(DateTime.parse("2000-05-20T00:00:00Z"))
.setEventTime(DateTime.parse("2000-04-05T00:00:00Z"))
.setParent(persistedEntries.get(1))
.setCancellationMatchingBillingEvent(recurring2.createVKey())
.setDomainHistory(persistedEntries.get(1))
.setCancellationMatchingBillingEvent(recurring2)
.build();
assertBillingEventsForResource(domain, expected, expected2, recurring, recurring2);
assertCursorAt(currentTestTime);
@@ -848,7 +854,10 @@ public class ExpandRecurringBillingEventsActionTest {
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setParent(persistedEntry).setCost(Money.of(USD, 100)).build();
defaultOneTimeBuilder()
.setDomainHistory(persistedEntry)
.setCost(Money.of(USD, 100))
.build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@@ -868,7 +877,7 @@ public class ExpandRecurringBillingEventsActionTest {
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setParent(persistedEntry).setCost(Money.of(USD, 11)).build();
defaultOneTimeBuilder().setDomainHistory(persistedEntry).setCost(Money.of(USD, 11)).build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@@ -882,7 +891,8 @@ public class ExpandRecurringBillingEventsActionTest {
getOnlyHistoryEntryOfType(domain, DOMAIN_AUTORENEW, DomainHistory.class);
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected = defaultOneTimeBuilder().setParent(persistedEntry).build();
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setDomainHistory(persistedEntry).build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@@ -908,7 +918,7 @@ public class ExpandRecurringBillingEventsActionTest {
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setParent(persistedEntry).setCost(Money.of(USD, 20)).build();
defaultOneTimeBuilder().setDomainHistory(persistedEntry).setCost(Money.of(USD, 20)).build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@@ -929,7 +939,7 @@ public class ExpandRecurringBillingEventsActionTest {
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), true);
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setParent(persistedEntry).setCost(Money.of(USD, 2)).build();
defaultOneTimeBuilder().setDomainHistory(persistedEntry).setCost(Money.of(USD, 2)).build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@@ -961,7 +971,7 @@ public class ExpandRecurringBillingEventsActionTest {
defaultOneTimeBuilder()
.setBillingTime(billingDate)
.setEventTime(eventDate)
.setParent(persistedEntries.get(0))
.setDomainHistory(persistedEntries.get(0))
.setCost(Money.of(USD, 8))
.build();
assertHistoryEntryMatches(
@@ -972,7 +982,7 @@ public class ExpandRecurringBillingEventsActionTest {
.setCost(Money.of(USD, 10))
.setBillingTime(billingDate.plusYears(1))
.setEventTime(eventDate.plusYears(1))
.setParent(persistedEntries.get(1))
.setDomainHistory(persistedEntries.get(1))
.build();
assertBillingEventsForResource(domain, recurring, cheaper, expensive);
assertCursorAt(currentTestTime);
@@ -1006,7 +1016,7 @@ public class ExpandRecurringBillingEventsActionTest {
defaultOneTimeBuilder()
.setBillingTime(billingDate)
.setEventTime(eventDate)
.setParent(persistedEntries.get(0))
.setDomainHistory(persistedEntries.get(0))
.setCost(Money.of(USD, 8))
.build();
assertHistoryEntryMatches(
@@ -1017,7 +1027,7 @@ public class ExpandRecurringBillingEventsActionTest {
.setCost(Money.of(USD, 10))
.setBillingTime(billingDate.plusYears(1))
.setEventTime(eventDate.plusYears(1))
.setParent(persistedEntries.get(1))
.setDomainHistory(persistedEntries.get(1))
.build();
assertBillingEventsForResource(domain, recurring, cheaper, expensive);
assertCursorAt(currentTestTime);
@@ -1057,7 +1067,7 @@ public class ExpandRecurringBillingEventsActionTest {
defaultOneTimeBuilder()
.setBillingTime(billingDate)
.setEventTime(eventDate)
.setParent(persistedEntries.get(0))
.setDomainHistory(persistedEntries.get(0))
.setCost(Money.of(USD, 5))
.build();
assertHistoryEntryMatches(
@@ -1068,7 +1078,7 @@ public class ExpandRecurringBillingEventsActionTest {
.setCost(Money.of(USD, 5))
.setBillingTime(billingDate.plusYears(1))
.setEventTime(eventDate.plusYears(1))
.setParent(persistedEntries.get(1))
.setDomainHistory(persistedEntries.get(1))
.build();
assertBillingEventsForResource(domain, recurring, cheaper, expensive);
assertCursorAt(currentTestTime);
core/src/test/java/google/registry/beam/invoicing/BillingEventTest.java
+27 -105
View File
@@ -15,7 +15,6 @@
package google.registry.beam.invoicing;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import google.registry.beam.invoicing.BillingEvent.InvoiceGroupingKey;
import google.registry.beam.invoicing.BillingEvent.InvoiceGroupingKey.InvoiceGroupingKeyCoder;
@@ -23,108 +22,41 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericRecord;
import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/** Unit tests for {@link BillingEvent} */
class BillingEventTest {
private static final String BILLING_EVENT_SCHEMA =
"{\"name\": \"BillingEvent\", "
+ "\"type\": \"record\", "
+ "\"fields\": ["
+ "{\"name\": \"id\", \"type\": \"long\"},"
+ "{\"name\": \"billingTime\", \"type\": \"string\"},"
+ "{\"name\": \"eventTime\", \"type\": \"string\"},"
+ "{\"name\": \"registrarId\", \"type\": \"string\"},"
+ "{\"name\": \"billingId\", \"type\": \"long\"},"
+ "{\"name\": \"poNumber\", \"type\": \"string\"},"
+ "{\"name\": \"tld\", \"type\": \"string\"},"
+ "{\"name\": \"action\", \"type\": \"string\"},"
+ "{\"name\": \"domain\", \"type\": \"string\"},"
+ "{\"name\": \"repositoryId\", \"type\": \"string\"},"
+ "{\"name\": \"years\", \"type\": \"int\"},"
+ "{\"name\": \"currency\", \"type\": \"string\"},"
+ "{\"name\": \"amount\", \"type\": \"float\"},"
+ "{\"name\": \"flags\", \"type\": \"string\"}"
+ "]}";
private SchemaAndRecord schemaAndRecord;
private BillingEvent event;
@BeforeEach
void beforeEach() {
// Create a record with a given JSON schema.
schemaAndRecord = new SchemaAndRecord(createRecord(), null);
event = createBillingEvent("", 5);
}
private GenericRecord createRecord() {
GenericRecord record = new GenericData.Record(new Schema.Parser().parse(BILLING_EVENT_SCHEMA));
record.put("id", "1");
record.put("billingTime", 1508835963000000L);
record.put("eventTime", 1484870383000000L);
record.put("registrarId", "myRegistrar");
record.put("billingId", "12345-CRRHELLO");
record.put("poNumber", "");
record.put("tld", "test");
record.put("action", "RENEW");
record.put("domain", "example.test");
record.put("repositoryId", "123456");
record.put("years", 5);
record.put("currency", "USD");
record.put("amount", 20.5);
record.put("flags", "AUTO_RENEW SYNTHETIC");
return record;
}
@Test
void testParseBillingEventFromRecord_success() {
BillingEvent event = BillingEvent.parseFromRecord(schemaAndRecord);
assertThat(event.id()).isEqualTo(1);
assertThat(event.billingTime()).isEqualTo(DateTime.parse("2017-10-24T09:06:03Z"));
assertThat(event.eventTime()).isEqualTo(DateTime.parse("2017-01-19T23:59:43Z"));
assertThat(event.registrarId()).isEqualTo("myRegistrar");
assertThat(event.billingId()).isEqualTo("12345-CRRHELLO");
assertThat(event.poNumber()).isEmpty();
assertThat(event.tld()).isEqualTo("test");
assertThat(event.action()).isEqualTo("RENEW");
assertThat(event.domain()).isEqualTo("example.test");
assertThat(event.repositoryId()).isEqualTo("123456");
assertThat(event.years()).isEqualTo(5);
assertThat(event.currency()).isEqualTo("USD");
assertThat(event.amount()).isEqualTo(20.5);
assertThat(event.flags()).isEqualTo("AUTO_RENEW SYNTHETIC");
}
@Test
void testParseBillingEventFromRecord_sunriseCreate_reducedPrice_success() {
schemaAndRecord.getRecord().put("flags", "SUNRISE");
BillingEvent event = BillingEvent.parseFromRecord(schemaAndRecord);
assertThat(event.amount()).isEqualTo(17.43);
assertThat(event.flags()).isEqualTo("SUNRISE");
}
@Test
void testParseBillingEventFromRecord_anchorTenant_zeroPrice_success() {
schemaAndRecord.getRecord().put("flags", "SUNRISE ANCHOR_TENANT");
BillingEvent event = BillingEvent.parseFromRecord(schemaAndRecord);
assertThat(event.amount()).isZero();
assertThat(event.flags()).isEqualTo("SUNRISE ANCHOR_TENANT");
}
@Test
void testParseBillingEventFromRecord_nullValue_throwsException() {
schemaAndRecord.getRecord().put("tld", null);
assertThrows(IllegalStateException.class, () -> BillingEvent.parseFromRecord(schemaAndRecord));
private static BillingEvent createBillingEvent(String pONumber, int years) {
return BillingEvent.create(
1,
new DateTime(1508835963000L, DateTimeZone.UTC),
new DateTime(1484870383000L, DateTimeZone.UTC),
"myRegistrar",
"12345-CRRHELLO",
pONumber,
"test",
"RENEW",
"example.test",
"123456",
years,
"USD",
20.5,
"AUTO_RENEW SYNTHETIC");
}
@Test
void testConvertBillingEvent_toCsv() {
BillingEvent event = BillingEvent.parseFromRecord(schemaAndRecord);
assertThat(event.toCsv())
.isEqualTo(
"1,2017-10-24 09:06:03 UTC,2017-01-19 23:59:43 UTC,myRegistrar,"
@@ -133,9 +65,7 @@ class BillingEventTest {
@Test
void testConvertBillingEvent_nonNullPoNumber_toCsv() {
GenericRecord record = createRecord();
record.put("poNumber", "905610");
BillingEvent event = BillingEvent.parseFromRecord(new SchemaAndRecord(record, null));
event = createBillingEvent("905610", 5);
assertThat(event.toCsv())
.isEqualTo(
"1,2017-10-24 09:06:03 UTC,2017-01-19 23:59:43 UTC,myRegistrar,"
@@ -144,13 +74,11 @@ class BillingEventTest {
@Test
void testGenerateBillingEventFilename() {
BillingEvent event = BillingEvent.parseFromRecord(schemaAndRecord);
assertThat(event.toFilename("2017-10")).isEqualTo("invoice_details_2017-10_myRegistrar_test");
}
@Test
void testGetInvoiceGroupingKey_fromBillingEvent() {
BillingEvent event = BillingEvent.parseFromRecord(schemaAndRecord);
InvoiceGroupingKey invoiceKey = event.getInvoiceGroupingKey();
assertThat(invoiceKey.startDate()).isEqualTo("2017-10-01");
assertThat(invoiceKey.endDate()).isEqualTo("2022-09-30");
@@ -164,9 +92,7 @@ class BillingEventTest {
@Test
void test_nonNullPoNumber() {
GenericRecord record = createRecord();
record.put("poNumber", "905610");
BillingEvent event = BillingEvent.parseFromRecord(new SchemaAndRecord(record, null));
event = createBillingEvent("905610", 5);
assertThat(event.poNumber()).isEqualTo("905610");
InvoiceGroupingKey invoiceKey = event.getInvoiceGroupingKey();
assertThat(invoiceKey.poNumber()).isEqualTo("905610");
@@ -174,7 +100,6 @@ class BillingEventTest {
@Test
void testConvertInvoiceGroupingKey_toCsv() {
BillingEvent event = BillingEvent.parseFromRecord(schemaAndRecord);
InvoiceGroupingKey invoiceKey = event.getInvoiceGroupingKey();
assertThat(invoiceKey.toCsv(3L))
.isEqualTo(
@@ -184,10 +109,7 @@ class BillingEventTest {
@Test
void testConvertInvoiceGroupingKey_zeroYears_toCsv() {
GenericRecord record = schemaAndRecord.getRecord();
record.put("years", 0);
schemaAndRecord = new SchemaAndRecord(record, null);
BillingEvent event = BillingEvent.parseFromRecord(schemaAndRecord);
event = createBillingEvent("", 0);
InvoiceGroupingKey invoiceKey = event.getInvoiceGroupingKey();
assertThat(invoiceKey.toCsv(3L))
.isEqualTo(
@@ -197,8 +119,7 @@ class BillingEventTest {
@Test
void testInvoiceGroupingKeyCoder_deterministicSerialization() throws IOException {
InvoiceGroupingKey invoiceKey =
BillingEvent.parseFromRecord(schemaAndRecord).getInvoiceGroupingKey();
InvoiceGroupingKey invoiceKey = event.getInvoiceGroupingKey();
InvoiceGroupingKeyCoder coder = new InvoiceGroupingKeyCoder();
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
coder.encode(invoiceKey, outStream);
@@ -217,8 +138,9 @@ class BillingEventTest {
@Test
void testGetOverallInvoiceHeader() {
assertThat(InvoiceGroupingKey.invoiceHeader())
.isEqualTo("StartDate,EndDate,ProductAccountKey,Amount,AmountCurrency,BillingProductCode,"
+ "SalesChannel,LineItemType,UsageGroupingKey,Quantity,Description,UnitPrice,"
+ "UnitPriceCurrency,PONumber");
.isEqualTo(
"StartDate,EndDate,ProductAccountKey,Amount,AmountCurrency,BillingProductCode,"
+ "SalesChannel,LineItemType,UsageGroupingKey,Quantity,Description,UnitPrice,"
+ "UnitPriceCurrency,PONumber");
}
}
core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java
+20 -33
View File
@@ -50,7 +50,6 @@ import google.registry.persistence.transaction.JpaTestExtensions;
import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension;
import google.registry.testing.DatastoreEntityExtension;
import google.registry.testing.FakeClock;
import google.registry.testing.TestDataHelper;
import google.registry.util.ResourceUtils;
import java.io.File;
import java.nio.file.Files;
@@ -67,7 +66,6 @@ import org.apache.beam.sdk.transforms.MapElements;
import org.apache.beam.sdk.transforms.PTransform;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.TypeDescriptor;
import org.joda.money.CurrencyUnit;
import org.joda.money.Money;
import org.joda.time.DateTime;
import org.junit.jupiter.api.BeforeEach;
@@ -81,8 +79,7 @@ class InvoicingPipelineTest {
@RegisterExtension
@Order(Order.DEFAULT - 1)
final transient DatastoreEntityExtension datastore =
new DatastoreEntityExtension().allThreads(true);
final DatastoreEntityExtension datastore = new DatastoreEntityExtension().allThreads(true);
@RegisterExtension
final TestPipelineExtension pipeline =
@@ -263,15 +260,6 @@ class InvoicingPipelineTest {
pipeline.apply(Create.of(INPUT_EVENTS).withCoder(SerializableCoder.of(BillingEvent.class)));
}
@Test
void testSuccess_makeQuery() {
String query = InvoicingPipeline.makeQuery("2017-10", "my-project-id");
assertThat(query)
.isEqualTo(TestDataHelper.loadFile(this.getClass(), "billing_events_test.sql"));
// This is necessary because the TestPipelineExtension verifies that the pipeline is run.
pipeline.run();
}
@Test
void testSuccess_fullSqlPipeline() throws Exception {
setupCloudSql();
@@ -365,14 +353,14 @@ class InvoicingPipelineTest {
// Test that comments are removed from the .sql file correctly
assertThat(InvoicingPipeline.makeCloudSqlQuery("2017-10"))
.isEqualTo(
"\n"
'\n'
+ "SELECT b, r FROM BillingEvent b\n"
+ "JOIN Registrar r ON b.clientId = r.clientIdentifier\n"
+ "JOIN Domain d ON b.domainRepoId = d.repoId\n"
+ "JOIN Tld t ON t.tldStr = d.tld\n"
+ "LEFT JOIN BillingCancellation c ON b.id = c.refOneTime.billingId\n"
+ "LEFT JOIN BillingCancellation c ON b.id = c.refOneTime\n"
+ "LEFT JOIN BillingCancellation cr ON b.cancellationMatchingBillingEvent ="
+ " cr.refRecurring.billingId\n"
+ " cr.refRecurring\n"
+ "WHERE r.billingAccountMap IS NOT NULL\n"
+ "AND r.type = 'REAL'\n"
+ "AND t.invoicingEnabled IS TRUE\n"
@@ -386,13 +374,12 @@ class InvoicingPipelineTest {
private ImmutableList<String> resultFileContents(String filename) throws Exception {
File resultFile =
new File(
String.format(
"%s/invoices/2017-10/%s", billingBucketUrl.getAbsolutePath().toString(), filename));
String.format("%s/invoices/2017-10/%s", billingBucketUrl.getAbsolutePath(), filename));
return ImmutableList.copyOf(
ResourceUtils.readResourceUtf8(resultFile.toURI().toURL()).split("\n"));
}
private void setupCloudSql() {
private static void setupCloudSql() {
// Populate billing events in Cloud SQL to match existing test data for Datastore
persistNewRegistrar("NewRegistrar");
persistNewRegistrar("TheRegistrar");
@@ -444,7 +431,7 @@ class InvoicingPipelineTest {
registrar1,
Reason.CREATE,
5,
Money.ofMajor(CurrencyUnit.JPY, 70),
Money.ofMajor(JPY, 70),
DateTime.parse("2017-09-29T00:00:00.0Z"),
DateTime.parse("2017-10-02T00:00:00.0Z"));
persistOneTimeBillingEvent(4, domain4, registrar2, Reason.RENEW, 1, Money.of(USD, 20.5));
@@ -495,7 +482,7 @@ class InvoicingPipelineTest {
registrar1,
Reason.CREATE,
5,
Money.ofMajor(CurrencyUnit.JPY, 70),
Money.ofMajor(JPY, 70),
DateTime.parse("2017-06-29T00:00:00.0Z"),
DateTime.parse("2017-07-02T00:00:00.0Z"));
@@ -510,13 +497,12 @@ class InvoicingPipelineTest {
.asBuilder()
.setId(1)
.setRegistrarId(registrar1.getRegistrarId())
.setDomainHistoryRevisionId(domainHistory.getId())
.setEventTime(DateTime.parse("2017-10-05T00:00:00.0Z"))
.setBillingTime(DateTime.parse("2017-10-04T00:00:00.0Z"))
.setOneTimeEventKey(oneTime.createVKey())
.setTargetId(domain12.getDomainName())
.setReason(Reason.RENEW)
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.build();
persistResource(cancellation);
@@ -530,7 +516,7 @@ class InvoicingPipelineTest {
.setRegistrarId(registrar1.getRegistrarId())
.setRecurrenceEndTime(END_OF_TIME)
.setId(1)
.setParent(domainHistoryRecurring)
.setDomainHistory(domainHistoryRecurring)
.setTargetId(domain13.getDomainName())
.setEventTime(DateTime.parse("2017-10-04T00:00:00.0Z"))
.setReason(Reason.RENEW)
@@ -541,7 +527,7 @@ class InvoicingPipelineTest {
oneTimeRecurring =
oneTimeRecurring
.asBuilder()
.setCancellationMatchingBillingEvent(recurring.createVKey())
.setCancellationMatchingBillingEvent(recurring)
.setFlags(ImmutableSet.of(Flag.SYNTHETIC))
.setSyntheticCreationTime(DateTime.parse("2017-10-03T00:00:00.0Z"))
.build();
@@ -552,18 +538,17 @@ class InvoicingPipelineTest {
.asBuilder()
.setId(2)
.setRegistrarId(registrar1.getRegistrarId())
.setDomainHistoryRevisionId(domainHistoryRecurring.getId())
.setEventTime(DateTime.parse("2017-10-05T00:00:00.0Z"))
.setBillingTime(DateTime.parse("2017-10-04T00:00:00.0Z"))
.setRecurringEventKey(recurring.createVKey())
.setTargetId(domain13.getDomainName())
.setReason(Reason.RENEW)
.setParent(domainHistoryRecurring)
.setDomainHistory(domainHistoryRecurring)
.build();
persistResource(cancellationRecurring);
}
private DomainHistory persistDomainHistory(DomainBase domainBase, Registrar registrar) {
private static DomainHistory persistDomainHistory(DomainBase domainBase, Registrar registrar) {
DomainHistory domainHistory =
new DomainHistory.Builder()
.setType(HistoryEntry.Type.DOMAIN_RENEW)
@@ -574,7 +559,7 @@ class InvoicingPipelineTest {
return persistResource(domainHistory);
}
private OneTime persistOneTimeBillingEvent(
private static OneTime persistOneTimeBillingEvent(
int id, DomainBase domainBase, Registrar registrar, Reason reason, int years, Money money) {
return persistOneTimeBillingEvent(
id,
@@ -587,7 +572,7 @@ class InvoicingPipelineTest {
DateTime.parse("2017-10-04T00:00:00.0Z"));
}
private OneTime persistOneTimeBillingEvent(
private static OneTime persistOneTimeBillingEvent(
int id,
DomainBase domainBase,
Registrar registrar,
@@ -597,7 +582,7 @@ class InvoicingPipelineTest {
DateTime eventTime,
DateTime billingTime,
Flag... flags) {
google.registry.model.billing.BillingEvent.OneTime.Builder billingEventBuilder =
OneTime.Builder billingEventBuilder =
new OneTime()
.asBuilder()
.setId(id)
@@ -606,10 +591,9 @@ class InvoicingPipelineTest {
.setRegistrarId(registrar.getRegistrarId())
.setReason(reason)
.setTargetId(domainBase.getDomainName())
.setDomainRepoId("REPO-ID")
.setCost(money)
.setFlags(Arrays.stream(flags).collect(toImmutableSet()))
.setParent(persistDomainHistory(domainBase, registrar));
.setDomainHistory(persistDomainHistory(domainBase, registrar));
if (years > 0) {
billingEventBuilder.setPeriodYears(years);
@@ -620,6 +604,9 @@ class InvoicingPipelineTest {
private static class ChangeDomainRepo
extends PTransform<PCollection<BillingEvent>, PCollection<BillingEvent>> {
private static final long serialVersionUID = 2695033474967615250L;
@Override
public PCollection<BillingEvent> expand(PCollection<BillingEvent> input) {
return input.apply(
core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java
+2 -1
View File
@@ -544,7 +544,8 @@ class EppLifecycleDomainTest extends EppTestCase {
.setCost(Money.parse("USD 100.00"))
.setEventTime(createTime)
.setBillingTime(createTime.plus(Registry.get("tld").getRenewGracePeriodLength()))
.setParent(getOnlyHistoryEntryOfType(domain, Type.DOMAIN_CREATE, DomainHistory.class))
.setDomainHistory(
getOnlyHistoryEntryOfType(domain, Type.DOMAIN_CREATE, DomainHistory.class))
.build();
// The expected one-time billing event, that should have an associated Cancellation.
core/src/test/java/google/registry/flows/EppTestCase.java
+13 -11
View File
@@ -28,7 +28,6 @@ import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.net.MediaType;
import com.googlecode.objectify.Key;
import google.registry.flows.EppTestComponent.FakesAndMocksModule;
import google.registry.model.billing.BillingEvent;
import google.registry.model.billing.BillingEvent.Flag;
@@ -327,7 +326,8 @@ public class EppTestCase {
.setPeriodYears(2)
.setEventTime(createTime)
.setBillingTime(createTime.plus(Registry.get(domain.getTld()).getAddGracePeriodLength()))
.setParent(getOnlyHistoryEntryOfType(domain, Type.DOMAIN_CREATE, DomainHistory.class))
.setDomainHistory(
getOnlyHistoryEntryOfType(domain, Type.DOMAIN_CREATE, DomainHistory.class))
.build();
}
@@ -341,7 +341,7 @@ public class EppTestCase {
.setPeriodYears(3)
.setEventTime(renewTime)
.setBillingTime(renewTime.plus(Registry.get(domain.getTld()).getRenewGracePeriodLength()))
.setParent(getOnlyHistoryEntryOfType(domain, Type.DOMAIN_RENEW, DomainHistory.class))
.setDomainHistory(getOnlyHistoryEntryOfType(domain, Type.DOMAIN_RENEW, DomainHistory.class))
.build();
}
@@ -375,7 +375,7 @@ public class EppTestCase {
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setEventTime(eventTime)
.setRecurrenceEndTime(endTime)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build();
}
@@ -386,10 +386,11 @@ public class EppTestCase {
.setTargetId(domain.getDomainName())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setEventTime(deleteTime)
.setOneTimeEventKey(VKey.from(findKeyToActualOneTimeBillingEvent(billingEventToCancel)))
.setOneTimeEventKey(findKeyToActualOneTimeBillingEvent(billingEventToCancel))
.setBillingTime(createTime.plus(Registry.get(domain.getTld()).getAddGracePeriodLength()))
.setReason(Reason.CREATE)
.setParent(getOnlyHistoryEntryOfType(domain, Type.DOMAIN_DELETE, DomainHistory.class))
.setDomainHistory(
getOnlyHistoryEntryOfType(domain, Type.DOMAIN_DELETE, DomainHistory.class))
.build();
}
@@ -400,10 +401,11 @@ public class EppTestCase {
.setTargetId(domain.getDomainName())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setEventTime(deleteTime)
.setOneTimeEventKey(VKey.from(findKeyToActualOneTimeBillingEvent(billingEventToCancel)))
.setOneTimeEventKey(findKeyToActualOneTimeBillingEvent(billingEventToCancel))
.setBillingTime(renewTime.plus(Registry.get(domain.getTld()).getRenewGracePeriodLength()))
.setReason(Reason.RENEW)
.setParent(getOnlyHistoryEntryOfType(domain, Type.DOMAIN_DELETE, DomainHistory.class))
.setDomainHistory(
getOnlyHistoryEntryOfType(domain, Type.DOMAIN_DELETE, DomainHistory.class))
.build();
}
@@ -412,11 +414,11 @@ public class EppTestCase {
*
* <p>This is used in the situation where we have created an expected billing event associated
* with the domain's creation (which is passed as the parameter here), then need to locate the key
* to the actual billing event in Datastore that would be seen on a Cancellation billing event.
* to the actual billing event in the database that would be seen on a Cancellation billing event.
* This is necessary because the ID will be different even though all the rest of the fields are
* the same.
*/
private static Key<OneTime> findKeyToActualOneTimeBillingEvent(OneTime expectedBillingEvent) {
private static VKey<OneTime> findKeyToActualOneTimeBillingEvent(OneTime expectedBillingEvent) {
Optional<OneTime> actualCreateBillingEvent =
loadAllOf(BillingEvent.OneTime.class).stream()
.filter(
@@ -425,6 +427,6 @@ public class EppTestCase {
stripBillingEventId(b), stripBillingEventId(expectedBillingEvent)))
.findFirst();
assertThat(actualCreateBillingEvent).isPresent();
return Key.create(actualCreateBillingEvent.get());
return actualCreateBillingEvent.get().createVKey();
}
}
core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java
+1 -1
View File
@@ -1440,7 +1440,7 @@ class DomainCheckFlowTest extends ResourceCheckFlowTestCase<DomainCheckFlow, Dom
.setRegistrarId("TheRegistrar")
.setEventTime(existingDomain.getCreationTime())
.setRecurrenceEndTime(clock.nowUtc())
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build());
return persistResource(
existingDomain.asBuilder().setAutorenewBillingEvent(renewEvent.createVKey()).build());
core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java
+3 -3
View File
@@ -301,7 +301,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
.setEventTime(clock.nowUtc())
.setBillingTime(billingTime)
.setFlags(expectedBillingFlags)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.setAllocationToken(allocationToken == null ? null : allocationToken.createVKey())
.build();
@@ -313,7 +313,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.setRenewalPriceBehavior(renewalPriceInfo.renewalPriceBehavior())
.setRenewalPrice(renewalPriceInfo.renewalPrice())
.build();
@@ -334,7 +334,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
.setEventTime(clock.nowUtc())
.setBillingTime(billingTime)
.setFlags(expectedBillingFlags)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build();
expectedBillingEvents.add(eapBillingEvent);
}
core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java
+3 -3
View File
@@ -240,7 +240,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
.setEventTime(eventTime)
.setBillingTime(TIME_BEFORE_FLOW.plusDays(1))
.setOneTimeEventKey(graceBillingEvent.createVKey())
.setParent(historyEntryDomainDelete)
.setDomainHistory(historyEntryDomainDelete)
.build());
}
@@ -260,7 +260,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
.setPeriodYears(2)
.setEventTime(TIME_BEFORE_FLOW.minusDays(4))
.setBillingTime(TIME_BEFORE_FLOW.plusDays(1))
.setParent(earlierHistoryEntry)
.setDomainHistory(earlierHistoryEntry)
.build();
}
@@ -272,7 +272,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
.setRegistrarId(registrarId)
.setEventTime(A_MONTH_FROM_NOW)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(earlierHistoryEntry);
.setDomainHistory(earlierHistoryEntry);
}
private PollMessage.Autorenew.Builder createAutorenewPollMessage(String registrarId) {
core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java
+1 -1
View File
@@ -388,7 +388,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc())
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build());
VKey<BillingEvent.Recurring> recurringVKey = renewEvent.createVKey();
// Add an AUTO_RENEW grace period to the saved resource.
core/src/test/java/google/registry/flows/domain/DomainPricingLogicTest.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class DomainPricingLogicTest {
Recurring recurring =
persistResource(
new BillingEvent.Recurring.Builder()
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.setRegistrarId(domain.getCreationRegistrarId())
.setEventTime(DateTime.parse("1999-01-05T00:00:00Z"))
.setFlags(ImmutableSet.of(AUTO_RENEW))
core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java
+4 -4
View File
@@ -170,7 +170,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainCreate)
.setDomainHistory(historyEntryDomainCreate)
.setRenewalPriceBehavior(renewalPriceBehavior)
.setRenewalPrice(renewalPrice)
.build();
@@ -284,7 +284,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
.setPeriodYears(renewalYears)
.setEventTime(clock.nowUtc())
.setBillingTime(clock.nowUtc().plus(Registry.get("tld").getRenewGracePeriodLength()))
.setParent(historyEntryDomainRenew)
.setDomainHistory(historyEntryDomainRenew)
.build();
assertBillingEvents(
renewBillingEvent,
@@ -297,7 +297,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setRecurrenceEndTime(clock.nowUtc())
.setParent(
.setDomainHistory(
getOnlyHistoryEntryOfType(
domain, HistoryEntry.Type.DOMAIN_CREATE, DomainHistory.class))
.build(),
@@ -310,7 +310,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainRenew)
.setDomainHistory(historyEntryDomainRenew)
.build());
// There should only be the new autorenew poll message, as the old one will have been deleted
// since it had no messages left to deliver.
core/src/test/java/google/registry/flows/domain/DomainRestoreRequestFlowTest.java
+5 -5
View File
@@ -212,7 +212,7 @@ class DomainRestoreRequestFlowTest
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainRestore)
.setDomainHistory(historyEntryDomainRestore)
.build(),
new BillingEvent.OneTime.Builder()
.setReason(Reason.RESTORE)
@@ -222,7 +222,7 @@ class DomainRestoreRequestFlowTest
.setPeriodYears(1)
.setEventTime(clock.nowUtc())
.setBillingTime(clock.nowUtc())
.setParent(historyEntryDomainRestore)
.setDomainHistory(historyEntryDomainRestore)
.build());
}
@@ -281,7 +281,7 @@ class DomainRestoreRequestFlowTest
.setRegistrarId("TheRegistrar")
.setEventTime(newExpirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainRestore)
.setDomainHistory(historyEntryDomainRestore)
.build(),
new BillingEvent.OneTime.Builder()
.setReason(Reason.RESTORE)
@@ -291,7 +291,7 @@ class DomainRestoreRequestFlowTest
.setPeriodYears(1)
.setEventTime(clock.nowUtc())
.setBillingTime(clock.nowUtc())
.setParent(historyEntryDomainRestore)
.setDomainHistory(historyEntryDomainRestore)
.build(),
new BillingEvent.OneTime.Builder()
.setReason(Reason.RENEW)
@@ -301,7 +301,7 @@ class DomainRestoreRequestFlowTest
.setPeriodYears(1)
.setEventTime(clock.nowUtc())
.setBillingTime(clock.nowUtc())
.setParent(historyEntryDomainRestore)
.setDomainHistory(historyEntryDomainRestore)
.build());
}
core/src/test/java/google/registry/flows/domain/DomainTransferApproveFlowTest.java
+5 -5
View File
@@ -265,13 +265,13 @@ class DomainTransferApproveFlowTest
.setRegistrarId("NewRegistrar")
.setCost(Money.of(USD, 11).multipliedBy(expectedYearsToCharge))
.setPeriodYears(expectedYearsToCharge)
.setParent(historyEntryTransferApproved)
.setDomainHistory(historyEntryTransferApproved)
.build();
assertBillingEventsForResource(
domain,
Streams.concat(
Arrays.stream(expectedCancellationBillingEvents)
.map(builder -> builder.setParent(historyEntryTransferApproved).build()),
.map(builder -> builder.setDomainHistory(historyEntryTransferApproved).build()),
Stream.of(
transferBillingEvent,
getLosingClientAutorenewEvent()
@@ -281,7 +281,7 @@ class DomainTransferApproveFlowTest
getGainingClientAutorenewEvent()
.asBuilder()
.setEventTime(domain.getRegistrationExpirationTime())
.setParent(historyEntryTransferApproved)
.setDomainHistory(historyEntryTransferApproved)
.build()))
.toArray(BillingEvent[]::new));
// There should be a grace period for the new transfer billing event.
@@ -308,7 +308,7 @@ class DomainTransferApproveFlowTest
domain,
Streams.concat(
Arrays.stream(expectedCancellationBillingEvents)
.map(builder -> builder.setParent(historyEntryTransferApproved).build()),
.map(builder -> builder.setDomainHistory(historyEntryTransferApproved).build()),
Stream.of(
getLosingClientAutorenewEvent()
.asBuilder()
@@ -317,7 +317,7 @@ class DomainTransferApproveFlowTest
getGainingClientAutorenewEvent()
.asBuilder()
.setEventTime(domain.getRegistrationExpirationTime())
.setParent(historyEntryTransferApproved)
.setDomainHistory(historyEntryTransferApproved)
.build()))
.toArray(BillingEvent[]::new));
// There should be no grace period.
core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java
+2 -2
View File
@@ -143,7 +143,7 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
.setRegistrarId("TheRegistrar")
.setEventTime(REGISTRATION_EXPIRATION_TIME)
.setRecurrenceEndTime(TRANSFER_EXPIRATION_TIME)
.setParent(historyEntryDomainCreate)
.setDomainHistory(historyEntryDomainCreate)
.build();
}
@@ -156,7 +156,7 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
.setRegistrarId("NewRegistrar")
.setEventTime(EXTENDED_REGISTRATION_EXPIRATION_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(
.setDomainHistory(
getOnlyHistoryEntryOfType(
domain, HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST, DomainHistory.class))
.build();
core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java
+2 -2
View File
@@ -262,7 +262,7 @@ class DomainTransferRequestFlowTest
.setRegistrarId("NewRegistrar")
.setCost(transferCost.orElse(Money.of(USD, 11)))
.setPeriodYears(1)
.setParent(historyEntryTransferRequest)
.setDomainHistory(historyEntryTransferRequest)
.build());
} else {
// Superuser transfers with no bundled renewal have no transfer billing event.
@@ -282,7 +282,7 @@ class DomainTransferRequestFlowTest
// Construct extra billing events expected by the specific test.
ImmutableSet<BillingEvent> extraBillingEvents =
Stream.of(extraExpectedBillingEvents)
.map(builder -> builder.setParent(historyEntryTransferRequest).build())
.map(builder -> builder.setDomainHistory(historyEntryTransferRequest).build())
.collect(toImmutableSet());
// Assert that the billing events we constructed above actually exist in Datastore.
ImmutableSet<BillingEvent> expectedBillingEvents =
core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java
+1 -1
View File
@@ -815,7 +815,7 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
.setCost(Money.of(USD, 19))
.setEventTime(clock.nowUtc())
.setBillingTime(clock.nowUtc())
.setParent(
.setDomainHistory(
getOnlyHistoryEntryOfType(
reloadResourceByForeignKey(), DOMAIN_UPDATE, DomainHistory.class))
.build());
core/src/test/java/google/registry/model/billing/BillingEventTest.java
+35 -45
View File
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedMap;
import com.googlecode.objectify.Key;
import google.registry.model.EntityTestCase;
import google.registry.model.billing.BillingEvent.Flag;
import google.registry.model.billing.BillingEvent.Reason;
@@ -110,7 +109,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.OneTime.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setReason(Reason.CREATE)
.setFlags(ImmutableSet.of(BillingEvent.Flag.ANCHOR_TENANT))
.setPeriodYears(2)
@@ -123,7 +122,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -132,13 +131,13 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.OneTime.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setReason(Reason.CREATE)
.setFlags(
ImmutableSet.of(
BillingEvent.Flag.ANCHOR_TENANT, BillingEvent.Flag.SYNTHETIC))
.setSyntheticCreationTime(now.plusDays(10))
.setCancellationMatchingBillingEvent(recurring.createVKey())
.setCancellationMatchingBillingEvent(recurring)
.setPeriodYears(2)
.setCost(Money.of(USD, 1))
.setEventTime(now)
@@ -148,7 +147,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Cancellation.Builder()
.setParent(domainHistory2)
.setDomainHistory(domainHistory2)
.setReason(Reason.CREATE)
.setEventTime(now.plusDays(1))
.setBillingTime(now.plusDays(5))
@@ -158,14 +157,15 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Cancellation.Builder()
.setParent(domainHistory2)
.setDomainHistory(domainHistory2)
.setReason(Reason.RENEW)
.setEventTime(now.plusDays(1))
.setBillingTime(now.plusYears(1).plusDays(45))
.setRecurringEventKey(recurring.createVKey())));
}
private <E extends BillingEvent, B extends BillingEvent.Builder<E, B>> E commonInit(B builder) {
private static <E extends BillingEvent, B extends BillingEvent.Builder<E, B>> E commonInit(
B builder) {
return builder.setRegistrarId("TheRegistrar").setTargetId("foo.tld").build();
}
@@ -207,7 +207,7 @@ public class BillingEventTest extends EntityTestCase {
oneTime
.asBuilder()
.setFlags(ImmutableSet.of(BillingEvent.Flag.SYNTHETIC))
.setCancellationMatchingBillingEvent(recurring.createVKey())
.setCancellationMatchingBillingEvent(recurring)
.build());
assertThat(thrown)
.hasMessageThat()
@@ -248,11 +248,7 @@ public class BillingEventTest extends EntityTestCase {
IllegalStateException thrown =
assertThrows(
IllegalStateException.class,
() ->
oneTime
.asBuilder()
.setCancellationMatchingBillingEvent(recurring.createVKey())
.build());
() -> oneTime.asBuilder().setCancellationMatchingBillingEvent(recurring).build());
assertThat(thrown)
.hasMessageThat()
.contains(
@@ -266,7 +262,7 @@ public class BillingEventTest extends EntityTestCase {
BillingEvent.Cancellation.forGracePeriod(
GracePeriod.forBillingEvent(GracePeriodStatus.ADD, domain.getRepoId(), oneTime),
domainHistory2.getModificationTime(),
Key.create(domainHistory2),
domainHistory2.getDomainHistoryId(),
"foo.tld");
// Set ID to be the same to ignore for the purposes of comparison.
assertThat(newCancellation.asBuilder().setId(cancellationOneTime.getId()).build())
@@ -284,7 +280,7 @@ public class BillingEventTest extends EntityTestCase {
"TheRegistrar",
recurring.createVKey()),
domainHistory2.getModificationTime(),
Key.create(domainHistory2),
domainHistory2.getDomainHistoryId(),
"foo.tld");
// Set ID to be the same to ignore for the purposes of comparison.
assertThat(newCancellation.asBuilder().setId(cancellationRecurring.getId()).build())
@@ -304,7 +300,7 @@ public class BillingEventTest extends EntityTestCase {
now.plusDays(1),
"a registrar"),
domainHistory.getModificationTime(),
Key.create(domainHistory),
domainHistory.getDomainHistoryId(),
"foo.tld"));
assertThat(thrown).hasMessageThat().contains("grace period without billing event");
}
@@ -337,12 +333,6 @@ public class BillingEventTest extends EntityTestCase {
assertThat(thrown).hasMessageThat().contains("exactly one billing event");
}
@Test
void testDeadCodeThatDeletedScrapCommandsReference() {
assertThat(recurring.getParentKey()).isEqualTo(Key.create(domainHistory));
new BillingEvent.OneTime.Builder().setParent(Key.create(domainHistory));
}
@Test
void testReasonRequiringPeriodYears_missingPeriodYears_throwsException() {
IllegalStateException thrown =
@@ -357,7 +347,7 @@ public class BillingEventTest extends EntityTestCase {
.setCost(Money.of(USD, 10))
.setRegistrarId("TheRegistrar")
.setTargetId("example.tld")
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.build());
assertThat(thrown)
.hasMessageThat()
@@ -379,7 +369,7 @@ public class BillingEventTest extends EntityTestCase {
.setCost(Money.of(USD, 10))
.setRegistrarId("TheRegistrar")
.setTargetId("example.tld")
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.build());
assertThat(thrown)
.hasMessageThat()
@@ -397,7 +387,7 @@ public class BillingEventTest extends EntityTestCase {
.setCost(Money.of(USD, 10))
.setRegistrarId("TheRegistrar")
.setTargetId("example.tld")
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.build();
}
@@ -413,7 +403,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -429,7 +419,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -456,7 +446,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -479,7 +469,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -506,7 +496,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -529,7 +519,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -557,7 +547,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -585,7 +575,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -616,7 +606,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -648,7 +638,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -680,7 +670,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -711,7 +701,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -743,7 +733,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -775,7 +765,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -792,7 +782,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -808,7 +798,7 @@ public class BillingEventTest extends EntityTestCase {
persistResource(
commonInit(
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -826,7 +816,7 @@ public class BillingEventTest extends EntityTestCase {
IllegalArgumentException.class,
() ->
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -847,7 +837,7 @@ public class BillingEventTest extends EntityTestCase {
IllegalArgumentException.class,
() ->
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
@@ -869,7 +859,7 @@ public class BillingEventTest extends EntityTestCase {
IllegalArgumentException.class,
() ->
new BillingEvent.Recurring.Builder()
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
core/src/test/java/google/registry/model/common/ClassPathManagerTest.java
+6 -16
View File
@@ -17,10 +17,6 @@ package google.registry.model.common;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import google.registry.model.billing.BillingEvent.Cancellation;
import google.registry.model.billing.BillingEvent.Modification;
import google.registry.model.billing.BillingEvent.OneTime;
import google.registry.model.billing.BillingEvent.Recurring;
import google.registry.model.contact.ContactResource;
import google.registry.model.domain.DomainBase;
import google.registry.model.domain.DomainHistory;
@@ -44,7 +40,7 @@ import org.junit.jupiter.api.Test;
public class ClassPathManagerTest {
@Test
void getClass_classInClassRegistry_returnsClass() throws ClassNotFoundException {
/**
/*
* Class names are used in stringified vkeys, which can be present in task queues. Class name is
* required to create a vkey. Changing these names could break task queue entries that are
* present during a rollout. If you want to change the names of any of the classses supported in
@@ -55,15 +51,11 @@ public class ClassPathManagerTest {
*/
assertThat(ClassPathManager.getClass("ForeignKeyContactIndex"))
.isEqualTo(ForeignKeyContactIndex.class);
assertThat(ClassPathManager.getClass("Modification")).isEqualTo(Modification.class);
assertThat(ClassPathManager.getClass("AllocationToken")).isEqualTo(AllocationToken.class);
assertThat(ClassPathManager.getClass("OneTime")).isEqualTo(OneTime.class);
assertThat(ClassPathManager.getClass("RdeRevision")).isEqualTo(RdeRevision.class);
assertThat(ClassPathManager.getClass("HostResource")).isEqualTo(HostResource.class);
assertThat(ClassPathManager.getClass("Recurring")).isEqualTo(Recurring.class);
assertThat(ClassPathManager.getClass("Registrar")).isEqualTo(Registrar.class);
assertThat(ClassPathManager.getClass("ContactResource")).isEqualTo(ContactResource.class);
assertThat(ClassPathManager.getClass("Cancellation")).isEqualTo(Cancellation.class);
assertThat(ClassPathManager.getClass("GaeUserIdConverter")).isEqualTo(GaeUserIdConverter.class);
assertThat(ClassPathManager.getClass("EppResourceIndexBucket"))
.isEqualTo(EppResourceIndexBucket.class);
@@ -85,7 +77,7 @@ public class ClassPathManagerTest {
IllegalArgumentException thrown =
assertThrows(
IllegalArgumentException.class, () -> ClassPathManager.getClass("DomainHistory"));
assertThat(thrown).hasMessageThat().contains("Class not found in class registry");
assertThat(thrown).hasMessageThat().contains("Class DomainHistory not found in class registry");
}
@Test
@@ -94,12 +86,14 @@ public class ClassPathManagerTest {
assertThrows(
IllegalArgumentException.class,
() -> ClassPathManager.getClassName(DomainHistory.class));
assertThat(thrown).hasMessageThat().contains("Class not found in class name registry");
assertThat(thrown)
.hasMessageThat()
.contains("Class DomainHistory not found in class name registry");
}
@Test
void getClassName() {
/**
/*
* Class names are used in stringified vkeys, which can be present in task queues. Class name is
* required to create a vkey. Changing these names could break task queue entries that are
* present during a rollout. If you want to change the names of any of the classses supported in
@@ -110,15 +104,11 @@ public class ClassPathManagerTest {
*/
assertThat(ClassPathManager.getClassName(ForeignKeyContactIndex.class))
.isEqualTo("ForeignKeyContactIndex");
assertThat(ClassPathManager.getClassName(Modification.class)).isEqualTo("Modification");
assertThat(ClassPathManager.getClassName(AllocationToken.class)).isEqualTo("AllocationToken");
assertThat(ClassPathManager.getClassName(OneTime.class)).isEqualTo("OneTime");
assertThat(ClassPathManager.getClassName(RdeRevision.class)).isEqualTo("RdeRevision");
assertThat(ClassPathManager.getClassName(HostResource.class)).isEqualTo("HostResource");
assertThat(ClassPathManager.getClassName(Recurring.class)).isEqualTo("Recurring");
assertThat(ClassPathManager.getClassName(Registrar.class)).isEqualTo("Registrar");
assertThat(ClassPathManager.getClassName(ContactResource.class)).isEqualTo("ContactResource");
assertThat(ClassPathManager.getClassName(Cancellation.class)).isEqualTo("Cancellation");
assertThat(ClassPathManager.getClassName(GaeUserIdConverter.class))
.isEqualTo("GaeUserIdConverter");
assertThat(ClassPathManager.getClassName(EppResourceIndexBucket.class))
core/src/test/java/google/registry/model/domain/DomainBaseSqlTest.java
+6 -12
View File
@@ -36,6 +36,7 @@ import com.googlecode.objectify.Key;
import google.registry.model.billing.BillingEvent;
import google.registry.model.billing.BillingEvent.Flag;
import google.registry.model.billing.BillingEvent.Reason;
import google.registry.model.billing.BillingEvent.Recurring;
import google.registry.model.common.EntityGroupRoot;
import google.registry.model.contact.ContactResource;
import google.registry.model.domain.DesignatedContact.Type;
@@ -409,11 +410,9 @@ public class DomainBaseSqlTest {
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example.com")
.setRegistrarId("registrar1")
.setDomainRepoId("4-COM")
.setDomainHistoryRevisionId(1L)
.setEventTime(DateTime.now(UTC).plusYears(1))
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build();
PollMessage.Autorenew autorenewPollMessage =
new PollMessage.Autorenew.Builder()
@@ -436,11 +435,10 @@ public class DomainBaseSqlTest {
.setReason(Reason.SERVER_STATUS)
.setTargetId("example.com")
.setRegistrarId("registrar1")
.setDomainRepoId("4-COM")
.setBillingTime(DateTime.now(UTC))
.setCost(Money.of(USD, 100))
.setEventTime(DateTime.now(UTC).plusYears(1))
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build();
DomainTransferData transferData =
new DomainTransferData.Builder()
@@ -536,11 +534,9 @@ public class DomainBaseSqlTest {
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example.com")
.setRegistrarId("registrar1")
.setDomainRepoId("4-COM")
.setDomainHistoryRevisionId(1L)
.setEventTime(DateTime.now(UTC).plusYears(1))
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build();
PollMessage.Autorenew autorenewPollMessage =
new PollMessage.Autorenew.Builder()
@@ -563,11 +559,10 @@ public class DomainBaseSqlTest {
.setReason(Reason.SERVER_STATUS)
.setTargetId("example.com")
.setRegistrarId("registrar1")
.setDomainRepoId("4-COM")
.setBillingTime(DateTime.now(UTC))
.setCost(Money.of(USD, 100))
.setEventTime(DateTime.now(UTC).plusYears(1))
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build();
DomainTransferData transferData =
createPendingTransferData(
@@ -599,8 +594,7 @@ public class DomainBaseSqlTest {
domain =
domain
.asBuilder()
.setAutorenewBillingEvent(
createLegacyVKey(BillingEvent.Recurring.class, billEvent.getId()))
.setAutorenewBillingEvent(Recurring.createVKey(billEvent.getId()))
.setAutorenewPollMessage(
createLegacyVKey(PollMessage.Autorenew.class, autorenewPollMessage.getId()),
autorenewPollMessage.getHistoryRevisionId())
core/src/test/java/google/registry/model/domain/DomainBaseTest.java
+5 -9
View File
@@ -106,7 +106,7 @@ public class DomainBaseTest {
domainHistory =
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(domain.createVKey().getOfyKey().getName())
.setDomainRepoId(domain.getRepoId())
.setModificationTime(fakeClock.nowUtc())
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setRegistrarId("TheRegistrar")
@@ -118,11 +118,10 @@ public class DomainBaseTest {
.setReason(Reason.SERVER_STATUS)
.setTargetId(domain.getDomainName())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setDomainRepoId(domain.getRepoId())
.setBillingTime(DateTime.now(UTC))
.setCost(Money.of(USD, 100))
.setEventTime(DateTime.now(UTC).plusYears(1))
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.build())
.createVKey();
DomainHistory historyEntry =
@@ -145,11 +144,10 @@ public class DomainBaseTest {
.setReason(Reason.SERVER_STATUS)
.setTargetId("example.com")
.setRegistrarId("registrar1")
.setDomainRepoId("4-COM")
.setBillingTime(DateTime.now(UTC))
.setCost(Money.of(USD, 100))
.setEventTime(DateTime.now(UTC).plusYears(1))
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build();
oneTimeBillKey = oneTimeBill.createVKey();
BillingEvent.Recurring recurringBill =
@@ -159,11 +157,9 @@ public class DomainBaseTest {
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(domain.getDomainName())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setDomainRepoId(domain.getRepoId())
.setDomainHistoryRevisionId(historyEntry.getId())
.setEventTime(DateTime.now(UTC).plusYears(1))
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build();
insertInDb(historyEntry, oneTimeBill, recurringBill);
recurringBillKey = recurringBill.createVKey();
@@ -427,7 +423,7 @@ public class DomainBaseTest {
.plus(Registry.get("com").getTransferGracePeriodLength()))
.setCost(Money.of(USD, 11))
.setPeriodYears(1)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build());
domain =
domain
core/src/test/java/google/registry/model/domain/GracePeriodTest.java
+3 -12
View File
@@ -18,12 +18,11 @@ import static com.google.common.truth.Truth.assertThat;
import static org.joda.time.DateTimeZone.UTC;
import static org.junit.jupiter.api.Assertions.assertThrows;
import com.googlecode.objectify.Key;
import google.registry.model.billing.BillingEvent;
import google.registry.model.billing.BillingEvent.Reason;
import google.registry.model.billing.BillingEvent.Recurring;
import google.registry.model.domain.DomainHistory.DomainHistoryId;
import google.registry.model.domain.rgp.GracePeriodStatus;
import google.registry.model.reporting.HistoryEntry;
import google.registry.persistence.VKey;
import google.registry.testing.AppEngineExtension;
import org.joda.money.CurrencyUnit;
@@ -54,20 +53,12 @@ public class GracePeriodTest {
.setBillingTime(now.plusDays(1))
.setRegistrarId("TheRegistrar")
.setCost(Money.of(CurrencyUnit.USD, 42))
.setParent(
Key.create(Key.create(DomainBase.class, "domain"), DomainHistory.class, 12345))
.setDomainHistoryId(new DomainHistoryId("domain", 12345))
.setReason(Reason.CREATE)
.setPeriodYears(1)
.setTargetId("foo.google")
.build();
recurringKey =
VKey.create(
Recurring.class,
12345L,
Key.create(
Key.create(Key.create(DomainBase.class, "1-TEST"), HistoryEntry.class, 343L),
Recurring.class,
12345L));
recurringKey = Recurring.createVKey(12345L);
}
@Test
core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java
+3 -3
View File
@@ -60,7 +60,7 @@ public final class Spec11ThreatMatchTest extends EntityTestCase {
String domainRepoId = "4-TLD";
createTld("tld");
/** Create a domain for the purpose of testing a foreign key reference in the Threat table. */
// Create a domain for the purpose of testing a foreign key reference in the Threat table.
domain =
new DomainBase()
.asBuilder()
@@ -73,7 +73,7 @@ public final class Spec11ThreatMatchTest extends EntityTestCase {
.setContacts(ImmutableSet.of())
.build();
/** Create a contact for the purpose of testing a foreign key reference in the Domain table. */
// Create a contact for the purpose of testing a foreign key reference in the Domain table.
registrantContact =
new ContactResource.Builder()
.setRepoId("contact_id")
@@ -82,7 +82,7 @@ public final class Spec11ThreatMatchTest extends EntityTestCase {
.setPersistedCurrentSponsorRegistrarId(REGISTRAR_ID)
.build();
/** Create a host for the purpose of testing a foreign key reference in the Domain table. */
// Create a host for the purpose of testing a foreign key reference in the Domain table. */
host =
new HostResource.Builder()
.setRepoId("host")
core/src/test/java/google/registry/model/transfer/TransferDataTest.java
+6 -15
View File
@@ -20,6 +20,9 @@ import static org.joda.time.DateTimeZone.UTC;
import com.google.common.collect.ImmutableSet;
import com.googlecode.objectify.Key;
import google.registry.model.billing.BillingEvent;
import google.registry.model.billing.BillingEvent.Cancellation;
import google.registry.model.billing.BillingEvent.OneTime;
import google.registry.model.billing.BillingEvent.Recurring;
import google.registry.model.domain.DomainBase;
import google.registry.model.domain.Period;
import google.registry.model.eppcommon.Trid;
@@ -50,21 +53,9 @@ public class TransferDataTest {
void beforeEach() {
Key<HistoryEntry> historyEntryKey =
Key.create(Key.create(DomainBase.class, "4-TLD"), HistoryEntry.class, 1356L);
transferBillingEventKey =
VKey.create(
BillingEvent.OneTime.class,
12345L,
Key.create(historyEntryKey, BillingEvent.OneTime.class, 12345L));
otherServerApproveBillingEventKey =
VKey.create(
BillingEvent.Cancellation.class,
2468L,
Key.create(historyEntryKey, BillingEvent.Cancellation.class, 2468L));
recurringBillingEventKey =
VKey.create(
BillingEvent.Recurring.class,
13579L,
Key.create(historyEntryKey, BillingEvent.Recurring.class, 13579L));
transferBillingEventKey = OneTime.createVKey(12345L);
otherServerApproveBillingEventKey = Cancellation.createVKey(2468L);
recurringBillingEventKey = Recurring.createVKey(13579L);
autorenewPollMessageKey =
VKey.create(
PollMessage.Autorenew.class,
core/src/test/java/google/registry/model/translators/VKeyTranslatorFactoryTest.java
+6 -7
View File
@@ -19,9 +19,10 @@ import static google.registry.testing.DatabaseHelper.newDomainBase;
import static google.registry.testing.DatabaseHelper.persistActiveContact;
import com.googlecode.objectify.Key;
import google.registry.model.billing.BillingEvent;
import google.registry.model.common.ClassPathManager;
import google.registry.model.domain.DomainBase;
import google.registry.model.domain.DomainHistory;
import google.registry.model.domain.DomainHistory.DomainHistoryId;
import google.registry.model.reporting.HistoryEntry;
import google.registry.persistence.VKey;
import google.registry.testing.AppEngineExtension;
@@ -60,14 +61,12 @@ public class VKeyTranslatorFactoryTest {
void testEntityWithAncestor() {
Key<DomainBase> domainKey = Key.create(DomainBase.class, "ROID-1");
Key<HistoryEntry> historyEntryKey = Key.create(domainKey, HistoryEntry.class, 10L);
Key<BillingEvent.OneTime> oneTimeKey =
Key.create(historyEntryKey, BillingEvent.OneTime.class, 200L);
VKey<BillingEvent.OneTime> vkey = VKeyTranslatorFactory.createVKey(oneTimeKey);
VKey<HistoryEntry> vkey = VKeyTranslatorFactory.createVKey(historyEntryKey);
assertThat(vkey.getKind()).isEqualTo(BillingEvent.OneTime.class);
assertThat(vkey.getOfyKey()).isEqualTo(oneTimeKey);
assertThat(vkey.getSqlKey()).isEqualTo(200L);
assertThat(vkey.getKind()).isEqualTo(DomainHistory.class);
assertThat(vkey.getOfyKey()).isEqualTo(historyEntryKey);
assertThat(vkey.getSqlKey()).isEqualTo(new DomainHistoryId("ROID-1", 10L));
}
@Test
core/src/test/java/google/registry/persistence/BillingVKeyTest.java
-112
View File
@@ -1,112 +0,0 @@
// Copyright 2020 The Nomulus Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package google.registry.persistence;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import com.googlecode.objectify.Key;
import com.googlecode.objectify.annotation.Entity;
import com.googlecode.objectify.annotation.Id;
import com.googlecode.objectify.annotation.Parent;
import google.registry.model.ImmutableObject;
import google.registry.model.billing.BillingEvent;
import google.registry.model.common.EntityGroupRoot;
import google.registry.model.domain.DomainBase;
import google.registry.model.reporting.HistoryEntry;
import google.registry.persistence.BillingVKey.BillingEventVKey;
import google.registry.persistence.BillingVKey.BillingRecurrenceVKey;
import google.registry.testing.AppEngineExtension;
import javax.persistence.Transient;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
/** Unit test for {@link BillingVKey}. */
class BillingVKeyTest {
@RegisterExtension
final AppEngineExtension appEngine =
AppEngineExtension.builder()
.withCloudSql()
.withOfyTestEntities(BillingVKeyTestEntity.class)
.withJpaUnitTestEntities(BillingVKeyTestEntity.class)
.build();
@Test
void testRestoreSymmetricVKey() {
Key<HistoryEntry> domainHistoryKey =
Key.create(Key.create(DomainBase.class, "domainRepoId"), HistoryEntry.class, 10L);
Key<BillingEvent.OneTime> oneTimeOfyKey =
Key.create(domainHistoryKey, BillingEvent.OneTime.class, 100L);
VKey<BillingEvent.OneTime> oneTimeVKey =
VKey.create(BillingEvent.OneTime.class, 100L, oneTimeOfyKey);
Key<BillingEvent.Recurring> recurringOfyKey =
Key.create(domainHistoryKey, BillingEvent.Recurring.class, 200L);
VKey<BillingEvent.Recurring> recurringVKey =
VKey.create(BillingEvent.Recurring.class, 200L, recurringOfyKey);
BillingVKeyTestEntity original = new BillingVKeyTestEntity(oneTimeVKey, recurringVKey);
tm().transact(() -> tm().insert(original));
BillingVKeyTestEntity persisted = tm().transact(() -> tm().loadByKey(original.createVKey()));
assertThat(persisted).isEqualTo(original);
assertThat(persisted.getBillingEventVKey()).isEqualTo(oneTimeVKey);
assertThat(persisted.getBillingRecurrenceVKey()).isEqualTo(recurringVKey);
}
@Test
void testHandleNullVKeyCorrectly() {
BillingVKeyTestEntity original = new BillingVKeyTestEntity(null, null);
tm().transact(() -> tm().insert(original));
BillingVKeyTestEntity persisted = tm().transact(() -> tm().loadByKey(original.createVKey()));
assertThat(persisted).isEqualTo(original);
}
@Entity
@javax.persistence.Entity
private static class BillingVKeyTestEntity extends ImmutableObject {
@Transient @Parent Key<EntityGroupRoot> parent = getCrossTldKey();
@Id @javax.persistence.Id String id = "id";
BillingEventVKey billingEventVKey;
BillingRecurrenceVKey billingRecurrenceVKey;
BillingVKeyTestEntity() {}
BillingVKeyTestEntity(
VKey<BillingEvent.OneTime> onetime, VKey<BillingEvent.Recurring> recurring) {
this.billingEventVKey = BillingEventVKey.create(onetime);
this.billingRecurrenceVKey = BillingRecurrenceVKey.create(recurring);
}
VKey<BillingEvent.OneTime> getBillingEventVKey() {
return billingEventVKey.createVKey();
}
VKey<BillingEvent.Recurring> getBillingRecurrenceVKey() {
return billingRecurrenceVKey.createVKey();
}
@Override
public VKey<BillingVKeyTestEntity> createVKey() {
return VKey.createSql(BillingVKeyTestEntity.class, id);
}
}
}
core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java
+4 -4
View File
@@ -234,7 +234,7 @@ public class DomainBaseToXjcConverterTest {
.setPeriodYears(2)
.setEventTime(DateTime.parse("1910-01-01T00:00:00Z"))
.setBillingTime(DateTime.parse("1910-01-01T00:00:00Z"))
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.build());
domain =
domain
@@ -295,7 +295,7 @@ public class DomainBaseToXjcConverterTest {
.setPeriodYears(2)
.setEventTime(DateTime.parse("1920-01-01T00:00:00Z"))
.setBillingTime(DateTime.parse("1920-01-01T00:00:00Z"))
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.build())),
GracePeriod.create(
GracePeriodStatus.TRANSFER,
@@ -319,7 +319,7 @@ public class DomainBaseToXjcConverterTest {
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.build())
.createVKey())
.setAutorenewPollMessage(
@@ -349,7 +349,7 @@ public class DomainBaseToXjcConverterTest {
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(domainHistory)
.setDomainHistory(domainHistory)
.build())
.createVKey())
.setServerApproveAutorenewPollMessage(
core/src/test/java/google/registry/rde/RdeFixtures.java
+4 -4
View File
@@ -84,7 +84,7 @@ final class RdeFixtures {
.setPeriodYears(2)
.setEventTime(DateTime.parse("1990-01-01T00:00:00Z"))
.setBillingTime(DateTime.parse("1990-01-01T00:00:00Z"))
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build());
domain =
domain
@@ -138,7 +138,7 @@ final class RdeFixtures {
.setPeriodYears(2)
.setEventTime(DateTime.parse("1992-01-01T00:00:00Z"))
.setBillingTime(DateTime.parse("1992-01-01T00:00:00Z"))
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build())),
GracePeriod.create(
GracePeriodStatus.TRANSFER,
@@ -162,7 +162,7 @@ final class RdeFixtures {
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build())
.createVKey())
.setAutorenewPollMessage(
@@ -192,7 +192,7 @@ final class RdeFixtures {
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build())
.createVKey())
.setServerApproveAutorenewPollMessage(
core/src/test/java/google/registry/testing/DatabaseHelper.java
+4 -4
View File
@@ -349,7 +349,7 @@ public class DatabaseHelper {
Recurring recurring =
persistResource(
new BillingEvent.Recurring.Builder()
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.setRenewalPrice(renewalPrice)
.setRenewalPriceBehavior(renewalPriceBehavior)
.setRegistrarId(domain.getCreationRegistrarId())
@@ -557,7 +557,7 @@ public class DatabaseHelper {
.setRegistrarId("NewRegistrar")
.setPeriodYears(1)
.setCost(getDomainRenewCost(domain.getDomainName(), costLookupTime, 1))
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build();
}
@@ -654,7 +654,7 @@ public class DatabaseHelper {
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainCreate)
.setDomainHistory(historyEntryDomainCreate)
.build());
PollMessage.Autorenew autorenewPollMessage =
persistResource(
@@ -701,7 +701,7 @@ public class DatabaseHelper {
.setRegistrarId("NewRegistrar")
.setEventTime(extendedRegistrationExpirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainTransfer)
.setDomainHistory(historyEntryDomainTransfer)
.build());
PollMessage.Autorenew gainingClientAutorenewPollMessage =
persistResource(
core/src/test/java/google/registry/tools/DomainLockUtilsTest.java
+1 -1
View File
@@ -575,7 +575,7 @@ public final class DomainLockUtilsTest {
.setCost(Registry.get(domain.getTld()).getRegistryLockOrUnlockBillingCost())
.setEventTime(clock.nowUtc())
.setBillingTime(clock.nowUtc())
.setParent(entry)
.setDomainHistory(entry)
.build())
.collect(Collectors.toSet());
DatabaseHelper.assertBillingEvents(expectedEvents);
core/src/test/java/google/registry/tools/EppLifecycleToolsTest.java
+2 -1
View File
@@ -150,7 +150,8 @@ class EppLifecycleToolsTest extends EppTestCase {
.setPeriodYears(4)
.setEventTime(DateTime.parse("2000-06-07T00:00:00Z"))
.setBillingTime(DateTime.parse("2000-06-12T00:00:00Z"))
.setParent(getOnlyHistoryEntryOfType(domain, Type.DOMAIN_RENEW, DomainHistory.class))
.setDomainHistory(
getOnlyHistoryEntryOfType(domain, Type.DOMAIN_RENEW, DomainHistory.class))
.build();
assertBillingEventsForResource(
core/src/test/java/google/registry/tools/UnrenewDomainCommandTest.java
+1 -1
View File
@@ -134,7 +134,7 @@ public class UnrenewDomainCommandTest extends CommandTestCase<UnrenewDomainComma
assertBillingEventsEqual(
loadByKey(domain.getAutorenewBillingEvent()),
new BillingEvent.Recurring.Builder()
.setParent(synthetic)
.setDomainHistory(synthetic)
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(domain.getDomainName())
core/src/test/java/google/registry/tools/UpdateDomainCommandTest.java
+1 -1
View File
@@ -345,7 +345,7 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
.setRegistrarId("NewRegistrar")
.setEventTime(fakeClock.nowUtc().minusDays(5))
.setRecurrenceEndTime(END_OF_TIME)
.setParent(createHistoryEntry)
.setDomainHistory(createHistoryEntry)
.build());
persistResource(
domain
core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java
+1 -1
View File
@@ -320,7 +320,7 @@ final class RegistryLockVerifyActionTest {
.setCost(Registry.get(domain.getTld()).getRegistryLockOrUnlockBillingCost())
.setEventTime(fakeClock.nowUtc())
.setBillingTime(fakeClock.nowUtc())
.setParent(historyEntry)
.setDomainHistory(historyEntry)
.build());
}
core/src/test/resources/google/registry/model/schema.txt
-97
View File
@@ -1,78 +1,3 @@
class google.registry.model.billing.BillingEvent$Cancellation {
@Id java.lang.Long id;
@Parent com.googlecode.objectify.Key<google.registry.model.domain.DomainHistory> parent;
google.registry.model.billing.BillingEvent$Reason reason;
google.registry.persistence.BillingVKey$BillingEventVKey refOneTime;
google.registry.persistence.BillingVKey$BillingRecurrenceVKey refRecurring;
java.lang.String clientId;
java.lang.String targetId;
java.util.Set<google.registry.model.billing.BillingEvent$Flag> flags;
org.joda.time.DateTime billingTime;
org.joda.time.DateTime eventTime;
}
enum google.registry.model.billing.BillingEvent$Flag {
ALLOCATION;
ANCHOR_TENANT;
AUTO_RENEW;
LANDRUSH;
RESERVED;
SUNRISE;
SYNTHETIC;
}
class google.registry.model.billing.BillingEvent$Modification {
@Id java.lang.Long id;
@Parent com.googlecode.objectify.Key<google.registry.model.domain.DomainHistory> parent;
com.googlecode.objectify.Key<google.registry.model.billing.BillingEvent$OneTime> eventRef;
google.registry.model.billing.BillingEvent$Reason reason;
java.lang.String clientId;
java.lang.String description;
java.lang.String targetId;
java.util.Set<google.registry.model.billing.BillingEvent$Flag> flags;
org.joda.money.Money cost;
org.joda.time.DateTime eventTime;
}
class google.registry.model.billing.BillingEvent$OneTime {
@Id java.lang.Long id;
@Parent com.googlecode.objectify.Key<google.registry.model.domain.DomainHistory> parent;
google.registry.model.billing.BillingEvent$Reason reason;
google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$Recurring> cancellationMatchingBillingEvent;
google.registry.persistence.VKey<google.registry.model.domain.token.AllocationToken> allocationToken;
java.lang.Integer periodYears;
java.lang.String clientId;
java.lang.String targetId;
java.util.Set<google.registry.model.billing.BillingEvent$Flag> flags;
org.joda.money.Money cost;
org.joda.time.DateTime billingTime;
org.joda.time.DateTime eventTime;
org.joda.time.DateTime syntheticCreationTime;
}
enum google.registry.model.billing.BillingEvent$Reason {
CREATE;
ERROR;
FEE_EARLY_ACCESS;
RENEW;
RESTORE;
SERVER_STATUS;
TRANSFER;
}
class google.registry.model.billing.BillingEvent$Recurring {
@Id java.lang.Long id;
@Parent com.googlecode.objectify.Key<google.registry.model.domain.DomainHistory> parent;
google.registry.model.billing.BillingEvent$Reason reason;
google.registry.model.billing.BillingEvent$RenewalPriceBehavior renewalPriceBehavior;
google.registry.model.common.TimeOfYear recurrenceTimeOfYear;
java.lang.String clientId;
java.lang.String targetId;
java.util.Set<google.registry.model.billing.BillingEvent$Flag> flags;
org.joda.money.Money renewalPrice;
org.joda.time.DateTime eventTime;
org.joda.time.DateTime recurrenceEndTime;
}
enum google.registry.model.billing.BillingEvent$RenewalPriceBehavior {
DEFAULT;
NONPREMIUM;
SPECIFIED;
}
class google.registry.model.common.EntityGroupRoot {
@Id java.lang.String id;
}
@@ -80,9 +5,6 @@ class google.registry.model.common.GaeUserIdConverter {
@Id long id;
com.google.appengine.api.users.User user;
}
class google.registry.model.common.TimeOfYear {
java.lang.String timeString;
}
class google.registry.model.contact.ContactAddress {
java.lang.String city;
java.lang.String countryCode;
@@ -183,7 +105,6 @@ class google.registry.model.domain.DomainBase {
google.registry.model.domain.DomainAuthInfo authInfo;
google.registry.model.domain.launch.LaunchNotice launchNotice;
google.registry.model.transfer.DomainTransferData transferData;
google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$Recurring> autorenewBillingEvent;
google.registry.persistence.VKey<google.registry.model.contact.ContactResource> adminContact;
google.registry.persistence.VKey<google.registry.model.contact.ContactResource> billingContact;
google.registry.persistence.VKey<google.registry.model.contact.ContactResource> registrantContact;
@@ -213,7 +134,6 @@ class google.registry.model.domain.DomainContent {
google.registry.model.domain.DomainAuthInfo authInfo;
google.registry.model.domain.launch.LaunchNotice launchNotice;
google.registry.model.transfer.DomainTransferData transferData;
google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$Recurring> autorenewBillingEvent;
google.registry.persistence.VKey<google.registry.model.contact.ContactResource> adminContact;
google.registry.persistence.VKey<google.registry.model.contact.ContactResource> billingContact;
google.registry.persistence.VKey<google.registry.model.contact.ContactResource> registrantContact;
@@ -259,16 +179,12 @@ class google.registry.model.domain.DomainHistory {
}
class google.registry.model.domain.GracePeriod {
google.registry.model.domain.rgp.GracePeriodStatus type;
google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$OneTime> billingEventOneTime;
google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$Recurring> billingEventRecurring;
java.lang.String clientId;
long gracePeriodId;
org.joda.time.DateTime expirationTime;
}
class google.registry.model.domain.GracePeriod$GracePeriodHistory {
google.registry.model.domain.rgp.GracePeriodStatus type;
google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$OneTime> billingEventOneTime;
google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$Recurring> billingEventRecurring;
java.lang.Long domainHistoryRevisionId;
java.lang.Long gracePeriodHistoryRevisionId;
java.lang.String clientId;
@@ -319,7 +235,6 @@ class google.registry.model.domain.token.AllocationToken {
@Id java.lang.String token;
boolean discountPremiums;
double discountFraction;
google.registry.model.billing.BillingEvent$RenewalPriceBehavior renewalPriceBehavior;
google.registry.model.common.TimedTransitionProperty<google.registry.model.domain.token.AllocationToken$TokenStatus> tokenStatusTransitions;
google.registry.model.domain.token.AllocationToken$RegistrationBehavior registrationBehavior;
google.registry.model.domain.token.AllocationToken$TokenType tokenType;
@@ -626,8 +541,6 @@ class google.registry.model.transfer.DomainTransferData {
google.registry.model.domain.Period transferPeriod;
google.registry.model.eppcommon.Trid transferRequestTrid;
google.registry.model.transfer.TransferStatus transferStatus;
google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$OneTime> serverApproveBillingEvent;
google.registry.persistence.VKey<google.registry.model.billing.BillingEvent$Recurring> serverApproveAutorenewEvent;
google.registry.persistence.VKey<google.registry.model.poll.PollMessage$Autorenew> serverApproveAutorenewPollMessage;
java.lang.String gainingClientId;
java.lang.String losingClientId;
@@ -643,16 +556,6 @@ enum google.registry.model.transfer.TransferStatus {
SERVER_APPROVED;
SERVER_CANCELLED;
}
class google.registry.persistence.BillingVKey$BillingEventVKey {
java.lang.Long billingId;
java.lang.Long historyRevisionId;
java.lang.String repoId;
}
class google.registry.persistence.BillingVKey$BillingRecurrenceVKey {
java.lang.Long billingId;
java.lang.Long historyRevisionId;
java.lang.String repoId;
}
class google.registry.persistence.DomainHistoryVKey {
java.lang.Long historyRevisionId;
java.lang.String repoId;