mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-02-07 21:41:03 +00:00
Code Issues Releases Wiki Activity

Fix missing autorenew onetime billing events (#1854)

Browse Source 
This PR fixes the issue where the onetime billing event for an autorenew
is not correctly created if the recurrence of the autorenew is closed
during the autorenew grace period, such as the case if a manual renew
happens during the same grace period.

The detailed analysis of the issue is captured in b/258822640. Note that
this is a quick and dirty fix to make ongoing billing event expanse work
correctly in the future. It does not fix the missing events in the past,
nor can it be used to reconstruct the missing ones (by providing a
different cursor time), due to timeout when triggering the action from
nomulus curl.

Per Weimin, the recurrences that fits the new condition along, based on
the current cursor, would increase from 382k to 430k, a 12% increase. I
checked last nights cron job run, which starts on 22:00 EST and seemed
to finish at 22:15 EST (when the last log for this request was
recorded), so it should definitely still finish in time for the nightly
runs with the new condition.
This commit is contained in:
Lai Jiang
2022-11-17 12:04:34 -05:00
committed by GitHub
parent 592dadd12e
commit ca213aa8d7
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
View File

@@ -455,6 +455,45 @@ public class ExpandRecurringBillingEventsActionTest {
assertCursorAt(currentTestTime);
}
@Test
void testSuccess_noEventExpanded_recurrenceEndAfterEvent_cursorTimeTooLate() throws Exception {
// This can occur when a domain is transferred/renewed/deleted during autorenew grace peroid.
recurring =
persistResource(
recurring
.asBuilder()
.setRecurrenceEndTime(recurring.getEventTime().plusDays(5))
.build());
action.cursorTimeParam = Optional.of(recurring.getRecurrenceEndTime().plusDays(46));
runAction();
// No new history entries should be generated because cursor time is more than 45 days after
// recurrence end time.
assertThat(getHistoryEntriesOfType(domain, DOMAIN_AUTORENEW)).isEmpty();
assertBillingEventsForResource(domain, recurring);
assertCursorAt(currentTestTime);
}
@Test
void testSuccess_expandSingleEvent_recurrenceEndAfterEvent() throws Exception {
// This can occur when a domain is transferred/renewed/deleted during autorenew grace peroid.
recurring =
persistResource(
recurring
.asBuilder()
.setRecurrenceEndTime(recurring.getEventTime().plusDays(5))
.build());
action.cursorTimeParam = Optional.of(recurring.getRecurrenceEndTime().plusDays(35));
runAction();
DomainHistory persistedEntry =
getOnlyHistoryEntryOfType(domain, DOMAIN_AUTORENEW, DomainHistory.class);
assertHistoryEntryMatches(
domain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"), false);
BillingEvent.OneTime expected =
defaultOneTimeBuilder().setDomainHistory(persistedEntry).build();
assertBillingEventsForResource(domain, expected, recurring);
assertCursorAt(currentTestTime);
}
@Test
void testSuccess_expandSingleEvent_dryRun() throws Exception {
persistResource(recurring);