@hed-hog/operations 0.0.306 → 0.0.310

package/src/controllers/operations-collaborators.controller.ts

@@ -7,8 +7,10 @@ import {
   ParseIntPipe,
   Patch,
   Post,
+  Query,
 } from '@nestjs/common';
 import { CreateCollaboratorDto } from '../dto/create-collaborator.dto';
+import { ListCollaboratorsDto } from '../dto/list-collaborators.dto';
 import { UpdateCollaboratorDto } from '../dto/update-collaborator.dto';
 import { OperationsService } from '../operations.service';
 
@@ -18,8 +20,19 @@ export class OperationsCollaboratorsController {
   constructor(private readonly operationsService: OperationsService) {}
 
   @Get('collaborators')
-  listCollaborators(@User() user) {
-    return this.operationsService.listCollaborators(Number(user?.id || 0));
+  listCollaborators(@User() user, @Query() filters: ListCollaboratorsDto) {
+    return this.operationsService.listCollaborators(
+      Number(user?.id || 0),
+      filters,
+    );
+  }
+
+  @Get('collaborators/stats')
+  listCollaboratorStats(@User() user, @Query() filters: ListCollaboratorsDto) {
+    return this.operationsService.getCollaboratorStats(
+      Number(user?.id || 0),
+      filters,
+    );
   }
 
   @Get('collaborators/me')

package/src/controllers/operations-contracts.controller.ts

@@ -8,7 +8,9 @@ import {
     ParseIntPipe,
     Patch,
     Post,
+    Query,
 } from '@nestjs/common';
+import { ListContractsDto } from '../dto/list-contracts.dto';
 import { OperationsService } from '../operations.service';
 
 @Role()
@@ -16,43 +18,14 @@ import { OperationsService } from '../operations.service';
 export class OperationsContractsController {
   constructor(private readonly operationsService: OperationsService) {}
 
-  @Get('contract-templates')
-  listContractTemplates(@User() user) {
-    return this.operationsService.listContractTemplates(Number(user?.id || 0));
-  }
-
-  @Get('contract-templates/:id')
-  getContractTemplate(@User() user, @Param('id', ParseIntPipe) id: number) {
-    return this.operationsService.getContractTemplateById(
-      Number(user?.id || 0),
-      id,
-    );
-  }
-
-  @Post('contract-templates')
-  createContractTemplate(@User() user, @Body() data) {
-    return this.operationsService.createContractTemplate(
-      Number(user?.id || 0),
-      data,
-    );
-  }
-
-  @Patch('contract-templates/:id')
-  updateContractTemplate(
-    @User() user,
-    @Param('id', ParseIntPipe) id: number,
-    @Body() data,
-  ) {
-    return this.operationsService.updateContractTemplate(
-      Number(user?.id || 0),
-      id,
-      data,
-    );
+  @Get('contracts')
+  listContracts(@User() user, @Query() filters: ListContractsDto) {
+    return this.operationsService.listContracts(Number(user?.id || 0), filters);
   }
 
-  @Get('contracts')
-  listContracts(@User() user) {
-    return this.operationsService.listContracts(Number(user?.id || 0));
+  @Get('contracts/stats')
+  getContractStats(@User() user) {
+    return this.operationsService.getContractStats(Number(user?.id || 0));
   }
 
   @Get('contracts/:id')
@@ -60,63 +33,11 @@ export class OperationsContractsController {
     return this.operationsService.getContractById(Number(user?.id || 0), id);
   }
 
-  @Post('contracts/drafts')
-  createContractDraft(@User() user, @Body() data) {
-    return this.operationsService.createContractDraft(Number(user?.id || 0), data);
-  }
-
   @Post('contracts')
   createContract(@User() user, @Body() data) {
     return this.operationsService.createContract(Number(user?.id || 0), data);
   }
 
-  @Post('contracts/extract-draft')
-  extractContractDraft(@User() user, @Body() data) {
-    return this.operationsService.extractContractDraft(
-      Number(user?.id || 0),
-      data,
-    );
-  }
-
-  @Post('contracts/:id/extract-source')
-  extractContractSource(
-    @User() user,
-    @Param('id', ParseIntPipe) id: number,
-    @Body() data,
-  ) {
-    return this.operationsService.extractContractSource(
-      Number(user?.id || 0),
-      id,
-      data,
-    );
-  }
-
-  @Post('contracts/:id/generate-content')
-  generateContractContent(
-    @User() user,
-    @Param('id', ParseIntPipe) id: number,
-    @Body() data,
-  ) {
-    return this.operationsService.generateContractContent(
-      Number(user?.id || 0),
-      id,
-      data,
-    );
-  }
-
-  @Post('contracts/:id/legal-review')
-  reviewContractLegally(
-    @User() user,
-    @Param('id', ParseIntPipe) id: number,
-    @Body() data,
-  ) {
-    return this.operationsService.reviewContractLegally(
-      Number(user?.id || 0),
-      id,
-      data,
-    );
-  }
-
   @Patch('contracts/:id')
   updateContract(
     @User() user,
@@ -130,9 +51,4 @@ export class OperationsContractsController {
   removeContract(@User() user, @Param('id', ParseIntPipe) id: number) {
     return this.operationsService.removeContract(Number(user?.id || 0), id);
   }
-
-  @Post('contracts/:id/generate-pdf')
-  generateContractPdf(@User() user, @Param('id', ParseIntPipe) id: number) {
-    return this.operationsService.generateContractPdf(Number(user?.id || 0), id);
-  }
 }

package/src/controllers/operations-org-structure.controller.ts

@@ -1,5 +1,4 @@
 import { Role, User } from '@hed-hog/api';
-import { Pagination } from '@hed-hog/api-pagination';
 import {
     Body,
     Controller,
@@ -8,9 +7,12 @@ import {
     ParseIntPipe,
     Patch,
     Post,
+    Query,
 } from '@nestjs/common';
 import { CreateCollaboratorTypeDto } from '../dto/create-collaborator-type.dto';
 import { ListCollaboratorTypesDto } from '../dto/list-collaborator-types.dto';
+import { ListDepartmentsDto } from '../dto/list-departments.dto';
+import { ReorderCollaboratorTypesDto } from '../dto/reorder-collaborator-types.dto';
 import { UpdateCollaboratorTypeDto } from '../dto/update-collaborator-type.dto';
 import { OperationsService } from '../operations.service';
 
@@ -22,7 +24,7 @@ export class OperationsOrgStructureController {
   @Get('collaborator-types')
   listCollaboratorTypes(
     @User() user,
-    @Pagination() filters: ListCollaboratorTypesDto,
+    @Query() filters: ListCollaboratorTypesDto,
   ) {
     return this.operationsService.listCollaboratorTypes(
       Number(user?.id || 0),
@@ -38,6 +40,17 @@ export class OperationsOrgStructureController {
     );
   }
 
+  @Patch('collaborator-types/reorder')
+  reorderCollaboratorTypes(
+    @User() user,
+    @Body() data: ReorderCollaboratorTypesDto,
+  ) {
+    return this.operationsService.reorderCollaboratorTypes(
+      Number(user?.id || 0),
+      data.ids,
+    );
+  }
+
   @Patch('collaborator-types/:id')
   updateCollaboratorType(
     @User() user,
@@ -62,8 +75,8 @@ export class OperationsOrgStructureController {
   }
 
   @Get('departments')
-  listDepartments(@User() user) {
-    return this.operationsService.listDepartments(Number(user?.id || 0));
+  listDepartments(@User() user, @Query() filters: ListDepartmentsDto) {
+    return this.operationsService.listDepartments(Number(user?.id || 0), filters);
   }
 
   @Post('departments')

package/src/controllers/operations-projects.controller.ts

@@ -1,5 +1,4 @@
 import { Role, User } from '@hed-hog/api';
-import { Pagination } from '@hed-hog/api-pagination';
 import {
     Body,
     Controller,
@@ -8,8 +7,10 @@ import {
     ParseIntPipe,
     Patch,
     Post,
+    Query,
 } from '@nestjs/common';
 import { ListOperationsProjectOptionsDto } from '../dto/list-project-options.dto';
+import { ListProjectsDto } from '../dto/list-projects.dto';
 import { OperationsService } from '../operations.service';
 
 @Role()
@@ -20,7 +21,7 @@ export class OperationsProjectsController {
   @Get('projects/options')
   listProjectOptions(
     @User() user,
-    @Pagination() paginationParams: ListOperationsProjectOptionsDto,
+    @Query() paginationParams: ListOperationsProjectOptionsDto,
   ) {
     return this.operationsService.listProjectOptions(
       Number(user?.id || 0),
@@ -29,8 +30,13 @@ export class OperationsProjectsController {
   }
 
   @Get('projects')
-  listProjects(@User() user) {
-    return this.operationsService.listProjects(Number(user?.id || 0));
+  listProjects(@User() user, @Query() filters: ListProjectsDto) {
+    return this.operationsService.listProjects(Number(user?.id || 0), filters);
+  }
+
+  @Get('projects/:id/stats')
+  getProjectStats(@User() user, @Param('id', ParseIntPipe) id: number) {
+    return this.operationsService.getProjectStats(Number(user?.id || 0), id);
   }
 
   @Get('projects/:id')

package/src/controllers/operations-timesheets.controller.ts

@@ -1,5 +1,4 @@
 import { Role, User } from '@hed-hog/api';
-import { Pagination } from '@hed-hog/api-pagination';
 import {
     Body,
     Controller,
@@ -9,11 +8,15 @@ import {
     ParseIntPipe,
     Patch,
     Post,
+    Query,
 } from '@nestjs/common';
 import { CreateScheduleAdjustmentRequestDto } from '../dto/create-schedule-adjustment-request.dto';
 import { CreateTimeOffRequestDto } from '../dto/create-time-off-request.dto';
 import { CreateTimesheetEntryDto } from '../dto/create-timesheet-entry.dto';
+import { ListScheduleAdjustmentsDto } from '../dto/list-schedule-adjustments.dto';
+import { ListTimeOffRequestsDto } from '../dto/list-time-off-requests.dto';
 import { ListTimesheetEntriesDto } from '../dto/list-timesheet-entries.dto';
+import { ListTimesheetsDto } from '../dto/list-timesheets.dto';
 import { OperationsService } from '../operations.service';
 
 @Role()
@@ -22,14 +25,14 @@ export class OperationsTimesheetsController {
   constructor(private readonly operationsService: OperationsService) {}
 
   @Get('timesheets')
-  listTimesheets(@User() user) {
-    return this.operationsService.listTimesheets(Number(user?.id || 0));
+  listTimesheets(@User() user, @Query() filters: ListTimesheetsDto) {
+    return this.operationsService.listTimesheets(Number(user?.id || 0), filters);
   }
 
   @Get('timesheet-entries')
   listTimesheetEntries(
     @User() user,
-    @Pagination() paginationParams: ListTimesheetEntriesDto,
+    @Query() paginationParams: ListTimesheetEntriesDto,
   ) {
     return this.operationsService.listTimesheetEntries(
       Number(user?.id || 0),
@@ -83,8 +86,8 @@ export class OperationsTimesheetsController {
   }
 
   @Get('time-off')
-  listTimeOffRequests(@User() user) {
-    return this.operationsService.listTimeOffRequests(Number(user?.id || 0));
+  listTimeOffRequests(@User() user, @Query() filters: ListTimeOffRequestsDto) {
+    return this.operationsService.listTimeOffRequests(Number(user?.id || 0), filters);
   }
 
   @Post('time-off')
@@ -96,8 +99,14 @@ export class OperationsTimesheetsController {
   }
 
   @Get('schedule-adjustments')
-  listScheduleAdjustments(@User() user) {
-    return this.operationsService.listScheduleAdjustments(Number(user?.id || 0));
+  listScheduleAdjustments(
+    @User() user,
+    @Query() filters: ListScheduleAdjustmentsDto,
+  ) {
+    return this.operationsService.listScheduleAdjustments(
+      Number(user?.id || 0),
+      filters,
+    );
   }
 
   @Post('schedule-adjustments')

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

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

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

@@ -1,7 +1,8 @@
+import { PaginationDTO } from '@hed-hog/api-pagination';
 import { Transform } from 'class-transformer';
-import { IsBoolean, IsOptional } from 'class-validator';
+import { IsBoolean, IsOptional, IsString } from 'class-validator';
 
-export class ListCollaboratorTypesDto {
+export class ListCollaboratorTypesDto extends PaginationDTO {
   @IsOptional()
   @Transform(({ value }) => {
     if (value === '' || value === undefined || value === null) {
@@ -12,4 +13,8 @@ export class ListCollaboratorTypesDto {
   })
   @IsBoolean()
   active?: boolean;
+
+  @IsOptional()
+  @IsString()
+  status?: string;
 }

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

@@ -7,6 +7,10 @@ export class ListCollaboratorsDto extends PaginationDTO {
   @IsString()
   status?: string;
 
+  @IsOptional()
+  @IsString()
+  collaboratorType?: string;
+
   @IsOptional()
   @Transform(({ value }) =>
     value === '' || value === undefined || value === null ? undefined : Number(value)

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

@@ -0,0 +1,20 @@
+import { PaginationDTO } from '@hed-hog/api-pagination';
+import { IsBooleanString, IsOptional, IsString } from 'class-validator';
+
+export class ListContractsDto extends PaginationDTO {
+  @IsOptional()
+  @IsString()
+  status?: string;
+
+  @IsOptional()
+  @IsString()
+  contractCategory?: string;
+
+  @IsOptional()
+  @IsString()
+  originType?: string;
+
+  @IsOptional()
+  @IsBooleanString()
+  isActive?: string;
+}

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

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

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

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

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