@hed-hog/operations 0.0.305 → 0.0.306

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

@@ -1,223 +1,223 @@
-import { Transform, Type } from 'class-transformer';
-import {
-  IsBoolean,
-  IsIn,
-  IsInt,
-  IsNumber,
-  IsObject,
-  IsOptional,
-  IsString,
-  MaxLength,
-  ValidateNested,
-} from 'class-validator';
-
-class CollaboratorWeeklyScheduleDayDto {
-  @IsString()
-  @IsIn([
-    'monday',
-    'tuesday',
-    'wednesday',
-    'thursday',
-    'friday',
-    'saturday',
-    'sunday',
-  ])
-  weekday!:
-    | 'monday'
-    | 'tuesday'
-    | 'wednesday'
-    | 'thursday'
-    | 'friday'
-    | 'saturday'
-    | 'sunday';
-
-  @IsOptional()
-  @IsBoolean()
-  isWorkingDay?: boolean;
-
-  @IsOptional()
-  @IsString()
-  startTime?: string | null;
-
-  @IsOptional()
-  @IsString()
-  endTime?: string | null;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsNumber()
-  breakMinutes?: number | null;
-}
-
-export class CollaboratorEquityParticipationDto {
-  @IsOptional()
-  @IsIn([
-    'partner_quota_holder',
-    'common_shareholder',
-    'preferred_shareholder',
-    'administrator',
-    'other',
-  ])
-  participationType?:
-    | 'partner_quota_holder'
-    | 'common_shareholder'
-    | 'preferred_shareholder'
-    | 'administrator'
-    | 'other';
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsNumber()
-  percentage?: number | null;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsNumber()
-  votingPower?: number | null;
-
-  @IsOptional()
-  @IsString()
-  startDate?: string | null;
-
-  @IsOptional()
-  @IsString()
-  endDate?: string | null;
-
-  @IsOptional()
-  @IsString()
-  notes?: string | null;
-}
-
-export class CreateCollaboratorDto {
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsInt()
-  userId?: number | null;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsInt()
-  personId?: number | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(32)
-  code?: string | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(180)
-  displayName?: string | null;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsInt()
-  collaboratorTypeId?: number | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(80)
-  collaboratorTypeSlug?: string | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(80)
-  collaboratorType?: string | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(120)
-  department?: string | null;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsInt()
-  departmentId?: number | null;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsInt()
-  jobTitleId?: number | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(120)
-  title?: string | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(120)
-  levelLabel?: string | null;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsInt()
-  supervisorCollaboratorId?: number | null;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsNumber()
-  weeklyCapacityHours?: number | null;
-
-  @IsOptional()
-  @IsIn(['draft', 'active', 'on_leave', 'inactive'])
-  status?: 'draft' | 'active' | 'on_leave' | 'inactive';
-
-  @IsOptional()
-  @IsString()
-  joinedAt?: string | null;
-
-  @IsOptional()
-  @IsString()
-  leftAt?: string | null;
-
-  @IsOptional()
-  @Transform(({ value }) =>
-    value === '' || value === undefined || value === null ? undefined : Number(value)
-  )
-  @IsNumber()
-  compensationAmount?: number | null;
-
-  @IsOptional()
-  @IsString()
-  contractDescription?: string | null;
-
-  @IsOptional()
-  @IsBoolean()
-  autoGenerateContractDraft?: boolean;
-
-  @IsOptional()
-  @ValidateNested({ each: true })
-  @Type(() => CollaboratorWeeklyScheduleDayDto)
-  weeklySchedule?: CollaboratorWeeklyScheduleDayDto[];
-
-  @IsOptional()
-  @IsObject()
-  @ValidateNested()
-  @Type(() => CollaboratorEquityParticipationDto)
-  equityParticipation?: CollaboratorEquityParticipationDto | null;
-
-  @IsOptional()
-  @IsString()
-  notes?: string | null;
-}
+import { Transform, Type } from 'class-transformer';
+import {
+  IsBoolean,
+  IsIn,
+  IsInt,
+  IsNumber,
+  IsObject,
+  IsOptional,
+  IsString,
+  MaxLength,
+  ValidateNested,
+} from 'class-validator';
+
+class CollaboratorWeeklyScheduleDayDto {
+  @IsString()
+  @IsIn([
+    'monday',
+    'tuesday',
+    'wednesday',
+    'thursday',
+    'friday',
+    'saturday',
+    'sunday',
+  ])
+  weekday!:
+    | 'monday'
+    | 'tuesday'
+    | 'wednesday'
+    | 'thursday'
+    | 'friday'
+    | 'saturday'
+    | 'sunday';
+
+  @IsOptional()
+  @IsBoolean()
+  isWorkingDay?: boolean;
+
+  @IsOptional()
+  @IsString()
+  startTime?: string | null;
+
+  @IsOptional()
+  @IsString()
+  endTime?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsNumber()
+  breakMinutes?: number | null;
+}
+
+export class CollaboratorEquityParticipationDto {
+  @IsOptional()
+  @IsIn([
+    'partner_quota_holder',
+    'common_shareholder',
+    'preferred_shareholder',
+    'administrator',
+    'other',
+  ])
+  participationType?:
+    | 'partner_quota_holder'
+    | 'common_shareholder'
+    | 'preferred_shareholder'
+    | 'administrator'
+    | 'other';
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsNumber()
+  percentage?: number | null;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsNumber()
+  votingPower?: number | null;
+
+  @IsOptional()
+  @IsString()
+  startDate?: string | null;
+
+  @IsOptional()
+  @IsString()
+  endDate?: string | null;
+
+  @IsOptional()
+  @IsString()
+  notes?: string | null;
+}
+
+export class CreateCollaboratorDto {
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt()
+  userId?: number | null;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt()
+  personId?: number | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(32)
+  code?: string | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(180)
+  displayName?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt()
+  collaboratorTypeId?: number | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(80)
+  collaboratorTypeSlug?: string | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(80)
+  collaboratorType?: string | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(120)
+  department?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt()
+  departmentId?: number | null;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt()
+  jobTitleId?: number | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(120)
+  title?: string | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(120)
+  levelLabel?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsInt()
+  supervisorCollaboratorId?: number | null;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsNumber()
+  weeklyCapacityHours?: number | null;
+
+  @IsOptional()
+  @IsIn(['draft', 'active', 'on_leave', 'inactive'])
+  status?: 'draft' | 'active' | 'on_leave' | 'inactive';
+
+  @IsOptional()
+  @IsString()
+  joinedAt?: string | null;
+
+  @IsOptional()
+  @IsString()
+  leftAt?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) =>
+    value === '' || value === undefined || value === null ? undefined : Number(value)
+  )
+  @IsNumber()
+  compensationAmount?: number | null;
+
+  @IsOptional()
+  @IsString()
+  contractDescription?: string | null;
+
+  @IsOptional()
+  @IsBoolean()
+  autoGenerateContractDraft?: boolean;
+
+  @IsOptional()
+  @ValidateNested({ each: true })
+  @Type(() => CollaboratorWeeklyScheduleDayDto)
+  weeklySchedule?: CollaboratorWeeklyScheduleDayDto[];
+
+  @IsOptional()
+  @IsObject()
+  @ValidateNested()
+  @Type(() => CollaboratorEquityParticipationDto)
+  equityParticipation?: CollaboratorEquityParticipationDto | null;
+
+  @IsOptional()
+  @IsString()
+  notes?: string | null;
+}

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

@@ -1,15 +1,15 @@
-import { Transform } from 'class-transformer';
-import { IsBoolean, IsOptional } from 'class-validator';
-
-export class ListCollaboratorTypesDto {
-  @IsOptional()
-  @Transform(({ value }) => {
-    if (value === '' || value === undefined || value === null) {
-      return undefined;
-    }
-
-    return value === true || value === 'true' || value === '1';
-  })
-  @IsBoolean()
-  active?: boolean;
-}
+import { Transform } from 'class-transformer';
+import { IsBoolean, IsOptional } from 'class-validator';
+
+export class ListCollaboratorTypesDto {
+  @IsOptional()
+  @Transform(({ value }) => {
+    if (value === '' || value === undefined || value === null) {
+      return undefined;
+    }
+
+    return value === true || value === 'true' || value === '1';
+  })
+  @IsBoolean()
+  active?: boolean;
+}

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/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

@@ -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,