From 7a5784831cbd193c83ab0003a6962960c89cb977 Mon Sep 17 00:00:00 2001 From: Jhony Cesar Date: Wed, 5 Aug 2026 21:34:46 -0400 Subject: [PATCH] feat: enable maintenance activity filtering by tag and update UI search placeholder --- .../ui/screens/MaintenanceDashboardScreen.kt | 2 +- .../ui/viewmodel/MaintenanceViewModel.kt | 3 +- .../test/java/com/example/ExampleUnitTest.kt | 42 +++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt index c4ba0b0..5215bc2 100644 --- a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt +++ b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt @@ -421,7 +421,7 @@ fun MaintenanceDashboardScreen( TextField( value = searchQuery, onValueChange = { viewModel.setSearchQuery(it) }, - placeholder = { Text("Buscar por OS, descrição...", fontSize = 14.sp) }, + placeholder = { Text("Buscar por OS, TAG, descrição...", fontSize = 14.sp) }, leadingIcon = { Icon(Icons.Default.Search, contentDescription = "Buscar") }, trailingIcon = { if (searchQuery.isNotEmpty()) { diff --git a/app/src/main/java/com/example/ui/viewmodel/MaintenanceViewModel.kt b/app/src/main/java/com/example/ui/viewmodel/MaintenanceViewModel.kt index 77b7f96..507dfa4 100644 --- a/app/src/main/java/com/example/ui/viewmodel/MaintenanceViewModel.kt +++ b/app/src/main/java/com/example/ui/viewmodel/MaintenanceViewModel.kt @@ -253,7 +253,8 @@ class MaintenanceViewModel(private val repository: MaintenanceRepository) : View val matchQuery = query.isBlank() || activity.numeroOs.contains(query, ignoreCase = true) || activity.descricao.contains(query, ignoreCase = true) || - activity.recurso.contains(query, ignoreCase = true) + activity.recurso.contains(query, ignoreCase = true) || + activity.tag.contains(query, ignoreCase = true) val matchQuickFilter = when (quickFilter) { "Todos" -> true diff --git a/app/src/test/java/com/example/ExampleUnitTest.kt b/app/src/test/java/com/example/ExampleUnitTest.kt index 114819a..134795f 100644 --- a/app/src/test/java/com/example/ExampleUnitTest.kt +++ b/app/src/test/java/com/example/ExampleUnitTest.kt @@ -458,7 +458,49 @@ class ExampleUnitTest { assertEquals(100.0f, stateUtil.realizedProgressPoints.last(), 0.5f) assertEquals(0.0f, statePrep.realizedProgressPoints.last(), 0.5f) } + + @Test + fun testSearchQueryFilteringByTag() { + val act1 = com.example.data.model.MaintenanceActivity( + numeroOs = "OS-100", descricao = "Troca de Motor", setor = "Geral", equipe = "Mecânica", recurso = "Sem Recurso", + dataInicio = "18/08/2026", dataFim = "22/08/2026", percentualExecucao = 0, tag = "TAG-VALVULA-01" + ) + val act2 = com.example.data.model.MaintenanceActivity( + numeroOs = "OS-200", descricao = "Inspeção de Bomba", setor = "Geral", equipe = "Mecânica", recurso = "Sem Recurso", + dataInicio = "18/08/2026", dataFim = "22/08/2026", percentualExecucao = 0, tag = "TAG-BOMBA-02" + ) + val activities = listOf(act1, act2) + + val filterByTag = { query: String -> + activities.filter { activity -> + query.isBlank() || + activity.numeroOs.contains(query, ignoreCase = true) || + activity.descricao.contains(query, ignoreCase = true) || + activity.recurso.contains(query, ignoreCase = true) || + activity.tag.contains(query, ignoreCase = true) + } + } + + // 1. Partial TAG match + val resultValvula = filterByTag("VALVULA") + assertEquals(1, resultValvula.size) + assertEquals("OS-100", resultValvula[0].numeroOs) + + // 2. Case insensitive match + val resultBombaLower = filterByTag("bomba") + assertEquals(1, resultBombaLower.size) + assertEquals("OS-200", resultBombaLower[0].numeroOs) + + // 3. Search query matching both or empty + val resultTagCommon = filterByTag("TAG") + assertEquals(2, resultTagCommon.size) + + // 4. Search query matching nonexistent tag + val resultNotFound = filterByTag("TAG-INEXISTENTE") + assertEquals(0, resultNotFound.size) + } } +