Skip to content

fix(bug): number id parse issue #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hemantch01 wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −4
Open

fix(bug): number id parse issue #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion server/handlers/agreements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ import { Template as CiceroTemplate } from '@accordproject/cicero-core';

async function resolveAgreement(db: any, agreementId: string) {
console.log('Getting agreement: ' + agreementId);
const result = await db.select().from(Agreement).where(eq(Agreement.id, Number.parseInt(agreementId))).limit(1);
const parsedId = Number(agreementId);
if (Number.isNaN(parsedId)) {
throw new Error(`Invalid agreement ID format`);
}
const result = await db.select().from(Agreement).where(eq(Agreement.id, parsedId)).limit(1);
if (!result.length) {
throw new Error(`Agreement with id ${agreementId} does not exist`);
}
Expand Down
15 changes: 12 additions & 3 deletions server/handlers/crud.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,14 @@ export function buildCrudRouter<T extends PgTable<any> & TableWithId>({
async (req: Request, res: Response) => {
try {
const queryParams = parseQueryParams(req);
if (table.id.columnType !== 'PgUUID' && isNaN(Number(req.params.id))) {
return res.status(400).json({ error: 'Invalid ID format' });
}
const whereConditions = [
// Check if table has UUID primary key
table.id.columnType === 'PgUUID' ?
eq(table.id, req.params.id) :
eq(table.id, parseInt(req.params.id))
eq(table.id, Number(req.params.id))
].filter(Boolean);

const result = await res.locals.db
Expand Down Expand Up @@ -392,10 +395,13 @@ export function buildCrudRouter<T extends PgTable<any> & TableWithId>({
};

const queryParams = parseQueryParams(req);
if (table.id.columnType !== 'PgUUID' && isNaN(Number(req.params.id))) {
return res.status(400).json({ error: 'Invalid ID format' });
}
const whereConditions = [
table.id.columnType === 'PgUUID' ?
eq(table.id, req.params.id) :
eq(table.id, parseInt(req.params.id))
eq(table.id, Number(req.params.id))
].filter(Boolean);

const updated = await res.locals.db
Expand Down Expand Up @@ -433,10 +439,13 @@ export function buildCrudRouter<T extends PgTable<any> & TableWithId>({
async (req: Request, res: Response) => {
try {
const queryParams = parseQueryParams(req);
if (table.id.columnType !== 'PgUUID' && isNaN(Number(req.params.id))) {
return res.status(400).json({ error: 'Invalid ID format' });
}
const whereConditions = [
table.id.columnType === 'PgUUID' ?
eq(table.id, req.params.id) :
eq(table.id, parseInt(req.params.id))
eq(table.id, Number(req.params.id))
].filter(Boolean);

await res.locals.db
Expand Down