mirror of
https://github.com/google/nomulus.git
synced 2025-05-21 03:39:36 +02:00
Handle pending transfers on domain imports from RDE deposits
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=148496597
This commit is contained in:
Wolfgang Meyers
Ben McIlwain
parent
3ca9bb6aeb
commit
9f90597691
14 changed files with 752 additions and 125 deletions
|
|
@ -17,9 +17,6 @@ package google.registry.rde.imports;
|
|||
import static com.google.common.base.Preconditions.checkArgument;
|
||||
import static com.google.common.base.Preconditions.checkState;
|
||||
import static com.google.common.collect.Iterables.transform;
|
||||
import static google.registry.model.ofy.ObjectifyService.ofy;
|
||||
import static google.registry.rde.imports.RdeImportUtils.generateTridForImport;
|
||||
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
||||
import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
|
||||
import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
|
||||
|
||||
|
|
@ -29,10 +26,7 @@ import com.google.common.collect.ImmutableSet;
|
|||
import com.google.common.collect.Iterables;
|
||||
import com.google.common.net.InternetDomainName;
|
||||
import com.googlecode.objectify.Key;
|
||||
import google.registry.model.ImmutableObject;
|
||||
import google.registry.model.billing.BillingEvent;
|
||||
import google.registry.model.billing.BillingEvent.Flag;
|
||||
import google.registry.model.billing.BillingEvent.Reason;
|
||||
import google.registry.model.contact.ContactResource;
|
||||
import google.registry.model.domain.DesignatedContact;
|
||||
import google.registry.model.domain.DomainAuthInfo;
|
||||
|
|
@ -47,7 +41,6 @@ import google.registry.model.index.ForeignKeyIndex;
|
|||
import google.registry.model.poll.PollMessage;
|
||||
import google.registry.model.registry.Registries;
|
||||
import google.registry.model.registry.Registry;
|
||||
import google.registry.model.reporting.HistoryEntry;
|
||||
import google.registry.model.transfer.TransferData;
|
||||
import google.registry.model.transfer.TransferStatus;
|
||||
import google.registry.util.NonFinalForTesting;
|
||||
|
|
@ -67,6 +60,7 @@ import java.security.ProviderException;
|
|||
import java.security.SecureRandom;
|
||||
import java.util.Random;
|
||||
import org.joda.time.DateTime;
|
||||
import org.joda.time.Years;
|
||||
|
||||
/** Utility class that converts an {@link XjcRdeDomainElement} into a {@link DomainResource}. */
|
||||
final class XjcToDomainResourceConverter extends XjcToEppResourceConverter {
|
||||
|
|
@ -184,14 +178,10 @@ final class XjcToDomainResourceConverter extends XjcToEppResourceConverter {
|
|||
}
|
||||
|
||||
/** Converts {@link XjcRdeDomain} to {@link DomainResource}. */
|
||||
static DomainResource convertDomain(XjcRdeDomain domain) {
|
||||
// First create history entry and autorenew billing event/poll message
|
||||
// Autorenew billing event is required for creating AUTO_RENEW grace period
|
||||
HistoryEntry historyEntry = createHistoryEntry(domain);
|
||||
BillingEvent.Recurring autoRenewBillingEvent =
|
||||
createAutoRenewBillingEvent(domain, historyEntry);
|
||||
PollMessage.Autorenew pollMessage = createAutoRenewPollMessage(domain, historyEntry);
|
||||
ofy().save().<ImmutableObject>entities(historyEntry, autoRenewBillingEvent, pollMessage);
|
||||
static DomainResource convertDomain(
|
||||
XjcRdeDomain domain,
|
||||
BillingEvent.Recurring autoRenewBillingEvent,
|
||||
PollMessage.Autorenew autoRenewPollMessage) {
|
||||
GracePeriodConverter gracePeriodConverter =
|
||||
new GracePeriodConverter(domain, Key.create(autoRenewBillingEvent));
|
||||
DomainResource.Builder builder =
|
||||
|
|
@ -202,7 +192,7 @@ final class XjcToDomainResourceConverter extends XjcToEppResourceConverter {
|
|||
.setCurrentSponsorClientId(domain.getClID())
|
||||
.setCreationClientId(domain.getCrRr().getValue())
|
||||
.setCreationTime(domain.getCrDate())
|
||||
.setAutorenewPollMessage(Key.create(pollMessage))
|
||||
.setAutorenewPollMessage(Key.create(autoRenewPollMessage))
|
||||
.setAutorenewBillingEvent(Key.create(autoRenewBillingEvent))
|
||||
.setRegistrationExpirationTime(domain.getExDate())
|
||||
.setLastEppUpdateTime(domain.getUpDate())
|
||||
|
|
@ -218,7 +208,7 @@ final class XjcToDomainResourceConverter extends XjcToEppResourceConverter {
|
|||
? ImmutableSet.<DelegationSignerData>of()
|
||||
: ImmutableSet.copyOf(
|
||||
transform(domain.getSecDNS().getDsDatas(), SECDNS_CONVERTER)))
|
||||
.setTransferData(convertDomainTransferData(domain.getTrnData()))
|
||||
.setTransferData(convertDomainTransferData(domain.getTrnData(), domain.getExDate()))
|
||||
// authInfo pw must be a token between 6 and 16 characters in length
|
||||
// generate a token of 16 characters as the default authInfo pw
|
||||
.setAuthInfo(DomainAuthInfo
|
||||
|
|
@ -229,51 +219,6 @@ final class XjcToDomainResourceConverter extends XjcToEppResourceConverter {
|
|||
return builder.build();
|
||||
}
|
||||
|
||||
private static BillingEvent.Recurring createAutoRenewBillingEvent(
|
||||
XjcRdeDomain domain, HistoryEntry historyEntry) {
|
||||
final BillingEvent.Recurring billingEvent =
|
||||
new BillingEvent.Recurring.Builder()
|
||||
.setReason(Reason.RENEW)
|
||||
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
|
||||
.setTargetId(domain.getRoid())
|
||||
.setClientId(domain.getClID())
|
||||
.setEventTime(domain.getExDate())
|
||||
.setRecurrenceEndTime(END_OF_TIME)
|
||||
.setParent(historyEntry)
|
||||
.build();
|
||||
return billingEvent;
|
||||
}
|
||||
|
||||
private static PollMessage.Autorenew createAutoRenewPollMessage(
|
||||
XjcRdeDomain domain, HistoryEntry historyEntry) {
|
||||
final PollMessage.Autorenew pollMessage =
|
||||
new PollMessage.Autorenew.Builder()
|
||||
.setTargetId(domain.getRoid())
|
||||
.setClientId(domain.getClID())
|
||||
.setEventTime(domain.getExDate())
|
||||
.setMsg("Domain was auto-renewed.")
|
||||
.setParent(historyEntry)
|
||||
.build();
|
||||
return pollMessage;
|
||||
}
|
||||
|
||||
private static HistoryEntry createHistoryEntry(XjcRdeDomain domain) {
|
||||
XjcRdeDomainElement element = new XjcRdeDomainElement(domain);
|
||||
final HistoryEntry historyEntry =
|
||||
new HistoryEntry.Builder()
|
||||
.setType(HistoryEntry.Type.RDE_IMPORT)
|
||||
.setClientId(domain.getClID())
|
||||
.setTrid(generateTridForImport())
|
||||
.setModificationTime(DateTime.now())
|
||||
.setXmlBytes(getObjectXml(element))
|
||||
.setBySuperuser(true)
|
||||
.setReason("RDE Import")
|
||||
.setRequestedByRegistrar(false)
|
||||
.setParent(Key.create(null, DomainResource.class, domain.getRoid()))
|
||||
.build();
|
||||
return historyEntry;
|
||||
}
|
||||
|
||||
/** Returns {@link Key} for registrant from foreign key */
|
||||
private static Key<ContactResource> convertRegistrant(String contactId) {
|
||||
Key<ContactResource> key =
|
||||
|
|
@ -296,16 +241,34 @@ final class XjcToDomainResourceConverter extends XjcToEppResourceConverter {
|
|||
}
|
||||
|
||||
/** Converts {@link XjcRdeDomainTransferDataType} to {@link TransferData}. */
|
||||
private static TransferData convertDomainTransferData(XjcRdeDomainTransferDataType data) {
|
||||
private static TransferData convertDomainTransferData(XjcRdeDomainTransferDataType data,
|
||||
DateTime domainExpiration) {
|
||||
if (data == null) {
|
||||
return TransferData.EMPTY;
|
||||
}
|
||||
// If the transfer is pending, calculate the number of years to add to the domain expiration
|
||||
// on approval of the transfer.
|
||||
TransferStatus transferStatus = TRANSFER_STATUS_MAPPER.xmlToEnum(data.getTrStatus().value());
|
||||
// Get new expiration date
|
||||
DateTime newExpirationTime = domainExpiration;
|
||||
if (transferStatus == TransferStatus.PENDING) {
|
||||
// Default to domain expiration time plus one year if no expiration is specified
|
||||
if (data.getExDate() == null) {
|
||||
newExpirationTime = newExpirationTime.plusYears(1);
|
||||
} else {
|
||||
newExpirationTime = data.getExDate();
|
||||
}
|
||||
}
|
||||
return new TransferData.Builder()
|
||||
.setTransferStatus(TRANSFER_STATUS_MAPPER.xmlToEnum(data.getTrStatus().value()))
|
||||
.setTransferStatus(transferStatus)
|
||||
.setGainingClientId(data.getReRr().getValue())
|
||||
.setLosingClientId(data.getAcRr().getValue())
|
||||
.setTransferRequestTime(data.getReDate())
|
||||
.setPendingTransferExpirationTime(data.getAcDate())
|
||||
// This will be wrong for domains that are not in pending transfer,
|
||||
// but there isn't a reliable way to calculate it.
|
||||
.setExtendedRegistrationYears(
|
||||
Years.yearsBetween(domainExpiration, newExpirationTime).getYears())
|
||||
.build();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue