Validation for @default attribute on userEntity #2311
Merged
Conversation
This file contains 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
infomiho
commented
Sep 27, 2024
| @@ -54,18 +52,15 @@ getPslModelBody = pslModelBody | |||
| getIdField :: Entity -> Maybe Psl.Model.Field | |||
| getIdField = findIdField . getPslModelBody | |||
|
|
|||
| isFieldUnique :: String -> Entity -> Maybe Bool | |||
infomiho
commented
Sep 27, 2024
waspc/src/Wasp/AppSpec/Valid.hs
Outdated
| [ GenericValidationError $ "Entity '" ++ userEntityName ++ "' (referenced by app.auth.userEntity) must have an ID field (specified with the '@id' attribute)" | ||
| | isNothing idFieldType | ||
| ] | ||
| concat |
There was a problem hiding this comment.
WIP: I'll rewrite this to be nicer
infomiho
force-pushed
the
miho-validate-user-autogenerate-attribute
branch
from
b581339
to
b43e4ad
Compare
infomiho
force-pushed
the
miho-validate-user-autogenerate-attribute
branch
from
b43e4ad
to
1c3e228
Compare
infomiho
commented
Sep 30, 2024
| isFieldUnique :: String -> Entity -> Maybe Bool | ||
| isFieldUnique fieldName = doesFieldHaveAttribute fieldName "unique" | ||
|
|
||
| doesFieldHaveAttribute :: String -> String -> Entity -> Maybe Bool |
There was a problem hiding this comment.
This was a weirdly specific function which I tried to rewrite but in the end it was easier just to use the lower level helper doesPslFieldHaveAttribute directly in the one place where we needed to check if a field has an attribute.
Martinsos
approved these changes
Oct 1, 2024
Comment on lines
+132
to
+137
| case Entity.getIdField userEntity of | ||
| Nothing -> [userEntityMissingIdFieldError] | ||
| Just idField -> | ||
| if Psl.Util.doesPslFieldHaveAttribute "default" idField | ||
| then [] | ||
| else [userEntityIdFieldMissingDefaultAttrError] |
There was a problem hiding this comment.
Nice! Might be tempting to use Either here as a monad? Btw there is even this thing: https://hackage.haskell.org/package/validation .
But probably just not to complicate, it is simple enough for now, I am writing this just to give ideas for the future!
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.
Closes #2308