From 7b2861de3a09cf00d00b0872cc537d54302c4bfa Mon Sep 17 00:00:00 2001 From: Jonathan Fritz Date: Mon, 12 Feb 2018 16:14:52 -0500 Subject: Removed unused fields from ChannelMemberHistory table, introduced new model.ChannelMemberHistoryResult object that includes those fields that are selected from a join on other tables --- model/ChannelMemberHistoryResult.go | 15 +++++++++++++++ model/channel_member_history.go | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 model/ChannelMemberHistoryResult.go (limited to 'model') diff --git a/model/ChannelMemberHistoryResult.go b/model/ChannelMemberHistoryResult.go new file mode 100644 index 000000000..ed3e79639 --- /dev/null +++ b/model/ChannelMemberHistoryResult.go @@ -0,0 +1,15 @@ +// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package model + +type ChannelMemberHistoryResult struct { + ChannelId string + UserId string + JoinTime int64 + LeaveTime *int64 + + // these two fields are never set in the database - when we SELECT, we join on Users to get them + UserEmail string `db:"Email"` + Username string +} diff --git a/model/channel_member_history.go b/model/channel_member_history.go index 47c59d54e..55435c320 100644 --- a/model/channel_member_history.go +++ b/model/channel_member_history.go @@ -8,8 +8,4 @@ type ChannelMemberHistory struct { UserId string JoinTime int64 LeaveTime *int64 - - // these two fields are never set in the database - when we SELECT, we join on Users to get them - UserEmail string `db:"Email"` - Username string } -- cgit v1.2.3-1-g7c22