Using CMMS event group key for CMMS event groups. (#1038)

Bug-fix for issue #1034
world-federation-of-advertisers · May 31, 2023 · 72e3798 · 72e3798
1 parent fde690f
commit 72e3798
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/kotlin/org/wfanet/measurement/reporting/service/api/v1alpha/ReportsService.kt b/src/main/kotlin/org/wfanet/measurement/reporting/service/api/v1alpha/ReportsService.kt
@@ -43,6 +43,7 @@ import org.wfanet.measurement.api.v2alpha.DataProvider
 import org.wfanet.measurement.api.v2alpha.DataProviderKey
 import org.wfanet.measurement.api.v2alpha.DataProvidersGrpcKt.DataProvidersCoroutineStub
 import org.wfanet.measurement.api.v2alpha.EncryptionPublicKey
+import org.wfanet.measurement.api.v2alpha.EventGroupKey as CmmsEventGroupKey
 import org.wfanet.measurement.api.v2alpha.Measurement
 import org.wfanet.measurement.api.v2alpha.Measurement.DataProviderEntry
 import org.wfanet.measurement.api.v2alpha.MeasurementConsumer
@@ -1120,7 +1121,12 @@ class ReportsService(
 
           eventGroupKey to
             RequisitionSpecKt.eventGroupEntry {
-              key = eventGroupName
+              key =
+                CmmsEventGroupKey(
+                    internalEventGroupKey.dataProviderReferenceId,
+                    internalEventGroupKey.eventGroupReferenceId
+                  )
+                  .toName()
               value =
                 RequisitionSpecKt.EventGroupEntryKt.value {
                   collectionInterval = timeInterval

diff --git a/src/test/kotlin/org/wfanet/measurement/reporting/service/api/v1alpha/ReportsServiceTest.kt b/src/test/kotlin/org/wfanet/measurement/reporting/service/api/v1alpha/ReportsServiceTest.kt
@@ -60,6 +60,7 @@ import org.wfanet.measurement.api.v2alpha.DataProviderKey
 import org.wfanet.measurement.api.v2alpha.DataProvidersGrpcKt.DataProvidersCoroutineImplBase
 import org.wfanet.measurement.api.v2alpha.DataProvidersGrpcKt.DataProvidersCoroutineStub
 import org.wfanet.measurement.api.v2alpha.EncryptionPublicKey
+import org.wfanet.measurement.api.v2alpha.EventGroupKey as CmmsEventGroupKey
 import org.wfanet.measurement.api.v2alpha.GetDataProviderRequest
 import org.wfanet.measurement.api.v2alpha.Measurement
 import org.wfanet.measurement.api.v2alpha.Measurement.DataProviderEntry.Value.ENCRYPTED_REQUISITION_SPEC_FIELD_NUMBER
@@ -535,7 +536,7 @@ private val EVENT_GROUP_ENTRIES =
     { DataProviderKey(it.dataProviderReferenceId) },
     {
       eventGroupEntry {
-        key = it.toName()
+        key = CmmsEventGroupKey(it.dataProviderReferenceId, it.eventGroupReferenceId).toName()
         value =
           EventGroupEntryKt.value {
             collectionInterval = MEASUREMENT_TIME_INTERVAL