From 0b6281d86533e7ff8a4004b87c8e2200643a34c1 Mon Sep 17 00:00:00 2001 From: Nicolas Lopes Date: Sun, 13 Oct 2024 19:48:58 -0300 Subject: [PATCH 1/2] feat: add role_name field for organization invitation and membership --- organization_invitation.go | 1 + organization_membership.go | 1 + 2 files changed, 2 insertions(+) diff --git a/organization_invitation.go b/organization_invitation.go index ad89767f..f7c8916d 100644 --- a/organization_invitation.go +++ b/organization_invitation.go @@ -16,6 +16,7 @@ type OrganizationInvitation struct { ID string `json:"id"` EmailAddress string `json:"email_address"` Role string `json:"role"` + RoleName string `json:"role_name"` OrganizationID string `json:"organization_id"` PublicOrganizationData *PublicOrganizationData `json:"public_organization_data,omitempty"` Status string `json:"status"` diff --git a/organization_membership.go b/organization_membership.go index 174e79d4..47d9c56c 100644 --- a/organization_membership.go +++ b/organization_membership.go @@ -11,6 +11,7 @@ type OrganizationMembership struct { PublicMetadata json.RawMessage `json:"public_metadata"` PrivateMetadata json.RawMessage `json:"private_metadata"` Role string `json:"role"` + RoleName string `json:"role_name"` CreatedAt int64 `json:"created_at"` UpdatedAt int64 `json:"updated_at"` PublicUserData *OrganizationMembershipPublicUserData `json:"public_user_data,omitempty"` From 05637058d71122384402c499a443bd4d5fe90dc2 Mon Sep 17 00:00:00 2001 From: Nicolas Lopes Date: Mon, 14 Oct 2024 11:29:29 -0300 Subject: [PATCH 2/2] test: add role_name to test respone --- organizationinvitation/client_test.go | 4 +++- organizationmembership/client_test.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/organizationinvitation/client_test.go b/organizationinvitation/client_test.go index 40fe5090..62450f4d 100644 --- a/organizationinvitation/client_test.go +++ b/organizationinvitation/client_test.go @@ -131,7 +131,7 @@ func TestOrganizationInvitationClientGet(t *testing.T) { config.HTTPClient = &http.Client{ Transport: &clerktest.RoundTripper{ T: t, - Out: json.RawMessage(fmt.Sprintf(`{"id":"%s","object":"organization_invitation","email_address":"string","role":"string","organization_id":"%s","status":"string","public_metadata":{},"private_metadata":{},"created_at":0,"updated_at":0}`, id, organizationID)), + Out: json.RawMessage(fmt.Sprintf(`{"id":"%s","object":"organization_invitation","email_address":"string","role":"string","role_name":"string","organization_id":"%s","status":"string","public_metadata":{},"private_metadata":{},"created_at":0,"updated_at":0}`, id, organizationID)), Method: http.MethodGet, Path: "/v1/organizations/" + organizationID + "/invitations/" + id, }, @@ -144,6 +144,8 @@ func TestOrganizationInvitationClientGet(t *testing.T) { require.NoError(t, err) require.Equal(t, id, response.ID) require.Equal(t, organizationID, response.OrganizationID) + require.Equal(t, "string", response.RoleName) + require.Equal(t, "string", response.Role) } func TestOrganizationInvitationClientGet_Error(t *testing.T) { diff --git a/organizationmembership/client_test.go b/organizationmembership/client_test.go index 64d060e0..eb09ebbc 100644 --- a/organizationmembership/client_test.go +++ b/organizationmembership/client_test.go @@ -176,7 +176,9 @@ func TestOrganizationMembershipClientList(t *testing.T) { "data": [{ "id":"%s", "organization":{"id":"%s"}, - "public_user_data":{"user_id":"%s"} + "public_user_data":{"user_id":"%s"}, + "role": "string", + "role_name": "string" }], "total_count": 1 }`, @@ -204,4 +206,6 @@ func TestOrganizationMembershipClientList(t *testing.T) { require.Equal(t, id, list.OrganizationMemberships[0].ID) require.Equal(t, organizationID, list.OrganizationMemberships[0].Organization.ID) require.Equal(t, userID, list.OrganizationMemberships[0].PublicUserData.UserID) + require.Equal(t, "string", list.OrganizationMemberships[0].RoleName) + require.Equal(t, "string", list.OrganizationMemberships[0].Role) }