Working MySQL Storage system
- testing delete
This commit is contained in:
208
libStorage.js
208
libStorage.js
@@ -5,7 +5,6 @@
|
||||
|
||||
// Storage Specific Modules
|
||||
// MySQL
|
||||
const e = require("express");
|
||||
const mysql = require("mysql");
|
||||
|
||||
|
||||
@@ -16,20 +15,49 @@ function runSQL(sqlQuery, connection, callback = (err, rows) => {
|
||||
throw err;
|
||||
}) {
|
||||
connection.query(sqlQuery, (err, rows) => {
|
||||
if (err) return callback(err, undefined);
|
||||
//console.log('The rows are:', rows);
|
||||
return callback(undefined, rows);
|
||||
if (err) {
|
||||
console.log("SQL Error:", err)
|
||||
callback(err, undefined);
|
||||
}
|
||||
console.log("RunSQL Returned Rows:", rows);
|
||||
callback(undefined, rows);
|
||||
})
|
||||
}
|
||||
|
||||
class RSSRecord {
|
||||
/**
|
||||
*
|
||||
* @param {*} _id
|
||||
* @param {*} _title
|
||||
* @param {*} _link
|
||||
* @param {*} _category
|
||||
*/
|
||||
constructor(_id, _title, _link, _category) {
|
||||
this.id = _id;
|
||||
this.title = _title;
|
||||
this.link= _link;
|
||||
this.category = _category;
|
||||
}
|
||||
|
||||
getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
get(key) {
|
||||
if (!Object.keys(this).includes(key)) throw new Error("Key is invalid", key);
|
||||
return this[key]
|
||||
}
|
||||
}
|
||||
|
||||
exports.RSSRecord = RSSRecord;
|
||||
|
||||
exports.Storage = class Storage {
|
||||
constructor(_dbTable) {
|
||||
this.connection = mysql.createConnection({
|
||||
host: process.env.DB_HOST,
|
||||
user: databaseConfig.DB_USER,
|
||||
password: databaseConfig.DB_PASS,
|
||||
database: databaseConfig.DB_NAME
|
||||
user: process.env.DB_USER,
|
||||
password: process.env.DB_PASS,
|
||||
database: process.env.DB_NAME
|
||||
});
|
||||
|
||||
// Start the MySQL Connection
|
||||
@@ -41,20 +69,29 @@ exports.Storage = class Storage {
|
||||
|
||||
/**
|
||||
* Wrapper to save a new entry using the storage method configured
|
||||
* @param {*} toBeSaved Entry or Entries to be added
|
||||
* @param {Array} toBeSaved Entry or Entries to be added
|
||||
* @param {function} callback The callback function to be called with the record when saved
|
||||
*/
|
||||
create(toBeSaved, callback) {
|
||||
console.log("To be saved:", toBeSaved);
|
||||
console.log("to be saved length:", toBeSaved.length);
|
||||
if (!toBeSaved[0].fields?.title) callback(Error("No title given"), undefined);
|
||||
|
||||
for (const entry of toBeSaved) {
|
||||
if(!this.checkForTitleSync(entry.title)) {
|
||||
this.saveEntry(entry, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
if (rows?.affectedRows) callback(undefined, rows[0]);
|
||||
})
|
||||
}
|
||||
let newRecords = []
|
||||
for (var entry of toBeSaved) {
|
||||
entry = entry.fields
|
||||
console.log("Entry:", entry);
|
||||
this.returnRecord(undefined, entry.title, entry.link, entry.category, (err, record) => {
|
||||
if (err) callback(err, undefined);
|
||||
newRecords.push(record);
|
||||
if (toBeSaved.length === 1) {
|
||||
console.log("One record to callback with:", record);
|
||||
callback(undefined, record);
|
||||
}
|
||||
})
|
||||
}
|
||||
if (!toBeSaved.length === 1) {
|
||||
callback(undefined, newRecords);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -65,12 +102,12 @@ exports.Storage = class Storage {
|
||||
destroy(entryID, callback) {
|
||||
if (!entryID) callback(Error("No entry ID given"), undefined);
|
||||
|
||||
const entryRecord = this.getRecordBy('id', entryID);
|
||||
|
||||
this.removeEntry(entryRecord.id, (err, results) => {
|
||||
if (err) callback(err, undefined);
|
||||
callback(undefined, results);
|
||||
});
|
||||
this.getRecordBy('id', entryID, (err, entryRecord) => {
|
||||
this.removeEntry(entryRecord.id, (err, results) => {
|
||||
if (err) callback(err, undefined);
|
||||
callback(undefined, results);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -78,14 +115,14 @@ exports.Storage = class Storage {
|
||||
* @param {*} title The title of the entry to check if it exists
|
||||
* @returns {true|false|*}
|
||||
*/
|
||||
checkForTitleSync(title) {
|
||||
if (!title) throw new Error("No title given when checking for title");
|
||||
const sqlQuery = `SELECT * FROM ${this.dbTable} WHERE title = ${title}`;
|
||||
checkForTitle(title, callback) {
|
||||
if (!title) callback(new Error("No title given when checking for title"), undefined);
|
||||
const sqlQuery = `SELECT * FROM ${this.dbTable} WHERE title = '${title}'`;
|
||||
|
||||
runSQL(this.connection, sqlQuery, (err, rows) => {
|
||||
if (err) throw err;
|
||||
if (rows[0]?.title) return true;
|
||||
else return false;
|
||||
runSQL(sqlQuery, this.connection, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
if (rows[0]?.title) callback(undefined, true);
|
||||
else callback(undefined, false);
|
||||
})
|
||||
}
|
||||
|
||||
@@ -94,16 +131,16 @@ exports.Storage = class Storage {
|
||||
* @param {*} key The key to search for
|
||||
* @param {*} keyValue The value of the key to search for
|
||||
*/
|
||||
getRecordBy(key, keyValue) {
|
||||
getRecordBy(key, keyValue, callback) {
|
||||
const validKeys = ["link", "title", "category", "id"];
|
||||
if (!Array(validKeys).includes(key)) throw new Error("Given key not valid");
|
||||
if (!validKeys.includes(key)) callback(new Error("Given key not valid"), undefined);
|
||||
|
||||
const sqlQuery = `SELECT * FROM ${this.dbTable} WHERE ${key} = ${keyValue}`;
|
||||
const sqlQuery = `SELECT * FROM ${this.dbTable} WHERE ${key} = '${keyValue}'`;
|
||||
|
||||
runSQL(this.connection, sqlQuery, (err, rows) => {
|
||||
if (err) throw err;
|
||||
if (rows[0]?.title) return rows[0];
|
||||
else return false;
|
||||
runSQL(sqlQuery, this.connection, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
if (rows[0]?.title) callback(undefined, rows[0]);
|
||||
else callback(undefined, false);
|
||||
})
|
||||
}
|
||||
|
||||
@@ -113,13 +150,16 @@ exports.Storage = class Storage {
|
||||
* @param {function} callback The callback to be called with either an error or undefined if successful
|
||||
*/
|
||||
saveEntry(entryObject, callback) {
|
||||
if (!entryObject?.table || entryObject?.link || entryObject?.category) {
|
||||
console.log("Saving entry:", entryObject);
|
||||
if (!entryObject?.title || !entryObject?.link || !entryObject?.category) {
|
||||
callback(new Error("Entry object malformed, check the object before saving it"), undefined)
|
||||
}
|
||||
|
||||
const sqlQuery = `INSERT INTO ${this.dbTable} (title, link, category) VALUES ('${entryObject.table}', '${entryObject.link}', '${entryObject.category}')`;
|
||||
const sqlQuery = `INSERT INTO ${this.dbTable} (title, link, category) VALUES ('${entryObject.title}', '${entryObject.link}', '${entryObject.category}');`;
|
||||
|
||||
runSQL(this.connection, sqlQuery, (err, rows) => {
|
||||
console.log(`Adding new entry with SQL query: '${sqlQuery}'`)
|
||||
|
||||
runSQL(sqlQuery, this.connection, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
callback(undefined, rows);
|
||||
})
|
||||
@@ -130,13 +170,13 @@ exports.Storage = class Storage {
|
||||
* @param {Object} entryObject The entry object to be saved
|
||||
* @param {function} callback The callback to be called with either an error or undefined if successful
|
||||
*/
|
||||
updateEntry(entryObject, callback) {
|
||||
updateEntry(entryObject, callback) {
|
||||
let queryParams = [];
|
||||
if (!entryObject.title) callback(new Error("No title given before updating"), undefined);
|
||||
queryParams.push(`title = '${entryObject.title}`);
|
||||
queryParams.push(`title = '${entryObject.title}'`);
|
||||
if (!entryObject.link) callback(new Error("No link given before updating"), undefined);
|
||||
queryParams.push(`link = '${entryObject.link}`);
|
||||
if (entryObject.category) queryParams.push(`category = '${entryObject.category}`);
|
||||
queryParams.push(`link = '${entryObject.link}'`);
|
||||
if (entryObject.category) queryParams.push(`category = '${entryObject.category}'`);
|
||||
|
||||
let sqlQuery = `UPDATE ${this.dbTable} SET`;
|
||||
|
||||
@@ -154,7 +194,9 @@ exports.Storage = class Storage {
|
||||
|
||||
sqlQuery = `${sqlQuery} WHERE title = '${entryObject.title}';`
|
||||
|
||||
runSQL(this.connection, sqlQuery, (err, rows) => {
|
||||
console.log(`Updating entry with SQL query: '${sqlQuery}'`)
|
||||
|
||||
runSQL(sqlQuery, this.connection, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
callback(undefined, rows);
|
||||
})
|
||||
@@ -172,9 +214,83 @@ exports.Storage = class Storage {
|
||||
|
||||
const sqlQuery = `DELETE FROM ${this.dbTable} WHERE title = '${title}'`;
|
||||
|
||||
runSQL(this.connection, sqlQuery, (err, rows) => {
|
||||
runSQL(sqlQuery, this.connection, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
callback(undefined, rows);
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a record class for the given information, if there's no ID, it will create it
|
||||
* @param {*} _id The ID / line number of the record in the storage medium (OPT)
|
||||
* @param {*} _title The title of the record
|
||||
* @param {*} _link The link to the RSS feed
|
||||
* @param {*} _category The category of the record
|
||||
* @param {*} callback Callback function to return an error or the record
|
||||
*/
|
||||
returnRecord(_id, _title, _link, _category, callback) {
|
||||
console.log(`Return record for these values: ID: '${_id}', Title: '${_title}', Category: '${_category}', Link: '${_link}'`)
|
||||
if (!_link && !_title) callback(new Error("No link or title given when creating a record"), undefined);
|
||||
let entryObject = {
|
||||
"title": _title,
|
||||
"link": _link
|
||||
}
|
||||
if (_category) entryObject.category = _category;
|
||||
|
||||
if (_id) {
|
||||
entryObject.id = _id;
|
||||
this.updateEntry(entryObject, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
this.getRecordBy('id', entryObject.id, (err, record) => {
|
||||
if (err) callback(err, undefined);
|
||||
callback(undefined, new RSSRecord(record.id, record.title, record.link, record.category));
|
||||
})
|
||||
})
|
||||
}
|
||||
else {
|
||||
this.checkForTitle(_title, (err, titleExists) => {
|
||||
if (!titleExists) {
|
||||
console.log("Entry doesn't exist, making one now", entryObject);
|
||||
this.saveEntry(entryObject, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
this.getRecordBy("title", entryObject.title, (err, record) => {
|
||||
if (err) callback(err, undefined);
|
||||
callback(undefined, new RSSRecord(record.id, record.title, record.link, record.category));
|
||||
})
|
||||
});
|
||||
}
|
||||
else{
|
||||
this.updateEntry(entryObject, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
this.getRecordBy('title', entryObject.title, (err, record) => {
|
||||
if (err) callback(err, undefined);
|
||||
callback(undefined, new RSSRecord(record.id, record.title, record.link, record.category));
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all records stored
|
||||
* @param {function} callback
|
||||
*/
|
||||
getAllRecords(callback) {
|
||||
console.log("Getting all records");
|
||||
const sqlQuery = `SELECT * FROM ${this.dbTable}`
|
||||
|
||||
let rssRecords = [];
|
||||
|
||||
runSQL(sqlQuery, this.connection, (err, rows) => {
|
||||
if (err) callback(err, undefined);
|
||||
for (const row of rows) {
|
||||
console.log("Row from SQL query:", row);
|
||||
rssRecords.push(new RSSRecord(row.id, row.title, row.link, row.category));
|
||||
}
|
||||
console.log("All records:", rssRecords);
|
||||
callback(undefined, rssRecords);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user