@balena/pinejs 17.1.0-build-joshbwlng-tasks-0c116dc98102e3ddd4aa6e8a4f350a1e18891e1a-1 → 17.1.0-build-joshbwlng-tasks-61ce10e444abec6afea3fec43e9a5c37c7cedea6-1

package/src/sbvr-api/sbvr-utils.ts

@@ -1546,7 +1546,8 @@ const runRequest = async (
 	if (env.DEBUG) {
 		log.log('Running', req.method, req.url);
 	}
-	let result: Db.Result | number | undefined;
+	let resultGet: Db.Result | undefined;
+	let resultPost: number | undefined;
 
 	try {
 		try {
@@ -1555,18 +1556,18 @@ const runRequest = async (
 
 			switch (request.method) {
 				case 'GET':
-					result = await runGet(req, request, tx);
+					resultGet = await runGet(req, request, tx);
 					break;
 				case 'POST':
-					result = await runPost(req, request, tx);
+					resultPost = await runPost(req, request, tx);
 					break;
 				case 'PUT':
 				case 'PATCH':
 				case 'MERGE':
-					result = await runPut(req, request, tx);
+					await runPut(req, request, tx);
 					break;
 				case 'DELETE':
-					result = await runDelete(req, request, tx);
+					await runDelete(req, request, tx);
 					break;
 			}
 		} catch (err: any) {
@@ -1592,7 +1593,12 @@ const runRequest = async (
 			throw err;
 		}
 
-		await runHooks('POSTRUN', request.hooks, { req, request, result, tx });
+		await runHooks('POSTRUN', request.hooks, {
+			req,
+			request,
+			result: resultGet ?? resultPost,
+			tx,
+		});
 	} catch (err: any) {
 		await runHooks('POSTRUN-ERROR', request.hooks, {
 			req,
@@ -1602,7 +1608,23 @@ const runRequest = async (
 		});
 		throw err;
 	}
-	return await prepareResponse(req, request, result, tx);
+
+	switch (request.method) {
+		case 'GET':
+			return await respondGet(req, request, resultGet, tx);
+		case 'POST':
+			return await respondPost(req, request, resultPost, tx);
+		case 'PUT':
+		case 'PATCH':
+		case 'MERGE':
+			return await respondPut(req, request, tx);
+		case 'DELETE':
+			return await respondDelete(req, request, tx);
+		case 'OPTIONS':
+			return await respondOptions(req, request, tx);
+		default:
+			throw new MethodNotAllowedError();
+	}
 };
 
 const runChangeSet =
@@ -1650,30 +1672,6 @@ const updateBinds = (
 	return request;
 };
 
-const prepareResponse = async (
-	req: Express.Request,
-	request: uriParser.ODataRequest,
-	result: any,
-	tx: Db.Tx,
-): Promise<Response> => {
-	switch (request.method) {
-		case 'GET':
-			return await respondGet(req, request, result, tx);
-		case 'POST':
-			return await respondPost(req, request, result, tx);
-		case 'PUT':
-		case 'PATCH':
-		case 'MERGE':
-			return await respondPut(req, request, result, tx);
-		case 'DELETE':
-			return await respondDelete(req, request, result, tx);
-		case 'OPTIONS':
-			return await respondOptions(req, request, result, tx);
-		default:
-			throw new MethodNotAllowedError();
-	}
-};
-
 const checkReadOnlyRequests = (request: uriParser.ODataRequest) => {
 	if (request.method !== 'GET') {
 		// Only GET requests can be read-only
@@ -1775,11 +1773,17 @@ const runGet = async (
 const respondGet = async (
 	req: Express.Request,
 	request: uriParser.ODataRequest,
-	result: any,
+	result: Db.Result | undefined,
 	tx: Db.Tx,
 ): Promise<Response> => {
 	const vocab = request.vocabulary;
 	if (request.sqlQuery != null) {
+		if (result == null) {
+			// This shouldn't be able to happen because the result should only be null if there's no sqlQuery
+			throw new Error(
+				'Null result passed to respond GET that has a sqlQuery defined',
+			);
+		}
 		const format = request.odataQuery.options?.$format;
 		const metadata =
 			format != null && typeof format === 'object'
@@ -1844,7 +1848,7 @@ const runPost = async (
 const respondPost = async (
 	req: Express.Request,
 	request: uriParser.ODataRequest,
-	id: number,
+	id: number | undefined,
 	tx: Db.Tx,
 ): Promise<Response> => {
 	const vocab = request.vocabulary;
@@ -1894,7 +1898,7 @@ const runPut = async (
 	_req: Express.Request,
 	request: uriParser.ODataRequest,
 	tx: Db.Tx,
-): Promise<undefined> => {
+): Promise<void> => {
 	let rowsAffected: number;
 	// If request.sqlQuery is an array it means it's an UPSERT, ie two queries: [InsertQuery, UpdateQuery]
 	if (Array.isArray(request.sqlQuery)) {
@@ -1910,13 +1914,11 @@ const runPut = async (
 	if (rowsAffected > 0) {
 		await validateModel(tx, _.last(request.translateVersions)!, request);
 	}
-	return undefined;
 };
 
 const respondPut = async (
 	req: Express.Request,
 	request: uriParser.ODataRequest,
-	result: any,
 	tx: Db.Tx,
 ): Promise<Response> => {
 	const response = {
@@ -1925,7 +1927,6 @@ const respondPut = async (
 	await runHooks('PRERESPOND', request.hooks, {
 		req,
 		request,
-		result,
 		response,
 		tx,
 	});
@@ -1938,13 +1939,11 @@ const runDelete = async (
 	_req: Express.Request,
 	request: uriParser.ODataRequest,
 	tx: Db.Tx,
-): Promise<undefined> => {
+): Promise<void> => {
 	const { rowsAffected } = await runQuery(tx, request, undefined, true);
 	if (rowsAffected > 0) {
 		await validateModel(tx, _.last(request.translateVersions)!, request);
 	}
-
-	return undefined;
 };
 
 export const executeStandardModels = async (tx: Db.Tx): Promise<void> => {