fix: Do not show failed messages as delivered #15816
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
atomrc
commented
Sep 14, 2023
Comment on lines
+1218
to
+1223
| const errorStatus = | ||
| isBackendError(error) && error.label === BackendErrorLabel.FEDERATION_REMOTE_ERROR | ||
| ? StatusType.FEDERATION_ERROR | ||
| : StatusType.FAILED; | ||
| messageEntity.status(errorStatus); | ||
| return this.eventService.updateEvent(messageEntity.primary_key, {status: errorStatus}); |
There was a problem hiding this comment.
This is a small refactoring to avoid code duplication
atomrc
commented
Sep 14, 2023
| return this.messages() | ||
| .slice() | ||
| .reverse() | ||
| .find(messageEntity => { | ||
| const isDelivered = messageEntity.status() >= StatusType.DELIVERED; | ||
| const isDelivered = [StatusType.DELIVERED, StatusType.SEEN].includes(messageEntity.status()); |
There was a problem hiding this comment.
This is the fix.
For more explanation, here is what the enum looks like
export enum StatusType {
DELIVERED = 3,
FAILED = 0,
FEDERATION_ERROR = 5,
SEEN = 4,
SENDING = 1,
SENT = 2,
UNSPECIFIED = -1,
}as you can see FEDERATION_ERROR has a higher value than DELIVERED and thus caused the bug
V-Gira
approved these changes
Sep 14, 2023
PatrykBuniX
approved these changes
Sep 14, 2023
przemvs
approved these changes
Sep 14, 2023
Codecov Report
@@ Coverage Diff @@
## dev #15816 +/- ##
=======================================
Coverage 44.48% 44.49%
=======================================
Files 673 673
Lines 22713 22711 -2
Branches 5166 5166
=======================================
Hits 10105 10105
+ Misses 11320 11318 -2
Partials 1288 1288 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
We used to have a check that was to permissive to know if a message is delivered.
Now that we have errors in the
StatusTypeenum that have a value higher thanStatusType.DELIVEREDwe need to be explicit about the status that could be considereddelivered.Screenshots/Screencast (for UI changes)
Before
After
Checklist