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: do not commit User and Client upserts if nothing has changed and fix empty contacts [WPB-15055] #3202

Open
wants to merge 2 commits into
base: release/candidate
Choose a base branch
from

Conversation

saleniuk
Copy link
Contributor

@saleniuk saleniuk commented Dec 30, 2024

BugWPB-15055 [Android] Crash when opening connection request from paginated list

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?

This PR contains cherry-picked changes that were first merged #3188 and then reverted #3198 because contacts data were not persisted properly. Here these changes are brought back along with a fix to persist these data properly. The problem was that in the upsert query, fields were compared using != but some of them are nullable, that's why if the value was set to be null initially and then there was an upsert attempt with proper data, NULL != 'some string' equals NULL instead of boolean value true/false so it never returns a proper result and when working with nullables, IS NOT should be used instead, so in this PR it's changed to use IS NOT.

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

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.

saleniuk and others added 2 commits December 30, 2024 12:32
…B-15055] (#3188)

* fix: do not commit User and Client upserts if nothing has changed [WPB-15055]

* fix unused parameter

* fix detekt
@echoes-hq echoes-hq bot added the echoes: unplanned Any work item that isn’t part of the product or technical roadmap. label Dec 30, 2024
@saleniuk
Copy link
Contributor Author

I tried multiple different accounts and I couldn't reproduce that on my side:
Wire 2024-12-30 at 11-47-07

But I believe comparing nullable using != was the reason here and this commit should fix that 9557242

@MohamadJaara could you please verify this using the account on which it happened to you?

Copy link
Contributor

github-actions bot commented Dec 30, 2024

Test Results

3 348 tests  +5   3 241 ✅ +5   5m 42s ⏱️ +23s
  572 suites ±0     107 💤 ±0 
  572 files   ±0       0 ❌ ±0 

Results for commit 9557242. ± Comparison against base commit dc70e05.

♻️ This comment has been updated with latest results.

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 86.66667% with 6 lines in your changes missing coverage. Please review.

Project coverage is 54.16%. Comparing base (dc70e05) to head (9557242).

Files with missing lines Patch % Lines
...ire/kalium/persistence/dao/client/ClientDAOImpl.kt 73.33% 3 Missing and 1 partial ⚠️
...lin/com/wire/kalium/persistence/dao/UserDAOImpl.kt 93.33% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@                  Coverage Diff                  @@
##           release/candidate    #3202      +/-   ##
=====================================================
+ Coverage              54.14%   54.16%   +0.02%     
=====================================================
  Files                   1250     1250              
  Lines                  36477    36495      +18     
  Branches                3696     3704       +8     
=====================================================
+ Hits                   19749    19767      +18     
+ Misses                 15299    15297       -2     
- Partials                1429     1431       +2     
Files with missing lines Coverage Δ
...lin/com/wire/kalium/persistence/dao/UserDAOImpl.kt 52.58% <93.33%> (+0.43%) ⬆️
...ire/kalium/persistence/dao/client/ClientDAOImpl.kt 77.16% <73.33%> (+2.16%) ⬆️

... 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 dc70e05...9557242. Read the comment docs.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/do-not-commit-user-and-client-upserts-if-nothing-has-changed-and-fix-empty-contacts
Commit report: b644fb2
Test service: kalium-jvm

✅ 0 Failed, 3241 Passed, 107 Skipped, 1m 1.88s Total Time

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
echoes: unplanned Any work item that isn’t part of the product or technical roadmap. 👕 size: L type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants