From 09b016639b66503c97bbe390819996f00e72bc95 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sat, 21 Nov 2026 10:31:35 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20catalogue=20colour=20parsing=20for=20ROS?= =?UTF-8?q?=C3=89=20and=20unknown=20values?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Normalize accent marks when mapping catalogue colour strings so ROSÉ matches WineColour.ROSE on file validation and web import. Stop defaulting unknown colours to RED during DTO mapping. Co-authored-by: T0liver --- .../data/remote/mapper/WineDtoMapper.kt | 12 ++++++- .../repository/CatalogSyncRepositoryImpl.kt | 4 +-- .../remote/mapper/WineColourParsingTest.kt | 31 +++++++++++++++++++ 3 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 app/src/test/java/hu/toliver/vinotes/data/remote/mapper/WineColourParsingTest.kt diff --git a/app/src/main/java/hu/toliver/vinotes/data/remote/mapper/WineDtoMapper.kt b/app/src/main/java/hu/toliver/vinotes/data/remote/mapper/WineDtoMapper.kt index 4aa79e8..5a31a5e 100644 --- a/app/src/main/java/hu/toliver/vinotes/data/remote/mapper/WineDtoMapper.kt +++ b/app/src/main/java/hu/toliver/vinotes/data/remote/mapper/WineDtoMapper.kt @@ -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) diff --git a/app/src/main/java/hu/toliver/vinotes/data/repository/CatalogSyncRepositoryImpl.kt b/app/src/main/java/hu/toliver/vinotes/data/repository/CatalogSyncRepositoryImpl.kt index af793d9..c183d24 100644 --- a/app/src/main/java/hu/toliver/vinotes/data/repository/CatalogSyncRepositoryImpl.kt +++ b/app/src/main/java/hu/toliver/vinotes/data/repository/CatalogSyncRepositoryImpl.kt @@ -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 @@ -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") } diff --git a/app/src/test/java/hu/toliver/vinotes/data/remote/mapper/WineColourParsingTest.kt b/app/src/test/java/hu/toliver/vinotes/data/remote/mapper/WineColourParsingTest.kt new file mode 100644 index 0000000..d8f7ba8 --- /dev/null +++ b/app/src/test/java/hu/toliver/vinotes/data/remote/mapper/WineColourParsingTest.kt @@ -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()) + } +} \ No newline at end of file