Bugfix: Fix websocket conversation overview

core/websocket/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/websocket/impl/WebsocketProviderImpl.kt

@@ -220,7 +220,7 @@ class WebsocketProviderImpl(
                         Log.d(TAG, "unsubscribe! $topic")
                     }
                     .catch { e ->
-                        Log.d(TAG, "Subscription $topic reported error: ${e.localizedMessage}")
+                        Log.e(TAG, "Subscription $topic reported error: ${e.localizedMessage}")
                     }
                     .map {
                         WebsocketProvider.WebsocketData.Message(it)

feature/metis-test/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metistest/MetisServiceStub.kt

@@ -1,13 +1,9 @@
 package de.tum.informatics.www1.artemis.native_app.feature.metistest
 
 import de.tum.informatics.www1.artemis.native_app.core.data.NetworkResponse
-import de.tum.informatics.www1.artemis.native_app.core.websocket.WebsocketProvider
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.network.MetisService
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisContext
-import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisPostDTO
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.StandalonePost
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
 
 class MetisServiceStub(
     var posts: List<StandalonePost> = emptyList()
@@ -31,11 +27,4 @@ class MetisServiceStub(
     ): NetworkResponse<StandalonePost> {
         return NetworkResponse.Response(posts.first())
     }
-
-    override fun subscribeToPostUpdates(
-        courseId: Long,
-        clientId: Long
-    ): Flow<WebsocketProvider.WebsocketData<MetisPostDTO>> {
-        return flowOf()
-    }
 }

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

@@ -21,7 +21,7 @@ import org.koin.androidx.workmanager.dsl.workerOf
 import org.koin.dsl.module
 
 val conversationModule = module {
-    single<MetisService> { MetisServiceImpl(get(), get()) }
+    single<MetisService> { MetisServiceImpl(get()) }
     single<MetisModificationService> { MetisModificationServiceImpl(get()) }
     single<EmojiService> { EmojiServiceImpl(androidContext()) }
 

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/service/network/MetisService.kt

@@ -1,14 +1,11 @@
 package de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.network
 
 import de.tum.informatics.www1.artemis.native_app.core.data.NetworkResponse
-import de.tum.informatics.www1.artemis.native_app.core.websocket.WebsocketProvider
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisContext
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisFilter
-import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisPostDTO
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisSortingStrategy
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.CourseWideContext
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.StandalonePost
-import kotlinx.coroutines.flow.Flow
 
 interface MetisService {
 
@@ -33,11 +30,6 @@ interface MetisService {
         authToken: String
     ): NetworkResponse<StandalonePost>
 
-    fun subscribeToPostUpdates(
-        courseId: Long,
-        clientId: Long,
-    ): Flow<WebsocketProvider.WebsocketData<MetisPostDTO>>
-
     /**
      * The metis context needed to query standalone posts.
      * @param query if not null the posts will be filtered to contain the given query.

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/service/network/impl/MetisServiceImpl.kt

@@ -4,26 +4,20 @@ import de.tum.informatics.www1.artemis.native_app.core.data.NetworkResponse
 import de.tum.informatics.www1.artemis.native_app.core.data.cookieAuth
 import de.tum.informatics.www1.artemis.native_app.core.data.performNetworkCall
 import de.tum.informatics.www1.artemis.native_app.core.data.service.KtorProvider
-import de.tum.informatics.www1.artemis.native_app.core.websocket.WebsocketProvider
-import de.tum.informatics.www1.artemis.native_app.core.websocket.impl.WebsocketTopic
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.network.MetisService
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.network.RESOURCE_PATH_SEGMENTS
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisContext
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisFilter
-import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisPostDTO
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisSortingStrategy
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.CourseWideContext
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.StandalonePost
 import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.client.request.parameter
 import io.ktor.http.appendPathSegments
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.merge
 
 internal class MetisServiceImpl(
     private val ktorProvider: KtorProvider,
-    private val websocketProvider: WebsocketProvider
 ) : MetisService {
 
     override suspend fun getPosts(
@@ -149,17 +143,4 @@ internal class MetisServiceImpl(
             }
         }
     }
-
-    override fun subscribeToPostUpdates(
-        courseId: Long,
-        clientId: Long
-    ): Flow<WebsocketProvider.WebsocketData<MetisPostDTO>> {
-        val courseWideTopic = WebsocketTopic.getCourseWideConversationUpdateTopic(courseId)
-        val normalTopic = WebsocketTopic.getNormalConversationUpdateTopic(clientId)
-
-        val courseWideUpdates = websocketProvider.subscribe(courseWideTopic, MetisPostDTO.serializer())
-        val normalUpdates = websocketProvider.subscribe(normalTopic, MetisPostDTO.serializer())
-
-        return merge(courseWideUpdates, normalUpdates)
-    }
 }

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

@@ -143,7 +143,7 @@ internal open class ConversationViewModel(
      * Manages updating from the websocket.
      */
     private val webSocketUpdateUseCase = ConversationWebSocketUpdateUseCase(
-        metisService = metisService,
+        websocketProvider = websocketProvider,
         metisStorageService = metisStorageService
     )
 
@@ -233,7 +233,7 @@ internal open class ConversationViewModel(
         clientId.filterSuccess()
     ) { conversationDataState, clientId ->
         websocketProvider.subscribeToConversationUpdates(clientId, metisContext.courseId)
-            .filter { it.crudAction == MetisCrudAction.UPDATE }
+            .filter { it.action == MetisCrudAction.UPDATE }
             .map<ConversationWebsocketDto, DataState<Conversation>> { DataState.Success(it.conversation) }
             .onStart { emit(conversationDataState) }
     }

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

@@ -1,17 +1,17 @@
 package de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui
 
 import de.tum.informatics.www1.artemis.native_app.core.websocket.WebsocketProvider
-import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.network.MetisService
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.storage.MetisStorageService
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisContext
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisCrudAction
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.MetisPostDTO
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.service.network.subscribeToPostUpdates
 
 /**
  * Manages updates to the conversation over the web socket.
  */
 class ConversationWebSocketUpdateUseCase(
-    private val metisService: MetisService,
+    private val websocketProvider: WebsocketProvider,
     private val metisStorageService: MetisStorageService
 ) {
 
@@ -23,17 +23,15 @@ class ConversationWebSocketUpdateUseCase(
         context: MetisContext,
         clientId: Long
     ) {
-        metisService.subscribeToPostUpdates(
+        websocketProvider.subscribeToPostUpdates(
             courseId = context.courseId,
             clientId = clientId
-        ).collect { websocketData ->
-            if (websocketData is WebsocketProvider.WebsocketData.Message) {
-                updateDatabaseWithDto(
-                    dto = websocketData.message,
-                    context = context,
-                    host = host
-                )
-            }
+        ).collect { postDto ->
+            updateDatabaseWithDto(
+                dto = postDto,
+                context = context,
+                host = host
+            )
         }
     }
 
@@ -57,10 +55,6 @@ class ConversationWebSocketUpdateUseCase(
                     listOf(dto.post.id ?: return)
                 )
             }
-
-            MetisCrudAction.NEW_MESSAGE -> {
-                // Nothing to do here. Only relevant for the conversation overview.
-            }
         }
     }
 }