zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 00:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rethrow exceptions in ExpandRecurringBillingEventsAction

Browse source 
Also fixes bug in handling of future-dated Recurring billing events.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140048357
This commit is contained in:
ctingue 2016-11-23 10:40:14 -08:00 • committed by Ben McIlwain
parent 9a616ccd7f
commit 35d88a9f8c
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
java/google/registry/batch/ExpandRecurringBillingEventsAction.java
View file

@ -138,6 +138,11 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
return;
}
getContext().incrementCounter("Recurring billing events encountered");
// Ignore any recurring billing events that have yet to apply.
if (recurring.getEventTime().isAfter(executeTime)) {
getContext().incrementCounter("Recurring billing events ignored");
return;
}
int billingEventsSaved = 0;
try {
billingEventsSaved = ofy().transactNew(new Work<Integer>() {
@ -199,6 +204,7 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
t, "Error while expanding Recurring billing events for %s", recurring.getId());
getContext().incrementCounter("error: " + t.getClass().getSimpleName());
getContext().incrementCounter(ERROR_COUNTER);
throw t;
}
if (!isDryRun) {
getContext().incrementCounter("Saved OneTime billing events", billingEventsSaved);

13
javatests/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
View file

@ -17,6 +17,7 @@ package google.registry.batch;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.model.common.Cursor.CursorType.RECURRING_BILLING;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.testing.DatastoreHelper.assertBillingEvents;
import static google.registry.testing.DatastoreHelper.assertBillingEventsForResource;
import static google.registry.testing.DatastoreHelper.createTld;
import static google.registry.testing.DatastoreHelper.persistActiveDomain;
@ -53,6 +54,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Unit tests for {@link ExpandRecurringBillingEventsAction}. */
@RunWith(JUnit4.class)
public class ExpandRecurringBillingEventsActionTest
@ -259,7 +261,6 @@ public class ExpandRecurringBillingEventsActionTest
action.cursorTimeParam = Optional.of(START_OF_TIME);
runMapreduce();
assertBillingEventsForResource(domain, recurring);
assertCursorAt(clock.nowUtc());
}
@Test
@ -664,4 +665,14 @@ public class ExpandRecurringBillingEventsActionTest
IllegalArgumentException.class, "Cursor time must be earlier than execution time.");
runMapreduce();
}
@Test
public void testFailure_mapperException_doesNotMoveCursor() throws Exception {
saveCursor(START_OF_TIME); // Need a saved cursor to verify that it didn't move.
// Set target to a TLD that doesn't exist.
recurring = persistResource(recurring.asBuilder().setTargetId("domain.junk").build());
runMapreduce();
assertBillingEvents(recurring); // only the bogus one in datastore
assertCursorAt(START_OF_TIME); // Cursor doesn't move on a failure.
}
}