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: wrong conversation type when resolving 1on1 after receiving new conversation event [WPB-5551] #2248

Merged
merged 4 commits into from
Nov 24, 2023

Conversation

github-actions[bot]
Copy link
Contributor

Cherry pick from the original PR:


⚠️ Conflicts during cherry-pick:


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
    • 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

New team 1on1 conversations are still not visible on conversation list.

Causes (Optional)

When handling new conversation event, if a conversation is a team 1on1, the app can receive a false type for such conversation instead of . We handle that case when persisting conversation already but shouldn't use field directly anywhere because of that.

Solutions

Use mapping function from to get the proper type when handling new conversation event.

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

user A and B have no conversation
user A and B use Proteus protocol and at least one does not support MLS protocol (so that MLS can't be used for their 1on1 conversation)
user A and B are in the same team (this assertion was missing in the previous fix)
user B finds user A, opens 1on1 conversation with user A and sends a message
user A can see this new 1on1 conversation on the conversation list even before he/she writes anything in this conversation


PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. .

@github-actions github-actions bot added the cherry-pick PR is cherry-picking changes from another banch label Nov 22, 2023
Copy link
Contributor Author

github-actions bot commented Nov 22, 2023

Unit Test Results

       2 files   - 476         2 suites   - 476   17s ⏱️ - 2m 23s
2 050 tests  - 608  2 043 ✔️  - 511  7 💤  - 97  0 ±0 

Results for commit 30b4c34. ± Comparison against base commit d9df432.

♻️ This comment has been updated with latest results.

@codecov-commenter
Copy link

Codecov Report

Merging #2248 (b672a34) into develop (7893659) will decrease coverage by 0.01%.
The diff coverage is 72.22%.

Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #2248      +/-   ##
=============================================
- Coverage      57.97%   57.97%   -0.01%     
  Complexity        21       21              
=============================================
  Files           1081     1081              
  Lines          41044    41045       +1     
  Branches        3798     3799       +1     
=============================================
  Hits           23794    23794              
  Misses         15625    15625              
- Partials        1625     1626       +1     
Files Coverage Δ
...authenticated/conversation/ConversationResponse.kt 78.87% <100.00%> (ø)
...ceiver/conversation/NewConversationEventHandler.kt 89.18% <60.00%> (-2.48%) ⬇️
...lium/logic/data/conversation/ConversationMapper.kt 59.40% <75.00%> (+0.26%) ⬆️

... and 1 file 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 7893659...b672a34. Read the comment docs.

@datadog-wireapp
Copy link

datadog-wireapp bot commented Nov 22, 2023

Datadog Report

All test runs 6c1449d 🔗

2 Total Test Services: 0 Failed, 0 with New Flaky, 2 Passed

Test Services
Service Name Failed Known Flaky New Flaky Passed Skipped Wall Time Branch View
kalium-ios 0 0 0 2016 42 4m 8.1s Link
kalium-jvm 0 0 0 2556 104 7m 28.06s Link

@saleniuk saleniuk requested review from a team, yamilmedina, borichellow, MohamadJaara, vitorhugods and ohassine and removed request for a team November 22, 2023 16:38
@saleniuk saleniuk added this pull request to the merge queue Nov 24, 2023
Merged via the queue into develop with commit f7a8ad1 Nov 24, 2023
17 checks passed
@saleniuk saleniuk deleted the fix/wrong-type-when-resolving-1on1-cherry-pick branch November 24, 2023 14:45
augustocdias pushed a commit that referenced this pull request Dec 5, 2023
…conversation event [WPB-5551] (#2248)

* fix: wrong conversation type when resolving 1on1 after receiving new conversation event [WPB-5551] (#2247)

* trigger build

---------

Co-authored-by: Michał Saleniuk <[email protected]>
Co-authored-by: Michał Saleniuk <[email protected]>
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