diff --git a/API-Project/package-lock.json b/API-Project/package-lock.json index 90b4735..ffc5c3d 100644 --- a/API-Project/package-lock.json +++ b/API-Project/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@types/express": "^4.17.21", "@types/morgan": "^1.9.9", - "dotenv": "^16.3.1", "cors": "^2.8.5", + "dotenv": "^16.3.1", "express": "^4.18.2", "helmet": "^7.1.0", "morgan": "^1.10.0", diff --git a/API-Project/src/gateways/ingredients.gateway.ts b/API-Project/src/gateways/ingredients.gateway.ts index e7bb812..76c6ba6 100644 --- a/API-Project/src/gateways/ingredients.gateway.ts +++ b/API-Project/src/gateways/ingredients.gateway.ts @@ -71,15 +71,16 @@ export class IngredientsGateway { } async getByLetter(letter: string): Promise { - this.connection.connect(); + const client = await this.connection.getPoolClient() const query = { text: 'SELECT * FROM Ingredients i WHERE LOWER(SUBSTRING(i.name, 1, 1)) = $1', values: [letter.toLowerCase()], }; - const res = await this.connection.client.query(query); - console.log(res) + const res = await client.query(query); + + client.release() if (res.rowCount === 0) { return null; @@ -96,15 +97,16 @@ export class IngredientsGateway { } async filter(prompt: string): Promise { - this.connection.connect(); + const client = await this.connection.getPoolClient() const query = { text: 'SELECT * FROM Ingredients WHERE LOWER(name) LIKE $1', values: [`%${prompt.toLowerCase()}%`], }; - const res = await this.connection.client.query(query); - console.log(res) + const res = await client.query(query); + + client.release() if (res.rowCount === 0) { return null; diff --git a/API-Project/src/server.ts b/API-Project/src/server.ts index 7b3451f..69ca29e 100644 --- a/API-Project/src/server.ts +++ b/API-Project/src/server.ts @@ -1,10 +1,12 @@ -import express from "express"; require('dotenv').config(); +import express from "express"; import cors from "cors"; import { IngredientsController } from "./controllers/ingredients.controller"; import { RecipesController } from "./controllers/recipes.controller"; import { StepsController } from "./controllers/steps.controller"; + + let helmet = require("helmet"); let app = express(); app.use(helmet.hidePoweredBy()); diff --git a/API-Project/src/services b/API-Project/src/services deleted file mode 100644 index e69de29..0000000