guillm/wf-radio
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: guillm:072fbbd8736a690bbe5fa65a13ce6fabc29373c3
Branches Tags
guillm:main
..
compare: guillm:0aa9e663ff416d286eef2bb2ab7da7985be1add3
Branches Tags
guillm:main

No commits in common. "072fbbd8736a690bbe5fa65a13ce6fabc29373c3" and "0aa9e663ff416d286eef2bb2ab7da7985be1add3" have entirely different histories.
072fbbd873 ... 0aa9e663ff

3 changed files with 46 additions and 217 deletions
Show stats Expand all files Collapse all files

16
src/database/index.js
View file

@ -34,14 +34,14 @@ async function initDatabase() {
// --- Users ---
// Uers table
db.exec(`CREATE TABLE IF NOT EXISTS Users (
username TINYTEXT PRIMARY KEY,
display_name TINYTEXT NOT NULL,
email TINYTEXT NOT NULL,
password TINYTEXT NOT NULL,
profile_picture LONGTEXT,
settings LONGTEXT,
);`);
db.exec("CREATE TABLE IF NOT EXISTS Users ( \
username TINYTEXT PRIMARY KEY, \
display_name TINYTEXT, \
email TINYTEXT,\
password TINYTEXT,\
profile_picture LONGTEXT,\
settings LONGTEXT, \
);");
// --- Mods ---

136
src/models/mod.js
View file

@ -2,11 +2,8 @@ const { getDatabase } = require('../database/index');
const AppError = require('../utils/appError');
const db = getDatabase();
// --- Get ---
async function getAllMods() {
return await db.query("SELECT name, display_name, author, description FROM Mods");
return db.query("SELECT name FROM Mods");
}
async function getModByName(name) {
@ -14,136 +11,39 @@ async function getModByName(name) {
}
async function getFullModInfos(name) {
// Query
const base_infos = db.query(`SELECT * FROM Mods WHERE name = ?`, [name]);
const other_infos = db.query(`SELECT full_description, license, links, creation_date
FROM ModInfos WHERE name = ?`, [name]);
// Merge
const res = {...await base_infos, ...await other_infos};
return res;
}
async function exists(name) {
return db.exists("Mods", "name", name);
}
async function createMod(mod_data) {
// --- Create ---
async function createMod(name, display_name, author, description, mod_infos) {
// Extract infos
const { full_description, license, links, creation_date, tags } = mod_infos;
// Mods table
await db.prepare("INSERT INTO Mods (name, display_name, author, description) \
VALUES (?, ?, ?, ?)",
[name, display_name, author, description]);
// ModInfos table
await db.prepare(`INSERT INTO ModInfos (mod, full_description, license, links, creation_date)
VALUES (?, ?, ?, ?, ?)`,
[name, full_description, license.type, links.toString(), creation_date]);
// Tags
const tags_proc = updateTags(name, tags, []);
// License
if (license_type == "custom") {
await db.prepare(`UPDATE ModInfos SET custom_license = ?
WHERE mod = ?`,
[license.content, name]);
}
// Await
await tags_proc;
const { name, displayName, author, versions, otherInfos } = mod_data;
const { description, links, tags, screenshots, license, changelogs, counts } = otherInfos;
await db.prepare("INSERT INTO mods (name, display_name, author) \
VALUES (?, ?, ?, ?)", [name, displayName, author]);
// db.prepare("INSERT INTO modsDescription (Name, Description, Links, Tags, Screenshots, License, Changelogs, Counts) \
// VALUES (?, ?, ?, ?, ?, ?, ?, ?)", [name, description, links, tags, screenshots, license, changelogs, counts]);
return;
}
async function addVersion(version_number, channel, changelog, release_date, game_version, platform, environment, url) {
await db.prepare(`INSERT INTO ModVersions (version_number, channel, changelog, release_date, game_version, platform, url)
VALUES (?, ?, ?, ?, ?, ?, ?);`,
[version_number, channel, changelog, release_date, game_version, platform, url]);
return;
}
async function AddTags(tags) {
// Add asynchronously
const promises = tags.map(async (mod) => {
db.query(`INSERT INTO UserFavoriteMods (username, mod)
VALUES (?, ?);`,
[username, mod]);
});
await Promise.all(promises);
return;
}
// --- Update ---
async function updateMod(name, display_name, author, description) {
if (display_name) {
await updateModAttributes(name, "display_name", display_name);
}
if (author) {
await updateModAttribute(nale, "author", author);
}
if (profile_picture) {
await updateUserAttribute(name, "description", description)
}
}
async function updateModAttribute(name, attribute, value) {
await db.prepare(`UPDATE Mods SET ${attribute} = ? WHERE name = ?`, [value, name]);
return;
}
async function updateModInfosAttribute(name, attribute, value) {
await db.prepare(`UPDATE ModInfos SET ${attribute} = ? WHERE name = ?`, [value, name]);
return;
}
// --- Delete ---
async function deleteMod(name) {
await db.prepare("DELETE FROM Mods WHERE name = ?", [name]);
console.log("WARNING: using a WIP function : deleteMod (models/mods.js)");
db.prepare("DELETE FROM Mods WHERE name = ?", [name]);
// db.prepare("DELETE FROM modsDescription WHERE Name = ?", [name]);
return;
}
async function deleteVersion(name, version_number, channel, game_version, platform, environment) {
await db.prepare(`DELETE FROM ModVersions WHERE name = ?
AND version_number = ?
AND channel = ?
AND game_version = ?
AND platform = ?
AND environment = ?;`,
[name, version_number, channel, game_version, platform, environment]);
return;
}
// --- WIP ---
async function deleteTags(tags) {
// Remove asynchronously
const promises = tags.map(async (mod) => {
db.query(`DELETE FROM UserFavoriteMods
WHERE username = ? AND mod = ?;`, [username, mod]);
});
await Promise.all(promises);
return;
async function updateMod(mod_data) {
console.log("WARNING: using a WIP function : updateMod (models/mods.js)");
throw new AppError(501, "Not implemented");
// const { name, description } = mod_data;
// return db.query("INSERT INTO mods (name, description) VALUES (?, ?)", [name, description]);
}
// --- Exports ---
module.exports = { getAllMods, getModByName, createMod, deleteMod, exists }

111
src/models/user.js
View file

@ -2,118 +2,47 @@ const { getDatabase } = require('../database/index');
const AppError = require('../utils/appError');
const db = getDatabase();
// --- Get ---
async function getAllUsers(name) {
return db.query("SELECT username, display_name, email, profile_picture FROM Users WHERE username = ?", [name]);
async function getAllUsers() {
return db.query("SELECT * FROM users");
}
async function getUserByName(name) {
return await db.query("SELECT username, display_name, profile_picture FROM Users WHERE username = ?;", [name]);
return await db.query("SELECT * FROM Users WHERE username = ?;", [name]);
}
async function getUserByEmail(email) {
return await db.query("SELECT email, username, display_name, FROM Users WHERE email = ?;", [email]);
}
async function getFullUserInfos(name) {
return await db.query("SELECT username, display_name, email, profile_picture, settings FROM Users WHERE username = ?;", [name]);
}
async function getUserPassword(name) {
return await db.query("SELECT username, password FROM Users WHERE username = ?;", [name]);
return await db.query("SELECT * FROM Users WHERE email = ?;", [email]);
}
async function exists(name) {
return await db.exists("Users", "username", name);
return db.exists("Users", "username", name);
}
async function createUser(user_data) {
// --- Create ---
const { name, email, password, displayName, profilePicture, favorites, preferences } = user_data;
async function createUser( username, email, password, displayName, profilePicture, settings ) {
// Create user
await db.prepare("INSERT INTO Users (username, email, password, display_name) \
VALUES (?, ?, ?, ?)", [username, email, password, displayName]);
// Handle nullable fields
if (profilePicture) {
await updateUserAttribute(username, "profile_picture", profilePicture);
}
if (settings) {
await updateUserAttribute(username, "settings", settings);
}
//TODO breakdown to handle partial updates
await db.prepare("INSERT INTO Users (username, email, password, display_name, profile_picture, favorites, preferences) \
VALUES (?, ?, ?, ?)", [name, email, password, displayName, profilePicture, favorites, preferences]);
return;
}
// --- Update ---
async function updateUser(username, display_name, email, profile_picture, settings) {
if (display_name) {
await updateUserAttribute(username, "display_name", display_name);
}
if (email) {
await updateUserAttribute(username, "email", email);
}
if (profile_picture) {
await updateUserAttribute(username, "profile_picture", profile_picture)
}
if (settings) {
await updateUserAttribute(username, "settings", settings);
}
}
async function updateUserPassword(username, password) {
await db.prepare(`UPDATE Users SET password = ? WHERE username = ?`, [password, username]);
}
async function updateUserFavoriteMods(username, new_favs, deleted_favs) {
// Delete / Add asynchronously
const promises_new = new_favs.map(async (mod) => {
db.query(`INSERT INTO UserFavoriteMods
(username, mod) VALUES (?, ?);`,
[username, mod]);
});
const promises_deleted = deleted_favs.map(async (mod) => {
db.query(`DELETE FROM UserFavoriteMods
WHERE username = ? AND mod = ?;`, [username, mod]);
});
// Await
await Promise.all(promises_new);
await Promise.all(promises_deleted);
async function deleteUser(name) {
await db.prepare("DELETE FROM Users WHERE username = ?", [name]);
return;
}
async function updateUserAttribute(username, attribute, value) {
await db.prepare(`UPDATE Users SET ${attribute} = ? WHERE username = ?`, [value, username]);
return;
// --- WIP ---
async function updateUser(user_data) {
console.log("WARNING: using a WIP function : updateUser (userels/users.js)");
throw new AppError(501, "Not implemented");
// const { name, description } = user_data;
// return db.query("INSERT INTO users (name, description) VALUES (?, ?)", [name, description]);
}
// --- Delete ---
async function deleteUser(username) {
await db.prepare("DELETE FROM Users WHERE username = ?", [username]);
return;
}
// --- Exports ---
module.exports = { getAllUsers, getUserByName, getUserByEmail, getFullUserInfos, getUserPassword,
createUser,
updateUser, updateUserFavoriteMods,
deleteUser,
exists }
module.exports = { getAllUsers, getUserByName, getUserByEmail, createUser, deleteUser, exists }