Merge pull request #172 from TaskTrial/feature/171/activitylogs_task

mdawoud27 · web-flow · commit dd3fc57ade5a · 2025-04-18T21:43:43.000+02:00
feature/activity-logs-task
diff --git a/prisma/generated/prisma-client-js/edge.js b/prisma/generated/prisma-client-js/edge.js
diff --git a/prisma/generated/prisma-client-js/index-browser.js b/prisma/generated/prisma-client-js/index-browser.js
@@ -468,6 +468,7 @@ exports.ActionType = exports.$Enums.ActionType = {
   CREATED: 'CREATED',
   UPDATED: 'UPDATED',
   DELETED: 'DELETED',
+  RESTORED: 'RESTORED',
   COMMENTED: 'COMMENTED',
   STATUS_CHANGED: 'STATUS_CHANGED',
   ASSIGNED: 'ASSIGNED',
diff --git a/prisma/generated/prisma-client-js/index.d.ts b/prisma/generated/prisma-client-js/index.d.ts
@@ -146,6 +146,7 @@ export const ActionType: {
   CREATED: 'CREATED',
   UPDATED: 'UPDATED',
   DELETED: 'DELETED',
+  RESTORED: 'RESTORED',
   COMMENTED: 'COMMENTED',
   STATUS_CHANGED: 'STATUS_CHANGED',
   ASSIGNED: 'ASSIGNED',
diff --git a/prisma/generated/prisma-client-js/index.js b/prisma/generated/prisma-client-js/index.js
diff --git a/prisma/generated/prisma-client-js/package.json b/prisma/generated/prisma-client-js/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "prisma-client-a10afe2d65b1696aceeffd7b7ee9060221c49b4aa8ca29ad38aff4f8c36e19cd",
+  "name": "prisma-client-9780e8e36b8830e8333f06b5c248c200021c25902ffd14c6f44b19a7776b5264",
   "main": "index.js",
   "types": "index.d.ts",
   "browser": "index-browser.js",
diff --git a/prisma/generated/prisma-client-js/schema.prisma b/prisma/generated/prisma-client-js/schema.prisma
@@ -559,6 +559,7 @@ enum ActionType {
   CREATED
   UPDATED
   DELETED
+  RESTORED
   COMMENTED
   STATUS_CHANGED
   ASSIGNED
diff --git a/prisma/generated/prisma-client-js/wasm.js b/prisma/generated/prisma-client-js/wasm.js
@@ -468,6 +468,7 @@ exports.ActionType = exports.$Enums.ActionType = {
   CREATED: 'CREATED',
   UPDATED: 'UPDATED',
   DELETED: 'DELETED',
+  RESTORED: 'RESTORED',
   COMMENTED: 'COMMENTED',
   STATUS_CHANGED: 'STATUS_CHANGED',
   ASSIGNED: 'ASSIGNED',
diff --git a/prisma/migrations/20250418193821_add_restored_action/migration.sql b/prisma/migrations/20250418193821_add_restored_action/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "ActionType" ADD VALUE 'RESTORED';
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -559,6 +559,7 @@ enum ActionType {
   CREATED
   UPDATED
   DELETED
+  RESTORED
   COMMENTED
   STATUS_CHANGED
   ASSIGNED
diff --git a/src/controllers/task.controller.js b/src/controllers/task.controller.js
@@ -3,6 +3,10 @@ import {
   createTaskValidation,
   updateTaskValidation,
 } from '../validations/task.validation.js';
+import {
+  createActivityLog,
+  generateActivityDetails,
+} from '../utils/activityLogs.utils.js';
 
 /**
  * Helper function to validate required params
@@ -344,6 +348,37 @@ export const createTask = async (req, res, next) => {
       },
     });
 
+    // Log the activity
+    await createActivityLog({
+      entityType: 'TASK',
+      action: 'CREATED',
+      userId: user.id,
+      organizationId,
+      teamId,
+      projectId,
+      sprintId: sprintId || null,
+      taskId: task.id,
+      details: generateActivityDetails('CREATED', null, task),
+    });
+
+    // If task is assigned to someone, log that action too
+    if (assignedTo) {
+      await createActivityLog({
+        entityType: 'TASK',
+        action: 'ASSIGNED',
+        userId: user.id,
+        organizationId,
+        teamId,
+        projectId,
+        sprintId: sprintId || null,
+        taskId: task.id,
+        details: generateActivityDetails('ASSIGNED', null, {
+          assignedTo,
+          taskId: task.id,
+        }),
+      });
+    }
+
     // Fetch project members
     const projectMembers = await prisma.projectMember.findMany({
       where: { projectId },
@@ -517,6 +552,9 @@ export const updateTask = async (req, res, next) => {
       }
     }
 
+    // Save old task data for activity logging
+    const oldTaskData = { ...task };
+
     // Update the task
     const updatedTask = await prisma.task.update({
       where: { id: taskId },
@@ -536,6 +574,100 @@ export const updateTask = async (req, res, next) => {
       },
     });
 
+    // Log the general update activity
+    await createActivityLog({
+      entityType: 'TASK',
+      action: 'UPDATED',
+      userId: user.id,
+      organizationId,
+      teamId,
+      projectId,
+      sprintId: updatedTask.sprintId || null,
+      taskId: updatedTask.id,
+      details: generateActivityDetails('UPDATED', oldTaskData, updatedTask),
+    });
+
+    // Assignment change
+    if (assignedTo !== undefined && assignedTo !== oldTaskData.assignedTo) {
+      if (assignedTo === null) {
+        // Task was unassigned
+        await createActivityLog({
+          entityType: 'TASK',
+          action: 'UNASSIGNED',
+          userId: user.id,
+          organizationId,
+          teamId,
+          projectId,
+          sprintId: updatedTask.sprintId || null,
+          taskId: updatedTask.id,
+          details: generateActivityDetails('UNASSIGNED', oldTaskData, null),
+        });
+      } else if (oldTaskData.assignedTo === null) {
+        // Task was assigned
+        await createActivityLog({
+          entityType: 'TASK',
+          action: 'ASSIGNED',
+          userId: user.id,
+          organizationId,
+          teamId,
+          projectId,
+          sprintId: updatedTask.sprintId || null,
+          taskId: updatedTask.id,
+          details: generateActivityDetails('ASSIGNED', null, {
+            assignedTo,
+            taskId: updatedTask.id,
+          }),
+        });
+      } else {
+        // Assignment was changed
+        await createActivityLog({
+          entityType: 'TASK',
+          action: 'UNASSIGNED',
+          userId: user.id,
+          organizationId,
+          teamId,
+          projectId,
+          sprintId: updatedTask.sprintId || null,
+          taskId: updatedTask.id,
+          details: generateActivityDetails('UNASSIGNED', oldTaskData, null),
+        });
+
+        await createActivityLog({
+          entityType: 'TASK',
+          action: 'ASSIGNED',
+          userId: user.id,
+          organizationId,
+          teamId,
+          projectId,
+          sprintId: updatedTask.sprintId || null,
+          taskId: updatedTask.id,
+          details: generateActivityDetails('ASSIGNED', null, {
+            assignedTo,
+            taskId: updatedTask.id,
+          }),
+        });
+      }
+    }
+
+    // Sprint change
+    if (sprintId !== undefined && sprintId !== oldTaskData.sprintId) {
+      await createActivityLog({
+        entityType: 'TASK',
+        action: 'TASK_MOVED',
+        userId: user.id,
+        organizationId,
+        teamId,
+        projectId,
+        sprintId: updatedTask.sprintId || null,
+        taskId: updatedTask.id,
+        details: generateActivityDetails(
+          'TASK_MOVED',
+          oldTaskData,
+          updatedTask,
+        ),
+      });
+    }
+
     return res.status(200).json({
       success: true,
       message: 'Task updated successfully',
@@ -625,6 +757,8 @@ export const updateTaskPriority = async (req, res, next) => {
       });
     }
 
+    const oldTaskData = { ...task };
+
     // Update task priority
     const updatedTask = await prisma.task.update({
       where: { id: taskId },
@@ -635,6 +769,25 @@ export const updateTaskPriority = async (req, res, next) => {
       },
     });
 
+    // Status change
+    if (priority && priority !== oldTaskData.priority) {
+      await createActivityLog({
+        entityType: 'TASK',
+        action: 'STATUS_CHANGED',
+        userId: user.id,
+        organizationId,
+        teamId,
+        projectId,
+        sprintId: updatedTask.sprintId || null,
+        taskId: updatedTask.id,
+        details: generateActivityDetails(
+          'STATUS_CHANGED',
+          oldTaskData,
+          updatedTask,
+        ),
+      });
+    }
+
     return res.status(200).json({
       success: true,
       message: 'Task priority updated successfully',
@@ -725,6 +878,8 @@ export const updateTaskStatus = async (req, res, next) => {
       });
     }
 
+    const oldTaskData = { ...task };
+
     // Update task status
     const updatedTask = await prisma.task.update({
       where: { id: taskId },
@@ -735,6 +890,25 @@ export const updateTaskStatus = async (req, res, next) => {
       },
     });
 
+    // Status change
+    if (status && status !== oldTaskData.status) {
+      await createActivityLog({
+        entityType: 'TASK',
+        action: 'STATUS_CHANGED',
+        userId: user.id,
+        organizationId,
+        teamId,
+        projectId,
+        sprintId: updatedTask.sprintId || null,
+        taskId: updatedTask.id,
+        details: generateActivityDetails(
+          'STATUS_CHANGED',
+          oldTaskData,
+          updatedTask,
+        ),
+      });
+    }
+
     return res.status(200).json({
       success: true,
       message: 'Task status updated successfully',
@@ -1213,6 +1387,19 @@ export const deleteTask = async (req, res, next) => {
       }
     });
 
+    // Log the delete activity
+    await createActivityLog({
+      entityType: 'TASK',
+      action: 'DELETED',
+      userId: user.id,
+      organizationId,
+      teamId,
+      projectId,
+      sprintId: task.sprintId || null,
+      taskId: task.id,
+      details: generateActivityDetails('DELETED', task, null),
+    });
+
     return res.status(200).json({
       success: true,
       message: `Task ${permanent ? 'permanently ' : ''}deleted successfully`,
@@ -1367,6 +1554,22 @@ export const restoreTask = async (req, res, next) => {
       },
     });
 
+    // Log the restore activity
+    await createActivityLog({
+      entityType: 'TASK',
+      action: 'UPDATED', // Using UPDATED with specific details
+      userId: user.id,
+      organizationId,
+      teamId,
+      projectId,
+      sprintId: restoredTask.sprintId || null,
+      taskId: restoredTask.id,
+      details: {
+        action: 'RESTORE',
+        restoredAt: new Date(),
+      },
+    });
+
     return res.status(200).json({
       success: true,
       message: `Task restored successfully${restoreSubtasks ? ' with its subtasks' : ''}`,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "prisma-client-a10afe2d65b1696aceeffd7b7ee9060221c49b4aa8ca29ad38aff4f8c36e19cd",`
	`2`	`+ "name": "prisma-client-9780e8e36b8830e8333f06b5c248c200021c25902ffd14c6f44b19a7776b5264",`
`3`	`3`	`"main": "index.js",`
`4`	`4`	`"types": "index.d.ts",`
`5`	`5`	`"browser": "index-browser.js",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- AlterEnum`
	`2`	`+ALTER TYPE "ActionType" ADD VALUE 'RESTORED';`