Merge pull request #33 from azeddine-hmd/dev

Major change

Author: azeddine-hmd

.gitignore

@@ -1,2 +1,3 @@
 .env
 .postgres
+.cache

backend/.gitignore

@@ -132,3 +132,5 @@ dist
 
 # upload
 uploads/
+
+.cache

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18
+FROM node:20.11.0
 
 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app
@@ -11,10 +11,8 @@ else \
 	npm ci; \
 fi
 
-COPY prisma ./prisma
-RUN npx prisma generate
-
 COPY . ./
+RUN npm install -g prisma
 
 RUN chmod +x ./scripts/entrypoint.sh
 CMD ["./scripts/entrypoint.sh"]

backend/package-lock.json

@@ -20,7 +20,7 @@
   "author": "Azeddine Hamdaoui",
   "license": "ISC",
   "dependencies": {
-    "@prisma/client": "^5.4.2",
+    "@prisma/client": "^5.8.1",
     "@socket.io/postgres-adapter": "^0.3.1",
     "bcrypt": "^5.1.0",
     "body-parser": "^1.20.2",
@@ -32,18 +32,16 @@
     "express": "^5.0.0-beta.1",
     "express-session": "^1.17.3",
     "helmet": "^7.0.0",
-    "mailgun.js": "^9.2.0",
     "multer": "^1.4.5-lts.1",
-    "node-request-interceptor": "^0.6.3",
     "nodemailer": "^6.9.4",
     "passport": "^0.6.0",
     "passport-jwt": "^4.0.1",
     "pg": "^8.11.3",
+    "redis": "^4.6.12",
     "socket.io": "^4.7.2",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.1.6"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",
@@ -62,6 +60,7 @@
     "@types/supertest": "^2.0.15",
     "@types/swagger-jsdoc": "^6.0.4",
     "@types/swagger-ui-express": "^4.1.6",
+    "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "eslint": "^8.44.0",
     "eslint-config-prettier": "^8.8.0",
@@ -74,10 +73,12 @@
     "jest-mock-extended": "^3.0.5",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.0.0",
-    "prisma": "^5.4.2",
+    "prisma": "^5.8.1",
     "socket.io-client": "^4.7.2",
     "supertest": "^6.3.3",
-    "ts-jest": "^29.1.1"
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.8",

backend/package.json

@@ -0,0 +1,48 @@
+-- CreateEnum
+CREATE TYPE "DMType" AS ENUM ('SINGLE', 'GROUP');
+
+-- CreateTable
+CREATE TABLE "DM" (
+    "id" TEXT NOT NULL,
+    "createAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "type" "DMType" NOT NULL,
+
+    CONSTRAINT "DM_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "UserDm" (
+    "id" SERIAL NOT NULL,
+    "userId" INTEGER NOT NULL,
+    "dmId" TEXT NOT NULL,
+
+    CONSTRAINT "UserDm_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Message" (
+    "id" SERIAL NOT NULL,
+    "createAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "dmId" TEXT NOT NULL,
+    "replyId" INTEGER,
+
+    CONSTRAINT "Message_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserDm_userId_dmId_key" ON "UserDm"("userId", "dmId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Message_replyId_key" ON "Message"("replyId");
+
+-- AddForeignKey
+ALTER TABLE "UserDm" ADD CONSTRAINT "UserDm_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserDm" ADD CONSTRAINT "UserDm_dmId_fkey" FOREIGN KEY ("dmId") REFERENCES "DM"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Message" ADD CONSTRAINT "Message_dmId_fkey" FOREIGN KEY ("dmId") REFERENCES "DM"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Message" ADD CONSTRAINT "Message_replyId_fkey" FOREIGN KEY ("replyId") REFERENCES "Message"("id") ON DELETE SET NULL ON UPDATE CASCADE;

backend/prisma/migrations/20240128062639_after_deletion/migration.sql

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

backend/prisma/migrations/20240128063045_enters_at_dm/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `createAt` on the `DM` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "DM" DROP COLUMN "createAt",
+ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;

backend/prisma/migrations/20240128063251_typo_in_create_at_must_be_created_at_in_dm_model/migration.sql

@@ -0,0 +1,27 @@
+/*
+  Warnings:
+
+  - Added the required column `messageContentId` to the `Message` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- CreateEnum
+CREATE TYPE "MessageContentType" AS ENUM ('TEXT', 'IMAGE');
+
+-- AlterTable
+ALTER TABLE "Message" ADD COLUMN     "messageContentId" INTEGER NOT NULL;
+
+-- CreateTable
+CREATE TABLE "MessageContent" (
+    "id" SERIAL NOT NULL,
+    "type" "MessageContentType" NOT NULL,
+    "contentText" TEXT,
+    "fileId" INTEGER,
+
+    CONSTRAINT "MessageContent_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "Message" ADD CONSTRAINT "Message_messageContentId_fkey" FOREIGN KEY ("messageContentId") REFERENCES "MessageContent"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MessageContent" ADD CONSTRAINT "MessageContent_fileId_fkey" FOREIGN KEY ("fileId") REFERENCES "File"("id") ON DELETE SET NULL ON UPDATE CASCADE;

backend/prisma/migrations/20240202135759_/migration.sql

@@ -0,0 +1,11 @@
+-- DropForeignKey
+ALTER TABLE "UserDm" DROP CONSTRAINT "UserDm_dmId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "UserDm" DROP CONSTRAINT "UserDm_userId_fkey";
+
+-- AddForeignKey
+ALTER TABLE "UserDm" ADD CONSTRAINT "UserDm_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserDm" ADD CONSTRAINT "UserDm_dmId_fkey" FOREIGN KEY ("dmId") REFERENCES "DM"("id") ON DELETE CASCADE ON UPDATE CASCADE;

backend/prisma/migrations/20240212001341_cascade_for_user_dm_table/migration.sql

@@ -0,0 +1,28 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `messageContentId` on the `Message` table. All the data in the column will be lost.
+  - A unique constraint covering the columns `[messageId]` on the table `MessageContent` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `messageId` to the `MessageContent` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Message" DROP CONSTRAINT "Message_messageContentId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "MessageContent" DROP CONSTRAINT "MessageContent_fileId_fkey";
+
+-- AlterTable
+ALTER TABLE "Message" DROP COLUMN "messageContentId";
+
+-- AlterTable
+ALTER TABLE "MessageContent" ADD COLUMN     "messageId" INTEGER NOT NULL;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "MessageContent_messageId_key" ON "MessageContent"("messageId");
+
+-- AddForeignKey
+ALTER TABLE "MessageContent" ADD CONSTRAINT "MessageContent_fileId_fkey" FOREIGN KEY ("fileId") REFERENCES "File"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MessageContent" ADD CONSTRAINT "MessageContent_messageId_fkey" FOREIGN KEY ("messageId") REFERENCES "Message"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

backend/prisma/migrations/20240220041130_reverse_message_content_relationship_with_message/migration.sql

@@ -0,0 +1,8 @@
+-- DropForeignKey
+ALTER TABLE "Message" DROP CONSTRAINT "Message_dmId_fkey";
+
+-- AlterTable
+ALTER TABLE "Message" ALTER COLUMN "dmId" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Message" ADD CONSTRAINT "Message_dmId_fkey" FOREIGN KEY ("dmId") REFERENCES "DM"("id") ON DELETE SET NULL ON UPDATE CASCADE;

backend/prisma/migrations/20240220043206_making_dm_optional_in_message_table/migration.sql

@@ -0,0 +1,5 @@
+-- DropForeignKey
+ALTER TABLE "MessageContent" DROP CONSTRAINT "MessageContent_messageId_fkey";
+
+-- AddForeignKey
+ALTER TABLE "MessageContent" ADD CONSTRAINT "MessageContent_messageId_fkey" FOREIGN KEY ("messageId") REFERENCES "Message"("id") ON DELETE CASCADE ON UPDATE CASCADE;

backend/prisma/migrations/20240220081650_/migration.sql

@@ -16,6 +16,11 @@ enum UserStatus {
     OFFLINE
 }
 
+enum DMType {
+    SINGLE
+    GROUP
+}
+
 model User {
     id          Int           @id @default(autoincrement())
     displayName String
@@ -28,6 +33,7 @@ model User {
     avatar      File?
     Codes       Codes[]
     sockets     UserSockets[]
+    userDms     UserDm[]
 
     Friend1         Friendship[]        @relation("Friend1")
     Friend2         Friendship[]        @relation("Friend2")
@@ -108,5 +114,53 @@ model File {
     createdAt    DateTime @default(now())
     updatedAt    DateTime @updatedAt
 
-    uploadedBy User @relation(fields: [uploadedById], references: [id], onDelete: Cascade)
+    uploadedBy     User             @relation(fields: [uploadedById], references: [id], onDelete: Cascade)
+    MessageContent MessageContent[]
+}
+
+model DM {
+    id        String    @id
+    createdAt DateTime  @default(now())
+    entersAt  DateTime
+    type      DMType
+    Message   Message[]
+    userDms   UserDm[]
+}
+
+model UserDm {
+    id     Int    @id @default(autoincrement())
+    userId Int
+    dmId   String
+
+    user User @relation(fields: [userId], references: [id], onDelete: Cascade)
+    dm   DM   @relation(fields: [dmId], references: [id], onDelete: Cascade)
+
+    @@unique([userId, dmId])
+}
+
+model Message {
+    id             Int             @id @default(autoincrement())
+    createAt       DateTime        @default(now())
+    dmId           String?
+    replyId        Int?            @unique
+    messageContent MessageContent?
+
+    dm        DM?       @relation(fields: [dmId], references: [id])
+    reply     Message? @relation("replyMessage", fields: [replyId], references: [id])
+    repliedTo Message? @relation("replyMessage")
+}
+
+enum MessageContentType {
+    TEXT
+    IMAGE
+}
+
+model MessageContent {
+    id          Int                @id @default(autoincrement())
+    type        MessageContentType
+    contentText String?
+    contentFile File?              @relation(fields: [fileId], references: [id], onDelete: Cascade)
+    message     Message            @relation(fields: [messageId], references: [id], onDelete: Cascade)
+    messageId   Int                @unique
+    fileId      Int?
 }

backend/prisma/schema.prisma

@@ -2,14 +2,16 @@
 
 npx prisma studio &
 npx prisma db push
-mkdir uploads/
+npx prisma generate
+mkdir uploads/ 2> /dev/null
 
 if [ "$NODE_ENV" == "production" ]; then
 	npx prisma migrate deploy
 	npm run build
 	npm run start
 else
-	npx prisma generate --watch &
-	npx prisma migrate dev
+	prisma generate --watch &
+	prisma migrate dev
+	npx prisma db seed
 	npm run dev
 fi

backend/scripts/entrypoint.sh

@@ -0,0 +1,10 @@
+import { mapToPublicProfile } from '../users/users-mapper';
+import { SingleDm } from './types/single-dm';
+
+export function mapToPublicDm(singleDm: SingleDm) {
+  return {
+    id: singleDm.id,
+    type: singleDm.type,
+    other: mapToPublicProfile(singleDm.other),
+  };
+}

backend/src/api/dm/dm-mapper.ts

@@ -0,0 +1,13 @@
+import { Message } from '@prisma/client';
+
+// type MessageMapper = {
+//   id: number;
+//   renderType: 'short' | 'normal';
+//   content: /*TODO */
+// };
+
+export function mapToMessage(message: Message) {
+  return {
+    id: message.id,
+  };
+}