@hed-hog/operations 0.0.318 → 0.0.321

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

@@ -1,5 +1,6 @@
 import { Transform } from 'class-transformer';
 import {
+    IsBoolean,
     IsIn,
     IsInt,
     IsNumber,
@@ -73,4 +74,9 @@ export class UpdateOperationsTaskDto {
   @IsOptional()
   @IsString({ message: 'tags must be a string' })
   tags?: string;
+
+  @IsOptional()
+  @Transform(({ value }) => value === 'true' || value === true)
+  @IsBoolean({ message: 'archived must be a boolean' })
+  archived?: boolean;
 }

package/src/operations.module.ts

@@ -5,10 +5,12 @@ import { AiModule, FileModule, IntegrationModule, SettingModule } from '@hed-hog
 import { forwardRef, Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { OperationsApprovalsController } from './controllers/operations-approvals.controller';
+import { OperationsCollaboratorCostsController } from './controllers/operations-collaborator-costs.controller';
 import { OperationsCollaboratorsController } from './controllers/operations-collaborators.controller';
 import { OperationsContractsController } from './controllers/operations-contracts.controller';
 import { OperationsOrgStructureController } from './controllers/operations-org-structure.controller';
 import { OperationsProjectsController } from './controllers/operations-projects.controller';
+import { OperationsReportsController } from './controllers/operations-reports.controller';
 import { OperationsTasksController } from './controllers/operations-tasks.controller';
 import { OperationsTimesheetsController } from './controllers/operations-timesheets.controller';
 import { OperationsController } from './operations.controller';
@@ -30,8 +32,10 @@ import { OperationsAccessService } from './services/shared/operations-access.ser
   controllers: [
     OperationsController,
     OperationsCollaboratorsController,
+    OperationsCollaboratorCostsController,
     OperationsOrgStructureController,
     OperationsProjectsController,
+    OperationsReportsController,
     OperationsTasksController,
     OperationsContractsController,
     OperationsTimesheetsController,

package/src/operations.service.spec.ts

@@ -263,6 +263,7 @@ describe('OperationsService quick-entry timesheets', () => {
     });
     jest.spyOn(service as any, 'getOrCreateTimesheetForWorkDate').mockResolvedValue(55);
     jest.spyOn(service as any, 'refreshTimesheetTotal').mockResolvedValue(undefined);
+    jest.spyOn(service as any, 'submitTimesheetForApproval').mockResolvedValue(undefined);
     jest.spyOn(service as any, 'getTimesheetEntryByIdForActor').mockResolvedValue({
       id: 91,
       durationMinutes: 90,
@@ -296,6 +297,11 @@ describe('OperationsService quick-entry timesheets', () => {
       1.5,
       'Worked on the API layer',
     );
+    expect((service as any).submitTimesheetForApproval).toHaveBeenCalledWith(
+      tx,
+      55,
+      7,
+    );
   });
 
   it('uses the task assignment when full timesheet entries omit projectAssignmentId', async () => {
@@ -356,7 +362,10 @@ describe('OperationsService quick-entry timesheets', () => {
   it('rejects submitting a timesheet without a resolved approver', async () => {
     const tx = {
       $executeRawUnsafe: jest.fn().mockResolvedValue(undefined),
-      $queryRawUnsafe: jest.fn().mockResolvedValue([{ id: 1 }]),
+      $queryRawUnsafe: jest
+        .fn()
+        .mockResolvedValueOnce([])
+        .mockResolvedValueOnce([{ exists: true }]),
     };
 
     (service as any).prisma.$transaction.mockImplementation(
@@ -373,7 +382,6 @@ describe('OperationsService quick-entry timesheets', () => {
       id: 7,
       supervisorId: null,
     });
-    jest.spyOn(service as any, 'upsertApproval').mockResolvedValue(undefined);
     jest.spyOn(service as any, 'listSingleTimesheet').mockResolvedValue({
       id: 55,
       status: 'submitted',
@@ -386,7 +394,10 @@ describe('OperationsService quick-entry timesheets', () => {
   it('rejects submitting a timesheet without active entries', async () => {
     const tx = {
       $executeRawUnsafe: jest.fn().mockResolvedValue(undefined),
-      $queryRawUnsafe: jest.fn().mockResolvedValue([]),
+      $queryRawUnsafe: jest
+        .fn()
+        .mockResolvedValueOnce([{ managerCollaboratorId: 18 }])
+        .mockResolvedValueOnce([{ exists: false }]),
     };
 
     (service as any).prisma.$transaction.mockImplementation(
@@ -403,8 +414,6 @@ describe('OperationsService quick-entry timesheets', () => {
       id: 7,
       supervisorId: 18,
     });
-    jest.spyOn(service as any, 'querySingle').mockResolvedValue({ exists: false });
-    jest.spyOn(service as any, 'upsertApproval').mockResolvedValue(undefined);
     jest.spyOn(service as any, 'listSingleTimesheet').mockResolvedValue({
       id: 56,
       status: 'submitted',
@@ -501,6 +510,7 @@ describe('OperationsService quick-entry timesheets', () => {
     jest.spyOn(service as any, 'getOrCreateTimesheetForWorkDate').mockResolvedValue(77);
     jest.spyOn(service as any, 'refreshTimesheetTotal').mockResolvedValue(undefined);
     jest.spyOn(service as any, 'cleanupEmptyEditableTimesheet').mockResolvedValue(undefined);
+    jest.spyOn(service as any, 'submitTimesheetForApproval').mockResolvedValue(undefined);
 
     const result = await service.updateTimesheetEntry(15, 93, {
       projectId: 12,
@@ -536,17 +546,45 @@ describe('OperationsService quick-entry timesheets', () => {
       tx,
       55,
     );
+    expect((service as any).submitTimesheetForApproval).toHaveBeenCalledWith(
+      tx,
+      77,
+      7,
+    );
   });
 
-  it('rejects deleting entries from submitted timesheets', async () => {
+  it('allows deleting entries from submitted timesheets until approval', async () => {
+    const tx = {
+      $executeRawUnsafe: jest.fn().mockResolvedValue(undefined),
+    };
+
+    (service as any).prisma.$transaction.mockImplementation(
+      async (callback: (client: unknown) => unknown) => callback(tx),
+    );
+
     jest.spyOn(service as any, 'getTimesheetEntryByIdForActor').mockResolvedValue({
       id: 92,
       timesheetId: 56,
       collaboratorId: 7,
       status: 'submitted',
     });
+    jest.spyOn(service as any, 'refreshTimesheetTotal').mockResolvedValue(undefined);
+    jest.spyOn(service as any, 'cleanupEmptyEditableTimesheet').mockResolvedValue(undefined);
+
+    await expect(service.removeTimesheetEntry(15, 92)).resolves.toEqual({
+      success: true,
+    });
+  });
+
+  it('rejects deleting entries from approved timesheets', async () => {
+    jest.spyOn(service as any, 'getTimesheetEntryByIdForActor').mockResolvedValue({
+      id: 94,
+      timesheetId: 57,
+      collaboratorId: 7,
+      status: 'approved',
+    });
 
-    await expect(service.removeTimesheetEntry(15, 92)).rejects.toThrow(
+    await expect(service.removeTimesheetEntry(15, 94)).rejects.toThrow(
       BadRequestException,
     );
   });