Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Communication: Fix Tagging other Users does not work #71

Merged
merged 8 commits into from
Nov 14, 2024
Merged

Communication: Fix Tagging other Users does not work #71

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aca13f0
Calling a different endpoint for the search for tagging users. This m…
FelberMartin Oct 24, 2024
aafb6a0
Adding UI test for user tagging
FelberMartin Oct 24, 2024
bc65caf
Adding more UI test cases
FelberMartin Oct 25, 2024
03eae8d
Added two more tests to document the expected behaviour of the autoCo…
FelberMartin Oct 25, 2024
42fe092
Added integration test for user tagging
FelberMartin Oct 25, 2024
46d8bb8
Fixed warnings
FelberMartin Oct 25, 2024
386274c
Implement change requests
FelberMartin Oct 25, 2024
d0acba0
Fixing the e2e test query
FelberMartin Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ...nformatics/www1/artemis/native_app/feature/metis/conversation/ui/ConversationViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,12 +417,9 @@ internal open class ConversationViewModel(
) { authToken, serverUrl ->
retryOnInternet(networkStatusProvider.currentNetworkStatus) {
conversationService
.searchForPotentialCommunicationParticipants(
.searchForCourseMembers(
courseId = metisContext.courseId,
query = query,
includeStudents = true,
includeTutors = true,
includeInstructors = true,
authToken = authToken,
serverUrl = serverUrl
)
Expand Down
7 changes: 7 additions & 0 deletions ...e/tum/informatics/www1/artemis/native_app/feature/metis/shared/ConversationServiceStub.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ open class ConversationServiceStub(
serverUrl: String
): NetworkResponse<List<User>> = NetworkResponse.Response(emptyList())

override suspend fun searchForCourseMembers(
courseId: Long,
query: String,
authToken: String,
serverUrl: String
): NetworkResponse<List<User>> = NetworkResponse.Response(emptyList())

override suspend fun createOneToOneConversation(
courseId: Long,
partner: String,
Expand Down
7 changes: 7 additions & 0 deletions ...atics/www1/artemis/native_app/feature/metis/shared/service/network/ConversationService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ interface ConversationService {
serverUrl: String
): NetworkResponse<List<User>>

suspend fun searchForCourseMembers(
courseId: Long,
query: String,
authToken: String,
serverUrl: String
): NetworkResponse<List<User>>

suspend fun createOneToOneConversation(
courseId: Long,
partner: String,
Expand Down
19 changes: 19 additions & 0 deletions ...1/artemis/native_app/feature/metis/shared/service/network/impl/ConversationServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,25 @@ class ConversationServiceImpl(private val ktorProvider: KtorProvider) : Conversa
}
}

override suspend fun searchForCourseMembers(
courseId: Long,
query: String,
authToken: String,
serverUrl: String
): NetworkResponse<List<User>> {
return performNetworkCall {
ktorProvider.ktorClient.get(serverUrl) {
url {
appendPathSegments("api", "courses", courseId.toString(), "members", "search")

parameter("loginOrName", query)
}

cookieAuth(authToken)
}.body()
}
}

override suspend fun createGroupChat(
courseId: Long,
groupMembers: List<String>,
Expand Down
Loading