diff --git a/shared.go b/shared.go index 74ef4738..eef23979 100644 --- a/shared.go +++ b/shared.go @@ -31298,16 +31298,12 @@ func HandleDeleteOrg(resp http.ResponseWriter, request *http.Request) { } parentOrg.ChildOrgs = newChildOrg - allChildOrgs, err := GetAllChildOrgs(ctx, parentOrg.Id) - if err != nil { - log.Printf("[WARNING] Failed getting all child orgs for parent org '%s': %s", parentOrg.Id, err) - resp.WriteHeader(500) - resp.Write([]byte(`{"success": false, "reason": "Failed getting all child orgs"}`)) - return - } - parentOrg.SyncUsage.MultiTenant.Counter = int64(len(allChildOrgs)) + 1 - parentOrg.SyncFeatures.MultiTenant.Usage = int64(len(allChildOrgs)) + 1 + suborgCacheKey := fmt.Sprintf("%s_childorgs", parentOrg.Id) + DeleteCache(ctx, suborgCacheKey) + DeleteCache(ctx, fmt.Sprintf("Organizations_%s", subOrg.Id)) + parentOrg.SyncUsage.MultiTenant.Counter = int64(len(newChildOrg)) + 1 + parentOrg.SyncFeatures.MultiTenant.Usage = int64(len(newChildOrg)) + 1 err = SetOrg(ctx, *parentOrg, parentOrg.Id) if err != nil { @@ -31327,10 +31323,6 @@ func HandleDeleteOrg(resp http.ResponseWriter, request *http.Request) { user.ActiveOrg.Name = currentActiveOrg.Name } - suborgCacheKey := fmt.Sprintf("%s_childorgs", parentOrg.Id) - DeleteCache(ctx, suborgCacheKey) - DeleteCache(ctx, fmt.Sprintf("Organizations_%s", subOrg.Id)) - err = SetUser(ctx, &user, true) if err != nil { log.Printf("[WARNING] Failed setting user '%s': %s", user.Username, err)