Fix confusion of search results and translations

Author: menny

app/src/main/java/com/anysoftkeyboard/janus/app/repository/TranslationRepository.kt

@@ -2,6 +2,7 @@ package com.anysoftkeyboard.janus.app.repository
 
 import com.anysoftkeyboard.janus.database.dao.TranslationDao
 import com.anysoftkeyboard.janus.database.entities.Translation
+import com.anysoftkeyboard.janus.network.SearchResult
 import com.anysoftkeyboard.janus.network.WikipediaApi
 import kotlinx.coroutines.flow.Flow
 
@@ -13,30 +14,41 @@ open class TranslationRepository(
 
   open fun getBookmarks(): Flow<List<Translation>> = translationDao.getBookmarks()
 
-  open suspend fun search(
+  open suspend fun searchArticles(
       lang: String,
       term: String,
-  ): List<Translation> {
-    val local = translationDao.findTranslation(term, lang, lang)
-    if (local != null) return listOf(local)
-
+  ): List<SearchResult> {
     val searchResponse = wikipediaApi.search(searchTerm = "$lang $term")
-    val translations =
-        searchResponse.query.search.map { searchResult ->
-          Translation(
-              sourceWord = searchResult.title,
-              sourceLangCode = lang,
-              sourceArticleUrl = "https://en.wikipedia.org/?curid=${searchResult.pageid}",
-              sourceShortDescription = searchResult.snippet,
-              sourceSummary = "summary",
-              translatedWord = "translated",
-              targetLangCode = "he",
-              targetArticleUrl = "https://he.wikipedia.org/wiki/$term",
-              targetShortDescription = "hebrew desc",
-              targetSummary = "hebrew summary",
-          )
-        }
-    translationDao.insertTranslations(translations)
-    return translations
+    return searchResponse.query.search ?: emptyList()
+  }
+
+  open suspend fun fetchTranslation(
+      pageId: Long,
+      sourceLang: String,
+      targetLang: String
+  ): Translation? {
+    val langLinksResponse = wikipediaApi.getLangLinks(pageId)
+    val page = langLinksResponse.query.pages.values.firstOrNull()
+    if (page == null) return null
+    val langLinks = page.langlinks
+    if (langLinks == null) return null
+
+    val targetLink = langLinks.find { it.lang == targetLang } ?: return null
+
+    val translation =
+        Translation(
+            sourceWord = page.title,
+            sourceLangCode = sourceLang,
+            sourceArticleUrl = "https://en.wikipedia.org/?curid=${page.pageid}",
+            sourceShortDescription = null,
+            sourceSummary = null,
+            translatedWord = targetLink.title,
+            targetLangCode = targetLang,
+            targetArticleUrl = "https://${targetLang}.wikipedia.org/wiki/${targetLink.title}",
+            targetShortDescription = null,
+            targetSummary = null,
+        )
+    translationDao.insertTranslation(translation)
+    return translation
   }
 }

app/src/main/java/com/anysoftkeyboard/janus/app/ui/TranslateScreen.kt

@@ -3,6 +3,7 @@ package com.anysoftkeyboard.janus.app.ui
 import android.text.Html
 import android.text.method.LinkMovementMethod
 import android.widget.TextView
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -12,6 +13,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.DropdownMenu
@@ -33,13 +36,15 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import com.anysoftkeyboard.janus.app.ui.data.UiTranslation
 import com.anysoftkeyboard.janus.app.viewmodels.TranslateViewModel
+import com.anysoftkeyboard.janus.network.SearchResult
 
 @Composable
 fun TranslateScreen(viewModel: TranslateViewModel) {
   var text by remember { mutableStateOf("") }
-  var sourceLang by remember { mutableStateOf("English") }
-  var targetLang by remember { mutableStateOf("Spanish") }
-  val translations by viewModel.translations.collectAsState()
+  var sourceLang by remember { mutableStateOf("en") }
+  var targetLang by remember { mutableStateOf("he") }
+  val searchResults by viewModel.searchResults.collectAsState()
+  val translation by viewModel.translation.collectAsState()
 
   Column(
       modifier = Modifier.fillMaxSize().padding(16.dp),
@@ -61,16 +66,41 @@ fun TranslateScreen(viewModel: TranslateViewModel) {
                   selectedLanguage = targetLang, onLanguageSelected = { targetLang = it })
             }
         Spacer(modifier = Modifier.height(16.dp))
-        Button(onClick = { viewModel.search(sourceLang, text) }) { Text("Translate") }
+        Button(onClick = { viewModel.searchArticles(sourceLang, text) }) { Text("Translate") }
         Spacer(modifier = Modifier.height(16.dp))
-        TranslationList(translations.map { UiTranslation.fromTranslation(it) })
+
+        if (translation != null) {
+          TranslationCard(UiTranslation.fromTranslation(translation!!))
+        } else if (searchResults.isNotEmpty()) {
+          LazyColumn {
+            items(searchResults) { result ->
+              SearchResultItem(result) {
+                viewModel.fetchTranslation(result.pageid, sourceLang, targetLang)
+              }
+            }
+          }
+        }
       }
 }
 
+@Composable
+fun SearchResultItem(result: SearchResult, onClick: () -> Unit) {
+  Card(modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp).clickable(onClick = onClick)) {
+    Column(modifier = Modifier.padding(16.dp)) {
+      Text(text = result.title, style = MaterialTheme.typography.headlineSmall)
+      AndroidView(
+          factory = { context ->
+            TextView(context).apply { movementMethod = LinkMovementMethod.getInstance() }
+          },
+          update = { it.text = Html.fromHtml(result.snippet, Html.FROM_HTML_MODE_COMPACT) })
+    }
+  }
+}
+
 @Composable
 fun LanguageSelector(selectedLanguage: String, onLanguageSelected: (String) -> Unit) {
   // In a real app, you'd get this from a ViewModel
-  val languages = listOf("English", "Spanish", "French", "German")
+  val languages = listOf("en", "he", "fr", "de")
   var expanded by remember { mutableStateOf(false) }
 
   Box {
@@ -103,7 +133,7 @@ fun TranslationCard(translation: UiTranslation) {
             TextView(context).apply { movementMethod = LinkMovementMethod.getInstance() }
           },
           update = {
-            it.text = Html.fromHtml(translation.shortDescription, Html.FROM_HTML_MODE_COMPACT)
+            it.text = Html.fromHtml(translation.shortDescription ?: "", Html.FROM_HTML_MODE_COMPACT)
           })
       IconButton(onClick = { /* TODO */ }) {
         Icon(imageVector = translation.favoriteIcon, contentDescription = "Favorite")

app/src/main/java/com/anysoftkeyboard/janus/app/viewmodels/TranslateViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.anysoftkeyboard.janus.app.repository.TranslationRepository
 import com.anysoftkeyboard.janus.database.entities.Translation
+import com.anysoftkeyboard.janus.network.SearchResult
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -13,10 +14,22 @@ import kotlinx.coroutines.launch
 @HiltViewModel
 class TranslateViewModel @Inject constructor(private val repository: TranslationRepository) :
     ViewModel() {
-  private val _translations = MutableStateFlow<List<Translation>>(emptyList())
-  val translations: StateFlow<List<Translation>> = _translations
+  private val _searchResults = MutableStateFlow<List<SearchResult>>(emptyList())
+  val searchResults: StateFlow<List<SearchResult>> = _searchResults
 
-  fun search(lang: String, term: String) {
-    viewModelScope.launch { _translations.value = repository.search(lang, term) }
+  private val _translation = MutableStateFlow<Translation?>(null)
+  val translation: StateFlow<Translation?> = _translation
+
+  fun searchArticles(lang: String, term: String) {
+    viewModelScope.launch {
+      _searchResults.value = repository.searchArticles(lang, term)
+      _translation.value = null
+    }
+  }
+
+  fun fetchTranslation(pageId: Long, sourceLang: String, targetLang: String) {
+    viewModelScope.launch {
+      _translation.value = repository.fetchTranslation(pageId, sourceLang, targetLang)
+    }
   }
 }

app/src/test/java/com/anysoftkeyboard/janus/app/repository/FakeTranslationRepository.kt

@@ -2,6 +2,7 @@ package com.anysoftkeyboard.janus.app.repository
 
 import com.anysoftkeyboard.janus.database.dao.TranslationDao
 import com.anysoftkeyboard.janus.database.entities.Translation
+import com.anysoftkeyboard.janus.network.SearchResult
 import com.anysoftkeyboard.janus.network.WikipediaApi
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
@@ -15,14 +16,23 @@ constructor(private val translationDao: TranslationDao, private val wikipediaApi
 
   private val _history = MutableStateFlow(emptyList<Translation>())
   private val _bookmarks = MutableStateFlow(emptyList<Translation>())
-  var nextTranslations: List<Translation> = emptyList()
+  var nextSearchResults: List<SearchResult> = emptyList()
+  var nextTranslation: Translation? = null
 
   override fun getHistory(): Flow<List<Translation>> = _history.asStateFlow()
 
   override fun getBookmarks(): Flow<List<Translation>> = _bookmarks.asStateFlow()
 
-  override suspend fun search(lang: String, term: String): List<Translation> {
-    return nextTranslations
+  override suspend fun searchArticles(lang: String, term: String): List<SearchResult> {
+    return nextSearchResults
+  }
+
+  override suspend fun fetchTranslation(
+      pageId: Long,
+      sourceLang: String,
+      targetLang: String
+  ): Translation? {
+    return nextTranslation
   }
 
   fun setHistory(history: List<Translation>) {

app/src/test/java/com/anysoftkeyboard/janus/app/repository/TranslationRepositoryTest.kt

@@ -1,8 +1,11 @@
 package com.anysoftkeyboard.janus.app.repository
 
 import com.anysoftkeyboard.janus.database.dao.TranslationDao
-import com.anysoftkeyboard.janus.database.entities.Translation
 import com.anysoftkeyboard.janus.network.ContinueData
+import com.anysoftkeyboard.janus.network.LangLink
+import com.anysoftkeyboard.janus.network.LangLinksQuery
+import com.anysoftkeyboard.janus.network.LangLinksResponse
+import com.anysoftkeyboard.janus.network.PageLangLinks
 import com.anysoftkeyboard.janus.network.Query
 import com.anysoftkeyboard.janus.network.SearchInfo
 import com.anysoftkeyboard.janus.network.SearchResponse
@@ -11,11 +14,11 @@ import com.anysoftkeyboard.janus.network.WikipediaApi
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.Before
 import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.mock
-import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 
@@ -34,32 +37,7 @@ class TranslationRepositoryTest {
   }
 
   @Test
-  fun `test search, term in db`() = runTest {
-    val term = "term"
-    val lang = "en"
-    val translation =
-        Translation(
-            sourceWord = term,
-            sourceLangCode = lang,
-            targetLangCode = lang,
-            sourceArticleUrl = "",
-            sourceShortDescription = "",
-            sourceSummary = "",
-            translatedWord = "",
-            targetArticleUrl = "",
-            targetShortDescription = "",
-            targetSummary = "")
-    whenever(translationDao.findTranslation(term, lang, lang)).thenReturn(translation)
-
-    val result = repository.search(lang, term)
-
-    assertEquals(listOf(translation), result)
-    verify(wikipediaApi, never()).search("$lang $term")
-    verify(translationDao, never()).insertTranslations(any())
-  }
-
-  @Test
-  fun `test search, term not in db`() = runTest {
+  fun `test searchArticles`() = runTest {
     val term = "term"
     val lang = "en"
     val searchResult =
@@ -81,15 +59,34 @@ class TranslationRepositoryTest {
             continueData = ContinueData(sroffset = 1, continueVal = "-|||"),
             query = query)
 
-    whenever(translationDao.findTranslation(term, lang, lang)).thenReturn(null)
     whenever(wikipediaApi.search(searchTerm = "$lang $term")).thenReturn(searchResponse)
 
-    val result = repository.search(lang, term)
+    val result = repository.searchArticles(lang, term)
 
     assertEquals(1, result.size)
-    assertEquals("title", result[0].sourceWord)
-    assertEquals(lang, result[0].sourceLangCode)
-    assertEquals("snippet", result[0].sourceShortDescription)
-    verify(translationDao).insertTranslations(any())
+    assertEquals("title", result[0].title)
+  }
+
+  @Test
+  fun `test fetchTranslation`() = runTest {
+    val pageId = 1L
+    val sourceLang = "en"
+    val targetLang = "he"
+    val langLink = LangLink(lang = targetLang, title = "כותרת")
+    val pageLangLinks =
+        PageLangLinks(pageid = pageId, ns = 0, title = "title", langlinks = listOf(langLink))
+    val langLinksQuery = LangLinksQuery(pages = mapOf(pageId.toString() to pageLangLinks))
+    val langLinksResponse = LangLinksResponse(query = langLinksQuery)
+
+    whenever(wikipediaApi.getLangLinks(pageId)).thenReturn(langLinksResponse)
+
+    val result = repository.fetchTranslation(pageId, sourceLang, targetLang)
+
+    assertNotNull(result)
+    assertEquals("title", result!!.sourceWord)
+    assertEquals(sourceLang, result.sourceLangCode)
+    assertEquals("כותרת", result.translatedWord)
+    assertEquals(targetLang, result.targetLangCode)
+    verify(translationDao).insertTranslation(any())
   }
 }