-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: add archived field to conversations table (WPB-4471) (#2056)
* feat: add otr_archived to database and db mappers * feat: add otr_archived to logic conversation and mapper * feat: add missing fields from select query * feat: add missing fields for connection conversation * feat: add missing fields for web mappers conversation * test: adjust tests with missing new fields * chore: add db migration file * chore: rename db fields to remove prefix otr * chore: rename params to remove prefix otr * test: rename params to remove prefix otr in tests * chore: rename archivedRef to archivedDateTime to represente correctly its value * chore: rename archivedRef to archivedDateTime on mappers and repos * test: rename archivedRef to archivedDateTime on tests * chore: change archived date time from String to Instant * chore: adjust domain archived date to instant
- Loading branch information
1 parent
b2a859c
commit 38df69b
Showing
22 changed files
with
256 additions
and
54 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| ALTER TABLE Conversation ADD COLUMN archived INTEGER AS Boolean NOT NULL DEFAULT 0; | ||
| ALTER TABLE Conversation ADD COLUMN archived_date_time INTEGER AS Instant; | ||
|
|
||
| DROP VIEW IF EXISTS ConversationDetails; | ||
|
|
||
| CREATE VIEW IF NOT EXISTS ConversationDetails AS | ||
| SELECT | ||
| Conversation.qualified_id AS qualifiedId, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.name | ||
| WHEN 'CONNECTION_PENDING' THEN connection_user.name | ||
| ELSE Conversation.name | ||
| END AS name, | ||
| Conversation.type, | ||
| Call.status AS callStatus, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.preview_asset_id | ||
| WHEN 'CONNECTION_PENDING' THEN connection_user.preview_asset_id | ||
| END AS previewAssetId, | ||
| Conversation.muted_status AS mutedStatus, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.team | ||
| ELSE Conversation.team_id | ||
| END AS teamId, | ||
| CASE (Conversation.type) | ||
| WHEN 'CONNECTION_PENDING' THEN Connection.last_update_date | ||
| ELSE Conversation.last_modified_date | ||
| END AS lastModifiedDate, | ||
| Conversation.last_read_date AS lastReadDate, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.user_availability_status | ||
| WHEN 'CONNECTION_PENDING' THEN connection_user.user_availability_status | ||
| END AS userAvailabilityStatus, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.user_type | ||
| WHEN 'CONNECTION_PENDING' THEN connection_user.user_type | ||
| END AS userType, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.bot_service | ||
| WHEN 'CONNECTION_PENDING' THEN connection_user.bot_service | ||
| END AS botService, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.deleted | ||
| WHEN 'CONNECTION_PENDING' THEN connection_user.deleted | ||
| END AS userDeleted, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.defederated | ||
| WHEN 'CONNECTION_PENDING' THEN connection_user.defederated | ||
| END AS userDefederated, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.connection_status | ||
| WHEN 'CONNECTION_PENDING' THEN connection_user.connection_status | ||
| END AS connectionStatus, | ||
| CASE (Conversation.type) | ||
| WHEN 'ONE_ON_ONE' THEN User.qualified_id | ||
| WHEN 'CONNECTION_PENDING' THEN connection_user.qualified_id | ||
| END AS otherUserId, | ||
| CASE | ||
| WHEN ((SELECT id FROM SelfUser LIMIT 1) LIKE (Conversation.creator_id || '@%')) THEN 1 | ||
| ELSE 0 | ||
| END AS isCreator, | ||
| Conversation.last_notified_date AS lastNotifiedMessageDate, | ||
| memberRole. role AS selfRole, | ||
| Conversation.protocol, | ||
| Conversation.mls_cipher_suite, | ||
| Conversation.mls_epoch, | ||
| Conversation.mls_group_id, | ||
| Conversation.mls_last_keying_material_update_date, | ||
| Conversation.mls_group_state, | ||
| Conversation.access_list, | ||
| Conversation.access_role_list, | ||
| Conversation.team_id, | ||
| Conversation.mls_proposal_timer, | ||
| Conversation.muted_time, | ||
| Conversation.creator_id, | ||
| Conversation.last_modified_date, | ||
| Conversation.receipt_mode, | ||
| Conversation.message_timer, | ||
| Conversation.user_message_timer, | ||
| Conversation.incomplete_metadata, | ||
| Conversation.archived, | ||
| Conversation.archived_date_time | ||
| FROM Conversation | ||
| LEFT JOIN Member ON Conversation.qualified_id = Member.conversation | ||
| AND Conversation.type IS 'ONE_ON_ONE' | ||
| AND Member.user IS NOT (SELECT SelfUser.id FROM SelfUser LIMIT 1) | ||
| LEFT JOIN Member AS memberRole ON Conversation.qualified_id = memberRole.conversation | ||
| AND memberRole.user IS (SELECT SelfUser.id FROM SelfUser LIMIT 1) | ||
| LEFT JOIN User ON User.qualified_id = Member.user | ||
| LEFT JOIN Connection ON Connection.qualified_conversation = Conversation.qualified_id | ||
| AND (Connection.status = 'SENT' | ||
| OR Connection.status = 'PENDING' | ||
| OR Connection.status = 'NOT_CONNECTED' | ||
| AND Conversation.type IS 'CONNECTION_PENDING') | ||
| LEFT JOIN User AS connection_user ON Connection.qualified_to = connection_user.qualified_id | ||
| LEFT JOIN Call ON Call.id IS (SELECT id FROM Call WHERE Call.conversation_id = Conversation.qualified_id AND Call.status IS 'STILL_ONGOING' ORDER BY created_at DESC LIMIT 1); |
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
Oops, something went wrong.