Repository navigation
Accept ROSÉ catalogue colour on file and web import - #25
Merged
Merged
Conversation
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 <T0liver@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #19
Cause
The official catalogue uses
"colour": "ROSÉ"while the app enum isROSE. File import validated colours with an exact enum name match, and web import’stoWineColour()usedvalueOfand fell back toREDfor anything that did not match.Fix
parseWineColour()that trims, strips accents (Unicode NFD), uppercases, and matchesWineColourenum names.CatalogSyncRepositoryImpl.validateWineDto(file import) andString.toWineColour()(web/DTO mapping).RED; mapping throwsIllegalArgumentExceptioninstead.Tests
WineColourParsingTestcoversROSÉ, case-insensitiveROSE, unknown values, andtoWineColour().Build
./gradlew testDebugUnitTest assembleDebug -Dorg.gradle.jvmargs="-Xmx4g"— BUILD SUCCESSFUL