Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Advanced search: backend allows multiples terms to search #40618

Merged
merged 5 commits into from
Nov 10, 2023
Merged

Advanced search: backend allows multiples terms to search #40618

merged 5 commits into from
Nov 10, 2023

Conversation

Altahrim
Copy link
Collaborator

@Altahrim Altahrim commented Sep 25, 2023 •
edited by ChristophWurst
Loading

Ref #39162

Partly fixes #41345
Fixes nextcloud/contacts#3608

Summary

Allows API to return results of an advanced search

Checklist

@Altahrim Altahrim added the 2. developing Work in progress label Sep 25, 2023
@Altahrim Altahrim added this to the Nextcloud 28 milestone Sep 25, 2023
@Altahrim Altahrim self-assigned this Sep 25, 2023
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch 2 times, most recently from 9852a99 to c78349b Compare September 25, 2023 13:34
@Altahrim Altahrim changed the title feat(search): Allow multiple search terms in UnifiedController Advanced search: backend allows multiples terms to search Sep 25, 2023
come-nc
come-nc reviewed Sep 26, 2023
View reviewed changes
lib/public/Search/ISearchQuery.php Outdated Show resolved Hide resolved
lib/private/Search/SearchQuery.php Outdated Show resolved Hide resolved
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch from e11b170 to 01ff73f Compare September 28, 2023 08:45
github-advanced-security[bot]
github-advanced-security bot found potential problems Sep 28, 2023
View reviewed changes
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Psalm found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch from 1756487 to c0dda46 Compare September 28, 2023 09:33
come-nc
come-nc reviewed Sep 28, 2023
View reviewed changes
apps/files/lib/Search/FilesSearchProvider.php Outdated Show resolved Hide resolved
lib/private/Search/Filter.php Outdated Show resolved Hide resolved
lib/private/Search/Filter/TypeDateTime.php Outdated Show resolved Hide resolved
lib/private/Search/Filter/TypeFloat.php Outdated Show resolved Hide resolved
lib/private/Search/Filter.php Outdated Show resolved Hide resolved
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch 3 times, most recently from 6374218 to 64e3f2c Compare October 6, 2023 08:51
github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 6, 2023
View reviewed changes
apps/files/lib/Search/FilesSearchProvider.php Fixed Show fixed Hide fixed
apps/files/lib/Search/FilesSearchProvider.php Fixed Show fixed Hide fixed
core/Controller/UnifiedSearchController.php Fixed Show fixed Hide fixed
lib/private/Search/SearchComposer.php Fixed Show fixed Hide fixed
lib/private/Search/SearchComposer.php Fixed Show fixed Hide fixed
lib/private/Search/SearchComposer.php Fixed Show fixed Hide fixed
apps/files/lib/Search/FilesSearchProvider.php Fixed Show fixed Hide fixed
apps/files/lib/Search/FilesSearchProvider.php Fixed Show fixed Hide fixed
apps/files/lib/Search/FilesSearchProvider.php Fixed Show fixed Hide fixed
lib/private/Search/SearchComposer.php Fixed Show fixed Hide fixed
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch from 64e3f2c to 55845d0 Compare October 6, 2023 09:23
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch from 55845d0 to df3d05f Compare October 10, 2023 16:12
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch 2 times, most recently from b26220d to fa33cd8 Compare October 17, 2023 10:42
@ChristophWurst ChristophWurst mentioned this pull request Oct 17, 2023
Closed
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch from fa33cd8 to ffc108b Compare October 17, 2023 12:54
github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 17, 2023
View reviewed changes
lib/private/Search/FilterFactory.php Fixed Show fixed Hide fixed
lib/private/Search/FilterFactory.php Fixed Show fixed Hide fixed
lib/private/Search/FilterFactory.php Fixed Show fixed Hide fixed
lib/private/Search/FilterFactory.php Fixed Show fixed Hide fixed
lib/private/Search/FilterFactory.php Fixed Show fixed Hide fixed
lib/public/Search/Filter/IntegerFilter.php Fixed Show fixed Hide fixed
lib/public/Search/Filter/UserFilter.php Fixed Show fixed Hide fixed
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch from ffc108b to 1f3f5e3 Compare October 23, 2023 14:35
@ChristophWurst ChristophWurst mentioned this pull request Oct 23, 2023
Closed
@ChristophWurst ChristophWurst added the pending documentation This pull request needs an associated documentation update label Oct 23, 2023
ChristophWurst
ChristophWurst reviewed Oct 23, 2023
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Early feedback on the public parts

lib/public/Search/IFilterCollection.php Outdated Show resolved Hide resolved
lib/public/Search/IProviderV2.php Outdated Show resolved Hide resolved
lib/public/Search/IProviderV2.php Outdated Show resolved Hide resolved
lib/public/Search/Filter/UserFilter.php Outdated Show resolved Hide resolved
lib/public/Search/Filter/BooleanFilter.php Outdated Show resolved Hide resolved
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch from 530355a to 8e184ec Compare November 8, 2023 10:21
provokateurin
provokateurin requested changes Nov 8, 2023
View reviewed changes
core/Controller/UnifiedSearchController.php Outdated Show resolved Hide resolved
core/Controller/UnifiedSearchController.php Outdated Show resolved Hide resolved
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch 3 times, most recently from 4e0cb1a to 50b397c Compare November 8, 2023 10:47
provokateurin
provokateurin approved these changes Nov 8, 2023
View reviewed changes
Copy link
Member

@provokateurin provokateurin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OpenAPI side looks good

@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch 2 times, most recently from 3e44339 to 70e8c78 Compare November 8, 2023 15:53
ChristophWurst
ChristophWurst approved these changes Nov 8, 2023
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For lib/public

@ChristophWurst ChristophWurst mentioned this pull request Nov 8, 2023
Closed
@ChristophWurst

This comment was marked as resolved.

Sign in to view
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch 7 times, most recently from 81db411 to 4accccf Compare November 10, 2023 08:08
@Altahrim
feat(search): Allow multiple search terms in UnifiedController
c753eef 
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
@Altahrim
chore: update openapi.json
f3181a3 
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
@Altahrim
feat(files): Allow advanced search for files
a75a93a 
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
@Altahrim
feat(caldav): Allow advanced search for events/tasks
3545a1c 
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
@Altahrim
feat(carddav): Allow advanced search for contacts
ddb8b68 
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
@Altahrim Altahrim force-pushed the feat/39162/advanced_search branch from 4accccf to ddb8b68 Compare November 10, 2023 08:21
@ChristophWurst
Copy link
Member

CI is done

@Altahrim Altahrim merged commit fa761b5 into master Nov 10, 2023
47 of 49 checks passed
@Altahrim Altahrim deleted the feat/39162/advanced_search branch November 10, 2023 09:42
@nickvergessen nickvergessen mentioned this pull request Nov 14, 2023
Open
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@come-nc come-nc come-nc left review comments

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@provokateurin provokateurin provokateurin approved these changes

@tcitworld tcitworld Awaiting requested review from tcitworld tcitworld is a code owner

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl ArtificialOwl was automatically assigned from nextcloud/server-backend

@icewind1991 icewind1991 Awaiting requested review from icewind1991 icewind1991 was automatically assigned from nextcloud/server-backend

@sorbaugh sorbaugh Awaiting requested review from sorbaugh sorbaugh was automatically assigned from nextcloud/server-backend

Assignees

@Altahrim Altahrim

Labels
2. developing Work in progress pending documentation This pull request needs an associated documentation update
Projects
None yet
Milestone
Nextcloud 28
4 participants
@Altahrim @ChristophWurst @provokateurin @come-nc