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

Add conversations to full ejpd info. #3945

Merged
merged 50 commits into from May 21, 2024
Merged

Add conversations to full ejpd info. #3945

merged 50 commits into from May 21, 2024

Conversation

fisx
Copy link
Contributor

@fisx fisx commented Mar 12, 2024 •
edited by stefanwire

https://wearezeta.atlassian.net/browse/WPB-7005

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Mar 12, 2024
@fisx fisx force-pushed the WPB-6329-make-EJPD-data-model-exhaustive-follow-up branch 2 times, most recently from 362fd55 to 6ed7891 Compare April 22, 2024 07:51
@MangoIV MangoIV force-pushed the WPB-6329-make-EJPD-data-model-exhaustive-follow-up branch from bafeafc to 9e12bcd Compare April 22, 2024 12:25
@fisx fisx force-pushed the WPB-6329-make-EJPD-data-model-exhaustive-follow-up branch from 2e947a2 to 988f9a8 Compare April 23, 2024 09:26
@stefanwire stefanwire marked this pull request as ready for review April 24, 2024 15:30
fisx and others added 17 commits April 24, 2024 15:32
@fisx @stefanwire
Add conversations to full ejpd info.
7f2aa51
@fisx @stefanwire
...
b656b4a
@MangoIV @stefanwire
[fix] make test pass by fixing galley and brig endpoints
4c30abb
@MangoIV @stefanwire
[chore] massage internal endpoints to give all the data we need
f032692
@fisx @stefanwire
ejpd test: also test remote conversations (hosted by remote users).
e69186d
@fisx @stefanwire
Add federation to missing bits in ejpd response end-point.
16d2d10
@fisx @stefanwire
Fix ejpd answers involving federation [WIP]
573a53a
@MangoIV @stefanwire
[chore] qualify Aeson, don't qualify Schema
cd2eccc
@MangoIV @stefanwire
[feat] implement missing schemas
a6bf3ea
@battermann @stefanwire
fix the compile errors
07035b1
@MangoIV @stefanwire
[fix] some test fixes and fixes related to serialization
016bc5f
@battermann @stefanwire
remove remote contacts and conversations from expected response and
09a9a44 
update implementation
@stefanwire
check that remote user doesn't pollute EJPD result
ecdb952
@stefanwire
cleanup
e928fd8
@stefanwire
add robustness
84143e0
@stefanwire
only retrieve local conversations
09dc259
@stefanwire
add changelog
95fcb21
@stefanwire stefanwire force-pushed the WPB-6329-make-EJPD-data-model-exhaustive-follow-up branch from d9af8c4 to 95fcb21 Compare April 24, 2024 15:41
fisx
fisx commented Apr 24, 2024
View reviewed changes
Copy link
Contributor Author

@fisx fisx left a comment

Choose a reason for hiding this comment

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

almost done, but not quite... :)

services/galley/src/Galley/API/Internal.hs Show resolved Hide resolved
services/brig/src/Brig/Effects/GalleyProvider/RPC.hs Outdated Show resolved Hide resolved
libs/wire-api/src/Wire/API/Routes/Internal/Brig/EJPD.hs Outdated Show resolved Hide resolved
libs/wire-api/src/Wire/API/Routes/Internal/Brig/EJPD.hs Outdated Show resolved Hide resolved
libs/wire-api/src/Wire/API/Routes/Internal/Brig/EJPD.hs Outdated Show resolved Hide resolved
services/galley/src/Galley/API/Internal.hs Show resolved Hide resolved
integration/test/Test/EJPD.hs Outdated Show resolved Hide resolved
integration/test/Test/EJPD.hs Show resolved Hide resolved
@fisx fisx force-pushed the WPB-6329-make-EJPD-data-model-exhaustive-follow-up branch from 1415b4b to b94194a Compare April 26, 2024 09:05
stefanwire and others added 20 commits April 26, 2024 09:31
@stefanwire
fix compiler
552a943
@stefanwire
wip: fix integration tests
3204d39
@fisx
Merge remote-tracking branch 'origin/develop' into WPB-6329-make-EJPD…
c768b0b 
…-data-model-exhaustive-follow-up
@fisx
rm debug noise.
4ecc6a6
@fisx
Fix stern.
4951670
@fisx
hi ci
8889677
@fisx
Merge remote-tracking branch 'origin/develop' into WPB-6329-make-EJPD…
b9b154f 
…-data-model-exhaustive-follow-up
@fisx
Merge remote-tracking branch 'origin/develop' into WPB-6329-make-EJPD…
938c76c 
…-data-model-exhaustive-follow-up
@fisx
Merge remote-tracking branch 'origin/develop' into WPB-6329-make-EJPD…
01559a1 
…-data-model-exhaustive-follow-up
@fisx
D'OH!
da07ae4
@fisx
hi ci
567f036
@fisx
hi ci
a81dac2
@fisx
Merge remote-tracking branch 'origin/develop' into WPB-6329-make-EJPD…
d8a25ba 
…-data-model-exhaustive-follow-up
@fisx
hi ci
2b39e85
@fisx
hi ci
b1ef4af
@fisx
Merge remote-tracking branch 'origin/develop' into WPB-6329-make-EJPD…
7f17ea9 
…-data-model-exhaustive-follow-up
@fisx
Merge remote-tracking branch 'origin/develop' into WPB-6329-make-EJPD…
e1b3931 
…-data-model-exhaustive-follow-up
@stefanwire
Merge remote-tracking branch 'origin/develop' into WPB-6329-make-EJPD…
9d8f886 
…-data-model-exhaustive-follow-up
@fisx
Merge remote-tracking branch 'origin/develop' into WPB-6329-make-EJPD…
d63ba4e 
…-data-model-exhaustive-follow-up
@fisx
Merge remote-tracking branch 'refs/remotes/origin/WPB-6329-make-EJPD-…
6ca9d18 
…data-model-exhaustive-follow-up' into WPB-6329-make-EJPD-data-model-exhaustive-follow-up
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented May 21, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

fisx
fisx commented May 21, 2024
View reviewed changes
services/galley/src/Galley/API/Query.hs Outdated
Comment on lines 335 to 336
Just (Public.ConversationPagingState Public.PagingLocals stateBS) ->
localsOnly localDomain (mkState <$> stateBS) gmtprSize
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@stefanwire do you remember why this was done? this function is called elsewhere, and this change breaks stuff (sends group notifs to outside users, doesn't find convs, ...).

@fisx fisx merged commit 7b3c83f into develop May 21, 2024
9 checks passed
@fisx fisx deleted the WPB-6329-make-EJPD-data-model-exhaustive-follow-up branch May 21, 2024 13:57
battermann added a commit that referenced this pull request May 24, 2024
@fisx @MangoIV
@battermann @stefanwire
Add conversations to full ejpd info. (#3945)
6276ba3 
Co-authored-by: Magnus Viernickel <magnus.viernickel@wire.com>
Co-authored-by: Leif Battermann <leif.battermann@wire.com>
Co-authored-by: Stefan Berthold <stefan.berthold@wire.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@battermann battermann battermann left review comments

@stefanwire stefanwire stefanwire approved these changes

Assignees
No one assigned
Labels
ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@fisx @battermann @stefanwire @zebot @MangoIV