verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

Added new filter param in item request #3094

Merged
jon merged 6 commits from Fix-ItemRequest into dev 2024-10-21 09:34:54 +00:00
Conversation 1 Commits 6 Files Changed 1 +27
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/ticket/back/methods/ticket-request/filter.js
View File

@ -59,6 +59,11 @@ module.exports = Self => {
arg: 'state', arg: 'state',
type: 'string', type: 'string',
description: `Search request by request state` description: `Search request by request state`
},
{
arg: 'myTeam',
type: 'boolean',
description: `Team partners`
} }
], ],
returns: { returns: {
@ -75,6 +80,8 @@ module.exports = Self => {
const conn = Self.dataSource.connector; const conn = Self.dataSource.connector;
const userId = ctx.req.accessToken.userId; const userId = ctx.req.accessToken.userId;
const myOptions = {}; const myOptions = {};
const models = Self.app.models;
const args = ctx.args;
if (typeof options == 'object') if (typeof options == 'object')
jgallego marked this conversation as resolved Outdated
jgallego commented 2024-10-14 12:44:15 +00:00
Outdated
Review
Copy Link

subimos el codigo sin comentarios..

Esta hecho igual que las otras secciones que buscan departamentos?

subimos el codigo sin comentarios.. Esta hecho igual que las otras secciones que buscan departamentos?
jon commented 2024-10-15 07:05:29 +00:00
Outdated
Review
Copy Link

Me he guiado de como está hecho en claim/filter.
De todas formas pongo a @alexm para que le pegue un vistazo por si me he dejado algo.

Me he guiado de como está hecho en claim/filter. De todas formas pongo a @alexm para que le pegue un vistazo por si me he dejado algo.
Object.assign(myOptions, options); Object.assign(myOptions, options);
@ -82,6 +89,21 @@ module.exports = Self => {
if (ctx.args.mine) if (ctx.args.mine)
ctx.args.attenderFk = userId; ctx.args.attenderFk = userId;
const teamMembersId = [];
if (args.myTeam != null) {
const worker = await models.Worker.findById(userId, {
include: {
relation: 'collegues'
}
}, myOptions);
const collegues = worker.collegues() || [];
for (let collegue of collegues)
teamMembersId.push(collegue.collegueFk);
if (teamMembersId.length == 0)
teamMembersId.push(userId);
}
let where = buildFilter(ctx.args, (param, value) => { let where = buildFilter(ctx.args, (param, value) => {
switch (param) { switch (param) {
case 'search': case 'search':
@ -113,6 +135,11 @@ module.exports = Self => {
return {'w.id': value}; return {'w.id': value};
case 'salesPersonFk': case 'salesPersonFk':
return {'c.salesPersonFk': value}; return {'c.salesPersonFk': value};
case 'myTeam':
if (value)
return {'tr.requesterFk': {inq: teamMembersId}};
else
return {'tr.requesterFk': {nin: teamMembersId}};
} }
}); });