Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@ import hu.toliver.vinotes.data.remote.dto.WineDto
import hu.toliver.vinotes.domain.model.Wine
import hu.toliver.vinotes.domain.model.enums.WineColour
import hu.toliver.vinotes.domain.model.enums.WineSweetness
import java.text.Normalizer
import java.util.Locale

fun parseWineColour(raw: String): WineColour? {
val canonical = Normalizer.normalize(raw.trim(), Normalizer.Form.NFD)
.replace(Regex("\\p{M}+"), "")
.uppercase(Locale.ROOT)
return WineColour.entries.firstOrNull { it.name == canonical }
}

fun String.toWineColour(): WineColour =
runCatching { WineColour.valueOf(this) }.getOrDefault(WineColour.RED)
parseWineColour(this)
?: throw IllegalArgumentException("Unknown wine colour: $this")

fun String.toWineSweetness(): WineSweetness =
runCatching { WineSweetness.valueOf(this) }.getOrDefault(WineSweetness.DRY)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import hu.toliver.vinotes.data.local.entity.toEntity
import hu.toliver.vinotes.data.remote.api.CatalogApi
import hu.toliver.vinotes.domain.repository.AppPreferencesRepository
import hu.toliver.vinotes.data.remote.dto.FullCatalogDto
import hu.toliver.vinotes.data.remote.mapper.parseWineColour
import hu.toliver.vinotes.data.remote.mapper.toDomain
import hu.toliver.vinotes.domain.model.Wine
import hu.toliver.vinotes.domain.model.enums.WineColour
import hu.toliver.vinotes.domain.model.enums.WineSweetness
import hu.toliver.vinotes.domain.model.sync.CatalogDelta
import hu.toliver.vinotes.domain.model.sync.CatalogManifest
Expand Down Expand Up @@ -184,7 +184,7 @@ class CatalogSyncRepositoryImpl @Inject constructor(
}
if (wine.volume <= 0) invalidCatalog("$wineLabel has an invalid volume")

if (WineColour.entries.none { it.name == wine.colour }) {
if (parseWineColour(wine.colour) == null) {
invalidCatalog("$wineLabel has an invalid colour value")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package hu.toliver.vinotes.data.remote.mapper

import hu.toliver.vinotes.domain.model.enums.WineColour
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
import org.junit.Test

class WineColourParsingTest {

@Test
fun parseWineColour_acceptsRoséAccent() {
assertEquals(WineColour.ROSE, parseWineColour("ROSÉ"))
}

@Test
fun parseWineColour_acceptsRosePlainCaseInsensitive() {
assertEquals(WineColour.ROSE, parseWineColour("rose"))
assertEquals(WineColour.ROSE, parseWineColour("ROSE"))
}

@Test
fun parseWineColour_rejectsUnknown() {
assertNull(parseWineColour("BURGUNDY"))
}

@Test
fun toWineColour_mapsOfficialCatalogueValues() {
assertEquals(WineColour.RED, "RED".toWineColour())
assertEquals(WineColour.ROSE, "ROSÉ".toWineColour())
}
}
Loading