Enable moderators to delete posts

ls1intum · Nov 19, 2024 · 6f9b29b · 6f9b29b
1 parent 313d711
commit 6f9b29b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/...tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/post/PostActions.kt b/...tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/post/PostActions.kt
@@ -55,7 +55,7 @@ fun rememberPostActions(
 
         PostActions(
             requestEditPost = if (doesPostExistOnServer && hasEditPostRights) onRequestEdit else null,
-            requestDeletePost = if (hasEditPostRights) onRequestDelete else null,
+            requestDeletePost = if (hasModerationRights) onRequestDelete else null,
             onClickReaction = if (doesPostExistOnServer) onClickReaction else null,
             onCopyText = {
                 clipboardManager.setText(AnnotatedString(post.content.orEmpty()))

diff --git a/...informatics/www1/artemis/native_app/feature/metis/conversation/ui/post/PostActionsTest.kt b/...informatics/www1/artemis/native_app/feature/metis/conversation/ui/post/PostActionsTest.kt
@@ -18,6 +18,7 @@ import org.junit.runner.RunWith
 class PostActionsTest : BaseComposeTest() {
 
     private val EDIT_POST = {}
+    private val DELETE_POST = {}
 
     private val author = User(id = 1)
     private val instructor = User(id = 2)
@@ -31,7 +32,7 @@ class PostActionsTest : BaseComposeTest() {
     fun `test GIVEN a post WHEN calling rememberPostActions as the post author THEN onRequestEditPost is not null`() {
         composeTestRule.setContent {
             val postActions = createPostActions(
-                editorId = author.id,
+                requestorId = author.id,
                 hasModerationRights = false
             )
 
@@ -45,27 +46,40 @@ class PostActionsTest : BaseComposeTest() {
     fun `test GIVEN a user with moderation-rights WHEN calling rememberPostActions THEN onRequestEditPost is null`() {
         composeTestRule.setContent {
             val postActions = createPostActions(
-                editorId = instructor.id,
+                requestorId = instructor.id,
                 hasModerationRights = true
             )
 
             assertNull(postActions.requestEditPost)
         }
     }
 
+    @Test
+    fun `test GIVEN a user with moderation-rights WHEN calling rememberPostActions THEN onRequestDeletePost is not null`() {
+        composeTestRule.setContent {
+            val postActions = createPostActions(
+                requestorId = instructor.id,
+                hasModerationRights = true
+            )
+
+            assertNotNull(postActions.requestDeletePost)
+            assertEquals(DELETE_POST, postActions.requestDeletePost)
+        }
+    }
+
 
     @Composable
     private fun createPostActions(
-        editorId: Long,
+        requestorId: Long,
         hasModerationRights: Boolean = false,
     ): PostActions {
         val postActions = rememberPostActions(
             post = post,
             hasModerationRights = hasModerationRights,
             isAtLeastTutorInCourse = false,
-            clientId = editorId,
+            clientId = requestorId,
             onRequestEdit = EDIT_POST,
-            onRequestDelete = {},
+            onRequestDelete = DELETE_POST,
             onClickReaction = { _, _ -> },
             onReplyInThread = {},
             onResolvePost = {},