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

Add RDAP support for deleted contacts and registrars

Browse source 
This CL adds the functionality for contact and registrar searches. A future CL will handle domains and entities.

Support is also added for filtering results by registrar.

Deleted items can only be seen by admins, and by registrars viewing their own deleted items.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170734664
This commit is contained in:
mountford 2017-10-02 12:20:04 -07:00 • committed by Ben McIlwain
parent 6740e9270f
commit a5c931a152
13 changed files with 905 additions and 375 deletions
Download patch file Download diff file Expand all files Collapse all files

35
javatests/google/registry/testing/FullFieldsTestEntityHelper.java
View file

@ -178,6 +178,16 @@ public final class FullFieldsTestEntityHelper {
@Nullable String email,
@Nullable List<String> street,
@Nullable Registrar registrar) {
return makeContactResource(id, name, email, street, registrar, null);
}
public static ContactResource makeContactResource(
String id,
String name,
@Nullable String email,
@Nullable List<String> street,
@Nullable Registrar registrar,
@Nullable DateTime deletionTime) {
PostalInfo.Builder postalBuilder = new PostalInfo.Builder()
.setType(PostalInfo.Type.INTERNATIONALIZED)
.setName(name)
@ -212,6 +222,9 @@ public final class FullFieldsTestEntityHelper {
.setCreationClientId(registrar.getClientId())
.setPersistedCurrentSponsorClientId(registrar.getClientId());
}
if (deletionTime != null) {
builder.setDeletionTime(deletionTime);
}
return builder.build();
}
@ -227,7 +240,8 @@ public final class FullFieldsTestEntityHelper {
email,
ImmutableList.of("123 Example Boulevard <script>"),
creationTime,
registrar);
registrar,
null);
}
public static ContactResource makeAndPersistContactResource(
@ -236,7 +250,7 @@ public final class FullFieldsTestEntityHelper {
@Nullable String email,
@Nullable List<String> street,
@Nullable DateTime creationTime) {
return makeAndPersistContactResource(id, name, email, street, creationTime, null);
return makeAndPersistContactResource(id, name, email, street, creationTime, null, null);
}
public static ContactResource makeAndPersistContactResource(
@ -246,12 +260,27 @@ public final class FullFieldsTestEntityHelper {
@Nullable List<String> street,
@Nullable DateTime creationTime,
@Nullable Registrar registrar) {
return makeAndPersistContactResource(id, name, email, street, creationTime, registrar, null);
}
public static ContactResource makeAndPersistContactResource(
String id,
String name,
@Nullable String email,
@Nullable List<String> street,
@Nullable DateTime creationTime,
@Nullable Registrar registrar,
@Nullable DateTime deletionTime) {
ContactResource contactResource =
persistResource(makeContactResource(id, name, email, street, registrar));
persistResource(makeContactResource(id, name, email, street, registrar, deletionTime));
if (creationTime != null) {
persistResource(makeHistoryEntry(
contactResource, HistoryEntry.Type.CONTACT_CREATE, null, "created", creationTime));
}
if (deletionTime != null) {
persistResource(makeHistoryEntry(
contactResource, HistoryEntry.Type.CONTACT_DELETE, null, "deleted", deletionTime));
}
return contactResource;
}