API-36: 🚑 Fixing critical issue with the amount of sql connections (!15)

Co-authored-by: Patrick Mueller <patrick@mueller-patrick.tech>
Reviewed-on: #15
Co-authored-by: Patrick Müller <patrick@plutodev.de>
Co-committed-by: Patrick Müller <patrick@plutodev.de>

src/models/partyplaner/PartyPlaner.db.ts

@@ -0,0 +1,29 @@
+import * as dotenv from 'dotenv';
+
+const mariadb = require('mariadb');
+
+dotenv.config();
+
+export namespace PartyPlanerDB {
+    const prod_pool = mariadb.createPool({
+        host: process.env.DB_HOST,
+        user: process.env.DB_USER,
+        password: process.env.DB_PASSWORD,
+        database: process.env.PARTYPLANER_PROD_DATABASE,
+        connectionLimit: 5
+    });
+    const dev_pool = mariadb.createPool({
+        host: process.env.DB_HOST,
+        user: process.env.DB_USER,
+        password: process.env.DB_PASSWORD,
+        database: process.env.PARTYPLANER_DEV_DATABASE,
+        connectionLimit: 5
+    });
+
+    export function getConnection(useDev: boolean = false) {
+        if (useDev) {
+            return dev_pool;
+        }
+        return prod_pool;
+    }
+}

src/models/partyplaner/event/event.service.ts

@@ -1,24 +1,9 @@
 import * as dotenv from 'dotenv';
 import {Event} from './Event.interface';
+import {PartyPlanerDB} from '../PartyPlaner.db';
 
 dotenv.config();
 
-const mariadb = require('mariadb');
-const prod_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_PROD_DATABASE,
-    connectionLimit: 5
-});
-const dev_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_DEV_DATABASE,
-    connectionLimit: 5
-});
-
 /**
  * Returns all events of the given user
  * @param useDev If the dev or prod database should be used
@@ -26,14 +11,8 @@ const dev_pool = mariadb.createPool({
  * @return Event[] A list of events
  */
 export const getEventData = async (useDev: boolean, userId: string): Promise<Event[]> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
-
         let eventRows = await conn.query('SELECT event_id, name, description, takes_place_date, registration_until_date, max_participants FROM events WHERE creator_id = ?', userId);
 
         let eventsMap = new Map<string, Event>();
@@ -90,9 +69,5 @@ export const getEventData = async (useDev: boolean, userId: string): Promise<Eve
         return eventsList;
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };

src/models/partyplaner/friendship/friendship.service.ts

@@ -1,24 +1,9 @@
 import * as dotenv from 'dotenv';
 import {Friendship} from './Friendship.interface';
+import {PartyPlanerDB} from '../PartyPlaner.db';
 
 dotenv.config();
 
-const mariadb = require('mariadb');
-const prod_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_PROD_DATABASE,
-    connectionLimit: 5
-});
-const dev_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_DEV_DATABASE,
-    connectionLimit: 5
-});
-
 /**
  * Returns all friends of the given user
  * @param useDev If the dev or prod database should be used
@@ -26,14 +11,8 @@ const dev_pool = mariadb.createPool({
  * @return Friendship[] A list of friends
  */
 export const getFriendshipData = async (useDev: boolean, userId: string): Promise<Friendship[]> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
-
         let rows = await conn.query('SELECT f.friendship_id, f.friend_id, u.first_name as friend_first_name, u.last_name as friend_last_name, u.username as friend_username FROM friendships f LEFT OUTER JOIN users u ON f.friend_id = u.user_id WHERE f.user_id = ?', userId);
 
         let friends: Friendship[] = [];
@@ -51,9 +30,5 @@ export const getFriendshipData = async (useDev: boolean, userId: string): Promis
         return friends;
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };

src/models/partyplaner/invite/invite.service.ts

@@ -1,24 +1,9 @@
 import * as dotenv from 'dotenv';
 import {ReceivedInvite} from './ReceivedInvite.interface';
+import {PartyPlanerDB} from '../PartyPlaner.db';
 
 dotenv.config();
 
-const mariadb = require('mariadb');
-const prod_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_PROD_DATABASE,
-    connectionLimit: 5
-});
-const dev_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_DEV_DATABASE,
-    connectionLimit: 5
-});
-
 /**
  * Returns all events the user is invited to
  * @param useDev If the dev or prod database should be used
@@ -26,14 +11,8 @@ const dev_pool = mariadb.createPool({
  * @return ReceivedInvite[] A list of invites
  */
 export const getInvitesData = async (useDev: boolean, userId: string): Promise<ReceivedInvite[]> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
-
         let rows = await conn.query('SELECT i.invite_id, i.valid_until, i.already_used, i.invite_key, e.name as event_name, e.description as event_description, e.takes_place_date, e.registration_until_date, e.max_participants, e.creator_id, u.first_name, u.last_name FROM invitations i LEFT OUTER JOIN events e ON e.event_id = i.event_id LEFT OUTER JOIN users u ON u.user_id = e.creator_id WHERE i.user_id = ?', userId);
 
         let invites: ReceivedInvite[] = [];
@@ -58,9 +37,5 @@ export const getInvitesData = async (useDev: boolean, userId: string): Promise<R
         return invites;
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };

src/models/partyplaner/session/session.service.ts

@@ -1,24 +1,9 @@
 import * as dotenv from 'dotenv';
 import {SessionData} from './SessionData.interface';
+import {PartyPlanerDB} from '../PartyPlaner.db';
 
 dotenv.config();
 
-const mariadb = require('mariadb');
-const prod_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_PROD_DATABASE,
-    connectionLimit: 5
-});
-const dev_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_DEV_DATABASE,
-    connectionLimit: 5
-});
-
 /**
  * Returns all active sessions of the given user
  * @param useDev If the dev or prod database should be used
@@ -26,14 +11,8 @@ const dev_pool = mariadb.createPool({
  * @return SessionData[] A list containing objects with the session data
  */
 export const getSessionData = async (useDev: boolean, userId: string): Promise<SessionData[]> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
-
         let rows = await conn.query('SELECT session_id, type, last_login, last_ip FROM sessions WHERE user_id = ? AND valid_until > NOW()', userId);
 
         let sessions: SessionData[] = [];
@@ -50,9 +29,5 @@ export const getSessionData = async (useDev: boolean, userId: string): Promise<S
         return sessions;
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };

src/models/partyplaner/user/user.service.ts

@@ -4,25 +4,10 @@ import {Guid} from 'guid-typescript';
 import {UserData} from './UserData.interface';
 import {Session} from './Session.interface';
 import {Status} from './Status.interface';
+import {PartyPlanerDB} from '../PartyPlaner.db';
 
 dotenv.config();
 
-const mariadb = require('mariadb');
-const prod_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_PROD_DATABASE,
-    connectionLimit: 5
-});
-const dev_pool = mariadb.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.PARTYPLANER_DEV_DATABASE,
-    connectionLimit: 5
-});
-
 /**
  * Returns all data about the given user
  * @param useDev If the dev or prod database should be used
@@ -30,14 +15,8 @@ const dev_pool = mariadb.createPool({
  * @return UserData An object containing the user data
  */
 export const getUserData = async (useDev: boolean, userId: string): Promise<UserData> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
-
         let rows = await conn.query('SELECT username, email, first_name, last_Name, last_login, email_is_verified, is_premium_user FROM users WHERE user_id = ?', userId);
 
         let user: UserData = {} as UserData;
@@ -57,10 +36,6 @@ export const getUserData = async (useDev: boolean, userId: string): Promise<User
         return user;
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };
 
@@ -70,14 +45,8 @@ export const getUserData = async (useDev: boolean, userId: string): Promise<User
  * @return any An object with a list of usernames and emails
  */
 export const getExistingUsernamesAndEmails = async (useDev: boolean): Promise<any> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
-
         const rows = await conn.query('SELECT username, email FROM users');
 
         let usernames: string[] = [];
@@ -94,10 +63,6 @@ export const getExistingUsernamesAndEmails = async (useDev: boolean): Promise<an
         };
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };
 
@@ -113,14 +78,8 @@ export const getExistingUsernamesAndEmails = async (useDev: boolean): Promise<an
  * @param deviceInfo The user agent of the new user
  */
 export const registerUser = async (useDev: boolean, username: string, email: string, firstName: string, lastName: string, password: string, ip: string, deviceInfo: string): Promise<Session> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
-
         const pwHash = bcrypt.hashSync(password, 10);
         const sessionKey = Guid.create().toString();
         const sessionKeyHash = bcrypt.hashSync(sessionKey, 10);
@@ -166,10 +125,6 @@ export const registerUser = async (useDev: boolean, username: string, email: str
         };
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };
 
@@ -183,14 +138,8 @@ export const registerUser = async (useDev: boolean, username: string, email: str
  * @param deviceInfo The user agent of the new user
  */
 export const loginUser = async (useDev: boolean, username: string, email: string, password: string, ip: string, deviceInfo: string): Promise<Session> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
-
         let query_result;
 
         // Get the saved hash
@@ -248,10 +197,6 @@ export const loginUser = async (useDev: boolean, username: string, email: string
 
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };
 
@@ -262,13 +207,8 @@ export const loginUser = async (useDev: boolean, username: string, email: string
  * @param email The email to check
  */
 export const checkUsernameAndEmail = async (useDev: boolean, username: string, email: string): Promise<Status> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
         const usernameQuery = 'SELECT username FROM users WHERE username = ?';
         const emailQuery = 'SELECT email FROM users WHERE email = ?';
         const usernameRes = await conn.query(usernameQuery, username);
@@ -314,22 +254,12 @@ export const checkUsernameAndEmail = async (useDev: boolean, username: string, e
 
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };
 
 export const checkSession = async (useDev: boolean, userId: string, sessionId: string, sessionKey: string): Promise<boolean> => {
-    let conn;
+    let conn = PartyPlanerDB.getConnection(useDev);
     try {
-        if (useDev) {
-            conn = await dev_pool.getConnection();
-        } else {
-            conn = await prod_pool.getConnection();
-        }
-
         let rows = await conn.query('SELECT session_key_hash FROM sessions WHERE user_id = ? AND session_id = ?', [userId, sessionId]);
 
         let savedHash = '';
@@ -340,9 +270,5 @@ export const checkSession = async (useDev: boolean, userId: string, sessionId: s
         return bcrypt.compareSync(sessionKey, savedHash);
     } catch (err) {
         throw err;
-    } finally {
-        if (conn) {
-            conn.end();
-        }
     }
 };