Merge pull request #44 from mongodb/teamsProjects

Teams and projects resource were refactored due to issues

Author: marinsalinas

mongodbatlas/projects.go

@@ -30,7 +30,7 @@ type ProjectsService interface {
 	Create(context.Context, *Project) (*Project, *Response, error)
 	Delete(context.Context, string) (*Response, error)
 	GetProjectTeamsAssigned(context.Context, string) (*TeamsAssigned, *Response, error)
-	AddTeamsToProject(context.Context, string, *ProjectTeam) (*TeamsAssigned, *Response, error)
+	AddTeamsToProject(context.Context, string, []*ProjectTeam) (*TeamsAssigned, *Response, error)
 }
 
 //ProjectsServiceOp handles communication with the Projects related methos of the
@@ -65,15 +65,10 @@ type Result struct {
 	TeamID    string   `json:"teamId"`
 }
 
-// RoleName represents the kind of user role in your project
-type RoleName struct {
-	RoleName string `json:"rolesNames"`
-}
-
 // ProjectTeam reperesents the kind of role that has the team
 type ProjectTeam struct {
-	TeamID string      `json:"teamId"`
-	Roles  []*RoleName `json:"roles"`
+	TeamID    string   `json:"teamId,omitempty"`
+	RoleNames []string `json:"roleNames,omitempty"`
 }
 
 // TeamsAssigned represents the one team assigned to the project.
@@ -216,7 +211,7 @@ func (s *ProjectsServiceOp) GetProjectTeamsAssigned(ctx context.Context, project
 
 //AddTeamsToProject adds teams to a project
 //See more: https://docs.atlas.mongodb.com/reference/api/project-add-team/
-func (s *ProjectsServiceOp) AddTeamsToProject(ctx context.Context, projectID string, createRequest *ProjectTeam) (*TeamsAssigned, *Response, error) {
+func (s *ProjectsServiceOp) AddTeamsToProject(ctx context.Context, projectID string, createRequest []*ProjectTeam) (*TeamsAssigned, *Response, error) {
 	if createRequest == nil {
 		return nil, nil, NewArgError("createRequest", "cannot be nil")
 	}

mongodbatlas/projects_test.go

@@ -327,13 +327,10 @@ func TestProject_AddTeamsToProject(t *testing.T) {
 
 	projectID := "5a0a1e7e0f2912c554080adc"
 
-	createRequest := &ProjectTeam{
-		TeamID: "{TEAM-ID}",
-		Roles: []*RoleName{
-			{RoleName: GroupOwner},
-			{RoleName: GroupReadOnly},
-		},
-	}
+	createRequest := []*ProjectTeam{{
+		TeamID:    "{TEAM-ID}",
+		RoleNames: []string{"GROUP_OWNER", "GROUP_READ_ONLY"},
+	}}
 
 	mux.HandleFunc(fmt.Sprintf("/groups/%s/teams", projectID), func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprint(w, `{

mongodbatlas/teams.go

@@ -230,8 +230,7 @@ func (s *TeamsServiceOp) UpdateTeamRoles(ctx context.Context, orgID string, team
 		return nil, nil, NewArgError("updateTeamRolesRequest", "cannot be nil")
 	}
 
-	basePath := fmt.Sprintf(teamsBasePath, orgID)
-	path := fmt.Sprintf("%s/%s", basePath, teamID)
+	path := fmt.Sprintf("groups/%s/teams/%s", orgID, teamID)
 
 	req, err := s.client.NewRequest(ctx, http.MethodPatch, path, updateTeamRolesRequest)
 	if err != nil {

mongodbatlas/teams_test.go

@@ -344,7 +344,7 @@ func TestTeams_UpdateTeamRoles(t *testing.T) {
 
 	teamID := "6b720e1087d9d66b272f1c86"
 
-	mux.HandleFunc(fmt.Sprintf("/orgs/%s/teams/%s", orgID, teamID), func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc(fmt.Sprintf("/groups/%s/teams/%s", orgID, teamID), func(w http.ResponseWriter, r *http.Request) {
 		expected := map[string]interface{}{
 			"roleNames": []interface{}{"GROUP_OWNER"},
 		}