mirror of
https://github.com/google/nomulus.git
synced 2025-07-21 10:16:07 +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
|
|
@ -10,9 +10,11 @@ java_library(
|
|||
deps = [
|
||||
"//java/google/registry/config",
|
||||
"//java/google/registry/dns",
|
||||
"//java/google/registry/flows",
|
||||
"//java/google/registry/gcs",
|
||||
"//java/google/registry/mapreduce",
|
||||
"//java/google/registry/model",
|
||||
"//java/google/registry/pricing",
|
||||
"//java/google/registry/request",
|
||||
"//java/google/registry/util",
|
||||
"//java/google/registry/xjc",
|
||||
|
|
@ -28,5 +30,6 @@ java_library(
|
|||
"@com_google_guava",
|
||||
"@javax_servlet_api",
|
||||
"@joda_time",
|
||||
"@org_joda_money",
|
||||
],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ public class RdeContactImportAction implements Runnable {
|
|||
public void vrun() {
|
||||
ContactResource contact =
|
||||
XjcToContactResourceConverter.convertContact(xjcContact);
|
||||
getImportUtils().importContact(contact);
|
||||
getImportUtils().importEppResource(contact);
|
||||
}
|
||||
});
|
||||
// Record number of contacts imported
|
||||
|
|
|
|||
|
|
@ -14,10 +14,18 @@
|
|||
|
||||
package google.registry.rde.imports;
|
||||
|
||||
import static google.registry.flows.domain.DomainTransferUtils.createLosingTransferPollMessage;
|
||||
import static google.registry.flows.domain.DomainTransferUtils.createPendingTransferData;
|
||||
import static google.registry.flows.domain.DomainTransferUtils.createTransferServerApproveEntities;
|
||||
import static google.registry.mapreduce.MapreduceRunner.PARAM_MAP_SHARDS;
|
||||
import static google.registry.model.ofy.ObjectifyService.ofy;
|
||||
import static google.registry.pricing.PricingEngineProxy.getDomainRenewCost;
|
||||
import static google.registry.rde.imports.RdeImportUtils.createAutoRenewBillingEventForDomainImport;
|
||||
import static google.registry.rde.imports.RdeImportUtils.createAutoRenewPollMessageForDomainImport;
|
||||
import static google.registry.rde.imports.RdeImportUtils.createHistoryEntryForDomainImport;
|
||||
import static google.registry.rde.imports.RdeImportsModule.PATH;
|
||||
import static google.registry.util.PipelineUtils.createJobPath;
|
||||
import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
|
||||
|
||||
import com.google.appengine.tools.cloudstorage.GcsService;
|
||||
import com.google.appengine.tools.cloudstorage.GcsServiceFactory;
|
||||
|
|
@ -25,13 +33,20 @@ import com.google.appengine.tools.cloudstorage.RetryParams;
|
|||
import com.google.appengine.tools.mapreduce.Mapper;
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.googlecode.objectify.VoidWork;
|
||||
import google.registry.config.RegistryConfig.Config;
|
||||
import google.registry.config.RegistryConfig.ConfigModule;
|
||||
import google.registry.dns.DnsQueue;
|
||||
import google.registry.gcs.GcsUtils;
|
||||
import google.registry.mapreduce.MapreduceRunner;
|
||||
import google.registry.model.billing.BillingEvent;
|
||||
import google.registry.model.domain.DomainResource;
|
||||
import google.registry.model.poll.PollMessage;
|
||||
import google.registry.model.reporting.HistoryEntry;
|
||||
import google.registry.model.transfer.TransferData;
|
||||
import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
|
||||
import google.registry.model.transfer.TransferStatus;
|
||||
import google.registry.request.Action;
|
||||
import google.registry.request.Parameter;
|
||||
import google.registry.request.Response;
|
||||
|
|
@ -41,6 +56,7 @@ import google.registry.xjc.JaxbFragment;
|
|||
import google.registry.xjc.rdedomain.XjcRdeDomain;
|
||||
import google.registry.xjc.rdedomain.XjcRdeDomainElement;
|
||||
import javax.inject.Inject;
|
||||
import org.joda.money.Money;
|
||||
|
||||
/**
|
||||
* A mapreduce that imports domains from an escrow file.
|
||||
|
|
@ -145,17 +161,70 @@ public class RdeDomainImportAction implements Runnable {
|
|||
public void map(JaxbFragment<XjcRdeDomainElement> fragment) {
|
||||
final XjcRdeDomain xjcDomain = fragment.getInstance().getValue();
|
||||
try {
|
||||
logger.infofmt("Converting xml for domain %s", xjcDomain.getName());
|
||||
// Record number of attempted map operations
|
||||
getContext().incrementCounter("domain imports attempted");
|
||||
|
||||
logger.infofmt("Saving domain %s", xjcDomain.getName());
|
||||
ofy().transact(new VoidWork() {
|
||||
@Override
|
||||
public void vrun() {
|
||||
DomainResource domain =
|
||||
XjcToDomainResourceConverter.convertDomain(xjcDomain);
|
||||
getImportUtils().importDomain(domain);
|
||||
HistoryEntry historyEntry = createHistoryEntryForDomainImport(xjcDomain);
|
||||
BillingEvent.Recurring autorenewBillingEvent =
|
||||
createAutoRenewBillingEventForDomainImport(xjcDomain, historyEntry);
|
||||
PollMessage.Autorenew autorenewPollMessage =
|
||||
createAutoRenewPollMessageForDomainImport(xjcDomain, historyEntry);
|
||||
DomainResource domain = XjcToDomainResourceConverter.convertDomain(
|
||||
xjcDomain, autorenewBillingEvent, autorenewPollMessage);
|
||||
getDnsQueue().addDomainRefreshTask(domain.getFullyQualifiedDomainName());
|
||||
// Keep a list of "extra objects" that need to be saved along with the domain
|
||||
// and add to it if necessary.
|
||||
ImmutableSet<Object> extraEntitiesToSave =
|
||||
getImportUtils().createIndexesForEppResource(domain);
|
||||
// Create speculative server approval entities for pending transfers
|
||||
if (domain.getTransferData().getTransferStatus() == TransferStatus.PENDING) {
|
||||
TransferData transferData = domain.getTransferData();
|
||||
checkArgumentNotNull(transferData,
|
||||
"Domain %s is in pending transfer but has no transfer data",
|
||||
domain.getFullyQualifiedDomainName());
|
||||
Money transferCost = getDomainRenewCost(
|
||||
domain.getFullyQualifiedDomainName(),
|
||||
transferData.getPendingTransferExpirationTime(),
|
||||
transferData.getExtendedRegistrationYears());
|
||||
// Create speculative entities in anticipation of an automatic server approval.
|
||||
ImmutableSet<TransferServerApproveEntity> serverApproveEntities =
|
||||
createTransferServerApproveEntities(
|
||||
transferData.getPendingTransferExpirationTime(),
|
||||
domain.getRegistrationExpirationTime()
|
||||
.plusYears(transferData.getExtendedRegistrationYears()),
|
||||
historyEntry,
|
||||
domain,
|
||||
historyEntry.getTrid(),
|
||||
transferData.getGainingClientId(),
|
||||
transferCost,
|
||||
transferData.getExtendedRegistrationYears(),
|
||||
transferData.getTransferRequestTime());
|
||||
transferData =
|
||||
createPendingTransferData(transferData.asBuilder(), serverApproveEntities);
|
||||
// Create a poll message to notify the losing registrar that a transfer was requested.
|
||||
PollMessage requestPollMessage = createLosingTransferPollMessage(domain.getRepoId(),
|
||||
transferData, transferData.getPendingTransferExpirationTime(), historyEntry)
|
||||
.asBuilder().setEventTime(transferData.getTransferRequestTime()).build();
|
||||
domain = domain.asBuilder().setTransferData(transferData).build();
|
||||
autorenewBillingEvent = autorenewBillingEvent.asBuilder()
|
||||
.setRecurrenceEndTime(transferData.getPendingTransferExpirationTime()).build();
|
||||
autorenewPollMessage = autorenewPollMessage.asBuilder()
|
||||
.setAutorenewEndTime(transferData.getPendingTransferExpirationTime()).build();
|
||||
extraEntitiesToSave = new ImmutableSet.Builder<>()
|
||||
.add(requestPollMessage)
|
||||
.addAll(extraEntitiesToSave)
|
||||
.addAll(serverApproveEntities).build();
|
||||
} // End pending transfer check
|
||||
ofy().save()
|
||||
.entities(new ImmutableSet.Builder<>()
|
||||
.add(domain, historyEntry, autorenewBillingEvent, autorenewPollMessage)
|
||||
.addAll(extraEntitiesToSave)
|
||||
.build())
|
||||
.now();
|
||||
}
|
||||
});
|
||||
// Record the number of domains imported
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ public class RdeHostImportAction implements Runnable {
|
|||
@Override
|
||||
public void vrun() {
|
||||
HostResource host = XjcToHostResourceConverter.convert(xjcHost);
|
||||
getImportUtils().importHost(host);
|
||||
getImportUtils().importEppResource(host);
|
||||
}
|
||||
});
|
||||
// Record number of hosts imported
|
||||
|
|
|
|||
|
|
@ -16,34 +16,47 @@ package google.registry.rde.imports;
|
|||
|
||||
import static com.google.common.base.Preconditions.checkArgument;
|
||||
import static com.google.common.base.Preconditions.checkState;
|
||||
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
||||
import static google.registry.util.DateTimeUtils.START_OF_TIME;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import com.google.appengine.tools.cloudstorage.GcsFilename;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.io.BaseEncoding;
|
||||
import com.googlecode.objectify.Key;
|
||||
import google.registry.config.RegistryConfig.Config;
|
||||
import google.registry.gcs.GcsUtils;
|
||||
import google.registry.model.EppResource;
|
||||
import google.registry.model.contact.ContactResource;
|
||||
import google.registry.model.EppResource.ForeignKeyedEppResource;
|
||||
import google.registry.model.billing.BillingEvent;
|
||||
import google.registry.model.billing.BillingEvent.Flag;
|
||||
import google.registry.model.billing.BillingEvent.Reason;
|
||||
import google.registry.model.domain.DomainResource;
|
||||
import google.registry.model.eppcommon.Trid;
|
||||
import google.registry.model.host.HostResource;
|
||||
import google.registry.model.index.EppResourceIndex;
|
||||
import google.registry.model.index.ForeignKeyIndex;
|
||||
import google.registry.model.ofy.Ofy;
|
||||
import google.registry.model.poll.PollMessage;
|
||||
import google.registry.model.registrar.Registrar;
|
||||
import google.registry.model.registry.Registry;
|
||||
import google.registry.model.registry.Registry.RegistryNotFoundException;
|
||||
import google.registry.model.registry.Registry.TldState;
|
||||
import google.registry.model.reporting.HistoryEntry;
|
||||
import google.registry.util.Clock;
|
||||
import google.registry.util.FormattingLogger;
|
||||
import google.registry.xjc.XjcXmlTransformer;
|
||||
import google.registry.xjc.rdedomain.XjcRdeDomain;
|
||||
import google.registry.xjc.rdedomain.XjcRdeDomainElement;
|
||||
import google.registry.xjc.rderegistrar.XjcRdeRegistrar;
|
||||
import google.registry.xml.XmlException;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.UUID;
|
||||
import javax.inject.Inject;
|
||||
import javax.xml.bind.JAXBException;
|
||||
import javax.xml.stream.XMLStreamException;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
/**
|
||||
* Utility functions for escrow file import.
|
||||
|
|
@ -66,10 +79,11 @@ public class RdeImportUtils {
|
|||
this.escrowBucketName = escrowBucketName;
|
||||
}
|
||||
|
||||
private <T extends EppResource> void importEppResource(final T resource, final String type) {
|
||||
public <T extends EppResource & ForeignKeyedEppResource> ImmutableSet<Object>
|
||||
createIndexesForEppResource(T resource) {
|
||||
@SuppressWarnings("unchecked")
|
||||
Class<T> resourceClass = (Class<T>) resource.getClass();
|
||||
EppResource existing = ofy.load().key(Key.create(resource)).now();
|
||||
Object existing = ofy.load().key(Key.create(resource)).now();
|
||||
if (existing != null) {
|
||||
// This will roll back the transaction and prevent duplicate history entries from being saved.
|
||||
throw new ResourceExistsException();
|
||||
|
|
@ -80,51 +94,30 @@ public class RdeImportUtils {
|
|||
checkState(
|
||||
existingForeignKeyIndex == null,
|
||||
"New %s resource has existing foreign key index; foreignKey=%s, repoId=%s",
|
||||
type,
|
||||
resource.getClass().getCanonicalName(),
|
||||
resource.getForeignKey(),
|
||||
resource.getRepoId());
|
||||
ofy.save().entity(resource);
|
||||
ofy.save().entity(ForeignKeyIndex.create(resource, resource.getDeletionTime()));
|
||||
ofy.save().entity(EppResourceIndex.create(Key.create(resource)));
|
||||
logger.infofmt(
|
||||
"Imported %s resource - ROID=%s, id=%s",
|
||||
type, resource.getRepoId(), resource.getForeignKey());
|
||||
return ImmutableSet.<Object>of(ForeignKeyIndex.create(resource, resource.getDeletionTime()),
|
||||
EppResourceIndex.create(Key.create(resource)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Imports a host from an escrow file.
|
||||
* Imports a resource from an escrow file.
|
||||
*
|
||||
* <p>The host will only be imported if it has not been previously imported.
|
||||
*
|
||||
* <p>If the host is imported, {@link ForeignKeyIndex} and {@link EppResourceIndex} are also
|
||||
* created.
|
||||
*/
|
||||
public void importHost(final HostResource resource) {
|
||||
importEppResource(resource, "host");
|
||||
}
|
||||
|
||||
/**
|
||||
* Imports a contact from an escrow file.
|
||||
*
|
||||
* <p>The contact will only be imported if it has not been previously imported.
|
||||
*
|
||||
* <p>If the contact is imported, {@link ForeignKeyIndex} and {@link EppResourceIndex} are also
|
||||
* created.
|
||||
*/
|
||||
public void importContact(final ContactResource resource) {
|
||||
importEppResource(resource, "contact");
|
||||
}
|
||||
|
||||
/**
|
||||
* Imports a domain from an escrow file.
|
||||
*
|
||||
* <p>The domain will only be imported if it has not been previously imported.
|
||||
*
|
||||
* <p>If the domain is imported, {@link ForeignKeyIndex} and {@link EppResourceIndex} are also
|
||||
* created.
|
||||
*/
|
||||
public void importDomain(final DomainResource resource) {
|
||||
importEppResource(resource, "domain");
|
||||
public <T extends EppResource & ForeignKeyedEppResource> void
|
||||
importEppResource(final T resource) {
|
||||
ofy.save().entities(new ImmutableSet.Builder<>()
|
||||
.add(resource)
|
||||
.addAll(createIndexesForEppResource(resource))
|
||||
.build());
|
||||
logger.infofmt(
|
||||
"Imported %s resource - ROID=%s, id=%s",
|
||||
resource.getClass().getCanonicalName(), resource.getRepoId(), resource.getForeignKey());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -184,4 +177,59 @@ public class RdeImportUtils {
|
|||
return Trid.create(
|
||||
"Import_" + BaseEncoding.base64().encode(UUID.randomUUID().toString().getBytes()));
|
||||
}
|
||||
|
||||
public static BillingEvent.Recurring createAutoRenewBillingEventForDomainImport(
|
||||
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;
|
||||
}
|
||||
|
||||
public static PollMessage.Autorenew createAutoRenewPollMessageForDomainImport(
|
||||
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;
|
||||
}
|
||||
|
||||
public static HistoryEntry createHistoryEntryForDomainImport(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;
|
||||
}
|
||||
|
||||
public static byte[] getObjectXml(Object jaxbElement) {
|
||||
try {
|
||||
ByteArrayOutputStream bout = new ByteArrayOutputStream();
|
||||
XjcXmlTransformer.marshalLenient(jaxbElement, bout, UTF_8);
|
||||
return bout.toByteArray();
|
||||
} catch (XmlException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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