Be more explicit about returning deleted actors or not #2335
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
Nutomic
commented
Jun 27, 2022
| q.filter(deleted.eq(false)) | ||
| .filter(removed.eq(false)) | ||
| .first::<Self>(conn) | ||
| } |
There was a problem hiding this comment.
This is a little awkward, not sure if theres a better way to write the query.
There was a problem hiding this comment.
Do .into_boxed()
Then you can do:
`if .... {
q = q.filter(...)
;
There was a problem hiding this comment.
Like this? Gives me error "overflow evaluating the requirement _: Sized".
let mut q = community
.filter(local.eq(true))
.filter(lower(name).eq(lower(community_name))).into_boxed();
if !include_deleted {
q = q.filter(deleted.eq(false))
.filter(removed.eq(false)).into_boxed();
}
q.first::<Self>(conn)
There was a problem hiding this comment.
You do the into_boxed before filters I think.
Nutomic
commented
Jun 27, 2022
| @@ -58,7 +58,7 @@ where | |||
| let identifier = identifier.to_string(); | |||
| Ok( | |||
| blocking(context.pool(), move |conn| { | |||
| DbActor::read_from_name(conn, &identifier) | |||
| DbActor::read_from_name(conn, &identifier, false) | |||
There was a problem hiding this comment.
Search should probably not list deleted users or communities.
|
Works as expected. |
dessalines
reviewed
Jun 28, 2022
| q.filter(deleted.eq(false)) | ||
| .filter(removed.eq(false)) | ||
| .first::<Self>(conn) | ||
| } |
There was a problem hiding this comment.
Do .into_boxed()
Then you can do:
`if .... {
q = q.filter(...)
;
| q.first::<Self>(conn) | ||
| } else { | ||
| q.filter(deleted.eq(false)).first::<Self>(conn) | ||
| } |
Nutomic
force-pushed
the
handle-better-deleted-actors
branch
from
1133991
to
3425e9e
Compare
|
updated |
dessalines
approved these changes
Jul 5, 2022
Nutomic
added a commit
that referenced
this pull request
Jul 18, 2022
* Be more explicit about returning deleted actors or not * simplify db queries
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.
Still have to test this.