@hed-hog/operations 0.0.305 → 0.0.309

package/src/dto/list-schedule-adjustments.dto.ts

@@ -0,0 +1,8 @@
+import { PaginationDTO } from '@hed-hog/api-pagination';
+import { IsOptional, IsString } from 'class-validator';
+
+export class ListScheduleAdjustmentsDto extends PaginationDTO {
+  @IsOptional()
+  @IsString()
+  status?: string;
+}

package/src/dto/list-time-off-requests.dto.ts

@@ -0,0 +1,8 @@
+import { PaginationDTO } from '@hed-hog/api-pagination';
+import { IsOptional, IsString } from 'class-validator';
+
+export class ListTimeOffRequestsDto extends PaginationDTO {
+  @IsOptional()
+  @IsString()
+  status?: string;
+}

package/src/dto/list-timesheets.dto.ts

@@ -0,0 +1,8 @@
+import { PaginationDTO } from '@hed-hog/api-pagination';
+import { IsOptional, IsString } from 'class-validator';
+
+export class ListTimesheetsDto extends PaginationDTO {
+  @IsOptional()
+  @IsString()
+  status?: string;
+}

package/src/dto/reorder-collaborator-types.dto.ts

@@ -0,0 +1,10 @@
+import { Type } from 'class-transformer';
+import { ArrayMinSize, IsArray, IsInt } from 'class-validator';
+
+export class ReorderCollaboratorTypesDto {
+  @IsArray()
+  @ArrayMinSize(1)
+  @Type(() => Number)
+  @IsInt({ each: true })
+  ids!: number[];
+}

package/src/dto/update-collaborator-type.dto.ts

@@ -1,3 +1,4 @@
-import { CreateCollaboratorTypeDto } from './create-collaborator-type.dto';
-
-export class UpdateCollaboratorTypeDto extends CreateCollaboratorTypeDto {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateCollaboratorTypeDto } from './create-collaborator-type.dto';
+
+export class UpdateCollaboratorTypeDto extends PartialType(CreateCollaboratorTypeDto) {}

package/src/dto/update-collaborator.dto.ts

@@ -1,3 +1,3 @@
-import { CreateCollaboratorDto } from './create-collaborator.dto';
-
-export class UpdateCollaboratorDto extends CreateCollaboratorDto {}
+import { CreateCollaboratorDto } from './create-collaborator.dto';
+
+export class UpdateCollaboratorDto extends CreateCollaboratorDto {}

package/src/operations.service.spec.ts

@@ -29,10 +29,6 @@ describe('OperationsService proposal integration', () => {
 
     jest.spyOn(service as any, 'generateContractCode').mockResolvedValue('CTR-001');
     jest.spyOn(service as any, 'replaceContractParties').mockResolvedValue(undefined);
-    jest
-      .spyOn(service as any, 'replaceContractFinancialTerms')
-      .mockResolvedValue(undefined);
-    jest.spyOn(service as any, 'replaceContractRevisions').mockResolvedValue(undefined);
     jest.spyOn(service as any, 'insertContractHistory').mockResolvedValue(undefined);
   });
 
@@ -156,32 +152,6 @@ describe('OperationsService proposal integration', () => {
         }),
       ],
     );
-    expect((service as any).replaceContractFinancialTerms).toHaveBeenCalledWith(
-      tx,
-      77,
-      expect.arrayContaining([
-        expect.objectContaining({
-          label: 'Monthly retainer',
-          amount: 1000,
-          recurrence: 'monthly',
-        }),
-        expect.objectContaining({
-          label: 'Setup fee',
-          amount: 234,
-          recurrence: 'one_time',
-        }),
-      ]),
-    );
-    expect((service as any).replaceContractRevisions).toHaveBeenCalledWith(
-      tx,
-      77,
-      [
-        expect.objectContaining({
-          title: 'Revision 1',
-          status: 'draft',
-        }),
-      ],
-    );
     expect((service as any).insertContractHistory).toHaveBeenCalledWith(
       tx,
       77,
@@ -472,6 +442,102 @@ describe('OperationsService quick-entry timesheets', () => {
     expect((service as any).refreshTimesheetTotal).toHaveBeenCalledWith(tx, 55);
   });
 
+  it('updates quick entries and moves them to the correct weekly timesheet', async () => {
+    const tx = {
+      $executeRawUnsafe: jest.fn().mockResolvedValue(undefined),
+      $queryRawUnsafe: jest.fn().mockResolvedValue([]),
+    };
+
+    (service as any).prisma.$transaction.mockImplementation(
+      async (callback: (client: unknown) => unknown) => callback(tx),
+    );
+
+    jest
+      .spyOn(service as any, 'getTimesheetEntryByIdForActor')
+      .mockResolvedValueOnce({
+        id: 93,
+        timesheetId: 55,
+        collaboratorId: 7,
+        projectId: 11,
+        projectAssignmentId: 33,
+        taskId: 44,
+        status: 'draft',
+        weekStartDate: '2026-04-06',
+        weekEndDate: '2026-04-12',
+        workDate: '2026-04-09',
+        hours: 1,
+        durationMinutes: 60,
+      })
+      .mockResolvedValueOnce({
+        id: 93,
+        timesheetId: 77,
+        collaboratorId: 7,
+        projectId: 12,
+        projectAssignmentId: 34,
+        taskId: 45,
+        status: 'draft',
+        weekStartDate: '2026-04-13',
+        weekEndDate: '2026-04-19',
+        workDate: '2026-04-14',
+        hours: 2,
+        durationMinutes: 120,
+        taskName: 'Review backlog',
+      });
+    jest.spyOn(service as any, 'resolveOwnedProjectAssignment').mockResolvedValue({
+      id: 34,
+      projectId: 12,
+      projectName: 'Project Boreal',
+      projectCode: 'OPS-12',
+      roleLabel: 'Engineer',
+    });
+    jest.spyOn(service as any, 'getOwnedTaskRecord').mockResolvedValue({
+      id: 45,
+      name: 'Review backlog',
+      projectAssignmentId: 34,
+      projectId: 12,
+      projectName: 'Project Boreal',
+      projectCode: 'OPS-12',
+    });
+    jest.spyOn(service as any, 'getOrCreateTimesheetForWorkDate').mockResolvedValue(77);
+    jest.spyOn(service as any, 'refreshTimesheetTotal').mockResolvedValue(undefined);
+    jest.spyOn(service as any, 'cleanupEmptyEditableTimesheet').mockResolvedValue(undefined);
+
+    const result = await service.updateTimesheetEntry(15, 93, {
+      projectId: 12,
+      projectAssignmentId: 34,
+      taskId: 45,
+      workDate: '2026-04-14',
+      duration: 2,
+      unit: 'hours',
+      description: 'Backlog refinement',
+    } as any);
+
+    expect(result).toEqual(
+      expect.objectContaining({
+        id: 93,
+        timesheetId: 77,
+      }),
+    );
+    expect(tx.$executeRawUnsafe).toHaveBeenCalledWith(
+      expect.stringContaining('UPDATE operations_timesheet_entry'),
+      77,
+      34,
+      45,
+      'Review backlog',
+      '2026-04-14',
+      120,
+      2,
+      'Backlog refinement',
+      93,
+    );
+    expect((service as any).refreshTimesheetTotal).toHaveBeenCalledWith(tx, 55);
+    expect((service as any).refreshTimesheetTotal).toHaveBeenCalledWith(tx, 77);
+    expect((service as any).cleanupEmptyEditableTimesheet).toHaveBeenCalledWith(
+      tx,
+      55,
+    );
+  });
+
   it('rejects deleting entries from submitted timesheets', async () => {
     jest.spyOn(service as any, 'getTimesheetEntryByIdForActor').mockResolvedValue({
       id: 92,