fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! refactor(api): moving organization API resourced based

This commit is contained in:
Iraq Jaber
2025-05-04 18:00:38 +02:00
parent 492ac01af4
commit b8498e89ee

View File

@@ -7,6 +7,7 @@ import (
"errors"
"fmt"
"os"
"strings"
"testing"
"time"
@@ -492,12 +493,7 @@ func TestServer_DeactivateReactivateOrganization(t *testing.T) {
deactivate_res, err = Client.DeactivateOrganization(ctx, &v2beta_org.DeactivateOrganizationRequest{
Id: orgId,
})
require.NoError(t, err)
assert.NotZero(t, deactivate_res.GetDetails().GetSequence())
gotCD = deactivate_res.GetDetails().GetChangeDate().AsTime()
now = time.Now()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
assert.NotEmpty(t, deactivate_res.GetDetails().GetResourceOwner())
require.Contains(t, err.Error(), "Organisation is already deactivated")
// 6. repeat check organization state is still deactivated
res, err = Client.GetOrganizationByID(ctx, &v2beta_org.GetOrganizationByIDRequest{
@@ -528,12 +524,7 @@ func TestServer_DeactivateReactivateOrganization(t *testing.T) {
reactivate_res, err = Client.ReactivateOrganization(ctx, &v2beta_org.ReactivateOrganizationRequest{
Id: orgId,
})
require.NoError(t, err)
assert.NotZero(t, reactivate_res.GetDetails().GetSequence())
gotCD = reactivate_res.GetDetails().GetChangeDate().AsTime()
now = time.Now()
assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute))
assert.NotEmpty(t, reactivate_res.GetDetails().GetResourceOwner())
require.Contains(t, err.Error(), "Organisation is already active")
// 10. repeat check organization state is still active
res, err = Client.GetOrganizationByID(ctx, &v2beta_org.GetOrganizationByIDRequest{
@@ -693,7 +684,9 @@ func TestServer_ValidateOrganizationDomain(t *testing.T) {
_, err = AdminClient.UpdateDomainPolicy(CTX, &admin.UpdateDomainPolicyRequest{
ValidateOrgDomains: true,
})
require.NoError(t, err)
if err != nil && !strings.Contains(err.Error(), "Organisation is already deactivated") {
require.NoError(t, err)
}
domain := "www.domainnn.com"
_, err = Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{