Merge pull request #17 from CUSW-chula/dev

Dev to main v0.1.0

Author: bunnybunbun37204

.github/workflows/deploy.yml

@@ -72,11 +72,15 @@ jobs:
         run: |
           bun --version  # Check if Bun is installed correctly
 
+      - name: Bun installation
+        run: |
+          bun install  # Check if Bun is installed correctly
+
       - name: Lint code
         run: |
           echo "Running lint checks..."
           bun run lint  # Run lint using Bun
       - name: Unit test
-        run: /
+        run: |
           echo "Running unit test..."
-          bun run test
+          bun test

.gitignore

@@ -33,6 +33,7 @@ yarn-error.log*
 
 # vercel
 .vercel
+bun.lockb
 .env
 
 **/*.trace

.husky/pre-commit

@@ -1,2 +1,3 @@
 bun run lint:fix
-bun run format:fix
+bun run format:fix
+bun test

Dockerfile

@@ -1,17 +1,31 @@
-FROM oven/bun
+# Use a specific version of the Bun image
+FROM oven/bun:1.1.30
 
+# Set the working directory
 WORKDIR /app
 
-COPY package.json .
-COPY bun.lockb .
+# Copy the Prisma schema and other initial files for better caching
+COPY package.json ./
+COPY tsconfig.json ./
+COPY prisma ./prisma
 
-RUN bun install --production
+# Install dependencies (will only re-run if package.json or lock files change)
+RUN bun install
 
-COPY src src
-COPY tsconfig.json .
-# COPY public public
+# Generate Prisma client
+RUN bunx prisma generate
 
-ENV NODE_ENV production
-CMD ["bun", "src/index.ts"]
+# Install OpenSSL (required by some libraries)
+RUN apt-get update && apt-get install -y openssl && rm -rf /var/lib/apt/lists/*
 
-EXPOSE 4000
+# Copy the rest of the application files
+COPY src ./src
+
+# Uncomment if you have public assets to include
+# COPY public ./public
+
+# Expose the application port
+EXPOSE 4000
+
+# Command to run the application
+CMD ["bun", "run", "src/index.ts"]

docker-compose.yml

@@ -1,24 +1,6 @@
 version: "3.8"
 
 services:
-  app:
-    build:
-      context: .  # The current directory where your Dockerfile is located
-      dockerfile: Dockerfile
-    container_name: app
-    restart: always
-    env_file:
-      - .env  # Environment variables for your app (make sure it includes DB, Redis, MinIO configs)
-    depends_on:
-      - postgres
-      - redis
-      - minio
-    ports:
-      - "4000:4000"  # Your app runs on port 4000
-    volumes:
-      - .:/app  # Mount your current directory for live reloading (optional during dev)
-    command: ["bun", "src/index.ts"]  # Start your Bun app
-
   postgres:
     image: postgres:latest
     container_name: postgres

package.json

@@ -6,7 +6,6 @@
     "dev": "bun run --watch src/index.ts",
     "db:push": "bunx prisma db push",
     "db:studio": "bunx prisma studio",
-    "postinstall": "bunx prisma generate",
     "prepare": "husky",
     "commit": "git-cz",
     "lint": "bunx biome lint ./src",
@@ -15,26 +14,31 @@
     "format:fix": "bunx biome format --write ./src"
   },
   "dependencies": {
-    "@elysiajs/swagger": "^1.1.1",
+    "@elysiajs/cors": "^1.1.1",
+    "@elysiajs/jwt": "^1.1.1",
+    "@elysiajs/stream": "^1.1.0",
+    "@elysiajs/swagger": "^1.1.5",
     "@prisma/client": "5.20.0",
     "elysia": "latest",
     "ioredis": "^5.4.1",
-    "minio": "^8.0.1",
+    "minio": "^8.0.2",
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.2",
+    "@biomejs/biome": "^1.9.4",
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
+    "@types/mime-types": "^2.1.4",
     "bun-types": "latest",
     "cz-conventional-changelog": "^3.3.0",
-    "cz-git": "^1.10.0",
-    "eslint": "^9.11.1",
-    "globals": "^15.9.0",
+    "cz-git": "^1.10.1",
+    "eslint": "^9.14.0",
+    "globals": "^15.11.0",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
-    "prisma": "^5.20.0",
-    "typescript-eslint": "^8.7.0"
+    "mime-types": "^2.1.35",
+    "prisma": "^5.21.1",
+    "typescript-eslint": "^8.12.2"
   },
   "config": {
     "commitizen": {
@@ -43,4 +47,4 @@
   },
   "module": "src/index.js",
   "type": "module"
-}
+}

pm2.config.cjs

@@ -0,0 +1,9 @@
+module.exports = {
+  name: "elysia-app",
+  script: "src/index.ts",
+  interpreter: "bun",
+  env: {
+    // biome-ignore lint/style/useNamingConvention: <explanation>
+    NODE_ENV: "production",
+  },
+};

prisma/schema.prisma

@@ -1,5 +1,5 @@
 generator client { 
-  provider = "prisma-client-js" 
+  provider      = "prisma-client-js"
 }
 
 datasource db { 
@@ -11,16 +11,30 @@ model User {
   id            String           @id @default(cuid()) 
   name          String 
   email         String           @unique 
-  projectRoles  ProjectRole[]    // Roles of users in various projects
-  assignedTasks TaskAssignment[] // Tasks assigned to the user
+  projectRoles  ProjectRole[]    
+  assignedTasks TaskAssignment[] 
   createdTasks  Task[]           @relation("CreatedTasks") 
-  uploadedFiles File[]           @relation("UploadedFiles") // Files uploaded by the user
+  uploadedFiles File[]           @relation("UploadedFiles") 
   comments      Comment[] 
-  activities    Activity[] 
+  activities    Activity[]
+  emojiTaskUsers EmojiTaskUser[] // Added relation field for EmojiTaskUser
+
 
   @@map("users") 
 }
 
+model EmojiTaskUser {
+  id     String @id @default(cuid())
+  emoji  String
+  userId String
+  taskId String
+
+  user User @relation(fields: [userId], references: [id])
+  task Task @relation(fields: [taskId], references: [id])
+
+  @@map("emoji_task_users")
+}
+
 model Project { 
   id             String           @id @default(cuid()) 
   title          String 
@@ -30,9 +44,9 @@ model Project {
   usedBudget     Float
   startDate      DateTime
   endDate        DateTime
-  projectRoles   ProjectRole[]    // Roles of users in the project
-  tasks          Task[]           @relation("ProjectTasks") // Tasks in the project
-  files          File[]           @relation("ProjectFiles") // Files associated with the project
+  projectRoles   ProjectRole[]    
+  tasks          Task[]           @relation("ProjectTasks") 
+  files          File[]           @relation("ProjectFiles") 
   
   @@map("projects") 
 }
@@ -51,27 +65,29 @@ model ProjectRole {
 }
 
 model Task { 
-  id             String       @id @default(cuid()) 
+  id             String           @id @default(cuid()) 
   title          String 
   description    String 
   status         TaskStatus 
-  projectId      String       // Link to the Project 
-  project        Project      @relation("ProjectTasks", fields: [projectId], references: [id]) // Relation to the Project model 
-  tags           Tag[]        @relation("TaskTags") // Many-to-many relation with Tag 
+  projectId      String       
+  project        Project      @relation("ProjectTasks", fields: [projectId], references: [id]) 
   subTasks       Task[]       @relation("SubTasks") 
   parentTask     Task?        @relation("SubTasks", fields: [parentTaskId], references: [id]) 
-  parentTaskId   String? 
-  expectedBudget Float 
-  realBudget     Float 
-  usedBudget     Float
+  parentTaskId   String?
+  statusBudgets  BudgetStatus 
+  budget         Float 
+  advance        Float 
+  expense        Float
   startDate      DateTime?
   endDate        DateTime?
-  assignedUsers  TaskAssignment[] // Many-to-many relation with users 
+  assignedUsers  TaskAssignment[] 
   createdById    String? 
-  createdBy      User?        @relation("CreatedTasks", fields: [createdById], references: [id]) 
+  createdBy      User?          @relation("CreatedTasks", fields: [createdById], references: [id]) 
   comments       Comment[] 
   activities     Activity[] 
-  files          File[]       @relation("TaskFiles") // Files associated with the task
+  files          File[]         @relation("TaskFiles") 
+  tags           TaskTag[]
+  emojiTaskUsers EmojiTaskUser[] // Added relation field for EmojiTaskUser
 
   @@map("tasks") 
 }
@@ -91,7 +107,7 @@ model TaskAssignment {
 model Tag { 
   id     String  @id @default(cuid()) 
   name   String  @unique 
-  tasks  Task[]  @relation("TaskTags") // Many-to-many relation with Task 
+  tasks  TaskTag[]
 
   @@map("tags") 
 }
@@ -101,7 +117,9 @@ model Comment {
   content   String 
   taskId    String 
   authorId  String 
-  createdAt DateTime  @default(now()) // Automatically set timestamp when comment is created
+  createdAt DateTime  @default(now()) 
+  isDelete  Boolean   @default(false)
+  editTime  DateTime?
 
   task      Task   @relation(fields: [taskId], references: [id]) 
   author    User   @relation(fields: [authorId], references: [id]) 
@@ -115,7 +133,7 @@ model Activity {
   detail    String?
   taskId    String? 
   userId    String 
-  createdAt DateTime     @default(now()) // Automatically set timestamp when activity is logged
+  createdAt DateTime     @default(now()) 
 
   task      Task?       @relation(fields: [taskId], references: [id]) 
   user      User        @relation(fields: [userId], references: [id]) 
@@ -126,12 +144,12 @@ model Activity {
 model File { 
   id         String  @id @default(cuid()) 
   filePath   String 
-  fileSize   Float     // File size in bytes
+  fileSize   Float   
   taskId     String? 
+  fileName   String
   projectId  String? 
   uploadedBy String 
-  uploadedAt DateTime  @default(now()) // Automatically set timestamp when file is uploaded
-  createdAt  DateTime  @default(now()) // Automatically set timestamp when file is created
+  createdAt  DateTime  @default(now()) 
 
   task       Task?    @relation("TaskFiles", fields: [taskId], references: [id]) 
   project    Project? @relation("ProjectFiles", fields: [projectId], references: [id]) 
@@ -140,24 +158,46 @@ model File {
   @@map("files") 
 }
 
+// Join table for many-to-many relationship between Task and Tag
+model TaskTag { 
+  id       String @id @default(cuid()) 
+  taskId   String 
+  tagId    String 
+
+  task     Task   @relation(fields: [taskId], references: [id]) 
+  tag      Tag    @relation(fields: [tagId], references: [id]) 
+
+  @@map("task_tags") 
+}
+
 enum Role { 
   Admin 
   Director 
   ProjectOwner 
   Member 
 }
 
-enum TaskStatus { 
+enum TaskStatus {
   Unassigned 
   Assigned 
   UnderReview 
   InRecheck 
   Done 
 }
 
+enum BudgetStatus { 
+  Initial
+  Added
+  SubTasksAdded
+  ParentTaskAdded
+}
+
 enum ActivityAction { 
-  CREATE 
+  CREATED
   ASSIGNED 
-  DELETE 
-  UPLOAD 
+  DELETED 
+  UPLOADED
+  UNASSIGNED
+  ADDED
+  REMOVED
 }

src/controllers/activity-logs.controller.ts

@@ -0,0 +1,26 @@
+import { Elysia } from "elysia";
+import { ActivityService } from "../services/activity-logs.service";
+import { type Context } from "../shared/interfaces.shared";
+import { WebSocket } from "../shared/utils/websocket.utils";
+
+export const ActivityController = new Elysia({ prefix: "/activities" }).get(
+	"/:id",
+	async ({
+		params: { id },
+		db,
+		redis,
+	}: Context & { params: { id: string } }) => {
+		const activityService = new ActivityService(db, redis);
+		try {
+			const activities = await activityService.getActivityById(id);
+			if (!activities) {
+				return Response.json("Activity not found", { status: 404 });
+			}
+			WebSocket.broadcast("activity", activities);
+			return activities;
+		} catch (_error) {
+			const error = _error as Error;
+			return Response.json(error.message, { status: 500 });
+		}
+	},
+);