Project-Name-Here/atas
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove/Deprecate parseIntOrUndefined

Browse Source
This commit is contained in:
Leon Meier 2025-01-31 23:49:16 +01:00
parent e377af7501
commit e3fba930d2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/helpers/prisma_helpers.ts
View File

@ -12,11 +12,11 @@ export function parseDynamicSortBy(SortField: string, Order: string) {
/** /**
* Function to parse a string into a number or return undefined if it is not a number * Function to parse a string into a number or return undefined if it is not a number
* * Deprecated since all empty strings in bodys are now undefined. This happens in api/v1 router
* @export * @export
* @param {string || any} data * @param {string || any} data
* @returns {object} * @returns {object}
*/ */
export function parseIntOrUndefined(data: any) { export function parseIntOrUndefined(data: any) {
return isNaN(parseInt(data)) ? undefined : parseInt(data); return isNaN(parseInt(data)) ? undefined : parseInt(data);
} }

12
src/routes/api/v1/alertContacts.ts
View File

@ -1,7 +1,7 @@
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import db, { handlePrismaError } from '../../../handlers/db.js'; // Database import db, { handlePrismaError } from '../../../handlers/db.js'; // Database
import log from '../../../handlers/log.js'; import log from '../../../handlers/log.js';
import { parseIntOrUndefined, parseDynamicSortBy } from '../../../helpers/prisma_helpers.js'; import { parseDynamicSortBy } from '../../../helpers/prisma_helpers.js';
import { schema_get, schema_post, schema_patch, schema_del } from './alertContacts_schema.js'; import { schema_get, schema_post, schema_patch, schema_del } from './alertContacts_schema.js';
// MARK: GET alertContact // MARK: GET alertContact
@ -22,11 +22,11 @@ async function get(req: Request, res: Response) {
await db.alertContacts await db.alertContacts
.findMany({ .findMany({
where: { where: {
OR: [{ id: parseIntOrUndefined(value.id) }, { name: { search: value.search } }, { phone: { search: value.search } }, { comment: { search: value.search } }] OR: [{ id: value.id }, { name: { search: value.search } }, { phone: { search: value.search } }, { comment: { search: value.search } }]
}, },
orderBy: parseDynamicSortBy(value.sort.toString(), value.order.toString()), orderBy: parseDynamicSortBy(value.sort.toString(), value.order.toString()),
skip: parseIntOrUndefined(value.skip), skip: value.skip,
take: parseIntOrUndefined(value.take) take: value.take
}) })
.then((result) => { .then((result) => {
if (result.length !== 0) { if (result.length !== 0) {
@ -41,7 +41,7 @@ async function get(req: Request, res: Response) {
await db.alertContacts await db.alertContacts
.count({ .count({
where: { where: {
OR: [{ id: parseIntOrUndefined(value.id) }, { name: { search: value.search } }, { phone: { search: value.search } }, { comment: { search: value.search } }] OR: [{ id: value.id }, { name: { search: value.search } }, { phone: { search: value.search } }, { comment: { search: value.search } }]
}, },
orderBy: parseDynamicSortBy(value.sort.toString(), value.order.toString()) orderBy: parseDynamicSortBy(value.sort.toString(), value.order.toString())
}) })
@ -55,7 +55,7 @@ async function get(req: Request, res: Response) {
// get all entrys // get all entrys
log.api?.trace('get all entrys - without FullTextSearch'); log.api?.trace('get all entrys - without FullTextSearch');
await db.alertContacts await db.alertContacts
.findMany({ orderBy: parseDynamicSortBy(value.sort.toString(), value.order.toString()), take: parseIntOrUndefined(value.take), skip: parseIntOrUndefined(value.skip) }) .findMany({ orderBy: parseDynamicSortBy(value.sort.toString(), value.order.toString()), take: value.take, skip: value.skip })
.then((result) => { .then((result) => {
if (result.length !== 0) { if (result.length !== 0) {
res.status(200).json(result); res.status(200).json(result);