fix(api) lookup entities by secondary field as uuid #2420
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
Tieske
force-pushed
the
fix/uuid-lookups
branch
from
a01814e to
059e66c
Compare
p0pr0ck5
reviewed
Apr 20, 2017
kong/api/crud_helpers.lua
Outdated
| @@ -5,16 +5,43 @@ local app_helpers = require "lapis.application" | |||
|
|
|||
| local _M = {} | |||
|
|
|||
| --- Will look up a value in the dao. | |||
| -- Either by `id` field or by the field named by 'alternate_field'. If the value is NOT | |||
| -- a uuid, then by the 'alternate_field'. If it is a uuid then it will first try | |||
There was a problem hiding this comment.
pedantic note: "a uuid" to me implies that the string we found is a UUID we generated. this could be clarified by noting the string "looks like a uuid" as opposed to is "a uuid"
There was a problem hiding this comment.
uuid's have a specific format and can be validated to conform to that format. Though our check is not doing that because in the past we created bad uuids.
kong/api/crud_helpers.lua
Outdated
| local rows, err = dao:find_all(filter) | ||
| if err then | ||
| return nil, err | ||
| elseif is_uuid and not next(rows) then |
There was a problem hiding this comment.
should be #rows == 0 instead of next(rows)?
There was a problem hiding this comment.
yep, same. style + good practice + consistency with other uses (probably worth a cleanup PR to remove that anti-pattern throughout the codebase).
when the name/key/whatever field is formatted as a uuid Kong would assume that field to be the `id` field. This change will make it first try the `id` field in that case, and then the alternative field.
Tieske
force-pushed
the
fix/uuid-lookups
branch
from
059e66c to
bdd305a
Compare
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.
when the name/key/whatever field is formatted as a uuid Kong
would assume that field to be the
idfield. This change willmake it first try the
idfield in that case, and then thealternative field.
Issues resolved
Fixes #2415