danielvici123/esp-projekt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now returns userId upon Register

Browse Source
This commit is contained in:
Lynixenn
2025-03-24 21:21:45 +01:00
parent 029fc10de7
commit 9e7039c72c
4 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/helpers/post_api.ts
View File

@@ -46,9 +46,10 @@ async function api_createPost(ctx: Context): Promise<void> {
}
// Create timestamp in the format expected by the database
const createdAt = `${Math.floor(Date.now() / 1000)}-${
new Date().toLocaleDateString("en-GB").split("/").join("-")
}`;
const createdAt = `${Math.floor(Date.now() / 1000)}-${new Date()
.toLocaleDateString("en-GB")
.split("/")
.join("-")}`;
const postId = await db_utils.createPost(
userId,
@@ -143,4 +144,4 @@ export {
api_getPostById,
api_likePost,
api_updatePost,
};
};

40
database/helpers/utils/post_utils.ts
View File

@@ -6,7 +6,6 @@
* @file postUtil.ts
*/
// +++ IMPORTS ------------------------------------------------------ //
import { DB } from "https://deno.land/x/sqlite@v3.9.1/mod.ts";
import { Post } from "../interfaces.ts";
@@ -20,30 +19,41 @@ async function getPostsFromDB(db: DB, user_uuid?: string): Promise<Post[]> {
return await queryDatabase<Post>(db, query, params, mapPostRow);
}
async function getPostById(db: DB, postId: string): Promise<Post | null> {
async function getPostById(db: DB, postId: string): Promise<Post | null> {
const query = `SELECT * FROM posts WHERE posts_uuid = ?`;
const posts = await queryDatabase<Post>(db, query, [postId], mapPostRow);
return posts.length > 0 ? posts[0] : null;
}
async function createPost(db: DB, userId: string, createdAt: string, postText: string, postType: string): Promise<string> {
async function createPost(
db: DB,
userId: string,
createdAt: string,
postText: string,
postType: string,
): Promise<string> {
const query = `
INSERT INTO posts (user_id, created_at, post_text, post_type, likes, comments)
VALUES (?, ?, ?, ?, 0, 0)
`;
db.query(query, [userId, createdAt, postText, postType]);
return db.lastInsertRowId.toString();
}
async function updatePost(db: DB, postId: string, postText?: string, postType?: string): Promise<void> {
async function updatePost(
db: DB,
postId: string,
postText?: string,
postType?: string,
): Promise<void> {
let query = `UPDATE posts SET `;
const params: any[] = [];
if (postText) {
query += `post_text = ?`;
params.push(postText);
if (postType) {
query += `, post_type = ?`;
params.push(postType);
@@ -52,26 +62,26 @@ async function updatePost(db: DB, postId: string, postText?: string, postType?:
query += `post_type = ?`;
params.push(postType);
}
query += ` WHERE posts_uuid = ?`;
params.push(postId);
db.query(query, params);
}
// This function deletes the comments on the post first, then
// deletes the post to avoid errors
async function deletePost(db: DB, postId: string): Promise<void> {
// First delete all comments on the post
const deleteCommentsQuery = `DELETE FROM comments WHERE post_id = ?`;
db.query(deleteCommentsQuery, [postId]);
// Then delete the post itself
const deletePostQuery = `DELETE FROM posts WHERE posts_uuid = ?`;
db.query(deletePostQuery, [postId]);
}
// This is simplified and doesn't work as it would in a real application
// or website like twitter, this only exists as a test
async function likePost(db: DB, postId: string, userId: string): Promise<void> {
// In a real application, you would check if the user has already liked the post
// and store like relationships in a separate table. This is a simplified version.
const query = `UPDATE posts SET likes = likes + 1 WHERE posts_uuid = ?`;
db.query(query, [postId]);
}
@@ -115,4 +125,4 @@ export {
deletePost,
likePost,
filterPosts,
};
};

17
database/helpers/utils/user_utils.ts
View File

@@ -29,8 +29,7 @@ function registerUser(
surname: string,
account_created: string,
): string {
const query_user_exists =
`SELECT * FROM accounts WHERE user_username = '${user}'`;
const query_user_exists = `SELECT * FROM accounts WHERE user_username = '${user}'`;
if (!query_user_exists) {
return "noUser";
}
@@ -68,9 +67,12 @@ function registerUser(
'[]'
)`;
db.query(query_add_user);
let userId = db.query(
`SELECT user_id FROM accounts WHERE user_username = '${user}'`,
);
console.log(`New user: ${user}`);
return "newUser";
return userId;
}
/**
@@ -88,8 +90,13 @@ async function getAllUsersFromDB(db: DB): Promise<Accounts[]> {
async function getUserByUsername(db: DB, username: string): Promise<Accounts> {
const query = `SELECT * FROM accounts WHERE username = '${username}'`;
const params: string[] = [];
const result = await queryDatabase<Accounts>(db, query, params, mapAccountRow);
const result = await queryDatabase<Accounts>(
db,
query,
params,
mapAccountRow,
);
return result[0];
}
export { registerUser, getAllUsersFromDB, getUserByUsername };
export { registerUser, getAllUsersFromDB, getUserByUsername };

71
database/utils.ts
View File

@@ -1,8 +1,9 @@
/// <reference lib="deno.ns" />
/**
* @author Esad Mustafoski
* @description This file is responsible for creating Functions to easily access the Database, Intended for use in the API
*/
/// <reference lib="deno.ns" />
// +++ IMPORTS ------------------------------------------------------ //
import { DB } from "https://deno.land/x/sqlite@v3.9.1/mod.ts";
@@ -21,7 +22,7 @@ import {
// getAllUserInfoByID as getAllUserInfoByIDInternal,
// Accidentally deleted function...
registerUser as registerUserInternal,
// --- Post Functions --- //
getPostsFromDB as getPostsFromDBInternal,
getPostById as getPostByIdInternal,
@@ -30,7 +31,7 @@ import {
deletePost as deletePostInternal,
likePost as likePostInternal,
filterPosts,
// --- Comment Functions --- //
getCommentsFromDB as getCommentsFromDBInternal,
// getCommentsForComments as getCommentsForCommentsInternal,
@@ -39,7 +40,7 @@ import {
updateComment as updateCommentInternal,
deleteComment as deleteCommentInternal,
likeComment as likeCommentInternal,
// --- Chat Functions --- //
getUserChats as getUserChatsInternal,
getChatById as getChatByIdInternal,
@@ -47,7 +48,7 @@ import {
createChat as createChatInternal,
addMessageToChat as addMessageToChatInternal,
deleteChat as deleteChatInternal,
// --- Mapper Functions --- //
queryDatabase as queryDatabaseInternal,
} from "./helpers/utils/mod.ts";
@@ -89,7 +90,8 @@ export function insertSamples(): void {
// +++ ACCOUNT FUNCTIONS -------------------------------------------- //
export const getAllUsersFromDB = () => getAllUsersFromDBInternal(db);
export const getUserByUsername = (username: string) => getUserByUsernameInternal(db, username);
export const getUserByUsername = (username: string) =>
getUserByUsernameInternal(db, username);
// export const getAllUserInfoByID = (user_id: string) => getAllUserInfoByIDInternal(db, user_id);
export const registerUser = (
user: string,
@@ -101,21 +103,23 @@ export const registerUser = (
firstname: string,
surname: string,
account_created: string,
) => registerUserInternal(
db,
user,
password,
salt,
userGroup,
displayname,
user_email,
firstname,
surname,
account_created,
);
) =>
registerUserInternal(
db,
user,
password,
salt,
userGroup,
displayname,
user_email,
firstname,
surname,
account_created,
);
// +++ POST FUNCTIONS ----------------------------------------------- //
export const getPostsFromDB = (user_uuid?: string) => getPostsFromDBInternal(db, user_uuid);
export const getPostsFromDB = (user_uuid?: string) =>
getPostsFromDBInternal(db, user_uuid);
export const getPostById = (postId: string) => getPostByIdInternal(db, postId);
export const createPost = (
userId: string,
@@ -129,10 +133,12 @@ export const updatePost = (
postType?: string,
) => updatePostInternal(db, postId, postText, postType);
export const deletePost = (postId: string) => deletePostInternal(db, postId);
export const likePost = (postId: string, userId: string) => likePostInternal(db, postId, userId);
export const likePost = (postId: string, userId: string) =>
likePostInternal(db, postId, userId);
// +++ COMMENT FUNCTIONS -------------------------------------------- //
export const getCommentsFromDB = (post_id?: number) => getCommentsFromDBInternal(db, post_id);
export const getCommentsFromDB = (post_id?: number) =>
getCommentsFromDBInternal(db, post_id);
// export const getCommentsForComments = (comment_id: number) => getCommentsForCommentsInternal(db, comment_id);
export const createComment = (
postId: string,
@@ -140,18 +146,21 @@ export const createComment = (
createdAt: string,
text: string,
) => createCommentInternal(db, postId, userId, createdAt, text);
export const updateComment = (commentId: string, text: string) => updateCommentInternal(db, commentId, text);
export const deleteComment = (commentId: string) => deleteCommentInternal(db, commentId);
export const likeComment = (commentId: string, userId: string) => likeCommentInternal(db, commentId, userId);
export const updateComment = (commentId: string, text: string) =>
updateCommentInternal(db, commentId, text);
export const deleteComment = (commentId: string) =>
deleteCommentInternal(db, commentId);
export const likeComment = (commentId: string, userId: string) =>
likeCommentInternal(db, commentId, userId);
// +++ CHAT FUNCTIONS ----------------------------------------------- //
export const getUserChats = (userId: string) => getUserChatsInternal(db, userId);
export const getUserChats = (userId: string) =>
getUserChatsInternal(db, userId);
export const getChatById = (chatId: string) => getChatByIdInternal(db, chatId);
export const getChatMessages = (chatId: string) => getChatMessagesInternal(db, chatId);
export const createChat = (
participants: string[],
chatName: string,
) => createChatInternal(db, participants, chatName);
export const getChatMessages = (chatId: string) =>
getChatMessagesInternal(db, chatId);
export const createChat = (participants: string[], chatName: string) =>
createChatInternal(db, participants, chatName);
export const addMessageToChat = (
chatId: string,
senderId: string,
@@ -160,4 +169,4 @@ export const addMessageToChat = (
export const deleteChat = (chatId: string) => deleteChatInternal(db, chatId);
// +++ UTILITY FUNCTIONS -------------------------------------------- //
export { filterPosts };
export { filterPosts };