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.

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

[Fixes #11652] Facets: wrong count on multiple tkeywords filtering #11655

Merged
merged 4 commits into from
Nov 6, 2023

Conversation

etj
Copy link
Contributor

@etj etj commented Nov 3, 2023

The query has been completely rewritten.

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: black geonode && flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates
  • Commits adding new texts do use gettext and have updated .po / .mo files (without location infos)

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Nov 3, 2023
Copy link

codecov bot commented Nov 3, 2023

Codecov Report

Merging #11655 (5ddb855) into master (6a8a202) will increase coverage by 0.00%.
The diff coverage is 85.71%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #11655   +/-   ##
=======================================
  Coverage   62.90%   62.90%           
=======================================
  Files         875      875           
  Lines       52536    52543    +7     
  Branches     6604     6604           
=======================================
+ Hits        33047    33052    +5     
- Misses      17966    17969    +3     
+ Partials     1523     1522    -1     

@etj etj linked an issue Nov 3, 2023 that may be closed by this pull request
@giohappy giohappy added this to the 4.2.0 milestone Nov 6, 2023
@giohappy giohappy merged commit c937f5e into master Nov 6, 2023
18 checks passed
@giohappy giohappy deleted the 11652-facets-bad-count branch November 6, 2023 09:21
Copy link
Contributor

github-actions bot commented Nov 6, 2023

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-11655-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c937f5e42ead119bdfcd709a4ea23d3db37f5e7b
# Push it to GitHub
git push --set-upstream origin backport-11655-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-11655-to-4.2.x.

giohappy pushed a commit that referenced this pull request Nov 6, 2023
…11655)

* [Fixes #11652] Facets: wrong count on multiple tkeywords filtering - tkeywords

* [Fixes #11652] Facets: wrong count on multiple tkeywords filtering - category

* [Fixes #11652] Facets: wrong count on multiple tkeywords filtering - region

* [Fixes #11652] Facets: wrong count on multiple tkeywords filtering - keywords
giohappy added a commit that referenced this pull request Nov 6, 2023
* thesaurus topics should only return its own keys (#11644)

* [Fixes #11652] Facets: wrong count on multiple tkeywords filtering (#11655)

* [Fixes #11652] Facets: wrong count on multiple tkeywords filtering - tkeywords

* [Fixes #11652] Facets: wrong count on multiple tkeywords filtering - category

* [Fixes #11652] Facets: wrong count on multiple tkeywords filtering - region

* [Fixes #11652] Facets: wrong count on multiple tkeywords filtering - keywords

---------

Co-authored-by: Emanuele Tajariol <etj@geo-solutions.it>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 4.2.x cla-signed CLA Bot: community license agreement signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Facets: wrong count on multiple tkeywords filtering
2 participants