Fix /api/getRequests endpoint #1
					 7 changed files with 34 additions and 8 deletions
				
			
		
							
								
								
									
										13
									
								
								.vscode/launch.json
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								.vscode/launch.json
									
										
									
									
										vendored
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,13 @@
 | 
			
		|||
{
 | 
			
		||||
    "version": "0.2.0",
 | 
			
		||||
    "configurations": [
 | 
			
		||||
      {
 | 
			
		||||
        "type": "node",
 | 
			
		||||
        "request": "attach",
 | 
			
		||||
        "name": "Node: Nodemon",
 | 
			
		||||
        "processId": "${command:PickProcess}",
 | 
			
		||||
        "restart": true,
 | 
			
		||||
        "protocol": "inspector"
 | 
			
		||||
      }
 | 
			
		||||
    ]
 | 
			
		||||
  }  
 | 
			
		||||
| 
						 | 
				
			
			@ -2,5 +2,9 @@
 | 
			
		|||
  "watch": ["src"],
 | 
			
		||||
  "ext": "ts",
 | 
			
		||||
  "ignore": ["src/**/*.spec.ts"],
 | 
			
		||||
  "exec": "ts-node ./src/app.ts"
 | 
			
		||||
  "execMap": {
 | 
			
		||||
    "ts": "node --require ts-node/register"
 | 
			
		||||
  },
 | 
			
		||||
  "verbose": true,
 | 
			
		||||
  "restartable": "rs"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										5
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -491,6 +491,11 @@
 | 
			
		|||
        "is-obj": "^2.0.0"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "dotenv": {
 | 
			
		||||
      "version": "8.2.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
 | 
			
		||||
      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
 | 
			
		||||
    },
 | 
			
		||||
    "duplexer3": {
 | 
			
		||||
      "version": "0.1.4",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,6 +4,7 @@
 | 
			
		|||
  "main": "index.js",
 | 
			
		||||
  "license": "MIT",
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "dotenv": "^8.2.0",
 | 
			
		||||
    "express": "^4.17.1",
 | 
			
		||||
    "pg": "^8.2.1"
 | 
			
		||||
  },
 | 
			
		||||
| 
						 | 
				
			
			@ -16,6 +17,7 @@
 | 
			
		|||
    "typescript": "^3.9.5"
 | 
			
		||||
  },
 | 
			
		||||
  "scripts": {
 | 
			
		||||
    "start": "nodemon"
 | 
			
		||||
    "start": "nodemon src/app.ts",
 | 
			
		||||
    "debug": "nodemon --inspect src/app.ts"
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,6 +2,7 @@ import * as config from "./config";
 | 
			
		|||
import * as requests from "./requests";
 | 
			
		||||
import express from "express";
 | 
			
		||||
import db from "./db";
 | 
			
		||||
import { QueryResult } from "pg";
 | 
			
		||||
 | 
			
		||||
const app = express();
 | 
			
		||||
app.use(express.static('public'));
 | 
			
		||||
| 
						 | 
				
			
			@ -9,8 +10,7 @@ app.use(express.json());
 | 
			
		|||
 | 
			
		||||
app.get("/api/getRequests", async (request, response) => {
 | 
			
		||||
    var requestCount = ( request.query.count ? parseInt(request.query.count as string, 10) : 5 );
 | 
			
		||||
	requests.getRequests(requestCount).then((val: any) => console.log(val));
 | 
			
		||||
	response.send(requests.getRequests(requestCount));
 | 
			
		||||
    requests.getRequests(requestCount).then((val: QueryResult) => response.send(val));
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
app.get("/api/getAllRequests", async (request, response) => {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,3 +1,5 @@
 | 
			
		|||
require('dotenv').config()
 | 
			
		||||
 | 
			
		||||
if (!process.env.PORT) {
 | 
			
		||||
    console.log("Missing environment variable PORT");
 | 
			
		||||
    process.exit(1);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,7 +10,7 @@ const getRequestsQuery = {
 | 
			
		|||
 | 
			
		||||
export async function getRequests(count: number) {
 | 
			
		||||
	var query = Object.assign(getRequestsQuery, { values: [count] });
 | 
			
		||||
	db.query(query)
 | 
			
		||||
	return db.query(query)
 | 
			
		||||
	.then((result: pg.QueryResult) => result.rows)
 | 
			
		||||
	.catch((e: any) => console.error(e.stack));
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue