Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b86dbbc17 | ||
|
|
0279c22e20 | ||
|
|
2571bda8c4 | ||
|
|
cd24736df8 | ||
|
|
8e2d0dfe19 | ||
|
|
afde214cbb |
@@ -0,0 +1,66 @@
|
||||
name: DH V2 CI
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [main]
|
||||
push:
|
||||
branches: [main]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: dhv2-ci-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
api:
|
||||
name: API · typecheck, tests, build
|
||||
runs-on: ubuntu-latest
|
||||
defaults:
|
||||
run:
|
||||
working-directory: api-v3
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '24'
|
||||
cache: npm
|
||||
cache-dependency-path: api-v3/package-lock.json
|
||||
- run: npm ci
|
||||
- run: npm run typecheck
|
||||
- run: npm test
|
||||
- run: npm run build
|
||||
|
||||
web:
|
||||
name: WEB · typecheck, build
|
||||
runs-on: ubuntu-latest
|
||||
defaults:
|
||||
run:
|
||||
working-directory: web-v2
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '24'
|
||||
cache: npm
|
||||
cache-dependency-path: web-v2/package-lock.json
|
||||
- run: npm ci
|
||||
- run: npm run typecheck
|
||||
- run: npm run build
|
||||
|
||||
contract:
|
||||
name: Docker / scripts contract
|
||||
runs-on: ubuntu-latest
|
||||
needs: [api, web]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Validate shell scripts
|
||||
run: |
|
||||
while IFS= read -r -d '' script; do
|
||||
bash -n "$script"
|
||||
done < <(find scripts -type f -name '*.sh' -print0)
|
||||
- name: Validate Compose
|
||||
run: docker compose --env-file .env.example config >/dev/null
|
||||
- name: Build production images
|
||||
run: docker compose --env-file .env.example build api migrate web
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "dhv2-api",
|
||||
"version": "0.19.6-4",
|
||||
"version": "0.20.0-2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "dhv2-api",
|
||||
"version": "0.19.6-4",
|
||||
"version": "0.20.0-2",
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"@nestjs/common": "^11.0.0",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dhv2-api",
|
||||
"version": "0.19.6-4",
|
||||
"version": "0.20.0-2",
|
||||
"private": true,
|
||||
"license": "UNLICENSED",
|
||||
"scripts": {
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
|
||||
import { Body, Controller, Get, Param, ParseUUIDPipe, Patch, Post, Query, Req, Res, UploadedFile, UseInterceptors } from '@nestjs/common';
|
||||
import { FileInterceptor } from '@nestjs/platform-express';
|
||||
import type { Response } from 'express';
|
||||
import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
|
||||
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
|
||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
||||
import { ActAdministrationService, MAX_ACT_RESPONSE_BYTES, type UploadedActResponseFile } from './act-administration.service';
|
||||
import { CreateActCompanyResponseDto } from './dto/create-act-company-response.dto';
|
||||
import { ListActAdministrationQueryDto } from './dto/list-act-administration-query.dto';
|
||||
import { SetActResponseDeadlineDto } from './dto/set-act-response-deadline.dto';
|
||||
|
||||
@Controller('act-administration')
|
||||
export class ActAdministrationQueueController {
|
||||
constructor(private readonly administration: ActAdministrationService) {}
|
||||
@Get('queue') @RequirePermissions('inspection_acts.read') queue(@Query() query: ListActAdministrationQueryDto) { return this.administration.queue(query); }
|
||||
@Get('calendar') @RequirePermissions('inspection_acts.read') calendar(@Query('from') from?: string, @Query('to') to?: string) { return this.administration.calendar(from, to); }
|
||||
}
|
||||
|
||||
@Controller('inspection-acts/:actId/administration')
|
||||
export class ActAdministrationController {
|
||||
constructor(private readonly administration: ActAdministrationService) {}
|
||||
@Get() @RequirePermissions('inspection_acts.read') get(@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string) { return this.administration.detail(actId); }
|
||||
@Patch('deadline') @RequirePermissions('inspection_findings.follow_up')
|
||||
setDeadline(@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string, @Body() dto: SetActResponseDeadlineDto, @CurrentAuth() principal: AuthPrincipal, @Req() request: RequestWithContext) { return this.administration.setDeadline(actId, dto, principal, request); }
|
||||
@Post('responses') @RequirePermissions('inspection_findings.follow_up')
|
||||
@UseInterceptors(FileInterceptor('file', { limits: { fileSize: MAX_ACT_RESPONSE_BYTES, files: 1 } }))
|
||||
addResponse(@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string, @Body() dto: CreateActCompanyResponseDto, @UploadedFile() file: UploadedActResponseFile | undefined, @CurrentAuth() principal: AuthPrincipal, @Req() request: RequestWithContext) { return this.administration.addResponse(actId, dto, file, principal, request); }
|
||||
}
|
||||
|
||||
@Controller('act-company-responses')
|
||||
export class ActCompanyResponseContentController {
|
||||
constructor(private readonly administration: ActAdministrationService) {}
|
||||
@Get(':responseId/content') @RequirePermissions('inspection_acts.read')
|
||||
async content(@Param('responseId', new ParseUUIDPipe({ version: '4' })) responseId: string, @Query('download') download: string | undefined, @Res() response: Response): Promise<void> {
|
||||
const item = await this.administration.responseContent(responseId);
|
||||
const disposition = download === '1' ? 'attachment' : 'inline';
|
||||
const fallbackName = item.originalName.replace(/[^\x20-\x7e]/g, '_').replace(/["\\]/g, '_');
|
||||
response.setHeader('Content-Type', 'application/pdf');
|
||||
response.setHeader('Content-Length', String(item.sizeBytes));
|
||||
response.setHeader('Content-Disposition', `${disposition}; filename="${fallbackName}"; filename*=UTF-8''${encodeURIComponent(item.originalName)}`);
|
||||
response.setHeader('Cache-Control', 'private, no-store');
|
||||
response.setHeader('X-Content-Type-Options', 'nosniff');
|
||||
response.setHeader('Content-Security-Policy', "sandbox; default-src 'none'");
|
||||
await new Promise<void>((resolveSend, rejectSend) => response.sendFile(item.filePath, (error) => error ? rejectSend(error) : resolveSend()));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
|
||||
import { Module } from '@nestjs/common';
|
||||
import { AuditModule } from '../audit/audit.module';
|
||||
import { ActAdministrationController, ActAdministrationQueueController, ActCompanyResponseContentController } from './act-administration.controller';
|
||||
import { ActAdministrationService } from './act-administration.service';
|
||||
|
||||
@Module({
|
||||
imports: [AuditModule],
|
||||
controllers: [ActAdministrationQueueController, ActAdministrationController, ActCompanyResponseContentController],
|
||||
providers: [ActAdministrationService],
|
||||
})
|
||||
export class ActAdministrationModule {}
|
||||
@@ -0,0 +1,180 @@
|
||||
|
||||
import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
|
||||
import { createHash, randomUUID } from 'crypto';
|
||||
import { mkdir, stat, unlink, writeFile } from 'fs/promises';
|
||||
import { join, resolve } from 'path';
|
||||
import { DataSource } from 'typeorm';
|
||||
import { AuditService } from '../audit/audit.service';
|
||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
||||
import { CreateActCompanyResponseDto } from './dto/create-act-company-response.dto';
|
||||
import { ListActAdministrationQueryDto } from './dto/list-act-administration-query.dto';
|
||||
import { SetActResponseDeadlineDto } from './dto/set-act-response-deadline.dto';
|
||||
|
||||
export const MAX_ACT_RESPONSE_BYTES = 15 * 1024 * 1024;
|
||||
export interface UploadedActResponseFile { originalname: string; mimetype: string; size: number; buffer: Buffer }
|
||||
|
||||
const STORAGE = resolve(process.env.ACT_COMPANY_RESPONSE_STORAGE_DIR ?? '/app/storage/act-company-responses');
|
||||
|
||||
@Injectable()
|
||||
export class ActAdministrationService {
|
||||
constructor(private readonly dataSource: DataSource, private readonly audit: AuditService) {}
|
||||
|
||||
private baseCte() {
|
||||
return `
|
||||
WITH act_rows AS (
|
||||
SELECT ia.id AS "actId", ia.code AS "actCode", ia.status AS "actStatus", ia.occurred_at AS "occurredAt",
|
||||
ia.closed_at AS "closedAt", v.id AS "visitId", v.code AS "visitCode",
|
||||
v.operational_area_id AS "areaId", v.operator_company_id AS "companyId",
|
||||
area.name AS "areaName", COALESCE(op.legal_name, company.name) AS "companyName",
|
||||
dl.id AS "deadlineEventId", dl.response_due_on AS "responseDueOn", dl.reason AS "deadlineReason",
|
||||
dl.created_at AS "deadlineSetAt", rsp.id AS "latestResponseId", rsp.received_on AS "responseReceivedOn",
|
||||
rsp.committed_correction_on AS "committedCorrectionOn",
|
||||
COALESCE(fc.finding_count, 0)::int AS "findingCount",
|
||||
COALESCE(fc.open_count, 0)::int AS "openFindingCount",
|
||||
COALESCE(fc.scheduled_control_count, 0)::int AS "scheduledControlCount"
|
||||
FROM inspection_acts ia
|
||||
JOIN inspection_visits v ON v.id = ia.visit_id
|
||||
LEFT JOIN assets area ON area.id = v.operational_area_id
|
||||
LEFT JOIN assets company ON company.id = v.operator_company_id
|
||||
LEFT JOIN organization_profiles op ON op.asset_id = v.operator_company_id
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT d.* FROM inspection_act_deadline_events d WHERE d.act_id = ia.id ORDER BY d.created_at DESC, d.id DESC LIMIT 1
|
||||
) dl ON true
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT r.* FROM inspection_act_company_responses r WHERE r.act_id = ia.id ORDER BY r.received_on DESC, r.created_at DESC, r.id DESC LIMIT 1
|
||||
) rsp ON true
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT COUNT(*) FILTER (WHERE f.status <> 'VOIDED') AS finding_count,
|
||||
COUNT(*) FILTER (WHERE f.status = 'OPEN') AS open_count,
|
||||
COUNT(*) FILTER (WHERE f.status = 'OPEN' AND f.next_control_on IS NOT NULL) AS scheduled_control_count
|
||||
FROM inspection_findings f WHERE f.act_id = ia.id
|
||||
) fc ON true
|
||||
WHERE ia.status IN ('CLOSED', 'RECTIFIED')
|
||||
), classified AS (
|
||||
SELECT *, CASE
|
||||
WHEN "findingCount" > 0 AND "openFindingCount" = 0 THEN 'REGULARIZED'
|
||||
WHEN "latestResponseId" IS NOT NULL AND "committedCorrectionOn" IS NOT NULL AND "committedCorrectionOn" < CURRENT_DATE AND "openFindingCount" > 0 THEN 'COMMITMENT_OVERDUE'
|
||||
WHEN "latestResponseId" IS NOT NULL AND "openFindingCount" > 0 AND "scheduledControlCount" = 0 THEN 'VERIFICATION_PENDING'
|
||||
WHEN "latestResponseId" IS NOT NULL THEN 'RESPONSE_RECEIVED'
|
||||
WHEN "responseDueOn" IS NULL THEN 'NEW'
|
||||
WHEN "responseDueOn" < CURRENT_DATE THEN 'OVERDUE'
|
||||
WHEN "responseDueOn" <= CURRENT_DATE + 3 THEN 'DUE_SOON'
|
||||
ELSE 'WAITING_RESPONSE'
|
||||
END AS "adminState"
|
||||
FROM act_rows
|
||||
)`;
|
||||
}
|
||||
|
||||
async queue(query: ListActAdministrationQueryDto) {
|
||||
const page = query.page ?? 1;
|
||||
const pageSize = query.pageSize ?? 25;
|
||||
const filters: string[] = [];
|
||||
const args: unknown[] = [];
|
||||
const add = (sql: string, value: unknown) => { args.push(value); filters.push(sql.replace('?', `$${args.length}`)); };
|
||||
if (query.areaId) add('"areaId" = ?', query.areaId);
|
||||
if (query.companyId) add('"companyId" = ?', query.companyId);
|
||||
if (query.state && query.state !== 'ALL') add('"adminState" = ?', query.state);
|
||||
const where = filters.length ? `WHERE ${filters.join(' AND ')}` : '';
|
||||
const rows = await this.dataSource.query(
|
||||
`${this.baseCte()} SELECT *, COUNT(*) OVER()::int AS "totalRows" FROM classified ${where} ORDER BY "responseDueOn" ASC NULLS FIRST, "occurredAt" DESC LIMIT $${args.length + 1} OFFSET $${args.length + 2}`,
|
||||
[...args, pageSize, (page - 1) * pageSize],
|
||||
) as Array<Record<string, unknown>>;
|
||||
const total = Number(rows[0]?.totalRows ?? 0);
|
||||
const counterFilters: string[] = [];
|
||||
const counterArgs: unknown[] = [];
|
||||
if (query.areaId) { counterArgs.push(query.areaId); counterFilters.push(`"areaId" = $${counterArgs.length}`); }
|
||||
if (query.companyId) { counterArgs.push(query.companyId); counterFilters.push(`"companyId" = $${counterArgs.length}`); }
|
||||
const countersRaw = await this.dataSource.query(
|
||||
`${this.baseCte()} SELECT "adminState" AS state, COUNT(*)::int AS count FROM classified ${counterFilters.length ? `WHERE ${counterFilters.join(' AND ')}` : ''} GROUP BY "adminState"`,
|
||||
counterArgs,
|
||||
) as Array<{ state: string; count: number }>;
|
||||
const counters = Object.fromEntries(countersRaw.map((r) => [r.state, Number(r.count)]));
|
||||
return {
|
||||
data: rows.map(({ totalRows: _ignored, ...row }) => row),
|
||||
counters,
|
||||
meta: { page, pageSize, total, totalPages: Math.ceil(total / pageSize) },
|
||||
};
|
||||
}
|
||||
|
||||
async detail(actId: string) {
|
||||
const rows = await this.dataSource.query(`${this.baseCte()} SELECT * FROM classified WHERE "actId" = $1`, [actId]);
|
||||
const act = rows[0];
|
||||
if (!act) throw new NotFoundException({ code: 'ACT_ADMIN_NOT_FOUND', message: 'El Acta no está disponible para seguimiento administrativo.' });
|
||||
const deadlines = await this.dataSource.query(`SELECT id, response_due_on AS "responseDueOn", reason, created_by AS "createdBy", created_at AS "createdAt" FROM inspection_act_deadline_events WHERE act_id = $1 ORDER BY created_at DESC`, [actId]);
|
||||
const responses = await this.dataSource.query(`SELECT id, received_on AS "receivedOn", details, committed_correction_on AS "committedCorrectionOn", contact_name AS "contactName", contact_email AS "contactEmail", original_name AS "originalName", mime_type AS "mimeType", size_bytes AS "sizeBytes", sha256, created_by AS "createdBy", created_at AS "createdAt" FROM inspection_act_company_responses WHERE act_id = $1 ORDER BY received_on DESC, created_at DESC`, [actId]);
|
||||
const findings = await this.dataSource.query(`SELECT id, code, title, status, next_control_on AS "nextControlOn" FROM inspection_findings WHERE act_id = $1 AND status <> 'VOIDED' ORDER BY finding_number`, [actId]);
|
||||
return { act, deadlines, responses, findings };
|
||||
}
|
||||
|
||||
private async ensureClosedAct(actId: string) {
|
||||
const rows = await this.dataSource.query(`SELECT id, code, status FROM inspection_acts WHERE id = $1`, [actId]);
|
||||
const act = rows[0];
|
||||
if (!act) throw new NotFoundException({ code: 'ACT_NOT_FOUND', message: 'Acta inexistente.' });
|
||||
if (!['CLOSED', 'RECTIFIED'].includes(act.status)) throw new BadRequestException({ code: 'ACT_ADMIN_REQUIRES_CLOSED', message: 'El seguimiento administrativo comienza cuando el Acta está cerrada.' });
|
||||
return act;
|
||||
}
|
||||
|
||||
async setDeadline(actId: string, dto: SetActResponseDeadlineDto, principal: AuthPrincipal, request: RequestWithContext) {
|
||||
const act = await this.ensureClosedAct(actId);
|
||||
const rows = await this.dataSource.query(
|
||||
`INSERT INTO inspection_act_deadline_events (id, act_id, response_due_on, reason, created_by) VALUES ($1,$2,$3,$4,$5) RETURNING id, response_due_on AS "responseDueOn", reason, created_at AS "createdAt"`,
|
||||
[randomUUID(), actId, dto.responseDueOn, dto.reason, principal.userId],
|
||||
);
|
||||
await this.audit.record({ actorUserId: principal.userId, actorUsername: principal.username, action: 'ACT_RESPONSE_DEADLINE_SET', entityType: 'inspection_act', entityId: actId, requestId: request.requestId, afterData: { actCode: act.code, responseDueOn: dto.responseDueOn, reason: dto.reason } });
|
||||
return rows[0];
|
||||
}
|
||||
|
||||
async addResponse(actId: string, dto: CreateActCompanyResponseDto, file: UploadedActResponseFile | undefined, principal: AuthPrincipal, request: RequestWithContext) {
|
||||
const act = await this.ensureClosedAct(actId);
|
||||
let storedName: string | null = null;
|
||||
let sha256: string | null = null;
|
||||
if (file) {
|
||||
if (file.size <= 0 || file.size > MAX_ACT_RESPONSE_BYTES) throw new BadRequestException({ code: 'ACT_RESPONSE_FILE_SIZE', message: 'El PDF supera el límite permitido.' });
|
||||
if (file.mimetype !== 'application/pdf' || file.buffer.subarray(0, 5).toString('ascii') !== '%PDF-') throw new BadRequestException({ code: 'ACT_RESPONSE_FILE_TYPE', message: 'La respuesta adjunta debe ser un PDF válido.' });
|
||||
await mkdir(STORAGE, { recursive: true });
|
||||
sha256 = createHash('sha256').update(file.buffer).digest('hex');
|
||||
storedName = `${randomUUID()}.pdf`;
|
||||
await writeFile(join(STORAGE, storedName), file.buffer, { flag: 'wx' });
|
||||
}
|
||||
try {
|
||||
const rows = await this.dataSource.query(
|
||||
`INSERT INTO inspection_act_company_responses (id, act_id, received_on, details, committed_correction_on, contact_name, contact_email, original_name, stored_name, mime_type, size_bytes, sha256, created_by)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)
|
||||
RETURNING id, received_on AS "receivedOn", details, committed_correction_on AS "committedCorrectionOn", contact_name AS "contactName", contact_email AS "contactEmail", original_name AS "originalName", size_bytes AS "sizeBytes", sha256, created_at AS "createdAt"`,
|
||||
[randomUUID(), actId, dto.receivedOn, dto.details ?? null, dto.committedCorrectionOn ?? null, dto.contactName ?? null, dto.contactEmail ?? null, file?.originalname ?? null, storedName, file ? 'application/pdf' : null, file?.size ?? null, sha256, principal.userId],
|
||||
);
|
||||
await this.audit.record({ actorUserId: principal.userId, actorUsername: principal.username, action: 'ACT_COMPANY_RESPONSE_RECORDED', entityType: 'inspection_act', entityId: actId, requestId: request.requestId, afterData: { actCode: act.code, receivedOn: dto.receivedOn, committedCorrectionOn: dto.committedCorrectionOn ?? null, hasPdf: Boolean(file), sha256 } });
|
||||
return rows[0];
|
||||
} catch (error) {
|
||||
if (storedName) await unlink(join(STORAGE, storedName)).catch(() => undefined);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async responseContent(responseId: string) {
|
||||
const rows = await this.dataSource.query(`SELECT original_name AS "originalName", stored_name AS "storedName", size_bytes AS "sizeBytes" FROM inspection_act_company_responses WHERE id = $1 AND stored_name IS NOT NULL`, [responseId]);
|
||||
const row = rows[0];
|
||||
if (!row) throw new NotFoundException({ code: 'ACT_RESPONSE_FILE_NOT_FOUND', message: 'PDF de respuesta inexistente.' });
|
||||
const filePath = join(STORAGE, row.storedName);
|
||||
const info = await stat(filePath).catch(() => null);
|
||||
if (!info?.isFile()) throw new NotFoundException({ code: 'ACT_RESPONSE_FILE_NOT_FOUND', message: 'El archivo de respuesta no está disponible.' });
|
||||
return { originalName: row.originalName as string, sizeBytes: Number(row.sizeBytes), filePath };
|
||||
}
|
||||
|
||||
async calendar(from?: string, to?: string) {
|
||||
const dateRe = /^\d{4}-\d{2}-\d{2}$/;
|
||||
if ((from && !dateRe.test(from)) || (to && !dateRe.test(to))) throw new BadRequestException({ code: 'INVALID_DATE_RANGE', message: 'Las fechas deben usar YYYY-MM-DD.' });
|
||||
const start = from ?? new Date().toISOString().slice(0, 10);
|
||||
const endDate = new Date(`${to ?? start}T00:00:00Z`);
|
||||
if (!to) endDate.setUTCDate(endDate.getUTCDate() + 60);
|
||||
const end = endDate.toISOString().slice(0, 10);
|
||||
if (start > end) throw new BadRequestException({ code: 'INVALID_DATE_RANGE', message: 'El rango de fechas es inválido.' });
|
||||
const rows = await this.dataSource.query(`${this.baseCte()} SELECT * FROM classified WHERE ("responseDueOn" BETWEEN $1 AND $2) OR ("committedCorrectionOn" BETWEEN $1 AND $2) ORDER BY COALESCE("responseDueOn", "committedCorrectionOn")`, [start, end]);
|
||||
const events: Array<Record<string, unknown>> = [];
|
||||
for (const row of rows) {
|
||||
if (row.responseDueOn && row.responseDueOn >= start && row.responseDueOn <= end) events.push({ type: 'RESPONSE_DUE', date: row.responseDueOn, actId: row.actId, actCode: row.actCode, areaName: row.areaName, companyName: row.companyName, state: row.adminState });
|
||||
if (row.committedCorrectionOn && row.committedCorrectionOn >= start && row.committedCorrectionOn <= end) events.push({ type: 'COMMITMENT_DUE', date: row.committedCorrectionOn, actId: row.actId, actCode: row.actCode, areaName: row.areaName, companyName: row.companyName, state: row.adminState });
|
||||
}
|
||||
return { from: start, to: end, data: events.sort((a, b) => String(a.date).localeCompare(String(b.date))) };
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
|
||||
import { Transform } from 'class-transformer';
|
||||
import { IsDateString, IsEmail, IsOptional, IsString, MaxLength, MinLength } from 'class-validator';
|
||||
|
||||
export class CreateActCompanyResponseDto {
|
||||
@IsDateString()
|
||||
receivedOn!: string;
|
||||
|
||||
@IsOptional()
|
||||
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
|
||||
@IsString()
|
||||
@MinLength(3)
|
||||
@MaxLength(8000)
|
||||
details?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsDateString()
|
||||
committedCorrectionOn?: string;
|
||||
|
||||
@IsOptional()
|
||||
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
|
||||
@IsString()
|
||||
@MaxLength(200)
|
||||
contactName?: string;
|
||||
|
||||
@IsOptional()
|
||||
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
|
||||
@IsEmail()
|
||||
@MaxLength(320)
|
||||
contactEmail?: string;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
|
||||
import { Transform } from 'class-transformer';
|
||||
import { IsIn, IsInt, IsOptional, IsUUID, Max, Min } from 'class-validator';
|
||||
|
||||
export const ACT_ADMIN_STATES = [
|
||||
'ALL', 'NEW', 'WAITING_RESPONSE', 'DUE_SOON', 'OVERDUE',
|
||||
'RESPONSE_RECEIVED', 'VERIFICATION_PENDING', 'COMMITMENT_OVERDUE', 'REGULARIZED',
|
||||
] as const;
|
||||
export type ActAdministrationState = typeof ACT_ADMIN_STATES[number];
|
||||
|
||||
export class ListActAdministrationQueryDto {
|
||||
@IsOptional() @IsIn(ACT_ADMIN_STATES) state?: ActAdministrationState;
|
||||
@IsOptional() @IsUUID('4') areaId?: string;
|
||||
@IsOptional() @IsUUID('4') companyId?: string;
|
||||
@IsOptional() @Transform(({ value }) => Number(value)) @IsInt() @Min(1) page?: number;
|
||||
@IsOptional() @Transform(({ value }) => Number(value)) @IsInt() @Min(1) @Max(100) pageSize?: number;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
|
||||
import { Transform } from 'class-transformer';
|
||||
import { IsDateString, IsString, MaxLength, MinLength } from 'class-validator';
|
||||
|
||||
export class SetActResponseDeadlineDto {
|
||||
@IsDateString()
|
||||
responseDueOn!: string;
|
||||
|
||||
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
|
||||
@IsString()
|
||||
@MinLength(3)
|
||||
@MaxLength(1000)
|
||||
reason!: string;
|
||||
}
|
||||
@@ -24,6 +24,7 @@ import { InspectionClosingModule } from './inspection-closing/inspection-closing
|
||||
import { AssetImportsModule } from './asset-imports/asset-imports.module';
|
||||
import { InspectionReportsModule } from './inspection-reports/inspection-reports.module';
|
||||
import { InspectionVerificationsModule } from './inspection-verifications/inspection-verifications.module';
|
||||
import { ActAdministrationModule } from './act-administration/act-administration.module';
|
||||
|
||||
function required(config: ConfigService, key: string): string {
|
||||
const value = config.get<string>(key);
|
||||
@@ -76,6 +77,7 @@ function required(config: ConfigService, key: string): string {
|
||||
InspectionClosingModule,
|
||||
InspectionReportsModule,
|
||||
InspectionVerificationsModule,
|
||||
ActAdministrationModule,
|
||||
AssetImportsModule,
|
||||
],
|
||||
controllers: [HealthController],
|
||||
|
||||
@@ -93,6 +93,7 @@ export {
|
||||
InspectionActSignatureSource,
|
||||
InspectionActSignatureStatus,
|
||||
InspectionActSignerType,
|
||||
InspectionCompanySignatureManifestation,
|
||||
} from './inspection-act-signature.entity';
|
||||
export { FindingCategory } from './finding-category.entity';
|
||||
export { FindingCatalogItem } from './finding-catalog-item.entity';
|
||||
|
||||
@@ -17,6 +17,11 @@ export enum InspectionActSignatureSource {
|
||||
ANDROID = 'ANDROID',
|
||||
}
|
||||
|
||||
export enum InspectionCompanySignatureManifestation {
|
||||
CONFORMITY = 'CONFORMITY',
|
||||
DISSENT = 'DISSENT',
|
||||
}
|
||||
|
||||
@Entity({ name: 'inspection_act_signatures' })
|
||||
@Index('idx_inspection_act_signatures_act_created', ['actId', 'createdAt'])
|
||||
@Index('idx_inspection_act_signatures_sha256', ['signaturePayloadSha256'])
|
||||
@@ -51,6 +56,12 @@ export class InspectionActSignature {
|
||||
@Column({ type: 'text', nullable: true })
|
||||
reason!: string | null;
|
||||
|
||||
@Column({ name: 'company_manifestation', type: 'varchar', length: 20, nullable: true })
|
||||
companyManifestation!: InspectionCompanySignatureManifestation | null;
|
||||
|
||||
@Column({ name: 'company_statement', type: 'text', nullable: true })
|
||||
companyStatement!: string | null;
|
||||
|
||||
@Column({ name: 'original_name', type: 'varchar', length: 255, nullable: true })
|
||||
originalName!: string | null;
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ export enum InspectionActStatus {
|
||||
}
|
||||
|
||||
@Entity({ name: 'inspection_acts' })
|
||||
@Index('uq_inspection_acts_visit', ['visitId'], { unique: true })
|
||||
@Index('uq_inspection_acts_one_draft_per_visit', ['visitId'], { unique: true, where: "status = 'DRAFT'" })
|
||||
@Index('uq_inspection_acts_year_number', ['actYear', 'actNumber'], { unique: true })
|
||||
@Index('uq_inspection_acts_code', ['code'], { unique: true })
|
||||
@Index('idx_inspection_acts_visit_status', ['visitId', 'status'])
|
||||
|
||||
@@ -25,7 +25,7 @@ export enum InspectionReportReviewStatus {
|
||||
}
|
||||
|
||||
@Entity({ name: 'inspection_reports' })
|
||||
@Index('uq_inspection_reports_visit', ['visitId'], { unique: true })
|
||||
@Index('idx_inspection_reports_visit_id', ['visitId'])
|
||||
@Index('uq_inspection_reports_act', ['actId'], { unique: true })
|
||||
@Index('uq_inspection_reports_year_number', ['reportYear', 'reportNumber'], { unique: true })
|
||||
@Index('uq_inspection_reports_code', ['code'], { unique: true })
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||
|
||||
export class PhaseF11MultiActInspections1789495200000 implements MigrationInterface {
|
||||
name = 'PhaseF11MultiActInspections1789495200000';
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`
|
||||
ALTER TABLE inspection_acts
|
||||
DROP CONSTRAINT IF EXISTS uq_inspection_acts_visit
|
||||
`);
|
||||
await queryRunner.query(`
|
||||
CREATE UNIQUE INDEX uq_inspection_acts_one_draft_per_visit
|
||||
ON inspection_acts (visit_id)
|
||||
WHERE status = 'DRAFT'
|
||||
`);
|
||||
|
||||
await queryRunner.query(`
|
||||
ALTER TABLE inspection_reports
|
||||
DROP CONSTRAINT IF EXISTS uq_inspection_reports_visit
|
||||
`);
|
||||
await queryRunner.query(`
|
||||
CREATE INDEX idx_inspection_reports_visit_id
|
||||
ON inspection_reports (visit_id)
|
||||
`);
|
||||
|
||||
await queryRunner.query(`
|
||||
ALTER TABLE inspection_act_signatures
|
||||
ADD COLUMN company_manifestation varchar(20),
|
||||
ADD COLUMN company_statement text
|
||||
`);
|
||||
await queryRunner.query(`
|
||||
UPDATE inspection_act_signatures
|
||||
SET company_manifestation = 'CONFORMITY'
|
||||
WHERE signer_type = 'COMPANY_RESPONSIBLE'
|
||||
AND status = 'SIGNED'
|
||||
`);
|
||||
await queryRunner.query(`
|
||||
ALTER TABLE inspection_act_signatures
|
||||
ADD CONSTRAINT chk_inspection_act_signatures_company_manifestation CHECK (
|
||||
(
|
||||
signer_type = 'COMPANY_RESPONSIBLE'
|
||||
AND status = 'SIGNED'
|
||||
AND company_manifestation IN ('CONFORMITY', 'DISSENT')
|
||||
AND (
|
||||
(company_manifestation = 'CONFORMITY' AND company_statement IS NULL)
|
||||
OR
|
||||
(company_manifestation = 'DISSENT' AND LENGTH(TRIM(COALESCE(company_statement, ''))) >= 10)
|
||||
)
|
||||
)
|
||||
OR
|
||||
(
|
||||
NOT (signer_type = 'COMPANY_RESPONSIBLE' AND status = 'SIGNED')
|
||||
AND company_manifestation IS NULL
|
||||
AND company_statement IS NULL
|
||||
)
|
||||
)
|
||||
`);
|
||||
}
|
||||
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`
|
||||
DO $$
|
||||
BEGIN
|
||||
IF EXISTS (
|
||||
SELECT visit_id FROM inspection_acts
|
||||
GROUP BY visit_id HAVING COUNT(*) > 1
|
||||
) THEN
|
||||
RAISE EXCEPTION 'F1.1 no puede revertirse: existen inspecciones con múltiples actas';
|
||||
END IF;
|
||||
IF EXISTS (
|
||||
SELECT visit_id FROM inspection_reports
|
||||
GROUP BY visit_id HAVING COUNT(*) > 1
|
||||
) THEN
|
||||
RAISE EXCEPTION 'F1.1 no puede revertirse: existen inspecciones con múltiples informes';
|
||||
END IF;
|
||||
IF EXISTS (
|
||||
SELECT 1 FROM inspection_act_signatures
|
||||
WHERE company_manifestation = 'DISSENT'
|
||||
) THEN
|
||||
RAISE EXCEPTION 'F1.1 no puede revertirse: existen firmas en disidencia';
|
||||
END IF;
|
||||
END
|
||||
$$
|
||||
`);
|
||||
|
||||
await queryRunner.query(`
|
||||
ALTER TABLE inspection_act_signatures
|
||||
DROP CONSTRAINT chk_inspection_act_signatures_company_manifestation
|
||||
`);
|
||||
await queryRunner.query(`
|
||||
ALTER TABLE inspection_act_signatures
|
||||
DROP COLUMN company_statement,
|
||||
DROP COLUMN company_manifestation
|
||||
`);
|
||||
|
||||
await queryRunner.query(`DROP INDEX idx_inspection_reports_visit_id`);
|
||||
await queryRunner.query(`
|
||||
ALTER TABLE inspection_reports
|
||||
ADD CONSTRAINT uq_inspection_reports_visit UNIQUE (visit_id)
|
||||
`);
|
||||
|
||||
await queryRunner.query(`DROP INDEX uq_inspection_acts_one_draft_per_visit`);
|
||||
await queryRunner.query(`
|
||||
ALTER TABLE inspection_acts
|
||||
ADD CONSTRAINT uq_inspection_acts_visit UNIQUE (visit_id)
|
||||
`);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
|
||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
||||
|
||||
export class PhaseF12ActAdministration1789581600000 implements MigrationInterface {
|
||||
name = 'PhaseF12ActAdministration1789581600000';
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`CREATE TABLE inspection_act_deadline_events (
|
||||
id uuid PRIMARY KEY, act_id uuid NOT NULL REFERENCES inspection_acts(id) ON DELETE RESTRICT,
|
||||
response_due_on date NOT NULL, reason text NOT NULL, created_by uuid NULL REFERENCES users(id) ON DELETE SET NULL,
|
||||
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
)`);
|
||||
await queryRunner.query(`CREATE INDEX idx_act_deadline_events_act_created ON inspection_act_deadline_events (act_id, created_at DESC)`);
|
||||
await queryRunner.query(`CREATE INDEX idx_act_deadline_events_due ON inspection_act_deadline_events (response_due_on)`);
|
||||
await queryRunner.query(`CREATE TABLE inspection_act_company_responses (
|
||||
id uuid PRIMARY KEY, act_id uuid NOT NULL REFERENCES inspection_acts(id) ON DELETE RESTRICT,
|
||||
received_on date NOT NULL, details text NULL, committed_correction_on date NULL,
|
||||
contact_name varchar(200) NULL, contact_email varchar(320) NULL,
|
||||
original_name varchar(255) NULL, stored_name varchar(100) NULL, mime_type varchar(120) NULL,
|
||||
size_bytes bigint NULL, sha256 char(64) NULL, created_by uuid NULL REFERENCES users(id) ON DELETE SET NULL,
|
||||
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
CONSTRAINT chk_act_company_response_file CHECK ((stored_name IS NULL AND original_name IS NULL AND mime_type IS NULL AND size_bytes IS NULL AND sha256 IS NULL) OR (stored_name IS NOT NULL AND original_name IS NOT NULL AND mime_type = 'application/pdf' AND size_bytes > 0 AND sha256 IS NOT NULL))
|
||||
)`);
|
||||
await queryRunner.query(`CREATE INDEX idx_act_company_responses_act_received ON inspection_act_company_responses (act_id, received_on DESC, created_at DESC)`);
|
||||
await queryRunner.query(`CREATE INDEX idx_act_company_responses_commitment ON inspection_act_company_responses (committed_correction_on)`);
|
||||
await queryRunner.query(`INSERT INTO inspection_act_deadline_events (id, act_id, response_due_on, reason, created_by, created_at)
|
||||
SELECT gen_random_uuid(), act_id, MIN(correction_due_on), 'Migrado desde plazo histórico coincidente de hallazgos', NULL, CURRENT_TIMESTAMP
|
||||
FROM inspection_findings WHERE correction_due_on IS NOT NULL GROUP BY act_id HAVING COUNT(DISTINCT correction_due_on) = 1`);
|
||||
await queryRunner.query(`CREATE OR REPLACE FUNCTION prevent_f12_append_only_mutation() RETURNS trigger AS $$ BEGIN RAISE EXCEPTION 'F1.2 append-only: update/delete no permitido'; END; $$ LANGUAGE plpgsql`);
|
||||
await queryRunner.query(`CREATE TRIGGER trg_act_deadline_events_append_only BEFORE UPDATE OR DELETE ON inspection_act_deadline_events FOR EACH ROW EXECUTE FUNCTION prevent_f12_append_only_mutation()`);
|
||||
await queryRunner.query(`CREATE TRIGGER trg_act_company_responses_append_only BEFORE UPDATE OR DELETE ON inspection_act_company_responses FOR EACH ROW EXECUTE FUNCTION prevent_f12_append_only_mutation()`);
|
||||
}
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`DROP TRIGGER IF EXISTS trg_act_company_responses_append_only ON inspection_act_company_responses`);
|
||||
await queryRunner.query(`DROP TRIGGER IF EXISTS trg_act_deadline_events_append_only ON inspection_act_deadline_events`);
|
||||
await queryRunner.query(`DROP FUNCTION IF EXISTS prevent_f12_append_only_mutation()`);
|
||||
await queryRunner.query(`DROP TABLE inspection_act_company_responses`);
|
||||
await queryRunner.query(`DROP TABLE inspection_act_deadline_events`);
|
||||
}
|
||||
}
|
||||
@@ -308,7 +308,7 @@ export class InspectionActsService {
|
||||
const visit = await this.lockVisit(manager, visitId);
|
||||
this.assertVisitOpen(visit);
|
||||
await this.assertActorAssigned(manager, visitId, principal);
|
||||
await this.assertVisitHasNoAct(manager, visitId);
|
||||
await this.assertVisitHasNoDraftAct(manager, visitId);
|
||||
await this.assertVisitAssets(manager, visitId, dto.assetIds);
|
||||
const occurredAt = new Date(dto.occurredAt);
|
||||
const actYear = await this.yearAtProjectTimezone(manager, occurredAt);
|
||||
@@ -632,20 +632,20 @@ export class InspectionActsService {
|
||||
}
|
||||
}
|
||||
|
||||
private async assertVisitHasNoAct(
|
||||
private async assertVisitHasNoDraftAct(
|
||||
manager: EntityManager,
|
||||
visitId: string,
|
||||
): Promise<void> {
|
||||
const rows = (await manager.query(`
|
||||
SELECT code
|
||||
FROM inspection_acts
|
||||
WHERE visit_id = $1
|
||||
WHERE visit_id = $1 AND status = 'DRAFT'
|
||||
LIMIT 1
|
||||
`, [visitId])) as Array<{ code: string }>;
|
||||
if (rows.length > 0) {
|
||||
throw new ConflictException({
|
||||
code: 'INSPECTION_VISIT_ACT_ALREADY_EXISTS',
|
||||
message: 'La visita ya tiene un acta; cada visita admite una única acta',
|
||||
code: 'INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS',
|
||||
message: 'La inspección ya tiene un acta en borrador; preparala o cancelala antes de crear otra',
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
import { Transform } from 'class-transformer';
|
||||
import { IsEnum, IsOptional, IsString, MaxLength, MinLength, ValidateIf } from 'class-validator';
|
||||
import { InspectionCompanySignatureManifestation } from '../../database/entities';
|
||||
import { CreateInspectionSignatureDto } from './create-inspection-signature.dto';
|
||||
|
||||
export class CreateCompanySignatureDto extends CreateInspectionSignatureDto {
|
||||
@IsOptional()
|
||||
@IsEnum(InspectionCompanySignatureManifestation)
|
||||
manifestation?: InspectionCompanySignatureManifestation;
|
||||
|
||||
@ValidateIf((dto: CreateCompanySignatureDto) =>
|
||||
dto.manifestation === InspectionCompanySignatureManifestation.DISSENT,
|
||||
)
|
||||
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
|
||||
@IsString()
|
||||
@MinLength(10)
|
||||
@MaxLength(4000)
|
||||
statement?: string;
|
||||
}
|
||||
@@ -19,6 +19,7 @@ import type { AuthPrincipal, RequestWithContext } from '../common/http/request-c
|
||||
import { CloseInspectionActDto } from './dto/close-inspection-act.dto';
|
||||
import { CreateCompanyOutcomeDto } from './dto/create-company-outcome.dto';
|
||||
import { CreateInspectionSignatureDto } from './dto/create-inspection-signature.dto';
|
||||
import { CreateCompanySignatureDto } from './dto/create-company-signature.dto';
|
||||
import { UpsertInspectionResponsibleDto } from './dto/upsert-inspection-responsible.dto';
|
||||
import { InspectionClosingService } from './inspection-closing.service';
|
||||
import {
|
||||
@@ -89,7 +90,7 @@ export class InspectionClosingController {
|
||||
}))
|
||||
companySignature(
|
||||
@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
|
||||
@Body() dto: CreateInspectionSignatureDto,
|
||||
@Body() dto: CreateCompanySignatureDto,
|
||||
@UploadedFile() file: UploadedInspectionSignatureFile | undefined,
|
||||
@CurrentAuth() principal: AuthPrincipal,
|
||||
@Req() request: RequestWithContext,
|
||||
|
||||
@@ -21,6 +21,7 @@ import {
|
||||
InspectionActSignatureSource,
|
||||
InspectionActSignatureStatus,
|
||||
InspectionActSignerType,
|
||||
InspectionCompanySignatureManifestation,
|
||||
InspectionActStatus,
|
||||
InspectionActUploadMode,
|
||||
InspectionActVersionEvent,
|
||||
@@ -33,6 +34,7 @@ import type { CloseInspectionActDto } from './dto/close-inspection-act.dto';
|
||||
import { InspectionReportsService } from '../inspection-reports/inspection-reports.service';
|
||||
import type { CreateCompanyOutcomeDto } from './dto/create-company-outcome.dto';
|
||||
import type { CreateInspectionSignatureDto } from './dto/create-inspection-signature.dto';
|
||||
import type { CreateCompanySignatureDto } from './dto/create-company-signature.dto';
|
||||
import type { UpsertInspectionResponsibleDto } from './dto/upsert-inspection-responsible.dto';
|
||||
import {
|
||||
inspectInspectionSignatureFile,
|
||||
@@ -70,6 +72,8 @@ interface SignatureView {
|
||||
position: string | null;
|
||||
status: InspectionActSignatureStatus;
|
||||
reason: string | null;
|
||||
companyManifestation: InspectionCompanySignatureManifestation | null;
|
||||
companyStatement: string | null;
|
||||
mimeType: string | null;
|
||||
sizeBytes: number | null;
|
||||
imageSha256: string | null;
|
||||
@@ -429,7 +433,7 @@ export class InspectionClosingService {
|
||||
|
||||
async signCompany(
|
||||
actId: string,
|
||||
dto: CreateInspectionSignatureDto,
|
||||
dto: CreateCompanySignatureDto,
|
||||
file: UploadedInspectionSignatureFile | undefined,
|
||||
principal: AuthPrincipal,
|
||||
request: RequestWithContext,
|
||||
@@ -447,7 +451,7 @@ export class InspectionClosingService {
|
||||
assertMobileInspector(principal);
|
||||
return this.dataSource.transaction(async (manager) => {
|
||||
const { act, visit } = await this.lockContext(manager, actId);
|
||||
this.assertReadyInProgress(act, visit);
|
||||
this.assertReadyForCompanyOutcome(act, visit);
|
||||
await this.assertActorAssigned(manager, visit.id, principal, true);
|
||||
const responsible = await this.requireResponsible(manager, actId);
|
||||
if (
|
||||
@@ -540,7 +544,8 @@ export class InspectionClosingService {
|
||||
assertMobileInspector(principal);
|
||||
const closed = await this.dataSource.transaction(async (manager) => {
|
||||
const { act, visit } = await this.lockContext(manager, actId);
|
||||
this.assertReadyInProgress(act, visit);
|
||||
this.assertReadyForFinalClosure(act, visit);
|
||||
await this.assertActorAssigned(manager, visit.id, principal, true);
|
||||
const closure = await this.requireClosure(manager, actId);
|
||||
const signatures = await this.loadSignatures(manager, actId);
|
||||
if (!signatures.some((item) => (
|
||||
@@ -576,6 +581,8 @@ export class InspectionClosingService {
|
||||
position: item.position,
|
||||
status: item.status,
|
||||
reason: item.reason,
|
||||
companyManifestation: item.companyManifestation,
|
||||
companyStatement: item.companyStatement,
|
||||
imageSha256: item.imageSha256,
|
||||
consentText: item.consentText,
|
||||
consentVersion: item.consentVersion,
|
||||
@@ -636,14 +643,6 @@ export class InspectionClosingService {
|
||||
WHERE id = $1
|
||||
RETURNING current_version AS "versionNumber"
|
||||
`, [actId, serverClosedAt, principal.userId, finalSha256])) as Array<{ versionNumber: number }>;
|
||||
await manager.query(`
|
||||
UPDATE inspection_visits
|
||||
SET status = 'CLOSED',
|
||||
actual_closed_at = $2,
|
||||
updated_by = $3,
|
||||
updated_at = $2
|
||||
WHERE id = $1
|
||||
`, [visit.id, serverClosedAt, principal.userId]);
|
||||
await manager.query(`
|
||||
INSERT INTO inspection_act_versions (
|
||||
act_id, version_number, event, snapshot, actor_user_id, actor_username
|
||||
@@ -672,6 +671,7 @@ export class InspectionClosingService {
|
||||
visitId: visit.id,
|
||||
versionNumber: Number(updated.versionNumber),
|
||||
findingsRemainOpen: true,
|
||||
visitRemainsIndependent: true,
|
||||
},
|
||||
}, manager);
|
||||
await this.reports.ensureFrozenReport(manager, actId, principal, request);
|
||||
@@ -710,7 +710,7 @@ export class InspectionClosingService {
|
||||
|
||||
private async createSignedSignature(
|
||||
actId: string,
|
||||
dto: CreateInspectionSignatureDto,
|
||||
dto: CreateInspectionSignatureDto | CreateCompanySignatureDto,
|
||||
file: UploadedInspectionSignatureFile | undefined,
|
||||
fixedIdentity: null | {
|
||||
signerType: InspectionActSignerType;
|
||||
@@ -737,7 +737,8 @@ export class InspectionClosingService {
|
||||
try {
|
||||
return await this.dataSource.transaction(async (manager) => {
|
||||
const { act, visit } = await this.lockContext(manager, actId);
|
||||
this.assertReadyInProgress(act, visit);
|
||||
if (fixedIdentity) this.assertReadyInProgress(act, visit);
|
||||
else this.assertReadyForCompanyOutcome(act, visit);
|
||||
await this.assertActorAssigned(manager, visit.id, principal, !requireSelfAssignment);
|
||||
const closure = await this.requireClosure(manager, actId);
|
||||
const responsible = fixedIdentity ? null : await this.requireResponsible(manager, actId);
|
||||
@@ -778,6 +779,13 @@ export class InspectionClosingService {
|
||||
const source = this.signatureSource(principal);
|
||||
const signedAt = new Date();
|
||||
const clientSignedAt = dto.clientSignedAt ? new Date(dto.clientSignedAt) : null;
|
||||
const companyDto = fixedIdentity ? null : dto as CreateCompanySignatureDto;
|
||||
const companyManifestation = fixedIdentity
|
||||
? null
|
||||
: companyDto?.manifestation ?? InspectionCompanySignatureManifestation.CONFORMITY;
|
||||
const companyStatement = companyManifestation === InspectionCompanySignatureManifestation.DISSENT
|
||||
? companyDto?.statement?.trim() ?? null
|
||||
: null;
|
||||
const payload = {
|
||||
actId,
|
||||
preparedSha256: closure.preparedSha256,
|
||||
@@ -788,6 +796,8 @@ export class InspectionClosingService {
|
||||
documentNumber: identity.documentNumber,
|
||||
position: identity.position,
|
||||
status: InspectionActSignatureStatus.SIGNED,
|
||||
companyManifestation,
|
||||
companyStatement,
|
||||
imageSha256,
|
||||
consentText: identity.consentText,
|
||||
consentVersion: CONSENT_VERSION,
|
||||
@@ -806,6 +816,7 @@ export class InspectionClosingService {
|
||||
INSERT INTO inspection_act_signatures (
|
||||
id, act_id, signer_type, signer_user_id, signer_name,
|
||||
document_type, document_number, position, status,
|
||||
company_manifestation, company_statement,
|
||||
original_name, stored_name, mime_type, size_bytes, image_sha256,
|
||||
consent_text, consent_version, consent_accepted_at,
|
||||
client_signed_at, signed_at, latitude, longitude, accuracy_m,
|
||||
@@ -814,11 +825,12 @@ export class InspectionClosingService {
|
||||
) VALUES (
|
||||
$1, $2, $3, $4, $5,
|
||||
$6, $7, $8, 'SIGNED',
|
||||
$9, $10, $11, $12, $13,
|
||||
$14, $15, $16,
|
||||
$17, $18, $19, $20, $21,
|
||||
$22, $23, $24, $25,
|
||||
$26, $18
|
||||
$9, $10,
|
||||
$11, $12, $13, $14, $15,
|
||||
$16, $17, $18,
|
||||
$19, $20, $21, $22, $23,
|
||||
$24, $25, $26, $27,
|
||||
$28, $20
|
||||
)
|
||||
`, [
|
||||
id,
|
||||
@@ -829,6 +841,8 @@ export class InspectionClosingService {
|
||||
identity.documentType,
|
||||
identity.documentNumber,
|
||||
identity.position,
|
||||
companyManifestation,
|
||||
companyStatement,
|
||||
inspected.originalName,
|
||||
storedName,
|
||||
inspected.mimeType,
|
||||
@@ -1266,6 +1280,8 @@ export class InspectionClosingService {
|
||||
signature.position,
|
||||
signature.status,
|
||||
signature.reason,
|
||||
signature.company_manifestation AS "companyManifestation",
|
||||
signature.company_statement AS "companyStatement",
|
||||
signature.original_name AS "originalName",
|
||||
signature.stored_name AS "storedName",
|
||||
signature.mime_type AS "mimeType",
|
||||
@@ -1365,6 +1381,26 @@ export class InspectionClosingService {
|
||||
}
|
||||
}
|
||||
|
||||
private assertReadyForCompanyOutcome(act: InspectionAct, visit: InspectionVisit): void {
|
||||
if (act.status !== InspectionActStatus.READY
|
||||
|| ![InspectionVisitStatus.IN_PROGRESS, InspectionVisitStatus.CLOSED].includes(visit.status)) {
|
||||
throw new ConflictException({
|
||||
code: 'INSPECTION_ACT_NOT_READY_FOR_COMPANY',
|
||||
message: 'El acta debe estar preparada; la firma de empresa puede completarse durante la inspección o después de su cierre',
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private assertReadyForFinalClosure(act: InspectionAct, visit: InspectionVisit): void {
|
||||
if (act.status !== InspectionActStatus.READY
|
||||
|| ![InspectionVisitStatus.IN_PROGRESS, InspectionVisitStatus.CLOSED].includes(visit.status)) {
|
||||
throw new ConflictException({
|
||||
code: 'INSPECTION_ACT_NOT_READY',
|
||||
message: 'El acta debe estar preparada para completar su cierre definitivo',
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private async assertActorAssigned(
|
||||
manager: EntityManager,
|
||||
visitId: string,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { ConflictException, Injectable } from '@nestjs/common';
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import type { EntityManager } from 'typeorm';
|
||||
|
||||
export interface FieldDiscoveryInspectionLinkResult {
|
||||
@@ -18,7 +18,7 @@ export class FieldDiscoveryInspectionLinkService {
|
||||
SELECT id, status
|
||||
FROM inspection_acts
|
||||
WHERE visit_id = $1
|
||||
AND status <> 'CANCELLED'
|
||||
AND status = 'DRAFT'
|
||||
ORDER BY created_at DESC
|
||||
LIMIT 1
|
||||
FOR UPDATE
|
||||
@@ -26,12 +26,6 @@ export class FieldDiscoveryInspectionLinkService {
|
||||
[visitId],
|
||||
)) as Array<{ id: string; status: string }>;
|
||||
|
||||
if (act && act.status !== 'DRAFT') {
|
||||
throw new ConflictException({
|
||||
code: 'FIELD_DISCOVERY_ACT_NOT_EDITABLE',
|
||||
message: 'El Acta ya no admite nuevos elementos ni Hallazgos',
|
||||
});
|
||||
}
|
||||
|
||||
await manager.query(
|
||||
`
|
||||
|
||||
@@ -16,6 +16,8 @@ function lines(snapshot: Record<string, unknown>): string[] {
|
||||
const team=asArray(prepared.team);
|
||||
const assets=asArray(prepared.assets);
|
||||
const findings=asArray(prepared.findings);
|
||||
const signatures=asArray(snapshot.signatures);
|
||||
const companySignature=signatures.find(item=>text(item.signerType,'')==='COMPANY_RESPONSIBLE');
|
||||
const companies=[...new Set(assets.map(x=>text(asRecord(x.operatorCompany).name,'')).filter(Boolean))];
|
||||
const areas=[...new Set(assets.map(x=>text(asRecord(x.operationalArea).name,'')).filter(Boolean))];
|
||||
const inspectors=team.map(x=>`${text(x.firstName,'')} ${text(x.lastName,'')}`.trim()).filter(Boolean);
|
||||
@@ -42,6 +44,15 @@ function lines(snapshot: Record<string, unknown>): string[] {
|
||||
out.push('', 'HALLAZGOS');
|
||||
if(!findings.length) out.push('Sin hallazgos registrados.');
|
||||
for(const item of findings){ out.push(...wrap(`${text(item.code)} | ${text(item.title)} | Vencimiento: ${date(item.correctionDueOn)}`)); out.push(...wrap(text(item.description))); }
|
||||
out.push('', 'CONSTANCIA DE LA EMPRESA');
|
||||
if(!companySignature) out.push('Firma o constancia pendiente.');
|
||||
else if(text(companySignature.status,'')==='SIGNED'){
|
||||
const manifestation=text(companySignature.companyManifestation,'CONFORMITY');
|
||||
out.push(manifestation==='DISSENT'?'Firma en disidencia':'Firma en conformidad');
|
||||
if(manifestation==='DISSENT') out.push(...wrap(text(companySignature.companyStatement)));
|
||||
} else {
|
||||
out.push(...wrap(`${text(companySignature.status)}: ${text(companySignature.reason)}`));
|
||||
}
|
||||
out.push('', 'INTEGRIDAD', `Hash de cierre: ${text(asRecord(snapshot).finalSha256 ?? asRecord(snapshot).preparedSha256)}`);
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
import { IsISO8601 } from 'class-validator';
|
||||
|
||||
export class CloseInspectionVisitDto {
|
||||
@IsISO8601({ strict: true })
|
||||
clientClosedAt!: string;
|
||||
}
|
||||
@@ -14,6 +14,7 @@ import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
|
||||
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
|
||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
||||
import { ChangeInspectionVisitStatusDto } from './dto/change-inspection-visit-status.dto';
|
||||
import { CloseInspectionVisitDto } from './dto/close-inspection-visit.dto';
|
||||
import { CreateInspectionVisitDto } from './dto/create-inspection-visit.dto';
|
||||
import { ExcludeInspectionVisitAssetDto } from './dto/exclude-inspection-visit-asset.dto';
|
||||
import { ListInspectionVisitsQueryDto } from './dto/list-inspection-visits-query.dto';
|
||||
@@ -154,4 +155,15 @@ export class InspectionVisitsController {
|
||||
) {
|
||||
return this.visits.start(id, principal, request);
|
||||
}
|
||||
|
||||
@Post(':id/close')
|
||||
@RequirePermissions('inspections.execute')
|
||||
close(
|
||||
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
|
||||
@Body() dto: CloseInspectionVisitDto,
|
||||
@CurrentAuth() principal: AuthPrincipal,
|
||||
@Req() request: RequestWithContext,
|
||||
) {
|
||||
return this.visits.close(id, dto, principal, request);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ import {
|
||||
InspectionVisitStatus,
|
||||
} from '../database/entities';
|
||||
import type { ChangeInspectionVisitStatusDto } from './dto/change-inspection-visit-status.dto';
|
||||
import type { CloseInspectionVisitDto } from './dto/close-inspection-visit.dto';
|
||||
import type { CreateInspectionVisitDto } from './dto/create-inspection-visit.dto';
|
||||
import type { ListInspectionVisitsQueryDto } from './dto/list-inspection-visits-query.dto';
|
||||
import type { ReplaceInspectionVisitAssetsDto } from './dto/replace-inspection-visit-assets.dto';
|
||||
@@ -810,6 +811,107 @@ export class InspectionVisitsService {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
async close(
|
||||
id: string,
|
||||
dto: CloseInspectionVisitDto,
|
||||
principal: AuthPrincipal,
|
||||
request: RequestWithContext,
|
||||
): Promise<InspectionVisitView> {
|
||||
assertMobileInspector(principal);
|
||||
return this.dataSource.transaction(async (manager) => {
|
||||
const visit = await this.lockVisit(manager, id);
|
||||
if (visit.status !== InspectionVisitStatus.IN_PROGRESS) {
|
||||
throw new ConflictException({
|
||||
code: 'INSPECTION_VISIT_NOT_IN_PROGRESS',
|
||||
message: 'La inspección debe estar en curso para cerrarse',
|
||||
});
|
||||
}
|
||||
if (!principal.permissions.includes('inspections.manage')) {
|
||||
const memberIds = await this.activeMemberIds(manager, id);
|
||||
if (!memberIds.includes(principal.userId)) {
|
||||
throw new ForbiddenException({
|
||||
code: 'INSPECTION_VISIT_NOT_ASSIGNED',
|
||||
message: 'La inspección no está asignada al usuario actual',
|
||||
});
|
||||
}
|
||||
}
|
||||
const [acts] = (await manager.query(`
|
||||
SELECT
|
||||
COUNT(*) FILTER (WHERE act.status = 'DRAFT')::integer AS drafts,
|
||||
COUNT(*) FILTER (
|
||||
WHERE act.status = 'READY'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM inspection_act_signatures signature
|
||||
WHERE signature.act_id = act.id
|
||||
AND signature.signer_type = 'INSPECTOR'
|
||||
AND signature.status = 'SIGNED'
|
||||
)
|
||||
)::integer AS "readyWithoutInspector",
|
||||
COUNT(*) FILTER (
|
||||
WHERE act.status = 'READY'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM inspection_act_signatures signature
|
||||
WHERE signature.act_id = act.id
|
||||
AND signature.signer_type = 'COMPANY_RESPONSIBLE'
|
||||
)
|
||||
)::integer AS "pendingCompany"
|
||||
FROM inspection_acts act
|
||||
WHERE act.visit_id = $1
|
||||
AND act.status <> 'CANCELLED'
|
||||
`, [id])) as Array<{ drafts: number; readyWithoutInspector: number; pendingCompany: number }>;
|
||||
if (Number(acts?.drafts ?? 0) > 0) {
|
||||
throw new ConflictException({
|
||||
code: 'INSPECTION_VISIT_DRAFT_ACTS_PENDING',
|
||||
message: 'Prepará o cancelá las actas en borrador antes de cerrar la inspección',
|
||||
});
|
||||
}
|
||||
if (Number(acts?.readyWithoutInspector ?? 0) > 0) {
|
||||
throw new ConflictException({
|
||||
code: 'INSPECTION_VISIT_INSPECTOR_SIGNATURE_PENDING',
|
||||
message: 'Toda acta preparada debe tener firma de inspector antes de cerrar la inspección',
|
||||
});
|
||||
}
|
||||
const serverClosedAt = new Date();
|
||||
const clientClosedAt = new Date(dto.clientClosedAt);
|
||||
if (visit.actualStartedAt && clientClosedAt.getTime() < visit.actualStartedAt.getTime()) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_VISIT_INVALID_CLOSE_TIME',
|
||||
message: 'La fecha de cierre del dispositivo no puede ser anterior al inicio de la inspección',
|
||||
});
|
||||
}
|
||||
if (clientClosedAt.getTime() > serverClosedAt.getTime() + 24 * 60 * 60 * 1000) {
|
||||
throw new BadRequestException({
|
||||
code: 'INSPECTION_VISIT_INVALID_DEVICE_TIME',
|
||||
message: 'La fecha informada por el dispositivo no puede estar más de 24 horas en el futuro',
|
||||
});
|
||||
}
|
||||
visit.status = InspectionVisitStatus.CLOSED;
|
||||
visit.actualClosedAt = serverClosedAt;
|
||||
visit.updatedBy = principal.userId;
|
||||
await manager.getRepository(InspectionVisit).save(visit);
|
||||
const updated = await this.loadView(manager, id);
|
||||
await this.audit.record({
|
||||
...administrationAuditContext(principal, request),
|
||||
action: AuditAction.INSPECTION_VISIT_STATUS_CHANGED,
|
||||
entityType: 'inspection_visit',
|
||||
entityId: id,
|
||||
beforeData: { status: InspectionVisitStatus.IN_PROGRESS },
|
||||
afterData: {
|
||||
status: InspectionVisitStatus.CLOSED,
|
||||
clientClosedAt: clientClosedAt.toISOString(),
|
||||
serverClosedAt: serverClosedAt.toISOString(),
|
||||
pendingCompanySignatures: Number(acts?.pendingCompany ?? 0),
|
||||
},
|
||||
metadata: {
|
||||
closeSource: 'ANDROID',
|
||||
actsMayCompleteCompanySignatureLater: true,
|
||||
},
|
||||
}, manager);
|
||||
return updated;
|
||||
});
|
||||
}
|
||||
|
||||
private visitSelect(where: string): string {
|
||||
return `
|
||||
SELECT
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
export const API_VERSION = '0.19.6-4';
|
||||
export const API_PHASE = 'D5.6.4';
|
||||
export const API_VERSION = '0.20.0-2';
|
||||
export const API_PHASE = 'F1.2';
|
||||
|
||||
@@ -4,37 +4,29 @@ import { ConflictException } from '@nestjs/common';
|
||||
import type { DataSource, EntityManager } from 'typeorm';
|
||||
import { InspectionActsService } from '../../src/inspection-acts/inspection-acts.service';
|
||||
|
||||
type SingleActGuard = {
|
||||
assertVisitHasNoAct(manager: EntityManager, visitId: string): Promise<void>;
|
||||
type DraftActGuard = {
|
||||
assertVisitHasNoDraftAct(manager: EntityManager, visitId: string): Promise<void>;
|
||||
};
|
||||
|
||||
function serviceGuard(): SingleActGuard {
|
||||
function serviceGuard(): DraftActGuard {
|
||||
return new InspectionActsService(
|
||||
{} as DataSource,
|
||||
{} as never,
|
||||
) as unknown as SingleActGuard;
|
||||
) as unknown as DraftActGuard;
|
||||
}
|
||||
|
||||
test('single-act guard allows a visit without an act', async () => {
|
||||
const manager = {
|
||||
query: async () => [],
|
||||
} as unknown as EntityManager;
|
||||
|
||||
await assert.doesNotReject(
|
||||
serviceGuard().assertVisitHasNoAct(manager, 'visit-id'),
|
||||
);
|
||||
test('multi-act guard allows a new act when the inspection has no draft act', async () => {
|
||||
const manager = { query: async () => [] } as unknown as EntityManager;
|
||||
await assert.doesNotReject(serviceGuard().assertVisitHasNoDraftAct(manager, 'visit-id'));
|
||||
});
|
||||
|
||||
test('single-act guard rejects a second act for the same visit', async () => {
|
||||
const manager = {
|
||||
query: async () => [{ code: 'ACTA-2026-000001' }],
|
||||
} as unknown as EntityManager;
|
||||
|
||||
test('multi-act guard blocks only a second draft act for the same inspection', async () => {
|
||||
const manager = { query: async () => [{ code: 'ACTA-2026-000001' }] } as unknown as EntityManager;
|
||||
await assert.rejects(
|
||||
serviceGuard().assertVisitHasNoAct(manager, 'visit-id'),
|
||||
serviceGuard().assertVisitHasNoDraftAct(manager, 'visit-id'),
|
||||
(error: unknown) => error instanceof ConflictException
|
||||
&& error.getResponse() instanceof Object
|
||||
&& (error.getResponse() as { code?: string }).code
|
||||
=== 'INSPECTION_VISIT_ACT_ALREADY_EXISTS',
|
||||
=== 'INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS',
|
||||
);
|
||||
});
|
||||
|
||||
@@ -20,4 +20,5 @@ test('inspection visit endpoints separate reading, planning, assignment and exec
|
||||
assert.deepEqual(permissionFor('replaceTeam'), ['inspections.assign']);
|
||||
assert.deepEqual(permissionFor('changeStatus'), ['inspections.manage']);
|
||||
assert.deepEqual(permissionFor('start'), ['inspections.execute']);
|
||||
assert.deepEqual(permissionFor('close'), ['inspections.execute']);
|
||||
});
|
||||
|
||||
@@ -19,7 +19,7 @@ test('D5.1 applies the mobile-inspector policy to every field operation', async
|
||||
source('inspection-findings/inspection-evidence.service.ts'),
|
||||
source('inspection-closing/inspection-closing.service.ts'),
|
||||
]);
|
||||
assert.equal(policyCalls(visits), 1);
|
||||
assert.equal(policyCalls(visits), 2);
|
||||
assert.equal(policyCalls(acts), 3);
|
||||
assert.equal(policyCalls(findings), 2);
|
||||
assert.equal(policyCalls(evidence), 1);
|
||||
|
||||
@@ -46,9 +46,9 @@ test('D5.3.19 exposes company area inspector and date filters across operational
|
||||
}
|
||||
});
|
||||
|
||||
test('D5.3.19 keeps one visit equal to one act', () => {
|
||||
assert.match(actsService, /await this\.assertVisitHasNoAct\(manager, visitId\)/);
|
||||
assert.match(actsService, /INSPECTION_VISIT_ACT_ALREADY_EXISTS/);
|
||||
test('F1.1 supersedes the historical single-act rule while retaining the D5.3.19 filters', () => {
|
||||
assert.match(actsService, /await this\.assertVisitHasNoDraftAct\(manager, visitId\)/);
|
||||
assert.match(actsService, /INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS/);
|
||||
});
|
||||
|
||||
test('D5.3.19 does not introduce the contextual finding catalog before its office definition', () => {
|
||||
|
||||
@@ -35,7 +35,7 @@ test('D5.3.20 builds OOXML Word from the frozen act snapshot without external do
|
||||
assert.doesNotMatch(builder, /nodemailer|libreoffice|pandoc/i);
|
||||
});
|
||||
|
||||
test('D5.3.20 preserves one visit one act and leaves email delivery for a configured phase', () => {
|
||||
test('D5.3.20 keeps frozen report generation act-scoped and leaves email delivery for a configured phase', () => {
|
||||
assert.match(closing, /findingsRemainOpen: true/);
|
||||
assert.doesNotMatch(migration, /smtp|email_outbox|mail_delivery/i);
|
||||
});
|
||||
|
||||
@@ -4,4 +4,4 @@ test('D5.3.21 stores institutional and company recipients without hardcoding add
|
||||
test('D5.3.21 creates an immutable act PDF and separates its delivery from the report Word',()=>{assert.match(migration,/inspection_act_pdf_artifacts/);assert.match(migration,/ACT_PDF/);assert.match(migration,/REPORT_WORD/);assert.match(pdf,/%PDF-1\.4/);assert.match(delivery,/this\.pdf\.ensure/);assert.match(delivery,/this\.word\.ensure/);});
|
||||
test('D5.3.21 keeps an auditable retryable outbox with explicit waiting states',()=>{assert.match(migration,/WAITING_RECIPIENT/);assert.match(migration,/WAITING_TRANSPORT/);assert.match(migration,/WAITING_ARTIFACT/);assert.match(delivery,/export interface DeliveryRow/);assert.match(controller,/Promise<DeliveryRow>/);assert.match(controller,/outbox\/:id\/retry/);assert.match(controller,/retry-pending/);});
|
||||
test('D5.3.21 only attempts SMTP when transport and recipients are configured',()=>{assert.match(smtp,/SMTP_HOST/);assert.match(smtp,/MAIL_FROM/);assert.match(smtp,/STARTTLS/);assert.match(delivery,/this\.smtp\.configured\(\)/);assert.match(delivery,/WAITING_TRANSPORT/);});
|
||||
test('D5.3.21 triggers document delivery after the frozen report Word step without changing one visit one act',()=>{assert.match(reports,/await this\.delivery\.dispatchForAct\(actId\)/); const acts=read('src/inspection-acts/inspection-acts.service.ts');assert.match(acts,/assertVisitHasNoAct/);assert.match(acts,/INSPECTION_VISIT_ACT_ALREADY_EXISTS/);});
|
||||
test('D5.3.21 delivery stays act-scoped after F1.1 enables multiple acts',()=>{assert.match(reports,/await this\.delivery\.dispatchForAct\(actId\)/); const acts=read('src/inspection-acts/inspection-acts.service.ts');assert.match(acts,/assertVisitHasNoDraftAct/);assert.match(acts,/INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS/);});
|
||||
|
||||
@@ -48,8 +48,8 @@ test('D5.3.22 binds the final Director signature to report and revision hashes',
|
||||
});
|
||||
|
||||
test('D5.3.22 changes only the report review layer and preserves inspection immutability', () => {
|
||||
assert.match(acts, /assertVisitHasNoAct/);
|
||||
assert.match(acts, /INSPECTION_VISIT_ACT_ALREADY_EXISTS/);
|
||||
assert.match(acts, /assertVisitHasNoDraftAct/);
|
||||
assert.match(acts, /INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS/);
|
||||
assert.match(findings, /INSPECTION_FINDING_RESPONSE_IMMUTABLE/);
|
||||
assert.doesNotMatch(migration, /ALTER TABLE inspection_acts/);
|
||||
assert.doesNotMatch(migration, /ALTER TABLE inspection_findings/);
|
||||
|
||||
@@ -26,12 +26,14 @@ test('D5.3.23 only lets a mobile assigned inspector create during an active visi
|
||||
assert.match(assets, /FIELD_DISCOVERY_INSPECTOR_NOT_ASSIGNED/);
|
||||
});
|
||||
|
||||
test('D5.3.23 immediately links the provisional object to the visit and open act', () => {
|
||||
test('F1.1 preserves D5.3.23 field discovery while linking only to the current draft act', () => {
|
||||
assert.match(assets, /fieldDiscoveryInspectionLinks\.attach/);
|
||||
assert.doesNotMatch(assets, /INSERT INTO inspection_/);
|
||||
assert.match(inspectionLinks, /INSERT INTO inspection_visit_assets/);
|
||||
assert.match(inspectionLinks, /INSERT INTO inspection_act_assets/);
|
||||
assert.match(inspectionLinks, /FIELD_DISCOVERY_ACT_NOT_EDITABLE/);
|
||||
assert.match(inspectionLinks, /status = 'DRAFT'/);
|
||||
assert.match(inspectionLinks, /if \(act\)/);
|
||||
assert.match(inspectionLinks, /actId: act\?\.id \?\? null/);
|
||||
assert.match(findings, /assertActAsset/);
|
||||
});
|
||||
|
||||
|
||||
@@ -6,10 +6,10 @@ import test from 'node:test';
|
||||
const root = process.cwd();
|
||||
const read = (relative: string) => fs.readFileSync(path.join(root, relative), 'utf8');
|
||||
|
||||
test('D5.6 preserves one visit one immutable act with a frozen closure snapshot', () => {
|
||||
test('D5.6 immutable act closure remains intact after the multi-act transition', () => {
|
||||
const acts = read('src/inspection-acts/inspection-acts.service.ts');
|
||||
const closing = read('src/inspection-closing/inspection-closing.service.ts');
|
||||
assert.match(acts, /INSPECTION_VISIT_ACT_ALREADY_EXISTS/);
|
||||
assert.match(acts, /INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS/);
|
||||
assert.match(closing, /final_snapshot = \$2/);
|
||||
assert.match(closing, /final_sha256 = \$3/);
|
||||
assert.match(closing, /InspectionActVersionEvent\.CLOSED/);
|
||||
@@ -74,10 +74,8 @@ test('D5.6 preserves auditable document delivery while allowing SMTP to remain p
|
||||
assert.match(smtp, /MAIL_FROM/);
|
||||
});
|
||||
|
||||
test('D5.6 declares a stable Phase D closure across maintenance hotfixes without introducing another functional migration', () => {
|
||||
const apiVersion = read('src/version.ts');
|
||||
assert.match(apiVersion, /API_VERSION = '0\.19\.6(?:-\d+)?'/);
|
||||
assert.match(apiVersion, /API_PHASE = 'D5\.6(?:\.\d+)?'/);
|
||||
test('D5.6 remains a historical closure baseline while Phase F introduces an explicit new migration', () => {
|
||||
const migrations = fs.readdirSync(path.join(root, 'src/database/migrations'));
|
||||
assert.equal(migrations.some((name) => /phase-d5-6/i.test(name)), false);
|
||||
assert.equal(migrations.some((name) => /phase-f1-1-multi-act-inspections/i.test(name)), true);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import test from 'node:test';
|
||||
|
||||
const root = process.cwd();
|
||||
const read = (relative: string) => fs.readFileSync(path.join(root, relative), 'utf8');
|
||||
|
||||
test('F1.1 migration allows many acts per inspection while keeping only one draft at a time', () => {
|
||||
const migration = read('src/database/migrations/1789495200000-phase-f1-1-multi-act-inspections.ts');
|
||||
assert.match(migration, /DROP CONSTRAINT IF EXISTS uq_inspection_acts_visit/);
|
||||
assert.match(migration, /CREATE UNIQUE INDEX uq_inspection_acts_one_draft_per_visit/);
|
||||
assert.match(migration, /WHERE status = 'DRAFT'/);
|
||||
assert.match(migration, /DROP CONSTRAINT IF EXISTS uq_inspection_reports_visit/);
|
||||
assert.match(migration, /CREATE INDEX idx_inspection_reports_visit_id/);
|
||||
});
|
||||
|
||||
test('F1.1 preserves exactly one frozen report per act instead of per inspection', () => {
|
||||
const reportEntity = read('src/database/entities/inspection-report.entity.ts');
|
||||
const reports = read('src/inspection-reports/inspection-reports.service.ts');
|
||||
assert.match(reportEntity, /@Index\('uq_inspection_reports_act', \['actId'\], \{ unique: true \}\)/);
|
||||
assert.match(reportEntity, /@Index\('idx_inspection_reports_visit_id', \['visitId'\]\)/);
|
||||
assert.doesNotMatch(reportEntity, /visitId'\], \{ unique: true \}/);
|
||||
assert.match(reports, /WHERE act_id = \$1/);
|
||||
});
|
||||
|
||||
test('F1.1 closes an act without closing its parent inspection', () => {
|
||||
const closing = read('src/inspection-closing/inspection-closing.service.ts');
|
||||
const closeBody = closing.slice(closing.indexOf(' async close('), closing.indexOf(' async signatureContent('));
|
||||
assert.match(closeBody, /UPDATE inspection_acts/);
|
||||
assert.doesNotMatch(closeBody, /UPDATE inspection_visits/);
|
||||
assert.match(closeBody, /visitRemainsIndependent: true/);
|
||||
assert.match(closeBody, /ensureFrozenReport\(manager, actId, principal, request\)/);
|
||||
});
|
||||
|
||||
test('F1.1 exposes an APK-only explicit inspection close and permits pending company signature', () => {
|
||||
const controller = read('src/inspection-visits/inspection-visits.controller.ts');
|
||||
const visits = read('src/inspection-visits/inspection-visits.service.ts');
|
||||
assert.match(controller, /@Post\(':id\/close'\)/);
|
||||
assert.match(controller, /@RequirePermissions\('inspections\.execute'\)/);
|
||||
assert.match(visits, /async close\(/);
|
||||
assert.match(visits, /assertMobileInspector\(principal\)/);
|
||||
assert.match(visits, /INSPECTION_VISIT_DRAFT_ACTS_PENDING/);
|
||||
assert.match(visits, /INSPECTION_VISIT_INSPECTOR_SIGNATURE_PENDING/);
|
||||
assert.match(visits, /pendingCompanySignatures/);
|
||||
assert.match(visits, /actsMayCompleteCompanySignatureLater: true/);
|
||||
});
|
||||
|
||||
test('F1.1 lets the company sign after the inspection closes and records conformity or dissent', () => {
|
||||
const closing = read('src/inspection-closing/inspection-closing.service.ts');
|
||||
const dto = read('src/inspection-closing/dto/create-company-signature.dto.ts');
|
||||
const signatureEntity = read('src/database/entities/inspection-act-signature.entity.ts');
|
||||
assert.match(closing, /InspectionVisitStatus\.IN_PROGRESS, InspectionVisitStatus\.CLOSED/);
|
||||
assert.match(closing, /InspectionCompanySignatureManifestation\.CONFORMITY/);
|
||||
assert.match(closing, /InspectionCompanySignatureManifestation\.DISSENT/);
|
||||
assert.match(dto, /@ValidateIf/);
|
||||
assert.match(dto, /@MinLength\(10\)/);
|
||||
assert.match(signatureEntity, /CONFORMITY = 'CONFORMITY'/);
|
||||
assert.match(signatureEntity, /DISSENT = 'DISSENT'/);
|
||||
assert.match(signatureEntity, /companyStatement/);
|
||||
});
|
||||
|
||||
test('F1.1 keeps field-created Inventory linked only to the current draft act', () => {
|
||||
const link = read('src/inspection-operations/field-discovery-inspection-link.service.ts');
|
||||
assert.match(link, /AND status = 'DRAFT'/);
|
||||
assert.match(link, /if \(act\)/);
|
||||
assert.match(link, /inspection_visit_assets/);
|
||||
assert.match(link, /inspection_act_assets/);
|
||||
assert.match(link, /return \{ actId: act\?\.id \?\? null \}/);
|
||||
assert.doesNotMatch(link, /status <> 'CANCELLED'/);
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { resolve } from 'node:path';
|
||||
import test from 'node:test';
|
||||
import { validate } from 'class-validator';
|
||||
import { plainToInstance } from 'class-transformer';
|
||||
import { SetActResponseDeadlineDto } from '../../src/act-administration/dto/set-act-response-deadline.dto';
|
||||
import { CreateActCompanyResponseDto } from '../../src/act-administration/dto/create-act-company-response.dto';
|
||||
|
||||
const source = (path: string) => readFileSync(resolve(process.cwd(), path), 'utf8');
|
||||
const migration = source('src/database/migrations/1789581600000-phase-f1-2-act-administration.ts');
|
||||
const service = source('src/act-administration/act-administration.service.ts');
|
||||
const controller = source('src/act-administration/act-administration.controller.ts');
|
||||
|
||||
test('F1.2 stores one append-only administrative deadline ledger per Act', () => {
|
||||
assert.match(migration, /inspection_act_deadline_events/);
|
||||
assert.match(migration, /append_only/);
|
||||
assert.match(service, /ACT_RESPONSE_DEADLINE_SET/);
|
||||
});
|
||||
|
||||
test('F1.2 preserves ambiguous historical finding deadlines instead of collapsing them', () => {
|
||||
assert.match(migration, /HAVING COUNT\(DISTINCT correction_due_on\) = 1/);
|
||||
});
|
||||
|
||||
test('F1.2 stores company responses and protected PDF metadata at Act level', () => {
|
||||
assert.match(migration, /inspection_act_company_responses/);
|
||||
assert.match(service, /%PDF-/);
|
||||
assert.match(controller, /inspection-acts\/:actId\/administration/);
|
||||
});
|
||||
|
||||
test('F1.2 deadline and company response DTOs reject invalid office input', async () => {
|
||||
const deadline = plainToInstance(SetActResponseDeadlineDto, { responseDueOn: 'bad', reason: 'x' });
|
||||
assert.ok((await validate(deadline)).length >= 2);
|
||||
const response = plainToInstance(CreateActCompanyResponseDto, { receivedOn: 'bad', contactEmail: 'bad' });
|
||||
assert.ok((await validate(response)).length >= 2);
|
||||
});
|
||||
|
||||
test('F1.2 derives administrative queues from Acts instead of replacing finding history', () => {
|
||||
assert.match(service, /WAITING_RESPONSE/);
|
||||
assert.match(service, /COMMITMENT_OVERDUE/);
|
||||
assert.match(service, /inspection_findings/);
|
||||
});
|
||||
@@ -0,0 +1,303 @@
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
APP="/var/www/dhv2.korexlabs.com"
|
||||
KEY="/root/.ssh/dhv2_github"
|
||||
BACKUP_ROOT="/root/DH_V2_BACKUPS"
|
||||
DEPLOY_REF="${DHV2_DEPLOY_REF:-deploy}"
|
||||
STAMP="$(date +%Y%m%d_%H%M%S)"
|
||||
BACKUP="$BACKUP_ROOT/GITHUB_DEPLOY_${STAMP}"
|
||||
STAGE="/root/dhv2-github-stage-${STAMP}"
|
||||
LOG="/tmp/dhv2-github-deploy-${STAMP}.log"
|
||||
API_TEST_IMAGE="dhv2-api:github-${STAMP}"
|
||||
WEB_TEST_IMAGE="dhv2-web:github-${STAMP}"
|
||||
PHASE="bootstrap"
|
||||
PREV_SHA=""
|
||||
TARGET_SHA=""
|
||||
EXPECTED_API_VERSION=""
|
||||
EXPECTED_WEB_VERSION=""
|
||||
APP_TOUCHED=0
|
||||
|
||||
cd "$APP"
|
||||
export GIT_SSH_COMMAND="ssh -i $KEY -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new"
|
||||
exec > >(tee -a "$LOG") 2>&1
|
||||
|
||||
cleanup() {
|
||||
set +e
|
||||
git worktree remove --force "$STAGE" >/dev/null 2>&1 || true
|
||||
rm -rf "$STAGE"
|
||||
docker image rm "$API_TEST_IMAGE" "$WEB_TEST_IMAGE" >/dev/null 2>&1 || true
|
||||
}
|
||||
|
||||
publish_status() {
|
||||
local rc="${1:-1}"
|
||||
set +e
|
||||
|
||||
local outcome="failure"
|
||||
[ "$rc" -eq 0 ] && outcome="success"
|
||||
local current="unknown"
|
||||
current="$(git rev-parse HEAD 2>/dev/null || echo unknown)"
|
||||
local status_file log_file status_blob log_blob tree commit
|
||||
|
||||
status_file="$(mktemp /tmp/dhv2-status.XXXXXX)"
|
||||
log_file="$(mktemp /tmp/dhv2-log.XXXXXX)"
|
||||
|
||||
{
|
||||
echo "status=$outcome"
|
||||
echo "exit_code=$rc"
|
||||
echo "phase=$PHASE"
|
||||
echo "timestamp=$(date --iso-8601=seconds)"
|
||||
echo "deploy_ref=$DEPLOY_REF"
|
||||
echo "previous_sha=${PREV_SHA:-unknown}"
|
||||
echo "target_sha=${TARGET_SHA:-unknown}"
|
||||
echo "current_sha=$current"
|
||||
echo "api_version=${EXPECTED_API_VERSION:-unknown}"
|
||||
echo "web_version=${EXPECTED_WEB_VERSION:-unknown}"
|
||||
echo "app_touched=$APP_TOUCHED"
|
||||
echo "backup=${BACKUP:-unknown}"
|
||||
} > "$status_file"
|
||||
|
||||
tail -n 500 "$LOG" > "$log_file" 2>/dev/null || true
|
||||
status_blob="$(git hash-object -w "$status_file" 2>/dev/null || true)"
|
||||
log_blob="$(git hash-object -w "$log_file" 2>/dev/null || true)"
|
||||
|
||||
if [ -n "$status_blob" ] && [ -n "$log_blob" ]; then
|
||||
tree="$(printf '100644 blob %s\tdeploy.log\n100644 blob %s\tstatus.txt\n' "$log_blob" "$status_blob" | git mktree 2>/dev/null || true)"
|
||||
if [ -n "$tree" ]; then
|
||||
commit="$(printf 'deploy-status: %s · phase %s\n' "$outcome" "$PHASE" | git -c user.name='DH V2 Deploy Bot' -c user.email='deploy@dhv2.local' commit-tree "$tree" 2>/dev/null || true)"
|
||||
[ -z "$commit" ] || git push --force origin "$commit:refs/heads/deploy-status" >/dev/null 2>&1 || true
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -f "$status_file" "$log_file"
|
||||
}
|
||||
|
||||
on_exit() {
|
||||
local rc=$?
|
||||
trap - EXIT ERR
|
||||
cleanup
|
||||
publish_status "$rc"
|
||||
exit "$rc"
|
||||
}
|
||||
trap on_exit EXIT
|
||||
|
||||
rollback() {
|
||||
local rc=$?
|
||||
trap - ERR
|
||||
PHASE="rollback"
|
||||
|
||||
echo
|
||||
echo "============================================================"
|
||||
echo " DH V2 · DEPLOY FALLÓ · ROLLBACK"
|
||||
echo "============================================================"
|
||||
|
||||
cd "$APP"
|
||||
if [ "$APP_TOUCHED" -eq 1 ] && [ -n "${PREV_SHA:-}" ]; then
|
||||
echo "Restaurando aplicación al commit previo: $PREV_SHA"
|
||||
git reset --hard "$PREV_SHA" || true
|
||||
docker compose build api web </dev/null || true
|
||||
docker compose up -d --no-deps --force-recreate api web </dev/null || true
|
||||
else
|
||||
echo "El candidato falló antes de modificar producción; no se reconstruye ni reinicia la aplicación activa."
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "Estado actual:"
|
||||
docker compose ps -a </dev/null || true
|
||||
|
||||
if [ "$APP_TOUCHED" -eq 1 ]; then
|
||||
echo
|
||||
echo "Últimos logs:"
|
||||
docker compose logs --tail=160 api web </dev/null || true
|
||||
fi
|
||||
|
||||
echo
|
||||
if [ -d "$BACKUP" ]; then
|
||||
echo "Backup PRE disponible en: $BACKUP"
|
||||
echo "Las migraciones son forward-only; database-before.dump queda disponible para restauración manual si hiciera falta."
|
||||
else
|
||||
echo "No fue necesario crear backup PRE: el fallo ocurrió durante el preflight del candidato, antes de tocar producción."
|
||||
fi
|
||||
exit "$rc"
|
||||
}
|
||||
trap rollback ERR
|
||||
|
||||
echo
|
||||
echo "============================================================"
|
||||
echo " DH V2 · DEPLOY DESDE GITHUB · $DEPLOY_REF"
|
||||
echo "============================================================"
|
||||
|
||||
for cmd in git docker curl tar node; do
|
||||
command -v "$cmd" >/dev/null || { echo "ERROR: falta $cmd"; false; }
|
||||
done
|
||||
[ -f "$KEY" ] || { echo "ERROR: falta deploy key $KEY"; false; }
|
||||
[ -d .git ] || { echo "ERROR: $APP no es repositorio Git"; false; }
|
||||
[ -f .env ] || { echo "ERROR: falta $APP/.env"; false; }
|
||||
|
||||
git config --global --get-all safe.directory 2>/dev/null | grep -Fxq "$APP" || git config --global --add safe.directory "$APP"
|
||||
|
||||
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
|
||||
echo "ERROR: hay cambios locales versionados en producción."
|
||||
git status --short
|
||||
false
|
||||
fi
|
||||
|
||||
PREV_SHA="$(git rev-parse HEAD)"
|
||||
PHASE="fetch"
|
||||
git fetch origin "$DEPLOY_REF"
|
||||
TARGET_SHA="$(git rev-parse "origin/$DEPLOY_REF")"
|
||||
|
||||
echo "Actual: $PREV_SHA"
|
||||
echo "Objetivo: $TARGET_SHA"
|
||||
|
||||
if [ "$TARGET_SHA" = "$PREV_SHA" ]; then
|
||||
echo "Producción ya está en el commit autorizado."
|
||||
PHASE="complete"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if ! git merge-base --is-ancestor "$PREV_SHA" "$TARGET_SHA"; then
|
||||
echo "ERROR: origin/$DEPLOY_REF no es fast-forward desde producción."
|
||||
false
|
||||
fi
|
||||
|
||||
PHASE="candidate-preflight"
|
||||
rm -rf "$STAGE"
|
||||
git worktree add --detach "$STAGE" "$TARGET_SHA" >/dev/null
|
||||
|
||||
EXPECTED_API_VERSION="$(node -p "require('$STAGE/api-v3/package.json').version")"
|
||||
EXPECTED_WEB_VERSION="$(node -p "require('$STAGE/web-v2/package.json').version")"
|
||||
|
||||
echo "API candidata: $EXPECTED_API_VERSION"
|
||||
echo "WEB candidata: $EXPECTED_WEB_VERSION"
|
||||
|
||||
docker compose --env-file "$APP/.env" -f "$STAGE/docker-compose.yml" config >/dev/null
|
||||
|
||||
while IFS= read -r -d '' script; do
|
||||
bash -n "$script"
|
||||
done < <(find "$STAGE/scripts" -type f -name '*.sh' -print0)
|
||||
|
||||
echo
|
||||
echo "========== TEST API CANDIDATA =========="
|
||||
docker build --target builder -t "$API_TEST_IMAGE" "$STAGE/api-v3" </dev/null
|
||||
docker run --rm \
|
||||
-v "$STAGE/api-v3/test:/app/test:ro" \
|
||||
-v "$STAGE/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
|
||||
"$API_TEST_IMAGE" npm test </dev/null
|
||||
|
||||
echo
|
||||
echo "========== BUILD WEB CANDIDATA =========="
|
||||
docker build -t "$WEB_TEST_IMAGE" "$STAGE/web-v2" </dev/null
|
||||
|
||||
PHASE="backup"
|
||||
echo
|
||||
echo "========== BACKUP PRE =========="
|
||||
install -d -m 700 "$BACKUP"
|
||||
docker compose exec -T db sh -lc 'pg_dump -U "$POSTGRES_USER" -d "$POSTGRES_DB" -Fc' </dev/null > "$BACKUP/database-before.dump"
|
||||
tar \
|
||||
--exclude='./.git' \
|
||||
--exclude='./.env' \
|
||||
--exclude='*/node_modules' \
|
||||
--exclude='*/dist' \
|
||||
--exclude='*.zip' \
|
||||
--exclude='*.tar.gz' \
|
||||
--exclude='*.tgz' \
|
||||
-czf "$BACKUP/source-before.tar.gz" .
|
||||
install -m 600 .env "$BACKUP/.env"
|
||||
git rev-parse HEAD > "$BACKUP/previous.sha"
|
||||
printf '%s\n' "$TARGET_SHA" > "$BACKUP/target.sha"
|
||||
docker compose ps -a > "$BACKUP/docker-before.txt"
|
||||
(
|
||||
cd "$BACKUP"
|
||||
sha256sum database-before.dump source-before.tar.gz .env previous.sha target.sha docker-before.txt > SHA256SUMS.txt
|
||||
sha256sum -c SHA256SUMS.txt
|
||||
)
|
||||
chmod 600 "$BACKUP"/* "$BACKUP/.env" 2>/dev/null || true
|
||||
|
||||
PHASE="fast-forward"
|
||||
echo
|
||||
echo "========== FAST-FORWARD =========="
|
||||
git log --oneline --no-decorate "$PREV_SHA..$TARGET_SHA"
|
||||
APP_TOUCHED=1
|
||||
git merge --ff-only "origin/$DEPLOY_REF"
|
||||
|
||||
PHASE="build"
|
||||
echo
|
||||
echo "========== BUILD PRODUCCIÓN =========="
|
||||
docker compose build api migrate web </dev/null
|
||||
|
||||
PHASE="migrations"
|
||||
echo
|
||||
echo "========== MIGRACIONES =========="
|
||||
docker compose --profile tools run --rm migrate </dev/null
|
||||
docker compose --profile tools run --rm migrate npm run migration:show </dev/null | tee "$BACKUP/migrations.txt"
|
||||
grep -Fq 'Pending migrations: no' "$BACKUP/migrations.txt"
|
||||
|
||||
PHASE="recreate"
|
||||
echo
|
||||
echo "========== RECREATE API + WEB =========="
|
||||
docker compose up -d --no-deps --force-recreate api web </dev/null
|
||||
|
||||
PHASE="health"
|
||||
echo
|
||||
echo "========== HEALTH =========="
|
||||
HEALTH_OK=0
|
||||
for _ in $(seq 1 60); do
|
||||
if curl -fsS --max-time 5 http://127.0.0.1:3101/api/v3/health > "$BACKUP/health.json" 2>/dev/null; then
|
||||
if grep -F '"status":"ok"' "$BACKUP/health.json" >/dev/null; then
|
||||
HEALTH_OK=1
|
||||
break
|
||||
fi
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
|
||||
if [ "$HEALTH_OK" -ne 1 ]; then
|
||||
echo "ERROR: API no pasó healthcheck."
|
||||
docker compose logs --tail=180 api
|
||||
false
|
||||
fi
|
||||
|
||||
cat "$BACKUP/health.json"
|
||||
echo
|
||||
|
||||
grep -Fq "\"version\":\"$EXPECTED_API_VERSION\"" "$BACKUP/health.json"
|
||||
grep -Fq '"database":"ok"' "$BACKUP/health.json"
|
||||
|
||||
WEB_CODE="$(curl -sS -o /dev/null -w '%{http_code}' --max-time 10 http://127.0.0.1:8182/)"
|
||||
[ "$WEB_CODE" = "200" ] || { echo "ERROR: WEB HTTP $WEB_CODE"; false; }
|
||||
|
||||
PHASE="verify"
|
||||
echo
|
||||
echo "========== VERIFICACIÓN FINAL =========="
|
||||
docker compose ps -a | tee "$BACKUP/docker-after.txt"
|
||||
if docker compose ps --status running --services | grep -Fxq api && docker compose ps --status running --services | grep -Fxq web && docker compose ps --status running --services | grep -Fxq db; then
|
||||
echo "Servicios críticos: OK"
|
||||
else
|
||||
echo "ERROR: falta un servicio crítico en ejecución."
|
||||
false
|
||||
fi
|
||||
|
||||
PHASE="post-backup"
|
||||
docker compose exec -T db sh -lc 'pg_dump -U "$POSTGRES_USER" -d "$POSTGRES_DB" -Fc' </dev/null > "$BACKUP/database-after.dump"
|
||||
git rev-parse HEAD > "$BACKUP/deployed.sha"
|
||||
printf 'API=%s\nWEB=%s\n' "$EXPECTED_API_VERSION" "$EXPECTED_WEB_VERSION" > "$BACKUP/deployed-versions.txt"
|
||||
(
|
||||
cd "$BACKUP"
|
||||
sha256sum database-after.dump deployed.sha deployed-versions.txt health.json migrations.txt docker-after.txt >> SHA256SUMS.txt
|
||||
sha256sum -c SHA256SUMS.txt
|
||||
)
|
||||
chmod 600 "$BACKUP"/* "$BACKUP/.env" 2>/dev/null || true
|
||||
|
||||
PHASE="complete"
|
||||
trap - ERR
|
||||
|
||||
echo
|
||||
echo "============================================================"
|
||||
echo " DH V2 · DEPLOY OK"
|
||||
echo "============================================================"
|
||||
echo "Commit: $TARGET_SHA"
|
||||
echo "API: $EXPECTED_API_VERSION"
|
||||
echo "WEB: $EXPECTED_WEB_VERSION"
|
||||
echo "Backup: $BACKUP"
|
||||
echo "============================================================"
|
||||
@@ -0,0 +1,111 @@
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
APP="/var/www/dhv2.korexlabs.com"
|
||||
KEY="/root/.ssh/dhv2_github"
|
||||
WATCHER="/usr/local/sbin/dhv2-auto-deploy"
|
||||
SERVICE="/etc/systemd/system/dhv2-auto-deploy.service"
|
||||
TIMER="/etc/systemd/system/dhv2-auto-deploy.timer"
|
||||
|
||||
if [ "$(id -u)" -ne 0 ]; then
|
||||
echo "ERROR: ejecutar como root."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$APP"
|
||||
[ -d .git ] || { echo "ERROR: $APP no es repositorio Git."; exit 1; }
|
||||
[ -f "$KEY" ] || { echo "ERROR: falta $KEY"; exit 1; }
|
||||
|
||||
git config --global --add safe.directory "$APP" >/dev/null 2>&1 || true
|
||||
git config core.sshCommand "ssh -i $KEY -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new"
|
||||
|
||||
cat > "$WATCHER" <<'WATCH'
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
APP="/var/www/dhv2.korexlabs.com"
|
||||
KEY="/root/.ssh/dhv2_github"
|
||||
LOCK="/var/lock/dhv2-auto-deploy.lock"
|
||||
|
||||
exec 9>"$LOCK"
|
||||
flock -n 9 || exit 0
|
||||
|
||||
cd "$APP"
|
||||
export GIT_SSH_COMMAND="ssh -i $KEY -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new"
|
||||
git config --global --add safe.directory "$APP" >/dev/null 2>&1 || true
|
||||
|
||||
if ! git fetch --quiet origin deploy; then
|
||||
echo "No se pudo consultar origin/deploy; producción no se modifica."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
TARGET="$(git rev-parse origin/deploy)"
|
||||
CURRENT="$(git rev-parse HEAD)"
|
||||
|
||||
[ "$TARGET" != "$CURRENT" ] || exit 0
|
||||
|
||||
if ! git merge-base --is-ancestor "$CURRENT" "$TARGET"; then
|
||||
echo "ERROR: origin/deploy no es fast-forward desde $CURRENT. Deploy rechazado."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TMP="$(mktemp /root/dhv2-deploy.XXXXXX.sh)"
|
||||
trap 'rm -f "$TMP"' EXIT
|
||||
|
||||
git show "$TARGET:scripts/deploy-github.sh" > "$TMP"
|
||||
chmod 700 "$TMP"
|
||||
DHV2_DEPLOY_REF=deploy bash "$TMP"
|
||||
WATCH
|
||||
chmod 700 "$WATCHER"
|
||||
|
||||
cat > "$SERVICE" <<'UNIT'
|
||||
[Unit]
|
||||
Description=DH V2 autonomous GitHub deploy check
|
||||
After=network-online.target docker.service
|
||||
Wants=network-online.target
|
||||
Requires=docker.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
User=root
|
||||
WorkingDirectory=/var/www/dhv2.korexlabs.com
|
||||
ExecStart=/usr/local/sbin/dhv2-auto-deploy
|
||||
Nice=10
|
||||
IOSchedulingClass=best-effort
|
||||
IOSchedulingPriority=6
|
||||
UNIT
|
||||
|
||||
cat > "$TIMER" <<'UNIT'
|
||||
[Unit]
|
||||
Description=Check DH V2 deploy branch every minute
|
||||
|
||||
[Timer]
|
||||
OnBootSec=45s
|
||||
OnUnitInactiveSec=60s
|
||||
AccuracySec=10s
|
||||
Persistent=true
|
||||
Unit=dhv2-auto-deploy.service
|
||||
|
||||
[Install]
|
||||
WantedBy=timers.target
|
||||
UNIT
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl enable --now dhv2-auto-deploy.timer
|
||||
|
||||
if ! systemctl start dhv2-auto-deploy.service; then
|
||||
echo
|
||||
echo "ERROR: la comprobación inicial de deploy falló."
|
||||
journalctl -u dhv2-auto-deploy.service -n 140 --no-pager || true
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "============================================================"
|
||||
echo " DH V2 AUTO-DEPLOY INSTALADO Y VALIDADO"
|
||||
echo "============================================================"
|
||||
echo "Watcher: $WATCHER"
|
||||
echo "Timer: dhv2-auto-deploy.timer"
|
||||
echo "Logs: journalctl -u dhv2-auto-deploy.service"
|
||||
echo "============================================================"
|
||||
systemctl --no-pager --full status dhv2-auto-deploy.timer | sed -n '1,16p' || true
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "dhv2-web",
|
||||
"version": "0.19.6-4",
|
||||
"version": "0.20.0-2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "dhv2-web",
|
||||
"version": "0.19.6-4",
|
||||
"version": "0.20.0-2",
|
||||
"dependencies": {
|
||||
"maplibre-gl": "^6.0.0",
|
||||
"react": "^19.0.0",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dhv2-web",
|
||||
"version": "0.19.6-4",
|
||||
"version": "0.20.0-2",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"engines": {
|
||||
|
||||
@@ -32,6 +32,8 @@ import { ActsPage } from '../pages/ActsPage';
|
||||
import { ReportsPage } from '../pages/ReportsPage';
|
||||
import { ReportDetailPage } from '../pages/ReportDetailPage';
|
||||
import { VerificationPlanningPage } from '../pages/VerificationPlanningPage';
|
||||
import { ActAdministrationPage } from '../pages/ActAdministrationPage';
|
||||
import { ActAdministrationDetailPage } from '../pages/ActAdministrationDetailPage';
|
||||
|
||||
const MapPage = lazy(() => import('../pages/MapPage').then((module) => ({ default: module.MapPage })));
|
||||
|
||||
@@ -71,7 +73,7 @@ export function App() {
|
||||
</Route>
|
||||
<Route element={<PermissionRoute permission="inspection_findings.read" />}><Route path="/hallazgos" element={<FindingsPage />} /><Route path="/hallazgos/:id" element={<FindingDetailPage />} /></Route>
|
||||
<Route element={<PermissionRoute permission="inspection_verifications.plan" />}><Route path="/hallazgos/planificacion" element={<VerificationPlanningPage />} /></Route>
|
||||
<Route element={<PermissionRoute permission="inspection_acts.read" />}><Route path="/actas" element={<ActsPage />} /></Route>
|
||||
<Route element={<PermissionRoute permission="inspection_acts.read" />}><Route path="/actas" element={<ActsPage />} /><Route path="/seguimiento-actas" element={<ActAdministrationPage />} /><Route path="/seguimiento-actas/:actId" element={<ActAdministrationDetailPage />} /></Route>
|
||||
<Route element={<PermissionRoute permission="inspection_reports.read" />}><Route path="/informes" element={<ReportsPage />} /><Route path="/informes/:id" element={<ReportDetailPage />} /></Route>
|
||||
<Route element={<PermissionRoute permission="assets.read_history" />}><Route path="/historial" element={<HistoryPage />} /></Route>
|
||||
<Route element={<PermissionRoute permission="assets.read_temporal" />}><Route path="/consulta-temporal" element={<TemporalAssetsPage />} /></Route>
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
export const APP_VERSION = '0.19.6-4';
|
||||
export const APP_PHASE = 'Fase D5.6.4 · Inspecciones simples y combobox buscables';
|
||||
export const APP_VERSION = '0.20.0-2';
|
||||
export const APP_PHASE = 'Fase F1.2 · Seguimiento administrativo por Acta';
|
||||
|
||||
@@ -29,13 +29,13 @@ export function InspectionActsPanel({ visit }: { visit: InspectionVisit }) {
|
||||
|
||||
return <section className="inspection-acts-panel">
|
||||
<div className="panel-heading">
|
||||
<div><span className="eyebrow">ACTA DE LA VISITA</span><h2>Acta única</h2><p className="section-copy">Cada visita genera una única acta, con numeración anual oficial y versiones inmutables.</p></div>
|
||||
<div><span className="eyebrow">ACTAS DE LA INSPECCIÓN</span><h2>Actas generadas</h2><p className="section-copy">Una inspección puede generar múltiples actas. Cada acta agrupa sus propios hallazgos y tendrá un único informe.</p></div>
|
||||
<span className="status-badge pending">Sólo lectura</span>
|
||||
</div>
|
||||
<div className="temporal-notice"><Icon name="clipboard" /><p><strong>El acta se crea en la APK.</strong> El dashboard permite consultar el acta, sus hallazgos, firmas e informe después de la sincronización.</p></div>
|
||||
<div className="temporal-notice"><Icon name="clipboard" /><p><strong>Las actas se crean en la APK.</strong> El dashboard permite consultar cada acta, sus hallazgos, firmas e informe después de la sincronización.</p></div>
|
||||
{error && <Alert>{error}</Alert>}
|
||||
{loading ? <LoadingBlock label="Cargando actas…" /> : acts.length === 0
|
||||
? <EmptyState title="Sin acta sincronizada" text={visit.status === 'IN_PROGRESS' ? 'El inspector debe crearla desde la APK.' : 'Aparecerá aquí cuando el inspector la genere desde la APK.'} />
|
||||
: <div className="table-panel inspection-acts-table"><div className="table-summary"><strong>Acta de inspección</strong><span>Numeración oficial global por año</span></div><div className="table-scroll"><table><thead><tr><th>Acta</th><th>Estado</th><th>Fecha</th><th>Registros</th><th>Hallazgos</th><th>Versión</th><th /></tr></thead><tbody>{acts.map((act) => <tr key={act.id}><td><div className="asset-cell"><span className="asset-symbol"><Icon name="clipboard" size={17} /></span><div><strong>{act.title}</strong><small>{act.code}</small></div></div></td><td><span className={`status-badge ${inspectionActStatusClass(act.status)}`}>{inspectionActStatusLabel(act.status)}</span></td><td>{formatDate(act.occurredAt)}</td><td>{act.assetCount}</td><td>{act.findingCount}</td><td>v{act.currentVersion}</td><td className="action-cell"><Link className="icon-button" to={`/inspecciones/actas/${act.id}`} aria-label={`Abrir ${act.code}`}><Icon name="chevron" /></Link></td></tr>)}</tbody></table></div></div>}
|
||||
? <EmptyState title="Sin actas sincronizadas" text={visit.status === 'IN_PROGRESS' ? 'El inspector puede crear la primera acta desde la APK.' : 'Aparecerán aquí a medida que el inspector genere actas desde la APK.'} />
|
||||
: <div className="table-panel inspection-acts-table"><div className="table-summary"><strong>Actas de la inspección</strong><span>Numeración oficial global por año</span></div><div className="table-scroll"><table><thead><tr><th>Acta</th><th>Estado</th><th>Fecha</th><th>Registros</th><th>Hallazgos</th><th>Versión</th><th /></tr></thead><tbody>{acts.map((act) => <tr key={act.id}><td><div className="asset-cell"><span className="asset-symbol"><Icon name="clipboard" size={17} /></span><div><strong>{act.title}</strong><small>{act.code}</small></div></div></td><td><span className={`status-badge ${inspectionActStatusClass(act.status)}`}>{inspectionActStatusLabel(act.status)}</span></td><td>{formatDate(act.occurredAt)}</td><td>{act.assetCount}</td><td>{act.findingCount}</td><td>v{act.currentVersion}</td><td className="action-cell"><Link className="icon-button" to={`/inspecciones/actas/${act.id}`} aria-label={`Abrir ${act.code}`}><Icon name="chevron" /></Link></td></tr>)}</tbody></table></div></div>}
|
||||
</section>;
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ export function InspectionClosurePanel({ act }: { act: InspectionAct }) {
|
||||
const constanciasCompletas = inspectorSignatures.length > 0 && Boolean(companyOutcome);
|
||||
|
||||
return <section className="panel inspection-closure-panel">
|
||||
<div className="panel-heading"><div><span className="eyebrow">CIERRE DE LA INSPECCIÓN · SÓLO LECTURA</span><h2>Responsable, firmas y sellado</h2><p className="section-copy">La preparación, las firmas y el cierre son operaciones exclusivas de la APK para inspectores.</p></div><span className={`status-badge large ${act.status === 'CLOSED' ? 'active' : act.status === 'READY' ? 'observed' : 'pending'}`}>{act.status === 'CLOSED' ? 'Cierre sellado' : act.status === 'READY' ? 'Esperando firmas' : 'Pendiente en APK'}</span></div>
|
||||
<div className="panel-heading"><div><span className="eyebrow">CIERRE DEL ACTA · SÓLO LECTURA</span><h2>Responsable, firmas y sellado</h2><p className="section-copy">La preparación y firma del acta se realizan desde la APK. La inspección puede continuar con otras actas.</p></div><span className={`status-badge large ${act.status === 'CLOSED' ? 'active' : act.status === 'READY' ? 'observed' : 'pending'}`}>{act.status === 'CLOSED' ? 'Cierre sellado' : act.status === 'READY' ? 'Esperando firmas' : 'Pendiente en APK'}</span></div>
|
||||
|
||||
{error && <Alert>{error}</Alert>}
|
||||
<div className="temporal-notice"><Icon name="clipboard" /><p><strong>Operación exclusiva en APK.</strong> El dashboard muestra las constancias sincronizadas, pero no permite identificar al responsable, firmar, reabrir ni cerrar el acta.</p></div>
|
||||
@@ -78,8 +78,8 @@ export function InspectionClosurePanel({ act }: { act: InspectionAct }) {
|
||||
|
||||
{closure.closure?.isCurrent && <div className="closure-hash-card"><div><span className="eyebrow">CONTENIDO CONGELADO</span><strong>{closure.closure.schemaVersion}</strong><small>Preparado {formatDate(closure.closure.preparedAt)}</small></div><code>{closure.closure.preparedSha256}</code></div>}
|
||||
|
||||
{closure.signatures.length > 0 && <div className="signature-records">{closure.signatures.map((signature) => <article key={signature.id}><div><span className={`status-badge ${signature.status === 'SIGNED' ? 'active' : 'observed'}`}>{signatureStatusLabel(signature.status)}</span><strong>{signature.signerName}</strong><small>{signerTypeLabel(signature.signerType)} · {formatDate(signature.createdAt)}</small></div><code title={signature.signaturePayloadSha256}>{signature.signaturePayloadSha256}</code>{signature.status === 'SIGNED' ? <button type="button" className="button secondary" onClick={() => viewSignature(signature)}>Ver firma</button> : <p>{signature.reason}</p>}</article>)}</div>}
|
||||
{closure.signatures.length > 0 && <div className="signature-records">{closure.signatures.map((signature) => <article key={signature.id}><div><span className={`status-badge ${signature.status === 'SIGNED' ? 'active' : 'observed'}`}>{signatureStatusLabel(signature.status)}</span><strong>{signature.signerName}</strong><small>{signerTypeLabel(signature.signerType)} · {formatDate(signature.createdAt)}</small></div><code title={signature.signaturePayloadSha256}>{signature.signaturePayloadSha256}</code>{signature.status === 'SIGNED' ? <><button type="button" className="button secondary" onClick={() => viewSignature(signature)}>Ver firma</button>{signature.signerType === 'COMPANY_RESPONSIBLE' && <p><strong>{signature.companyManifestation === 'DISSENT' ? 'Firma en disidencia' : 'Firma en conformidad'}</strong>{signature.companyStatement ? ` · ${signature.companyStatement}` : ''}</p>}</> : <p>{signature.reason}</p>}</article>)}</div>}
|
||||
|
||||
{act.status === 'CLOSED' && closure.closure?.finalSha256 && <div className="closed-seal"><Icon name="check" /><div><span className="eyebrow">ACTA Y VISITA CERRADAS</span><strong>{formatDate(closure.closure.serverClosedAt)}</strong><p>Los hallazgos continúan abiertos para la respuesta de la empresa y el próximo control.</p><code>{closure.closure.finalSha256}</code></div></div>}
|
||||
{act.status === 'CLOSED' && closure.closure?.finalSha256 && <div className="closed-seal"><Icon name="check" /><div><span className="eyebrow">ACTA CERRADA</span><strong>{formatDate(closure.closure.serverClosedAt)}</strong><p>El acta quedó sellada. La inspección y las demás actas tienen un ciclo independiente.</p><code>{closure.closure.finalSha256}</code></div></div>}
|
||||
</section>;
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ const operational: NavItem[] = [
|
||||
];
|
||||
|
||||
const followUp: NavItem[] = [
|
||||
{ to: '/seguimiento-actas', label: 'Seguimiento de actas', icon: 'clipboard', permission: 'inspection_acts.read' },
|
||||
{ to: '/hallazgos', label: 'Hallazgos', icon: 'alert', permission: 'inspection_findings.read' },
|
||||
];
|
||||
|
||||
|
||||
@@ -1129,6 +1129,8 @@ export interface InspectionActSignature {
|
||||
position: string | null;
|
||||
status: InspectionActSignatureStatus;
|
||||
reason: string | null;
|
||||
companyManifestation: 'CONFORMITY' | 'DISSENT' | null;
|
||||
companyStatement: string | null;
|
||||
mimeType: string | null;
|
||||
sizeBytes: number | null;
|
||||
imageSha256: string | null;
|
||||
@@ -3094,3 +3096,36 @@ export function updateDocumentDeliverySettings(input:{officeEmail?:string|null;d
|
||||
export function listDocumentDeliveries(){return apiRequest<{data:DocumentDeliveryItem[]}>('/document-delivery/outbox');}
|
||||
export function retryDocumentDelivery(id:string){return apiRequest<DocumentDeliveryItem>(`/document-delivery/outbox/${id}/retry`,{method:'POST'});}
|
||||
export function retryPendingDocumentDeliveries(){return apiRequest<{processed:number}>('/document-delivery/outbox/retry-pending',{method:'POST'});}
|
||||
|
||||
export type ActAdministrationState = 'NEW' | 'WAITING_RESPONSE' | 'DUE_SOON' | 'OVERDUE' | 'RESPONSE_RECEIVED' | 'VERIFICATION_PENDING' | 'COMMITMENT_OVERDUE' | 'REGULARIZED';
|
||||
export interface ActAdministrationQueueItem {
|
||||
actId: string; actCode: string; actStatus: string; occurredAt: string; closedAt: string | null;
|
||||
visitId: string; visitCode: string; areaId: string | null; companyId: string | null; areaName: string | null; companyName: string | null;
|
||||
responseDueOn: string | null; deadlineReason: string | null; responseReceivedOn: string | null; committedCorrectionOn: string | null;
|
||||
findingCount: number; openFindingCount: number; scheduledControlCount: number; adminState: ActAdministrationState;
|
||||
}
|
||||
export interface ActAdministrationQueuePage { data: ActAdministrationQueueItem[]; counters: Partial<Record<ActAdministrationState, number>>; meta: PageMeta }
|
||||
export interface ActAdministrationDetail {
|
||||
act: ActAdministrationQueueItem;
|
||||
deadlines: Array<{ id:string; responseDueOn:string; reason:string; createdAt:string }>;
|
||||
responses: Array<{ id:string; receivedOn:string; details:string|null; committedCorrectionOn:string|null; contactName:string|null; contactEmail:string|null; originalName:string|null; sizeBytes:number|null; sha256:string|null; createdAt:string }>;
|
||||
findings: Array<{ id:string; code:string; title:string; status:string; nextControlOn:string|null }>;
|
||||
}
|
||||
export function listActAdministrationQueue(params: { state?: ActAdministrationState | 'ALL'; areaId?: string; companyId?: string; page?: number; pageSize?: number } = {}) {
|
||||
const q = new URLSearchParams({ page: String(params.page ?? 1), pageSize: String(params.pageSize ?? 25) });
|
||||
if (params.state && params.state !== 'ALL') q.set('state', params.state);
|
||||
if (params.areaId) q.set('areaId', params.areaId);
|
||||
if (params.companyId) q.set('companyId', params.companyId);
|
||||
return apiRequest<ActAdministrationQueuePage>(`/act-administration/queue?${q}`);
|
||||
}
|
||||
export function getActAdministration(actId: string) { return apiRequest<ActAdministrationDetail>(`/inspection-acts/${actId}/administration`); }
|
||||
export function setActResponseDeadline(actId: string, input: { responseDueOn: string; reason: string }) { return apiRequest(`/inspection-acts/${actId}/administration/deadline`, { method: 'PATCH', body: JSON.stringify(input) }); }
|
||||
export function addActCompanyResponse(actId: string, input: { receivedOn: string; details?: string; committedCorrectionOn?: string; contactName?: string; contactEmail?: string; file?: File }) {
|
||||
const body = new FormData(); body.append('receivedOn', input.receivedOn);
|
||||
if (input.details) body.append('details', input.details); if (input.committedCorrectionOn) body.append('committedCorrectionOn', input.committedCorrectionOn);
|
||||
if (input.contactName) body.append('contactName', input.contactName); if (input.contactEmail) body.append('contactEmail', input.contactEmail); if (input.file) body.append('file', input.file);
|
||||
return apiRequest(`/inspection-acts/${actId}/administration/responses`, { method: 'POST', body });
|
||||
}
|
||||
export function actCompanyResponseContentUrl(responseId: string) { return `${API_BASE}/act-company-responses/${responseId}/content`; }
|
||||
export function listActAdministrationCalendar(from?: string, to?: string) { const q=new URLSearchParams(); if(from)q.set('from',from); if(to)q.set('to',to); return apiRequest<{from:string;to:string;data:Array<{type:'RESPONSE_DUE'|'COMMITMENT_DUE';date:string;actId:string;actCode:string;areaName:string|null;companyName:string|null;state:ActAdministrationState}>}>(`/act-administration/calendar${q.size?`?${q}`:''}`); }
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ const actions: Record<string, string> = {
|
||||
INSPECTION_ACT_REOPENED: 'Acta devuelta a borrador',
|
||||
INSPECTION_ACT_SIGNATURE_RECORDED: 'Firma manuscrita incorporada al acta',
|
||||
INSPECTION_ACT_COMPANY_OUTCOME_RECORDED: 'Resultado de recepción empresarial registrado',
|
||||
INSPECTION_ACT_CLOSED: 'Acta y visita cerradas',
|
||||
INSPECTION_ACT_CLOSED: 'Acta cerrada',
|
||||
INSPECTION_REPORT_GENERATED: 'Informe de inspección generado',
|
||||
INSPECTION_VERIFICATION_PLANNED: 'Visita de verificación preparada',
|
||||
INSPECTION_FINDING_CREATED: 'Hallazgo abierto',
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
|
||||
import { useEffect, useState } from 'react';
|
||||
import type { FormEvent } from 'react';
|
||||
import { Link, useParams } from 'react-router';
|
||||
import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||
import { addActCompanyResponse, actCompanyResponseContentUrl, getActAdministration, setActResponseDeadline } from '../lib/api';
|
||||
import type { ActAdministrationDetail } from '../lib/api';
|
||||
import { formatDate } from '../lib/format';
|
||||
|
||||
export function ActAdministrationDetailPage(){
|
||||
const {actId=''}=useParams(); const [data,setData]=useState<ActAdministrationDetail|null>(null); const [error,setError]=useState(''); const [busy,setBusy]=useState(false); const [due,setDue]=useState(''); const [reason,setReason]=useState('Plazo administrativo otorgado a la empresa'); const [received,setReceived]=useState(new Date().toISOString().slice(0,10)); const [details,setDetails]=useState(''); const [commitment,setCommitment]=useState(''); const [file,setFile]=useState<File|undefined>();
|
||||
const load=()=>getActAdministration(actId).then(setData).catch(e=>setError(errorMessage(e))); useEffect(()=>{void load()},[actId]);
|
||||
const deadline=async(e:FormEvent)=>{e.preventDefault();setBusy(true);setError('');try{await setActResponseDeadline(actId,{responseDueOn:due,reason});setDue('');await load()}catch(err){setError(errorMessage(err))}finally{setBusy(false)}};
|
||||
const response=async(e:FormEvent)=>{e.preventDefault();setBusy(true);setError('');try{await addActCompanyResponse(actId,{receivedOn:received,details:details||undefined,committedCorrectionOn:commitment||undefined,file});setDetails('');setCommitment('');setFile(undefined);await load()}catch(err){setError(errorMessage(err))}finally{setBusy(false)}};
|
||||
if(!data&&!error)return <LoadingBlock label="Cargando expediente administrativo…"/>;
|
||||
return <section>{error&&<Alert>{error}</Alert>}{data&&<><div className="page-heading"><div><span className="eyebrow">EXPEDIENTE ADMINISTRATIVO</span><h1>{data.act.actCode}</h1><p>{data.act.areaName??'Área sin asignar'} · {data.act.companyName??'Empresa sin asignar'} · {data.act.openFindingCount} hallazgos abiertos</p></div><Link className="button secondary" to={`/inspecciones/actas/${data.act.actId}`}>Ver Acta</Link></div>
|
||||
<div className="detail-grid"><div className="card"><h2>Plazo de respuesta</h2><p>El plazo aplica al conjunto completo de hallazgos del Acta.</p><form className="form-grid" onSubmit={deadline}><label><span>Vencimiento *</span><input type="date" required value={due} onChange={e=>setDue(e.target.value)}/></label><label className="full"><span>Motivo *</span><textarea required minLength={3} value={reason} onChange={e=>setReason(e.target.value)}/></label><button className="button primary" disabled={busy}>Registrar nuevo plazo</button></form>{data.deadlines.length>0&&<div className="stack-list">{data.deadlines.map(d=><div key={d.id}><strong>{formatDate(d.responseDueOn)}</strong><small>{d.reason}</small></div>)}</div>}</div>
|
||||
<div className="card"><h2>Respuesta de la empresa</h2><form className="form-grid" onSubmit={response}><label><span>Recibida el *</span><input type="date" required value={received} onChange={e=>setReceived(e.target.value)}/></label><label><span>Fecha comprometida</span><input type="date" value={commitment} onChange={e=>setCommitment(e.target.value)}/></label><label className="full"><span>Detalle</span><textarea value={details} onChange={e=>setDetails(e.target.value)} placeholder="Resumen de la presentación de la empresa"/></label><label className="full"><span>PDF presentado</span><input type="file" accept="application/pdf,.pdf" onChange={e=>setFile(e.target.files?.[0])}/></label><button className="button primary" disabled={busy}>Registrar respuesta</button></form>{data.responses.length>0&&<div className="stack-list">{data.responses.map(r=><div key={r.id}><strong>{formatDate(r.receivedOn)}</strong><small>{r.details??'Sin detalle'}{r.committedCorrectionOn?` · compromiso ${formatDate(r.committedCorrectionOn)}`:''}</small>{r.originalName&&<a className="text-link" href={actCompanyResponseContentUrl(r.id)} target="_blank" rel="noreferrer">Abrir PDF</a>}</div>)}</div>}</div></div>
|
||||
<div className="card"><h2>Hallazgos del Acta</h2><div className="table-scroll"><table><thead><tr><th>Código</th><th>Hallazgo</th><th>Estado</th><th>Próximo control</th></tr></thead><tbody>{data.findings.map(f=><tr key={f.id}><td><Link className="text-link" to={`/hallazgos/${f.id}`}>{f.code}</Link></td><td>{f.title}</td><td>{f.status}</td><td>{f.nextControlOn?formatDate(f.nextControlOn):'Sin programar'}</td></tr>)}</tbody></table></div></div></>}</section>;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Link } from 'react-router';
|
||||
import { Alert, EmptyState, LoadingBlock, errorMessage } from '../components/Feedback';
|
||||
import { useOperationalContext } from '../context/OperationalContext';
|
||||
import { listActAdministrationQueue } from '../lib/api';
|
||||
import type { ActAdministrationQueueItem, ActAdministrationState, PageMeta } from '../lib/api';
|
||||
import { formatDate } from '../lib/format';
|
||||
|
||||
const states: Array<{value:'ALL'|ActAdministrationState;label:string}> = [
|
||||
{value:'ALL',label:'Todas'}, {value:'NEW',label:'Nuevas'}, {value:'WAITING_RESPONSE',label:'Esperando respuesta'},
|
||||
{value:'DUE_SOON',label:'Próximas a vencer'}, {value:'OVERDUE',label:'Vencidas'}, {value:'RESPONSE_RECEIVED',label:'Respondidas'},
|
||||
{value:'VERIFICATION_PENDING',label:'A verificar'}, {value:'COMMITMENT_OVERDUE',label:'Compromiso vencido'}, {value:'REGULARIZED',label:'Regularizadas'},
|
||||
];
|
||||
const label=(s:ActAdministrationState)=>states.find(x=>x.value===s)?.label??s;
|
||||
export function ActAdministrationPage(){
|
||||
const ctx=useOperationalContext(); const [state,setState]=useState<'ALL'|ActAdministrationState>('ALL'); const [items,setItems]=useState<ActAdministrationQueueItem[]>([]); const [meta,setMeta]=useState<PageMeta>({page:1,pageSize:25,total:0,totalPages:0}); const [counters,setCounters]=useState<Partial<Record<ActAdministrationState,number>>>({}); const [loading,setLoading]=useState(true); const [error,setError]=useState('');
|
||||
useEffect(()=>{setLoading(true);setError('');listActAdministrationQueue({state,areaId:ctx.areaId||undefined,companyId:ctx.companyId||undefined,page:1,pageSize:50}).then(r=>{setItems(r.data);setMeta(r.meta);setCounters(r.counters)}).catch(e=>setError(errorMessage(e))).finally(()=>setLoading(false));},[state,ctx.areaId,ctx.companyId]);
|
||||
return <section><div className="page-heading"><div><span className="eyebrow">SEGUIMIENTO ADMINISTRATIVO</span><h1>Seguimiento de Actas</h1><p>El plazo y la respuesta de la empresa se gestionan sobre el Acta completa. Los hallazgos quedan dentro de su expediente.</p></div></div>
|
||||
<div className="status-tabs">{states.map(s=><button key={s.value} className={state===s.value?'active':''} onClick={()=>setState(s.value)}>{s.label}{s.value!=='ALL'&&<small>{counters[s.value]??0}</small>}</button>)}</div>
|
||||
{error&&<Alert>{error}</Alert>}{loading?<LoadingBlock label="Cargando seguimiento…"/>:items.length===0?<EmptyState title="Sin actas" text="No hay actas en este estado para el contexto seleccionado."/>:<div className="table-panel"><div className="table-summary"><strong>{meta.total} acta{meta.total===1?'':'s'}</strong></div><div className="table-scroll"><table><thead><tr><th>Acta</th><th>Área / empresa</th><th>Hallazgos</th><th>Plazo empresa</th><th>Respuesta</th><th>Estado</th><th/></tr></thead><tbody>{items.map(a=><tr key={a.actId}><td><strong>{a.actCode}</strong><small className="block-muted">{formatDate(a.occurredAt)}</small></td><td><strong>{a.areaName??'—'}</strong><small className="block-muted">{a.companyName??'—'}</small></td><td>{a.openFindingCount} abiertos / {a.findingCount}</td><td>{a.responseDueOn?formatDate(a.responseDueOn):'Sin definir'}</td><td>{a.responseReceivedOn?formatDate(a.responseReceivedOn):'Pendiente'}</td><td><span className={`status-badge ${a.adminState==='OVERDUE'||a.adminState==='COMMITMENT_OVERDUE'?'danger':'pending'}`}>{label(a.adminState)}</span></td><td><Link className="button secondary" to={`/seguimiento-actas/${a.actId}`}>Gestionar</Link></td></tr>)}</tbody></table></div></div>}</section>;
|
||||
}
|
||||
@@ -404,7 +404,7 @@ export function InspectionVisitEditorPage() {
|
||||
{visit && <div className="survey-status-actions panel"><div><strong>Flujo de la inspección</strong><p>Oficina planifica y asigna. El inspector responsable inicia la inspección desde la APK; toda la ejecución de campo sigue siendo exclusiva del dispositivo móvil.</p></div><div>{canManage && visit.status === 'DRAFT' && <button type="button" className="button secondary" onClick={() => void changeStatus('PLANNED')} disabled={busy}>Confirmar planificación</button>}{canManage && visit.status === 'PLANNED' && <button type="button" className="button secondary" onClick={() => void changeStatus('DRAFT')} disabled={busy}>Volver a borrador</button>}{canManage && ['DRAFT', 'PLANNED'].includes(visit.status) && <button type="button" className="button danger-outline" onClick={() => void changeStatus('CANCELLED')} disabled={busy}>Cancelar planificación</button>}</div></div>}
|
||||
|
||||
{visit?.status === 'PLANNED' && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Planificación lista.</strong> El inspector asignado debe iniciar la inspección desde la APK. El dashboard no dispone de acción de inicio.</p></div>}
|
||||
{visit?.status === 'IN_PROGRESS' && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Inspección iniciada {formatDate(visit.actualStartedAt)}.</strong> El acta, hallazgos, evidencias y cierre se registran desde la APK; aquí se consultan.</p></div>}
|
||||
{visit?.status === 'IN_PROGRESS' && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Inspección iniciada {formatDate(visit.actualStartedAt)}.</strong> Las actas, hallazgos, evidencias y el cierre de la inspección se registran desde la APK; aquí se consultan.</p></div>}
|
||||
{visit?.status === 'CANCELLED' && <Alert>Cancelada: {visit.cancellationReason}</Alert>}
|
||||
</section>;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ export function InspectionVisitsPage() {
|
||||
{statusTabs.map((item) => <Link key={item.value || 'all'} className={status === item.value ? 'active' : ''} to={statusHref(item.value)}>{item.label}</Link>)}
|
||||
</nav>
|
||||
|
||||
<div className="temporal-notice"><Icon name="clipboard" /><p><strong>Un solo ciclo.</strong> La planificación, ejecución, Acta, Hallazgos e Informe pertenecen a la misma inspección. El inicio en campo sigue siendo exclusivo de la APK.</p></div>
|
||||
<div className="temporal-notice"><Icon name="clipboard" /><p><strong>Un recorrido, varias actas.</strong> La inspección representa la salida a un Área/Operadora y puede generar múltiples actas durante el recorrido. El inicio y cierre en campo siguen siendo exclusivos de la APK.</p></div>
|
||||
|
||||
<form className="toolbar survey-toolbar" onSubmit={applySearch}>
|
||||
<label className="search-field"><Icon name="search" /><input value={draftSearch} onChange={(event) => setDraftSearch(event.target.value)} placeholder="Buscar por código" /><button>Buscar</button></label>
|
||||
|
||||
Reference in New Issue
Block a user