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] #2247

Merged
merged 1 commit into from
Nov 22, 2023

Conversation

saleniuk
Copy link
Contributor


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

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 GROUP type for such conversation instead of ONE_TO_ONE. We handle that case when persisting conversation already but shouldn't use type field directly anywhere because of that.

Solutions

Use mapping function from ConversationMapper 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. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

Copy link
Contributor

github-actions bot commented Nov 22, 2023

Unit Test Results

   445 files     445 suites   22s ⏱️
2 516 tests 2 397 ✔️ 119 💤 0

Results for commit a885d9c.

♻️ This comment has been updated with latest results.

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (release/candidate@043e931). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@                 Coverage Diff                  @@
##             release/candidate    #2247   +/-   ##
====================================================
  Coverage                     ?   58.06%           
  Complexity                   ?       21           
====================================================
  Files                        ?     1074           
  Lines                        ?    40766           
  Branches                     ?     3776           
====================================================
  Hits                         ?    23670           
  Misses                       ?    15475           
  Partials                     ?     1621           

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 043e931...a885d9c. Read the comment docs.

@saleniuk saleniuk requested review from a team, typfel, yamilmedina, borichellow, MohamadJaara and vitorhugods and removed request for a team November 22, 2023 14:26
@saleniuk saleniuk merged commit 83763fb into release/candidate Nov 22, 2023
16 checks passed
@saleniuk saleniuk deleted the fix/wrong-type-when-resolving-1on1 branch November 22, 2023 14:54
github-actions bot pushed a commit that referenced this pull request Nov 22, 2023
github-merge-queue bot pushed a commit that referenced this pull request Nov 24, 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]>
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.

5 participants