From 7b3703506b43283f7cb838f2788e6ce0fd1c0434 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 25 Mar 2022 18:13:06 -0700
Subject: [PATCH] Remove number from `ReportMessageManager#store`

---
 .../textsecuregcm/storage/MessagesManager.java     |  8 ++------
 .../storage/ReportMessageManager.java              |  6 +-----
 .../textsecuregcm/storage/MessagesManagerTest.java |  7 ++++++-
 .../storage/ReportMessageManagerTest.java          | 14 +++++++++-----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
index fef3d9ef9..1ba612c50 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
@@ -56,12 +56,8 @@ public class MessagesManager {
 
     messagesCache.insert(messageGuid, destinationUuid, destinationDevice, message);
 
-    if (message.hasSource() && !destinationUuid.toString().equals(message.getSourceUuid())) {
-      if (message.hasSourceUuid()) {
-        reportMessageManager.store(message.getSource(), message.getSourceUuid(), messageGuid);
-      } else {
-        logger.warn("Message missing source UUID");
-      }
+    if (message.hasSourceUuid() && !destinationUuid.toString().equals(message.getSourceUuid())) {
+      reportMessageManager.store(message.getSourceUuid(), messageGuid);
     }
   }
 
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java
index 84fefd25d..b4f395b73 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java
@@ -45,14 +45,11 @@ public class ReportMessageManager {
     this.reportedMessageListeners.add(listener);
   }
 
-  // TODO sourceNumber can be removed after 2022-04-01
-  public void store(String sourceNumber, String sourceAci, UUID messageGuid) {
+  public void store(String sourceAci, UUID messageGuid) {
 
     try {
-      Objects.requireNonNull(sourceNumber);
       Objects.requireNonNull(sourceAci);
 
-      reportMessageDynamoDb.store(hash(messageGuid, sourceNumber));
       reportMessageDynamoDb.store(hash(messageGuid, sourceAci));
     } catch (final Exception e) {
       logger.warn("Failed to store hash", e);
@@ -93,7 +90,6 @@ public class ReportMessageManager {
       sourceNumber.ifPresent(number ->
           reportedMessageListeners.forEach(listener -> {
             try {
-              // TODO should listener take the source Aci?
               listener.handleMessageReported(number, messageGuid, reporterUuid);
             } catch (final Exception e) {
               logger.error("Failed to notify listener of reported message", e);
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesManagerTest.java
index f98759cf9..71eb78704 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesManagerTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2021-2022 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.whispersystems.textsecuregcm.storage;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -34,7 +39,7 @@ class MessagesManagerTest {
 
     messagesManager.insert(destinationUuid, 1L, message);
 
-    verify(reportMessageManager).store(eq(sourceNumber), eq(sourceAci.toString()), any(UUID.class));
+    verify(reportMessageManager).store(eq(sourceAci.toString()), any(UUID.class));
 
     final Envelope syncMessage = Envelope.newBuilder(message)
         .setSourceUuid(destinationUuid.toString())
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
index 6efc7db98..df7c35adc 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2021-2022 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.whispersystems.textsecuregcm.storage;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -6,7 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
@@ -56,18 +60,18 @@ class ReportMessageManagerTest {
 
   @Test
   void testStore() {
-    assertDoesNotThrow(() -> reportMessageManager.store(null, null, messageGuid));
+    assertDoesNotThrow(() -> reportMessageManager.store(null, messageGuid));
 
     verifyNoInteractions(reportMessageDynamoDb);
 
-    reportMessageManager.store(sourceNumber, sourceAci.toString(), messageGuid);
+    reportMessageManager.store(sourceAci.toString(), messageGuid);
 
-    verify(reportMessageDynamoDb, times(2)).store(any());
+    verify(reportMessageDynamoDb).store(any());
 
     doThrow(RuntimeException.class)
         .when(reportMessageDynamoDb).store(any());
 
-    assertDoesNotThrow(() -> reportMessageManager.store(sourceNumber, sourceAci.toString(), messageGuid));
+    assertDoesNotThrow(() -> reportMessageManager.store(sourceAci.toString(), messageGuid));
   }
 
   @Test