chore: cleanup of code
This commit is contained in:
Your Name
parent
28a441d98a
commit
ae51fc763c
3 changed files with 264 additions and 275 deletions
132
db.js
132
db.js
|
|
@ -44,13 +44,13 @@ function applyMigrations() {
|
|||
// | | _____| || |___ | | | |
|
||||
// |_______||_______||_______||___| |_|
|
||||
|
||||
function createUser(db, username, hashedPassword) {
|
||||
function createUser(username, hashedPassword) {
|
||||
return db
|
||||
.prepare("INSERT INTO users (username, password) VALUES (?, ?)")
|
||||
.run(username, hashedPassword).lastInsertRowid;
|
||||
}
|
||||
|
||||
function getUser(db, username) {
|
||||
function getUser(username) {
|
||||
return db.prepare("SELECT * from users where username = ?").get(username);
|
||||
}
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ function getDbInstance(dbId) {
|
|||
return dbInstance;
|
||||
}
|
||||
|
||||
function getAllRoutes(db) {
|
||||
function getAllRoutes() {
|
||||
return db
|
||||
.prepare(
|
||||
`
|
||||
|
|
@ -100,7 +100,7 @@ function getTemplater(structId) {
|
|||
return path;
|
||||
};
|
||||
etaInstance.readFile = function (templateAlias) {
|
||||
return getTemplateContentByName(db, structId, templateAlias).content;
|
||||
return getTemplateContentByName(structId, templateAlias).content;
|
||||
};
|
||||
templateCache.set(structId, etaInstance);
|
||||
}
|
||||
|
|
@ -108,15 +108,15 @@ function getTemplater(structId) {
|
|||
return etaInstance;
|
||||
}
|
||||
|
||||
function getStructures(db) {
|
||||
function getStructures() {
|
||||
return db.prepare("SELECT * from structures").all();
|
||||
}
|
||||
|
||||
function getStructure(db, id) {
|
||||
function getStructure(id) {
|
||||
return db.prepare("SELECT * from structures where ID = ?").get(id);
|
||||
}
|
||||
|
||||
function createStructure(db, name, userId) {
|
||||
function createStructure(name, userId) {
|
||||
const stmt = db.prepare(
|
||||
"INSERT INTO structures (name, user_id) VALUES (?, ?)",
|
||||
);
|
||||
|
|
@ -124,7 +124,7 @@ function createStructure(db, name, userId) {
|
|||
return info.lastInsertRowid; // Returns the structure_id of the newly created structure
|
||||
}
|
||||
|
||||
function createRoute(db, verb, path, structureId, handler) {
|
||||
function createRoute(verb, path, structureId, handler) {
|
||||
path = encodeURI(path);
|
||||
|
||||
const stmt = db.prepare(
|
||||
|
|
@ -134,60 +134,40 @@ function createRoute(db, verb, path, structureId, handler) {
|
|||
const routeId = info.lastInsertRowid; // Get the newly created route ID
|
||||
|
||||
if (verb !== 'GET') {
|
||||
createScaffoldPage(db, routeId);
|
||||
createScaffoldPage(routeId);
|
||||
}
|
||||
|
||||
return routeId; // Returns the route_id of the newly created route
|
||||
}
|
||||
|
||||
function getRoutes(db, structureId) {
|
||||
const query = `
|
||||
SELECT
|
||||
r.*,
|
||||
s.route_prefix,
|
||||
sp.id AS scaffold_page_id,
|
||||
sp.content AS scaffold_page_content,
|
||||
sp2.id AS scaffold_params_id,
|
||||
sp2.query_params,
|
||||
sp2.url_params
|
||||
FROM routes r
|
||||
LEFT JOIN scaffold_pages sp ON r.id = sp.route_id
|
||||
LEFT JOIN scaffold_params sp2 ON r.id = sp2.route_id
|
||||
LEFT JOIN structures s ON r.structure_id = s.id
|
||||
WHERE r.structure_id = ?
|
||||
ORDER BY sp.created_at DESC, sp2.created_at DESC
|
||||
`;
|
||||
const ROUTE_SELECT = `
|
||||
SELECT
|
||||
r.*,
|
||||
s.route_prefix,
|
||||
sp.id AS scaffold_page_id,
|
||||
sp.content AS scaffold_page_content,
|
||||
sp2.id AS scaffold_params_id,
|
||||
sp2.query_params,
|
||||
sp2.url_params
|
||||
FROM routes r
|
||||
LEFT JOIN scaffold_pages sp ON r.id = sp.route_id
|
||||
LEFT JOIN scaffold_params sp2 ON r.id = sp2.route_id
|
||||
LEFT JOIN structures s ON r.structure_id = s.id
|
||||
`;
|
||||
|
||||
return db.prepare(query).all(structureId);
|
||||
function getRoutes(structureId) {
|
||||
return db
|
||||
.prepare(`${ROUTE_SELECT} WHERE r.structure_id = ? ORDER BY sp.created_at DESC, sp2.created_at DESC`)
|
||||
.all(structureId);
|
||||
}
|
||||
|
||||
function getRoute(db, routeId) {
|
||||
const query = `
|
||||
SELECT
|
||||
r.*,
|
||||
s.route_prefix,
|
||||
sp.id AS scaffold_page_id,
|
||||
sp.content AS scaffold_page_content,
|
||||
sp2.id AS scaffold_params_id,
|
||||
sp2.query_params,
|
||||
sp2.url_params
|
||||
FROM routes r
|
||||
LEFT JOIN scaffold_pages sp ON r.id = sp.route_id
|
||||
LEFT JOIN scaffold_params sp2 ON r.id = sp2.route_id
|
||||
LEFT JOIN structures s ON r.structure_id = s.id
|
||||
WHERE r.id = ?
|
||||
ORDER BY sp.created_at DESC, sp2.created_at DESC
|
||||
LIMIT 1
|
||||
`;
|
||||
|
||||
return db.prepare(query).get(routeId);
|
||||
function getRoute(routeId) {
|
||||
return db
|
||||
.prepare(`${ROUTE_SELECT} WHERE r.id = ? ORDER BY sp.created_at DESC, sp2.created_at DESC LIMIT 1`)
|
||||
.get(routeId);
|
||||
}
|
||||
|
||||
function defaultEndpointForRoute(db, routeId) {
|
||||
|
||||
}
|
||||
|
||||
function updateRoute(db, route) {
|
||||
function updateRoute(route) {
|
||||
const fields = [
|
||||
"verb",
|
||||
"path",
|
||||
|
|
@ -204,7 +184,7 @@ function updateRoute(db, route) {
|
|||
db.prepare(sql).run(...values);
|
||||
}
|
||||
|
||||
function updateDb(db, appDb) {
|
||||
function updateDb(appDb) {
|
||||
const fields = ["name", "library"];
|
||||
const values = fields.map((field) => appDb[field]);
|
||||
const placeholders = fields.map((field) => `${field} = ?`).join(", ");
|
||||
|
|
@ -214,7 +194,7 @@ function updateDb(db, appDb) {
|
|||
db.prepare(sql).run(...values);
|
||||
}
|
||||
|
||||
function updateStruct(db, struct) {
|
||||
function updateStruct(struct) {
|
||||
const fields = ["name", "route_prefix", "head_injection"];
|
||||
const values = fields.map((field) => struct[field]);
|
||||
const placeholders = fields.map((field) => `${field} = ?`).join(", ");
|
||||
|
|
@ -224,7 +204,7 @@ function updateStruct(db, struct) {
|
|||
db.prepare(sql).run(...values);
|
||||
}
|
||||
|
||||
function updateTemplate(db, template) {
|
||||
function updateTemplate(template) {
|
||||
const fields = ["content", "name", "test_object"];
|
||||
const values = fields.map((field) => template[field]);
|
||||
const placeholders = fields.map((field) => `${field} = ?`).join(", ");
|
||||
|
|
@ -234,17 +214,17 @@ function updateTemplate(db, template) {
|
|||
db.prepare(sql).run(...values);
|
||||
}
|
||||
|
||||
function getTemplates(db, structureId) {
|
||||
function getTemplates(structureId) {
|
||||
return db
|
||||
.prepare("SELECT * from templates where structure_id = ?")
|
||||
.all(structureId);
|
||||
}
|
||||
|
||||
function getTemplate(db, templateId) {
|
||||
function getTemplate(templateId) {
|
||||
return db.prepare("SELECT * from templates where id = ?").get(templateId);
|
||||
}
|
||||
|
||||
function getTemplateContentByName(db, structId, name) {
|
||||
function getTemplateContentByName(structId, name) {
|
||||
return db
|
||||
.prepare(
|
||||
"SELECT content from templates where structure_id = ? AND name = ?",
|
||||
|
|
@ -252,7 +232,7 @@ function getTemplateContentByName(db, structId, name) {
|
|||
.get(structId, name);
|
||||
}
|
||||
|
||||
function createTemplate(db, structureId, name, content, testObjectString) {
|
||||
function createTemplate(structureId, name, content, testObjectString) {
|
||||
return db
|
||||
.prepare(
|
||||
"INSERT INTO templates (structure_id, name, content, test_object) VALUES (?, ?, ?, ?)",
|
||||
|
|
@ -260,7 +240,7 @@ function createTemplate(db, structureId, name, content, testObjectString) {
|
|||
.run(structureId, name, content, testObjectString).lastInsertRowid;
|
||||
}
|
||||
|
||||
function getDbsForStructure(db, structureId) {
|
||||
function getDbsForStructure(structureId) {
|
||||
return db
|
||||
.prepare(
|
||||
`SELECT
|
||||
|
|
@ -280,7 +260,7 @@ function getDbsForStructure(db, structureId) {
|
|||
.all(structureId);
|
||||
}
|
||||
|
||||
function getDb(db, dbId) {
|
||||
function getDb(dbId) {
|
||||
return db
|
||||
.prepare(
|
||||
`SELECT *
|
||||
|
|
@ -291,7 +271,7 @@ function getDb(db, dbId) {
|
|||
.get(dbId);
|
||||
}
|
||||
|
||||
function getDbForStructure(db, structureId, dbId) {
|
||||
function getDbForStructure(structureId, dbId) {
|
||||
return db
|
||||
.prepare(
|
||||
`SELECT *
|
||||
|
|
@ -304,7 +284,7 @@ function getDbForStructure(db, structureId, dbId) {
|
|||
.get(structureId, dbId);
|
||||
}
|
||||
|
||||
function createDb(db, structId, name) {
|
||||
function createDb(structId, name) {
|
||||
const transaction = db.transaction(() => {
|
||||
const insertDbStmt = db.prepare(`
|
||||
INSERT INTO dbs (name, structure_id)
|
||||
|
|
@ -328,7 +308,7 @@ function createDb(db, structId, name) {
|
|||
return transaction();
|
||||
}
|
||||
|
||||
function attachDb(db, structId, dbId, alias) {
|
||||
function attachDb(structId, dbId, alias) {
|
||||
const insertStructureDbStmt = db.prepare(`
|
||||
INSERT INTO structure_dbs (db_id, structure_id, alias)
|
||||
VALUES (?, ?, ?)
|
||||
|
|
@ -336,7 +316,7 @@ function attachDb(db, structId, dbId, alias) {
|
|||
insertStructureDbStmt.run(dbId, structId, alias);
|
||||
}
|
||||
|
||||
function getFilesForStruct(db, structureId) {
|
||||
function getFilesForStruct(structureId) {
|
||||
let test = db
|
||||
.prepare("SELECT * FROM files WHERE structure_id = ? ORDER BY id DESC")
|
||||
.all(structureId);
|
||||
|
|
@ -344,11 +324,11 @@ function getFilesForStruct(db, structureId) {
|
|||
return test;
|
||||
}
|
||||
|
||||
function getFile(db, fileId) {
|
||||
function getFile(fileId) {
|
||||
return db.prepare("SELECT * FROM files WHERE id = ?").get(fileId);
|
||||
}
|
||||
|
||||
function createFile(db, structure_id, name, filePath, mime_type, mime_subtype) {
|
||||
function createFile(structure_id, name, filePath, mime_type, mime_subtype) {
|
||||
return db
|
||||
.prepare(
|
||||
"INSERT INTO files (structure_id, name, path, mime_type, mime_subtype) VALUES (?, ?, ?, ?, ?)",
|
||||
|
|
@ -468,7 +448,7 @@ function cloneStructure(
|
|||
return transaction();
|
||||
}
|
||||
|
||||
function createLog(db, structureId, routeId, content, error = false) {
|
||||
function createLog(structureId, routeId, content, error = false) {
|
||||
const stmt = db.prepare(
|
||||
"INSERT INTO logs (error, structure_id, route_id, content) VALUES (?, ?, ?, ?)",
|
||||
);
|
||||
|
|
@ -476,7 +456,7 @@ function createLog(db, structureId, routeId, content, error = false) {
|
|||
return info.lastInsertRowid; // Returns the log_id of the newly created log
|
||||
}
|
||||
|
||||
function getLogsByRoute(db, routeId) {
|
||||
function getLogsByRoute(routeId) {
|
||||
return db
|
||||
.prepare(
|
||||
"SELECT * FROM logs WHERE route_id = ? ORDER BY created_at DESC LIMIT 50",
|
||||
|
|
@ -485,7 +465,7 @@ function getLogsByRoute(db, routeId) {
|
|||
.reverse();
|
||||
}
|
||||
|
||||
function getNewLogsByRoute(db, routeId, since) {
|
||||
function getNewLogsByRoute(routeId, since) {
|
||||
return db
|
||||
.prepare(
|
||||
"SELECT * FROM logs WHERE route_id = ? AND id > ? ORDER BY created_at DESC",
|
||||
|
|
@ -493,7 +473,7 @@ function getNewLogsByRoute(db, routeId, since) {
|
|||
.all(routeId, since);
|
||||
}
|
||||
|
||||
function getMostRecentLogIdByRoute(db, routeId) {
|
||||
function getMostRecentLogIdByRoute(routeId) {
|
||||
const result = db
|
||||
.prepare("SELECT MAX(id) AS id FROM logs WHERE route_id = ?")
|
||||
.get(routeId);
|
||||
|
|
@ -505,9 +485,9 @@ function buildScaffoldUrl(endpoint, urlParams, queryString) {
|
|||
return queryString ? `${populatedUrl}?${queryString}` : populatedUrl;
|
||||
}
|
||||
|
||||
function createScaffoldPage(db, routeId, content=null) {
|
||||
function createScaffoldPage(routeId, content=null) {
|
||||
if (!content) {
|
||||
const route = getRoute(db, routeId)
|
||||
const route = getRoute(routeId)
|
||||
const endpoint = buildScaffoldUrl(route.path, route.url_params, route.query_params);
|
||||
content = getDefaultScaffoldContentByVerb(endpoint, route.verb);
|
||||
console.log("gabga", content, route, endpoint)
|
||||
|
|
@ -520,14 +500,14 @@ function createScaffoldPage(db, routeId, content=null) {
|
|||
return info.lastInsertRowid; // Returns the scaffold_page id of the newly created scaffold page
|
||||
}
|
||||
|
||||
function getLatestScaffoldPage(db, routeId) {
|
||||
function getLatestScaffoldPage(routeId) {
|
||||
const stmt = db.prepare(
|
||||
"SELECT * FROM scaffold_pages WHERE route_id = ? ORDER BY created_at DESC LIMIT 1"
|
||||
);
|
||||
return stmt.get(routeId);
|
||||
}
|
||||
|
||||
function updateScaffoldPage(db, scaffoldPage) {
|
||||
function updateScaffoldPage(scaffoldPage) {
|
||||
const fields = ["content"];
|
||||
const values = fields.map((field) => scaffoldPage[field]);
|
||||
const placeholders = fields.map((field) => `${field} = ?`).join(", ");
|
||||
|
|
@ -582,7 +562,7 @@ function generateModifyForm(endpoint, verb) {
|
|||
<body>
|
||||
<h1>Test ${verb} Request</h1>
|
||||
|
||||
<form action="<%= it.route(${endpoint}) %>" method="${verb}">
|
||||
<form action="<%= it.route("${endpoint}") %>" method="${verb}">
|
||||
<!-- Add your form fields here to test ${verb.toLowerCase()} requests. -->
|
||||
<label for="testField">Test Field:</label>
|
||||
<input type="text" id="testField" name="testField" required>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue