Merge pull request #1631 from mrf/mrf/1630-projectmember-struct-expir…

…es-date

Updates ProjectMember struct with expected format for ExpiresAt field.

project_members_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -291,19 +292,21 @@ func TestProjectMembersService_EditProjectMember(t *testing.T) {
 			  "web_url": "http://192.168.1.8:3000/root",
 			  "access_level": 30,
 			  "email": "venkatesh.thalluri@example.com",
-			  "expires_at": null,
+			  "expires_at": "2023-10-22T14:13:35Z",
 			  "group_saml_identity": null
 			}
 		`)
 	})
 
+	ExpectedExpiry := time.Date(2023, time.October, 22, 14, 13, 35, 0, time.UTC)
+
 	want := &ProjectMember{
 		ID:          1,
 		Username:    "venkatesh_thalluri",
 		Email:       "venkatesh.thalluri@example.com",
 		Name:        "Venkatesh Thalluri",
 		State:       "active",
-		ExpiresAt:   nil,
+		ExpiresAt:   &ExpectedExpiry,
 		AccessLevel: 30,
 		WebURL:      "http://192.168.1.8:3000/root",
 		AvatarURL:   "https://www.gravatar.com/avatar/c2525a7f58ae3776070e44c106c48e15?s=80&d=identicon",

projects.go

@@ -1170,15 +1170,15 @@ func (s *ProjectsService) DeleteSharedProjectFromGroup(pid interface{}, groupID
 // ProjectMember represents a project member.
 //
 // GitLab API docs:
-// https://docs.gitlab.com/ee/api/projects.html#list-project-team-members
+// https://docs.gitlab.com/ee/api/members.html#list-all-members-of-a-group-or-project
 type ProjectMember struct {
 	ID          int              `json:"id"`
 	Username    string           `json:"username"`
 	Email       string           `json:"email"`
 	Name        string           `json:"name"`
 	State       string           `json:"state"`
 	CreatedAt   *time.Time       `json:"created_at"`
-	ExpiresAt   *ISOTime         `json:"expires_at"`
+	ExpiresAt   *time.Time       `json:"expires_at"`
 	AccessLevel AccessLevelValue `json:"access_level"`
 	WebURL      string           `json:"web_url"`
 	AvatarURL   string           `json:"avatar_url"`