diff --git a/src/models/betterzon/Betterzon.db.ts b/src/models/betterzon/Betterzon.db.ts new file mode 100644 index 0000000..90f5946 --- /dev/null +++ b/src/models/betterzon/Betterzon.db.ts @@ -0,0 +1,19 @@ +import * as dotenv from 'dotenv'; + +const mariadb = require('mariadb'); + +dotenv.config(); + +export namespace BetterzonDB { + const pool = mariadb.createPool({ + host: process.env.DB_HOST, + user: process.env.DB_USER, + password: process.env.DB_PASSWORD, + database: process.env.BETTERZON_DATABASE, + connectionLimit: 5 + }); + + export function getConnection() { + return pool; + } +} diff --git a/src/models/betterzon/Betterzon.router.ts b/src/models/betterzon/Betterzon.router.ts index b8dddf0..767fb40 100644 --- a/src/models/betterzon/Betterzon.router.ts +++ b/src/models/betterzon/Betterzon.router.ts @@ -34,7 +34,7 @@ betterzonRouter.use('/crawlingstatus', crawlingstatusRouter); betterzonRouter.get('/', async (req: Request, res: Response) => { try { - res.status(200).send('Pluto Development PartyPlaner API Endpoint V2'); + res.status(200).send('Pluto Development Betterzon API Endpoint'); } catch (e) { let errorGuid = Guid.create().toString(); logger.error('Error handling a request: ' + e.message, {reference: errorGuid}); diff --git a/src/models/betterzon/categories/categories.service.ts b/src/models/betterzon/categories/categories.service.ts index ed88cc8..f35a6ed 100644 --- a/src/models/betterzon/categories/categories.service.ts +++ b/src/models/betterzon/categories/categories.service.ts @@ -1,18 +1,10 @@ import * as dotenv from 'dotenv'; import {Category} from './category.interface'; import {Categories} from './categories.interface'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -26,10 +18,9 @@ const pool = mariadb.createPool({ * Fetches and returns all known categories */ export const findAll = async (): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let categRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT category_id, name FROM categories'); for (let row in rows) { if (row !== 'meta') { @@ -47,10 +38,6 @@ export const findAll = async (): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return categRows; @@ -61,10 +48,9 @@ export const findAll = async (): Promise => { * @param id The id of the category to fetch */ export const find = async (id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let categ: any; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT category_id, name FROM categories WHERE category_id = ?', id); for (let row in rows) { if (row !== 'meta') { @@ -74,10 +60,6 @@ export const find = async (id: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return categ; @@ -88,10 +70,9 @@ export const find = async (id: number): Promise => { * @param term the term to match */ export const findBySearchTerm = async (term: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let categRows = []; try { - conn = await pool.getConnection(); term = '%' + term + '%'; const rows = await conn.query('SELECT category_id, name FROM categories WHERE name LIKE ?', term); for (let row in rows) { @@ -102,10 +83,6 @@ export const findBySearchTerm = async (term: string): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return categRows; diff --git a/src/models/betterzon/contact_persons/contact_persons.service.ts b/src/models/betterzon/contact_persons/contact_persons.service.ts index f302bba..e95ad7e 100644 --- a/src/models/betterzon/contact_persons/contact_persons.service.ts +++ b/src/models/betterzon/contact_persons/contact_persons.service.ts @@ -1,18 +1,10 @@ import * as dotenv from 'dotenv'; import {Contact_Person} from './contact_person.interface'; import {Contact_Persons} from './contact_persons.interface'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -26,10 +18,9 @@ const pool = mariadb.createPool({ * Fetches and returns all known contact persons */ export const findAll = async (): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let contRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT contact_person_id, first_name, last_name, gender, email, phone, vendor_id FROM contact_persons'); for (let row in rows) { if (row !== 'meta') { @@ -39,10 +30,6 @@ export const findAll = async (): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return contRows; @@ -53,10 +40,9 @@ export const findAll = async (): Promise => { * @param id The id of the contact person to fetch */ export const find = async (id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let cont: any; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT contact_person_id, first_name, last_name, gender, email, phone, vendor_id FROM contact_persons WHERE contact_person_id = ?', id); for (let row in rows) { if (row !== 'meta') { @@ -66,10 +52,6 @@ export const find = async (id: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return cont; @@ -80,10 +62,9 @@ export const find = async (id: number): Promise => { * @param id The id of the vendor to fetch contact persons for */ export const findByVendor = async (id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let contRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT contact_person_id, first_name, last_name, gender, email, phone, vendor_id FROM contact_persons WHERE vendor_id = ?', id); for (let row in rows) { if (row !== 'meta') { @@ -93,10 +74,6 @@ export const findByVendor = async (id: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return contRows; @@ -113,10 +90,8 @@ export const findByVendor = async (id: number): Promise => { * @param phone The phone number of the contact person */ export const createContactEntry = async (user_id: number, vendor_id: number, first_name: string, last_name: string, gender: string, email: string, phone: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); - // Check if the user is authorized to manage the requested vendor const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]); if (user_vendor_rows.length !== 1) { @@ -130,10 +105,6 @@ export const createContactEntry = async (user_id: number, vendor_id: number, fir return res.affectedRows === 1; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; @@ -149,10 +120,8 @@ export const createContactEntry = async (user_id: number, vendor_id: number, fir * @param phone The phone number of the contact person */ export const updateContactEntry = async (user_id: number, contact_person_id: number, vendor_id: number, first_name: string, last_name: string, gender: string, email: string, phone: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); - // Check if the user is authorized to manage the requested vendor const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]); if (user_vendor_rows.length !== 1) { @@ -166,9 +135,5 @@ export const updateContactEntry = async (user_id: number, contact_person_id: num return res.affectedRows === 1; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; diff --git a/src/models/betterzon/crawling_status/crawling_status.service.ts b/src/models/betterzon/crawling_status/crawling_status.service.ts index c41c08c..e8976ca 100644 --- a/src/models/betterzon/crawling_status/crawling_status.service.ts +++ b/src/models/betterzon/crawling_status/crawling_status.service.ts @@ -1,17 +1,9 @@ import * as dotenv from 'dotenv'; import {Crawling_Status} from './crawling_status.interface'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -25,10 +17,8 @@ const pool = mariadb.createPool({ * Fetches and returns the current crawling status if the issuing user is an admin */ export const getCurrent = async (): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); - // Get the current crawling process let process_info = { process_id: -1, @@ -65,9 +55,5 @@ export const getCurrent = async (): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; diff --git a/src/models/betterzon/favorite_shops/favoriteshops.service.ts b/src/models/betterzon/favorite_shops/favoriteshops.service.ts index 732d209..7483a01 100644 --- a/src/models/betterzon/favorite_shops/favoriteshops.service.ts +++ b/src/models/betterzon/favorite_shops/favoriteshops.service.ts @@ -1,17 +1,9 @@ import * as dotenv from 'dotenv'; import {FavoriteShops} from './favoriteshops.interface'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -27,18 +19,13 @@ const pool = mariadb.createPool({ * @param vendor_id The id of the vendor to set as favorite */ export const createFavoriteShop = async (user_id: number, vendor_id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); const res = await conn.query('INSERT INTO favorite_shops (vendor_id, user_id) VALUES (?, ?)', [vendor_id, user_id]); return res.affectedRows === 1; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; @@ -47,10 +34,9 @@ export const createFavoriteShop = async (user_id: number, vendor_id: number): Pr * @param user_id */ export const getFavoriteShops = async (user_id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let shops = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT favorite_id, vendor_id, user_id FROM favorite_shops WHERE user_id = ?', user_id); for (let row in rows) { if (row !== 'meta') { @@ -61,10 +47,6 @@ export const getFavoriteShops = async (user_id: number): Promise return shops; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; @@ -74,17 +56,12 @@ export const getFavoriteShops = async (user_id: number): Promise * @param favorite_id The favorite shop to delete */ export const deleteFavoriteShop = async (user_id: number, favorite_id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); const res = await conn.query('DELETE FROM favorite_shops WHERE favorite_id = ? AND user_id = ?', [favorite_id, user_id]); return res.affectedRows === 1; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; diff --git a/src/models/betterzon/manufacturers/manufacturers.service.ts b/src/models/betterzon/manufacturers/manufacturers.service.ts index a49b5cf..6a20af5 100644 --- a/src/models/betterzon/manufacturers/manufacturers.service.ts +++ b/src/models/betterzon/manufacturers/manufacturers.service.ts @@ -1,18 +1,10 @@ import * as dotenv from 'dotenv'; import {Manufacturer} from './manufacturer.interface'; import {Manufacturers} from './manufacturers.interface'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -26,10 +18,9 @@ const pool = mariadb.createPool({ * Fetches and returns all known manufacturers */ export const findAll = async (): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let manRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT manufacturer_id, name FROM manufacturers'); for (let row in rows) { if (row !== 'meta') { @@ -47,10 +38,6 @@ export const findAll = async (): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return manRows; @@ -61,10 +48,9 @@ export const findAll = async (): Promise => { * @param id The id of the manufacturer to fetch */ export const find = async (id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let man: any; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT manufacturer_id, name FROM manufacturers WHERE manufacturer_id = ?', id); for (let row in rows) { if (row !== 'meta') { @@ -74,10 +60,6 @@ export const find = async (id: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return man; @@ -88,10 +70,9 @@ export const find = async (id: number): Promise => { * @param term the term to match */ export const findBySearchTerm = async (term: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let manRows = []; try { - conn = await pool.getConnection(); term = '%' + term + '%'; const rows = await conn.query('SELECT manufacturer_id, name FROM manufacturers WHERE name LIKE ?', term); for (let row in rows) { @@ -102,10 +83,6 @@ export const findBySearchTerm = async (term: string): Promise => } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return manRows; diff --git a/src/models/betterzon/pricealarms/pricealarms.service.ts b/src/models/betterzon/pricealarms/pricealarms.service.ts index 720d6e0..0ef1fe9 100644 --- a/src/models/betterzon/pricealarms/pricealarms.service.ts +++ b/src/models/betterzon/pricealarms/pricealarms.service.ts @@ -1,17 +1,9 @@ import * as dotenv from 'dotenv'; import {PriceAlarms} from './pricealarms.interface'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -28,18 +20,13 @@ const pool = mariadb.createPool({ * @param defined_price The defined price for the price alarm */ export const createPriceAlarm = async (user_id: number, product_id: number, defined_price: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); const res = await conn.query('INSERT INTO price_alarms (user_id, product_id, defined_price) VALUES (?, ?, ?)', [user_id, product_id, defined_price]); return res.affectedRows === 1; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; @@ -48,10 +35,9 @@ export const createPriceAlarm = async (user_id: number, product_id: number, defi * @param user_id */ export const getPriceAlarms = async (user_id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let priceAlarms = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT alarm_id, user_id, product_id, defined_price FROM price_alarms WHERE user_id = ?', user_id); for (let row in rows) { if (row !== 'meta') { @@ -62,10 +48,6 @@ export const getPriceAlarms = async (user_id: number): Promise => { return priceAlarms; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; @@ -76,18 +58,13 @@ export const getPriceAlarms = async (user_id: number): Promise => { * @param defined_price The defined price for the price alarm */ export const updatePriceAlarm = async (alarm_id: number, user_id: number, defined_price: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); const res = await conn.query('UPDATE price_alarms SET defined_price = ? WHERE alarm_id = ? AND user_id = ?', [defined_price, alarm_id, user_id]); return res.affectedRows === 1; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; @@ -97,17 +74,12 @@ export const updatePriceAlarm = async (alarm_id: number, user_id: number, define * @param user_id The id of the user that wants to update the price alarm */ export const deletePriceAlarm = async (alarm_id: number, user_id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); const res = await conn.query('DELETE FROM price_alarms WHERE alarm_id = ? AND user_id = ?', [alarm_id, user_id]); return res.affectedRows === 1; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; diff --git a/src/models/betterzon/prices/prices.service.ts b/src/models/betterzon/prices/prices.service.ts index 6de0047..ea72863 100644 --- a/src/models/betterzon/prices/prices.service.ts +++ b/src/models/betterzon/prices/prices.service.ts @@ -1,18 +1,10 @@ import * as dotenv from 'dotenv'; import {Deal, Price} from './price.interface'; import {Prices} from './prices.interface'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -26,10 +18,9 @@ const pool = mariadb.createPool({ * Fetches and returns all known prices */ export const findAll = async (): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let priceRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT price_id, product_id, v.vendor_id, price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE active_listing = true AND v.isActive = true'); for (let row in rows) { if (row !== 'meta') { @@ -53,10 +44,6 @@ export const findAll = async (): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return priceRows; @@ -67,10 +54,9 @@ export const findAll = async (): Promise => { * @param id The id of the price to fetch */ export const find = async (id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let price: any; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT price_id, product_id, p.vendor_id, price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE price_id = ? AND active_listing = true AND v.isActive = true', id); for (let row in rows) { if (row !== 'meta') { @@ -80,10 +66,6 @@ export const find = async (id: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return price; @@ -94,10 +76,9 @@ export const find = async (id: number): Promise => { * @param product the product to fetch the prices for */ export const findByProduct = async (product: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let priceRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT price_id, product_id, p.vendor_id, price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND active_listing = true AND v.isActive = true', product); for (let row in rows) { if (row !== 'meta') { @@ -107,10 +88,6 @@ export const findByProduct = async (product: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return priceRows; @@ -125,10 +102,9 @@ export const findByProduct = async (product: number): Promise => { * @param type The type of prices, e.g. newest / lowest */ export const findByType = async (product: string, type: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let priceRows = []; try { - conn = await pool.getConnection(); let rows = []; if (type === 'newest') { // Used to get the newest price for this product per vendor @@ -162,10 +138,6 @@ export const findByType = async (product: string, type: string): Promise } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return priceRows; @@ -181,10 +153,9 @@ export const findByType = async (product: string, type: string): Promise * @param type The type of prices, e.g. newest / lowest */ export const findByVendor = async (product: string, vendor: string, type: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let priceRows = []; try { - conn = await pool.getConnection(); let rows = []; if (type === 'newest') { // Used to get the newest price for this product and vendor @@ -205,10 +176,6 @@ export const findByVendor = async (product: string, vendor: string, type: string } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return priceRows; @@ -220,11 +187,9 @@ export const findByVendor = async (product: string, vendor: string, type: string * @param amount The amount of deals to return */ export const getBestDeals = async (amount: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let priceRows = []; try { - conn = await pool.getConnection(); - let allPrices: Record = {}; // Get newest prices for every product at every vendor @@ -303,10 +268,6 @@ export const getBestDeals = async (amount: number): Promise => { } catch (err) { console.log(err); throw err; - } finally { - if (conn) { - conn.end(); - } } return priceRows; @@ -317,11 +278,9 @@ export const getBestDeals = async (amount: number): Promise => { * @param productIds the ids of the products */ export const findListByProducts = async (productIds: [number]): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let priceRows: Price[] = []; try { - conn = await pool.getConnection(); - let allPrices: Record = {}; // Get newest prices for every given product at every vendor @@ -366,20 +325,14 @@ export const findListByProducts = async (productIds: [number]): Promise }); } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return priceRows; }; export const createPriceEntry = async (user_id: number, vendor_id: number, product_id: number, price_in_cents: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); - // Check if the user is authorized to manage the requested vendor const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]); if (user_vendor_rows.length !== 1) { @@ -393,9 +346,5 @@ export const createPriceEntry = async (user_id: number, vendor_id: number, produ return res.affectedRows === 1; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; diff --git a/src/models/betterzon/products/products.service.ts b/src/models/betterzon/products/products.service.ts index ba26473..2956c0e 100644 --- a/src/models/betterzon/products/products.service.ts +++ b/src/models/betterzon/products/products.service.ts @@ -2,18 +2,10 @@ import * as dotenv from 'dotenv'; import {Product} from './product.interface'; import {Products} from './products.interface'; import * as http from 'http'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -27,10 +19,9 @@ const pool = mariadb.createPool({ * Fetches and returns all known products */ export const findAll = async (): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let prodRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT product_id, name, asin, is_active, short_description, long_description, image_guid, date_added, last_modified, manufacturer_id, selling_rank, category_id FROM products'); for (let row in rows) { if (row !== 'meta') { @@ -68,10 +59,6 @@ export const findAll = async (): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return prodRows; @@ -82,10 +69,9 @@ export const findAll = async (): Promise => { * @param id The id of the product to fetch */ export const find = async (id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let prod: any; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT product_id, name, asin, is_active, short_description, long_description, image_guid, date_added, last_modified, manufacturer_id, selling_rank, category_id FROM products WHERE product_id = ?', id); for (let row in rows) { if (row !== 'meta') { @@ -95,10 +81,6 @@ export const find = async (id: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return prod; @@ -109,10 +91,9 @@ export const find = async (id: number): Promise => { * @param term the term to match */ export const findBySearchTerm = async (term: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let prodRows = []; try { - conn = await pool.getConnection(); term = '%' + term + '%'; const rows = await conn.query('SELECT product_id, name, asin, is_active, short_description, long_description, image_guid, date_added, last_modified, manufacturer_id, selling_rank, category_id FROM products WHERE name LIKE ?', term); for (let row in rows) { @@ -124,10 +105,6 @@ export const findBySearchTerm = async (term: string): Promise => { } catch (err) { console.log(err); throw err; - } finally { - if (conn) { - conn.end(); - } } return prodRows; @@ -138,10 +115,9 @@ export const findBySearchTerm = async (term: string): Promise => { * @param ids The list of product ids to fetch the details for */ export const findList = async (ids: [number]): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let prodRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT product_id, name, asin, is_active, short_description, long_description, image_guid, date_added, last_modified, manufacturer_id, selling_rank, category_id FROM products WHERE product_id IN (?)', [ids]); for (let row in rows) { if (row !== 'meta') { @@ -151,10 +127,6 @@ export const findList = async (ids: [number]): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return prodRows; @@ -165,11 +137,9 @@ export const findList = async (ids: [number]): Promise => { * @param id The id of the vendor to fetch the products for */ export const findByVendor = async (id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let prodRows = []; try { - conn = await pool.getConnection(); - // Get the relevant product ids let relevant_prod_ids = []; const relevantProds = await conn.query('SELECT product_id FROM prices WHERE vendor_id = ? GROUP BY product_id', id); @@ -189,10 +159,6 @@ export const findByVendor = async (id: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return prodRows; diff --git a/src/models/betterzon/users/users.service.ts b/src/models/betterzon/users/users.service.ts index 8eea031..019d883 100644 --- a/src/models/betterzon/users/users.service.ts +++ b/src/models/betterzon/users/users.service.ts @@ -3,19 +3,11 @@ import * as bcrypt from 'bcrypt'; import {Guid} from 'guid-typescript'; import {User} from './user.interface'; import {Session} from './session.interface'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -29,7 +21,7 @@ const pool = mariadb.createPool({ * Creates a user record in the database, also creates a session. Returns the session if successful. */ export const createUser = async (username: string, password: string, email: string, ip: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { // Hash password and generate + hash session key const pwHash = bcrypt.hashSync(password, 10); @@ -37,7 +29,6 @@ export const createUser = async (username: string, password: string, email: stri const sessionKeyHash = bcrypt.hashSync(sessionKey, 10); // Create user entry in SQL - conn = await pool.getConnection(); const userQuery = 'INSERT INTO users (username, email, bcrypt_password_hash) VALUES (?, ?, ?) RETURNING user_id'; const userIdRes = await conn.query(userQuery, [username, email, pwHash]); await conn.commit(); @@ -72,10 +63,6 @@ export const createUser = async (username: string, password: string, email: stri } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return {} as Session; @@ -86,10 +73,9 @@ export const createUser = async (username: string, password: string, email: stri * Returns the session information in case of a successful login */ export const login = async (username: string, password: string, ip: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { // Get saved password hash - conn = await pool.getConnection(); const query = 'SELECT user_id, bcrypt_password_hash FROM users WHERE username = ?'; const userRows = await conn.query(query, username); let savedHash = ''; @@ -139,10 +125,6 @@ export const login = async (username: string, password: string, ip: string): Pro } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return {} as Session; @@ -152,10 +134,9 @@ export const login = async (username: string, password: string, ip: string): Pro * Checks if the given session information are valid and returns the user information if they are */ export const checkSession = async (sessionId: string, sessionKey: string, ip: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { // Get saved session key hash - conn = await pool.getConnection(); const query = 'SELECT user_id, session_key_hash, validUntil FROM sessions WHERE session_id = ?'; const sessionRows = await conn.query(query, sessionId); let savedHash = ''; @@ -221,10 +202,6 @@ export const checkSession = async (sessionId: string, sessionKey: string, ip: st } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; @@ -257,10 +234,9 @@ export interface Status { * @param email The email to check */ export const checkUsernameAndEmail = async (username: string, email: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { // Create user entry in SQL - conn = await 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); @@ -306,9 +282,5 @@ export const checkUsernameAndEmail = async (username: string, email: string): Pr } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; diff --git a/src/models/betterzon/vendors/vendors.service.ts b/src/models/betterzon/vendors/vendors.service.ts index fe2e979..cd47e61 100644 --- a/src/models/betterzon/vendors/vendors.service.ts +++ b/src/models/betterzon/vendors/vendors.service.ts @@ -1,18 +1,10 @@ import * as dotenv from 'dotenv'; import {Vendor} from './vendor.interface'; import {Vendors} from './vendors.interface'; +import {BetterzonDB} from '../Betterzon.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.BETTERZON_DATABASE, - connectionLimit: 5 -}); - /** * Data Model Interfaces */ @@ -26,10 +18,9 @@ const pool = mariadb.createPool({ * Fetches and returns all known vendors */ export const findAll = async (): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let vendorRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE isActive = true'); for (let row in rows) { if (row !== 'meta') { @@ -59,10 +50,6 @@ export const findAll = async (): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return vendorRows; @@ -73,10 +60,9 @@ export const findAll = async (): Promise => { * @param id The id of the vendor to fetch */ export const find = async (id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let vendor: any; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE vendor_id = ? AND isActive = true', id); for (let row in rows) { if (row !== 'meta') { @@ -86,10 +72,6 @@ export const find = async (id: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return vendor; @@ -100,10 +82,9 @@ export const find = async (id: number): Promise => { * @param term the term to match */ export const findBySearchTerm = async (term: string): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let vendorRows = []; try { - conn = await pool.getConnection(); term = '%' + term + '%'; const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE name LIKE ? AND isActive = true', term); for (let row in rows) { @@ -114,10 +95,6 @@ export const findBySearchTerm = async (term: string): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return vendorRows; @@ -128,10 +105,9 @@ export const findBySearchTerm = async (term: string): Promise => { * @param user The user to return the managed shops for */ export const getManagedShops = async (user_id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); let vendorRows = []; try { - conn = await pool.getConnection(); const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE admin_id LIKE ?', user_id); for (let row in rows) { if (row !== 'meta') { @@ -141,10 +117,6 @@ export const getManagedShops = async (user_id: number): Promise => { } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return vendorRows; @@ -157,10 +129,8 @@ export const getManagedShops = async (user_id: number): Promise => { * @param product_id The product id of the product to deactivate the listing for */ export const deactivateListing = async (user_id: number, vendor_id: number, product_id: number): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); - // Check if the user is authorized to manage the requested vendor const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]); if (user_vendor_rows.length !== 1) { @@ -172,10 +142,6 @@ export const deactivateListing = async (user_id: number, vendor_id: number, prod return status.affectedRows > 0; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return false; @@ -188,10 +154,8 @@ export const deactivateListing = async (user_id: number, vendor_id: number, prod * @param isActive The new active state */ export const setShopStatus = async (user_id: number, vendor_id: number, isActive: boolean): Promise => { - let conn; + let conn = BetterzonDB.getConnection(); try { - conn = await pool.getConnection(); - // Check if the user is authorized to manage the requested vendor const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]); if (user_vendor_rows.length !== 1) { @@ -204,10 +168,6 @@ export const setShopStatus = async (user_id: number, vendor_id: number, isActive return status.affectedRows > 0; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } return false; diff --git a/src/models/dhbw-rapla-changes/DHBWRaPlaChanges.db.ts b/src/models/dhbw-rapla-changes/DHBWRaPlaChanges.db.ts new file mode 100644 index 0000000..e691196 --- /dev/null +++ b/src/models/dhbw-rapla-changes/DHBWRaPlaChanges.db.ts @@ -0,0 +1,19 @@ +import * as dotenv from 'dotenv'; + +const mariadb = require('mariadb'); + +dotenv.config(); + +export namespace RaPlaChangesDB { + const pool = mariadb.createPool({ + host: process.env.DB_HOST, + user: process.env.DB_USER, + password: process.env.DB_PASSWORD, + database: process.env.RAPLACHANGES_DATABASE, + connectionLimit: 5 + }); + + export function getConnection() { + return pool; + } +} diff --git a/src/models/dhbw-rapla-changes/changes/changes.service.ts b/src/models/dhbw-rapla-changes/changes/changes.service.ts index e235934..b205dcd 100644 --- a/src/models/dhbw-rapla-changes/changes/changes.service.ts +++ b/src/models/dhbw-rapla-changes/changes/changes.service.ts @@ -1,23 +1,13 @@ import * as dotenv from 'dotenv'; import {Event} from './Event.interface'; import {Change} from './Change.interface'; +import {RaPlaChangesDB} from '../DHBWRaPlaChanges.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.RAPLACHANGES_DATABASE, - connectionLimit: 5 -}); - export const getChanges = async (course: string, week: string): Promise => { - let conn; + let conn = RaPlaChangesDB.getConnection(); try { - conn = await pool.getConnection(); - let relevantEventsRows = await conn.query('SELECT DISTINCT(entry_id) FROM rapla_changes WHERE new_start > ? AND new_start < DATE_ADD(?, INTERVAL 7 DAY)', [week, week]); let relevantEventIds: string[] = []; @@ -78,18 +68,12 @@ export const getChanges = async (course: string, week: string): Promise return Array.from(eventsMap.values()) as Event[]; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; export const getEventById = async (course: string, id: string): Promise => { - let conn; + let conn = RaPlaChangesDB.getConnection(); try { - conn = await pool.getConnection(); - let rows = await conn.query('SELECT c.change_id, c.entry_id, c.change_timestamp, c.isDeleted, c.new_summary, c.new_description, c.new_start, c.new_last_modified, c.new_end, c.new_created, c.new_location, c.new_organizer, c.new_categories, e.uid FROM rapla_changes c LEFT OUTER JOIN rapla_entries e ON c.entry_id = e.entry_id WHERE e.uid = ? ORDER BY c.change_id', id); let eventsMap = new Map(); @@ -139,9 +123,5 @@ export const getEventById = async (course: string, id: string): Promise = return Array.from(eventsMap.values())[0]; } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } }; diff --git a/src/models/partyplaner/PartyPlaner.db.ts b/src/models/partyplaner/PartyPlaner.db.ts new file mode 100644 index 0000000..0977db8 --- /dev/null +++ b/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; + } +} diff --git a/src/models/partyplaner/event/event.service.ts b/src/models/partyplaner/event/event.service.ts index ded21a2..ea66470 100644 --- a/src/models/partyplaner/event/event.service.ts +++ b/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 => { - 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(); @@ -90,9 +69,5 @@ export const getEventData = async (useDev: boolean, userId: string): Promise => { - 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(); - } } }; diff --git a/src/models/partyplaner/invite/invite.service.ts b/src/models/partyplaner/invite/invite.service.ts index c7934bf..37bc5d6 100644 --- a/src/models/partyplaner/invite/invite.service.ts +++ b/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 => { - 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 => { - 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 => { - 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 => { - 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 => { - 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 => { - 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 => { - 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 => { - 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(); - } } }; diff --git a/src/models/twitch-highlight-marker/HighlightMarker.db.ts b/src/models/twitch-highlight-marker/HighlightMarker.db.ts new file mode 100644 index 0000000..6d5f3d1 --- /dev/null +++ b/src/models/twitch-highlight-marker/HighlightMarker.db.ts @@ -0,0 +1,19 @@ +import * as dotenv from 'dotenv'; + +const mariadb = require('mariadb'); + +dotenv.config(); + +export namespace HighlightMarkerDB { + const pool = mariadb.createPool({ + host: process.env.DB_HOST, + user: process.env.DB_USER, + password: process.env.DB_PASSWORD, + database: process.env.BETTERZON_DATABASE, + connectionLimit: 5 + }); + + export function getConnection() { + return pool; + } +} diff --git a/src/models/twitch-highlight-marker/addHighlight/addHighlights.service.ts b/src/models/twitch-highlight-marker/addHighlight/addHighlights.service.ts index ea6c7b6..b258330 100644 --- a/src/models/twitch-highlight-marker/addHighlight/addHighlights.service.ts +++ b/src/models/twitch-highlight-marker/addHighlight/addHighlights.service.ts @@ -1,25 +1,15 @@ import * as dotenv from 'dotenv'; +import {HighlightMarkerDB} from '../HighlightMarker.db'; dotenv.config(); -const mariadb = require('mariadb'); -const pool = mariadb.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.TWITCH_HIGHLIGHTS_DATABASE, - connectionLimit: 5 -}); - /** * Creates a new highlight entry in SQL * @param req_body The request body */ export const createHighlightEntry = async (req_body: any) => { - let conn; + let conn = HighlightMarkerDB.getConnection(); try { - conn = await pool.getConnection(); - const streamers = await conn.query('SELECT streamer_id FROM streamers WHERE username = ?', req_body.streamer); let streamer_id: number = -1; @@ -34,9 +24,5 @@ export const createHighlightEntry = async (req_body: any) => { const rows = await conn.query('INSERT INTO highlights (streamer_id, stream_id, description, stream_timestamp, issuing_user, game) VALUES (?, ?, ?, ?, ?, ?)', params); } catch (err) { throw err; - } finally { - if (conn) { - conn.end(); - } } };