farheen-psql-app 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "farheen-psql-app",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "index.js",
   "type": "module",
   "scripts": {

package/src/controllers/commentController.js

@@ -0,0 +1,6 @@
+import { createCommentService } from "../services/commentService.js";
+
+export const createCommentsHandler = (req, res) => {
+    const result = await createCommentService(req.body);
+    res.status(201).json(result);
+}

package/src/controllers/postController.js

@@ -0,0 +1,12 @@
+import { createPostService, getPostCommentsService } from "../services/postService.js";
+
+export const createPostHandler = (req, res) => {
+    const result = await createPostService(req.body);
+    res.status(201).json(result);
+}
+
+export const getPostCommentsHandler = (req, res) => {
+    const post_id = req.body;
+    const result = await getPostCommentsService(post_id);
+    res.status(200).json(result);
+}

package/src/database/schemas/commentSchema.js

@@ -0,0 +1,21 @@
+const commentTable = `
+CREATE TABLE IF NOT EXISTS comments (
+    id SERIAL PRIMARY KEY,
+    post_id INTEGER NOT NULL,
+    user_id INTEGER NOT NULL,
+    parent_id INTEGER NOT NULL,
+    comment VARCHAR(200) NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+
+    FOREIGN KEY(post_id)
+        REFERENCES posts(id)
+
+    FOREIGN KEY(user_id)
+        REFERENCES users(id)
+
+    FOREIGN KEY(parent_id)
+        REFERENCES comments(id)
+);
+`;
+
+export default commentTable;

package/src/database/schemas/permissionSchema.js

@@ -2,10 +2,9 @@ const permissionTable = `
 CREATE TABLE IF NOT EXISTS permissions (
     id SERIAL PRIMARY KEY,
     module VARCHAR(100) NOT NULL,
-    action VARCHAR(100) NOT NULL,
+    action JSONB NOT NULL,
     description TEXT,
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    UNIQUE(module, action)
 );
 `;
 

package/src/database/schemas/postSchema.js

@@ -0,0 +1,15 @@
+const postTable = `
+CREATE TABLE IF NOT EXISTS posts (
+    id SERIAL PRIMARY KEY,
+    user_id INTEGER NOT NULL,
+    content VARCHAR(200) NOT NULL,
+
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+
+    FOREIGN KEY(user_id)
+    REFERENCES users(id)
+    ON DELETE CASCADE
+);
+`;
+
+export default postTable;

package/src/database/schemas/roleSchema.js

@@ -3,7 +3,6 @@ CREATE TABLE IF NOT EXISTS roles (
     id SERIAL PRIMARY KEY,
     role_name VARCHAR(100) UNIQUE NOT NULL,
     description TEXT,
-    is_active BOOLEAN DEFAULT TRUE,
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );

package/src/database/schemas/userSchema.js

@@ -2,15 +2,13 @@ const userTable = `
 CREATE TABLE IF NOT EXISTS users (
     id SERIAL PRIMARY KEY,
 
-    first_name VARCHAR(100) NOT NULL,
-
-    last_name VARCHAR(100),
+    name VARCHAR(100) NOT NULL,
 
     email VARCHAR(255) UNIQUE NOT NULL,
 
     password TEXT NOT NULL,
 
-    role_id INTEGER,
+    role_id INTEGER NOT NULL,
 
     is_active BOOLEAN DEFAULT TRUE,
 

package/src/middleware/authentication.js

@@ -1,5 +1,9 @@
 export const authorization = (module, action) => {
     async (req, res, next) => {
-        const user = await U
+        if(!req.user || !req.user.permissions){
+            return res.status(403).json({ error: "Unauthorized: No access token"})
+        }
+
+        const required
     }
 }

package/src/models/comment.js

@@ -0,0 +1,17 @@
+export const addCommentQuery = `
+INSERT INTO comments (
+    user_id,
+    post_id,
+    comment,
+    parent_id,
+    created_at
+)
+VALUES (
+    $1,
+    $2,
+    $3,
+    $4,
+    NOW()
+)
+RETURNING *;
+`;

package/src/models/post.js

@@ -0,0 +1,36 @@
+export const createPostQuery = `
+INSERT INTO posts (
+    user_id,
+    content,
+    created_at
+)
+VALUES(
+    $1,
+    $2,
+    NOW()
+)
+RETURNING *;
+`;
+
+export const getAllPosts = `
+SELECT * FROM posts ORDER BY created_at ASC;
+`;
+
+export const getNestedCommentsByPost = `
+SELECT 
+
+c.id,
+c.comment,
+c.parent_id,
+u.id,
+u.name
+
+FROM comments c
+
+LEFT JOIN users u
+ON u.id = c.user_id
+
+WHERE c.post_id = $1
+
+ORDER BY created_at;
+`;

package/src/repositories/commentRepository.js

@@ -0,0 +1,7 @@
+import pool from "../config/db.js"
+import { addCommentQuery } from "../models/comment.js"
+
+export const createComment = async (data) => {
+    const result = await pool.query(addCommentQuery, [data.user_id, data.post_id, data.comment, data.parent_id]);
+    return result.rows[0];
+}

package/src/repositories/postRepository.js

@@ -0,0 +1,14 @@
+import pool from "../config/db.js";
+import { createPostQuery, getNestedCommentsByPost } from "../models/post.js";
+
+
+export const createPost = (data) => {
+    const result = await pool.query(createPostQuery, [data.user_id, data.content]);
+    return result.rows[0];
+}
+
+export const getPostComments = (post_id) => {
+    const result = await pool.query(getNestedCommentsByPost, [post_id]);
+    return result.rows;
+}
+

package/src/services/commentService.js

@@ -0,0 +1,5 @@
+import { createComment } from "../repositories/commentRepository"
+
+export const createCommentService = async (data) => {
+    return await createComment(data);
+}

package/src/services/permissionService.js

@@ -1,21 +1,13 @@
-import permissionRepository
-    from "../repositories/permissionRepository.js";
+import { createPermission, deletePermission, getAllPermissions } from "../repositories/permissionRepo.js";
 
-
-export const createPermission = async (data) => {
-
-    return await permissionRepository
-        .createPermission(data);
+export const createPermissionService = async (data) => {
+    return await createPermission(data);
 }
 
-export const getAllPermissions = async () => {
-
-    return await permissionRepository
-        .getAllPermissions();
+export const getAllPermissionsService = async () => {
+    return await getAllPermissions();
 }
 
-export const deletePermission = async (id) => {
-
-    return await permissionRepository
-        .deletePermission(id);
+export const deletePermissionService = async (id) => {
+    return await deletePermission(id);
 }

package/src/services/postService.js

@@ -0,0 +1,35 @@
+import { getAllRolesQuery } from "../models/role";
+import { createPost, getPostComments } from "../repositories/postRepository.js";
+import { createRole } from "../repositories/roleRepository.js";
+
+export const createPostService = async (data) => {
+    return await createPost(data);
+}
+
+export const getPostCommentsService = async (post_id) => {
+
+    const comments = await getPostComments(post_id);
+    return buildCommentTree(comments);
+}
+
+const buildCommentTree = (comments) => {
+    const commentMap = {};
+    const rootComment = [];
+
+    comments.forEach(comment => {
+        commentMap[comment.id] = {
+            ...comment,
+            replies: []
+        }
+    });
+
+    comments.forEach(comment => {
+        if (comment.parent_id) {
+            commentMap[comment.parent_id].replies.push(comment.id)
+        } else {
+            rootComment.push(commentMap[comment.id])
+        }
+    });
+
+    return rootComment;
+}