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

Indexing / Draft field MUST not be an array #8242

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Conversation

fxprunayre
Copy link
Member

In case of XSL error, index document was containing an array instead of single value

"draft": [
      "n",
      "n"
    ],

Draft field is added by the database info so no need to add it again on XSL error. Properly set it in case of indexing error.

not causing issue in current app (but will be more strict in index document model).

Checklist

  • I have read the contribution guidelines
  • Pull request provided for main branch, backports managed with label
  • Good housekeeping of code, cleaning up comments, tests, and documentation
  • Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
  • Clean commit messages, longer verbose messages are encouraged
  • API Changes are identified in commit messages
  • Testing provided for features or enhancements using automatic tests
  • User documentation provided for new features or enhancements in manual
  • Build documentation provided for development instructions in README.md files
  • Library management using pom.xml dependency management. Update build documentation with intended library use and library tutorials or documentation

In case of XSL error, index document was containing an array instead of single value

```
"draft": [
      "n",
      "n"
    ],
```

Draft field is added by the database info so no need to add it again on XSL error. Properly set it in case of indexing error.

not causing issue in current app (but will be more strict in index document model).
@fxprunayre fxprunayre added this to the 4.4.6 milestone Jul 3, 2024
@fxprunayre fxprunayre requested a review from josegar74 July 3, 2024 13:39
Copy link

sonarcloud bot commented Jul 3, 2024

Copy link
Member

@josegar74 josegar74 left a comment

Choose a reason for hiding this comment

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

I haven't test the code, but the change looks and makes sense.

@josegar74 josegar74 merged commit 1e643bd into main Sep 2, 2024
10 checks passed
@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 3a2c00acf0... Indexing / Draft field MUST not be an array
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging core/src/main/java/org/fao/geonet/kernel/search/EsSearchManager.java
CONFLICT (content): Merge conflict in core/src/main/java/org/fao/geonet/kernel/search/EsSearchManager.java

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-8242-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 3a2c00acf036da55fd972d8610a43b1e1fbf48be
# Push it to GitHub
git push --set-upstream origin backport-8242-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-8242-to-4.2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants