From 7a6152be511c0f6dda3465b473ae022732c09672 Mon Sep 17 00:00:00 2001 From: Esad Mustafoski Date: Thu, 7 Nov 2024 19:29:35 +0100 Subject: [PATCH] Combined functions, Changed some items --- database/create_db.ts | 84 ++++++++++++++-------------- database/esp-projekt.sqlite | Bin 20480 -> 20480 bytes database/utils.ts | 108 +++++++++++++++++++++++++++++------- src/router/index.ts | 2 + tests/api.test.ts | 7 ++- tests/db.test.ts | 12 ++-- 6 files changed, 143 insertions(+), 70 deletions(-) diff --git a/database/create_db.ts b/database/create_db.ts index c39a4b2..964c378 100644 --- a/database/create_db.ts +++ b/database/create_db.ts @@ -14,45 +14,47 @@ const _dirname: string = dirname(fromFileUrl(import.meta.url)); const dbPath: string = join(_dirname, "../database/esp-projekt.sqlite"); const db = new DB(dbPath); -db.execute(` - CREATE TABLE IF NOT EXISTS accounts ( - user_id INTEGER PRIMARY KEY AUTOINCREMENT, - user_group TEXT, - bio TEXT, - displayname TEXT, - username TEXT, - user_email TEXT, - password TEXT, - firstname TEXT, - surname TEXT, - account_created TEXT, - blocked_users TEXT, - followers TEXT, - following TEXT, - contacts TEXT - ) +export function createDatabase(): void { + db.execute(` + CREATE TABLE IF NOT EXISTS accounts ( + uuid INTEGER PRIMARY KEY AUTOINCREMENT, + user_group TEXT, + user_bio TEXT, + user_displayname TEXT, + user_username TEXT, + user_e-mail TEXT, + password TEXT, + firstname TEXT, + surname TEXT, + account_created TEXT, + followers ANY, + following ANY, + contacts ANY + ) + + CREATE TABLE IF NOT EXISTS posts ( + posts_uuid INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER, + created_at TEXT, + post_text TEXT, + likes INTEGER, + comments INTEGER + ) - CREATE TABLE IF NOT EXISTS posts ( - posts_uuid INTEGER PRIMARY KEY AUTOINCREMENT, - user_id INTEGER, - created_at TEXT, - post_text TEXT, - likes INTEGER, - comments INTEGER - ) - - CREATE TABLE IF NOT EXISTS comments ( - comment_id INTEGER PRIMARY KEY AUTOINCREMENT, - post_id INTEGER, - user_id INTEGER, - created_at TEXT, - comment_text TEXT - ) -`); + CREATE TABLE IF NOT EXISTS comments ( + commentd_id INTEGER PRIMARY KEY AUTOINCREMENT, + post_id INTEGER, + author_user_id INTEGER, + date_created_at TEXT, + text TEXT, + likes INTEGER + ) + `); +} // Sample data generated using online generators export function insertSampleData(): void { - db.query(`INSERT INTO accounts (user_group, bio, displayname, username, user_email, password, firstname, surname, account_created, blocked_users, followers, following, contacts) VALUES + db.query(`INSERT INTO accounts (user_group, user_bio, user_displayname, user_username, user_email, password, firstname, surname, account_created, followers, following, contacts) VALUES ('admin', 'Admin bio', 'Admin User', 'admin', 'admin@example.com', 'hashedpass1', 'Admin', 'User', '2024-01-01', '[]', '[]', '[]', '[]'), ('user', 'I love coding!', 'John Dev', 'johndev', 'john@example.com', 'hashedpass2', 'John', 'Smith', '2024-01-02', '[]', '[3,4]', '[1,2]', '[]'), ('user', 'Photography enthusiast', 'Alice', 'alice_photo', 'alice@example.com', 'hashedpass3', 'Alice', 'Johnson', '2024-01-03', '[5]', '[1]', '[2]', '[]') @@ -65,11 +67,11 @@ export function insertSampleData(): void { (3, '2024-01-16 14:20:00', 'Posted my new photo collection', 15, 4) `); - db.query(`INSERT INTO comments (post_id, user_id, created_at, comment_text) VALUES - (1, 2, '2024-01-15 10:05:00', 'Great post!'), - (1, 3, '2024-01-15 10:10:00', 'Very informative'), - (2, 3, '2024-01-15 11:35:00', 'Nice feature'), - (3, 1, '2024-01-16 09:20:00', 'TypeScript is awesome'), - (4, 2, '2024-01-16 14:25:00', 'Beautiful photos!') + db.query(`INSERT INTO comments (post_id, author_user_id, date_created_at, text, likes) VALUES + (1, 2, '2024-01-15 10:05:00', 'Great post!', 3), + (1, 3, '2024-01-15 10:10:00', 'Very informative', 2), + (2, 3, '2024-01-15 11:35:00', 'Nice feature', 4), + (3, 1, '2024-01-16 09:20:00', 'TypeScript is awesome', 5), + (4, 2, '2024-01-16 14:25:00', 'Beautiful photos!', 6) `); }; \ No newline at end of file diff --git a/database/esp-projekt.sqlite b/database/esp-projekt.sqlite index 9d23a60d36c35f2255211a777179d0fbe2ea79e2..8674e2378be561efbe20be0c8157e4c991b3ebf0 100644 GIT binary patch delta 955 zcmZvaO>fgM0EXj!tP5LWqG`&ZOgO3#nrOSE=>{!AqJWq-Bs6J^OH@JDx{F7?NSuvw zpgVE|aYwr%PE&utegHoJi5nOG1KI`K9s7_b#g3!AuV24Ua&QO^4#B6gHY-U|k&OZy zfQ{+TRa=>r>hIqw>?uF93yyrO$W>6%7Z$+BJL6vp0^<|42%sbs>ahgBLR&o^YuAs| zQIc1s`IcT;s_127ZcfWmoNRazjdl_@_J#9CS)6^E)^~ej;C~TOGX3ex}rtMf=r_pt~B*!ur7s|ED{75%+U4*V7Kib2n z7xhWFV{k8eg7`TU{;iDe z%OwfeYXIc`JFOLDHQNodZJHZVN^u_rLlokDB)~ETzK?s9L?JA+rnz|)$hiwhi znRz`+De|$Kglr3UJIW|}F^utMFCj6VUMZC%+3t)0II}Jz%WB&^_pyh2ZxDA-kE9}e zfL)p;_*%X-#f__%ecZ&ZrzBySF+25XV4Uz@C15~zjAE`?~BV=y$jVGs}1bhh3%QtY_rQWU*cqlNH~a+ cz@=ml=WYX`u7LBi3$@A5zM3$Wf|8N{2UX+zE&u=k delta 124 zcmZozz}T>Wae}lU2Ll5GD-g2)F(VMOPt-ByyuukWvPL&5Q=W_$N8A^71`n;6KejnLn6chVL0r P^a|hRXL@piOi(2NzX= { let rows: Row[]; try { - if (user_uuid === undefined) { - rows = await db.query(`SELECT * FROM posts`); - } else { + try { + if (user_uuid === undefined) { + rows = await db.query(`SELECT * FROM posts`); + } else { rows = await db.query( - `SELECT * FROM posts WHERE user_id = ${user_uuid}`, + `SELECT * FROM posts WHERE user_id = ${user_uuid}`, ); } + } catch (error) { + console.error("Error fetching posts", error, "User UUID:", user_uuid); + return []; + } for (const row of rows) { const [ @@ -229,30 +243,80 @@ async function getAllUserInfoByID(user_id: number) { const data_result_post: Array = []; const data_result_comments: Array = []; - let rowsAccount: Row[] = []; - let rowsPost: Row[] = []; - let rowsComments: Row[] = []; - try { const [rowsAccount, rowsPost, rowsComments] = await Promise.all([ - db.query('SELECT * FROM accounts WHERE uuid = ?', [user_id]), - db.query('SELECT * FROM posts WHERE uuid = ?', [user_id]), - db.query('SELECT * FROM comments WHERE uuid = ?', [user_id]) + db.query("SELECT * FROM accounts WHERE uuid = ?", [user_id]), + db.query("SELECT * FROM posts WHERE uuid = ?", [user_id]), + db.query("SELECT * FROM comments WHERE uuid = ?", [user_id]), ]); - + for (const row in rowsAccount) { + const [user_id,user_group,bio,displayname,username,user_email,password, + firstname,surname,account_created,blocked_users,followers,following, + contacts, + ] = row; + data_result_account.push({ + user_id: Number(user_id), + user_group: String(user_group), + bio: String(bio), + displayname: String(displayname), + username: String(username), + user_email: String(user_email), + password: String(password), + firstname: String(firstname), + surname: String(surname), + account_created: String(account_created), + blocked_users: String(blocked_users), + followers: String(followers), + following: String(following), + contacts: String(contacts), + }); + } + for (const row in rowsPost) { + const [ + posts_uuid, + user_id, + created_at, + post_text, + likes, + comments, + ] = row; + data_result_post.push({ + posts_uuid: Number(posts_uuid), + user_id: Number(user_id), + created_at: String(created_at), + post_text: String(post_text), + likes: Number(likes), + comments: Number(comments), + }); + } + + for (const row in rowsComments) { + const [ + comment_id, + post_id, + author_user_id, + date_created_at, + text, + likes, + ] = row; + data_result_comments.push({ + comment_id: Number(comment_id), + post_id: Number(post_id), + author_user_id: Number(author_user_id), + date_created_at: String(date_created_at), + text: String(text), + likes: Number(likes), + }); + } } catch (error) { - console.error(` - Failed to get User Info ${error} - rowsAccount: ${rowsAccount} - rowsPost: ${rowsPost} - rowsComments: ${rowsComments} - `); + console.error(`Failed to get User Info ${error}`); return []; } - return { data_result_account, data_result_comments, data_result_post }; + const result = { data_result_account, data_result_comments, data_result_post }; + return result; } /** @@ -264,16 +328,18 @@ function filterForImagePosts(posts_to_filter: Array) { return []; } -function filterForVideoPosts() { +function filterForVideoPosts(posts_to_filter: Array) { return []; } -function filterForTextPosts() { +function filterForTextPosts(posts_to_filter: Array) { return []; } // Exporting all functions as this is a module export { + createDatabaseIfNotExist, + insertSamples, countPosts, filterForImagePosts, filterForTextPosts, diff --git a/src/router/index.ts b/src/router/index.ts index 96aaa60..61d668e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,3 +1,5 @@ +/// + import { createRouter, createWebHistory } from "vue-router"; // Vue components imported here. diff --git a/tests/api.test.ts b/tests/api.test.ts index b8cccab..2553749 100644 --- a/tests/api.test.ts +++ b/tests/api.test.ts @@ -13,6 +13,9 @@ import { app } from "../api/main.ts"; // +++ TESTS ------------------------------------------------------- // Deno.test("GET /api returns testAPIPoint", async () => { const request = await superoak(app); - await request.get("/api").expect(200).expect("testAPIPoint"); + await request + .get("/api") + .timeout(5000) // 5 seconds timeout + .expect(200) + .expect("testAPIPoint"); }); - diff --git a/tests/db.test.ts b/tests/db.test.ts index 99aa6af..bf5b1b8 100644 --- a/tests/db.test.ts +++ b/tests/db.test.ts @@ -72,12 +72,12 @@ Deno.test("filterForImagePosts returns array", () => { }); Deno.test("filterForVideoPosts returns array", () => { - const result = db_utils.filterForVideoPosts(); + const result = db_utils.filterForVideoPosts([]); assert(Array.isArray(result), "Should return an array"); }); Deno.test("filterForTextPosts returns array", () => { - const result = db_utils.filterForTextPosts(); + const result = db_utils.filterForTextPosts([]); assert(Array.isArray(result), "Should return an array"); }); @@ -104,13 +104,13 @@ Deno.test("getCommentsFromDB handles invalid comment_id", () => { }); // User Info Tests -Deno.test("getUserInfoByID handles invalid user_id", () => { - const result = db_utils.getAllUserInfoByID(-1); - assertEquals(result, undefined, "Should handle invalid user_id"); +Deno.test("getUserInfoByID handles invalid user_id", async () => { + const result = await db_utils.getAllUserInfoByID(-1); + assertEquals(result, [], "Should handle invalid user_id"); }); Deno.test("getPostsFromDB handles invalid user_id", async () => { - const result = await db_utils.getPostsFromDB("invalid"); + const result = await db_utils.getPostsFromDB("-1"); assertEquals(result, [], "Should handle invalid user_id"); });