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

Add a third poll message column in TransferData for domain transfers (#974)

Browse source 
Because we don't store serverApproveEntities specifically as a set in
the SQL world, we need to make sure that the entities are all separated
and stored if they exist. For domain transfers, there exist three
separate poll messages (client losing, client gaining, autorenew) so we
need to store and retrieve that one.

Founnd this while converting domain transfer flows to SQL.
This commit is contained in:
gbrodman 2021-02-25 17:22:53 -05:00 • committed by GitHub
parent cc69d63802
commit 31bf4bd76d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 2497 additions and 2374 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/src/main/java/google/registry/model/transfer/TransferData.java
View file

@ -15,7 +15,6 @@
package google.registry.model.transfer;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static google.registry.model.ImmutableObject.DoNotCompare;
import static google.registry.util.CollectionUtils.isNullOrEmpty;
import static google.registry.util.CollectionUtils.nullToEmpty;
import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
@ -95,6 +94,9 @@ public abstract class TransferData<
// the transfer request flow, when the instance is loaded from Datastore, we cannot make this
// distinction because they are just VKeys. Also, the only way we use serverApproveEntities is to
// just delete all the entities referenced by the VKeys, so we don't need to make the distinction.
//
// In addition, there may be a third poll message for the autorenew poll message on domain
// transfer if applicable.
@Ignore
@Column(name = "transfer_poll_message_id_1")
Long pollMessageId1;
@ -103,6 +105,10 @@ public abstract class TransferData<
@Column(name = "transfer_poll_message_id_2")
Long pollMessageId2;
@Ignore
@Column(name = "transfer_poll_message_id_3")
Long pollMessageId3;
public abstract boolean isEmpty();
@Nullable
@ -177,6 +183,10 @@ public abstract class TransferData<
Key<PollMessage> ofyKey = Key.create(historyEntryKey, PollMessage.class, pollMessageId2);
entityKeysBuilder.add(PollMessage.createVKey(ofyKey));
}
if (pollMessageId3 != null) {
Key<PollMessage> ofyKey = Key.create(historyEntryKey, PollMessage.class, pollMessageId3);
entityKeysBuilder.add(PollMessage.createVKey(ofyKey));
}
serverApproveEntities = entityKeysBuilder.build();
}
@ -189,6 +199,7 @@ public abstract class TransferData<
transferData.repoId = null;
transferData.pollMessageId1 = null;
transferData.pollMessageId2 = null;
transferData.pollMessageId3 = null;
return;
}
// Each element in serverApproveEntities should have the exact same Key<HistoryEntry> as its
@ -204,6 +215,9 @@ public abstract class TransferData<
if (sortedPollMessageIds.size() >= 2) {
transferData.pollMessageId2 = sortedPollMessageIds.get(1);
}
if (sortedPollMessageIds.size() >= 3) {
transferData.pollMessageId3 = sortedPollMessageIds.get(2);
}
}
/**