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: exclude self deleting messages from backup #1801

Merged
merged 22 commits into from
Jun 20, 2023

Conversation

MohamadJaara
Copy link
Member

@MohamadJaara MohamadJaara commented Jun 13, 2023


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

self deleting messages are included in backups

Causes (Optional)

case not handled

Solutions

do not copy messages and related data when the message is self delete

Dependencies (Optional)

If there are some other pull requests related to this one (e.g. new releases of frameworks), specify them here.

Needs releases with:

  • GitHub link to other pull request

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)


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.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 13, 2023

Unit Test Results

   308 files   -   66     308 suites   - 66   18s ⏱️ - 1m 3s
1 696 tests  - 301  1 629 ✔️  - 286  67 💤  - 15  0 ±0 

Results for commit cb1feb7. ± Comparison against base commit 6fb57d1.

♻️ This comment has been updated with latest results.

@codecov-commenter
Copy link

codecov-commenter commented Jun 13, 2023

Codecov Report

Merging #1801 (cb1feb7) into develop (6fb57d1) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

@@              Coverage Diff              @@
##             develop    #1801      +/-   ##
=============================================
- Coverage      53.50%   53.48%   -0.02%     
  Complexity      1525     1525              
=============================================
  Files            965      965              
  Lines          35854    35872      +18     
  Branches        3172     3176       +4     
=============================================
+ Hits           19182    19186       +4     
- Misses         15407    15421      +14     
  Partials        1265     1265              

Copy link
Member

@vitorhugods vitorhugods left a comment

Choose a reason for hiding this comment

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

Test for these?

DatabaseImporterTest has the tooling for that

@MohamadJaara MohamadJaara force-pushed the fix/exclude_self_deleting_messages_from_bckup branch from 901284b to 7ebb981 Compare June 15, 2023 13:55
@MohamadJaara MohamadJaara force-pushed the fix/exclude_self_deleting_messages_from_bckup branch from 58d1726 to 6e63aaf Compare June 19, 2023 14:20
@MohamadJaara MohamadJaara changed the base branch from develop to release/candidate June 20, 2023 13:09
@MohamadJaara MohamadJaara changed the base branch from release/candidate to develop June 20, 2023 13:09
@MohamadJaara MohamadJaara added this pull request to the merge queue Jun 20, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 20, 2023
@vitorhugods vitorhugods added this pull request to the merge queue Jun 20, 2023
Merged via the queue into develop with commit 2980729 Jun 20, 2023
@vitorhugods vitorhugods deleted the fix/exclude_self_deleting_messages_from_bckup branch June 20, 2023 14:44
MohamadJaara added a commit that referenced this pull request Jun 20, 2023
* dump Reactions and receipt

* revert change to ClearConversationContent

* unit test

* add index for message message_expire_after_millis_index

* validate backup before and after
and fix issue with delete old DB function

* revert changes to enqueuePendingSelfDeletionMessages

* detekt

* nuke db test

* fix jvm test

* fix android test

* merge conflicts

* Update persistence/src/commonTest/kotlin/com/wire/kalium/persistence/BaseDatabaseTest.kt

Co-authored-by: Vitor Hugo Schwaab <[email protected]>

* Update persistence/src/commonTest/kotlin/com/wire/kalium/persistence/backup/DatabaseExporterTest.kt

Co-authored-by: Vitor Hugo Schwaab <[email protected]>

* Update persistence/src/commonTest/kotlin/com/wire/kalium/persistence/backup/DatabaseExporterTest.kt

Co-authored-by: Vitor Hugo Schwaab <[email protected]>

* trigger CI

---------

Co-authored-by: Vitor Hugo Schwaab <[email protected]>
MohamadJaara added a commit that referenced this pull request Jun 21, 2023
* dump Reactions and receipt

* revert change to ClearConversationContent

* unit test

* add index for message message_expire_after_millis_index

* validate backup before and after
and fix issue with delete old DB function

* revert changes to enqueuePendingSelfDeletionMessages

* detekt

* nuke db test

* fix jvm test

* fix android test

* merge conflicts

* Update persistence/src/commonTest/kotlin/com/wire/kalium/persistence/BaseDatabaseTest.kt



* Update persistence/src/commonTest/kotlin/com/wire/kalium/persistence/backup/DatabaseExporterTest.kt



* Update persistence/src/commonTest/kotlin/com/wire/kalium/persistence/backup/DatabaseExporterTest.kt



* trigger CI

---------

Co-authored-by: Vitor Hugo Schwaab <[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.

4 participants