Delete deleted-account records by PNI as well as e164

service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java

@@ -240,9 +240,10 @@ boolean create(final Account account, final List<TransactWriteItem> additionalWr
       // Clear any "recently deleted account" record for this number since, if it existed, we've used its old ACI for
       // the newly-created account.
       final TransactWriteItem deletedAccountDelete = buildRemoveDeletedAccount(account.getNumber());
+      final TransactWriteItem deletedAccountDeletePNI = buildRemoveDeletedAccount(account.getPhoneNumberIdentifier());
 
       final Collection<TransactWriteItem> writeItems = new ArrayList<>(
-          List.of(phoneNumberConstraintPut, phoneNumberIdentifierConstraintPut, accountPut, deletedAccountDelete));
+          List.of(phoneNumberConstraintPut, phoneNumberIdentifierConstraintPut, accountPut, deletedAccountDeletePNI, deletedAccountDelete));
 
       writeItems.addAll(additionalWriteItems);
 
@@ -436,6 +437,7 @@ public void changeNumber(final Account account,
         writeItems.add(buildDelete(phoneNumberIdentifierConstraintTableName, ATTR_PNI_UUID, originalPni));
         writeItems.add(buildConstraintTablePut(phoneNumberIdentifierConstraintTableName, uuidAttr, ATTR_PNI_UUID, pniAttr));
         writeItems.add(buildRemoveDeletedAccount(number));
+        writeItems.add(buildRemoveDeletedAccount(phoneNumberIdentifier));
         maybeDisplacedAccountIdentifier.ifPresent(displacedAccountIdentifier ->
             writeItems.add(buildPutDeletedAccount(displacedAccountIdentifier, originalNumber)));
 
@@ -1174,6 +1176,15 @@ private TransactWriteItem buildRemoveDeletedAccount(final String e164) {
         .build();
   }
 
+  private TransactWriteItem buildRemoveDeletedAccount(final UUID pni) {
+    return TransactWriteItem.builder()
+        .delete(Delete.builder()
+            .tableName(deletedAccountsTableName)
+            .key(Map.of(DELETED_ACCOUNTS_KEY_ACCOUNT_E164, AttributeValues.fromString(pni.toString())))
+            .build())
+        .build();
+  }
+
   @Nonnull
   public CompletableFuture<Optional<Account>> getByAccountIdentifierAsync(final UUID uuid) {
     return AsyncTimerUtil.record(GET_BY_UUID_TIMER, () -> itemByKeyAsync(accountsTableName, KEY_ACCOUNT_UUID, AttributeValues.fromUUID(uuid))