fix: removed unsupported discussions_url and discussions_total_count columns from the github_team table (#531)

Author: JayRovacsek

github/models/team.go

@@ -12,7 +12,6 @@ type Team struct {
 	CombinedSlug   string            `graphql:"combinedSlug @include(if:$includeTeamCombinedSlug)" json:"combined_slug"`
 	CreatedAt      time.Time         `graphql:"createdAt @include(if:$includeTeamCreatedAt)" json:"created_at"`
 	Description    string            `graphql:"description @include(if:$includeTeamDescription)" json:"description"`
-	DiscussionsUrl string            `graphql:"discussionsUrl @include(if:$includeTeamDiscussionsUrl)" json:"discussions_url"`
 	EditTeamUrl    string            `graphql:"editTeamUrl @include(if:$includeTeamEditTeamUrl)" json:"edit_team_url"`
 	MembersUrl     string            `graphql:"membersUrl @include(if:$includeTeamMembersUrl)" json:"members_url"`
 	NewTeamUrl     string            `graphql:"newTeamUrl @include(if:$includeTeamNewTeamUrl)" json:"new_team_url"`
@@ -36,7 +35,6 @@ type TeamWithCounts struct {
 	Team
 	Ancestors    Count `graphql:"ancestors @include(if:$includeTeamAncestors)" json:"ancestors"`
 	ChildTeams   Count `graphql:"childTeams @include(if:$includeTeamChildTeams)" json:"child_teams"`
-	Discussions  Count `graphql:"discussions @include(if:$includeTeamDiscussions)" json:"discussions"`
 	Invitations  Count `graphql:"invitations @include(if:$includeTeamInvitations)" json:"invitations"`
 	Members      Count `graphql:"members @include(if:$includeTeamMembers)" json:"members"`
 	ProjectsV2   Count `graphql:"projectsV2 @include(if:$includeTeamProjectsV2)" json:"projects_v2"`

github/table_github_team.go

@@ -27,14 +27,12 @@ func gitHubTeamColumns() []*plugin.Column {
 		{Name: "privacy", Type: proto.ColumnType_STRING, Description: "The privacy setting of the team (VISIBLE or SECRET).", Transform: transform.FromValue(), Hydrate: teamHydratePrivacy},
 		{Name: "ancestors_total_count", Type: proto.ColumnType_INT, Description: "Count of ancestors this team has.", Transform: transform.FromValue(), Hydrate: teamHydrateAncestorsTotalCount},
 		{Name: "child_teams_total_count", Type: proto.ColumnType_INT, Description: "Count of children teams this team has.", Transform: transform.FromValue(), Hydrate: teamHydrateChildTeamsTotalCount},
-		{Name: "discussions_total_count", Type: proto.ColumnType_INT, Description: "Count of team discussions.", Transform: transform.FromValue(), Hydrate: teamHydrateDiscussionsTotalCount},
 		{Name: "invitations_total_count", Type: proto.ColumnType_INT, Description: "Count of outstanding team member invitations for the team.", Transform: transform.FromValue(), Hydrate: teamHydrateInvitationsTotalCount},
 		{Name: "members_total_count", Type: proto.ColumnType_INT, Description: "Count of team members.", Transform: transform.FromValue(), Hydrate: teamHydrateMembersTotalCount},
 		{Name: "projects_v2_total_count", Type: proto.ColumnType_INT, Description: "Count of the teams v2 projects.", Transform: transform.FromValue(), Hydrate: teamHydrateProjectsV2TotalCount},
 		{Name: "repositories_total_count", Type: proto.ColumnType_INT, Description: "Count of repositories the team has.", Transform: transform.FromValue(), Hydrate: teamHydrateRepositoriesTotalCount},
 		{Name: "url", Type: proto.ColumnType_STRING, Description: "URL for the team page in GitHub.", Transform: transform.FromValue(), Hydrate: teamHydrateUrl},
 		{Name: "avatar_url", Type: proto.ColumnType_STRING, Description: "URL for teams avatar.", Transform: transform.FromValue(), Hydrate: teamHydrateAvatarUrl},
-		{Name: "discussions_url", Type: proto.ColumnType_STRING, Description: "URL for team discussions.", Transform: transform.FromValue(), Hydrate: teamHydrateDiscussionsUrl},
 		{Name: "edit_team_url", Type: proto.ColumnType_STRING, Description: "URL for editing this team.", Transform: transform.FromValue(), Hydrate: teamHydrateEditTeamUrl},
 		{Name: "members_url", Type: proto.ColumnType_STRING, Description: "URL for team members.", Transform: transform.FromValue(), Hydrate: teamHydrateMembersUrl},
 		{Name: "new_team_url", Type: proto.ColumnType_STRING, Description: "The HTTP URL creating a new team.", Transform: transform.FromValue(), Hydrate: teamHydrateNewTeamUrl},

github/team_utils.go

@@ -23,7 +23,6 @@ func appendTeamColumnIncludes(m *map[string]interface{}, cols []string) {
 	(*m)["includeTeamCombinedSlug"] = githubv4.Boolean(slices.Contains(cols, "combined_slug"))
 	(*m)["includeTeamCreatedAt"] = githubv4.Boolean(slices.Contains(cols, "created_at"))
 	(*m)["includeTeamDescription"] = githubv4.Boolean(slices.Contains(cols, "description"))
-	(*m)["includeTeamDiscussionsUrl"] = githubv4.Boolean(slices.Contains(cols, "discussions_url"))
 	(*m)["includeTeamEditTeamUrl"] = githubv4.Boolean(slices.Contains(cols, "edit_team_url"))
 	(*m)["includeTeamMembersUrl"] = githubv4.Boolean(slices.Contains(cols, "members_url"))
 	(*m)["includeTeamNewTeamUrl"] = githubv4.Boolean(slices.Contains(cols, "new_team_url"))
@@ -38,7 +37,6 @@ func appendTeamColumnIncludes(m *map[string]interface{}, cols []string) {
 	(*m)["includeTeamSubscription"] = githubv4.Boolean(slices.Contains(cols, "subscription"))
 	(*m)["includeTeamAncestors"] = githubv4.Boolean(slices.Contains(cols, "ancestors_total_count"))
 	(*m)["includeTeamChildTeams"] = githubv4.Boolean(slices.Contains(cols, "child_teams_total_count"))
-	(*m)["includeTeamDiscussions"] = githubv4.Boolean(slices.Contains(cols, "discussions_total_count"))
 	(*m)["includeTeamInvitations"] = githubv4.Boolean(slices.Contains(cols, "invitations_total_count"))
 	(*m)["includeTeamMembers"] = githubv4.Boolean(slices.Contains(cols, "members_total_count"))
 	(*m)["includeTeamProjectsV2"] = githubv4.Boolean(slices.Contains(cols, "projects_v2_total_count"))
@@ -77,14 +75,6 @@ func teamHydrateDescription(_ context.Context, _ *plugin.QueryData, h *plugin.Hy
 	return team.Description, nil
 }
 
-func teamHydrateDiscussionsUrl(_ context.Context, _ *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
-	team, err := extractTeamFromHydrateItem(h)
-	if err != nil {
-		return nil, err
-	}
-	return team.DiscussionsUrl, nil
-}
-
 func teamHydrateEditTeamUrl(_ context.Context, _ *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
 	team, err := extractTeamFromHydrateItem(h)
 	if err != nil {
@@ -197,14 +187,6 @@ func teamHydrateChildTeamsTotalCount(_ context.Context, _ *plugin.QueryData, h *
 	return teamWithCounts.ChildTeams.TotalCount, nil
 }
 
-func teamHydrateDiscussionsTotalCount(_ context.Context, _ *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
-	teamWithCounts, err := extractTeamFromHydrateItem(h)
-	if err != nil {
-		return nil, err
-	}
-	return teamWithCounts.Discussions.TotalCount, nil
-}
-
 func teamHydrateInvitationsTotalCount(_ context.Context, _ *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
 	teamWithCounts, err := extractTeamFromHydrateItem(h)
 	if err != nil {