Skip to content

Persist history deletion result. Fixes #451. #453

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
EranBoudjnah merged 1 commit into from
Jun 30, 2025
Merged

Persist history deletion result. Fixes #451. #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ...ava/com/mitteloupe/whoami/datasource/history/datasource/IpAddressHistoryDataSourceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ class IpAddressHistoryDataSourceImpl(

override fun delete(deletionIdentifier: HistoryRecordDeletionIdentifierDataModel) {
historyRecords.remove(deletionIdentifier.ipAddress)
sharedPreferences.edit {
putString(KEY_HISTORY_RECORDS, jsonEncoder.encode(historyRecords))
}
mutableHistoryRecordsFlow.emitRecords()
}

Expand Down
47 changes: 45 additions & 2 deletions ...com/mitteloupe/whoami/datasource/history/datasource/IpAddressHistoryDataSourceImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import org.mockito.kotlin.anyOrNull
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.verify

private typealias SavedIpAddressHistoryRecordLocalMap =
Map<String, SavedIpAddressHistoryRecordLocalModel>
Expand All @@ -40,6 +41,9 @@ class IpAddressHistoryDataSourceImplTest {
@Mock
private lateinit var savedIpAddressRecordDataMapper: SavedIpAddressRecordDataMapper

@Mock
private lateinit var preferencesEditor: SharedPreferences.Editor

private lateinit var sharedPreferences: SharedPreferences

@Mock
Expand All @@ -50,7 +54,6 @@ class IpAddressHistoryDataSourceImplTest {

@Before
fun setUp() {
val preferencesEditor: SharedPreferences.Editor = mock()
sharedPreferences = mock {
on { edit() } doReturn preferencesEditor
}
Expand Down Expand Up @@ -104,7 +107,7 @@ class IpAddressHistoryDataSourceImplTest {
}

@Test
fun `Given records,delete identifier when delete then deletes identified record`() = runTest {
fun `Given records,delete identifier when delete then emits remaining records`() = runTest {
// Given
val ipAddressToDelete = "1.1.1.1"
val recordsString = "{JSON}"
Expand Down Expand Up @@ -140,6 +143,46 @@ class IpAddressHistoryDataSourceImplTest {
assertEquals(2, actualRecords.size)
}

@Test
fun `Given records,delete identifier when delete then deletes identified record`() = runTest {
// Given
val ipAddressToDelete = "1.1.1.1"
val recordsString = "{JSON}"
given(sharedPreferences.getString(eq(KEY_HISTORY_RECORDS), anyOrNull()))
.willReturn(recordsString)
val localSavedIpAddressHistoryRecord1 =
localSavedIpAddressHistoryRecord(ipAddress = "0.0.0.0")
val localSavedIpAddressHistoryRecordToDelete =
localSavedIpAddressHistoryRecord(ipAddress = ipAddressToDelete)
val localSavedIpAddressHistoryRecord3 =
localSavedIpAddressHistoryRecord(ipAddress = "2.2.2.2")
val decodedRecords = mapOf(
localSavedIpAddressHistoryRecord1.ipAddress to localSavedIpAddressHistoryRecord1,
ipAddressToDelete to localSavedIpAddressHistoryRecordToDelete,
localSavedIpAddressHistoryRecord3.ipAddress to localSavedIpAddressHistoryRecord3
)
given(jsonDecoder.decode(recordsString)).willReturn(decodedRecords)
val deletionIdentifier = HistoryRecordDeletionIdentifierDataModel(ipAddressToDelete)
val dataSavedIpAddressHistoryRecord1 = dataSavedIpAddressHistoryRecord("0.0.0.0")
givenMappedToData(localSavedIpAddressHistoryRecord1, dataSavedIpAddressHistoryRecord1)
val dataSavedIpAddressHistoryRecord3 = dataSavedIpAddressHistoryRecord("2.2.2.2")
givenMappedToData(localSavedIpAddressHistoryRecord3, dataSavedIpAddressHistoryRecord3)

val recordsAfterDeletion = mapOf(
localSavedIpAddressHistoryRecord1.ipAddress to localSavedIpAddressHistoryRecord1,
localSavedIpAddressHistoryRecord3.ipAddress to localSavedIpAddressHistoryRecord3
)
val recordsAfterDeletionString = "{JSON2}"
given(jsonEncoder.encode(recordsAfterDeletion))
.willReturn(recordsAfterDeletionString)

// When
classUnderTest.delete(deletionIdentifier)

// Then
verify(preferencesEditor).putString(KEY_HISTORY_RECORDS, recordsAfterDeletionString)
}

private fun givenMappedToData(
localRecord: SavedIpAddressHistoryRecordLocalModel,
expectedRecord: SavedIpAddressHistoryRecordDataModel
Expand Down