djuka038/AthenaBE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Sone
2025-12-27 19:54:20 +01:00
parent af4d079181
commit f2c2171815
2 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+25 -17
View File
@@ -2064,23 +2064,27 @@
} }
}, },
"node_modules/body-parser": { "node_modules/body-parser": {
"version": "2.2.0", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz",
"integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", "integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"bytes": "^3.1.2", "bytes": "^3.1.2",
"content-type": "^1.0.5", "content-type": "^1.0.5",
"debug": "^4.4.0", "debug": "^4.4.3",
"http-errors": "^2.0.0", "http-errors": "^2.0.0",
"iconv-lite": "^0.6.3", "iconv-lite": "^0.7.0",
"on-finished": "^2.4.1", "on-finished": "^2.4.1",
"qs": "^6.14.0", "qs": "^6.14.0",
"raw-body": "^3.0.0", "raw-body": "^3.0.1",
"type-is": "^2.0.0" "type-is": "^2.0.1"
}, },
"engines": { "engines": {
"node": ">=18" "node": ">=18"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"node_modules/bowser": { "node_modules/bowser": {
@@ -2747,15 +2751,19 @@
} }
}, },
"node_modules/iconv-lite": { "node_modules/iconv-lite": {
"version": "0.6.3", "version": "0.7.1",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.1.tgz",
"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "integrity": "sha512-2Tth85cXwGFHfvRgZWszZSvdo+0Xsqmw8k8ZwxScfcBneNUraK+dxRxRm24nszx80Y0TVio8kKLt5sLE7ZCLlw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"safer-buffer": ">= 2.1.2 < 3.0.0" "safer-buffer": ">= 2.1.2 < 3.0.0"
}, },
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"node_modules/inherits": { "node_modules/inherits": {
@@ -2823,12 +2831,12 @@
} }
}, },
"node_modules/jws": { "node_modules/jws": {
"version": "3.2.2", "version": "3.2.3",
"resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.3.tgz",
"integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", "integrity": "sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"jwa": "^1.4.1", "jwa": "^1.4.2",
"safe-buffer": "^5.0.1" "safe-buffer": "^5.0.1"
} }
}, },
@@ -2968,9 +2976,9 @@
} }
}, },
"node_modules/nodemailer": { "node_modules/nodemailer": {
"version": "7.0.10", "version": "7.0.12",
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.10.tgz", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.12.tgz",
"integrity": "sha512-Us/Se1WtT0ylXgNFfyFSx4LElllVLJXQjWi2Xz17xWw7amDKO2MLtFnVp1WACy7GkVGs+oBlRopVNUzlrGSw1w==", "integrity": "sha512-H+rnK5bX2Pi/6ms3sN4/jRQvYSMltV6vqup/0SFOrxYYY/qoNvhXPlYq3e+Pm9RFJRwrMGbMIwi81M4dxpomhA==",
"license": "MIT-0", "license": "MIT-0",
"engines": { "engines": {
"node": ">=6.0.0" "node": ">=6.0.0"
src/routes/search/search.service.ts
+30 -26
View File
@@ -120,15 +120,26 @@ export class SearchService {
const { tokens } = tokenize(q); const { tokens } = tokenize(q);
const usersCandidates = await prisma.user.findMany({ // Users visibility rules
where: { const usersWhere: any = {
OR: [ OR: [
{ firstName: { contains: q, mode: "insensitive" } }, { firstName: { contains: q, mode: "insensitive" } },
{ lastName: { contains: q, mode: "insensitive" } }, { lastName: { contains: q, mode: "insensitive" } },
{ email: { contains: q, mode: "insensitive" } }, { email: { contains: q, mode: "insensitive" } },
{ title: { contains: q, mode: "insensitive" } }, { title: { contains: q, mode: "insensitive" } },
], ],
}, };
if (requesterRole === Role.ADMIN) {
// Admins: can search ONLY normal users (no managers/admins)
usersWhere.AND = [{ role: Role.USER }];
} else if (requesterRole === Role.MANAGER) {
// Managers: can search admins, managers, and normal users
usersWhere.AND = [{ role: { in: [Role.ADMIN, Role.MANAGER, Role.USER] } }];
}
const usersCandidates = await prisma.user.findMany({
where: usersWhere,
select: { select: {
id: true, id: true,
firstName: true, firstName: true,
@@ -148,16 +159,7 @@ export class SearchService {
], ],
}; };
if (requesterRole === Role.MANAGER && requesterId) { if (requesterRole === Role.ADMIN && requesterId) {
todoWhere.AND = [
{
OR: [
{ assignees: { some: { id: requesterId } } },
{ assignees: { some: { managerId: requesterId } } },
],
},
];
} else if (requesterRole === Role.ADMIN && requesterId) {
todoWhere.AND = [{ assignees: { some: { id: requesterId } } }]; todoWhere.AND = [{ assignees: { some: { id: requesterId } } }];
} }
@@ -236,15 +238,26 @@ export class SearchService {
const { tokens } = tokenize(q); const { tokens } = tokenize(q);
const userCandidates = await prisma.user.findMany({ // Users visibility rules
where: { const usersWhereFull: any = {
OR: [ OR: [
{ firstName: { contains: q, mode: "insensitive" } }, { firstName: { contains: q, mode: "insensitive" } },
{ lastName: { contains: q, mode: "insensitive" } }, { lastName: { contains: q, mode: "insensitive" } },
{ email: { contains: q, mode: "insensitive" } }, { email: { contains: q, mode: "insensitive" } },
{ title: { contains: q, mode: "insensitive" } }, { title: { contains: q, mode: "insensitive" } },
], ],
}, };
if (requesterRole === Role.ADMIN) {
// Admins: can search ONLY normal users (no managers/admins)
usersWhereFull.AND = [{ role: Role.USER }];
} else if (requesterRole === Role.MANAGER) {
// Managers: can search admins, managers, and normal users
usersWhereFull.AND = [{ role: { in: [Role.ADMIN, Role.MANAGER, Role.USER] } }];
}
const userCandidates = await prisma.user.findMany({
where: usersWhereFull,
select: { select: {
id: true, id: true,
firstName: true, firstName: true,
@@ -265,16 +278,7 @@ export class SearchService {
{ task: { contains: q, mode: "insensitive" } }, { task: { contains: q, mode: "insensitive" } },
], ],
}; };
if (requesterRole === Role.MANAGER && requesterId) { if (requesterRole === Role.ADMIN && requesterId) {
todoWhere.AND = [
{
OR: [
{ assignees: { some: { id: requesterId } } },
{ assignees: { some: { managerId: requesterId } } },
],
},
];
} else if (requesterRole === Role.ADMIN && requesterId) {
todoWhere.AND = [{ assignees: { some: { id: requesterId } } }]; todoWhere.AND = [{ assignees: { some: { id: requesterId } } }];
} }