diff options
| author | Corey Hulen <corey@hulen.com> | 2017-09-04 02:49:40 -0700 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-09-04 10:49:40 +0100 |
| commit | 9c1f6c9fd5716fece1afaf8a3d6a7dd235744a38 (patch) | |
| tree | fd41d02f9c938b20f5db81ce31e6b2123f0deace /store/sql_compliance_store.go | |
| parent | 670bfbf62686ebe9f2ab332733d851a62b6950b0 (diff) | |
| download | chat-9c1f6c9fd5716fece1afaf8a3d6a7dd235744a38.tar.gz chat-9c1f6c9fd5716fece1afaf8a3d6a7dd235744a38.tar.bz2 chat-9c1f6c9fd5716fece1afaf8a3d6a7dd235744a38.zip | |
PLT-7497 adding DMs to complinace export (#7353)
Diffstat (limited to 'store/sql_compliance_store.go')
| -rw-r--r-- | store/sql_compliance_store.go | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/store/sql_compliance_store.go b/store/sql_compliance_store.go index 4ffbcf113..0a9626eed 100644 --- a/store/sql_compliance_store.go +++ b/store/sql_compliance_store.go @@ -180,7 +180,7 @@ func (s SqlComplianceStore) ComplianceExport(job *model.Compliance) StoreChannel } query := - `SELECT + `(SELECT Teams.Name AS TeamName, Teams.DisplayName AS TeamDisplayName, Channels.Name AS ChannelName, @@ -212,8 +212,41 @@ func (s SqlComplianceStore) ComplianceExport(job *model.Compliance) StoreChannel AND Posts.CreateAt > :StartTime AND Posts.CreateAt <= :EndTime ` + emailQuery + ` - ` + keywordQuery + ` - ORDER BY Posts.CreateAt + ` + keywordQuery + `) + UNION ALL + (SELECT + "direct-message" AS TeamName, + "Direct Message" AS TeamDisplayName, + Channels.Name AS ChannelName, + Channels.DisplayName AS ChannelDisplayName, + Users.Username AS UserUsername, + Users.Email AS UserEmail, + Users.Nickname AS UserNickname, + Posts.Id AS PostId, + Posts.CreateAt AS PostCreateAt, + Posts.UpdateAt AS PostUpdateAt, + Posts.DeleteAt AS PostDeleteAt, + Posts.RootId AS PostRootId, + Posts.ParentId AS PostParentId, + Posts.OriginalId AS PostOriginalId, + Posts.Message AS PostMessage, + Posts.Type AS PostType, + Posts.Props AS PostProps, + Posts.Hashtags AS PostHashtags, + Posts.FileIds AS PostFileIds + FROM + Channels, + Users, + Posts + WHERE + Channels.TeamId = '' + AND Posts.ChannelId = Channels.Id + AND Posts.UserId = Users.Id + AND Posts.CreateAt > :StartTime + AND Posts.CreateAt <= :EndTime + ` + emailQuery + ` + ` + keywordQuery + `) + ORDER BY PostCreateAt LIMIT 30000` var cposts []*model.CompliancePost |