Merge pull request #68 from icefoganalytics/caleb/hot-fix

maybe fix for aircrash pagination

Author: burkkyy

api/routes/aircrash-router.ts

@@ -34,7 +34,7 @@ aircrashRouter.use(authorize(airCrashViewers));
 
 aircrashRouter.get(
 	'/',
-	[query('page').default(0).isInt(), query('limit').default(10).isInt({ gt: 0 })],
+	[query('page').default(0).isInt(), query('perPage').default(10).isInt({ gt: 0 })],
 	ReturnValidationErrors,
 	async (req: Request, res: Response) => {
 		try {
@@ -55,7 +55,7 @@ aircrashRouter.get(
 			} = req.query;
 
 			const page = parseInt(req.query.page?.toString() || '') || 1;
-			const perPage = parseInt(req.query.limit?.toString() || '') || 10;
+			const perPage = parseInt(req.query.perPage?.toString() || '') || 10;
 
 			const data = await aircrashService.doSearch(page, perPage, {
 				textToMatch,

api/services/aircrash-service.ts

@@ -47,7 +47,12 @@ export class AircrashService {
 
 		// _TODO_ move into base-controller.ts
 		const MAX_PER_PAGE = 1000;
-		const limit = Math.max(1, Math.min(perPage, MAX_PER_PAGE));
+		let limit = 0;
+		if (perPage === -1) {
+			limit = MAX_PER_PAGE;
+		} else {
+			limit = Math.max(1, Math.min(perPage, MAX_PER_PAGE));
+		}
 		const offset = (page - 1) * limit;
 
 		const aircrashes = await db

web/src/controllers/aircrash.js

@@ -3,7 +3,7 @@ import { api } from './config';
 export default {
 	async get(
 		page,
-		limit,
+		perPage,
 		textToMatch,
 		sortBy,
 		sort,
@@ -23,7 +23,7 @@ export default {
 				crossdomain: true,
 				params: {
 					page,
-					limit,
+					perPage,
 					textToMatch,
 					sortBy,
 					sort,