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

Remove temporary handling of invalid billing events

Browse source 
The bad prober domain data has since been deleted, so we no longer need
to handle the case where these Keys point to entities that don't exist.

This mostly reverses []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168687701
This commit is contained in:
mcilwain 2017-09-14 07:50:54 -07:00 • committed by jianglai
parent efd7010f9d
commit d73ef66352
2 changed files with 1 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
java/google/registry/flows/domain/DomainFlowUtils.java
View file

@ -37,7 +37,6 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.DateTimeUtils.isAtOrAfter;
import static google.registry.util.DateTimeUtils.leapSafeAddYears;
import static google.registry.util.DomainNameUtils.ACE_PREFIX;
import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
import com.google.common.base.CharMatcher;
import com.google.common.base.Joiner;
@ -111,7 +110,6 @@ import google.registry.model.reporting.DomainTransactionRecord;
import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField;
import google.registry.model.reporting.HistoryEntry;
import google.registry.model.tmch.ClaimsListShard;
import google.registry.util.FormattingLogger;
import google.registry.util.Idn;
import java.math.BigDecimal;
import java.util.HashSet;
@ -127,8 +125,6 @@ import org.joda.time.Duration;
/** Static utility functions for domain flows. */
public class DomainFlowUtils {
private static final FormattingLogger logger = getLoggerForCallerClass();
/** Map from launch phases to the equivalent tld states. */
private static final ImmutableMap<LaunchPhase, TldState> LAUNCH_PHASE_TO_TLD_STATE =
ImmutableMap.of(
@ -521,17 +517,8 @@ public class DomainFlowUtils {
}
Recurring recurring = ofy().load().key(domain.getAutorenewBillingEvent()).now();
// TODO(b/27472322): Revert handling of recurring being null once bad data is cleaned from prod.
// It shouldn't ever actually be null, and we only have some null data left because of issues
// dating back to the Registry 2.0 migration.
if (recurring == null) {
logger.warningfmt(
"Domain name %s has null autorenew billing event; ignoring. Domain key: %s.",
domain.getFullyQualifiedDomainName(), Key.create(domain));
} else {
ofy().save().entity(recurring.asBuilder().setRecurrenceEndTime(newEndTime).build());
}
}
/**
* Validates a {@link FeeQueryCommandExtensionItem} and sets the appropriate fields on a {@link

14
javatests/google/registry/flows/domain/DomainDeleteFlowTest.java
View file

@ -511,20 +511,6 @@ public class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow,
assertThat(domain.getTransferData()).isEqualTo(TransferData.EMPTY);
}
//TODO(b/27472322): Delete test handling recurring being null once bad data is cleaned from prod.
@Test
public void testSuccess_nullAutorenewBillingEvent_isIgnore() throws Exception {
setClientIdForFlow("TheRegistrar");
setUpSuccessfulTest();
ofy().deleteWithoutBackup().key(domain.getAutorenewBillingEvent()).now();
ofy().clearSessionCache();
clock.advanceOneMilli();
runFlowAssertResponse(readFile("domain_delete_response_pending.xml"));
// If the previous statement doesn't throw an error, then the test is successful.
assertThat(ofy().load().key(reloadResourceByForeignKey().getAutorenewBillingEvent()).now())
.isNull();
}
@Test
public void testSuccess_pendingTransfer() throws Exception {
setClientIdForFlow("TheRegistrar");