Merge pull request #186 from StatelessStudio/v3.0.3

[3.0.3] Jul-23-2019

Author: DrewImm

CHANGELOG.md

@@ -1,5 +1,11 @@
 # PointyApi Changelog
 
+## [3.0.3] Jul-23-2019
+
+### Fixes
+- runHook should return result set
+- Duplicate Key Value should output column name
+
 ## [3.0.2] Jul-14-2019
 
 ### Fixes

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "pointyapi",
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"author": "stateless-studio",
 	"license": "MIT",
 	"scripts": {
@@ -26,7 +26,7 @@
 		"@types/btoa": "^1.2.3",
 		"@types/express": "^4.17.0",
 		"@types/jsonwebtoken": "^7.2.8",
-		"@types/node": "^10.14.12",
+		"@types/node": "^10.14.13",
 		"@types/request": "^2.48.2",
 		"atob": "^2.1.2",
 		"bcryptjs": "^2.4.3",

package.json

@@ -17,7 +17,7 @@ export function errorHandler(error: any, code: number = 500): void {
 				{
 					property: error.column,
 					constraints: {
-						"isNotNull": error.message
+						isNotNull: error.message
 					}
 				}
 			]);
@@ -30,7 +30,9 @@ export function errorHandler(error: any, code: number = 500): void {
 		}
 		else if (error.code === 23505) {
 			// Duplicate key value
-			this.response.conflictResponder('Duplicate Key Value');
+			this.response.conflictResponder(
+				'Duplicate Key Value: ' + error.detail
+			);
 			return;
 		}
 	}

src/handlers/error-handler.ts

@@ -17,6 +17,7 @@ export async function runHook(
 ): Promise<boolean> {
 	// Run model hook
 	let hookResult = false;
+	let resultset;
 	const promises = [];
 
 	if (obj instanceof Array) {
@@ -33,6 +34,7 @@ export async function runHook(
 	await Promise.all(promises)
 		.then((results) => {
 			hookResult = true;
+			resultset = results;
 
 			for (let i = 0; i < results.length; i++) {
 				if (!results[i]) {
@@ -57,5 +59,5 @@ export async function runHook(
 		console.warn('Could not complete hook "' + name + '" on object: ', obj);
 	}
 
-	return hookResult;
+	return hookResult ? resultset : false;
 }

src/utils/run-hook.ts

@@ -58,7 +58,7 @@ describe('[Utils] runHook()', () => {
 			response
 		);
 
-		expect(result).toBe(true);
+		expect(result).toBeTruthy();
 	});
 
 	it('calls response.error if the hook does not return true', async () => {
@@ -143,7 +143,7 @@ describe('[Utils] runHook()', () => {
 			response
 		);
 
-		expect(result).toBe(true);
+		expect(result).toBeTruthy();
 		expect(tester.password).toEqual('bob');
 	});
 
@@ -158,7 +158,7 @@ describe('[Utils] runHook()', () => {
 			response
 		);
 
-		expect(result).toBe(true);
+		expect(result).toBeTruthy();
 		expect(testers[0].password).toEqual('bob');
 		expect(testers[1].password).toEqual('bob');
 	});