From 7bbf30d6bccc8f6f01e64225a0232608f118d899 Mon Sep 17 00:00:00 2001 From: Tim Scheuermann Date: Mon, 11 Jul 2022 16:05:09 +0300 Subject: [PATCH] MM-45168 GraphQL: add fields to Team (#20610) --- api4/resolver_team_member_test.go | 22 ++++++++++++++++++++-- api4/schema.graphqls | 5 +++++ model/team.go | 8 ++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/api4/resolver_team_member_test.go b/api4/resolver_team_member_test.go index 45aa49d23b..671260e6e3 100644 --- a/api4/resolver_team_member_test.go +++ b/api4/resolver_team_member_test.go @@ -31,8 +31,14 @@ func TestGraphQLTeamMembers(t *testing.T) { NickName string `json:"nickname"` } `json:"user"` Team struct { - ID string `json:"id"` - DisplayName string `json:"displayName"` + ID string `json:"id"` + DisplayName string `json:"displayName"` + Name string `json:"name"` + CreateAt float64 `json:"createAt"` + DeleteAt float64 `json:"deleteAt"` + SchemeId *string `json:"schemeId"` + PolicyId *string `json:"policyId"` + CloudLimitsArchived bool `json:"cloudLimitsArchived"` } `json:"team"` Roles []struct { ID string `json:"id"` @@ -113,6 +119,12 @@ func TestGraphQLTeamMembers(t *testing.T) { team { id displayName + name + createAt + deleteAt + schemeId + policyId + cloudLimitsArchived } user { id @@ -143,6 +155,12 @@ func TestGraphQLTeamMembers(t *testing.T) { tm := q.TeamMembers[0] assert.Equal(t, th.BasicTeam.Id, tm.Team.ID) assert.Equal(t, th.BasicTeam.DisplayName, tm.Team.DisplayName) + assert.Equal(t, th.BasicTeam.Name, tm.Team.Name) + assert.Equal(t, th.BasicTeam.CreateAt_(), tm.Team.CreateAt) + assert.Equal(t, th.BasicTeam.DeleteAt_(), tm.Team.DeleteAt) + assert.Equal(t, th.BasicTeam.SchemeId, tm.Team.SchemeId) + assert.Equal(t, th.BasicTeam.PolicyID, tm.Team.PolicyId) + assert.Equal(t, th.BasicTeam.CloudLimitsArchived, tm.Team.CloudLimitsArchived) assert.Equal(t, th.BasicUser.Id, tm.User.ID) assert.Equal(t, th.BasicUser.Username, tm.User.Username) diff --git a/api4/schema.graphqls b/api4/schema.graphqls index 717a05c247..9fd37d686f 100644 --- a/api4/schema.graphqls +++ b/api4/schema.graphqls @@ -142,7 +142,9 @@ type Team { id: String! displayName : String! name : String! + createAt : Float! updateAt : Float! + deleteAt : Float! description : String! email : String! type : String! @@ -152,6 +154,9 @@ type Team { lastTeamIconUpdate: Float! groupConstrained: Boolean allowOpenInvite: Boolean! + schemeId : String + policyId : String + cloudLimitsArchived: Boolean! } type TeamMember { diff --git a/model/team.go b/model/team.go index d37fdd05df..b5b67a03c8 100644 --- a/model/team.go +++ b/model/team.go @@ -269,10 +269,18 @@ func (o *Team) ShallowCopy() *Team { // so we have to pass the data in float64. The _ at the end is // a hack to keep the attribute name same in GraphQL schema. +func (o *Team) CreateAt_() float64 { + return float64(o.UpdateAt) +} + func (o *Team) UpdateAt_() float64 { return float64(o.UpdateAt) } +func (o *Team) DeleteAt_() float64 { + return float64(o.DeleteAt) +} + func (o *Team) LastTeamIconUpdate_() float64 { return float64(o.LastTeamIconUpdate) }