32 update prisma to represent the api spec

.github/workflows/ci.yml

@@ -1,9 +1,5 @@
 name: CI
 on: [push, pull_request]
-env:
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
-  JWT_TOKEN: ${{ secrets.JWT_TOKEN }}
-  JWT_EXPIRY: ${{ secrets.JWT_EXPIRY }}
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -14,4 +10,3 @@ jobs:
           node-version: 'lts/*'
       - run: npm ci
       - run: npx eslint src
-      - run: npx prisma migrate reset --force --skip-seed

package.json

@@ -7,7 +7,6 @@
   "scripts": {
     "start": "node src/index.js",
     "dev": "nodemon src/index.js",
-    "prepare": "husky install",
     "db-reset": "prisma migrate reset",
     "lint": "eslint .",
     "lint:fix": "eslint --fix",
@@ -36,13 +35,12 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^5.1.0",
-    "husky": "^7.0.4",
     "nodemon": "^2.0.15",
     "prettier": "^2.6.2",
-    "prisma": "^3.12.0"
+    "prisma": "^3.15.2"
   },
   "dependencies": {
-    "@prisma/client": "^3.12.0",
+    "@prisma/client": "^3.15.2",
     "bcrypt": "^5.0.1",
     "cors": "^2.8.5",
     "dotenv": "^16.0.0",

prisma/migrations/20241028210717_add_comments_to_posts/migration.sql

@@ -0,0 +1,16 @@
+-- CreateTable
+CREATE TABLE "Comment" (
+    "id" SERIAL NOT NULL,
+    "content" TEXT NOT NULL,
+    "userId" INTEGER NOT NULL,
+    "postId" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Comment_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "Comment" ADD CONSTRAINT "Comment_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Comment" ADD CONSTRAINT "Comment_postId_fkey" FOREIGN KEY ("postId") REFERENCES "Post"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20241029071000_prisma_update_24_10_29_08_03_iris_flystam/migration.sql

@@ -0,0 +1,16 @@
+/*
+  Warnings:
+
+  - Added the required column `createdAt` to the `Cohort` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `updatedAt` to the `Cohort` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `createdAt` to the `Post` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `updatedAt` to the `Post` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Cohort" ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL,
+ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL;
+
+-- AlterTable
+ALTER TABLE "Post" ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL,
+ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL;

prisma/schema.prisma

@@ -25,6 +25,7 @@ model User {
   cohortId      Int?
   cohort        Cohort?   @relation(fields: [cohortId], references: [id])
   posts         Post[]
+  comments      Comment[]
   deliveryLogs  DeliveryLog[]
 }
 
@@ -41,14 +42,29 @@ model Profile {
 model Cohort {
   id            Int           @id @default(autoincrement())
   users         User[]
+  createdAt     DateTime
+  updatedAt     DateTime
   deliveryLogs  DeliveryLog[]
 }
 
 model Post {
-  id      Int           @id @default(autoincrement())
-  content String
-  userId  Int
-  user    User          @relation(fields: [userId], references: [id])
+  id        Int           @id @default(autoincrement())
+  content   String
+  createdAt DateTime
+  updatedAt DateTime
+  userId    Int
+  user      User          @relation(fields: [userId], references: [id])
+  comments  Comment[]
+}
+
+model Comment {
+  id        Int       @id @default(autoincrement())
+  content   String
+  userId    Int
+  user      User      @relation(fields: [userId], references: [id])
+  postId    Int
+  post      Post      @relation(fields: [postId], references: [id])
+  createdAt DateTime  @default(now())
 }
 
 model DeliveryLog {

src/controllers/comment.js

@@ -0,0 +1,35 @@
+import { sendDataResponse, sendMessageResponse } from '../utils/responses.js'
+import Comment from '../domain/comment.js'
+
+export const createComment = async (req, res) => {
+  const { postId, content } = req.body
+
+  if (!postId || !content) {
+    return sendDataResponse(res, 400, {
+      message: 'Post ID and content are required'
+    })
+  }
+
+  try {
+    const comment = await Comment.create({
+      postId: parseInt(postId),
+      userId: req.user.id,
+      content
+    })
+
+    return sendDataResponse(res, 201, { comment })
+  } catch (error) {
+    return sendMessageResponse(res, 500, 'Unable to create comment')
+  }
+}
+
+export const getCommentsByPost = async (req, res) => {
+  const { postId } = req.params
+
+  try {
+    const comments = await Comment.findByPostId(parseInt(postId))
+    return sendDataResponse(res, 200, { comments })
+  } catch (error) {
+    return sendMessageResponse(res, 500, 'Unable to retrieve comments')
+  }
+}

src/domain/comment.js

@@ -0,0 +1,28 @@
+import dbClient from '../utils/dbClient.js'
+
+export default class Comment {
+  static async create({ postId, userId, content }) {
+    const newComment = await dbClient.comment.create({
+      data: {
+        postId,
+        userId,
+        content
+      },
+      include: {
+        user: { select: { id: true, email: true } },
+        post: { select: { id: true } }
+      }
+    })
+    return newComment
+  }
+
+  static async findByPostId(postId) {
+    return dbClient.comment.findMany({
+      where: { postId },
+      include: {
+        user: { select: { id: true, email: true, profile: true } }
+      },
+      orderBy: { createdAt: 'asc' }
+    })
+  }
+}

src/routes/comment.js

@@ -0,0 +1,10 @@
+import { Router } from 'express'
+import { createComment, getCommentsByPost } from '../controllers/comment.js'
+import { validateAuthentication } from '../middleware/auth.js'
+
+const router = Router()
+
+router.post('/', validateAuthentication, createComment)
+router.get('/post/:postId', validateAuthentication, getCommentsByPost)
+
+export default router

src/server.js

@@ -7,6 +7,7 @@ import cors from 'cors'
 import userRouter from './routes/user.js'
 import postRouter from './routes/post.js'
 import authRouter from './routes/auth.js'
+import commentRouter from './routes/comment.js'
 import cohortRouter from './routes/cohort.js'
 import deliveryLogRouter from './routes/deliveryLog.js'
 
@@ -25,6 +26,7 @@ app.use('/users', userRouter)
 app.use('/posts', postRouter)
 app.use('/cohorts', cohortRouter)
 app.use('/logs', deliveryLogRouter)
+app.use('/comments', commentRouter)
 app.use('/', authRouter)
 
 app.get('*', (req, res) => {