From 7b6460dff2156f40f9d172fdc2490c37df9c4a61 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Tue, 8 Sep 2026 13:55:11 -0300 Subject: [PATCH] fix(f4): name recurrence response contracts for api declarations --- .../src/inspection-findings/finding-recurrence.service.ts | 7 +++++-- .../inspection-findings/inspection-findings.controller.ts | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/api-v3/src/inspection-findings/finding-recurrence.service.ts b/api-v3/src/inspection-findings/finding-recurrence.service.ts index a06e304..ffa4cc9 100644 --- a/api-v3/src/inspection-findings/finding-recurrence.service.ts +++ b/api-v3/src/inspection-findings/finding-recurrence.service.ts @@ -13,6 +13,7 @@ import { AuditAction } from '../database/entities'; import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy'; import type { SetFindingRecurrenceDto } from './dto/set-finding-recurrence.dto'; import { InspectionFindingsService } from './inspection-findings.service'; +import type { InspectionFindingView } from './inspection-findings.service'; interface FindingRecurrenceContext { id: string; @@ -32,6 +33,8 @@ export interface FindingRecurrenceState { recurrenceOfFindingCode: string | null; } +export type FindingWithRecurrenceView = InspectionFindingView & FindingRecurrenceState; + function comparable(value: string): string { return value .normalize('NFD') @@ -104,7 +107,7 @@ export class FindingRecurrenceService { dto: SetFindingRecurrenceDto, principal: AuthPrincipal, request: RequestWithContext, - ) { + ): Promise { assertMobileInspector(principal); await this.dataSource.transaction(async (manager) => { const current = await this.requireFinding(manager, id, true); @@ -174,7 +177,7 @@ export class FindingRecurrenceService { id: string, principal: AuthPrincipal, request: RequestWithContext, - ) { + ): Promise { assertMobileInspector(principal); await this.dataSource.transaction(async (manager) => { const current = await this.requireFinding(manager, id, true); diff --git a/api-v3/src/inspection-findings/inspection-findings.controller.ts b/api-v3/src/inspection-findings/inspection-findings.controller.ts index 20ad646..f55e41b 100644 --- a/api-v3/src/inspection-findings/inspection-findings.controller.ts +++ b/api-v3/src/inspection-findings/inspection-findings.controller.ts @@ -17,8 +17,10 @@ import { CreateInspectionFindingDto } from './dto/create-inspection-finding.dto' import { ListInspectionFindingsQueryDto } from './dto/list-inspection-findings-query.dto'; import { UpdateInspectionFindingDto } from './dto/update-inspection-finding.dto'; import { FindingRecurrenceService } from './finding-recurrence.service'; +import type { FindingRecurrenceState } from './finding-recurrence.service'; import { InspectionFindingWorklistService } from './inspection-finding-worklist.service'; import { InspectionFindingsService } from './inspection-findings.service'; +import type { InspectionFindingView } from './inspection-findings.service'; @Controller('inspection-acts/:actId/findings') export class InspectionActFindingsController { @@ -58,7 +60,9 @@ export class InspectionFindingsController { @Get(':id') @RequirePermissions('inspection_findings.read') - async get(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) { + async get( + @Param('id', new ParseUUIDPipe({ version: '4' })) id: string, + ): Promise { const [finding, recurrence] = await Promise.all([ this.findings.getById(id), this.recurrence.state(id),