analytics - fixing filtering by roles

[pmauduit]

See #2685 ;

Note: this PR introduces some integration tests on the analytics webapp, inspired from the ones introduced in 19.04 for the console, but:

• Integration tests follow the same conventions as the regular default maven failsafe plugin (code into src/test instead of src/it)
• The introduced IT makes use of the exact same spring beans configuration as the one used in the webapp in production (ws-servlet.xml)
• We still have to activate the "it" profile to make use of the postgresql docker image.

Tests:

• mvn test ok
• mvn verify -Pit ok

Credits goes to @groldan for the help !

[pmauduit]

I did not expect such a reindentation on the pom, sorry about that. Maybe we shall stick with 2 spaces on xml files ?

[fvanderbiest]

When merged, this will require to merge 18.06 into 19.04 into master ...

[groldan]

Looks good overall. Please check this branch for some fixes/improvements: https://github.com/groldan/georchestra/tree/pmauduit-it-analytics-2685

Had to test it out thoroughly to catch those hence the commits instead of just comments.
It'd be good if you can squash all commits in the PR into a single one and provide a descriptive commit message of what it encompasses functionality wise.

[groldan]

When merged, this will require to merge 18.06 into 19.04 into master ...

The correct command would then be:

git checkout 19.04
git merge --strategy-option ours 18.06

You'll get a number of files deleted in 19.04, so do:

git mergetool

And select the d option when prompted for what to do with each deleted file, to keep'em deleted
now git merge --continue and voilà

[pmauduit]

It'd be good if you can squash all commits in the PR into a single one and provide a descriptive commit message of what it encompasses functionality wise.

Done

[pmauduit]

I think @groldan provided a better approach while working on GPDR:

https://github.com/georchestra/georchestra/pull/2613/files#diff-0cdf168c2c66425c514a83589eeddd9dR62

The annotation comes from com.github.database.rider and should do the work better than I can do in this before() method

[fvanderbiest]

IIUC, you do not consider this one is ready for merge ?

[pmauduit]

I was wondering if it was worth to integrate this database-rider dependency (on a test scope) or not. In the current state, it works, it would be fancier with it.

[pmauduit]

I did some rapid tests with database-rider (the DataSet annotation), as well as the Sql from spring-tests, but with no luck, I cannot get them work to load my fixtures.

[pmauduit]

trying harder I succeeded \o/ I'll update my PR actually

[fvanderbiest]

When merged, this will require to merge 18.06 into 19.04 into master ...

Thanks Gabriel. I successfully merged 18.06 into 19.04.
I gave up merging 19.04 into master, there are too many conflicts that I was not able to resolve.
Asking for help here... @cmangeat @groldan