Skip to content

CA STM.info service updates provider > cleanup #112

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

Merged
mmathieum merged 3 commits into from
Apr 8, 2026
Merged

CA STM.info service updates provider > cleanup #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68a2a6c
CA STM.info service updates provider > cleanup
mmathieum Apr 8, 2026
17b0001
Add visibility annotation to parseTranslations function
mmathieum Apr 8, 2026
23916b6
fix
mmathieum Apr 8, 2026
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
9 changes: 5 additions & 4 deletions ...in/java/org/mtransit/android/commons/provider/ca/info/stm/StmInfoServiceUpdateProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,8 @@ object StmInfoServiceUpdateProvider : MTLog.Loggable {
return serviceUpdates
}

private fun List<EtatServiceResponse.Alert.TranslatedText>.parseTranslations(): Map<String, String>? {
@VisibleForTesting
internal fun List<EtatServiceResponse.Alert.TranslatedText>.parseTranslations(): Map<String, String>? {
this.takeIf { it.isNotEmpty() } ?: return null
var hasDefaultLanguage = false
val translations = this.mapNotNull { translatedText ->
Expand All @@ -328,9 +329,9 @@ object StmInfoServiceUpdateProvider : MTLog.Loggable {
if (language == DEFAULT_LANGUAGE) hasDefaultLanguage = true
language to text
}.toMap()
if (!hasDefaultLanguage) {
this.firstOrNull()?.text?.let {
return translations + (DEFAULT_LANGUAGE to it)
if (!hasDefaultLanguage && translations.isNotEmpty()) {
translations.values.firstOrNull()?.let { text ->
return translations + (DEFAULT_LANGUAGE to text)
}
}
return translations
Expand Down
24 changes: 24 additions & 0 deletions ...ava/org/mtransit/android/commons/provider/ca/info/stm/StmInfoServiceUpdateProviderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ package org.mtransit.android.commons.provider.ca.info.stm

import org.junit.Assert.assertEquals
import org.junit.Test
import org.mtransit.android.commons.provider.ca.info.stm.StmInfoServiceUpdateProvider.parseTranslations
import org.mtransit.android.commons.provider.ca.info.stm.StmInfoServiceUpdateProvider.toServiceUpdates
import org.mtransit.android.commons.secsToInstant
import kotlin.test.assertNotNull
import kotlin.time.Duration.Companion.days

class StmInfoServiceUpdateProviderTest {
Expand All @@ -14,6 +16,28 @@ class StmInfoServiceUpdateProviderTest {
private const val SOURCE_LABEL = "stm.info"
}

@Test
fun test_parseTranslations() {
buildList {
add(EtatServiceResponse.Alert.TranslatedText(language = "fr", text = "Titre"))
add(EtatServiceResponse.Alert.TranslatedText(language = "en", text = null))
}.parseTranslations().let { result ->
assertNotNull(result)
assertEquals(2, result.size)
assertEquals("Titre", result["fr"])
assertEquals("Titre", result["en"])
}
buildList {
add(EtatServiceResponse.Alert.TranslatedText(language = "en", text = null))
add(EtatServiceResponse.Alert.TranslatedText(language = "fr", text = "Titre"))
}.parseTranslations().let { result ->
assertNotNull(result)
assertEquals(2, result.size)
assertEquals("Titre", result["fr"])
assertEquals("Titre", result["en"])
}
Comment thread
mmathieum marked this conversation as resolved.
}

@Test
fun testToServiceUpdates_deduplicatesDuplicateAlerts() {
// Two identical alerts for route "34" -> should produce 2 service updates (one per language)
Expand Down