modules/worker/back/methods/worker-dms/docuwareFilter.js

@@ -0,0 +1,74 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('filter', {
+        description: 'Find docuware documents',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                description: 'The worker id',
+                http: {source: 'path'}
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/:id/filter`,
+            verb: 'GET'
+        }
+    });
+
+    Self.filter = async(ctx, id) => {
+        const models = Self.app.models;
+
+        const {dmsTypeFk} = await models.Docuware.findOne({
+            fields: ['dmsTypeFk'],
+            where: {code: 'hr', action: 'find'}
+        });
+
+        if (!await models.DmsType.hasReadRole(ctx, dmsTypeFk)) return [];
+
+        let workerDocuware = [];
+        const worker = await models.Worker.findById(id, {fields: ['fi', 'firstName', 'lastName']});
+        const docuwareParse = {
+            'Filename': 'dmsFk',
+            'Tipo Documento': 'description',
+            'Stored on': 'created',
+            'Document ID': 'id',
+            'URL': 'download',
+            'Stored by': 'name',
+            'Estado': 'state'
+        };
+
+        workerDocuware =
+            await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
+        const url = (await Self.app.models.Url.getUrl('docuware')) + 'WebClient';
+        for (document of workerDocuware) {
+            const docuwareId = document.id;
+            const defaultData = {
+                id: docuwareId,
+                workerFk: id,
+                dmsFk: docuwareId,
+                dms: {
+                    id: docuwareId,
+                    file: docuwareId + '.pdf',
+                    isDocuware: true,
+                    hasFile: false,
+                    reference: worker.fi,
+                    dmsFk: docuwareId,
+                    url,
+                    description: document.description + ' - ' + document.state,
+                    download: document.download,
+                    created: document.created,
+                    dmsType: {name: 'Docuware'},
+                    worker: {id: null, user: {name: document.name}},
+                }
+            };
+            Object.assign(document, defaultData);
+        }
+    };
+
+    return workerDocuware;
+};

modules/worker/back/methods/worker-dms/filter.js

@@ -8,19 +8,19 @@ module.exports = Self => {
         accepts: [
             {
                 arg: 'id',
-                type: 'Number',
+                type: 'number',
                 description: 'The worker id',
                 http: {source: 'path'}
             },
             {
                 arg: 'filter',
-                type: 'Object',
+                type: 'object',
                 description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
                 http: {source: 'query'}
             }
         ],
         returns: {
-            type: ['Object'],
+            type: ['object'],
             root: true
         },
         http: {
@@ -36,6 +36,7 @@ module.exports = Self => {
 
         // Get ids alloweds
         const account = await models.VnUser.findById(userId);
+
         const stmt = new ParameterizedSQL(
             `SELECT d.id, d.id dmsFk
                 FROM workerDocument wd
@@ -44,68 +45,27 @@ module.exports = Self => {
                     LEFT JOIN account.roleRole rr ON rr.inheritsFrom = dt.readRoleFk AND rr.role = ?
                 `, [account.roleFk]
         );
-        const yourOwnDms = {and: [{isReadableByWorker: true}, {worker: userId}]};
+        const yourOwnDms = {
-        const where = {
+            or: [
-            or: [yourOwnDms, {
+                {and: [
+                    {isReadableByWorker: true},
+                    {worker: userId}
+                ]},
+                {
                     role: {
                         neq: null
                     }
                 }]
         };
-        stmt.merge(conn.makeSuffix(mergeWhere(filter.where, where)));
+        const where = mergeWhere(filter.where, yourOwnDms);
-
+        stmt.merge(conn.makeSuffix({where}));
-        // Get workerDms alloweds
         const dmsIds = await conn.executeStmt(stmt);
+
         const allowedIds = dmsIds.map(dms => dms.id);
-        const allowedFilter = mergeFilters(filter, {where: {dmsFk: {inq: allowedIds}, workerFk: id}});
+        const allowedFilter = mergeFilters(filter, {where: {dmsFk: {inq: allowedIds}}});
-        let workerDms = await models.WorkerDms.find(allowedFilter);
 
-        // Get docuware info
+        const find = await models.WorkerDms.find(allowedFilter);
-        const docuware = await models.Docuware.findOne({
-            fields: ['dmsTypeFk'],
-            where: {code: 'hr', action: 'find'}
-        });
-        const docuwareDmsType = docuware.dmsTypeFk;
-        let workerDocuware = [];
-        if (!filter.skip && (!docuwareDmsType || (docuwareDmsType && await models.DmsType.hasReadRole(ctx, docuwareDmsType)))) {
-            const worker = await models.Worker.findById(id, {fields: ['fi', 'firstName', 'lastName']});
-            const docuwareParse = {
-                'Filename': 'dmsFk',
-                'Tipo Documento': 'description',
-                'Stored on': 'created',
-                'Document ID': 'id',
-                'URL': 'download',
-                'Stored by': 'name',
-                'Estado': 'state'
-            };
 
-            workerDocuware =
+        return find;
-            await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
-            const url = (await Self.app.models.Url.getUrl('docuware')) + 'WebClient';
-            for (document of workerDocuware) {
-                const docuwareId = document.id;
-                const defaultData = {
-                    id: docuwareId,
-                    workerFk: id,
-                    dmsFk: docuwareId,
-                    dms: {
-                        id: docuwareId,
-                        file: docuwareId + '.pdf',
-                        isDocuware: true,
-                        hasFile: false,
-                        reference: worker.fi,
-                        dmsFk: docuwareId,
-                        url,
-                        description: document.description + ' - ' + document.state,
-                        download: document.download,
-                        created: document.created,
-                        dmsType: {name: 'Docuware'},
-                        worker: {id: null, user: {name: document.name}},
-                    }
-                };
-                Object.assign(document, defaultData);
-            }
-        }
-        return workerDms.concat(workerDocuware);
     };
 };