feat: implement sync conflict resolution using LWW strategy and add UI for conflict history monitoring
This commit is contained in:
@@ -82,4 +82,54 @@ class ExampleUnitTest {
|
||||
assertEquals("Todas", formatToShortDate("Todas"))
|
||||
assertEquals("N/A", formatToShortDate("N/A"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testConflictResolutionComputation() {
|
||||
val localHistory = listOf(
|
||||
com.example.data.model.OSUpdateHistory(id = 1, numeroOs = "OS1", timestamp = 1000L, percentualAnterior = 0, percentualNovo = 20, recurso = "Mecânico", emailEditor = "local@cargill.com"),
|
||||
com.example.data.model.OSUpdateHistory(id = 2, numeroOs = "OS2", timestamp = 1500L, percentualAnterior = 0, percentualNovo = 50, recurso = "Elétrico", emailEditor = "local@cargill.com"),
|
||||
com.example.data.model.OSUpdateHistory(id = 4, numeroOs = "OS4", timestamp = 3000L, percentualAnterior = 0, percentualNovo = 90, recurso = "Mecânico", emailEditor = "local@cargill.com"),
|
||||
com.example.data.model.OSUpdateHistory(id = 5, numeroOs = "OS5", timestamp = 4000L, percentualAnterior = 0, percentualNovo = 10, recurso = "Elétrico", emailEditor = "local@cargill.com")
|
||||
)
|
||||
|
||||
val remoteHistory = listOf(
|
||||
com.example.data.model.OSUpdateHistory(id = 10, numeroOs = "OS1", timestamp = 1200L, percentualAnterior = 0, percentualNovo = 30, recurso = "Mecânico", emailEditor = "remote@cargill.com"),
|
||||
com.example.data.model.OSUpdateHistory(id = 11, numeroOs = "OS3", timestamp = 2000L, percentualAnterior = 0, percentualNovo = 70, recurso = "Elétrico", emailEditor = "remote@cargill.com"),
|
||||
com.example.data.model.OSUpdateHistory(id = 12, numeroOs = "OS4", timestamp = 2500L, percentualAnterior = 0, percentualNovo = 80, recurso = "Mecânico", emailEditor = "remote@cargill.com"),
|
||||
com.example.data.model.OSUpdateHistory(id = 13, numeroOs = "OS5", timestamp = 4500L, percentualAnterior = 0, percentualNovo = 40, recurso = "Elétrico", emailEditor = "remote@cargill.com")
|
||||
)
|
||||
|
||||
val localHistoryKeys = localHistory.map { "${it.numeroOs}_${it.timestamp}" }.toSet()
|
||||
val remoteHistoryKeys = remoteHistory.map { "${it.numeroOs}_${it.timestamp}" }.toSet()
|
||||
|
||||
val unuploadedLocalLogs = localHistory.filter { "${it.numeroOs}_${it.timestamp}" !in remoteHistoryKeys }
|
||||
val ossWithUnuploadedLogs = unuploadedLocalLogs.map { it.numeroOs }.toSet()
|
||||
|
||||
val newRemoteLogs = remoteHistory.filter { "${it.numeroOs}_${it.timestamp}" !in localHistoryKeys }
|
||||
val ossWithNewRemoteLogs = newRemoteLogs.map { it.numeroOs }.toSet()
|
||||
|
||||
val conflictingOSs = ossWithUnuploadedLogs.intersect(ossWithNewRemoteLogs)
|
||||
|
||||
assertEquals(3, conflictingOSs.size)
|
||||
assertTrue(conflictingOSs.contains("OS1"))
|
||||
assertTrue(conflictingOSs.contains("OS4"))
|
||||
assertTrue(conflictingOSs.contains("OS5"))
|
||||
assertFalse(conflictingOSs.contains("OS2"))
|
||||
assertFalse(conflictingOSs.contains("OS3"))
|
||||
|
||||
// OS1: Remote (1200) wins over Local (1000)
|
||||
val os1Local = unuploadedLocalLogs.filter { it.numeroOs == "OS1" }.maxByOrNull { it.timestamp }!!
|
||||
val os1Remote = newRemoteLogs.filter { it.numeroOs == "OS1" }.maxByOrNull { it.timestamp }!!
|
||||
assertFalse(os1Local.timestamp >= os1Remote.timestamp)
|
||||
|
||||
// OS4: Local (3000) wins over Remote (2500)
|
||||
val os4Local = unuploadedLocalLogs.filter { it.numeroOs == "OS4" }.maxByOrNull { it.timestamp }!!
|
||||
val os4Remote = newRemoteLogs.filter { it.numeroOs == "OS4" }.maxByOrNull { it.timestamp }!!
|
||||
assertTrue(os4Local.timestamp >= os4Remote.timestamp)
|
||||
|
||||
// OS5: Remote (4500) wins over Local (4000)
|
||||
val os5Local = unuploadedLocalLogs.filter { it.numeroOs == "OS5" }.maxByOrNull { it.timestamp }!!
|
||||
val os5Remote = newRemoteLogs.filter { it.numeroOs == "OS5" }.maxByOrNull { it.timestamp }!!
|
||||
assertFalse(os5Local.timestamp >= os5Remote.timestamp)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user