Merge branch 'master' into stackdriver-plugin

pkg/models/team_member.go

@@ -12,10 +12,11 @@ var (
 
 // TeamMember model
 type TeamMember struct {
-	Id     int64
-	OrgId  int64
-	TeamId int64
-	UserId int64
+	Id       int64
+	OrgId    int64
+	TeamId   int64
+	UserId   int64
+	External bool
 
 	Created time.Time
 	Updated time.Time
@@ -25,9 +26,10 @@ type TeamMember struct {
 // COMMANDS
 
 type AddTeamMemberCommand struct {
-	UserId int64 `json:"userId" binding:"Required"`
-	OrgId  int64 `json:"-"`
-	TeamId int64 `json:"-"`
+	UserId   int64 `json:"userId" binding:"Required"`
+	OrgId    int64 `json:"-"`
+	TeamId   int64 `json:"-"`
+	External bool  `json:"-"`
 }
 
 type RemoveTeamMemberCommand struct {
@@ -40,20 +42,23 @@ type RemoveTeamMemberCommand struct {
 // QUERIES
 
 type GetTeamMembersQuery struct {
-	OrgId  int64
-	TeamId int64
-	UserId int64
-	Result []*TeamMemberDTO
+	OrgId    int64
+	TeamId   int64
+	UserId   int64
+	External bool
+	Result   []*TeamMemberDTO
 }
 
 // ----------------------
 // Projections and DTOs
 
 type TeamMemberDTO struct {
-	OrgId     int64  `json:"orgId"`
-	TeamId    int64  `json:"teamId"`
-	UserId    int64  `json:"userId"`
-	Email     string `json:"email"`
-	Login     string `json:"login"`
-	AvatarUrl string `json:"avatarUrl"`
+	OrgId     int64    `json:"orgId"`
+	TeamId    int64    `json:"teamId"`
+	UserId    int64    `json:"userId"`
+	External  bool     `json:"-"`
+	Email     string   `json:"email"`
+	Login     string   `json:"login"`
+	AvatarUrl string   `json:"avatarUrl"`
+	Labels    []string `json:"labels"`
 }