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

fix: persist mls conversation when mls disabled [WPB-15149] #3205

Merged
merged 2 commits into from
Jan 3, 2025

Conversation

Garzas
Copy link
Contributor

@Garzas Garzas commented Jan 2, 2025

BugWPB-15149 App is stuck after MLS migration


PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

MLS conversations was not saved if MLS was disabled, causing further message migration fail.

Solutions

Instead of not saving MLS conversations we save them but with GroupState.PENDING_JOIN state to trigger migration when MLS will be enabled

Copy link

sonarqubecloud bot commented Jan 2, 2025

Copy link
Contributor

github-actions bot commented Jan 2, 2025

Test Results

3 349 tests  ±0   3 241 ✅ ±0   5m 21s ⏱️ -27s
  572 suites ±0     108 💤 ±0 
  572 files   ±0       0 ❌ ±0 

Results for commit f9577a4. ± Comparison against base commit 7f1da82.

♻️ This comment has been updated with latest results.

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 72.41379% with 8 lines in your changes missing coverage. Please review.

Project coverage is 54.16%. Comparing base (7f1da82) to head (f9577a4).

Files with missing lines Patch % Lines
.../logic/data/conversation/ConversationRepository.kt 79.16% 4 Missing and 1 partial ⚠️
...lium/logic/data/conversation/ConversationMapper.kt 50.00% 0 Missing and 2 partials ⚠️
...persistence/dao/conversation/ConversationEntity.kt 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@                  Coverage Diff                  @@
##           release/candidate    #3205      +/-   ##
=====================================================
- Coverage              54.16%   54.16%   -0.01%     
=====================================================
  Files                   1250     1250              
  Lines                  36504    36508       +4     
  Branches                3699     3696       -3     
=====================================================
+ Hits                   19772    19774       +2     
- Misses                 15302    15306       +4     
+ Partials                1430     1428       -2     
Files with missing lines Coverage Δ
...persistence/dao/conversation/ConversationEntity.kt 98.41% <0.00%> (ø)
...lium/logic/data/conversation/ConversationMapper.kt 58.15% <50.00%> (ø)
.../logic/data/conversation/ConversationRepository.kt 62.05% <79.16%> (+0.30%) ⬆️

... and 2 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f1da82...f9577a4. Read the comment docs.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/persist-mls-conversation
Commit report: 54d1f7a
Test service: kalium-jvm

✅ 0 Failed, 3241 Passed, 108 Skipped, 1m 2.93s Total Time

Copy link
Contributor

@borichellow borichellow left a comment

Choose a reason for hiding this comment

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

Basically looks good, but maybe some tests for that scenario? :)

@Garzas Garzas added this pull request to the merge queue Jan 3, 2025
Merged via the queue into release/candidate with commit b1f591b Jan 3, 2025
22 checks passed
@Garzas Garzas deleted the fix/persist-mls-conversation branch January 3, 2025 10:22
github-merge-queue bot pushed a commit that referenced this pull request Jan 9, 2025
Garzas added a commit that referenced this pull request Jan 10, 2025
* fix: fallback to proteus if conversation already present but MLS is default (WPB-15191) (#3200)

* fix: fallback to proteus if conversation already present and no common protocol

* fix: test coverage

* fix: test coverage

* fix: Migration message not shown in 1:1 conversations (#3042)

* fix: update common protocol resolution (#3208)

* fix: mls client init [WPB-15022] (#3178)

* fix: secure mls client creation with is mls enabled

* fix: dont persist mls conversations when mls is disabled

* review improvements

* fix: persist mls conversation when mls disabled (#3205)

---------

Co-authored-by: Yamil Medina <[email protected]>
Co-authored-by: Oussama Hassine <[email protected]>
@echoes-hq echoes-hq bot added the echoes: product-roadmap/bug Work contributing to resolve a bug not critical enough to have raised an incident. label Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
echoes: product-roadmap/bug Work contributing to resolve a bug not critical enough to have raised an incident. 🚨 Potential breaking changes 👕 size: S type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants