diff --git a/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java b/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java index 29c50d870..40f6cd7ea 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java @@ -371,6 +371,10 @@ public final class DomainDeleteFlow implements TransactionalFlow { String.format( "Domain %s was deleted by registry administrator with final deletion effective: %s", existingDomain.getDomainName(), deletionTime)) + .setResponseData( + ImmutableList.of( + DomainPendingActionNotificationResponse.create( + existingDomain.getDomainName(), true, trid, now))) .build(); } diff --git a/core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java index 593c4bdfc..219d5293f 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java @@ -838,14 +838,19 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase { runFlowAssertResponse(loadFile("poll_response_domain_pending_notification.xml")); } + @TestOfyAndSql + void testSuccess_domainPendingActionImmediateDelete() throws Exception { + persistResource( + new PollMessage.OneTime.Builder() + .setRegistrarId(getRegistrarIdForFlow()) + .setEventTime(clock.nowUtc()) + .setMsg( + String.format( + "Domain %s was deleted by registry administrator with final deletion" + + " effective: %s", + domain.getDomainName(), clock.nowUtc().minusMinutes(5))) + .setResponseData( + ImmutableList.of( + DomainPendingActionNotificationResponse.create( + domain.getDomainName(), + true, + Trid.create("ABC-12345", "other-trid"), + clock.nowUtc()))) + .setParent(createHistoryEntryForEppResource(domain)) + .build()); + assertTransactionalFlow(false); + runFlowAssertResponse(loadFile("poll_message_domain_pending_action_immediate_delete.xml")); + } + @TestOfyAndSql void testSuccess_domainAutorenewMessage() throws Exception { persistResource( diff --git a/core/src/test/resources/google/registry/flows/poll/poll_message_domain_pending_action_immediate_delete.xml b/core/src/test/resources/google/registry/flows/poll/poll_message_domain_pending_action_immediate_delete.xml new file mode 100644 index 000000000..1f878e181 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/poll/poll_message_domain_pending_action_immediate_delete.xml @@ -0,0 +1,26 @@ + + + + Command completed successfully; ack to dequeue + + + 2011-01-02T01:01:01Z + Domain test.example was deleted by registry administrator with final deletion effective: 2011-01-02T00:56:01.009Z + + + + test.example + + ABC-12345 + other-trid + + 2011-01-02T01:01:01Z + + + + ABC-12345 + server-trid + + + +