@hed-hog/operations 0.0.305 → 0.0.306

package/dist/operations.service.js

@@ -1057,20 +1057,18 @@ let OperationsService = OperationsService_1 = class OperationsService {
         var _a, _b;
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
-        if (!actor.collaboratorId) {
-            throw new common_1.BadRequestException('Collaborator context is required.');
-        }
         const pagination = this.normalizePaginationParams(paginationParams, {
             defaultSortField: 'name',
             defaultSortOrder: 'asc',
             allowedSortFields: ['name', 'code', 'clientName', 'startDate', 'endDate'],
         });
-        const params = [actor.collaboratorId];
+        const filter = this.buildIdFilter(actor.visibleProjectIds, 'p.id', actor.isDirector);
+        const params = [...filter.params];
         const filters = [
             'p.deleted_at IS NULL',
             'pa.deleted_at IS NULL',
-            `pa.collaborator_id = $1`,
             `pa.status IN ('planned', 'active')`,
+            filter.clause,
         ];
         if (pagination.search) {
             const searchPlaceholder = this.param(params, `%${pagination.search}%`);
@@ -1120,21 +1118,25 @@ let OperationsService = OperationsService_1 = class OperationsService {
         var _a, _b;
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
-        if (!actor.collaboratorId) {
-            throw new common_1.BadRequestException('Collaborator context is required.');
-        }
         const pagination = this.normalizePaginationParams(paginationParams, {
             defaultSortField: 'name',
             defaultSortOrder: 'asc',
             allowedSortFields: ['name', 'projectName', 'status', 'createdAt'],
         });
-        const params = [actor.collaboratorId];
+        const projectFilter = this.buildIdFilter(actor.visibleProjectIds, 'COALESCE(t.project_id, pa.project_id)', actor.isDirector);
+        const params = [...projectFilter.params];
         const filters = [
             't.deleted_at IS NULL',
-            'pa.deleted_at IS NULL',
             'p.deleted_at IS NULL',
-            `pa.collaborator_id = $1`,
-            `pa.status IN ('planned', 'active')`,
+            projectFilter.clause,
+            `(
+        t.project_id IS NOT NULL
+        OR (
+          pa.id IS NOT NULL
+          AND pa.deleted_at IS NULL
+          AND pa.status IN ('planned', 'active')
+        )
+      )`,
         ];
         if (pagination.search) {
             const searchPlaceholder = this.param(params, `%${pagination.search}%`);
@@ -1149,7 +1151,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
             filters.push(`pa.id = ${this.param(params, paginationParams.projectAssignmentId)}`);
         }
         if (paginationParams.projectId) {
-            filters.push(`pa.project_id = ${this.param(params, paginationParams.projectId)}`);
+            filters.push(`COALESCE(t.project_id, pa.project_id) = ${this.param(params, paginationParams.projectId)}`);
         }
         if (paginationParams.status) {
             filters.push(`t.status = ${this.param(params, paginationParams.status)}`);
@@ -1157,10 +1159,10 @@ let OperationsService = OperationsService_1 = class OperationsService {
         const whereClause = filters.join(' AND ');
         const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
          FROM operations_task t
-         JOIN operations_project_assignment pa
+         LEFT JOIN operations_project_assignment pa
            ON pa.id = t.project_assignment_id
          JOIN operations_project p
-           ON p.id = pa.project_id
+           ON p.id = COALESCE(t.project_id, pa.project_id)
         WHERE ${whereClause}`, params);
         const sortColumn = (_a = {
             name: 't.name',
@@ -1175,16 +1177,16 @@ let OperationsService = OperationsService_1 = class OperationsService {
               t.name,
               t.description,
               t.status,
-              pa.project_id AS "projectId",
+              COALESCE(t.project_id, pa.project_id) AS "projectId",
               pa.id AS "projectAssignmentId",
               p.name AS "projectName",
               p.code AS "projectCode",
               t.created_at AS "createdAt"
          FROM operations_task t
-         JOIN operations_project_assignment pa
+         LEFT JOIN operations_project_assignment pa
            ON pa.id = t.project_assignment_id
          JOIN operations_project p
-           ON p.id = pa.project_id
+           ON p.id = COALESCE(t.project_id, pa.project_id)
         WHERE ${whereClause}
         ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, t.id ASC
         LIMIT ${limitPlaceholder}
@@ -1463,8 +1465,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
             const resolvedTask = data.taskId
                 ? await this.getOwnedTaskRecord(tx, actor.collaboratorId, data.taskId)
                 : null;
-            if (resolvedTask && resolvedTask.projectAssignmentId !== assignment.id) {
-                throw new common_1.BadRequestException('The selected task does not belong to the chosen project assignment.');
+            if (resolvedTask && resolvedTask.projectId !== assignment.projectId) {
+                throw new common_1.BadRequestException('The selected task does not belong to the chosen project.');
             }
             const activityLabel = (_e = (_d = (_c = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _c !== void 0 ? _c : taskLabel) !== null && _d !== void 0 ? _d : assignment.roleLabel) !== null && _e !== void 0 ? _e : assignment.projectName;
             if (!activityLabel) {
@@ -1500,6 +1502,68 @@ let OperationsService = OperationsService_1 = class OperationsService {
         });
         return this.getTimesheetEntryByIdForActor(actor, createdEntryId);
     }
+    async updateTimesheetEntry(userId, entryId, data) {
+        var _a;
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        this.requireFields(data, ['workDate', 'duration']);
+        if (!actor.collaboratorId && !actor.isDirector) {
+            throw new common_1.BadRequestException('Collaborator context is required.');
+        }
+        const entry = await this.getTimesheetEntryByIdForActor(actor, entryId);
+        if (!actor.isDirector && entry.collaboratorId !== actor.collaboratorId) {
+            throw new common_1.ForbiddenException('Only the entry owner can update this timesheet entry.');
+        }
+        if (!['draft', 'rejected'].includes(entry.status)) {
+            throw new common_1.BadRequestException('Only draft or rejected timesheet entries can be edited.');
+        }
+        const collaboratorId = actor.isDirector
+            ? entry.collaboratorId
+            : actor.collaboratorId;
+        const durationMinutes = this.normalizeDurationMinutes(data.duration, data.unit);
+        const taskLabel = (_a = this.normalizeOptionalText(data.taskName)) !== null && _a !== void 0 ? _a : this.normalizeOptionalText(data.activityLabel);
+        const targetWeek = this.getWorkWeekRange(data.workDate);
+        const isSameWeek = entry.weekStartDate === targetWeek.weekStartDate &&
+            entry.weekEndDate === targetWeek.weekEndDate;
+        await this.prisma.$transaction(async (tx) => {
+            var _a, _b, _c, _d, _e, _f, _g;
+            const assignment = await this.resolveOwnedProjectAssignment(tx, collaboratorId, {
+                projectId: (_a = data.projectId) !== null && _a !== void 0 ? _a : null,
+                projectAssignmentId: (_b = data.projectAssignmentId) !== null && _b !== void 0 ? _b : null,
+            });
+            const resolvedTask = data.taskId
+                ? await this.getOwnedTaskRecord(tx, collaboratorId, data.taskId)
+                : null;
+            if (resolvedTask && resolvedTask.projectId !== assignment.projectId) {
+                throw new common_1.BadRequestException('The selected task does not belong to the chosen project.');
+            }
+            const activityLabel = (_e = (_d = (_c = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _c !== void 0 ? _c : taskLabel) !== null && _d !== void 0 ? _d : assignment.roleLabel) !== null && _e !== void 0 ? _e : assignment.projectName;
+            if (!activityLabel) {
+                throw new common_1.BadRequestException('A task is required for the timesheet entry.');
+            }
+            const targetTimesheetId = isSameWeek
+                ? entry.timesheetId
+                : await this.getOrCreateTimesheetForWorkDate(tx, collaboratorId, data.workDate);
+            await tx.$executeRawUnsafe(`UPDATE operations_timesheet_entry
+            SET timesheet_id = $1,
+                project_assignment_id = $2,
+                task_id = $3,
+                activity_label = $4,
+                work_date = $5::date,
+                duration_minutes = $6,
+                hours = $7,
+                description = $8,
+                updated_at = NOW()
+          WHERE id = $9
+            AND deleted_at IS NULL`, targetTimesheetId, assignment.id, (_g = (_f = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.id) !== null && _f !== void 0 ? _f : data.taskId) !== null && _g !== void 0 ? _g : null, activityLabel, data.workDate, durationMinutes, Number((durationMinutes / 60).toFixed(2)), this.normalizeOptionalText(data.description), entryId);
+            await this.refreshTimesheetTotal(tx, entry.timesheetId);
+            if (targetTimesheetId !== entry.timesheetId) {
+                await this.refreshTimesheetTotal(tx, targetTimesheetId);
+            }
+            await this.cleanupEmptyEditableTimesheet(tx, entry.timesheetId);
+        });
+        return this.getTimesheetEntryByIdForActor(actor, entryId);
+    }
     async removeTimesheetEntry(userId, entryId) {
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
@@ -1520,6 +1584,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           WHERE id = $1
             AND deleted_at IS NULL`, entryId);
             await this.refreshTimesheetTotal(tx, entry.timesheetId);
+            await this.cleanupEmptyEditableTimesheet(tx, entry.timesheetId);
         });
         return { success: true };
     }
@@ -1733,7 +1798,11 @@ let OperationsService = OperationsService_1 = class OperationsService {
           updated_at
         ) VALUES (
           $1, $2, $3, $4,
-          $5, $6, $7, $8, $9, $10, $11,
+          $5::text::operations_contract_template_contract_category_49bb07a713_enum,
+          $6::text::operations_contract_template_contract_type_3962dbda6a_enum,
+          $7::text::operations_contract_template_billing_model_384a7c60e2_enum,
+          $8::text::operations_contract_template_signature_status_56cb6d625b_enum,
+          $9, $10::text::operations_contract_template_status_c9d2e90231_enum, $11,
           NOW(), NOW()
         )
         RETURNING id`, await this.generateUniqueContractTemplateSlug(tx, name), nextCode, name, this.normalizeOptionalText(data.description), (_e = data.contractCategory) !== null && _e !== void 0 ? _e : 'client', (_f = data.contractType) !== null && _f !== void 0 ? _f : 'service_agreement', (_g = data.billingModel) !== null && _g !== void 0 ? _g : 'time_and_material', (_h = data.signatureStatus) !== null && _h !== void 0 ? _h : 'not_started', isActive, nextStatus, this.normalizeOptionalText(data.contentHtml)));
@@ -1775,12 +1844,12 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 code = $2,
                 name = $3,
                 description = $4,
-                contract_category = $5,
-                contract_type = $6,
-                billing_model = $7,
-                signature_status = $8,
+                contract_category = $5::text::operations_contract_template_contract_category_49bb07a713_enum,
+                contract_type = $6::text::operations_contract_template_contract_type_3962dbda6a_enum,
+                billing_model = $7::text::operations_contract_template_billing_model_384a7c60e2_enum,
+                signature_status = $8::text::operations_contract_template_signature_status_56cb6d625b_enum,
                 is_active = $9,
-                status = $10,
+                status = $10::text::operations_contract_template_status_c9d2e90231_enum,
                 content_html = $11,
                 updated_at = NOW()
           WHERE id = $12`, nextSlug, nextCode, nextName, data.description !== undefined
@@ -3026,7 +3095,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return this.listSingleTimesheet(actor, timesheetId);
     }
     async submitTimesheet(userId, timesheetId) {
-        var _a, _b;
+        var _a, _b, _c;
         const actor = await this.getActorContext(userId);
         const current = await this.getTimesheetById(timesheetId);
         if (!actor.isDirector && current.collaboratorId !== actor.collaboratorId) {
@@ -3036,7 +3105,15 @@ let OperationsService = OperationsService_1 = class OperationsService {
             throw new common_1.BadRequestException('Only draft or rejected timesheets can be submitted.');
         }
         const collaborator = await this.getCollaboratorById(current.collaboratorId);
-        const approverId = (_b = (_a = current.approverCollaboratorId) !== null && _a !== void 0 ? _a : collaborator.supervisorId) !== null && _b !== void 0 ? _b : null;
+        const projectManagerRow = await this.querySingle(`SELECT p.manager_collaborator_id AS "managerCollaboratorId"
+         FROM operations_timesheet_entry e
+         LEFT JOIN operations_project_assignment pa ON pa.id = e.project_assignment_id
+         LEFT JOIN operations_project p ON p.id = pa.project_id
+        WHERE e.timesheet_id = $1
+          AND e.deleted_at IS NULL
+          AND p.manager_collaborator_id IS NOT NULL
+        LIMIT 1`, [timesheetId]);
+        const approverId = (_c = (_b = (_a = projectManagerRow === null || projectManagerRow === void 0 ? void 0 : projectManagerRow.managerCollaboratorId) !== null && _a !== void 0 ? _a : current.approverCollaboratorId) !== null && _b !== void 0 ? _b : collaborator.supervisorId) !== null && _c !== void 0 ? _c : null;
         if (!approverId) {
             throw new common_1.BadRequestException('An approver is required before submitting a timesheet.');
         }
@@ -3192,7 +3269,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
          FROM operations_schedule_adjustment_day
         WHERE schedule_adjustment_request_id = ANY($1::int[])
         ORDER BY id ASC`, [requests.map((item) => item.id)]);
-        const currentSchedule = await this.queryRows(`SELECT collaborator_id AS "collaboratorId",
+        const currentSchedule = await this.queryRows(`SELECT DISTINCT ON (collaborator_id, weekday)
+              collaborator_id AS "collaboratorId",
               weekday,
               is_working_day AS "isWorkingDay",
               start_time AS "startTime",
@@ -3200,7 +3278,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
               break_minutes AS "breakMinutes"
          FROM operations_collaborator_schedule_day
         WHERE collaborator_id = ANY($1::int[])
-        ORDER BY id ASC`, [this.uniqueNumbers(requests.map((item) => item.collaboratorId))]);
+        ORDER BY collaborator_id, weekday, id DESC`, [this.uniqueNumbers(requests.map((item) => item.collaboratorId))]);
         const grouped = this.groupBy(days, 'requestId');
         const currentScheduleByCollaborator = this.groupBy(currentSchedule, 'collaboratorId');
         return requests.map((request) => {
@@ -3524,17 +3602,44 @@ let OperationsService = OperationsService_1 = class OperationsService {
         };
     }
     async getCollaboratorByUserId(userId) {
-        return this.querySingle(`SELECT c.id,
+        return this.querySingle(`WITH linked_collaborator AS (
+         SELECT person_id
+           FROM operations_collaborator
+          WHERE user_id = $1
+            AND deleted_at IS NULL
+          ORDER BY id DESC
+          LIMIT 1
+       )
+       SELECT c.id,
+              c.user_id AS "userId",
+              c.person_id AS "personId",
               COALESCE(NULLIF(c.display_name, ''), person_record.name) AS "displayName",
               s.id AS "supervisorId",
-              s.display_name AS "supervisorName"
+              s.display_name AS "supervisorName",
+              COUNT(pa.id) FILTER (
+                WHERE pa.deleted_at IS NULL
+                  AND pa.status IN ('planned', 'active')
+              )::int AS "activeAssignments"
          FROM operations_collaborator c
          LEFT JOIN person person_record
            ON person_record.id = c.person_id
          LEFT JOIN operations_collaborator s
            ON s.id = c.supervisor_collaborator_id
-        WHERE c.user_id = $1
-          AND c.deleted_at IS NULL`, [userId]);
+         LEFT JOIN operations_project_assignment pa
+           ON pa.collaborator_id = c.id
+        WHERE c.deleted_at IS NULL
+          AND (
+            c.user_id = $1
+            OR (
+              c.person_id IS NOT NULL
+              AND c.person_id = (SELECT person_id FROM linked_collaborator)
+            )
+          )
+        GROUP BY c.id, person_record.id, s.id
+        ORDER BY "activeAssignments" DESC,
+                 CASE WHEN c.user_id = $1 THEN 0 ELSE 1 END,
+                 c.id ASC
+        LIMIT 1`, [userId]);
     }
     async getCollaboratorById(collaboratorId) {
         const collaborator = await this.querySingle(`SELECT c.id,
@@ -4584,7 +4689,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return timesheet;
     }
     async replaceTimesheetEntries(client, timesheetId, entries, collaboratorId) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         await client.$executeRawUnsafe(`UPDATE operations_timesheet_entry
           SET deleted_at = NOW()
         WHERE timesheet_id = $1
@@ -4594,17 +4699,19 @@ let OperationsService = OperationsService_1 = class OperationsService {
         const assignmentIds = entries
             .map((entry) => entry.projectAssignmentId)
             .filter((value) => typeof value === 'number');
+        const assignmentMap = new Map();
         if (assignmentIds.length) {
-            const assignments = (await client.$queryRawUnsafe(`SELECT id, collaborator_id AS "collaboratorId"
+            const assignments = (await client.$queryRawUnsafe(`SELECT id,
+                collaborator_id AS "collaboratorId",
+                project_id AS "projectId"
            FROM operations_project_assignment
           WHERE id = ANY($1::int[])
             AND deleted_at IS NULL`, assignmentIds));
-            const assignmentMap = new Map(assignments.map((assignment) => [
-                assignment.id,
-                assignment.collaboratorId,
-            ]));
+            assignments.forEach((assignment) => {
+                assignmentMap.set(assignment.id, assignment);
+            });
             for (const assignmentId of assignmentIds) {
-                if (assignmentMap.get(assignmentId) !== collaboratorId) {
+                if (((_a = assignmentMap.get(assignmentId)) === null || _a === void 0 ? void 0 : _a.collaboratorId) !== collaboratorId) {
                     throw new common_1.ForbiddenException('Timesheet entries must use assignments owned by the target collaborator.');
                 }
             }
@@ -4615,16 +4722,19 @@ let OperationsService = OperationsService_1 = class OperationsService {
             const resolvedTask = entry.taskId
                 ? await this.getOwnedTaskRecord(client, collaboratorId, entry.taskId)
                 : null;
+            const selectedAssignment = entry.projectAssignmentId
+                ? (_b = assignmentMap.get(entry.projectAssignmentId)) !== null && _b !== void 0 ? _b : null
+                : null;
             if (resolvedTask &&
-                entry.projectAssignmentId &&
-                resolvedTask.projectAssignmentId !== entry.projectAssignmentId) {
-                throw new common_1.BadRequestException('The selected task does not belong to the chosen project assignment.');
+                selectedAssignment &&
+                resolvedTask.projectId !== selectedAssignment.projectId) {
+                throw new common_1.BadRequestException('The selected task does not belong to the chosen project.');
             }
-            const resolvedAssignmentId = (_b = (_a = entry.projectAssignmentId) !== null && _a !== void 0 ? _a : resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.projectAssignmentId) !== null && _b !== void 0 ? _b : null;
+            const resolvedAssignmentId = (_d = (_c = entry.projectAssignmentId) !== null && _c !== void 0 ? _c : resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.projectAssignmentId) !== null && _d !== void 0 ? _d : null;
             if (entry.taskId && !resolvedAssignmentId) {
                 throw new common_1.BadRequestException('The selected task must belong to a project assignment.');
             }
-            const activityLabel = (_d = (_c = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _c !== void 0 ? _c : this.normalizeOptionalText(entry.taskName)) !== null && _d !== void 0 ? _d : this.normalizeOptionalText(entry.activityLabel);
+            const activityLabel = (_f = (_e = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _e !== void 0 ? _e : this.normalizeOptionalText(entry.taskName)) !== null && _f !== void 0 ? _f : this.normalizeOptionalText(entry.activityLabel);
             if (!entry.workDate) {
                 throw new common_1.BadRequestException('Timesheet entry workDate is required.');
             }
@@ -4639,7 +4749,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           description,
           created_at,
           updated_at
-        ) VALUES ($1, $2, $3, $4, $5::date, $6, $7, $8, NOW(), NOW())`, timesheetId, resolvedAssignmentId, (_f = (_e = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.id) !== null && _e !== void 0 ? _e : entry.taskId) !== null && _f !== void 0 ? _f : null, activityLabel !== null && activityLabel !== void 0 ? activityLabel : null, entry.workDate, durationMinutes, hours, this.normalizeOptionalText(entry.description));
+        ) VALUES ($1, $2, $3, $4, $5::date, $6, $7, $8, NOW(), NOW())`, timesheetId, resolvedAssignmentId, (_h = (_g = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.id) !== null && _g !== void 0 ? _g : entry.taskId) !== null && _h !== void 0 ? _h : null, activityLabel !== null && activityLabel !== void 0 ? activityLabel : null, entry.workDate, durationMinutes, hours, this.normalizeOptionalText(entry.description));
         }
     }
     async refreshTimesheetTotal(client, timesheetId) {
@@ -4665,6 +4775,29 @@ let OperationsService = OperationsService_1 = class OperationsService {
               updated_at = NOW()
         WHERE id = $1`, timesheetId);
     }
+    async cleanupEmptyEditableTimesheet(client, timesheetId) {
+        var _a;
+        const candidate = (await client.$queryRawUnsafe(`SELECT t.id
+         FROM operations_timesheet t
+        WHERE t.id = $1
+          AND t.deleted_at IS NULL
+          AND t.status IN ('draft', 'rejected')
+          AND NOT EXISTS (
+            SELECT 1
+              FROM operations_timesheet_entry e
+             WHERE e.timesheet_id = t.id
+               AND e.deleted_at IS NULL
+          )
+        LIMIT 1`, timesheetId));
+        if (!((_a = candidate[0]) === null || _a === void 0 ? void 0 : _a.id)) {
+            return;
+        }
+        await client.$executeRawUnsafe(`UPDATE operations_timesheet
+          SET deleted_at = NOW(),
+              updated_at = NOW()
+        WHERE id = $1
+          AND deleted_at IS NULL`, timesheetId);
+    }
     async upsertApproval(client, input) {
         var _a, _b;
         const existing = (await client.$queryRawUnsafe(`SELECT id