@dosgato/api 0.0.2 → 0.0.5

package/dist/group/group.database.js

@@ -1,5 +1,5 @@
 import db from 'mysql2-async/db';
-import { Cache, hashify, unique } from 'txstate-utils';
+import { Cache, hashify } from 'txstate-utils';
 import { Group } from '../internal.js';
 class HierarchyGroup extends Group {
     constructor(row) {
@@ -52,13 +52,6 @@ function processFilters(filter) {
     if (filter?.ids?.length) {
         where.push(`groups.id IN (${db.in(binds, filter.ids)})`);
     }
-    if (filter?.managerIds?.length) {
-        joins.set('managerIds', `
-      LEFT JOIN (SELECT gm.groupId, users.* FROM groups_managers gm INNER JOIN users ON gm.userId=users.id) gmu ON groups.id = gmu.groupId
-      LEFT JOIN (SELECT gs.groupId, users.* FROM groups_sites gs INNER JOIN sites_managers sm ON gs.siteId=sm.siteId INNER JOIN users ON sm.userId=users.id) gsu ON groups.id = gsu.groupId
-    `);
-        where.push(`gmu.login IN (${db.in(binds, filter.managerIds)}) OR gsu.login IN (${db.in(binds, filter.managerIds)})`);
-    }
     if (filter?.root) {
         where.push('groups.id NOT IN (SELECT childId FROM groups_groups)');
     }
@@ -85,55 +78,30 @@ export async function getGroupsWithUser(userIds) {
     WHERE users.login IN (${db.in(binds, userIds)})`, binds);
     return rows.map(row => ({ key: row.login, value: new Group(row) }));
 }
-export async function getGroupsWithSite(siteIds) {
-    const binds = [];
-    const rows = await db.getall(`
-    SELECT gs.siteId, groups.* FROM groups
-    INNER JOIN groups_sites gs ON groups.id = gs.groupId
-    WHERE gs.siteId IN (${db.in(binds, siteIds)})`, binds);
-    return rows.map(row => ({ key: row.siteId, value: new Group(row) }));
-}
-export async function getGroupsWithManager(managerIds, direct) {
-    if (!managerIds.length)
-        return [];
-    const [directGroups, siteGroups] = await Promise.all([
-        db.getall(`SELECT g.*, u.login
-               FROM groups g
-               INNER JOIN groups_managers gm ON gm.groupId=g.id
-               INNER JOIN users u ON u.id=gm.userId
-               WHERE u.login IN (${db.in([], managerIds)})`, managerIds),
-        db.getall(`SELECT g.*, u.login
-               FROM groups g
-               INNER JOIN groups_sites gs ON gs.groupId=g.id
-               INNER JOIN sites_managers sm ON sm.siteId=gs.siteId
-               INNER JOIN users u ON u.id=sm.userId
-               WHERE u.login IN (${db.in([], managerIds)})`, managerIds)
-    ]);
-    const all = !direct ? siteGroups : [];
-    if (direct !== false)
-        all.push(...directGroups);
-    return unique(all, row => [row.id, row.login])
-        .map(row => ({ key: row.login, value: new Group(row) }));
-}
 export async function getGroupsWithRole(roleIds, filter) {
     const { binds, where, joins } = processFilters(filter);
     if (!joins.has('groups_roles')) {
         joins.set('groups_roles', 'INNER JOIN groups_roles on groups.id = groups_roles.groupId');
     }
     where.push(`groups_roles.roleId IN (${db.in(binds, roleIds)})`);
-    console.log(`SELECT groups.*, groups_roles.roleId as roleId
-  FROM groups
-  ${Array.from(joins.values()).join('\n')}
-  WHERE (${where.join(') AND (')})`);
     const groups = await db.getall(`SELECT groups.*, groups_roles.roleId as roleId
                                   FROM groups
                                   ${Array.from(joins.values()).join('\n')}
                                   WHERE (${where.join(') AND (')})`, binds);
     return groups.map(row => ({ key: String(row.roleId), value: new Group(row) }));
 }
-export async function createGroup(name) {
-    const groupId = await db.insert('INSERT INTO groups (name) VALUES (?)', [name]);
-    return groupId;
+export async function groupNameIsUnique(name) {
+    const count = await db.getval('SELECT COUNT(*) FROM groups WHERE name = ?', [name]);
+    return count === 0;
+}
+export async function createGroup(name, parent) {
+    return await db.transaction(async (db) => {
+        const groupId = await db.insert('INSERT INTO groups (name) VALUES (?)', [name]);
+        if (parent) {
+            await db.insert('INSERT INTO groups_groups (parentId, childId) VALUES (?,?)', [parent.id, groupId]);
+        }
+        return groupId;
+    });
 }
 export async function updateGroup(id, name) {
     return await db.update('UPDATE groups SET name = ? WHERE id = ?', [name, id]);
@@ -169,18 +137,6 @@ export async function setUserGroups(userId, groupIds) {
         return await db.insert(`INSERT INTO users_groups (userId, groupId) VALUES ${groupIds.map(g => '(?,?)').join(',')}`, binds);
     });
 }
-export async function setGroupManager(groupId, userId, manager) {
-    if (manager)
-        await db.update('INSERT IGNORE INTO groups_managers (groupId, userId) VALUES (?, ?)', [groupId, userId]);
-    else
-        await db.delete('DELETE FROM groups_managers WHERE groupId=? AND userId=?', [groupId, userId]);
-}
-export async function addGroupSite(groupId, siteId) {
-    return await db.update('INSERT IGNORE INTO groups_sites (groupId, siteId) VALUES (?, ?)', [groupId, siteId]);
-}
-export async function removeGroupSite(groupId, siteId) {
-    return await db.update('DELETE FROM groups_sites WHERE groupId=? AND siteId=?', [groupId, siteId]);
-}
 export async function addSubgroup(parentId, childId) {
     return await db.insert('INSERT INTO groups_groups (parentId, childId) VALUES (?,?)', [parentId, childId]);
 }

package/dist/group/group.database.js.map

@@ -1 +1 @@
-{"version":3,"file":"group.database.js","sourceRoot":"","sources":["../../src/group/group.database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"group.database.js","sourceRoot":"","sources":["../../src/group/group.database.ts"],"names":[],"mappings":"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"}

package/dist/group/group.model.d.ts

@@ -6,7 +6,6 @@ export declare class Group {
 }
 export declare class GroupFilter {
     ids?: string[];
-    managerIds?: string[];
     root?: boolean;
 }
 export declare class GroupResponse extends ValidatedResponse {

package/dist/group/group.model.js

@@ -34,10 +34,6 @@ __decorate([
     Field(type => [ID], { nullable: true }),
     __metadata("design:type", Array)
 ], GroupFilter.prototype, "ids", void 0);
-__decorate([
-    Field(type => [ID], { nullable: true, description: 'Return groups managed by any of the specified manager ids.' }),
-    __metadata("design:type", Array)
-], GroupFilter.prototype, "managerIds", void 0);
 __decorate([
     Field({ nullable: true, description: 'true -> Return only groups that are not subgroups' }),
     __metadata("design:type", Boolean)

package/dist/group/group.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"group.model.js","sourceRoot":"","sources":["../../src/group/group.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAyB,MAAM,6BAA6B,CAAA;AAGtF,IAAa,KAAK,GAAlB,MAAa,KAAK;IAOhB,YAAa,GAAQ;QACnB,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACxB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACtB,CAAC;CACF,CAAA;AATC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;;iCACR;AAGV;IADC,KAAK,EAAE;;mCACI;AALD,KAAK;IADjB,UAAU,CAAC,EAAE,WAAW,EAAE,0JAA0J,EAAE,CAAC;;GAC3K,KAAK,CAWjB;SAXY,KAAK;AAclB,IAAa,WAAW,GAAxB,MAAa,WAAW;CASvB,CAAA;AAPC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1B;AAGd;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,4DAA4D,EAAE,CAAC;;+CAC9F;AAGrB;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,mDAAmD,EAAE,CAAC;;yCAC9E;AARH,WAAW;IADvB,SAAS,EAAE;GACC,WAAW,CASvB;SATY,WAAW;AAYxB,IAAa,aAAa,GAA1B,MAAa,aAAc,SAAQ,iBAAiB;IAIlD,YAAa,MAAiD;QAC5D,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;IAC3B,CAAC;CACF,CAAA;AANC;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAClB,KAAK;4CAAA;AAFF,aAAa;IADzB,UAAU,EAAE;;GACA,aAAa,CAQzB;SARY,aAAa;AAW1B,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;CAAG,CAAA;AAAnB,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAAG;SAAnB,gBAAgB"}
+{"version":3,"file":"group.model.js","sourceRoot":"","sources":["../../src/group/group.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAyB,MAAM,6BAA6B,CAAA;AAGtF,IAAa,KAAK,GAAlB,MAAa,KAAK;IAOhB,YAAa,GAAQ;QACnB,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACxB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACtB,CAAC;CACF,CAAA;AATC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;;iCACR;AAGV;IADC,KAAK,EAAE;;mCACI;AALD,KAAK;IADjB,UAAU,CAAC,EAAE,WAAW,EAAE,0JAA0J,EAAE,CAAC;;GAC3K,KAAK,CAWjB;SAXY,KAAK;AAclB,IAAa,WAAW,GAAxB,MAAa,WAAW;CAMvB,CAAA;AAJC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1B;AAGd;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,mDAAmD,EAAE,CAAC;;yCAC9E;AALH,WAAW;IADvB,SAAS,EAAE;GACC,WAAW,CAMvB;SANY,WAAW;AASxB,IAAa,aAAa,GAA1B,MAAa,aAAc,SAAQ,iBAAiB;IAIlD,YAAa,MAAiD;QAC5D,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;IAC3B,CAAC;CACF,CAAA;AANC;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAClB,KAAK;4CAAA;AAFF,aAAa;IADzB,UAAU,EAAE;;GACA,aAAa,CAQzB;SARY,aAAa;AAW1B,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;CAAG,CAAA;AAAnB,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAAG;SAAnB,gBAAgB"}

package/dist/group/group.resolver.d.ts

@@ -1,23 +1,18 @@
 import { Context, ValidatedResponse } from '@txstate-mws/graphql-server';
-import { Role, User, Group, GroupFilter, GroupResponse, Site } from '../internal.js';
+import { Role, User, Group, GroupFilter, GroupResponse } from '../internal.js';
 export declare class GroupResolver {
     groups(ctx: Context, filter?: GroupFilter): Promise<Group[]>;
     users(ctx: Context, group: Group, direct?: boolean): Promise<User[] | (User | import("../internal.js").RedactedUser)[]>;
     subgroups(ctx: Context, group: Group, recursive?: boolean): Promise<Group[]>;
     roles(ctx: Context, group: Group, direct?: boolean): Promise<Role[]>;
-    managers(ctx: Context, group: Group, direct?: boolean): Promise<User[] | (User | import("../internal.js").RedactedUser)[]>;
-    sites(ctx: Context, group: Group): Promise<Site[]>;
-    parents(ctx: Context, group: Group): Promise<Group[]>;
+    supergroups(ctx: Context, group: Group, recursive?: boolean): Promise<Group[]>;
     permissions(group: Group): Group;
-    createGroup(ctx: Context, name: string): Promise<GroupResponse>;
-    updateGroup(ctx: Context, groupId: string, name: string): Promise<GroupResponse>;
+    createGroup(ctx: Context, name: string, parentId?: string, validateOnly?: boolean): Promise<GroupResponse>;
+    updateGroup(ctx: Context, groupId: string, name: string, validateOnly?: boolean): Promise<GroupResponse>;
     deleteGroup(ctx: Context, groupId: string): Promise<ValidatedResponse>;
     addUserToGroups(ctx: Context, groupIds: string[], userId: string): Promise<ValidatedResponse>;
     removeUserFromGroups(ctx: Context, groupIds: string[], userId: string): Promise<ValidatedResponse>;
     setUserGroups(ctx: Context, userId: string, groupIds: string[]): Promise<ValidatedResponse>;
-    setGroupManager(ctx: Context, groupId: string, userId: string, manager: boolean): Promise<GroupResponse>;
-    addGroupSite(ctx: Context, groupId: string, siteId: string): Promise<GroupResponse>;
-    removeGroupSite(ctx: Context, groupId: string, siteId: string): Promise<GroupResponse>;
     addSubgroup(ctx: Context, parentGroupId: string, childGroupId: string): Promise<ValidatedResponse>;
     removeSubgroup(ctx: Context, parentGroupId: string, childGroupId: string): Promise<ValidatedResponse>;
 }

package/dist/group/group.resolver.js

@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { Context, ValidatedResponse } from '@txstate-mws/graphql-server';
 import { Arg, Ctx, FieldResolver, Mutation, Query, Resolver, Root, ID } from 'type-graphql';
-import { Role, RoleService, User, UserService, Group, GroupFilter, GroupPermissions, GroupResponse, GroupService, Site, SiteService } from '../internal.js';
+import { Role, RoleService, User, UserService, Group, GroupFilter, GroupPermissions, GroupResponse, GroupService } from '../internal.js';
 let GroupResolver = class GroupResolver {
     async groups(ctx, filter) {
         return await ctx.svc(GroupService).find(filter);
@@ -26,23 +26,17 @@ let GroupResolver = class GroupResolver {
     async roles(ctx, group, direct) {
         return await ctx.svc(RoleService).findByGroupId(group.id, direct);
     }
-    async managers(ctx, group, direct) {
-        return await ctx.svc(UserService).findGroupManagers(group.id, direct);
-    }
-    async sites(ctx, group) {
-        return await ctx.svc(SiteService).findByGroup(group);
-    }
-    async parents(ctx, group) {
-        return await ctx.svc(GroupService).getSuperGroups(group.id, false);
+    async supergroups(ctx, group, recursive) {
+        return await ctx.svc(GroupService).getSuperGroups(group.id, recursive);
     }
     permissions(group) {
         return group;
     }
-    async createGroup(ctx, name) {
-        return await ctx.svc(GroupService).create(name);
+    async createGroup(ctx, name, parentId, validateOnly) {
+        return await ctx.svc(GroupService).create(name, parentId, validateOnly);
     }
-    async updateGroup(ctx, groupId, name) {
-        return await ctx.svc(GroupService).update(groupId, name);
+    async updateGroup(ctx, groupId, name, validateOnly) {
+        return await ctx.svc(GroupService).update(groupId, name, validateOnly);
     }
     async deleteGroup(ctx, groupId) {
         return await ctx.svc(GroupService).delete(groupId);
@@ -56,15 +50,6 @@ let GroupResolver = class GroupResolver {
     async setUserGroups(ctx, userId, groupIds) {
         return await ctx.svc(GroupService).setUserGroups(userId, groupIds);
     }
-    async setGroupManager(ctx, groupId, userId, manager) {
-        return await ctx.svc(GroupService).setGroupManager(groupId, userId, manager);
-    }
-    async addGroupSite(ctx, groupId, siteId) {
-        return await ctx.svc(GroupService).addGroupSite(groupId, siteId);
-    }
-    async removeGroupSite(ctx, groupId, siteId) {
-        return await ctx.svc(GroupService).removeGroupSite(groupId, siteId);
-    }
     async addSubgroup(ctx, parentGroupId, childGroupId) {
         return await ctx.svc(GroupService).addSubgroup(parentGroupId, childGroupId);
     }
@@ -108,30 +93,14 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], GroupResolver.prototype, "roles", null);
 __decorate([
-    FieldResolver(returns => [User], { description: 'People who are authorized to add and remove members from the group.' }),
+    FieldResolver(returns => [Group], { nullable: true, description: 'Returns ancestor group(s), or null if this group is not a subgroup' }),
     __param(0, Ctx()),
     __param(1, Root()),
-    __param(2, Arg('direct', { nullable: true, description: "If a group is associated with a site, the site's managers will be group managers as well. Set this to true to exclude managers that come from site relationships, false to exclude managers added directly, and null to return all managers." })),
+    __param(2, Arg('recursive', { nullable: true, description: 'If false, return only the parent groups' })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Context, Group, Boolean]),
     __metadata("design:returntype", Promise)
-], GroupResolver.prototype, "managers", null);
-__decorate([
-    FieldResolver(returns => [Site], { description: "Sites that are tightly related to this group. The sites' managers will also be managers of this group." }),
-    __param(0, Ctx()),
-    __param(1, Root()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Context, Group]),
-    __metadata("design:returntype", Promise)
-], GroupResolver.prototype, "sites", null);
-__decorate([
-    FieldResolver(returns => [Group], { nullable: true, description: 'Returns parent group(s), or null if this group is not a subgroup' }),
-    __param(0, Ctx()),
-    __param(1, Root()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Context, Group]),
-    __metadata("design:returntype", Promise)
-], GroupResolver.prototype, "parents", null);
+], GroupResolver.prototype, "supergroups", null);
 __decorate([
     FieldResolver(returns => GroupPermissions, {
         description: `Reveal the simplified results after all authorization rules are taken into account
@@ -146,8 +115,10 @@ __decorate([
     Mutation(returns => GroupResponse, { description: 'Add a new group. The group name must be unique.' }),
     __param(0, Ctx()),
     __param(1, Arg('name', { description: 'name of the group being created' })),
+    __param(2, Arg('parentId', type => ID, { nullable: true, description: 'Optional parent group ID, if creating a new subgroup' })),
+    __param(3, Arg('validateOnly', { nullable: true, description: 'Set to true to validate the input without saving it.' })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Context, String]),
+    __metadata("design:paramtypes", [Context, String, String, Boolean]),
     __metadata("design:returntype", Promise)
 ], GroupResolver.prototype, "createGroup", null);
 __decorate([
@@ -155,8 +126,9 @@ __decorate([
     __param(0, Ctx()),
     __param(1, Arg('groupId', type => ID)),
     __param(2, Arg('name')),
+    __param(3, Arg('validateOnly', { nullable: true, description: 'Set to true to validate the input without saving it.' })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Context, String, String]),
+    __metadata("design:paramtypes", [Context, String, String, Boolean]),
     __metadata("design:returntype", Promise)
 ], GroupResolver.prototype, "updateGroup", null);
 __decorate([
@@ -194,34 +166,6 @@ __decorate([
     __metadata("design:paramtypes", [Context, String, Array]),
     __metadata("design:returntype", Promise)
 ], GroupResolver.prototype, "setUserGroups", null);
-__decorate([
-    Mutation(returns => GroupResponse, { description: 'Update a user\'s status as a manager of a group' }),
-    __param(0, Ctx()),
-    __param(1, Arg('groupId', type => ID)),
-    __param(2, Arg('userId', type => ID)),
-    __param(3, Arg('manager', { description: 'true if this user should be a group manager, false if they should not be a group manager' })),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Context, String, String, Boolean]),
-    __metadata("design:returntype", Promise)
-], GroupResolver.prototype, "setGroupManager", null);
-__decorate([
-    Mutation(returns => GroupResponse, { description: "Tightly associate a site with a group. The site's managers may now also manage the group membership. If the site's managers change, the group managers will stay in sync." }),
-    __param(0, Ctx()),
-    __param(1, Arg('groupId', type => ID)),
-    __param(2, Arg('siteId', type => ID)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Context, String, String]),
-    __metadata("design:returntype", Promise)
-], GroupResolver.prototype, "addGroupSite", null);
-__decorate([
-    Mutation(returns => GroupResponse, { description: "Remove the association between a site and a group. The site's managers may no longer manage the group membership." }),
-    __param(0, Ctx()),
-    __param(1, Arg('groupId', type => ID)),
-    __param(2, Arg('siteId', type => ID)),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Context, String, String]),
-    __metadata("design:returntype", Promise)
-], GroupResolver.prototype, "removeGroupSite", null);
 __decorate([
     Mutation(returns => ValidatedResponse, { description: 'Make one group a subgroup of another' }),
     __param(0, Ctx()),

package/dist/group/group.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"group.resolver.js","sourceRoot":"","sources":["../../src/group/group.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"group.resolver.js","sourceRoot":"","sources":["../../src/group/group.resolver.ts"],"names":[],"mappings":"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"}

package/dist/group/group.service.d.ts

@@ -1,11 +1,9 @@
 import { BaseService, ValidatedResponse } from '@txstate-mws/graphql-server';
-import { Group, GroupFilter, GroupResponse, DosGatoService, User, Site } from '../internal.js';
+import { Group, GroupFilter, GroupResponse, DosGatoService } from '../internal.js';
 export declare class GroupServiceInternal extends BaseService {
     find(filter?: GroupFilter): Promise<Group[]>;
     findById(id: string): Promise<Group | undefined>;
     findByUserId(userId: string, direct?: boolean): Promise<Group[]>;
-    findByManager(manager: User, direct?: boolean): Promise<Group[]>;
-    findBySite(site: Site): Promise<Group[]>;
     getSubgroups(groupId: string, recursive?: boolean): Promise<Group[]>;
     getAllSubs(groupIds: string[]): Promise<Group[]>;
     getSuperGroups(groupId: string, recursive?: boolean): Promise<Group[]>;
@@ -17,25 +15,19 @@ export declare class GroupService extends DosGatoService<Group> {
     find(filter?: GroupFilter): Promise<Group[]>;
     findById(id: string): Promise<Group | undefined>;
     findByUserId(userId: string, direct?: boolean): Promise<Group[]>;
-    findByManager(manager: User, direct?: boolean): Promise<Group[]>;
-    findBySite(site: Site): Promise<Group[]>;
     getSubgroups(groupId: string, recursive?: boolean): Promise<Group[]>;
     getAllSubs(groupIds: string[]): Promise<Group[]>;
     getSuperGroups(groupId: string, recursive?: boolean): Promise<Group[]>;
     getAllSupers(groupIds: string[]): Promise<Group[]>;
     findByRoleId(roleId: string, direct?: boolean, filter?: GroupFilter): Promise<Group[]>;
-    create(name: string): Promise<GroupResponse>;
-    update(id: string, name: string): Promise<GroupResponse>;
+    create(name: string, parentId?: string, validateOnly?: boolean): Promise<GroupResponse>;
+    update(id: string, name: string, validateOnly?: boolean): Promise<GroupResponse>;
     delete(id: string): Promise<ValidatedResponse>;
     addUserToGroups(groupIds: string[], userId: string): Promise<ValidatedResponse>;
     removeUserFromGroup(groupIds: string[], userId: string): Promise<ValidatedResponse>;
     setUserGroups(userId: string, groupIds: string[]): Promise<ValidatedResponse>;
-    setGroupManager(groupId: string, userId: string, manager: boolean): Promise<GroupResponse>;
-    addGroupSite(groupId: string, siteId: string): Promise<GroupResponse>;
-    removeGroupSite(groupId: string, siteId: string): Promise<GroupResponse>;
     addSubgroup(parentId: string, childId: string): Promise<ValidatedResponse>;
     removeSubgroup(parentId: string, childId: string): Promise<ValidatedResponse>;
-    isManager(group: Group): Promise<boolean>;
     mayView(group: Group): Promise<boolean>;
     mayViewManagerUI(): Promise<boolean>;
     mayCreate(): Promise<boolean>;