PlutoDev
/
plutoapi-v2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better connection handling
Jenkins Production Deployment Details

This commit is contained in:
Patrick Müller 2022-06-26 14:48:00 +02:00
parent fc65474930
commit 0325534d53
Signed by: Paddy
GPG Key ID: 37ABC11275CAABCE
64 changed files with 1697 additions and 1505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/models/betterzon/Betterzon.db.ts
View File

@ -5,15 +5,15 @@ const mariadb = require('mariadb');
dotenv.config(); dotenv.config();
export namespace BetterzonDB { export namespace BetterzonDB {
const pool = mariadb.createPool({ const pool = mariadb.createPool({
host: process.env.DB_HOST, host: process.env.DB_HOST,
user: process.env.DB_USER, user: process.env.DB_USER,
password: process.env.DB_PASSWORD, password: process.env.DB_PASSWORD,
database: process.env.BETTERZON_DATABASE, database: process.env.BETTERZON_DATABASE,
connectionLimit: 5 connectionLimit: 5
}); });
export function getConnection() { export const getConnection = async () => {
return pool; return pool.getConnection();
} };
} }

2
src/models/betterzon/categories/categories.interface.ts
View File

@ -1,5 +1,5 @@
import {Category} from './category.interface'; import {Category} from './category.interface';
export interface Categories { export interface Categories {
[key: number]: Category; [key: number]: Category;
} }

103
src/models/betterzon/categories/categories.service.ts
View File

@ -18,29 +18,32 @@ dotenv.config();
* Fetches and returns all known categories * Fetches and returns all known categories
*/ */
export const findAll = async (): Promise<Categories> => { export const findAll = async (): Promise<Categories> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let categRows = []; let categRows = [];
try { try {
const rows = await conn.query('SELECT category_id, name FROM categories'); const rows = await conn.query('SELECT category_id, name FROM categories');
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
let categ: Category = { let categ: Category = {
category_id: 0, category_id: 0,
name: '' name: ''
}; };
const sqlCateg = rows[row]; const sqlCateg = rows[row];
categ.category_id = sqlCateg.category_id; categ.category_id = sqlCateg.category_id;
categ.name = sqlCateg.name; categ.name = sqlCateg.name;
categRows.push(categ); categRows.push(categ);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return categRows; return categRows;
}; };
/** /**
@ -48,21 +51,24 @@ export const findAll = async (): Promise<Categories> => {
* @param id The id of the category to fetch * @param id The id of the category to fetch
*/ */
export const find = async (id: number): Promise<Category> => { export const find = async (id: number): Promise<Category> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let categ: any; let categ: any;
try { try {
const rows = await conn.query('SELECT category_id, name FROM categories WHERE category_id = ?', id); const rows = await conn.query('SELECT category_id, name FROM categories WHERE category_id = ?', id);
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
categ = rows[row]; categ = rows[row];
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return categ; return categ;
}; };
/** /**
@ -70,20 +76,23 @@ export const find = async (id: number): Promise<Category> => {
* @param term the term to match * @param term the term to match
*/ */
export const findBySearchTerm = async (term: string): Promise<Categories> => { export const findBySearchTerm = async (term: string): Promise<Categories> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let categRows = []; let categRows = [];
try { try {
term = '%' + term + '%'; term = '%' + term + '%';
const rows = await conn.query('SELECT category_id, name FROM categories WHERE name LIKE ?', term); const rows = await conn.query('SELECT category_id, name FROM categories WHERE name LIKE ?', term);
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
categRows.push(rows[row]); categRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return categRows; return categRows;
}; };

4
src/models/betterzon/categories/category.interface.ts
View File

@ -1,4 +1,4 @@
export interface Category { export interface Category {
category_id: number; category_id: number;
name: string; name: string;
} }

14
src/models/betterzon/contact_persons/contact_person.interface.ts
View File

@ -1,9 +1,9 @@
export interface Contact_Person { export interface Contact_Person {
contact_person_id: number; contact_person_id: number;
first_name: string; first_name: string;
last_name: string; last_name: string;
gender: string; gender: string;
email: string; email: string;
phone: string; phone: string;
vendor_id: number; vendor_id: number;
} }

2
src/models/betterzon/contact_persons/contact_persons.interface.ts
View File

@ -1,5 +1,5 @@
import {Contact_Person} from './contact_person.interface'; import {Contact_Person} from './contact_person.interface';
export interface Contact_Persons { export interface Contact_Persons {
[key: number]: Contact_Person; [key: number]: Contact_Person;
} }

149
src/models/betterzon/contact_persons/contact_persons.service.ts
View File

@ -18,21 +18,24 @@ dotenv.config();
* Fetches and returns all known contact persons * Fetches and returns all known contact persons
*/ */
export const findAll = async (): Promise<Contact_Persons> => { export const findAll = async (): Promise<Contact_Persons> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let contRows = []; let contRows = [];
try { try {
const rows = await conn.query('SELECT contact_person_id, first_name, last_name, gender, email, phone, vendor_id FROM contact_persons'); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
contRows.push(rows[row]); contRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return contRows; return contRows;
}; };
/** /**
@ -40,21 +43,24 @@ export const findAll = async (): Promise<Contact_Persons> => {
* @param id The id of the contact person to fetch * @param id The id of the contact person to fetch
*/ */
export const find = async (id: number): Promise<Contact_Person> => { export const find = async (id: number): Promise<Contact_Person> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let cont: any; let cont: any;
try { try {
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); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
cont = rows[row]; cont = rows[row];
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return cont; return cont;
}; };
/** /**
@ -62,21 +68,24 @@ export const find = async (id: number): Promise<Contact_Person> => {
* @param id The id of the vendor to fetch contact persons for * @param id The id of the vendor to fetch contact persons for
*/ */
export const findByVendor = async (id: number): Promise<Contact_Persons> => { export const findByVendor = async (id: number): Promise<Contact_Persons> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let contRows = []; let contRows = [];
try { try {
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); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
contRows.push(rows[row]); contRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return contRows; return contRows;
}; };
/** /**
@ -90,22 +99,25 @@ export const findByVendor = async (id: number): Promise<Contact_Persons> => {
* @param phone The phone number of the contact person * @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<Boolean> => { export const createContactEntry = async (user_id: number, vendor_id: number, first_name: string, last_name: string, gender: string, email: string, phone: string): Promise<Boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Check if the user is authorized to manage the requested vendor // 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]); 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) { if (user_vendor_rows.length !== 1) {
return false; return false;
} }
// Create contact person entry // Create contact person entry
const res = await conn.query('INSERT INTO contact_persons (first_name, last_name, gender, email, phone, vendor_id) VALUES (?, ?, ?, ?, ?, ?)', [first_name, last_name, gender, email, phone, vendor_id]); const res = await conn.query('INSERT INTO contact_persons (first_name, last_name, gender, email, phone, vendor_id) VALUES (?, ?, ?, ?, ?, ?)', [first_name, last_name, gender, email, phone, vendor_id]);
// If there are more / less than 1 affected rows, return false // If there are more / less than 1 affected rows, return false
return res.affectedRows === 1; return res.affectedRows === 1;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -120,20 +132,23 @@ export const createContactEntry = async (user_id: number, vendor_id: number, fir
* @param phone The phone number of the contact person * @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<Boolean> => { 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<Boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Check if the user is authorized to manage the requested vendor // 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]); 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) { if (user_vendor_rows.length !== 1) {
return false; return false;
} }
// Create contact person entry // Create contact person entry
const res = await conn.query('UPDATE contact_persons SET first_name = ?, last_name = ?, gender = ?, email = ?, phone = ? WHERE contact_person_id = ? AND vendor_id = ?', [first_name, last_name, gender, email, phone, contact_person_id, vendor_id]); const res = await conn.query('UPDATE contact_persons SET first_name = ?, last_name = ?, gender = ?, email = ?, phone = ? WHERE contact_person_id = ? AND vendor_id = ?', [first_name, last_name, gender, email, phone, contact_person_id, vendor_id]);
// If there are more / less than 1 affected rows, return false // If there are more / less than 1 affected rows, return false
return res.affectedRows === 1; return res.affectedRows === 1;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

10
src/models/betterzon/crawling_status/crawling_status.interface.ts
View File

@ -1,7 +1,7 @@
export interface Crawling_Status { export interface Crawling_Status {
process_id: number; process_id: number;
started_timestamp: Date; started_timestamp: Date;
combinations_to_crawl: number; combinations_to_crawl: number;
successful_crawls: number; successful_crawls: number;
failed_crawls: number; failed_crawls: number;
} }

73
src/models/betterzon/crawling_status/crawling_status.service.ts
View File

@ -17,43 +17,46 @@ dotenv.config();
* Fetches and returns the current crawling status if the issuing user is an admin * Fetches and returns the current crawling status if the issuing user is an admin
*/ */
export const getCurrent = async (): Promise<Crawling_Status> => { export const getCurrent = async (): Promise<Crawling_Status> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Get the current crawling process // Get the current crawling process
let process_info = { let process_info = {
process_id: -1, process_id: -1,
started_timestamp: new Date(), started_timestamp: new Date(),
combinations_to_crawl: -1 combinations_to_crawl: -1
}; };
const process = await conn.query('SELECT process_id, started_timestamp, combinations_to_crawl FROM crawling_processes ORDER BY started_timestamp DESC LIMIT 1'); const process = await conn.query('SELECT process_id, started_timestamp, combinations_to_crawl FROM crawling_processes ORDER BY started_timestamp DESC LIMIT 1');
for (let row in process) { for (let row in process) {
if (row !== 'meta') { if (row !== 'meta') {
process_info = process[row]; process_info = process[row];
} }
} }
// Get the current status // Get the current status
let total_crawls = 0; let total_crawls = 0;
let successful_crawls = 0; let successful_crawls = 0;
const rows = await conn.query('SELECT COUNT(status_id) as total, SUM(success) as successful FROM crawling_status WHERE process_id = ?', process_info.process_id); const rows = await conn.query('SELECT COUNT(status_id) as total, SUM(success) as successful FROM crawling_status WHERE process_id = ?', process_info.process_id);
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
total_crawls = rows[row].total; total_crawls = rows[row].total;
successful_crawls = rows[row].successful; successful_crawls = rows[row].successful;
} }
} }
const failed_crawls = total_crawls - successful_crawls; const failed_crawls = total_crawls - successful_crawls;
return { return {
process_id: process_info.process_id, process_id: process_info.process_id,
started_timestamp: process_info.started_timestamp, started_timestamp: process_info.started_timestamp,
combinations_to_crawl: process_info.combinations_to_crawl, combinations_to_crawl: process_info.combinations_to_crawl,
successful_crawls: successful_crawls, successful_crawls: successful_crawls,
failed_crawls: failed_crawls failed_crawls: failed_crawls
}; };
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

2
src/models/betterzon/crawling_status/crawling_statuses.interface.ts
View File

@ -1,5 +1,5 @@
import {Crawling_Status} from './crawling_status.interface'; import {Crawling_Status} from './crawling_status.interface';
export interface Crawling_Statuses { export interface Crawling_Statuses {
[key: number]: Crawling_Status; [key: number]: Crawling_Status;
} }

6
src/models/betterzon/favorite_shops/favoriteshop.interface.ts
View File

@ -1,5 +1,5 @@
export interface FavoriteShop { export interface FavoriteShop {
favorite_id: number; favorite_id: number;
vendor_id: number; vendor_id: number;
user_id: number; user_id: number;
} }

2
src/models/betterzon/favorite_shops/favoriteshops.interface.ts
View File

@ -1,5 +1,5 @@
import {FavoriteShop} from './favoriteshop.interface'; import {FavoriteShop} from './favoriteshop.interface';
export interface FavoriteShops { export interface FavoriteShops {
[key: number]: FavoriteShop; [key: number]: FavoriteShop;
} }

63
src/models/betterzon/favorite_shops/favoriteshops.service.ts
View File

@ -19,14 +19,17 @@ dotenv.config();
* @param vendor_id The id of the vendor to set as favorite * @param vendor_id The id of the vendor to set as favorite
*/ */
export const createFavoriteShop = async (user_id: number, vendor_id: number): Promise<boolean> => { export const createFavoriteShop = async (user_id: number, vendor_id: number): Promise<boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
const res = await conn.query('INSERT INTO favorite_shops (vendor_id, user_id) VALUES (?, ?)', [vendor_id, user_id]); const res = await conn.query('INSERT INTO favorite_shops (vendor_id, user_id) VALUES (?, ?)', [vendor_id, user_id]);
return res.affectedRows === 1; return res.affectedRows === 1;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -34,20 +37,23 @@ export const createFavoriteShop = async (user_id: number, vendor_id: number): Pr
* @param user_id * @param user_id
*/ */
export const getFavoriteShops = async (user_id: number): Promise<FavoriteShops> => { export const getFavoriteShops = async (user_id: number): Promise<FavoriteShops> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let shops = []; let shops = [];
try { try {
const rows = await conn.query('SELECT favorite_id, vendor_id, user_id FROM favorite_shops WHERE user_id = ?', user_id); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
shops.push(rows[row]); shops.push(rows[row]);
} }
} }
return shops; return shops;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -56,12 +62,15 @@ export const getFavoriteShops = async (user_id: number): Promise<FavoriteShops>
* @param favorite_id The favorite shop to delete * @param favorite_id The favorite shop to delete
*/ */
export const deleteFavoriteShop = async (user_id: number, favorite_id: number): Promise<boolean> => { export const deleteFavoriteShop = async (user_id: number, favorite_id: number): Promise<boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
const res = await conn.query('DELETE FROM favorite_shops WHERE favorite_id = ? AND user_id = ?', [favorite_id, user_id]); const res = await conn.query('DELETE FROM favorite_shops WHERE favorite_id = ? AND user_id = ?', [favorite_id, user_id]);
return res.affectedRows === 1; return res.affectedRows === 1;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

4
src/models/betterzon/manufacturers/manufacturer.interface.ts
View File

@ -1,4 +1,4 @@
export interface Manufacturer { export interface Manufacturer {
manufacturer_id: number; manufacturer_id: number;
name: string; name: string;
} }

2
src/models/betterzon/manufacturers/manufacturers.interface.ts
View File

@ -1,5 +1,5 @@
import {Manufacturer} from './manufacturer.interface'; import {Manufacturer} from './manufacturer.interface';
export interface Manufacturers { export interface Manufacturers {
[key: number]: Manufacturer; [key: number]: Manufacturer;
} }

103
src/models/betterzon/manufacturers/manufacturers.service.ts
View File

@ -18,29 +18,32 @@ dotenv.config();
* Fetches and returns all known manufacturers * Fetches and returns all known manufacturers
*/ */
export const findAll = async (): Promise<Manufacturers> => { export const findAll = async (): Promise<Manufacturers> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let manRows = []; let manRows = [];
try { try {
const rows = await conn.query('SELECT manufacturer_id, name FROM manufacturers'); const rows = await conn.query('SELECT manufacturer_id, name FROM manufacturers');
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
let man: Manufacturer = { let man: Manufacturer = {
manufacturer_id: 0, manufacturer_id: 0,
name: '' name: ''
}; };
const sqlMan = rows[row]; const sqlMan = rows[row];
man.manufacturer_id = sqlMan.manufacturer_id; man.manufacturer_id = sqlMan.manufacturer_id;
man.name = sqlMan.name; man.name = sqlMan.name;
manRows.push(man); manRows.push(man);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return manRows; return manRows;
}; };
/** /**
@ -48,21 +51,24 @@ export const findAll = async (): Promise<Manufacturers> => {
* @param id The id of the manufacturer to fetch * @param id The id of the manufacturer to fetch
*/ */
export const find = async (id: number): Promise<Manufacturer> => { export const find = async (id: number): Promise<Manufacturer> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let man: any; let man: any;
try { try {
const rows = await conn.query('SELECT manufacturer_id, name FROM manufacturers WHERE manufacturer_id = ?', id); const rows = await conn.query('SELECT manufacturer_id, name FROM manufacturers WHERE manufacturer_id = ?', id);
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
man = rows[row]; man = rows[row];
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return man; return man;
}; };
/** /**
@ -70,20 +76,23 @@ export const find = async (id: number): Promise<Manufacturer> => {
* @param term the term to match * @param term the term to match
*/ */
export const findBySearchTerm = async (term: string): Promise<Manufacturers> => { export const findBySearchTerm = async (term: string): Promise<Manufacturers> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let manRows = []; let manRows = [];
try { try {
term = '%' + term + '%'; term = '%' + term + '%';
const rows = await conn.query('SELECT manufacturer_id, name FROM manufacturers WHERE name LIKE ?', term); const rows = await conn.query('SELECT manufacturer_id, name FROM manufacturers WHERE name LIKE ?', term);
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
manRows.push(rows[row]); manRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return manRows; return manRows;
}; };

8
src/models/betterzon/pricealarms/pricealarm.interface.ts
View File

@ -1,6 +1,6 @@
export interface PriceAlarm { export interface PriceAlarm {
alarm_id: number; alarm_id: number;
user_id: number; user_id: number;
product_id: number; product_id: number;
defined_price: number; defined_price: number;
} }

2
src/models/betterzon/pricealarms/pricealarms.interface.ts
View File

@ -1,5 +1,5 @@
import {PriceAlarm} from './pricealarm.interface'; import {PriceAlarm} from './pricealarm.interface';
export interface PriceAlarms { export interface PriceAlarms {
[key: number]: PriceAlarm; [key: number]: PriceAlarm;
} }

80
src/models/betterzon/pricealarms/pricealarms.service.ts
View File

@ -20,14 +20,17 @@ dotenv.config();
* @param defined_price The defined price for the price alarm * @param defined_price The defined price for the price alarm
*/ */
export const createPriceAlarm = async (user_id: number, product_id: number, defined_price: number): Promise<boolean> => { export const createPriceAlarm = async (user_id: number, product_id: number, defined_price: number): Promise<boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
const res = await conn.query('INSERT INTO price_alarms (user_id, product_id, defined_price) VALUES (?, ?, ?)', [user_id, product_id, defined_price]); 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; return res.affectedRows === 1;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -35,20 +38,23 @@ export const createPriceAlarm = async (user_id: number, product_id: number, defi
* @param user_id * @param user_id
*/ */
export const getPriceAlarms = async (user_id: number): Promise<PriceAlarms> => { export const getPriceAlarms = async (user_id: number): Promise<PriceAlarms> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let priceAlarms = []; let priceAlarms = [];
try { try {
const rows = await conn.query('SELECT alarm_id, user_id, product_id, defined_price FROM price_alarms WHERE user_id = ?', user_id); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
priceAlarms.push(rows[row]); priceAlarms.push(rows[row]);
} }
} }
return priceAlarms; return priceAlarms;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -58,14 +64,17 @@ export const getPriceAlarms = async (user_id: number): Promise<PriceAlarms> => {
* @param defined_price The defined price for the price alarm * @param defined_price The defined price for the price alarm
*/ */
export const updatePriceAlarm = async (alarm_id: number, user_id: number, defined_price: number): Promise<boolean> => { export const updatePriceAlarm = async (alarm_id: number, user_id: number, defined_price: number): Promise<boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
const res = await conn.query('UPDATE price_alarms SET defined_price = ? WHERE alarm_id = ? AND user_id = ?', [defined_price, alarm_id, user_id]); 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; return res.affectedRows === 1;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -74,12 +83,15 @@ 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 * @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<boolean> => { export const deletePriceAlarm = async (alarm_id: number, user_id: number): Promise<boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
const res = await conn.query('DELETE FROM price_alarms WHERE alarm_id = ? AND user_id = ?', [alarm_id, user_id]); const res = await conn.query('DELETE FROM price_alarms WHERE alarm_id = ? AND user_id = ?', [alarm_id, user_id]);
return res.affectedRows === 1; return res.affectedRows === 1;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

42
src/models/betterzon/prices/price.interface.ts
View File

@ -1,27 +1,27 @@
export interface Price { export interface Price {
price_id: number; price_id: number;
product_id: number; product_id: number;
vendor_id: number; vendor_id: number;
price_in_cents: number; price_in_cents: number;
timestamp: Date; timestamp: Date;
} }
export class Deal implements Price { export class Deal implements Price {
price_id: number; price_id: number;
product_id: number; product_id: number;
vendor_id: number; vendor_id: number;
price_in_cents: number; price_in_cents: number;
timestamp: Date; timestamp: Date;
amazonDifference: number; amazonDifference: number;
amazonDifferencePercent: number; amazonDifferencePercent: number;
constructor(price_id: number, product_id: number, vendor_id: number, price_in_cents: number, timestamp: Date, amazonDifference: number, amazonDifferencePercent: number) { constructor(price_id: number, product_id: number, vendor_id: number, price_in_cents: number, timestamp: Date, amazonDifference: number, amazonDifferencePercent: number) {
this.price_id = price_id; this.price_id = price_id;
this.product_id = product_id; this.product_id = product_id;
this.vendor_id = vendor_id; this.vendor_id = vendor_id;
this.price_in_cents = price_in_cents; this.price_in_cents = price_in_cents;
this.timestamp = timestamp; this.timestamp = timestamp;
this.amazonDifference = amazonDifference; this.amazonDifference = amazonDifference;
this.amazonDifferencePercent = amazonDifferencePercent; this.amazonDifferencePercent = amazonDifferencePercent;
} }
} }

2
src/models/betterzon/prices/prices.interface.ts
View File

@ -1,5 +1,5 @@
import {Price} from './price.interface'; import {Price} from './price.interface';
export interface Prices { export interface Prices {
[key: number]: Price; [key: number]: Price;
} }

504
src/models/betterzon/prices/prices.service.ts
View File

@ -18,35 +18,38 @@ dotenv.config();
* Fetches and returns all known prices * Fetches and returns all known prices
*/ */
export const findAll = async (): Promise<Prices> => { export const findAll = async (): Promise<Prices> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let priceRows = []; let priceRows = [];
try { try {
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'); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
let price: Price = { let price: Price = {
price_id: 0, price_id: 0,
price_in_cents: 0, price_in_cents: 0,
product_id: 0, product_id: 0,
timestamp: new Date(), timestamp: new Date(),
vendor_id: 0 vendor_id: 0
}; };
const sqlPrice = rows[row]; const sqlPrice = rows[row];
price.price_id = sqlPrice.price_id; price.price_id = sqlPrice.price_id;
price.product_id = sqlPrice.product_id; price.product_id = sqlPrice.product_id;
price.vendor_id = sqlPrice.vendor_id; price.vendor_id = sqlPrice.vendor_id;
price.price_in_cents = sqlPrice.price_in_cents; price.price_in_cents = sqlPrice.price_in_cents;
price.timestamp = sqlPrice.timestamp; price.timestamp = sqlPrice.timestamp;
priceRows.push(price); priceRows.push(price);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return priceRows; return priceRows;
}; };
/** /**
@ -54,21 +57,24 @@ export const findAll = async (): Promise<Prices> => {
* @param id The id of the price to fetch * @param id The id of the price to fetch
*/ */
export const find = async (id: number): Promise<Price> => { export const find = async (id: number): Promise<Price> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let price: any; let price: any;
try { try {
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); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
price = rows[row]; price = rows[row];
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return price; return price;
}; };
/** /**
@ -76,21 +82,24 @@ export const find = async (id: number): Promise<Price> => {
* @param product the product to fetch the prices for * @param product the product to fetch the prices for
*/ */
export const findByProduct = async (product: number): Promise<Prices> => { export const findByProduct = async (product: number): Promise<Prices> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let priceRows = []; let priceRows = [];
try { try {
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); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
priceRows.push(rows[row]); priceRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return priceRows; return priceRows;
}; };
/** /**
@ -102,45 +111,48 @@ export const findByProduct = async (product: number): Promise<Prices> => {
* @param type The type of prices, e.g. newest / lowest * @param type The type of prices, e.g. newest / lowest
*/ */
export const findByType = async (product: string, type: string): Promise<Prices> => { export const findByType = async (product: string, type: string): Promise<Prices> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let priceRows = []; let priceRows = [];
try { try {
let rows = []; let rows = [];
if (type === 'newest') { if (type === 'newest') {
// Used to get the newest price for this product per vendor // Used to get the newest price for this product per vendor
rows = await conn.query(('WITH summary AS ( ' + rows = await conn.query(('WITH summary AS ( ' +
'SELECT p.product_id, ' + 'SELECT p.product_id, ' +
'p.vendor_id, ' + 'p.vendor_id, ' +
'p.price_in_cents, ' + 'p.price_in_cents, ' +
'p.timestamp, ' + 'p.timestamp, ' +
'ROW_NUMBER() OVER( ' + 'ROW_NUMBER() OVER( ' +
'PARTITION BY p.vendor_id ' + 'PARTITION BY p.vendor_id ' +
'ORDER BY p.timestamp DESC) AS rk ' + 'ORDER BY p.timestamp DESC) AS rk ' +
'FROM prices p ' + 'FROM prices p ' +
'LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id ' + 'LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id ' +
'WHERE product_id = ? AND p.vendor_id != 1 AND active_listing = true AND v.isActive = true) ' + 'WHERE product_id = ? AND p.vendor_id != 1 AND active_listing = true AND v.isActive = true) ' +
'SELECT s.* ' + 'SELECT s.* ' +
'FROM summary s ' + 'FROM summary s ' +
'WHERE s.rk = 1 '), product); 'WHERE s.rk = 1 '), product);
} else if (type === 'lowest') { } else if (type === 'lowest') {
// Used to get the lowest prices for this product over a period of time // Used to get the lowest prices for this product over a period of time
rows = await conn.query('SELECT price_id, product_id, p.vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND v.vendor_id != 1 AND active_listing = true AND v.isActive = true GROUP BY DAY(timestamp) ORDER BY timestamp', product); rows = await conn.query('SELECT price_id, product_id, p.vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND v.vendor_id != 1 AND active_listing = true AND v.isActive = true GROUP BY DAY(timestamp) ORDER BY timestamp', product);
} else { } else {
// If no type is given, return all prices for this product // If no type is given, return all prices for this product
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 p.vendor_id != 1 AND active_listing = true AND v.isActive = true', product); 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 p.vendor_id != 1 AND active_listing = true AND v.isActive = true', product);
} }
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
priceRows.push(rows[row]); priceRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return priceRows; return priceRows;
}; };
/** /**
@ -153,32 +165,35 @@ export const findByType = async (product: string, type: string): Promise<Prices>
* @param type The type of prices, e.g. newest / lowest * @param type The type of prices, e.g. newest / lowest
*/ */
export const findByVendor = async (product: string, vendor: string, type: string): Promise<Prices> => { export const findByVendor = async (product: string, vendor: string, type: string): Promise<Prices> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let priceRows = []; let priceRows = [];
try { try {
let rows = []; let rows = [];
if (type === 'newest') { if (type === 'newest') {
// Used to get the newest price for this product and vendor // Used to get the newest price for this product and vendor
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 p.vendor_id = ? AND active_listing = true AND v.isActive = true ORDER BY timestamp DESC LIMIT 1', [product, vendor]); 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 p.vendor_id = ? AND active_listing = true AND v.isActive = true ORDER BY timestamp DESC LIMIT 1', [product, vendor]);
} else if (type === 'lowest') { } else if (type === 'lowest') {
// Used to get the lowest prices for this product and vendor in all time // Used to get the lowest prices for this product and vendor in all time
rows = await conn.query('SELECT price_id, product_id, p.vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND p.vendor_id = ? AND active_listing = true AND v.isActive = true LIMIT 1', [product, vendor]); rows = await conn.query('SELECT price_id, product_id, p.vendor_id, MIN(price_in_cents) as price_in_cents, timestamp FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE product_id = ? AND p.vendor_id = ? AND active_listing = true AND v.isActive = true LIMIT 1', [product, vendor]);
} else { } else {
// If no type is given, return all prices for this product and vendor // If no type is given, return all prices for this product and vendor
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 p.vendor_id = ? AND active_listing = true AND v.isActive = true', [product, vendor]); 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 p.vendor_id = ? AND active_listing = true AND v.isActive = true', [product, vendor]);
} }
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
priceRows.push(rows[row]); priceRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return priceRows; return priceRows;
}; };
/** /**
@ -187,90 +202,93 @@ export const findByVendor = async (product: string, vendor: string, type: string
* @param amount The amount of deals to return * @param amount The amount of deals to return
*/ */
export const getBestDeals = async (amount: number): Promise<Prices> => { export const getBestDeals = async (amount: number): Promise<Prices> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let priceRows = []; let priceRows = [];
try { try {
let allPrices: Record<number, Price[]> = {}; let allPrices: Record<number, Price[]> = {};
// Get newest prices for every product at every vendor // Get newest prices for every product at every vendor
const rows = await conn.query( const rows = await conn.query(
'WITH summary AS (\n' + 'WITH summary AS (\n' +
' SELECT p.product_id,\n' + ' SELECT p.product_id,\n' +
' p.vendor_id,\n' + ' p.vendor_id,\n' +
' p.price_in_cents,\n' + ' p.price_in_cents,\n' +
' p.timestamp,\n' + ' p.timestamp,\n' +
' ROW_NUMBER() OVER(\n' + ' ROW_NUMBER() OVER(\n' +
' PARTITION BY p.product_id, p.vendor_id\n' + ' PARTITION BY p.product_id, p.vendor_id\n' +
' ORDER BY p.timestamp DESC) AS rk\n' + ' ORDER BY p.timestamp DESC) AS rk\n' +
' FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE active_listing = true AND v.isActive = true)\n' + ' FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id WHERE active_listing = true AND v.isActive = true)\n' +
'SELECT s.*\n' + 'SELECT s.*\n' +
'FROM summary s\n' + 'FROM summary s\n' +
'WHERE s.rk = 1'); 'WHERE s.rk = 1');
// Write returned values to allPrices map with product id as key and a list of prices as value // Write returned values to allPrices map with product id as key and a list of prices as value
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
if (!allPrices[parseInt(rows[row].product_id)]) { if (!allPrices[parseInt(rows[row].product_id)]) {
allPrices[parseInt(rows[row].product_id)] = []; allPrices[parseInt(rows[row].product_id)] = [];
} }
allPrices[parseInt(rows[row].product_id)].push(rows[row]); allPrices[parseInt(rows[row].product_id)].push(rows[row]);
} }
} }
// Iterate over all prices to find the products with the biggest difference between amazon and other vendor // Iterate over all prices to find the products with the biggest difference between amazon and other vendor
let deals: Deal[] = []; let deals: Deal[] = [];
Object.keys(allPrices).forEach(productId => { Object.keys(allPrices).forEach(productId => {
if (allPrices[parseInt(productId)]) { if (allPrices[parseInt(productId)]) {
let pricesForProd = allPrices[parseInt(productId)]; let pricesForProd = allPrices[parseInt(productId)];
// Get amazon price and lowest price from other vendor // Get amazon price and lowest price from other vendor
let amazonPrice = {} as Price; let amazonPrice = {} as Price;
let lowestPrice = {} as Price; let lowestPrice = {} as Price;
pricesForProd.forEach(function (price, priceIndex) { pricesForProd.forEach(function (price, priceIndex) {
if (price.vendor_id === 1) { if (price.vendor_id === 1) {
amazonPrice = price; amazonPrice = price;
} else { } else {
// If there is no lowest price yet or the price of the current iteration is lower, set / replace it // If there is no lowest price yet or the price of the current iteration is lower, set / replace it
if (!lowestPrice.price_in_cents || lowestPrice.price_in_cents > price.price_in_cents) { if (!lowestPrice.price_in_cents || lowestPrice.price_in_cents > price.price_in_cents) {
lowestPrice = price; lowestPrice = price;
} }
} }
}); });
// Create deal object and add it to list // Create deal object and add it to list
let deal = { let deal = {
'product_id': lowestPrice.product_id, 'product_id': lowestPrice.product_id,
'vendor_id': lowestPrice.vendor_id, 'vendor_id': lowestPrice.vendor_id,
'price_in_cents': lowestPrice.price_in_cents, 'price_in_cents': lowestPrice.price_in_cents,
'timestamp': lowestPrice.timestamp, 'timestamp': lowestPrice.timestamp,
'amazonDifference': (amazonPrice.price_in_cents - lowestPrice.price_in_cents), 'amazonDifference': (amazonPrice.price_in_cents - lowestPrice.price_in_cents),
'amazonDifferencePercent': ((amazonPrice.price_in_cents / lowestPrice.price_in_cents) * 100) 'amazonDifferencePercent': ((amazonPrice.price_in_cents / lowestPrice.price_in_cents) * 100)
}; };
// Push only deals were the amazon price is actually higher // Push only deals were the amazon price is actually higher
if (deal.amazonDifferencePercent > 0 && deal.amazonDifference > 0) { if (deal.amazonDifferencePercent > 0 && deal.amazonDifference > 0) {
deals.push(deal as Deal); deals.push(deal as Deal);
} }
} }
}); });
// Sort to have the best deals on the top // Sort to have the best deals on the top
deals.sort((a, b) => a.amazonDifferencePercent! < b.amazonDifferencePercent! ? 1 : -1); deals.sort((a, b) => a.amazonDifferencePercent! < b.amazonDifferencePercent! ? 1 : -1);
// Return only as many records as requested or the maximum amount of found deals, whatever is less // Return only as many records as requested or the maximum amount of found deals, whatever is less
let maxAmt = Math.min(amount, deals.length); let maxAmt = Math.min(amount, deals.length);
for (let dealIndex = 0; dealIndex < maxAmt; dealIndex++) { for (let dealIndex = 0; dealIndex < maxAmt; dealIndex++) {
priceRows.push(deals[dealIndex] as Price); priceRows.push(deals[dealIndex] as Price);
} }
} catch (err) { } catch (err) {
console.log(err); console.log(err);
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return priceRows; return priceRows;
}; };
/** /**
@ -278,73 +296,79 @@ export const getBestDeals = async (amount: number): Promise<Prices> => {
* @param productIds the ids of the products * @param productIds the ids of the products
*/ */
export const findListByProducts = async (productIds: [number]): Promise<Prices> => { export const findListByProducts = async (productIds: [number]): Promise<Prices> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let priceRows: Price[] = []; let priceRows: Price[] = [];
try { try {
let allPrices: Record<number, Price[]> = {}; let allPrices: Record<number, Price[]> = {};
// Get newest prices for every given product at every vendor // Get newest prices for every given product at every vendor
const rows = await conn.query( const rows = await conn.query(
'WITH summary AS (\n' + 'WITH summary AS (\n' +
' SELECT p.product_id,\n' + ' SELECT p.product_id,\n' +
' p.vendor_id,\n' + ' p.vendor_id,\n' +
' p.price_in_cents,\n' + ' p.price_in_cents,\n' +
' p.timestamp,\n' + ' p.timestamp,\n' +
' ROW_NUMBER() OVER(\n' + ' ROW_NUMBER() OVER(\n' +
' PARTITION BY p.product_id, p.vendor_id\n' + ' PARTITION BY p.product_id, p.vendor_id\n' +
' ORDER BY p.timestamp DESC) AS rk\n' + ' ORDER BY p.timestamp DESC) AS rk\n' +
' FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id ' + ' FROM prices p LEFT OUTER JOIN vendors v ON v.vendor_id = p.vendor_id ' +
' WHERE p.product_id IN (?) AND v.isActive = true' + ' WHERE p.product_id IN (?) AND v.isActive = true' +
' AND p.vendor_id != 1 AND active_listing = true)\n' + ' AND p.vendor_id != 1 AND active_listing = true)\n' +
'SELECT s.*\n' + 'SELECT s.*\n' +
'FROM summary s\n' + 'FROM summary s\n' +
'WHERE s.rk = 1', [productIds]); 'WHERE s.rk = 1', [productIds]);
// Write returned values to allPrices map with product id as key and a list of prices as value // Write returned values to allPrices map with product id as key and a list of prices as value
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
if (!allPrices[parseInt(rows[row].product_id)]) { if (!allPrices[parseInt(rows[row].product_id)]) {
allPrices[parseInt(rows[row].product_id)] = []; allPrices[parseInt(rows[row].product_id)] = [];
} }
allPrices[parseInt(rows[row].product_id)].push(rows[row]); allPrices[parseInt(rows[row].product_id)].push(rows[row]);
} }
} }
// Iterate over all products to find lowest price // Iterate over all products to find lowest price
Object.keys(allPrices).forEach(productId => { Object.keys(allPrices).forEach(productId => {
if (allPrices[parseInt(productId)]) { if (allPrices[parseInt(productId)]) {
let pricesForProd = allPrices[parseInt(productId)]; let pricesForProd = allPrices[parseInt(productId)];
// Sort ascending by price so index 0 has the lowest price // Sort ascending by price so index 0 has the lowest price
pricesForProd.sort((a, b) => a.price_in_cents > b.price_in_cents ? 1 : -1); pricesForProd.sort((a, b) => a.price_in_cents > b.price_in_cents ? 1 : -1);
// Push the lowest price to the return list // Push the lowest price to the return list
priceRows.push(pricesForProd[0]); priceRows.push(pricesForProd[0]);
} }
}); });
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return priceRows; return priceRows;
}; };
export const createPriceEntry = async (user_id: number, vendor_id: number, product_id: number, price_in_cents: number): Promise<Boolean> => { export const createPriceEntry = async (user_id: number, vendor_id: number, product_id: number, price_in_cents: number): Promise<Boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Check if the user is authorized to manage the requested vendor // 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]); 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) { if (user_vendor_rows.length !== 1) {
return false; return false;
} }
// Create price entry // Create price entry
const res = await conn.query('INSERT INTO prices (product_id, vendor_id, price_in_cents) VALUES (?,?,?)', [product_id, vendor_id, price_in_cents]); const res = await conn.query('INSERT INTO prices (product_id, vendor_id, price_in_cents) VALUES (?,?,?)', [product_id, vendor_id, price_in_cents]);
// If there are more / less than 1 affected rows, return false // If there are more / less than 1 affected rows, return false
return res.affectedRows === 1; return res.affectedRows === 1;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

24
src/models/betterzon/products/product.interface.ts
View File

@ -1,14 +1,14 @@
export interface Product { export interface Product {
product_id: number; product_id: number;
asin: string; asin: string;
is_active: boolean; is_active: boolean;
name: string; name: string;
short_description: string; short_description: string;
long_description: string; long_description: string;
image_guid: string; image_guid: string;
date_added: Date; date_added: Date;
last_modified: Date; last_modified: Date;
manufacturer_id: number; manufacturer_id: number;
selling_rank: string; selling_rank: string;
category_id: number; category_id: number;
} }

2
src/models/betterzon/products/products.interface.ts
View File

@ -1,5 +1,5 @@
import {Product} from './product.interface'; import {Product} from './product.interface';
export interface Products { export interface Products {
[key: number]: Product; [key: number]: Product;
} }

261
src/models/betterzon/products/products.service.ts
View File

@ -19,49 +19,52 @@ dotenv.config();
* Fetches and returns all known products * Fetches and returns all known products
*/ */
export const findAll = async (): Promise<Products> => { export const findAll = async (): Promise<Products> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let prodRows = []; let prodRows = [];
try { try {
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'); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
let prod: Product = { let prod: Product = {
asin: '', asin: '',
category_id: 0, category_id: 0,
date_added: new Date(), date_added: new Date(),
image_guid: '', image_guid: '',
is_active: false, is_active: false,
last_modified: new Date(), last_modified: new Date(),
long_description: '', long_description: '',
manufacturer_id: 0, manufacturer_id: 0,
name: '', name: '',
product_id: 0, product_id: 0,
selling_rank: '', selling_rank: '',
short_description: '' short_description: ''
}; };
const sqlProd = rows[row]; const sqlProd = rows[row];
prod.product_id = sqlProd.product_id; prod.product_id = sqlProd.product_id;
prod.name = sqlProd.name; prod.name = sqlProd.name;
prod.asin = sqlProd.asin; prod.asin = sqlProd.asin;
prod.is_active = sqlProd.is_active; prod.is_active = sqlProd.is_active;
prod.short_description = sqlProd.short_description; prod.short_description = sqlProd.short_description;
prod.long_description = sqlProd.long_description; prod.long_description = sqlProd.long_description;
prod.image_guid = sqlProd.image_guid; prod.image_guid = sqlProd.image_guid;
prod.date_added = sqlProd.date_added; prod.date_added = sqlProd.date_added;
prod.last_modified = sqlProd.last_modified; prod.last_modified = sqlProd.last_modified;
prod.manufacturer_id = sqlProd.manufacturer_id; prod.manufacturer_id = sqlProd.manufacturer_id;
prod.selling_rank = sqlProd.selling_rank; prod.selling_rank = sqlProd.selling_rank;
prod.category_id = sqlProd.category_id; prod.category_id = sqlProd.category_id;
prodRows.push(prod); prodRows.push(prod);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return prodRows; return prodRows;
}; };
/** /**
@ -69,21 +72,24 @@ export const findAll = async (): Promise<Products> => {
* @param id The id of the product to fetch * @param id The id of the product to fetch
*/ */
export const find = async (id: number): Promise<Product> => { export const find = async (id: number): Promise<Product> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let prod: any; let prod: any;
try { try {
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); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
prod = rows[row]; prod = rows[row];
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return prod; return prod;
}; };
/** /**
@ -91,23 +97,26 @@ export const find = async (id: number): Promise<Product> => {
* @param term the term to match * @param term the term to match
*/ */
export const findBySearchTerm = async (term: string): Promise<Products> => { export const findBySearchTerm = async (term: string): Promise<Products> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let prodRows = []; let prodRows = [];
try { try {
term = '%' + term + '%'; 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); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
prodRows.push(rows[row]); prodRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
console.log(err); console.log(err);
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return prodRows; return prodRows;
}; };
/** /**
@ -115,21 +124,24 @@ export const findBySearchTerm = async (term: string): Promise<Products> => {
* @param ids The list of product ids to fetch the details for * @param ids The list of product ids to fetch the details for
*/ */
export const findList = async (ids: [number]): Promise<Products> => { export const findList = async (ids: [number]): Promise<Products> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let prodRows = []; let prodRows = [];
try { try {
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]); 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) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
prodRows.push(rows[row]); prodRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return prodRows; return prodRows;
}; };
/** /**
@ -137,31 +149,34 @@ export const findList = async (ids: [number]): Promise<Products> => {
* @param id The id of the vendor to fetch the products for * @param id The id of the vendor to fetch the products for
*/ */
export const findByVendor = async (id: number): Promise<Products> => { export const findByVendor = async (id: number): Promise<Products> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let prodRows = []; let prodRows = [];
try { try {
// Get the relevant product ids // Get the relevant product ids
let relevant_prod_ids = []; let relevant_prod_ids = [];
const relevantProds = await conn.query('SELECT product_id FROM prices WHERE vendor_id = ? GROUP BY product_id', id); const relevantProds = await conn.query('SELECT product_id FROM prices WHERE vendor_id = ? GROUP BY product_id', id);
for (let row in relevantProds) { for (let row in relevantProds) {
if (row !== 'meta') { if (row !== 'meta') {
relevant_prod_ids.push(relevantProds[row].product_id); relevant_prod_ids.push(relevantProds[row].product_id);
} }
} }
// Fetch products // Fetch products
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 (?)', [relevant_prod_ids]); 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 (?)', [relevant_prod_ids]);
for (let row in rows) { for (let row in rows) {
if (row !== 'meta') { if (row !== 'meta') {
prodRows.push(rows[row]); prodRows.push(rows[row]);
} }
} }
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
return prodRows; return prodRows;
}; };
/** /**
@ -169,26 +184,26 @@ export const findByVendor = async (id: number): Promise<Products> => {
* @param asin The amazon asin of the product to look for * @param asin The amazon asin of the product to look for
*/ */
export const addNewProduct = async (asin: string): Promise<boolean> => { export const addNewProduct = async (asin: string): Promise<boolean> => {
try { try {
let options = { let options = {
host: 'crawl.p4ddy.com', host: 'crawl.p4ddy.com',
path: '/searchNew', path: '/searchNew',
port: '443', port: '443',
method: 'POST' method: 'POST'
}; };
let req = http.request(options, res => { let req = http.request(options, res => {
return res.statusCode === 202; return res.statusCode === 202;
}); });
req.write(JSON.stringify({ req.write(JSON.stringify({
asin: asin, asin: asin,
key: process.env.CRAWLER_ACCESS_KEY key: process.env.CRAWLER_ACCESS_KEY
})); }));
req.end(); req.end();
} catch (err) { } catch (err) {
console.log(err); console.log(err);
throw(err); throw(err);
} }
return false; return false;
}; };

16
src/models/betterzon/users/session.interface.ts
View File

@ -1,10 +1,10 @@
export interface Session { export interface Session {
session_id: number; session_id: number;
session_key: string; session_key: string;
session_key_hash: string; session_key_hash: string;
createdDate?: Date; createdDate?: Date;
lastLogin?: Date; lastLogin?: Date;
validUntil?: Date; validUntil?: Date;
validDays?: number; validDays?: number;
last_IP: string; last_IP: string;
} }

14
src/models/betterzon/users/user.interface.ts
View File

@ -1,9 +1,9 @@
export interface User { export interface User {
user_id: number; user_id: number;
username: string; username: string;
email: string; email: string;
password_hash: string; password_hash: string;
registration_date: Date; registration_date: Date;
last_login_date: Date; last_login_date: Date;
is_admin: boolean; is_admin: boolean;
} }

2
src/models/betterzon/users/users.interface.ts
View File

@ -1,5 +1,5 @@
import {User} from './user.interface'; import {User} from './user.interface';
export interface Users { export interface Users {
[key: number]: User; [key: number]: User;
} }

20
src/models/betterzon/users/users.service.ts
View File

@ -21,7 +21,7 @@ dotenv.config();
* Creates a user record in the database, also creates a session. Returns the session if successful. * 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<Session> => { export const createUser = async (username: string, password: string, email: string, ip: string): Promise<Session> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Hash password and generate + hash session key // Hash password and generate + hash session key
const pwHash = bcrypt.hashSync(password, 10); const pwHash = bcrypt.hashSync(password, 10);
@ -63,6 +63,9 @@ export const createUser = async (username: string, password: string, email: stri
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
}; };
@ -71,7 +74,7 @@ export const createUser = async (username: string, password: string, email: stri
* Returns the session information in case of a successful login * Returns the session information in case of a successful login
*/ */
export const login = async (username: string, password: string, ip: string): Promise<Session> => { export const login = async (username: string, password: string, ip: string): Promise<Session> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Get saved password hash // Get saved password hash
const query = 'SELECT user_id, bcrypt_password_hash FROM users WHERE username = ?'; const query = 'SELECT user_id, bcrypt_password_hash FROM users WHERE username = ?';
@ -123,6 +126,9 @@ export const login = async (username: string, password: string, ip: string): Pro
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
}; };
@ -130,7 +136,7 @@ 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 * 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<User> => { export const checkSession = async (sessionId: string, sessionKey: string, ip: string): Promise<User> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Get saved session key hash // Get saved session key hash
const query = 'SELECT user_id, session_key_hash, validUntil FROM sessions WHERE session_id = ?'; const query = 'SELECT user_id, session_key_hash, validUntil FROM sessions WHERE session_id = ?';
@ -198,6 +204,9 @@ export const checkSession = async (sessionId: string, sessionKey: string, ip: st
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
}; };
@ -230,7 +239,7 @@ export interface Status {
* @param email The email to check * @param email The email to check
*/ */
export const checkUsernameAndEmail = async (username: string, email: string): Promise<Status> => { export const checkUsernameAndEmail = async (username: string, email: string): Promise<Status> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Create user entry in SQL // Create user entry in SQL
const usernameQuery = 'SELECT username FROM users WHERE username = ?'; const usernameQuery = 'SELECT username FROM users WHERE username = ?';
@ -278,5 +287,8 @@ export const checkUsernameAndEmail = async (username: string, email: string): Pr
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
}; };

16
src/models/betterzon/vendors/vendor.interface.ts vendored
View File

@ -1,10 +1,10 @@
export interface Vendor { export interface Vendor {
vendor_id: number; vendor_id: number;
name: string; name: string;
streetname: string; streetname: string;
zip_code: string; zip_code: string;
city: string; city: string;
country_code: string; country_code: string;
phone: string; phone: string;
website: string; website: string;
} }

2
src/models/betterzon/vendors/vendors.interface.ts vendored
View File

@ -1,5 +1,5 @@
import {Vendor} from './vendor.interface'; import {Vendor} from './vendor.interface';
export interface Vendors { export interface Vendors {
[key: number]: Vendor; [key: number]: Vendor;
} }

30
src/models/betterzon/vendors/vendors.service.ts vendored
View File

@ -18,7 +18,7 @@ dotenv.config();
* Fetches and returns all known vendors * Fetches and returns all known vendors
*/ */
export const findAll = async (): Promise<Vendors> => { export const findAll = async (): Promise<Vendors> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let vendorRows = []; let vendorRows = [];
try { try {
const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE isActive = true'); const rows = await conn.query('SELECT vendor_id, name, streetname, zip_code, city, country_code, phone, website FROM vendors WHERE isActive = true');
@ -50,6 +50,9 @@ export const findAll = async (): Promise<Vendors> => {
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
return vendorRows; return vendorRows;
@ -60,7 +63,7 @@ export const findAll = async (): Promise<Vendors> => {
* @param id The id of the vendor to fetch * @param id The id of the vendor to fetch
*/ */
export const find = async (id: number): Promise<Vendor> => { export const find = async (id: number): Promise<Vendor> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let vendor: any; let vendor: any;
try { try {
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); 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);
@ -72,6 +75,9 @@ export const find = async (id: number): Promise<Vendor> => {
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
return vendor; return vendor;
@ -82,7 +88,7 @@ export const find = async (id: number): Promise<Vendor> => {
* @param term the term to match * @param term the term to match
*/ */
export const findBySearchTerm = async (term: string): Promise<Vendors> => { export const findBySearchTerm = async (term: string): Promise<Vendors> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let vendorRows = []; let vendorRows = [];
try { try {
term = '%' + term + '%'; term = '%' + term + '%';
@ -95,6 +101,9 @@ export const findBySearchTerm = async (term: string): Promise<Vendors> => {
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
return vendorRows; return vendorRows;
@ -105,7 +114,7 @@ export const findBySearchTerm = async (term: string): Promise<Vendors> => {
* @param user The user to return the managed shops for * @param user The user to return the managed shops for
*/ */
export const getManagedShops = async (user_id: number): Promise<Vendors> => { export const getManagedShops = async (user_id: number): Promise<Vendors> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
let vendorRows = []; let vendorRows = [];
try { try {
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); 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);
@ -117,6 +126,9 @@ export const getManagedShops = async (user_id: number): Promise<Vendors> => {
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
return vendorRows; return vendorRows;
@ -129,7 +141,7 @@ export const getManagedShops = async (user_id: number): Promise<Vendors> => {
* @param product_id The product id of the product to deactivate the listing for * @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<Boolean> => { export const deactivateListing = async (user_id: number, vendor_id: number, product_id: number): Promise<Boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Check if the user is authorized to manage the requested vendor // 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]); const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]);
@ -142,6 +154,9 @@ export const deactivateListing = async (user_id: number, vendor_id: number, prod
return status.affectedRows > 0; return status.affectedRows > 0;
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
}; };
@ -152,7 +167,7 @@ export const deactivateListing = async (user_id: number, vendor_id: number, prod
* @param isActive The new active state * @param isActive The new active state
*/ */
export const setShopStatus = async (user_id: number, vendor_id: number, isActive: boolean): Promise<Boolean> => { export const setShopStatus = async (user_id: number, vendor_id: number, isActive: boolean): Promise<Boolean> => {
let conn = BetterzonDB.getConnection(); let conn = await BetterzonDB.getConnection();
try { try {
// Check if the user is authorized to manage the requested vendor // 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]); const user_vendor_rows = await conn.query('SELECT vendor_id FROM vendors WHERE vendor_id = ? AND admin_id = ?', [vendor_id, user_id]);
@ -166,5 +181,8 @@ export const setShopStatus = async (user_id: number, vendor_id: number, isActive
return status.affectedRows > 0; return status.affectedRows > 0;
} catch (err) { } catch (err) {
throw err; throw err;
} finally {
// Return connection
await conn.end();
} }
}; };

20
src/models/climbing-route-rating/ClimbingRouteRating.db.ts
View File

@ -5,15 +5,15 @@ const mariadb = require('mariadb');
dotenv.config(); dotenv.config();
export namespace ClimbingRouteRatingDB { export namespace ClimbingRouteRatingDB {
const pool = mariadb.createPool({ const pool = mariadb.createPool({
host: process.env.DB_HOST, host: process.env.DB_HOST,
user: process.env.DB_USER, user: process.env.DB_USER,
password: process.env.DB_PASSWORD, password: process.env.DB_PASSWORD,
database: process.env.CRR_DATABASE, database: process.env.CRR_DATABASE,
connectionLimit: 5 connectionLimit: 5
}); });
export function getConnection() { export const getConnection = async () => {
return pool; return pool.getConnection();
} };
} }

8
src/models/climbing-route-rating/climbing_gyms/ClimbingGym.interface.ts
View File

@ -1,6 +1,6 @@
export interface ClimbingGym { export interface ClimbingGym {
gym_id: number; gym_id: number;
name: string; name: string;
city: string; city: string;
verified: boolean; verified: boolean;
} }

32
src/models/climbing-route-rating/climbing_gyms/climbingGyms.service.ts
View File

@ -6,12 +6,15 @@ import {ClimbingGym} from './ClimbingGym.interface';
* @return Promise<ClimbingHall[]> The climbing halls * @return Promise<ClimbingHall[]> The climbing halls
*/ */
export const findAll = async (): Promise<ClimbingGym[]> => { export const findAll = async (): Promise<ClimbingGym[]> => {
let conn = ClimbingRouteRatingDB.getConnection(); let conn = await ClimbingRouteRatingDB.getConnection();
try { try {
return await conn.query('SELECT gym_id, name, city, verified FROM climbing_gyms'); return await conn.query('SELECT gym_id, name, city, verified FROM climbing_gyms');
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -21,13 +24,16 @@ export const findAll = async (): Promise<ClimbingGym[]> => {
* @return number The id of the climbing hall * @return number The id of the climbing hall
*/ */
export const createGym = async (name: string, city: string): Promise<number> => { export const createGym = async (name: string, city: string): Promise<number> => {
let conn = ClimbingRouteRatingDB.getConnection(); let conn = await ClimbingRouteRatingDB.getConnection();
try { try {
let res = await conn.query('INSERT INTO climbing_gyms (name, city) VALUES (?, ?) RETURNING gym_id', [name, city]); let res = await conn.query('INSERT INTO climbing_gyms (name, city) VALUES (?, ?) RETURNING gym_id', [name, city]);
return res[0].gym_id; return res[0].gym_id;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

10
src/models/climbing-route-rating/climbing_routes/ClimbingRoute.interface.ts
View File

@ -1,7 +1,7 @@
export interface ClimbingRoute { export interface ClimbingRoute {
route_id: string; route_id: string;
gym_id: number; gym_id: number;
name: string; name: string;
difficulty: string; difficulty: string;
route_setting_date: Date; route_setting_date: Date;
} }

65
src/models/climbing-route-rating/climbing_routes/climbingRoutes.service.ts
View File

@ -7,12 +7,15 @@ import random from 'random-words';
* @return Promise<ClimbingRoute[]> The climbing routes * @return Promise<ClimbingRoute[]> The climbing routes
*/ */
export const findAll = async (): Promise<ClimbingRoute[]> => { export const findAll = async (): Promise<ClimbingRoute[]> => {
let conn = ClimbingRouteRatingDB.getConnection(); let conn = await ClimbingRouteRatingDB.getConnection();
try { try {
return await conn.query('SELECT route_id, gym_id, name, difficulty, route_setting_date FROM climbing_routes'); return await conn.query('SELECT route_id, gym_id, name, difficulty, route_setting_date FROM climbing_routes');
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -21,12 +24,15 @@ export const findAll = async (): Promise<ClimbingRoute[]> => {
* @return Promise<ClimbingRoute> The climbing route * @return Promise<ClimbingRoute> The climbing route
*/ */
export const findById = async (route_id: string): Promise<ClimbingRoute> => { export const findById = async (route_id: string): Promise<ClimbingRoute> => {
let conn = ClimbingRouteRatingDB.getConnection(); let conn = await ClimbingRouteRatingDB.getConnection();
try { try {
return await conn.query('SELECT route_id, gym_id, name, difficulty, route_setting_date FROM climbing_routes WHERE route_id = ?', route_id); return await conn.query('SELECT route_id, gym_id, name, difficulty, route_setting_date FROM climbing_routes WHERE route_id = ?', route_id);
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -37,23 +43,26 @@ export const findById = async (route_id: string): Promise<ClimbingRoute> => {
* @return string The id of the created route * @return string The id of the created route
*/ */
export const createRoute = async (gym_id: number, name: string, difficulty: string): Promise<string> => { export const createRoute = async (gym_id: number, name: string, difficulty: string): Promise<string> => {
let conn = ClimbingRouteRatingDB.getConnection(); let conn = await ClimbingRouteRatingDB.getConnection();
// Generate route id // Generate route id
let route_id = ''; let route_id = '';
let randWords = random(3); let randWords = random(3);
for (let i = 0; i <= 2; i++) { for (let i = 0; i <= 2; i++) {
route_id += randWords[i]; route_id += randWords[i];
if (i < 2) { if (i < 2) {
route_id += '-'; route_id += '-';
} }
} }
try { try {
await conn.query('INSERT INTO climbing_routes (route_id, gym_id, name, difficulty) VALUES (?, ?, ?, ?)', [route_id, gym_id, name, difficulty]); await conn.query('INSERT INTO climbing_routes (route_id, gym_id, name, difficulty) VALUES (?, ?, ?, ?)', [route_id, gym_id, name, difficulty]);
return route_id; return route_id;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

12
src/models/climbing-route-rating/common/VerifyCaptcha.ts
View File

@ -5,11 +5,11 @@ import axios from 'axios';
dotenv.config(); dotenv.config();
export const verifyCaptcha = async (captcha_token: string): Promise<boolean> => { export const verifyCaptcha = async (captcha_token: string): Promise<boolean> => {
let postData = querystring.stringify({ let postData = querystring.stringify({
response: captcha_token, response: captcha_token,
secret: process.env.HCAPTCHA_SECRET secret: process.env.HCAPTCHA_SECRET
}); });
let res = await axios.post('https://hcaptcha.com/siteverify', postData); let res = await axios.post('https://hcaptcha.com/siteverify', postData);
return res.data.success; return res.data.success;
}; };

8
src/models/climbing-route-rating/route_comments/RouteComment.interface.ts
View File

@ -1,6 +1,6 @@
export interface RouteComment { export interface RouteComment {
comment_id: number; comment_id: number;
route_id: string; route_id: string;
comment: string; comment: string;
timestamp: Date; timestamp: Date;
} }

32
src/models/climbing-route-rating/route_comments/routeComments.service.ts
View File

@ -6,12 +6,15 @@ import {RouteComment} from './RouteComment.interface';
* @return Promise<RouteComment[]> The comments * @return Promise<RouteComment[]> The comments
*/ */
export const findByRoute = async (route_id: string): Promise<RouteComment[]> => { export const findByRoute = async (route_id: string): Promise<RouteComment[]> => {
let conn = ClimbingRouteRatingDB.getConnection(); let conn = await ClimbingRouteRatingDB.getConnection();
try { try {
return await conn.query('SELECT comment_id, route_id, comment, timestamp FROM route_comments WHERE route_id = ?', route_id); return await conn.query('SELECT comment_id, route_id, comment, timestamp FROM route_comments WHERE route_id = ?', route_id);
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -21,12 +24,15 @@ export const findByRoute = async (route_id: string): Promise<RouteComment[]> =>
* @return number The id of the comment * @return number The id of the comment
*/ */
export const createComment = async (route_id: string, comment: string): Promise<number> => { export const createComment = async (route_id: string, comment: string): Promise<number> => {
let conn = ClimbingRouteRatingDB.getConnection(); let conn = await ClimbingRouteRatingDB.getConnection();
try { try {
let res = await conn.query('INSERT INTO route_comments (route_id, comment) VALUES (?, ?) RETURNING comment_id', [route_id, comment]); let res = await conn.query('INSERT INTO route_comments (route_id, comment) VALUES (?, ?) RETURNING comment_id', [route_id, comment]);
return res[0].comment_id; return res[0].comment_id;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

8
src/models/climbing-route-rating/route_ratings/RouteRating.interface.ts
View File

@ -1,6 +1,6 @@
export interface RouteRating { export interface RouteRating {
rating_id: number; rating_id: number;
route_id: string; route_id: string;
stars: number; stars: number;
timestamp: Date; timestamp: Date;
} }

48
src/models/climbing-route-rating/route_ratings/routeRatings.service.ts
View File

@ -7,12 +7,15 @@ import {RouteRating} from './RouteRating.interface';
* @return Promise<RouteRating[]> The ratings * @return Promise<RouteRating[]> The ratings
*/ */
export const findByRoute = async (route_id: string): Promise<RouteRating[]> => { export const findByRoute = async (route_id: string): Promise<RouteRating[]> => {
let conn = ClimbingRouteRatingDB.getConnection(); let conn = await ClimbingRouteRatingDB.getConnection();
try { try {
return await conn.query('SELECT rating_id, route_id, stars, timestamp FROM route_ratings WHERE route_id = ?', route_id); return await conn.query('SELECT rating_id, route_id, stars, timestamp FROM route_ratings WHERE route_id = ?', route_id);
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -21,17 +24,17 @@ export const findByRoute = async (route_id: string): Promise<RouteRating[]> => {
* @return number The median amount of stars with 1 fraction digit. * @return number The median amount of stars with 1 fraction digit.
*/ */
export const getStarsForRoute = async (route_id: string): Promise<number> => { export const getStarsForRoute = async (route_id: string): Promise<number> => {
let ratings = await findByRoute(route_id); let ratings = await findByRoute(route_id);
let starsSum = 0; let starsSum = 0;
let starsAmount = 0; let starsAmount = 0;
for (let rating of ratings) { for (let rating of ratings) {
starsSum += rating.stars; starsSum += rating.stars;
starsAmount++; starsAmount++;
} }
return Number((starsSum / starsAmount).toFixed(1)); return Number((starsSum / starsAmount).toFixed(1));
}; };
/** /**
@ -41,12 +44,15 @@ export const getStarsForRoute = async (route_id: string): Promise<number> => {
* @return number The id of the created rating * @return number The id of the created rating
*/ */
export const createRating = async (route_id: string, stars: number): Promise<number> => { export const createRating = async (route_id: string, stars: number): Promise<number> => {
let conn = ClimbingRouteRatingDB.getConnection(); let conn = await ClimbingRouteRatingDB.getConnection();
try { try {
let res = await conn.query('INSERT INTO route_ratings (route_id, stars) VALUES (?, ?) RETURNING rating_id', [route_id, stars]); let res = await conn.query('INSERT INTO route_ratings (route_id, stars) VALUES (?, ?) RETURNING rating_id', [route_id, stars]);
return res[0].comment_id; return res[0].comment_id;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

20
src/models/dhbw-rapla-changes/DHBWRaPlaChanges.db.ts
View File

@ -5,15 +5,15 @@ const mariadb = require('mariadb');
dotenv.config(); dotenv.config();
export namespace RaPlaChangesDB { export namespace RaPlaChangesDB {
const pool = mariadb.createPool({ const pool = mariadb.createPool({
host: process.env.DB_HOST, host: process.env.DB_HOST,
user: process.env.DB_USER, user: process.env.DB_USER,
password: process.env.DB_PASSWORD, password: process.env.DB_PASSWORD,
database: process.env.RAPLACHANGES_DATABASE, database: process.env.RAPLACHANGES_DATABASE,
connectionLimit: 5 connectionLimit: 5
}); });
export function getConnection() { export const getConnection = async () => {
return pool; return pool.getConnection();
} };
} }

28
src/models/dhbw-rapla-changes/changes/Change.interface.ts
View File

@ -1,16 +1,16 @@
export interface Change { export interface Change {
change_id: string; change_id: string;
event_id: string; event_id: string;
change_timestamp: Date; change_timestamp: Date;
is_deleted: boolean; is_deleted: boolean;
new_summary: string; new_summary: string;
new_description: string; new_description: string;
new_start: Date; new_start: Date;
new_end: Date; new_end: Date;
new_last_modified: Date; new_last_modified: Date;
new_created: Date; new_created: Date;
new_location: string; new_location: string;
new_organizer: string; new_organizer: string;
new_categories: string; new_categories: string;
new_recurring: string; new_recurring: string;
} }

10
src/models/dhbw-rapla-changes/changes/Event.interface.ts
View File

@ -1,9 +1,9 @@
import {Change} from './Change.interface'; import {Change} from './Change.interface';
export interface Event { export interface Event {
event_id: string; event_id: string;
event_uid: string; event_uid: string;
latest_event_summary: string; latest_event_summary: string;
latest_start_date: Date; latest_start_date: Date;
changes: Change[]; changes: Change[];
} }

202
src/models/dhbw-rapla-changes/changes/changes.service.ts
View File

@ -6,122 +6,128 @@ import {RaPlaChangesDB} from '../DHBWRaPlaChanges.db';
dotenv.config(); dotenv.config();
export const getChanges = async (course: string, week: string): Promise<Event[]> => { export const getChanges = async (course: string, week: string): Promise<Event[]> => {
let conn = RaPlaChangesDB.getConnection(); let conn = await RaPlaChangesDB.getConnection();
try { try {
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 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[] = []; let relevantEventIds: string[] = [];
relevantEventsRows.forEach((row: { entry_id: string; }) => { relevantEventsRows.forEach((row: { entry_id: string; }) => {
relevantEventIds.push(row.entry_id); relevantEventIds.push(row.entry_id);
}); });
if (relevantEventIds.length < 1) { if (relevantEventIds.length < 1) {
return []; return [];
} }
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 c.entry_id IN (?) ORDER BY c.change_id', [relevantEventIds]); 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 c.entry_id IN (?) ORDER BY c.change_id', [relevantEventIds]);
let eventsMap = new Map(); let eventsMap = new Map();
for (let row of rows) { for (let row of rows) {
let change: Change = { let change: Change = {
change_id: row.change_id, change_id: row.change_id,
event_id: row.event_id, event_id: row.event_id,
change_timestamp: row.change_timestamp, change_timestamp: row.change_timestamp,
is_deleted: row.isDeleted, is_deleted: row.isDeleted,
new_summary: row.new_summary, new_summary: row.new_summary,
new_description: row.new_description, new_description: row.new_description,
new_start: row.new_start, new_start: row.new_start,
new_end: row.new_end, new_end: row.new_end,
new_last_modified: row.new_last_modified, new_last_modified: row.new_last_modified,
new_created: row.new_created, new_created: row.new_created,
new_location: row.new_location, new_location: row.new_location,
new_organizer: row.new_organizer, new_organizer: row.new_organizer,
new_categories: row.new_categories, new_categories: row.new_categories,
new_recurring: row.new_recurring new_recurring: row.new_recurring
}; };
if (eventsMap.has(row.entry_id)) { if (eventsMap.has(row.entry_id)) {
let event = eventsMap.get(row.entry_id); let event = eventsMap.get(row.entry_id);
// Only adjust these fields if the event is not deleted as otherwise they would be null // Only adjust these fields if the event is not deleted as otherwise they would be null
if (!row.isDeleted) { if (!row.isDeleted) {
event.latest_event_summary = row.new_summary; event.latest_event_summary = row.new_summary;
event.latest_start_date = row.new_start; event.latest_start_date = row.new_start;
} }
event.changes.push(change); event.changes.push(change);
eventsMap.set(row.entry_id, event); eventsMap.set(row.entry_id, event);
} else { } else {
let event: Event = { let event: Event = {
event_id: row.event_id, event_id: row.event_id,
event_uid: row.uid, event_uid: row.uid,
latest_event_summary: row.new_summary, latest_event_summary: row.new_summary,
latest_start_date: row.new_start, latest_start_date: row.new_start,
changes: [change] changes: [change]
}; };
eventsMap.set(row.entry_id, event); eventsMap.set(row.entry_id, event);
} }
} }
return Array.from(eventsMap.values()) as Event[]; return Array.from(eventsMap.values()) as Event[];
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
export const getEventById = async (course: string, id: string): Promise<Event> => { export const getEventById = async (course: string, id: string): Promise<Event> => {
let conn = RaPlaChangesDB.getConnection(); let conn = await RaPlaChangesDB.getConnection();
try { try {
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 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(); let eventsMap = new Map();
for (let row of rows) { for (let row of rows) {
let change: Change = { let change: Change = {
change_id: row.change_id, change_id: row.change_id,
event_id: row.event_id, event_id: row.event_id,
change_timestamp: row.change_timestamp, change_timestamp: row.change_timestamp,
is_deleted: row.isDeleted, is_deleted: row.isDeleted,
new_summary: row.new_summary, new_summary: row.new_summary,
new_description: row.new_description, new_description: row.new_description,
new_start: row.new_start, new_start: row.new_start,
new_end: row.new_end, new_end: row.new_end,
new_last_modified: row.new_last_modified, new_last_modified: row.new_last_modified,
new_created: row.new_created, new_created: row.new_created,
new_location: row.new_location, new_location: row.new_location,
new_organizer: row.new_organizer, new_organizer: row.new_organizer,
new_categories: row.new_categories, new_categories: row.new_categories,
new_recurring: row.new_recurring new_recurring: row.new_recurring
}; };
if (eventsMap.has(row.entry_id)) { if (eventsMap.has(row.entry_id)) {
let event = eventsMap.get(row.entry_id); let event = eventsMap.get(row.entry_id);
// Only adjust these fields if the event is not deleted as otherwise they would be null // Only adjust these fields if the event is not deleted as otherwise they would be null
if (!row.isDeleted) { if (!row.isDeleted) {
event.latest_event_summary = row.new_summary; event.latest_event_summary = row.new_summary;
event.latest_start_date = row.new_start; event.latest_start_date = row.new_start;
} }
event.changes.push(change); event.changes.push(change);
eventsMap.set(row.entry_id, event); eventsMap.set(row.entry_id, event);
} else { } else {
let event: Event = { let event: Event = {
event_id: row.event_id, event_id: row.event_id,
event_uid: row.uid, event_uid: row.uid,
latest_event_summary: row.new_summary, latest_event_summary: row.new_summary,
latest_start_date: row.new_start, latest_start_date: row.new_start,
changes: [change] changes: [change]
}; };
eventsMap.set(row.entry_id, event); eventsMap.set(row.entry_id, event);
} }
} }
return Array.from(eventsMap.values())[0]; return Array.from(eventsMap.values())[0];
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

40
src/models/partyplaner/PartyPlaner.db.ts
View File

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

16
src/models/partyplaner/event/Event.interface.ts
View File

@ -5,12 +5,12 @@ import {Registration} from './Registration.interface';
* Used in the getEventData method as a return value * Used in the getEventData method as a return value
*/ */
export interface Event { export interface Event {
eventId: string; eventId: string;
name: string; name: string;
description: string; description: string;
takesPlaceDate: Date; takesPlaceDate: Date;
registrationUntilDate: Date; registrationUntilDate: Date;
maxParticipants: number; maxParticipants: number;
invites: Invite[]; invites: Invite[];
registrations: Registration[]; registrations: Registration[];
} }

10
src/models/partyplaner/event/Invite.interface.ts
View File

@ -2,9 +2,9 @@
* Used in the getEventData method * Used in the getEventData method
*/ */
export interface Invite { export interface Invite {
inviteId: string; inviteId: string;
inviteKey: string; inviteKey: string;
validUntil: Date; validUntil: Date;
alreadyUsed: boolean; alreadyUsed: boolean;
invitedPersonName: string; invitedPersonName: string;
} }

10
src/models/partyplaner/event/Registration.interface.ts
View File

@ -2,9 +2,9 @@
* Used in the getEventData method * Used in the getEventData method
*/ */
export interface Registration { export interface Registration {
registrationId: string; registrationId: string;
name: string; name: string;
registeredDate: Date; registeredDate: Date;
takesPart: boolean; takesPart: boolean;
comment: string; comment: string;
} }

105
src/models/partyplaner/event/event.service.ts
View File

@ -11,63 +11,66 @@ dotenv.config();
* @return Event[] A list of events * @return Event[] A list of events
*/ */
export const getEventData = async (useDev: boolean, userId: string): Promise<Event[]> => { export const getEventData = async (useDev: boolean, userId: string): Promise<Event[]> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
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 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>(); let eventsMap = new Map<string, Event>();
let eventIds: string[] = []; let eventIds: string[] = [];
for (let row of eventRows) { for (let row of eventRows) {
eventIds.push(row.event_id); eventIds.push(row.event_id);
let event = { let event = {
eventId: row.event_id, eventId: row.event_id,
name: row.name, name: row.name,
description: row.description, description: row.description,
takesPlaceDate: row.takes_place_date, takesPlaceDate: row.takes_place_date,
registrationUntilDate: row.registration_until_date, registrationUntilDate: row.registration_until_date,
maxParticipants: row.max_participants, maxParticipants: row.max_participants,
invites: [], invites: [],
registrations: [] registrations: []
}; };
eventsMap.set(row.event_id, event); eventsMap.set(row.event_id, event);
} }
let registrationRows = await conn.query('SELECT registration_id, name, registered_date, takes_part, comment, event_id FROM event_registration WHERE event_id IN (?)', eventIds); let registrationRows = await conn.query('SELECT registration_id, name, registered_date, takes_part, comment, event_id FROM event_registration WHERE event_id IN (?)', eventIds);
for (let row of registrationRows) { for (let row of registrationRows) {
let event = eventsMap.get(row.event_id); let event = eventsMap.get(row.event_id);
if (!event) continue; if (!event) continue;
event.registrations.push({ event.registrations.push({
registrationId: row.registration_id, registrationId: row.registration_id,
name: row.name, name: row.name,
registeredDate: row.registered_date, registeredDate: row.registered_date,
takesPart: row.takes_part, takesPart: row.takes_part,
comment: row.comment comment: row.comment
}); });
} }
let inviteRows = await conn.query('SELECT invite_id, invite_key, valid_until, already_used, invited_person_name, event_id FROM invitations WHERE event_id IN (?)', eventIds); let inviteRows = await conn.query('SELECT invite_id, invite_key, valid_until, already_used, invited_person_name, event_id FROM invitations WHERE event_id IN (?)', eventIds);
for (let row of inviteRows) { for (let row of inviteRows) {
let event = eventsMap.get(row.event_id); let event = eventsMap.get(row.event_id);
if (!event) continue; if (!event) continue;
event.invites.push({ event.invites.push({
inviteId: row.invite_id, inviteId: row.invite_id,
inviteKey: row.invite_key, inviteKey: row.invite_key,
validUntil: row.valid_until, validUntil: row.valid_until,
alreadyUsed: row.already_used, alreadyUsed: row.already_used,
invitedPersonName: row.invited_person_name invitedPersonName: row.invited_person_name
}); });
} }
let eventsList: Event[] = []; let eventsList: Event[] = [];
for (let event of eventsMap.values()) { for (let event of eventsMap.values()) {
eventsList.push(event); eventsList.push(event);
} }
return eventsList; return eventsList;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

10
src/models/partyplaner/friendship/Friendship.interface.ts
View File

@ -2,9 +2,9 @@
* Used in the getFriendshipData method as a return value * Used in the getFriendshipData method as a return value
*/ */
export interface Friendship { export interface Friendship {
friendshipId: string; friendshipId: string;
friendId: string; friendId: string;
friendFirstName: string; friendFirstName: string;
friendLastName: string; friendLastName: string;
friendUsername: string; friendUsername: string;
} }

37
src/models/partyplaner/friendship/friendship.service.ts
View File

@ -11,24 +11,27 @@ dotenv.config();
* @return Friendship[] A list of friends * @return Friendship[] A list of friends
*/ */
export const getFriendshipData = async (useDev: boolean, userId: string): Promise<Friendship[]> => { export const getFriendshipData = async (useDev: boolean, userId: string): Promise<Friendship[]> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
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 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[] = []; let friends: Friendship[] = [];
for (let row of rows) { for (let row of rows) {
friends.push({ friends.push({
friendshipId: row.friendship_id, friendshipId: row.friendship_id,
friendId: row.friend_id, friendId: row.friend_id,
friendFirstName: row.friend_first_name, friendFirstName: row.friend_first_name,
friendLastName: row.friend_last_name, friendLastName: row.friend_last_name,
friendUsername: row.friend_username friendUsername: row.friend_username
}); });
} }
return friends; return friends;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

24
src/models/partyplaner/invite/ReceivedInvite.interface.ts
View File

@ -2,16 +2,16 @@
* Used in the getInvitesData method as a return value * Used in the getInvitesData method as a return value
*/ */
export interface ReceivedInvite { export interface ReceivedInvite {
inviteId: string; inviteId: string;
validUntil: Date; validUntil: Date;
alreadyUsed: boolean; alreadyUsed: boolean;
inviteKey: string; inviteKey: string;
eventName: string; eventName: string;
eventDescription: string; eventDescription: string;
takesPlaceDate: Date; takesPlaceDate: Date;
registrationUntilDate: Date; registrationUntilDate: Date;
maxParticipants: number; maxParticipants: number;
eventCreatorId: string; eventCreatorId: string;
creatorFirstName: string; creatorFirstName: string;
creatorLastName: string; creatorLastName: string;
} }

51
src/models/partyplaner/invite/invite.service.ts
View File

@ -11,31 +11,34 @@ dotenv.config();
* @return ReceivedInvite[] A list of invites * @return ReceivedInvite[] A list of invites
*/ */
export const getInvitesData = async (useDev: boolean, userId: string): Promise<ReceivedInvite[]> => { export const getInvitesData = async (useDev: boolean, userId: string): Promise<ReceivedInvite[]> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
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 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[] = []; let invites: ReceivedInvite[] = [];
for (let row of rows) { for (let row of rows) {
invites.push({ invites.push({
inviteId: row.invite_id, inviteId: row.invite_id,
validUntil: row.valid_until, validUntil: row.valid_until,
alreadyUsed: row.already_used, alreadyUsed: row.already_used,
inviteKey: row.invite_key, inviteKey: row.invite_key,
eventName: row.event_name, eventName: row.event_name,
eventDescription: row.event_description, eventDescription: row.event_description,
takesPlaceDate: row.takes_place_date, takesPlaceDate: row.takes_place_date,
registrationUntilDate: row.registration_until_date, registrationUntilDate: row.registration_until_date,
maxParticipants: row.max_participants, maxParticipants: row.max_participants,
eventCreatorId: row.creator_id, eventCreatorId: row.creator_id,
creatorFirstName: row.first_name, creatorFirstName: row.first_name,
creatorLastName: row.last_name creatorLastName: row.last_name
}); });
} }
return invites; return invites;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

8
src/models/partyplaner/session/SessionData.interface.ts
View File

@ -2,8 +2,8 @@
* Used in the getSessionData method as return value * Used in the getSessionData method as return value
*/ */
export interface SessionData { export interface SessionData {
sessionId: string; sessionId: string;
type: string; type: string;
lastLogin: string; lastLogin: string;
lastIp: string; lastIp: string;
} }

35
src/models/partyplaner/session/session.service.ts
View File

@ -11,23 +11,26 @@ dotenv.config();
* @return SessionData[] A list containing objects with the session data * @return SessionData[] A list containing objects with the session data
*/ */
export const getSessionData = async (useDev: boolean, userId: string): Promise<SessionData[]> => { export const getSessionData = async (useDev: boolean, userId: string): Promise<SessionData[]> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
let rows = await conn.query('SELECT session_id, type, last_login, last_ip FROM sessions WHERE user_id = ? AND valid_until > NOW()', userId); 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[] = []; let sessions: SessionData[] = [];
for (let row of rows) { for (let row of rows) {
sessions.push({ sessions.push({
sessionId: row.session_id, sessionId: row.session_id,
type: row.type, type: row.type,
lastLogin: row.last_login, lastLogin: row.last_login,
lastIp: row.last_ip lastIp: row.last_ip
}); });
} }
return sessions; return sessions;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

6
src/models/partyplaner/user/Session.interface.ts
View File

@ -2,7 +2,7 @@
* Used in the registerUser and loginUser methods as return value * Used in the registerUser and loginUser methods as return value
*/ */
export interface Session { export interface Session {
userId: string; userId: string;
sessionId: string; sessionId: string;
sessionKey: string; sessionKey: string;
} }

6
src/models/partyplaner/user/Status.interface.ts
View File

@ -2,7 +2,7 @@
* Used in the checkUsernameAndEmail method as return value * Used in the checkUsernameAndEmail method as return value
*/ */
export interface Status { export interface Status {
hasProblems: boolean; hasProblems: boolean;
messages: string[]; messages: string[];
status: string[]; status: string[];
} }

14
src/models/partyplaner/user/UserData.interface.ts
View File

@ -2,11 +2,11 @@
* Used in the getUserData method as return value * Used in the getUserData method as return value
*/ */
export interface UserData { export interface UserData {
username: string; username: string;
email: string; email: string;
firstName: string; firstName: string;
lastName: string; lastName: string;
lastLogin: string; lastLogin: string;
emailIsVerified: string; emailIsVerified: string;
isPremiumUser: string; isPremiumUser: string;
} }

374
src/models/partyplaner/user/user.service.ts
View File

@ -15,28 +15,31 @@ dotenv.config();
* @return UserData An object containing the user data * @return UserData An object containing the user data
*/ */
export const getUserData = async (useDev: boolean, userId: string): Promise<UserData> => { export const getUserData = async (useDev: boolean, userId: string): Promise<UserData> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
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 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; let user: UserData = {} as UserData;
for (let row of rows) { for (let row of rows) {
user = { user = {
username: row.username, username: row.username,
email: row.email, email: row.email,
firstName: row.first_name, firstName: row.first_name,
lastName: row.last_name, lastName: row.last_name,
lastLogin: row.last_login, lastLogin: row.last_login,
emailIsVerified: row.email_is_verified, emailIsVerified: row.email_is_verified,
isPremiumUser: row.is_premium_user isPremiumUser: row.is_premium_user
}; };
} }
return user; return user;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -45,25 +48,28 @@ export const getUserData = async (useDev: boolean, userId: string): Promise<User
* @return any An object with a list of usernames and emails * @return any An object with a list of usernames and emails
*/ */
export const getExistingUsernamesAndEmails = async (useDev: boolean): Promise<any> => { export const getExistingUsernamesAndEmails = async (useDev: boolean): Promise<any> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
const rows = await conn.query('SELECT username, email FROM users'); const rows = await conn.query('SELECT username, email FROM users');
let usernames: string[] = []; let usernames: string[] = [];
let emails: string[] = []; let emails: string[] = [];
for (let row of rows) { for (let row of rows) {
usernames.push(row.username); usernames.push(row.username);
emails.push(row.email); emails.push(row.email);
} }
return { return {
'usernames': usernames, 'usernames': usernames,
'emails': emails 'emails': emails
}; };
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -78,54 +84,57 @@ export const getExistingUsernamesAndEmails = async (useDev: boolean): Promise<an
* @param deviceInfo The user agent of the new user * @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> => { export const registerUser = async (useDev: boolean, username: string, email: string, firstName: string, lastName: string, password: string, ip: string, deviceInfo: string): Promise<Session> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
const pwHash = bcrypt.hashSync(password, 10); const pwHash = bcrypt.hashSync(password, 10);
const sessionKey = Guid.create().toString(); const sessionKey = Guid.create().toString();
const sessionKeyHash = bcrypt.hashSync(sessionKey, 10); const sessionKeyHash = bcrypt.hashSync(sessionKey, 10);
const verifyEmailCode = Guid.create().toString(); const verifyEmailCode = Guid.create().toString();
// Create user // Create user
const userQuery = 'INSERT INTO users (username, email, first_name, last_name, password_hash, verify_email_code, registration_date, last_login) VALUES (?, ?, ?, ?, ?, ?, NOW(), NOW()) RETURNING user_id'; const userQuery = 'INSERT INTO users (username, email, first_name, last_name, password_hash, verify_email_code, registration_date, last_login) VALUES (?, ?, ?, ?, ?, ?, NOW(), NOW()) RETURNING user_id';
const userIdRes = await conn.query(userQuery, [username, email, firstName, lastName, pwHash, verifyEmailCode]); const userIdRes = await conn.query(userQuery, [username, email, firstName, lastName, pwHash, verifyEmailCode]);
await conn.commit(); await conn.commit();
// Get user id of the created user // Get user id of the created user
let userId: number = -1; let userId: number = -1;
for (const row of userIdRes) { for (const row of userIdRes) {
if (row.user_id != null) { if (row.user_id != null) {
userId = row.user_id; userId = row.user_id;
} }
} }
let deviceType = 'unknown'; let deviceType = 'unknown';
if (deviceInfo.includes('PartyPlaner') || deviceInfo.includes('Dart')) { if (deviceInfo.includes('PartyPlaner') || deviceInfo.includes('Dart')) {
deviceType = 'mobile'; deviceType = 'mobile';
} else { } else {
deviceType = 'desktop'; deviceType = 'desktop';
} }
// Create session // Create session
const sessionQuery = 'INSERT INTO sessions (user_id, session_key_hash, created_Date, last_login, valid_until, valid_days, last_ip, device_info, type) VALUES (?,?,NOW(),NOW(),DATE_ADD(NOW(), INTERVAL 365 DAY),365,?, ?, ?) RETURNING session_id'; const sessionQuery = 'INSERT INTO sessions (user_id, session_key_hash, created_Date, last_login, valid_until, valid_days, last_ip, device_info, type) VALUES (?,?,NOW(),NOW(),DATE_ADD(NOW(), INTERVAL 365 DAY),365,?, ?, ?) RETURNING session_id';
const sessionIdRes = await conn.query(sessionQuery, [userId, sessionKeyHash, ip, deviceInfo, deviceType]); const sessionIdRes = await conn.query(sessionQuery, [userId, sessionKeyHash, ip, deviceInfo, deviceType]);
await conn.commit(); await conn.commit();
// Get session id of the created session // Get session id of the created session
let sessionId: number = -1; let sessionId: number = -1;
for (const row of sessionIdRes) { for (const row of sessionIdRes) {
if (row.session_id != null) { if (row.session_id != null) {
sessionId = row.session_id; sessionId = row.session_id;
} }
} }
return { return {
'userId': userId.toString(), 'userId': userId.toString(),
'sessionId': sessionId.toString(), 'sessionId': sessionId.toString(),
'sessionKey': sessionKey 'sessionKey': sessionKey
}; };
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -138,66 +147,69 @@ export const registerUser = async (useDev: boolean, username: string, email: str
* @param deviceInfo The user agent of the new user * @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> => { export const loginUser = async (useDev: boolean, username: string, email: string, password: string, ip: string, deviceInfo: string): Promise<Session> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
let query_result; let query_result;
// Get the saved hash // Get the saved hash
if (username !== '') { if (username !== '') {
query_result = await conn.query('SELECT user_id, password_hash FROM users WHERE username = ?', username); query_result = await conn.query('SELECT user_id, password_hash FROM users WHERE username = ?', username);
} else { } else {
query_result = await conn.query('SELECT user_id, password_hash FROM users WHERE email = ?', email); query_result = await conn.query('SELECT user_id, password_hash FROM users WHERE email = ?', email);
} }
let passwordHash: string = ''; let passwordHash: string = '';
let userId: string = ''; let userId: string = '';
for (let row of query_result) { for (let row of query_result) {
passwordHash = row.password_hash; passwordHash = row.password_hash;
userId = row.user_id; userId = row.user_id;
} }
// Wrong password // Wrong password
if (!bcrypt.compareSync(password, passwordHash)) { if (!bcrypt.compareSync(password, passwordHash)) {
return {} as Session; return {} as Session;
} }
// Update user last login // Update user last login
await conn.query('UPDATE users SET last_login = NOW() WHERE user_id = ?', userId); await conn.query('UPDATE users SET last_login = NOW() WHERE user_id = ?', userId);
await conn.commit(); await conn.commit();
// Create session // Create session
const sessionKey = Guid.create().toString(); const sessionKey = Guid.create().toString();
const sessionKeyHash = bcrypt.hashSync(sessionKey, 10); const sessionKeyHash = bcrypt.hashSync(sessionKey, 10);
let deviceType = 'unknown'; let deviceType = 'unknown';
if (deviceInfo.includes('PartyPlaner') || deviceInfo.includes('Dart')) { if (deviceInfo.includes('PartyPlaner') || deviceInfo.includes('Dart')) {
deviceType = 'mobile'; deviceType = 'mobile';
} else { } else {
deviceType = 'desktop'; deviceType = 'desktop';
} }
const sessionQuery = 'INSERT INTO sessions (user_id, session_key_hash, created_Date, last_login, valid_until, valid_days, last_ip, device_info, type) VALUES (?,?,NOW(),NOW(),DATE_ADD(NOW(), INTERVAL 365 DAY),365,?, ?, ?) RETURNING session_id'; const sessionQuery = 'INSERT INTO sessions (user_id, session_key_hash, created_Date, last_login, valid_until, valid_days, last_ip, device_info, type) VALUES (?,?,NOW(),NOW(),DATE_ADD(NOW(), INTERVAL 365 DAY),365,?, ?, ?) RETURNING session_id';
const sessionIdRes = await conn.query(sessionQuery, [userId, sessionKeyHash, ip, deviceInfo, deviceType]); const sessionIdRes = await conn.query(sessionQuery, [userId, sessionKeyHash, ip, deviceInfo, deviceType]);
await conn.commit(); await conn.commit();
// Get session id of the created session // Get session id of the created session
let sessionId: number = -1; let sessionId: number = -1;
for (const row of sessionIdRes) { for (const row of sessionIdRes) {
if (row.session_id != null) { if (row.session_id != null) {
sessionId = row.session_id; sessionId = row.session_id;
} }
} }
return { return {
'userId': userId.toString(), 'userId': userId.toString(),
'sessionId': sessionId.toString(), 'sessionId': sessionId.toString(),
'sessionKey': sessionKey 'sessionKey': sessionKey
}; };
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
/** /**
@ -207,68 +219,74 @@ export const loginUser = async (useDev: boolean, username: string, email: string
* @param email The email to check * @param email The email to check
*/ */
export const checkUsernameAndEmail = async (useDev: boolean, username: string, email: string): Promise<Status> => { export const checkUsernameAndEmail = async (useDev: boolean, username: string, email: string): Promise<Status> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
const usernameQuery = 'SELECT username FROM users WHERE username = ?'; const usernameQuery = 'SELECT username FROM users WHERE username = ?';
const emailQuery = 'SELECT email FROM users WHERE email = ?'; const emailQuery = 'SELECT email FROM users WHERE email = ?';
const usernameRes = await conn.query(usernameQuery, username); const usernameRes = await conn.query(usernameQuery, username);
const emailRes = await conn.query(emailQuery, email); const emailRes = await conn.query(emailQuery, email);
let res: Status = { let res: Status = {
hasProblems: false, hasProblems: false,
messages: [], messages: [],
status: [] status: []
}; };
const usernameRegex = RegExp('^[a-zA-Z0-9\\-\\_]{4,20}$'); // Can contain a-z, A-Z, 0-9, -, _ and has to be 4-20 chars long const usernameRegex = RegExp('^[a-zA-Z0-9\\-\\_]{4,20}$'); // Can contain a-z, A-Z, 0-9, -, _ and has to be 4-20 chars long
if (!usernameRegex.test(username)) { if (!usernameRegex.test(username)) {
// Username doesn't match requirements // Username doesn't match requirements
res.hasProblems = true; res.hasProblems = true;
res.messages.push('The username contains illegal characters or is not the allowed size'); res.messages.push('The username contains illegal characters or is not the allowed size');
res.status.push('INVALID_USERNAME'); res.status.push('INVALID_USERNAME');
} }
const emailRegex = RegExp('^[a-zA-Z0-9\\-\\_.]{1,30}\\@[a-zA-Z0-9\\-.]{1,20}\\.[a-z]{1,20}$'); // Normal email regex, user@plutodev.de const emailRegex = RegExp('^[a-zA-Z0-9\\-\\_.]{1,30}\\@[a-zA-Z0-9\\-.]{1,20}\\.[a-z]{1,20}$'); // Normal email regex, user@plutodev.de
if (!emailRegex.test(email)) { if (!emailRegex.test(email)) {
// Username doesn't match requirements // Username doesn't match requirements
res.hasProblems = true; res.hasProblems = true;
res.messages.push('The email contains illegal characters or is not the allowed size'); res.messages.push('The email contains illegal characters or is not the allowed size');
res.status.push('INVALID_EMAIL'); res.status.push('INVALID_EMAIL');
} }
if (usernameRes.length > 0) { if (usernameRes.length > 0) {
// Username is a duplicate // Username is a duplicate
res.hasProblems = true; res.hasProblems = true;
res.messages.push('This username is already in use'); res.messages.push('This username is already in use');
res.status.push('DUPLICATE_USERNAME'); res.status.push('DUPLICATE_USERNAME');
} }
if (emailRes.length > 0) { if (emailRes.length > 0) {
// Email is a duplicate // Email is a duplicate
res.hasProblems = true; res.hasProblems = true;
res.messages.push('This email is already in use'); res.messages.push('This email is already in use');
res.status.push('DUPLICATE_EMAIL'); res.status.push('DUPLICATE_EMAIL');
} }
return res; return res;
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };
export const checkSession = async (useDev: boolean, userId: string, sessionId: string, sessionKey: string): Promise<boolean> => { export const checkSession = async (useDev: boolean, userId: string, sessionId: string, sessionKey: string): Promise<boolean> => {
let conn = PartyPlanerDB.getConnection(useDev); let conn = await PartyPlanerDB.getConnection(useDev);
try { try {
let rows = await conn.query('SELECT session_key_hash FROM sessions WHERE user_id = ? AND session_id = ?', [userId, sessionId]); let rows = await conn.query('SELECT session_key_hash FROM sessions WHERE user_id = ? AND session_id = ?', [userId, sessionId]);
let savedHash = ''; let savedHash = '';
for (let row of rows) { for (let row of rows) {
savedHash = row.session_key_hash; savedHash = row.session_key_hash;
} }
return bcrypt.compareSync(sessionKey, savedHash); return bcrypt.compareSync(sessionKey, savedHash);
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };

318
src/models/rapla-middleware/icalgenerator/icalgenerator.service.ts
View File

@ -1,222 +1,222 @@
const fetch = require('node-fetch'); const fetch = require('node-fetch');
export const getiCalFile = async (user: string, file: string, showBlockers: boolean, electiveModule: string, profileModule: string): Promise<string> => { export const getiCalFile = async (user: string, file: string, showBlockers: boolean, electiveModule: string, profileModule: string): Promise<string> => {
try { try {
let iCalFileContents = ''; let iCalFileContents = '';
let baseUrl = 'https://rapla.dhbw-karlsruhe.de/rapla?page=ical'; let baseUrl = 'https://rapla.dhbw-karlsruhe.de/rapla?page=ical';
baseUrl += '&user=' + user; baseUrl += '&user=' + user;
baseUrl += '&file=' + file; baseUrl += '&file=' + file;
const response = await fetch(baseUrl); const response = await fetch(baseUrl);
let body = await response.text(); let body = await response.text();
// Parse the ical file // Parse the ical file
let iCalFile = parseIcal(body); let iCalFile = parseIcal(body);
// Now remove unwanted shit from the iCal file // Now remove unwanted shit from the iCal file
if (!showBlockers) { if (!showBlockers) {
iCalFile = removeBlockers(iCalFile); iCalFile = removeBlockers(iCalFile);
} }
if (electiveModule !== '') { if (electiveModule !== '') {
iCalFile = removeElective(iCalFile, electiveModule); iCalFile = removeElective(iCalFile, electiveModule);
} }
if (profileModule !== '') { if (profileModule !== '') {
iCalFile = removeProfile(iCalFile, profileModule); iCalFile = removeProfile(iCalFile, profileModule);
} }
// Turn into one file again // Turn into one file again
let resultingFile = serializeIcal(iCalFile); let resultingFile = serializeIcal(iCalFile);
return resultingFile; return resultingFile;
} catch (err) { } catch (err) {
throw err; throw err;
} }
}; };
export const parseIcal = function (icalContents: string): iCalFile { export const parseIcal = function (icalContents: string): iCalFile {
const fileHeaderRegex: RegExp = /^BEGIN:VCALENDAR.*?BEGIN:VEVENT$/ms; const fileHeaderRegex: RegExp = /^BEGIN:VCALENDAR.*?BEGIN:VEVENT$/ms;
const eventRegex: RegExp = /^BEGIN:VEVENT.*?END:VEVENT$/msg; const eventRegex: RegExp = /^BEGIN:VEVENT.*?END:VEVENT$/msg;
let headerMatch = fileHeaderRegex.exec(icalContents); let headerMatch = fileHeaderRegex.exec(icalContents);
let header = ''; let header = '';
if (headerMatch) { if (headerMatch) {
header = headerMatch[0]; header = headerMatch[0];
} }
header = header.substr(0, header.lastIndexOf('\n') + 1); header = header.substr(0, header.lastIndexOf('\n') + 1);
let events: iCalEvent[] = []; let events: iCalEvent[] = [];
let match: any; let match: any;
while (match = eventRegex.exec(icalContents)) { while (match = eventRegex.exec(icalContents)) {
if (match) { if (match) {
events.push({ events.push({
content: match[0], content: match[0],
duration: getDuration(match[0]) duration: getDuration(match[0])
}); });
} }
} }
return { return {
head: header, head: header,
body: events body: events
}; };
}; };
export const getDuration = function (event: string): number { export const getDuration = function (event: string): number {
let startRegex: RegExp = /DTSTART.*?(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z?\r/gm; let startRegex: RegExp = /DTSTART.*?(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z?\r/gm;
let endRegex: RegExp = /DTEND.*?(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z?\r/gm; let endRegex: RegExp = /DTEND.*?(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z?\r/gm;
let startMatch = startRegex.exec(event); let startMatch = startRegex.exec(event);
let startDtYear = 0; let startDtYear = 0;
let startDtMonth = 0; let startDtMonth = 0;
let startDtDay = 0; let startDtDay = 0;
let startDtHour = 0; let startDtHour = 0;
let startDtMinute = 0; let startDtMinute = 0;
if (startMatch) { if (startMatch) {
startDtYear = parseInt(startMatch[1]); startDtYear = parseInt(startMatch[1]);
startDtMonth = parseInt(startMatch[2]); startDtMonth = parseInt(startMatch[2]);
startDtDay = parseInt(startMatch[3]); startDtDay = parseInt(startMatch[3]);
startDtHour = parseInt(startMatch[4]); startDtHour = parseInt(startMatch[4]);
startDtMinute = parseInt(startMatch[5]); startDtMinute = parseInt(startMatch[5]);
} }
let endMatch = endRegex.exec(event); let endMatch = endRegex.exec(event);
let endDtYear = 0; let endDtYear = 0;
let endDtMonth = 0; let endDtMonth = 0;
let endDtDay = 0; let endDtDay = 0;
let endDtHour = 0; let endDtHour = 0;
let endDtMinute = 0; let endDtMinute = 0;
if (endMatch) { if (endMatch) {
endDtYear = parseInt(endMatch[1]); endDtYear = parseInt(endMatch[1]);
endDtMonth = parseInt(endMatch[2]); endDtMonth = parseInt(endMatch[2]);
endDtDay = parseInt(endMatch[3]); endDtDay = parseInt(endMatch[3]);
endDtHour = parseInt(endMatch[4]); endDtHour = parseInt(endMatch[4]);
endDtMinute = parseInt(endMatch[5]); endDtMinute = parseInt(endMatch[5]);
} }
let startDt = new Date(startDtYear, startDtMonth - 1, startDtDay, startDtHour, startDtMinute); let startDt = new Date(startDtYear, startDtMonth - 1, startDtDay, startDtHour, startDtMinute);
let endDt = new Date(endDtYear, endDtMonth - 1, endDtDay, endDtHour, endDtMinute); let endDt = new Date(endDtYear, endDtMonth - 1, endDtDay, endDtHour, endDtMinute);
let hourDifference = endDt.getHours() - startDt.getHours(); let hourDifference = endDt.getHours() - startDt.getHours();
let minuteDifference = 0; let minuteDifference = 0;
if (hourDifference === 0) { if (hourDifference === 0) {
minuteDifference = endDt.getMinutes() - startDt.getMinutes(); minuteDifference = endDt.getMinutes() - startDt.getMinutes();
} }
return hourDifference + (minuteDifference / 60); return hourDifference + (minuteDifference / 60);
}; };
export const serializeIcal = function (ical: iCalFile): string { export const serializeIcal = function (ical: iCalFile): string {
let resString = ical.head; let resString = ical.head;
ical.body.forEach((event) => { ical.body.forEach((event) => {
resString += event.content + '\n'; resString += event.content + '\n';
}); });
resString += 'END:VCALENDAR\n'; resString += 'END:VCALENDAR\n';
return resString; return resString;
}; };
export const removeBlockers = function (ical: iCalFile): iCalFile { export const removeBlockers = function (ical: iCalFile): iCalFile {
let remainingEvents: iCalEvent[] = []; let remainingEvents: iCalEvent[] = [];
ical.body.forEach((event) => { ical.body.forEach((event) => {
if ( if (
!event.content.includes('SUMMARY:Beginn Theorie') !event.content.includes('SUMMARY:Beginn Theorie')
&& !event.content.includes('SUMMARY:Präsenz') && !event.content.includes('SUMMARY:Präsenz')
&& event.duration < 10 && event.duration < 10
&& event.duration > 0.25 && event.duration > 0.25
) { ) {
remainingEvents.push(event); remainingEvents.push(event);
} }
}); });
ical.body = remainingEvents; ical.body = remainingEvents;
return ical; return ical;
}; };
export const removeElective = function (ical: iCalFile, chosenElective: string): iCalFile { export const removeElective = function (ical: iCalFile, chosenElective: string): iCalFile {
let remainingEvents: iCalEvent[] = []; let remainingEvents: iCalEvent[] = [];
let electiveToRemove = [ let electiveToRemove = [
{name: 'ERP-Systeme'}, {name: 'ERP-Systeme'},
{name: 'Ethik für Informatiker'}, {name: 'Ethik für Informatiker'},
{name: 'Evolutionäre Algorithmen'}, {name: 'Evolutionäre Algorithmen'},
{name: 'Forensik'}, {name: 'Forensik'},
{name: 'Kryptographische Verfahren'}, {name: 'Kryptographische Verfahren'},
{name: 'Robotik'}, {name: 'Robotik'},
{name: 'Web-Services'}, {name: 'Web-Services'},
{name: 'High Performance Computing'}, {name: 'High Performance Computing'},
{name: 'Digitale Audiosignalverarbeitung'}, {name: 'Digitale Audiosignalverarbeitung'},
{name: 'Psychologische Grundlagen für Informatiker'}, {name: 'Psychologische Grundlagen für Informatiker'},
{name: 'Erklärbare Künstliche Intelligenz'}, {name: 'Erklärbare Künstliche Intelligenz'},
{name: 'Innovation Management'} {name: 'Innovation Management'}
]; ];
electiveToRemove.splice(parseInt(chosenElective), 1); electiveToRemove.splice(parseInt(chosenElective), 1);
ical.body.forEach((event) => { ical.body.forEach((event) => {
let addEvent = true; let addEvent = true;
electiveToRemove.forEach((module) => { electiveToRemove.forEach((module) => {
if (event.content.includes(module.name)) { if (event.content.includes(module.name)) {
addEvent = false; addEvent = false;
} }
}); });
if (addEvent) { if (addEvent) {
remainingEvents.push(event); remainingEvents.push(event);
} }
}); });
ical.body = remainingEvents; ical.body = remainingEvents;
return ical; return ical;
}; };
export const removeProfile = function (ical: iCalFile, chosenProfile: string): iCalFile { export const removeProfile = function (ical: iCalFile, chosenProfile: string): iCalFile {
let remainingEvents: iCalEvent[] = []; let remainingEvents: iCalEvent[] = [];
let profileToRemove = [ let profileToRemove = [
{names: ['.Grundlagen der KI (KI und BV)', 'Bildverarbeitung (KI und BV)']}, {names: ['.Grundlagen der KI (KI und BV)', 'Bildverarbeitung (KI und BV)']},
{names: ['Bildverarbeitung', 'Computergraphik']}, {names: ['Bildverarbeitung', 'Computergraphik']},
{names: ['Interaktive Systeme', 'Grundlagen der KI']}, {names: ['Interaktive Systeme', 'Grundlagen der KI']},
{names: ['e Business', 'angewandtes Projektmanagement']}, {names: ['e Business', 'angewandtes Projektmanagement']},
{names: ['Kommunikations und Netztechnik II']} {names: ['Kommunikations und Netztechnik II']}
]; ];
profileToRemove.splice(parseInt(chosenProfile), 1); profileToRemove.splice(parseInt(chosenProfile), 1);
ical.body.forEach((event) => { ical.body.forEach((event) => {
let addEvent = true; let addEvent = true;
profileToRemove.forEach((module) => { profileToRemove.forEach((module) => {
module.names.forEach((name) => { module.names.forEach((name) => {
if (event.content.includes(name)) { if (event.content.includes(name)) {
addEvent = false; addEvent = false;
} }
}); });
}); });
if (addEvent) { if (addEvent) {
remainingEvents.push(event); remainingEvents.push(event);
} }
}); });
ical.body = remainingEvents; ical.body = remainingEvents;
return ical; return ical;
}; };
export interface iCalFile { export interface iCalFile {
head: string; head: string;
body: iCalEvent[]; body: iCalEvent[];
} }
export interface iCalEvent { export interface iCalEvent {
content: string; content: string;
duration: number; // Duration in hours duration: number; // Duration in hours
} }

20
src/models/twitch-highlight-marker/HighlightMarker.db.ts
View File

@ -5,15 +5,15 @@ const mariadb = require('mariadb');
dotenv.config(); dotenv.config();
export namespace HighlightMarkerDB { export namespace HighlightMarkerDB {
const pool = mariadb.createPool({ const pool = mariadb.createPool({
host: process.env.DB_HOST, host: process.env.DB_HOST,
user: process.env.DB_USER, user: process.env.DB_USER,
password: process.env.DB_PASSWORD, password: process.env.DB_PASSWORD,
database: process.env.BETTERZON_DATABASE, database: process.env.BETTERZON_DATABASE,
connectionLimit: 5 connectionLimit: 5
}); });
export function getConnection() { export const getConnection = async () => {
return pool; return pool.getConnection();
} };
} }

31
src/models/twitch-highlight-marker/addHighlight/addHighlights.service.ts
View File

@ -8,21 +8,24 @@ dotenv.config();
* @param req_body The request body * @param req_body The request body
*/ */
export const createHighlightEntry = async (req_body: any) => { export const createHighlightEntry = async (req_body: any) => {
let conn = HighlightMarkerDB.getConnection(); let conn = await HighlightMarkerDB.getConnection();
try { try {
const streamers = await conn.query('SELECT streamer_id FROM streamers WHERE username = ?', req_body.streamer); const streamers = await conn.query('SELECT streamer_id FROM streamers WHERE username = ?', req_body.streamer);
let streamer_id: number = -1; let streamer_id: number = -1;
for (let row in streamers) { for (let row in streamers) {
if (row !== 'meta') { if (row !== 'meta') {
streamer_id = streamers[row].streamer_id; streamer_id = streamers[row].streamer_id;
} }
} }
const params = [streamer_id, req_body.stream_id, req_body.description, req_body.timestamp, req_body.username, req_body.stream_game]; const params = [streamer_id, req_body.stream_id, req_body.description, req_body.timestamp, req_body.username, req_body.stream_game];
const rows = await conn.query('INSERT INTO highlights (streamer_id, stream_id, description, stream_timestamp, issuing_user, game) VALUES (?, ?, ?, ?, ?, ?)', params); const rows = await conn.query('INSERT INTO highlights (streamer_id, stream_id, description, stream_timestamp, issuing_user, game) VALUES (?, ?, ?, ?, ?, ?)', params);
} catch (err) { } catch (err) {
throw err; throw err;
} } finally {
// Return connection
await conn.end();
}
}; };