@hed-hog/operations 0.0.325 → 0.0.326

package/src/operations.service.ts

@@ -143,6 +143,9 @@ type CollaboratorPayload = {
   joinedAt?: string | null;
   leftAt?: string | null;
   compensationAmount?: number | null;
+  hourlyRate?: number | null;
+  compensationEffectiveDate?: string | null;
+  compensationNotes?: string | null;
   contractDescription?: string | null;
   autoGenerateContractDraft?: boolean;
   weeklySchedule?: Array<{
@@ -1980,14 +1983,42 @@ export class OperationsService {
           createdCollaboratorId,
           Number(data.compensationAmount),
           actor.userId,
-          null
+          data.compensationNotes ?? null,
+          data.compensationEffectiveDate ?? null
+        );
+      }
+
+      if (data.hourlyRate != null) {
+        await (tx as any).$executeRawUnsafe(
+          `UPDATE operations_collaborator SET hourly_rate = $1 WHERE id = $2`,
+          Number(data.hourlyRate),
+          createdCollaboratorId
+        );
+        await this.insertCollaboratorCompensationHistory(
+          tx as any,
+          createdCollaboratorId,
+          Number(data.hourlyRate),
+          actor.userId,
+          data.compensationNotes ?? null,
+          data.compensationEffectiveDate ?? null,
+          'hourly_rate'
         );
       }
 
       return createdCollaboratorId;
     });
 
-    return this.getCollaboratorByIdForUser(userId, collaboratorId);
+    const result = await this.getCollaboratorByIdForUser(userId, collaboratorId);
+
+    await this.integrationApi.publishEvent({
+      eventName: 'operations.collaborator.created',
+      sourceModule: 'operations',
+      aggregateType: 'collaborator',
+      aggregateId: String(collaboratorId),
+      payload: { id: collaboratorId, displayName: resolvedDisplayName, status: normalizedStatus },
+    }).catch(() => null);
+
+    return result;
   }
 
   async updateCollaborator(
@@ -2023,6 +2054,7 @@ export class OperationsService {
     }
     this.pushUpdate(updates, params, 'level_label', data.levelLabel);
     this.pushUpdate(updates, params, 'weekly_capacity_hours', data.weeklyCapacityHours);
+    this.pushUpdate(updates, params, 'hourly_rate', data.hourlyRate);
     this.pushUpdate(
       updates,
       params,
@@ -2034,7 +2066,18 @@ export class OperationsService {
     this.pushUpdate(updates, params, 'left_at', data.leftAt, 'date');
     this.pushUpdate(updates, params, 'notes', data.notes);
 
+    let currentHourlyRate: number | null = null;
+
     await this.prisma.$transaction(async (tx) => {
+      if (data.hourlyRate !== undefined && data.hourlyRate !== null) {
+        const curr = (await (tx as any).$queryRawUnsafe(
+          `SELECT hourly_rate AS "hourlyRate" FROM operations_collaborator WHERE id = $1`,
+          collaboratorId
+        )) as { hourlyRate: string | null }[];
+        currentHourlyRate =
+          curr[0]?.hourlyRate != null ? Number(curr[0].hourlyRate) : null;
+      }
+
       if (
         data.collaboratorType !== undefined ||
         data.collaboratorTypeId !== undefined ||
@@ -2127,6 +2170,7 @@ export class OperationsService {
         data.compensationAmount !== undefined ||
         data.contractDescription !== undefined ||
         data.autoGenerateContractDraft !== undefined ||
+        data.hourlyRate !== undefined ||
         data.joinedAt !== undefined ||
         data.weeklyCapacityHours !== undefined ||
         data.supervisorCollaboratorId !== undefined ||
@@ -2137,6 +2181,29 @@ export class OperationsService {
         data.personId !== undefined ||
         data.displayName !== undefined
       ) {
+        let currentBudgetAmount: number | null = null;
+
+        if (
+          data.compensationAmount !== undefined &&
+          data.compensationAmount !== null
+        ) {
+          const hiringContracts = (await (tx as any).$queryRawUnsafe(
+            `SELECT budget_amount AS "budgetAmount"
+               FROM operations_contract
+              WHERE related_collaborator_id = $1
+                AND origin_type = 'employee_hiring'
+                AND deleted_at IS NULL
+              ORDER BY created_at DESC
+              LIMIT 1`,
+            collaboratorId
+          )) as { budgetAmount: string | null }[];
+
+          currentBudgetAmount =
+            hiringContracts[0]?.budgetAmount != null
+              ? Number(hiringContracts[0].budgetAmount)
+              : null;
+        }
+
         await this.syncHiringContractDraft(
           tx as any,
           actor.userId,
@@ -2148,18 +2215,51 @@ export class OperationsService {
           data.compensationAmount !== undefined &&
           data.compensationAmount !== null
         ) {
-          await this.insertCollaboratorCompensationHistory(
-            tx as any,
-            collaboratorId,
-            Number(data.compensationAmount),
-            actor.userId,
-            null
-          );
+          const newAmount = Number(data.compensationAmount);
+
+          if (
+            currentBudgetAmount === null ||
+            newAmount !== currentBudgetAmount
+          ) {
+            await this.insertCollaboratorCompensationHistory(
+              tx as any,
+              collaboratorId,
+              newAmount,
+              actor.userId,
+              data.compensationNotes ?? null,
+              data.compensationEffectiveDate ?? null
+            );
+          }
+        }
+
+        if (data.hourlyRate !== undefined && data.hourlyRate !== null) {
+          const newRate = Number(data.hourlyRate);
+          if (currentHourlyRate === null || newRate !== currentHourlyRate) {
+            await this.insertCollaboratorCompensationHistory(
+              tx as any,
+              collaboratorId,
+              newRate,
+              actor.userId,
+              data.compensationNotes ?? null,
+              data.compensationEffectiveDate ?? null,
+              'hourly_rate'
+            );
+          }
         }
       }
     });
 
-    return this.getCollaboratorByIdForUser(userId, collaboratorId);
+    const collaboratorResult = await this.getCollaboratorByIdForUser(userId, collaboratorId);
+
+    await this.integrationApi.publishEvent({
+      eventName: 'operations.collaborator.updated',
+      sourceModule: 'operations',
+      aggregateType: 'collaborator',
+      aggregateId: String(collaboratorId),
+      payload: { id: collaboratorId, displayName: data.displayName, status: data.status },
+    }).catch(() => null);
+
+    return collaboratorResult;
   }
 
   async updateCollaboratorProjectAssignment(
@@ -2267,6 +2367,7 @@ export class OperationsService {
       actorUserId: number | null;
       actorName: string | null;
       notes: string | null;
+      amountType: string;
       createdAt: string;
     }>(
       `SELECT h.id,
@@ -2276,6 +2377,7 @@ export class OperationsService {
               h.actor_user_id AS "actorUserId",
               u.name AS "actorName",
               h.notes,
+              h.amount_type AS "amountType",
               h.created_at AS "createdAt"
          FROM operations_collaborator_compensation_history h
          LEFT JOIN "user" u ON u.id = h.actor_user_id
@@ -3139,14 +3241,20 @@ export class OperationsService {
       ]
     );
 
-    return this.getProjectBoardTask(created?.id ?? 0);
+    const task = await this.getProjectBoardTask(created?.id ?? 0);
+
+    await this.integrationApi.publishEvent({
+      eventName: 'operations.task.created',
+      sourceModule: 'operations',
+      aggregateType: 'task',
+      aggregateId: String(created?.id ?? 0),
+      payload: { id: created?.id, projectId, name, status: data.status ?? 'todo', priority: data.priority ?? 'medium' },
+    }).catch(() => null);
+
+    return task;
   }
 
-  async updateTask(
-    userId: number,
-    taskId: number,
-    data: Partial<TaskPayload>
-  ) {
+  async updateTask(userId: number, taskId: number, data: TaskPayload) {
     const actor = await this.getActorContext(userId);
     if (!actor.isCollaborator && !actor.isDirector && !actor.isSupervisor) {
       throw new ForbiddenException(
@@ -3237,7 +3345,17 @@ export class OperationsService {
       );
     });
 
-    return this.getProjectBoardTask(taskId);
+    const taskResult = await this.getProjectBoardTask(taskId);
+
+    await this.integrationApi.publishEvent({
+      eventName: 'operations.task.updated',
+      sourceModule: 'operations',
+      aggregateType: 'task',
+      aggregateId: String(taskId),
+      payload: { id: taskId, name: data.name, status: data.status },
+    }).catch(() => null);
+
+    return taskResult;
   }
 
   async removeTask(userId: number, taskId: number, permanent = false) {
@@ -3275,6 +3393,14 @@ export class OperationsService {
       );
     });
 
+    await this.integrationApi.publishEvent({
+      eventName: 'operations.task.deleted',
+      sourceModule: 'operations',
+      aggregateType: 'task',
+      aggregateId: String(taskId),
+      payload: { id: taskId, projectId: current.projectId, permanent },
+    }).catch(() => null);
+
     return { success: true };
   }
 
@@ -3493,8 +3619,8 @@ export class OperationsService {
       throw new BadRequestException('Comment content is required.');
     }
 
-    const rows = await this.queryRows<{ id: number; actorCollaboratorId: number | null }>(
-      `SELECT id, actor_collaborator_id AS "actorCollaboratorId"
+    const rows = await this.queryRows<{ id: number; actorCollaboratorId: number | null; createdAt: Date }>(
+      `SELECT id, actor_collaborator_id AS "actorCollaboratorId", created_at AS "createdAt"
          FROM operations_task_comment
         WHERE id = $1 AND task_id = $2`,
       [commentId, taskId]
@@ -3509,6 +3635,17 @@ export class OperationsService {
       throw new ForbiddenException('You can only edit your own comments.');
     }
 
+    const editSettings = await this.settingService.getSettingValues(['operations.comment-edit-window']);
+    const editWindowMinutes = Number(editSettings['operations.comment-edit-window'] ?? 5);
+    if (editWindowMinutes > 0) {
+      const diffMinutes = (Date.now() - new Date(row.createdAt).getTime()) / 60000;
+      if (diffMinutes > editWindowMinutes) {
+        throw new ForbiddenException(
+          `Comments can only be edited within ${editWindowMinutes} minute(s) of posting.`
+        );
+      }
+    }
+
     await this.queryRows(
       `UPDATE operations_task_comment
           SET content = $1, updated_at = NOW()
@@ -3539,8 +3676,8 @@ export class OperationsService {
     );
     await this.assertProjectAccess(actor, current.projectId);
 
-    const rows = await this.queryRows<{ id: number; actorCollaboratorId: number | null }>(
-      `SELECT id, actor_collaborator_id AS "actorCollaboratorId"
+    const rows = await this.queryRows<{ id: number; actorCollaboratorId: number | null; createdAt: Date }>(
+      `SELECT id, actor_collaborator_id AS "actorCollaboratorId", created_at AS "createdAt"
          FROM operations_task_comment
         WHERE id = $1 AND task_id = $2`,
       [commentId, taskId]
@@ -3555,6 +3692,17 @@ export class OperationsService {
       throw new ForbiddenException('You can only delete your own comments.');
     }
 
+    const deleteSettings = await this.settingService.getSettingValues(['operations.comment-edit-window']);
+    const deleteWindowMinutes = Number(deleteSettings['operations.comment-edit-window'] ?? 5);
+    if (deleteWindowMinutes > 0) {
+      const diffMinutes = (Date.now() - new Date(row.createdAt).getTime()) / 60000;
+      if (diffMinutes > deleteWindowMinutes) {
+        throw new ForbiddenException(
+          `Comments can only be deleted within ${deleteWindowMinutes} minute(s) of posting.`
+        );
+      }
+    }
+
     await this.queryRows(
       `DELETE FROM operations_task_comment WHERE id = $1`,
       [commentId]
@@ -4062,7 +4210,17 @@ export class OperationsService {
       return projectId;
     });
 
-    return this.getProjectById(userId, createdProjectId);
+    const result = await this.getProjectById(userId, createdProjectId);
+
+    await this.integrationApi.publishEvent({
+      eventName: 'operations.project.created',
+      sourceModule: 'operations',
+      aggregateType: 'project',
+      aggregateId: String(createdProjectId),
+      payload: { id: createdProjectId, code: data.code, name: data.name, status: data.status ?? 'planning' },
+    }).catch(() => null);
+
+    return result;
   }
 
   async updateProject(userId: number, projectId: number, data: Partial<ProjectPayload>) {
@@ -4159,7 +4317,17 @@ export class OperationsService {
       }
     });
 
-    return this.getProjectById(userId, projectId);
+    const projectResult = await this.getProjectById(userId, projectId);
+
+    await this.integrationApi.publishEvent({
+      eventName: 'operations.project.updated',
+      sourceModule: 'operations',
+      aggregateType: 'project',
+      aggregateId: String(projectId),
+      payload: { id: projectId, name: data.name, status: data.status },
+    }).catch(() => null);
+
+    return projectResult;
   }
 
   async listContracts(
@@ -7853,6 +8021,7 @@ export class OperationsService {
       title: string | null;
       levelLabel: string | null;
       weeklyCapacityHours: number | null;
+      hourlyRate: number | null;
       status: string;
       joinedAt: string | null;
       leftAt: string | null;
@@ -7880,6 +8049,7 @@ export class OperationsService {
               COALESCE(NULLIF(job_title_record.name, ''), NULLIF(c.title, '')) AS "title",
               c.level_label AS "levelLabel",
               c.weekly_capacity_hours AS "weeklyCapacityHours",
+              c.hourly_rate AS "hourlyRate",
               c.status,
               c.joined_at AS "joinedAt",
               c.left_at AS "leftAt",
@@ -10146,7 +10316,9 @@ export class OperationsService {
     collaboratorId: number,
     amount: number,
     actorUserId: number | null,
-    notes: string | null
+    notes: string | null,
+    effectiveDate?: string | null,
+    amountType: 'salary' | 'hourly_rate' = 'salary'
   ) {
     await client.$executeRawUnsafe(
       `INSERT INTO operations_collaborator_compensation_history (
@@ -10154,14 +10326,18 @@ export class OperationsService {
         amount,
         actor_user_id,
         notes,
+        effective_date,
+        amount_type,
         created_at
       ) VALUES (
-        $1, $2, $3, $4, NOW()
+        $1, $2, $3, $4, $5::date, $6::operations_collaborator_compensation_history_am_f803c4196e_enum, NOW()
       )`,
       collaboratorId,
       amount,
       actorUserId,
-      notes ?? null
+      notes ?? null,
+      effectiveDate ?? null,
+      amountType
     );
   }