Admin API endpoint to delete a reported event

synapse/storage/databases/main/room.py

@@ -2160,7 +2160,19 @@ async def add_event_report(
         reason: Optional[str],
         content: JsonDict,
         received_ts: int,
-    ) -> None:
+    ) -> int:
+        """Add an event report
+
+        Args:
+            room_id: Room that contains the reported event.
+            event_id: The reported event.
+            user_id: User who reports the event.
+            reason: Description that the user specifies.
+            content: Report request body (score and reason).
+            received_ts: Time when the user submitted the report.
+        Returns:
+            Id of the event report.
+        """
         next_id = self._event_reports_id_gen.get_next()
         await self.db_pool.simple_insert(
             table="event_reports",
@@ -2175,6 +2187,7 @@ async def add_event_report(
             },
             desc="add_event_report",
         )
+        return next_id
 
     async def get_event_report(self, report_id: int) -> Optional[Dict[str, Any]]:
         """Retrieve an event report

tests/rest/admin/test_event_reports.py

@@ -617,7 +617,7 @@ def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
         self.other_user_tok = self.login("user", "pass")
 
         # create report
-        self.get_success(
+        event_id = self.get_success(
             self._store.add_event_report(
                 "room_id",
                 "event_id",
@@ -628,8 +628,7 @@ def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
             )
         )
 
-        # first created event report gets `id`=2
-        self.url = "/_synapse/admin/v1/event_reports/2"
+        self.url = f"/_synapse/admin/v1/event_reports/{event_id}"
 
     def test_no_auth(self) -> None:
         """
@@ -668,6 +667,16 @@ def test_delete_success(self) -> None:
         self.assertEqual(200, channel.code, msg=channel.json_body)
         self.assertEqual({}, channel.json_body)
 
+        channel = self.make_request(
+            "GET",
+            self.url,
+            access_token=self.admin_user_tok,
+        )
+
+        # check that report was deleted
+        self.assertEqual(404, channel.code, msg=channel.json_body)
+        self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
+
     def test_invalid_report_id(self) -> None:
         """
         Testing that an invalid `report_id` returns a 400.