From e0dc2e43bb625ba5cafdf212c73c73bc9f8f1770 Mon Sep 17 00:00:00 2001
From: gbrodman <gbrodman@google.com>
Date: Tue, 2 Nov 2021 13:24:04 -0400
Subject: [PATCH] Pass the ICANN reporting BQ dataset to the DNS query
 coordinator (#1405)

---
 .../registry/reporting/icann/DnsCountQueryCoordinator.java | 7 ++++++-
 .../reporting/icann/DnsCountQueryCoordinatorModule.java    | 7 +++++--
 .../reporting/icann/ActivityReportingQueryBuilderTest.java | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java b/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java
index ebaf28f4f..9cb3b2f49 100644
--- a/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java
+++ b/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java
@@ -35,14 +35,19 @@ public interface DnsCountQueryCoordinator {
    * <p>If your report query requires any additional parameters, add them here.
    */
   class Params {
+
     public BigqueryConnection bigquery;
 
     /** The Google Cloud project id. */
     public String projectId;
 
-    public Params(BigqueryConnection bigquery, String projectId) {
+    /** The BigQuery dataset from which to query. */
+    public String icannReportingDataSet;
+
+    public Params(BigqueryConnection bigquery, String projectId, String icannReportingDataSet) {
       this.bigquery = bigquery;
       this.projectId = projectId;
+      this.icannReportingDataSet = icannReportingDataSet;
     }
   }
 
diff --git a/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinatorModule.java b/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinatorModule.java
index 8aaa1671c..f8212602d 100644
--- a/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinatorModule.java
+++ b/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinatorModule.java
@@ -14,6 +14,7 @@
 
 package google.registry.reporting.icann;
 
+import static google.registry.reporting.icann.IcannReportingModule.ICANN_REPORTING_DATA_SET;
 import static google.registry.util.TypeUtils.getClassFromString;
 import static google.registry.util.TypeUtils.instantiate;
 
@@ -21,6 +22,7 @@ import dagger.Module;
 import dagger.Provides;
 import google.registry.bigquery.BigqueryConnection;
 import google.registry.config.RegistryConfig.Config;
+import javax.inject.Named;
 
 /** Dagger module to provide the DnsCountQueryCoordinator. */
 @Module
@@ -30,9 +32,10 @@ public class DnsCountQueryCoordinatorModule {
   static DnsCountQueryCoordinator provideDnsCountQueryCoordinator(
       @Config("dnsCountQueryCoordinatorClass") String customClass,
       BigqueryConnection bigquery,
-      @Config("projectId") String projectId) {
+      @Config("projectId") String projectId,
+      @Named(ICANN_REPORTING_DATA_SET) String icannReportingDataSet) {
     DnsCountQueryCoordinator.Params params =
-        new DnsCountQueryCoordinator.Params(bigquery, projectId);
+        new DnsCountQueryCoordinator.Params(bigquery, projectId, icannReportingDataSet);
     return instantiate(getClassFromString(customClass, DnsCountQueryCoordinator.class), params);
   }
 }
diff --git a/core/src/test/java/google/registry/reporting/icann/ActivityReportingQueryBuilderTest.java b/core/src/test/java/google/registry/reporting/icann/ActivityReportingQueryBuilderTest.java
index 9d9780a04..25e7b9b51 100644
--- a/core/src/test/java/google/registry/reporting/icann/ActivityReportingQueryBuilderTest.java
+++ b/core/src/test/java/google/registry/reporting/icann/ActivityReportingQueryBuilderTest.java
@@ -44,7 +44,7 @@ class ActivityReportingQueryBuilderTest {
         "domain-registry-alpha",
         datasetName,
         new BasicDnsCountQueryCoordinator(
-            new BasicDnsCountQueryCoordinator.Params(null, "domain-registry-alpha")));
+            new BasicDnsCountQueryCoordinator.Params(null, "domain-registry-alpha", datasetName)));
   }
 
   @TestOfyOnly