Communication: Resolve Post functionality for threads

core/core-test/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/test/TestWebsocketProvider.kt

@@ -14,7 +14,7 @@ val testWebsocketModule = module {
     single<WebsocketProvider> { TestWebsocketProvider() }
 }
 
-private class TestWebsocketProvider : WebsocketProvider {
+class TestWebsocketProvider : WebsocketProvider {
 
     override val connectionState: Flow<WebsocketProvider.WebsocketConnectionState> =
         flowOf(WebsocketProvider.WebsocketConnectionState.WithSession(true))

feature/course-view/src/debug/kotlin/de/tum/informatics/www1/artemis/native_app/feature/courseview/MessagingScreenshots.kt

@@ -243,6 +243,7 @@ fun `Metis - Conversation Channel`() {
                                 ),
                                 clientId = 0L,
                                 hasModerationRights = true,
+                                isAtLeastTutorInCourse = true,
                                 listContentPadding = PaddingValues(),
                                 serverUrl = "",
                                 courseId = 0,

feature/metis/conversation/build.gradle.kts

@@ -36,6 +36,9 @@ dependencies {
 
     testImplementation(project(":feature:metis-test"))
     implementation("androidx.paging:paging-common:3.2.1")
+
+    testImplementation(libs.mockk.android)
+    testImplementation(libs.mockk.agent)
 }
 
 tasks.register("fetchAndPrepareEmojis", emoji.FetchAndPrepareEmojisTask::class) {

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/ConversationViewModel.kt

@@ -18,6 +18,7 @@ import de.tum.informatics.www1.artemis.native_app.core.datastore.ServerConfigura
 import de.tum.informatics.www1.artemis.native_app.core.datastore.authToken
 import de.tum.informatics.www1.artemis.native_app.core.device.NetworkStatusProvider
 import de.tum.informatics.www1.artemis.native_app.core.model.Course
+import de.tum.informatics.www1.artemis.native_app.core.model.account.isAtLeastTutorInCourse
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.FileUploadExercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.ModelingExercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.ProgrammingExercise
@@ -146,6 +147,21 @@ internal open class ConversationViewModel(
         metisStorageService = metisStorageService
     )
 
+    private val course: StateFlow<DataState<Course>> = flatMapLatest(
+        serverConfigurationService.serverUrl,
+        accountService.authToken,
+        onRequestReload.onStart { emit(Unit) }
+    ) { serverUrl, authToken, _ ->
+        retryOnInternet(networkStatusProvider.currentNetworkStatus) {
+            courseService.getCourse(
+                metisContext.courseId,
+                serverUrl,
+                authToken
+            ).bind { it.course }
+        }
+    }
+        .stateIn(viewModelScope + coroutineContext, SharingStarted.Lazily)
+
     val hasModerationRights: StateFlow<Boolean> = flatMapLatest(
         serverConfigurationService.serverUrl,
         accountService.authToken,
@@ -165,6 +181,22 @@ internal open class ConversationViewModel(
     }
         .stateIn(viewModelScope + coroutineContext, SharingStarted.Eagerly, false)
 
+    val isAtLeastTutorInCourse: StateFlow<Boolean> = flatMapLatest(
+        serverConfigurationService.serverUrl,
+        accountService.authToken,
+        course,
+        onRequestReload.onStart { emit(Unit) }
+    ) { serverUrl, authToken, course, _ ->
+        retryOnInternet(networkStatusProvider.currentNetworkStatus) {
+            accountDataService.getAccountData(
+                serverUrl = serverUrl,
+                bearerToken = authToken
+            )
+                .bind { it.isAtLeastTutorInCourse(course = course.orThrow()) }
+        }
+            .map { it.orElse(false) }
+    }
+        .stateIn(viewModelScope + coroutineContext, SharingStarted.Eagerly, false)
 
     val conversationDataStatus: StateFlow<DataStatus> = combine(
         websocketProvider.isConnected,
@@ -207,21 +239,6 @@ internal open class ConversationViewModel(
     }
         .stateIn(viewModelScope + coroutineContext, SharingStarted.Eagerly)
 
-    private val course: StateFlow<DataState<Course>> = flatMapLatest(
-        serverConfigurationService.serverUrl,
-        accountService.authToken,
-        onRequestReload.onStart { emit(Unit) }
-    ) { serverUrl, authToken, _ ->
-        retryOnInternet(networkStatusProvider.currentNetworkStatus) {
-            courseService.getCourse(
-                metisContext.courseId,
-                serverUrl,
-                authToken
-            ).bind { it.course }
-        }
-    }
-        .stateIn(viewModelScope + coroutineContext, SharingStarted.Lazily)
-
     private val conversations: StateFlow<DataState<List<Conversation>>> = flatMapLatest(
         serverConfigurationService.serverUrl,
         accountService.authToken,
@@ -322,6 +339,32 @@ internal open class ConversationViewModel(
         return if (success) null else MetisModificationFailure.DELETE_REACTION
     }
 
+    /**
+     * Handles a click on resolve or does not resolve post.
+     * It updates the post accordingly.
+     */
+    fun toggleResolvePost(
+        parentPost: PostPojo,
+        post: AnswerPostPojo
+    ): Deferred<MetisModificationFailure?> {
+        return viewModelScope.async(coroutineContext) {
+            val conversation =
+                loadConversation() ?: return@async MetisModificationFailure.UPDATE_POST
+
+            val resolved = !post.resolvesPost
+            val serializedParentPost = StandalonePost(parentPost, conversation)
+            val newPost = AnswerPost(post, serializedParentPost).copy(resolvesPost = resolved)
+
+            metisModificationService.updateAnswerPost(
+                context = metisContext,
+                post = newPost,
+                serverUrl = serverConfigurationService.serverUrl.first(),
+                authToken = accountService.authToken.first()
+            )
+                .asMetisModificationFailure(MetisModificationFailure.UPDATE_POST)
+        }
+    }
+
     fun deletePost(post: IBasePost): Deferred<MetisModificationFailure?> {
         return viewModelScope.async(coroutineContext) {
             metisModificationService.deletePost(

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/chatlist/ChatListItem.kt

@@ -1,7 +1,6 @@
 package de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.chatlist
 
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.IStandalonePost
-import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.db.pojo.PostPojo
 import kotlinx.datetime.LocalDate
 
 sealed class ChatListItem {

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/chatlist/MetisChatList.kt

@@ -28,7 +28,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.paging.compose.LazyPagingItems
-import de.tum.informatics.www1.artemis.native_app.core.data.DataState
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.R
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.MetisModificationFailure
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.ConversationViewModel
@@ -52,6 +51,7 @@ import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.atStartOfDayIn
 import kotlinx.datetime.toJavaInstant
+import org.koin.compose.koinInject
 import java.text.SimpleDateFormat
 import java.util.Date
 
@@ -74,6 +74,7 @@ internal fun MetisChatList(
 
     val clientId: Long by viewModel.clientIdOrDefault.collectAsState()
     val hasModerationRights by viewModel.hasModerationRights.collectAsState()
+    val isAtLeastTutorInCourse by viewModel.isAtLeastTutorInCourse.collectAsState()
 
     val serverUrl by viewModel.serverUrl.collectAsState()
 
@@ -93,6 +94,7 @@ internal fun MetisChatList(
         posts = posts.asPostsDataState(),
         clientId = clientId,
         hasModerationRights = hasModerationRights,
+        isAtLeastTutorInCourse = isAtLeastTutorInCourse,
         listContentPadding = listContentPadding,
         serverUrl = serverUrl,
         courseId = viewModel.courseId,
@@ -117,6 +119,7 @@ fun MetisChatList(
     bottomItem: PostPojo?,
     clientId: Long,
     hasModerationRights: Boolean,
+    isAtLeastTutorInCourse: Boolean,
     listContentPadding: PaddingValues,
     serverUrl: String,
     courseId: Long,
@@ -134,9 +137,10 @@ fun MetisChatList(
         initialReplyTextProvider = initialReplyTextProvider,
         onCreatePost = onCreatePost,
         onEditPost = onEditPost,
+        onResolvePost = null,
         onDeletePost = onDeletePost,
-        onRequestReactWithEmoji = onRequestReactWithEmoji
-    ) { replyMode, onEditPostDelegate, onRequestReactWithEmojiDelegate, onDeletePostDelegate, updateFailureStateDelegate ->
+        onRequestReactWithEmoji = onRequestReactWithEmoji,
+    ) { replyMode, onEditPostDelegate, _, onRequestReactWithEmojiDelegate, onDeletePostDelegate, updateFailureStateDelegate ->
         Column(modifier = modifier) {
             val informationModifier = Modifier
                 .fillMaxSize()
@@ -151,6 +155,7 @@ fun MetisChatList(
                 state = state,
                 itemCount = posts.itemCount,
                 order = DisplayPostOrder.REVERSED,
+                emojiService = koinInject(),
                 bottomItem = bottomItem
             ) {
                 when (posts) {
@@ -182,6 +187,7 @@ fun MetisChatList(
                             clientId = clientId,
                             onClickViewPost = onClickViewPost,
                             hasModerationRights = hasModerationRights,
+                            isAtLeastTutorInCourse = isAtLeastTutorInCourse,
                             onRequestEdit = onEditPostDelegate,
                             onRequestDelete = onDeletePostDelegate,
                             onRequestReactWithEmoji = onRequestReactWithEmojiDelegate,
@@ -210,6 +216,7 @@ private fun ChatList(
     state: LazyListState,
     posts: PostsDataState.Loaded,
     hasModerationRights: Boolean,
+    isAtLeastTutorInCourse: Boolean,
     clientId: Long,
     onClickViewPost: (StandalonePostId) -> Unit,
     onRequestEdit: (IStandalonePost) -> Unit,
@@ -242,6 +249,7 @@ private fun ChatList(
                     val postActions = rememberPostActions(
                         post = post,
                         hasModerationRights = hasModerationRights,
+                        isAtLeastTutorInCourse = isAtLeastTutorInCourse,
                         clientId = clientId,
                         onRequestEdit = { onRequestEdit(post ?: return@rememberPostActions) },
                         onRequestDelete = {
@@ -253,6 +261,7 @@ private fun ChatList(
                         onReplyInThread = {
                             onClickViewPost(post?.standalonePostId ?: return@rememberPostActions)
                         },
+                        onResolvePost = null,
                         onRequestRetrySend = {
                             onRequestRetrySend(
                                 post?.standalonePostId ?: return@rememberPostActions

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/chatlist/MetisPostListHandler.kt

@@ -22,9 +22,12 @@ import androidx.compose.ui.Modifier
 import de.tum.informatics.www1.artemis.native_app.core.common.markdown.PostArtemisMarkdownTransformer
 import de.tum.informatics.www1.artemis.native_app.core.ui.markdown.LocalMarkdownTransformer
 import de.tum.informatics.www1.artemis.native_app.core.ui.markdown.ProvideMarkwon
+import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.EmojiService
+import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.impl.EmojiServiceStub
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.ProvideEmojis
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.post.DisplayPostOrder
 import kotlinx.coroutines.launch
+import org.koin.compose.koinInject
 
 /**
  * Handles scrolling down to new items if the list was scrolled down before the new items came in.
@@ -40,6 +43,7 @@ internal fun <T : Any> MetisPostListHandler(
     itemCount: Int,
     bottomItem: T?,
     order: DisplayPostOrder,
+    emojiService: EmojiService,
     content: @Composable BoxScope.() -> Unit
 ) {
     val scope = rememberCoroutineScope()
@@ -116,7 +120,7 @@ internal fun <T : Any> MetisPostListHandler(
             }
 
             ProvideMarkwon {
-                ProvideEmojis {
+                ProvideEmojis(emojiService) {
                     CompositionLocalProvider(LocalMarkdownTransformer provides markdownTransformer) {
                         content()
                     }

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/post/PostActions.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.text.AnnotatedString
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.IAnswerPost
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.IBasePost
 
 data class PostActions(
@@ -12,6 +13,7 @@ data class PostActions(
     val onClickReaction: ((emojiId: String, create: Boolean) -> Unit)? = null,
     val onCopyText: () -> Unit = {},
     val onReplyInThread: (() -> Unit)? = null,
+    val onResolvePost: (() -> Unit)? = null,
     val onRequestRetrySend: () -> Unit = {}
 ) {
     val canPerformAnyAction: Boolean get() = requestDeletePost != null || requestEditPost != null
@@ -21,11 +23,13 @@ data class PostActions(
 fun rememberPostActions(
     post: IBasePost?,
     hasModerationRights: Boolean,
+    isAtLeastTutorInCourse: Boolean,
     clientId: Long,
     onRequestEdit: () -> Unit,
     onRequestDelete: () -> Unit,
     onClickReaction: (emojiId: String, create: Boolean) -> Unit,
     onReplyInThread: (() -> Unit)?,
+    onResolvePost: (() -> Unit)?,
     onRequestRetrySend: () -> Unit
 ): PostActions {
     val clipboardManager = LocalClipboardManager.current
@@ -38,12 +42,14 @@ fun rememberPostActions(
         onRequestDelete,
         onClickReaction,
         onReplyInThread,
+        onResolvePost,
         onRequestRetrySend,
         clipboardManager
     ) {
         if (post != null) {
             val doesPostExistOnServer = post.serverPostId != null
             val hasEditPostRights = hasModerationRights || post.authorId == clientId
+            val hasResolvePostRights = isAtLeastTutorInCourse || post.authorId == clientId
 
             PostActions(
                 requestEditPost = if (doesPostExistOnServer && hasEditPostRights) onRequestEdit else null,
@@ -53,6 +59,7 @@ fun rememberPostActions(
                     clipboardManager.setText(AnnotatedString(post.content.orEmpty()))
                 },
                 onReplyInThread = if (doesPostExistOnServer) onReplyInThread else null,
+                onResolvePost = if (hasResolvePostRights) onResolvePost else null,
                 onRequestRetrySend = onRequestRetrySend
             )
         } else {

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/post/PostContextBottomSheet.kt

@@ -18,6 +18,8 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AddReaction
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Clear
 import androidx.compose.material.icons.filled.ContentCopy
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
@@ -52,6 +54,8 @@ import de.tum.informatics.www1.artemis.native_app.core.ui.Spacings
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.R
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.LocalEmojiProvider
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.getUnicodeForEmojiId
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.AnswerPost
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.IAnswerPost
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.IBasePost
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.IReaction
 
@@ -136,6 +140,18 @@ internal fun PostContextBottomSheet(
                     }
                 )
 
+                if (postActions.onResolvePost != null && post is IAnswerPost) {
+                    ActionButton(
+                        modifier = actionButtonModifier,
+                        icon = if (post.resolvesPost) Icons.Default.Clear else Icons.Default.Check,
+                        text = if (post.resolvesPost) stringResource(id = R.string.post_does_not_resolve) else stringResource(id = R.string.post_resolves),
+                        onClick = {
+                            onDismissRequest()
+                            postActions.onResolvePost.invoke()
+                        }
+                    )
+                }
+
                 postActions.onReplyInThread?.let {
                     ActionButton(
                         modifier = actionButtonModifier,