@hed-hog/operations 0.0.304 → 0.0.306

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

@@ -1,30 +1,30 @@
-import { PaginationDTO } from '@hed-hog/api-pagination';
-import { Transform } from 'class-transformer';
-import { IsInt, IsOptional, IsString } from 'class-validator';
-
-export class ListCollaboratorsDto extends PaginationDTO {
-  @IsOptional()
-  @IsString()
-  status?: string;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsInt()
-  collaboratorTypeId?: number;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsInt()
-  departmentId?: number;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsInt()
-  jobTitleId?: number;
-}
+import { PaginationDTO } from '@hed-hog/api-pagination';
+import { Transform } from 'class-transformer';
+import { IsInt, IsOptional, IsString } from 'class-validator';
+
+export class ListCollaboratorsDto extends PaginationDTO {
+  @IsOptional()
+  @IsString()
+  status?: string;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt()
+  collaboratorTypeId?: number;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt()
+  departmentId?: number;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt()
+  jobTitleId?: number;
+}

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

@@ -18,8 +18,8 @@ export class ListOperationsTasksDto extends PaginationDTO {
   projectAssignmentId?: number;
 
   @IsOptional()
-  @IsIn(['active', 'completed', 'archived'], {
-    message: 'status must be active, completed, or archived',
+  @IsIn(['todo', 'doing', 'review', 'done'], {
+    message: 'status must be todo, doing, review, or done',
   })
-  status?: 'active' | 'completed' | 'archived';
+  status?: 'todo' | 'doing' | 'review' | 'done';
 }

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/dto/update-task.dto.ts

@@ -1,5 +1,12 @@
 import { Transform } from 'class-transformer';
-import { IsIn, IsInt, IsOptional, IsString, MaxLength } from 'class-validator';
+import {
+    IsIn,
+    IsInt,
+    IsNumber,
+    IsOptional,
+    IsString,
+    MaxLength,
+} from 'class-validator';
 
 export class UpdateOperationsTaskDto {
   @IsOptional()
@@ -16,6 +23,13 @@ export class UpdateOperationsTaskDto {
   @IsInt({ message: 'projectAssignmentId must be an integer' })
   projectAssignmentId?: number;
 
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt({ message: 'assigneeCollaboratorId must be an integer' })
+  assigneeCollaboratorId?: number;
+
   @IsOptional()
   @IsString({ message: 'name must be a string' })
   @MaxLength(180, { message: 'name must have at most 180 characters' })
@@ -23,14 +37,40 @@ export class UpdateOperationsTaskDto {
 
   @IsOptional()
   @IsString({ message: 'description must be a string' })
-  @MaxLength(500, {
-    message: 'description must have at most 500 characters',
-  })
+  @MaxLength(2000, { message: 'description must have at most 2000 characters' })
   description?: string;
 
   @IsOptional()
-  @IsIn(['active', 'completed', 'archived'], {
-    message: 'status must be active, completed, or archived',
+  @IsIn(['low', 'medium', 'high'], {
+    message: 'priority must be low, medium, or high',
   })
-  status?: 'active' | 'completed' | 'archived';
+  priority?: 'low' | 'medium' | 'high';
+
+  @IsOptional()
+  @IsIn(['todo', 'doing', 'review', 'done'], {
+    message: 'status must be todo, doing, review, or done',
+  })
+  status?: 'todo' | 'doing' | 'review' | 'done';
+
+  @IsOptional()
+  @IsString({ message: 'dueDate must be a string' })
+  dueDate?: string;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsNumber({}, { message: 'estimateHours must be a number' })
+  estimateHours?: number;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt({ message: 'position must be an integer' })
+  position?: number;
+
+  @IsOptional()
+  @IsString({ message: 'tags must be a string' })
+  tags?: string;
 }

package/src/operations.service.spec.ts

@@ -472,6 +472,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,