npm - @dosgato/api - Versions diffs - 1.1.11 → 1.2.1 - Mend

@dosgato/api 1.1.11 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

package/dist/asset/asset.database.d.ts +3 -2
package/dist/asset/asset.database.js +10 -4
package/dist/asset/asset.database.js.map +1 -1
package/dist/asset/asset.model.d.ts +6 -0
package/dist/asset/asset.model.js +15 -0
package/dist/asset/asset.model.js.map +1 -1
package/dist/asset/asset.resolver.d.ts +6 -3
package/dist/asset/asset.resolver.js +39 -6
package/dist/asset/asset.resolver.js.map +1 -1
package/dist/asset/asset.routes.js +5 -4
package/dist/asset/asset.routes.js.map +1 -1
package/dist/asset/asset.service.d.ts +4 -3
package/dist/asset/asset.service.js +35 -20
package/dist/asset/asset.service.js.map +1 -1
package/dist/globalrule/globalrule.service.js +7 -1
package/dist/globalrule/globalrule.service.js.map +1 -1
package/dist/index.js +1 -1
package/dist/index.js.map +1 -1
package/dist/migrations.js +42 -0
package/dist/migrations.js.map +1 -1
package/dist/role/role.database.d.ts +1 -1
package/dist/role/role.database.js +3 -1
package/dist/role/role.database.js.map +1 -1
package/dist/user/user.database.d.ts +9 -3
package/dist/user/user.database.js +81 -21
package/dist/user/user.database.js.map +1 -1
package/dist/user/user.model.d.ts +10 -3
package/dist/user/user.model.js +33 -11
package/dist/user/user.model.js.map +1 -1
package/dist/user/user.resolver.d.ts +5 -2
package/dist/user/user.resolver.js +37 -4
package/dist/user/user.resolver.js.map +1 -1
package/dist/user/user.service.d.ts +4 -2
package/dist/user/user.service.js +17 -5
package/dist/user/user.service.js.map +1 -1
package/package.json +2 -2

package/dist/asset/asset.service.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { BaseService, ValidatedResponse } from '@txstate-mws/graphql-server';
-import { type Asset, type AssetFilter, type AssetFolder, DosGatoService, AssetResponse, type DownloadsFilter, type AssetResize, AssetFolderResponse } from '../internal.js';
+import { type Asset, type AssetFilter, type AssetFolder, DosGatoService, AssetResponse, type DownloadsFilter, type AssetResize, AssetFolderResponse, AssetsResponse } from '../internal.js';
 export declare class AssetServiceInternal extends BaseService {
     find(filter: AssetFilter): Promise<Asset[]>;
     findById(id: string): Promise<Asset | undefined>;
@@ -41,8 +41,9 @@ export declare class AssetService extends DosGatoService<Asset> {
     update(assetId: string, data: any, validateOnly?: boolean): Promise<AssetResponse>;
     copy(folderId: string, assetIds?: string[], folderIds?: string[]): Promise<AssetFolderResponse>;
     delete(dataId: string): Promise<AssetResponse>;
-    finalizeDeletion(dataId: string): Promise<AssetResponse>;
-    undelete(dataId: string): Promise<AssetResponse>;
+    deleteAssets(dataIds: string[]): Promise<AssetsResponse>;
+    finalizeDeletion(dataIds: string[]): Promise<AssetsResponse>;
+    undelete(dataIds: string[]): Promise<AssetsResponse>;
     mayViewManagerUI(): Promise<boolean>;
     /**
     * assets must be viewable by any editor in case another editor with greater permissions linked to an asset in a chooser -

package/dist/asset/asset.service.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { BaseService, MutationMessageType, ValidatedResponse } from '@txstate-mws/graphql-server';
 import { ManyJoinedLoader, OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
-import { filterAsync, intersect, isBlank, isNotNull, sortby } from 'txstate-utils';
-import { getAssets, AssetFolderService, appendPath, getResizes, DosGatoService, getLatestDownload, AssetFolderServiceInternal, AssetResponse, deleteAsset, undeleteAsset, getResizesById, VersionedService, getDownloads, getResizeDownloads, AssetFolderResponse, moveAssets, copyAssets, finalizeAssetDeletion, renameAsset, updateAssetMeta, SiteServiceInternal, PagetreeServiceInternal, DeleteStateAll, getAssetsByPath, PagetreeType, SiteRuleService, DeleteState, AssetRuleService, shiftPath, fileHandler, LaunchState } from '../internal.js';
+import { filterAsync, intersect, isBlank, isNotNull, someAsync, sortby } from 'txstate-utils';
+import { getAssets, AssetFolderService, appendPath, getResizes, DosGatoService, getLatestDownload, AssetFolderServiceInternal, AssetResponse, deleteAsset, undeleteAssets, getResizesById, VersionedService, getDownloads, getResizeDownloads, AssetFolderResponse, moveAssets, copyAssets, finalizeAssetDeletion, renameAsset, updateAssetMeta, SiteServiceInternal, PagetreeServiceInternal, DeleteStateAll, getAssetsByPath, PagetreeType, SiteRuleService, DeleteState, AssetRuleService, shiftPath, fileHandler, LaunchState, deleteAssets, AssetsResponse } from '../internal.js';
 const thumbnailMimes = new Set(['image/jpg', 'image/jpeg', 'image/gif', 'image/png']);
 const assetsByIdLoader = new PrimaryKeyLoader({
     fetch: async (dataIds) => await getAssets({ ids: dataIds, deleteStates: DeleteStateAll })
@@ -320,28 +320,43 @@ export class AssetService extends DosGatoService {
             throw new Error('Could not delete asset');
         }
     }
-    async finalizeDeletion(dataId) {
-        const asset = await this.loaders.get(assetsByIdLoader).load(dataId);
-        if (!asset)
-            throw new Error('Asset to be deleted does not exist');
-        if (!(await this.haveAssetPerm(asset, 'delete')))
-            throw new Error(`Current user is not permitted to delete asset ${String(asset.name)}.${asset.extension}.`);
+    async deleteAssets(dataIds) {
+        const assets = (await Promise.all(dataIds.map(async (id) => await this.raw.findById(id)))).filter(isNotNull);
+        if (await someAsync(assets, async (asset) => !(await this.haveAssetPerm(asset, 'delete')))) {
+            throw new Error('Current user is not permitted to delete one or more assets');
+        }
+        const currentUser = await this.currentUser();
+        try {
+            await deleteAssets(assets.map(a => a.internalId), currentUser.internalId);
+            this.loaders.clear();
+            const deleted = await this.raw.findByIds(assets.map(a => a.id));
+            return new AssetsResponse({ success: true, assets: deleted });
+        }
+        catch (err) {
+            console.error(err);
+            throw new Error('An unknown error ocurred while trying to delete assets.');
+        }
+    }
+    async finalizeDeletion(dataIds) {
+        const assets = (await Promise.all(dataIds.map(async (id) => await this.raw.findById(id)))).filter(isNotNull);
+        if (await someAsync(assets, async (asset) => !(await this.haveAssetPerm(asset, 'delete')))) {
+            throw new Error('Current user is not permitted to delete one or more assets');
+        }
         const currentUser = await this.currentUser();
-        await finalizeAssetDeletion(asset.internalId, currentUser.internalId);
+        await finalizeAssetDeletion(assets.map(a => a.internalId), currentUser.internalId);
         this.loaders.clear();
-        const deletedAsset = await this.loaders.get(assetsByIdLoader).load(dataId);
-        return new AssetResponse({ asset: deletedAsset, success: true });
+        const deletedAssets = await this.raw.findByIds(assets.map(a => a.id));
+        return new AssetsResponse({ assets: deletedAssets, success: true });
     }
-    async undelete(dataId) {
-        const asset = await this.loaders.get(assetsByIdLoader).load(dataId);
-        if (!asset)
-            throw new Error('Asset to be restored does not exist');
-        if (!await this.mayUndelete(asset))
-            throw new Error(`Current user is not permitted to restore asset ${String(asset.name)}.${asset.extension}.`);
-        await undeleteAsset(asset.internalId);
+    async undelete(dataIds) {
+        const assets = (await Promise.all(dataIds.map(async (id) => await this.raw.findById(id)))).filter(isNotNull);
+        if (await someAsync(assets, async (asset) => !(await this.mayUndelete(asset)))) {
+            throw new Error('Current user is not permitted to restore one or more assets');
+        }
+        await undeleteAssets(assets.map(a => a.internalId));
         this.loaders.clear();
-        const restoredAsset = await this.loaders.get(assetsByIdLoader).load(dataId);
-        return new AssetResponse({ asset: restoredAsset, success: true });
+        const restoredAssets = await this.raw.findByIds(assets.map(a => a.id));
+        return new AssetsResponse({ assets: restoredAssets, success: true });
     }
     async mayViewManagerUI() {
         return (await this.currentAssetRules()).some(r => r.grants.viewForEdit);

package/dist/asset/asset.service.js.map CHANGED Viewed

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

package/dist/globalrule/globalrule.service.js CHANGED Viewed

@@ -88,7 +88,13 @@ export class GlobalRuleService extends DosGatoService {
         }
     }
     async tooPowerful(rule) {
-        const grants = await this.currentGlobalGrants();
+        const grants = await this.currentGlobalGrants() ?? {
+            manageAccess: false,
+            manageGlobalData: false,
+            manageParentRoles: false,
+            manageTemplates: false,
+            createSites: false
+        };
         return (rule.grants.createSites && !grants.createSites) ||
             (rule.grants.manageAccess && !grants.manageAccess) ||
             (rule.grants.manageGlobalData && !grants.manageGlobalData) ||

package/dist/globalrule/globalrule.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"globalrule.service.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC5E,OAAO,EACL,cAAc,EAAE,UAAU,EAAE,cAAc,EAAqB,WAAW,EAC9C,gBAAgB,EAAE,kBAAkB,EAChE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EACxD,MAAM,gBAAgB,CAAA;AAEvB,MAAM,qBAAqB,GAAG,IAAI,gBAAgB,CAAC;IACjD,KAAK,EAAE,KAAK,EAAE,GAAa,EAAE,EAAE;QAC7B,OAAO,MAAM,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;IACtC,CAAC;CACF,CAAC,CAAA;AACF,MAAM,uBAAuB,GAAG,IAAI,eAAe,CAAC;IAClD,KAAK,EAAE,KAAK,EAAE,OAAiB,EAAE,EAAE;QACjC,OAAO,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC1C,CAAC;IACD,UAAU,EAAE,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;CACxC,CAAC,CAAA;AAEF,MAAM,OAAO,yBAA0B,SAAQ,WAAW;IACxD,KAAK,CAAC,QAAQ,CAAE,MAAc;QAC5B,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,MAAc;QAChC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrE,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,cAA0B;IAAjE;;QACE,QAAG,GAAG,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;~~IAiF3C~~,CAAC;~~IA/EC~~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~~QAC/C~~,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;YACvD,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YAClD,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAC1D,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;YAC5D,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAE,IAAgB;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1D,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,IAAK,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,IAAgB;QAC7B,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;YAAE,OAAO,IAAI,CAAA;QAC1D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC9D,OAAO,CAAC,CAAC,IAAI,CAAA;IACf,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAA;IACjD,CAAC;CACF"}
1	+ {"version":3,"file":"globalrule.service.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.service.ts"],"names":[],"mappings":"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"}

package/dist/index.js CHANGED Viewed

@@ -59,7 +59,7 @@ export class DGServer {
                     if (!user) {
                         const details = (opts.userLookup ? (await opts.userLookup([userId]))[userId] : undefined) ?? { firstname: 'Training', lastname: 'User', email: '', enabled: true };
                         if (details.enabled !== false) {
-                            const internalId = await createUser(userId, details.firstname, details.lastname, details.email, true, false);
+                            const internalId = await createUser(userId, details.firstname, details.lastname, details.email, [], false);
                             user = await ctx.svc(UserServiceInternal).findByInternalId(internalId);
                         }
                     }

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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~~IAAI~~,EAAE,KAAK,CAAC,CAAA;~~4BAC5G~~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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/migrations.js CHANGED Viewed

@@ -41,6 +41,46 @@ const dgMigrations = [
             await db.execute('ALTER TABLE datarules ADD COLUMN isGlobal TINYINT UNSIGNED NOT NULL DEFAULT 0');
             await db.execute('CREATE INDEX `mime_idx` ON `binaries`(`mime`)');
         }
+    },
+    {
+        id: 20231130103000,
+        description: 'add trainings table and users_trainings table',
+        run: async (db) => {
+            await db.execute(`
+        CREATE TABLE IF NOT EXISTS trainings (
+          id SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT,
+          name VARCHAR(50) NOT NULL,
+          PRIMARY KEY (id),
+          UNIQUE name_idx (name)
+        )
+        ENGINE = InnoDB
+        DEFAULT CHARACTER SET = utf8mb4
+        DEFAULT COLLATE = utf8mb4_general_ci
+      `);
+            await db.execute(`
+        CREATE TABLE IF NOT EXISTS users_trainings (
+          userId MEDIUMINT UNSIGNED NOT NULL,
+          trainingId SMALLINT UNSIGNED NOT NULL,
+          recordedAt DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+          PRIMARY KEY (userId, trainingId),
+          INDEX trainingId_idx (trainingId),
+          CONSTRAINT FK_users_trainings_user FOREIGN KEY (userId) REFERENCES users (\`id\`),
+          CONSTRAINT FK_users_trainings_training FOREIGN KEY (trainingId) REFERENCES trainings (\`id\`)
+        )
+        ENGINE = InnoDB
+        DEFAULT CHARACTER SET = utf8mb4
+        DEFAULT COLLATE = utf8mb4_general_ci
+      `);
+            const basicId = await db.insert('INSERT INTO trainings (name) VALUES (?)', ['basic']);
+            await db.insert('INSERT INTO users_trainings (userId, trainingId) SELECT u.id, ' + basicId + ' FROM users u WHERE u.trained = 1');
+        }
+    },
+    {
+        id: 20231130110000,
+        description: 'remove user has been trained boolean from users table',
+        run: async (db) => {
+            await db.execute('ALTER TABLE users DROP COLUMN trained');
+        }
     }
 ];
 export async function migrations(moreMigrations) {
@@ -89,6 +129,8 @@ export async function resetdb() {
             db.execute('DROP TABLE IF EXISTS users_roles'),
             db.execute('DROP TABLE IF EXISTS groups_roles'),
             db.execute('DROP TABLE IF EXISTS users_groups'),
+            db.execute('DROP TABLE IF EXISTS users_trainings'),
+            db.execute('DROP TABLE IF EXISTS trainings'),
             db.execute('DROP TABLE IF EXISTS siterules'),
             db.execute('DROP TABLE IF EXISTS groups_groups'),
             db.execute('DROP TABLE IF EXISTS assets'),

package/dist/migrations.js.map CHANGED Viewed

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

package/dist/role/role.database.d.ts CHANGED Viewed

@@ -16,7 +16,7 @@ export declare function roleNameIsUnique(name: string): Promise<boolean>;
 export declare function createRole(name: string): Promise<number>;
 export declare function updateRole(id: string, name: string): Promise<number>;
 export declare function deleteRole(id: string): Promise<void>;
-export declare function addRolesToUser(roleIds: string[], userId: number): Promise<number>;
+export declare function addRolesToUser(roleIds: string[], userId: number): Promise<number | undefined>;
 export declare function assignRoleToUsers(roleId: string, userIds: number[]): Promise<number | undefined>;
 export declare function removeRoleFromUser(roleId: string, userId: number): Promise<number>;
 export declare function addRoleToGroups(groupIds: string[], roleId: string): Promise<number | undefined>;

package/dist/role/role.database.js CHANGED Viewed

@@ -98,7 +98,9 @@ export async function deleteRole(id) {
 }
 export async function addRolesToUser(roleIds, userId) {
     const binds = [];
-    return await db.insert(`INSERT INTO users_roles (userId, roleId) VALUES ${db.in(binds, roleIds.map(id => [userId, id]))} ON DUPLICATE KEY UPDATE userId=userId`, binds);
+    if (roleIds.length) {
+        return await db.insert(`INSERT INTO users_roles (userId, roleId) VALUES ${db.in(binds, roleIds.map(id => [userId, id]))} ON DUPLICATE KEY UPDATE userId=userId`, binds);
+    }
 }
 export async function assignRoleToUsers(roleId, userIds) {
     const binds = [];

package/dist/role/role.database.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"role.database.js","sourceRoot":"","sources":["../../src/role/role.database.ts"],"names":[],"mappings":"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~~AACzK~~,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAE,MAAc,EAAE,OAAiB;IACxE,MAAM,KAAK,GAAwB,EAAE,CAAA;IACrC,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE;QACxB,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;KACvB;IACD,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,mDAAmD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;KAC9J;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,MAAc,EAAE,MAAc;IACtE,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,yDAAyD,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AACrG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,QAAkB,EAAE,MAAc;IACvE,MAAM,KAAK,GAAwB,EAAE,CAAA;IACrC,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE;QACzB,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;KACvB;IACD,IAAI,QAAQ,CAAC,MAAM,EAAE;QACnB,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,qDAAqD,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,0CAA0C,EAAE,KAAK,CAAC,CAAA;KACnK;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAE,OAAe,EAAE,MAAc;IACxE,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,2DAA2D,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;AACxG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAE,MAAc,EAAE,MAAc;IAC/D,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,+DAA+D,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAC3G,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAE,MAAc,EAAE,MAAc;IAClE,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC,qDAAqD,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AACjG,CAAC"}
1	+ {"version":3,"file":"role.database.js","sourceRoot":"","sources":["../../src/role/role.database.ts"],"names":[],"mappings":"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"}

package/dist/user/user.database.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { User, type UserFilter } from '../internal.js';
+import { Training, User, type UserFilter } from '../internal.js';
 export declare function getUsers(filter: UserFilter): Promise<User[]>;
 export declare function getUsersByInternalId(ids: number[]): Promise<User[]>;
 export declare function getUsersInGroup(groupIds: string[], filter?: UserFilter): Promise<{
@@ -17,7 +17,13 @@ export declare function getUsersManagingGroups(groupIds: string[], direct?: bool
     key: string;
     value: User;
 }[]>;
-export declare function createUser(id: string, firstname: string, lastname: string, email: string, trained: boolean, system: boolean): Promise<number>;
-export declare function updateUser(id: string, firstname: string | undefined, lastname: string | undefined, email: string | undefined, trained: boolean | undefined): Promise<void>;
+export declare function getTrainingsForUsers(userInternalIds: number[]): Promise<{
+    key: any;
+    value: Training;
+}[]>;
+export declare function getAllTrainings(): Promise<Training[]>;
+export declare function addTrainings(trainingId: string, userIds: string[]): Promise<void>;
+export declare function createUser(id: string, firstname: string, lastname: string, email: string, trainings: string[] | undefined, system: boolean): Promise<number>;
+export declare function updateUser(id: string, firstname: string | undefined, lastname: string | undefined, email: string | undefined, trainings: string[] | undefined): Promise<void>;
 export declare function disableUsers(users: User[]): Promise<number>;
 export declare function enableUsers(users: User[]): Promise<number>;

package/dist/user/user.database.js CHANGED Viewed

@@ -1,10 +1,43 @@
 import db from 'mysql2-async/db';
-import { isNotNull, unique } from 'txstate-utils';
-import { User } from '../internal.js';
-function processFilters(filter) {
+import { intersect, isNotNull, unique } from 'txstate-utils';
+import { Training, User } from '../internal.js';
+async function processFilters(filter) {
     const binds = [];
     const where = [];
     if (typeof filter !== 'undefined') {
+        let trainingAllPromise;
+        let trainingAnyPromise;
+        let trainingNonePromise;
+        if (filter.trainingAll?.length) {
+            const tbinds = [];
+            trainingAllPromise = db.getvals(`SELECT userId FROM users_trainings WHERE trainingId IN (${db.in(tbinds, filter.trainingAll)}) GROUP BY userId HAVING COUNT(*) = ?`, [...tbinds, filter.trainingAll.length]);
+        }
+        if (filter.trainingAny?.length) {
+            const tbinds = [];
+            trainingAnyPromise = db.getvals(`SELECT userId FROM users_trainings WHERE trainingId IN (${db.in(tbinds, filter.trainingAny)})`, tbinds);
+        }
+        if (filter.trainingNone?.length) {
+            const tbinds = [];
+            trainingNonePromise = db.getvals(`SELECT u.id FROM users u LEFT JOIN users_trainings ut ON u.id=ut.userId AND ut.trainingId IN (${db.in(tbinds, filter.trainingNone)}) WHERE ut.userId IS NULL`, tbinds);
+        }
+        if (trainingAllPromise) {
+            const ids = await trainingAllPromise;
+            if (!ids.length)
+                filter.noresults = true;
+            filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, ids);
+        }
+        if (trainingAnyPromise) {
+            const ids = await trainingAnyPromise;
+            if (!ids.length)
+                filter.noresults = true;
+            filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, ids);
+        }
+        if (trainingNonePromise) {
+            const ids = await trainingNonePromise;
+            if (!ids.length)
+                filter.noresults = true;
+            filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, ids);
+        }
         if (filter.internalIds?.length) {
             where.push(`users.id IN (${db.in(binds, filter.internalIds)})`);
         }
@@ -23,14 +56,6 @@ function processFilters(filter) {
             where.push('users.disabledAt > ?');
             binds.push(filter.hideDisabledBefore.toISO());
         }
-        if (isNotNull(filter.trained)) {
-            if (filter.trained) {
-                where.push('users.trained IS TRUE');
-            }
-            else {
-                where.push('users.trained IS FALSE');
-            }
-        }
         if (isNotNull(filter.system)) {
             if (filter.system) {
                 where.push('users.system IS TRUE');
@@ -43,7 +68,9 @@ function processFilters(filter) {
     return { binds, where };
 }
 export async function getUsers(filter) {
-    const { binds, where } = processFilters(filter);
+    const { binds, where } = await processFilters(filter);
+    if (filter.noresults)
+        return [];
     const users = where.length
         ? await db.getall(`SELECT * FROM users WHERE (${where.join(') AND (')}) ORDER BY login`, binds)
         : await db.getall('SELECT * FROM users ORDER BY login');
@@ -57,7 +84,7 @@ export async function getUsersByInternalId(ids) {
     return users.map(u => new User(u));
 }
 export async function getUsersInGroup(groupIds, filter) {
-    const { binds, where } = processFilters(filter);
+    const { binds, where } = await processFilters(filter);
     where.push(`users_groups.groupId IN (${db.in(binds, groupIds)})`);
     const users = await db.getall(`SELECT users.*, users_groups.groupId AS groupId FROM users
                                  INNER JOIN users_groups ON users.id = users_groups.userId
@@ -65,7 +92,7 @@ export async function getUsersInGroup(groupIds, filter) {
     return users.map(row => ({ key: String(row.groupId), value: new User(row) }));
 }
 export async function getUsersWithRole(roleIds, filter) {
-    const { binds, where } = processFilters(filter);
+    const { binds, where } = await processFilters(filter);
     where.push(`users_roles.roleId IN (${db.in(binds, roleIds)})`);
     const users = await db.getall(`SELECT users.*, users_roles.roleId AS roleId
                                  FROM users INNER JOIN users_roles ON users.id = users_roles.userId
@@ -105,10 +132,42 @@ export async function getUsersManagingGroups(groupIds, direct) {
     return unique(all, row => [row.id, row.groupId])
         .map(row => ({ key: String(row.groupId), value: new User(row) }));
 }
-export async function createUser(id, firstname, lastname, email, trained, system) {
-    return await db.insert('INSERT INTO users (login, firstname, lastname, email, trained, system) VALUES (?, ?, ?, ?, ?, ?)', [id, firstname, lastname, email, trained, system]);
+export async function getTrainingsForUsers(userInternalIds) {
+    const rows = await db.getall(`SELECT ut.userId, t.id, t.name FROM users_trainings ut INNER JOIN trainings t ON ut.trainingId=t.id WHERE ut.userId IN (${db.in([], userInternalIds)})`, userInternalIds);
+    return rows.map(r => ({ key: r.userId, value: new Training(r) }));
+}
+export async function getAllTrainings() {
+    return (await db.getall('SELECT * FROM trainings')).map(r => new Training(r));
+}
+async function syncTrainings(userInternalId, trainings) {
+    if (trainings == null)
+        return;
+    const binds = [userInternalId];
+    if (trainings.length) {
+        await db.delete(`DELETE FROM users_trainings WHERE userId = ? AND trainingId NOT IN (${db.in(binds, trainings)})`, binds);
+        const ibinds = [];
+        await db.insert(`INSERT INTO users_trainings (userId, trainingId) VALUES ${db.in(ibinds, trainings.map(t => [userInternalId, t]))} ON DUPLICATE KEY UPDATE userId=userId`, ibinds);
+    }
+    else {
+        await db.delete('DELETE FROM users_trainings WHERE userId = ?', binds);
+    }
 }
-export async function updateUser(id, firstname, lastname, email, trained) {
+export async function addTrainings(trainingId, userIds) {
+    if (!userIds.length)
+        return;
+    const binds = [trainingId];
+    await db.insert(`
+    INSERT INTO users_trainings (userId, trainingId)
+    SELECT id, ? FROM users WHERE login IN (${db.in(binds, userIds)})
+    ON DUPLICATE KEY UPDATE userId=userId
+  `, binds);
+}
+export async function createUser(id, firstname, lastname, email, trainings, system) {
+    const userInternalId = await db.insert('INSERT INTO users (login, firstname, lastname, email, system) VALUES (?, ?, ?, ?, ?)', [id, firstname, lastname, email, system]);
+    await syncTrainings(userInternalId, trainings);
+    return userInternalId;
+}
+export async function updateUser(id, firstname, lastname, email, trainings) {
     const updates = [];
     const binds = [];
     if (firstname) {
@@ -123,14 +182,15 @@ export async function updateUser(id, firstname, lastname, email, trained) {
         updates.push('email = ?');
         binds.push(email);
     }
-    if (typeof trained !== 'undefined') {
-        updates.push('trained = ?');
-        binds.push(trained);
-    }
     if (updates.length) {
         binds.push(id);
         await db.update(`UPDATE users SET ${updates.join(',')} WHERE login = ?`, binds);
     }
+    if (trainings != null) {
+        const userInternalId = await db.getval('SELECT id FROM users WHERE login=?', [id]);
+        if (userInternalId)
+            await syncTrainings(userInternalId, trainings);
+    }
 }
 export async function disableUsers(users) {
     const binds = [];