From f006605753ce1a0c4abeb7c0e2e669424ece638c Mon Sep 17 00:00:00 2001
From: gbrodman <gbrodman@google.com>
Date: Wed, 27 Jul 2022 16:24:43 -0400
Subject: [PATCH] Don't include deleted domains in the ICANN reporting
 total_domains field (#1713)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This shouldn't matter for billing or anything like that because the
actual actions performed that month are still correct, but before this
PR we're including all domains ever created in the total_domains number,
including deleted domains

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/google/nomulus/1713)
<!-- Reviewable:end -->
---
 .../registry/reporting/icann/sql/cloud_sql_total_domains.sql    | 2 +-
 .../reporting/icann/TransactionsReportingQueryBuilderTest.java  | 1 -
 .../registry/reporting/icann/total_domains_test_cloud_sql.sql   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_total_domains.sql b/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_total_domains.sql
index 5168f264b..5e12cbbc5 100644
--- a/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_total_domains.sql
+++ b/core/src/main/java/google/registry/reporting/icann/sql/cloud_sql_total_domains.sql
@@ -36,7 +36,7 @@ JOIN
     tld,
     current_sponsor_registrar_id,
     domain_name
-  FROM "Domain" AS d;''')
+  FROM "Domain" AS d WHERE d.deletion_time > now();''')
 ON
   current_sponsor_registrar_id = registrar_id
 GROUP BY tld, registrar_name
diff --git a/core/src/test/java/google/registry/reporting/icann/TransactionsReportingQueryBuilderTest.java b/core/src/test/java/google/registry/reporting/icann/TransactionsReportingQueryBuilderTest.java
index 4a8307844..4a10e8133 100644
--- a/core/src/test/java/google/registry/reporting/icann/TransactionsReportingQueryBuilderTest.java
+++ b/core/src/test/java/google/registry/reporting/icann/TransactionsReportingQueryBuilderTest.java
@@ -62,7 +62,6 @@ class TransactionsReportingQueryBuilderTest {
 
     TransactionsReportingQueryBuilder queryBuilder =
         createQueryBuilder("cloud_sql_icann_reporting");
-    ;
     ImmutableMap<String, String> actualQueries = queryBuilder.getViewQueryMap(yearMonth);
     for (String queryName : expectedQueryNames) {
       String actualTableName = String.format("%s_201709", queryName);
diff --git a/core/src/test/resources/google/registry/reporting/icann/total_domains_test_cloud_sql.sql b/core/src/test/resources/google/registry/reporting/icann/total_domains_test_cloud_sql.sql
index 9b924e826..4f345c365 100644
--- a/core/src/test/resources/google/registry/reporting/icann/total_domains_test_cloud_sql.sql
+++ b/core/src/test/resources/google/registry/reporting/icann/total_domains_test_cloud_sql.sql
@@ -36,7 +36,7 @@ JOIN
     tld,
     current_sponsor_registrar_id,
     domain_name
-  FROM "Domain" AS d;''')
+  FROM "Domain" AS d WHERE d.deletion_time > now();''')
 ON
   current_sponsor_registrar_id = registrar_id
 GROUP BY tld, registrar_name