Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd24736df8 | ||
|
|
8e2d0dfe19 | ||
|
|
afde214cbb |
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "dhv2-api",
|
"name": "dhv2-api",
|
||||||
"version": "0.19.6-4",
|
"version": "0.20.0-1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -93,6 +93,7 @@ export {
|
|||||||
InspectionActSignatureSource,
|
InspectionActSignatureSource,
|
||||||
InspectionActSignatureStatus,
|
InspectionActSignatureStatus,
|
||||||
InspectionActSignerType,
|
InspectionActSignerType,
|
||||||
|
InspectionCompanySignatureManifestation,
|
||||||
} from './inspection-act-signature.entity';
|
} from './inspection-act-signature.entity';
|
||||||
export { FindingCategory } from './finding-category.entity';
|
export { FindingCategory } from './finding-category.entity';
|
||||||
export { FindingCatalogItem } from './finding-catalog-item.entity';
|
export { FindingCatalogItem } from './finding-catalog-item.entity';
|
||||||
|
|||||||
@@ -17,6 +17,11 @@ export enum InspectionActSignatureSource {
|
|||||||
ANDROID = 'ANDROID',
|
ANDROID = 'ANDROID',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export enum InspectionCompanySignatureManifestation {
|
||||||
|
CONFORMITY = 'CONFORMITY',
|
||||||
|
DISSENT = 'DISSENT',
|
||||||
|
}
|
||||||
|
|
||||||
@Entity({ name: 'inspection_act_signatures' })
|
@Entity({ name: 'inspection_act_signatures' })
|
||||||
@Index('idx_inspection_act_signatures_act_created', ['actId', 'createdAt'])
|
@Index('idx_inspection_act_signatures_act_created', ['actId', 'createdAt'])
|
||||||
@Index('idx_inspection_act_signatures_sha256', ['signaturePayloadSha256'])
|
@Index('idx_inspection_act_signatures_sha256', ['signaturePayloadSha256'])
|
||||||
@@ -51,6 +56,12 @@ export class InspectionActSignature {
|
|||||||
@Column({ type: 'text', nullable: true })
|
@Column({ type: 'text', nullable: true })
|
||||||
reason!: string | null;
|
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 })
|
@Column({ name: 'original_name', type: 'varchar', length: 255, nullable: true })
|
||||||
originalName!: string | null;
|
originalName!: string | null;
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export enum InspectionActStatus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Entity({ name: 'inspection_acts' })
|
@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_year_number', ['actYear', 'actNumber'], { unique: true })
|
||||||
@Index('uq_inspection_acts_code', ['code'], { unique: true })
|
@Index('uq_inspection_acts_code', ['code'], { unique: true })
|
||||||
@Index('idx_inspection_acts_visit_status', ['visitId', 'status'])
|
@Index('idx_inspection_acts_visit_status', ['visitId', 'status'])
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export enum InspectionReportReviewStatus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Entity({ name: 'inspection_reports' })
|
@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_act', ['actId'], { unique: true })
|
||||||
@Index('uq_inspection_reports_year_number', ['reportYear', 'reportNumber'], { unique: true })
|
@Index('uq_inspection_reports_year_number', ['reportYear', 'reportNumber'], { unique: true })
|
||||||
@Index('uq_inspection_reports_code', ['code'], { 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)
|
||||||
|
`);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -308,7 +308,7 @@ export class InspectionActsService {
|
|||||||
const visit = await this.lockVisit(manager, visitId);
|
const visit = await this.lockVisit(manager, visitId);
|
||||||
this.assertVisitOpen(visit);
|
this.assertVisitOpen(visit);
|
||||||
await this.assertActorAssigned(manager, visitId, principal);
|
await this.assertActorAssigned(manager, visitId, principal);
|
||||||
await this.assertVisitHasNoAct(manager, visitId);
|
await this.assertVisitHasNoDraftAct(manager, visitId);
|
||||||
await this.assertVisitAssets(manager, visitId, dto.assetIds);
|
await this.assertVisitAssets(manager, visitId, dto.assetIds);
|
||||||
const occurredAt = new Date(dto.occurredAt);
|
const occurredAt = new Date(dto.occurredAt);
|
||||||
const actYear = await this.yearAtProjectTimezone(manager, occurredAt);
|
const actYear = await this.yearAtProjectTimezone(manager, occurredAt);
|
||||||
@@ -632,20 +632,20 @@ export class InspectionActsService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async assertVisitHasNoAct(
|
private async assertVisitHasNoDraftAct(
|
||||||
manager: EntityManager,
|
manager: EntityManager,
|
||||||
visitId: string,
|
visitId: string,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const rows = (await manager.query(`
|
const rows = (await manager.query(`
|
||||||
SELECT code
|
SELECT code
|
||||||
FROM inspection_acts
|
FROM inspection_acts
|
||||||
WHERE visit_id = $1
|
WHERE visit_id = $1 AND status = 'DRAFT'
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
`, [visitId])) as Array<{ code: string }>;
|
`, [visitId])) as Array<{ code: string }>;
|
||||||
if (rows.length > 0) {
|
if (rows.length > 0) {
|
||||||
throw new ConflictException({
|
throw new ConflictException({
|
||||||
code: 'INSPECTION_VISIT_ACT_ALREADY_EXISTS',
|
code: 'INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS',
|
||||||
message: 'La visita ya tiene un acta; cada visita admite una única acta',
|
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 { CloseInspectionActDto } from './dto/close-inspection-act.dto';
|
||||||
import { CreateCompanyOutcomeDto } from './dto/create-company-outcome.dto';
|
import { CreateCompanyOutcomeDto } from './dto/create-company-outcome.dto';
|
||||||
import { CreateInspectionSignatureDto } from './dto/create-inspection-signature.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 { UpsertInspectionResponsibleDto } from './dto/upsert-inspection-responsible.dto';
|
||||||
import { InspectionClosingService } from './inspection-closing.service';
|
import { InspectionClosingService } from './inspection-closing.service';
|
||||||
import {
|
import {
|
||||||
@@ -89,7 +90,7 @@ export class InspectionClosingController {
|
|||||||
}))
|
}))
|
||||||
companySignature(
|
companySignature(
|
||||||
@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
|
@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
|
||||||
@Body() dto: CreateInspectionSignatureDto,
|
@Body() dto: CreateCompanySignatureDto,
|
||||||
@UploadedFile() file: UploadedInspectionSignatureFile | undefined,
|
@UploadedFile() file: UploadedInspectionSignatureFile | undefined,
|
||||||
@CurrentAuth() principal: AuthPrincipal,
|
@CurrentAuth() principal: AuthPrincipal,
|
||||||
@Req() request: RequestWithContext,
|
@Req() request: RequestWithContext,
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import {
|
|||||||
InspectionActSignatureSource,
|
InspectionActSignatureSource,
|
||||||
InspectionActSignatureStatus,
|
InspectionActSignatureStatus,
|
||||||
InspectionActSignerType,
|
InspectionActSignerType,
|
||||||
|
InspectionCompanySignatureManifestation,
|
||||||
InspectionActStatus,
|
InspectionActStatus,
|
||||||
InspectionActUploadMode,
|
InspectionActUploadMode,
|
||||||
InspectionActVersionEvent,
|
InspectionActVersionEvent,
|
||||||
@@ -33,6 +34,7 @@ import type { CloseInspectionActDto } from './dto/close-inspection-act.dto';
|
|||||||
import { InspectionReportsService } from '../inspection-reports/inspection-reports.service';
|
import { InspectionReportsService } from '../inspection-reports/inspection-reports.service';
|
||||||
import type { CreateCompanyOutcomeDto } from './dto/create-company-outcome.dto';
|
import type { CreateCompanyOutcomeDto } from './dto/create-company-outcome.dto';
|
||||||
import type { CreateInspectionSignatureDto } from './dto/create-inspection-signature.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 type { UpsertInspectionResponsibleDto } from './dto/upsert-inspection-responsible.dto';
|
||||||
import {
|
import {
|
||||||
inspectInspectionSignatureFile,
|
inspectInspectionSignatureFile,
|
||||||
@@ -70,6 +72,8 @@ interface SignatureView {
|
|||||||
position: string | null;
|
position: string | null;
|
||||||
status: InspectionActSignatureStatus;
|
status: InspectionActSignatureStatus;
|
||||||
reason: string | null;
|
reason: string | null;
|
||||||
|
companyManifestation: InspectionCompanySignatureManifestation | null;
|
||||||
|
companyStatement: string | null;
|
||||||
mimeType: string | null;
|
mimeType: string | null;
|
||||||
sizeBytes: number | null;
|
sizeBytes: number | null;
|
||||||
imageSha256: string | null;
|
imageSha256: string | null;
|
||||||
@@ -429,7 +433,7 @@ export class InspectionClosingService {
|
|||||||
|
|
||||||
async signCompany(
|
async signCompany(
|
||||||
actId: string,
|
actId: string,
|
||||||
dto: CreateInspectionSignatureDto,
|
dto: CreateCompanySignatureDto,
|
||||||
file: UploadedInspectionSignatureFile | undefined,
|
file: UploadedInspectionSignatureFile | undefined,
|
||||||
principal: AuthPrincipal,
|
principal: AuthPrincipal,
|
||||||
request: RequestWithContext,
|
request: RequestWithContext,
|
||||||
@@ -447,7 +451,7 @@ export class InspectionClosingService {
|
|||||||
assertMobileInspector(principal);
|
assertMobileInspector(principal);
|
||||||
return this.dataSource.transaction(async (manager) => {
|
return this.dataSource.transaction(async (manager) => {
|
||||||
const { act, visit } = await this.lockContext(manager, actId);
|
const { act, visit } = await this.lockContext(manager, actId);
|
||||||
this.assertReadyInProgress(act, visit);
|
this.assertReadyForCompanyOutcome(act, visit);
|
||||||
await this.assertActorAssigned(manager, visit.id, principal, true);
|
await this.assertActorAssigned(manager, visit.id, principal, true);
|
||||||
const responsible = await this.requireResponsible(manager, actId);
|
const responsible = await this.requireResponsible(manager, actId);
|
||||||
if (
|
if (
|
||||||
@@ -540,7 +544,8 @@ export class InspectionClosingService {
|
|||||||
assertMobileInspector(principal);
|
assertMobileInspector(principal);
|
||||||
const closed = await this.dataSource.transaction(async (manager) => {
|
const closed = await this.dataSource.transaction(async (manager) => {
|
||||||
const { act, visit } = await this.lockContext(manager, actId);
|
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 closure = await this.requireClosure(manager, actId);
|
||||||
const signatures = await this.loadSignatures(manager, actId);
|
const signatures = await this.loadSignatures(manager, actId);
|
||||||
if (!signatures.some((item) => (
|
if (!signatures.some((item) => (
|
||||||
@@ -576,6 +581,8 @@ export class InspectionClosingService {
|
|||||||
position: item.position,
|
position: item.position,
|
||||||
status: item.status,
|
status: item.status,
|
||||||
reason: item.reason,
|
reason: item.reason,
|
||||||
|
companyManifestation: item.companyManifestation,
|
||||||
|
companyStatement: item.companyStatement,
|
||||||
imageSha256: item.imageSha256,
|
imageSha256: item.imageSha256,
|
||||||
consentText: item.consentText,
|
consentText: item.consentText,
|
||||||
consentVersion: item.consentVersion,
|
consentVersion: item.consentVersion,
|
||||||
@@ -636,14 +643,6 @@ export class InspectionClosingService {
|
|||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
RETURNING current_version AS "versionNumber"
|
RETURNING current_version AS "versionNumber"
|
||||||
`, [actId, serverClosedAt, principal.userId, finalSha256])) as Array<{ versionNumber: number }>;
|
`, [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(`
|
await manager.query(`
|
||||||
INSERT INTO inspection_act_versions (
|
INSERT INTO inspection_act_versions (
|
||||||
act_id, version_number, event, snapshot, actor_user_id, actor_username
|
act_id, version_number, event, snapshot, actor_user_id, actor_username
|
||||||
@@ -672,6 +671,7 @@ export class InspectionClosingService {
|
|||||||
visitId: visit.id,
|
visitId: visit.id,
|
||||||
versionNumber: Number(updated.versionNumber),
|
versionNumber: Number(updated.versionNumber),
|
||||||
findingsRemainOpen: true,
|
findingsRemainOpen: true,
|
||||||
|
visitRemainsIndependent: true,
|
||||||
},
|
},
|
||||||
}, manager);
|
}, manager);
|
||||||
await this.reports.ensureFrozenReport(manager, actId, principal, request);
|
await this.reports.ensureFrozenReport(manager, actId, principal, request);
|
||||||
@@ -710,7 +710,7 @@ export class InspectionClosingService {
|
|||||||
|
|
||||||
private async createSignedSignature(
|
private async createSignedSignature(
|
||||||
actId: string,
|
actId: string,
|
||||||
dto: CreateInspectionSignatureDto,
|
dto: CreateInspectionSignatureDto | CreateCompanySignatureDto,
|
||||||
file: UploadedInspectionSignatureFile | undefined,
|
file: UploadedInspectionSignatureFile | undefined,
|
||||||
fixedIdentity: null | {
|
fixedIdentity: null | {
|
||||||
signerType: InspectionActSignerType;
|
signerType: InspectionActSignerType;
|
||||||
@@ -737,7 +737,8 @@ export class InspectionClosingService {
|
|||||||
try {
|
try {
|
||||||
return await this.dataSource.transaction(async (manager) => {
|
return await this.dataSource.transaction(async (manager) => {
|
||||||
const { act, visit } = await this.lockContext(manager, actId);
|
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);
|
await this.assertActorAssigned(manager, visit.id, principal, !requireSelfAssignment);
|
||||||
const closure = await this.requireClosure(manager, actId);
|
const closure = await this.requireClosure(manager, actId);
|
||||||
const responsible = fixedIdentity ? null : await this.requireResponsible(manager, actId);
|
const responsible = fixedIdentity ? null : await this.requireResponsible(manager, actId);
|
||||||
@@ -778,6 +779,13 @@ export class InspectionClosingService {
|
|||||||
const source = this.signatureSource(principal);
|
const source = this.signatureSource(principal);
|
||||||
const signedAt = new Date();
|
const signedAt = new Date();
|
||||||
const clientSignedAt = dto.clientSignedAt ? new Date(dto.clientSignedAt) : null;
|
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 = {
|
const payload = {
|
||||||
actId,
|
actId,
|
||||||
preparedSha256: closure.preparedSha256,
|
preparedSha256: closure.preparedSha256,
|
||||||
@@ -788,6 +796,8 @@ export class InspectionClosingService {
|
|||||||
documentNumber: identity.documentNumber,
|
documentNumber: identity.documentNumber,
|
||||||
position: identity.position,
|
position: identity.position,
|
||||||
status: InspectionActSignatureStatus.SIGNED,
|
status: InspectionActSignatureStatus.SIGNED,
|
||||||
|
companyManifestation,
|
||||||
|
companyStatement,
|
||||||
imageSha256,
|
imageSha256,
|
||||||
consentText: identity.consentText,
|
consentText: identity.consentText,
|
||||||
consentVersion: CONSENT_VERSION,
|
consentVersion: CONSENT_VERSION,
|
||||||
@@ -806,6 +816,7 @@ export class InspectionClosingService {
|
|||||||
INSERT INTO inspection_act_signatures (
|
INSERT INTO inspection_act_signatures (
|
||||||
id, act_id, signer_type, signer_user_id, signer_name,
|
id, act_id, signer_type, signer_user_id, signer_name,
|
||||||
document_type, document_number, position, status,
|
document_type, document_number, position, status,
|
||||||
|
company_manifestation, company_statement,
|
||||||
original_name, stored_name, mime_type, size_bytes, image_sha256,
|
original_name, stored_name, mime_type, size_bytes, image_sha256,
|
||||||
consent_text, consent_version, consent_accepted_at,
|
consent_text, consent_version, consent_accepted_at,
|
||||||
client_signed_at, signed_at, latitude, longitude, accuracy_m,
|
client_signed_at, signed_at, latitude, longitude, accuracy_m,
|
||||||
@@ -814,11 +825,12 @@ export class InspectionClosingService {
|
|||||||
) VALUES (
|
) VALUES (
|
||||||
$1, $2, $3, $4, $5,
|
$1, $2, $3, $4, $5,
|
||||||
$6, $7, $8, 'SIGNED',
|
$6, $7, $8, 'SIGNED',
|
||||||
$9, $10, $11, $12, $13,
|
$9, $10,
|
||||||
$14, $15, $16,
|
$11, $12, $13, $14, $15,
|
||||||
$17, $18, $19, $20, $21,
|
$16, $17, $18,
|
||||||
$22, $23, $24, $25,
|
$19, $20, $21, $22, $23,
|
||||||
$26, $18
|
$24, $25, $26, $27,
|
||||||
|
$28, $20
|
||||||
)
|
)
|
||||||
`, [
|
`, [
|
||||||
id,
|
id,
|
||||||
@@ -829,6 +841,8 @@ export class InspectionClosingService {
|
|||||||
identity.documentType,
|
identity.documentType,
|
||||||
identity.documentNumber,
|
identity.documentNumber,
|
||||||
identity.position,
|
identity.position,
|
||||||
|
companyManifestation,
|
||||||
|
companyStatement,
|
||||||
inspected.originalName,
|
inspected.originalName,
|
||||||
storedName,
|
storedName,
|
||||||
inspected.mimeType,
|
inspected.mimeType,
|
||||||
@@ -1266,6 +1280,8 @@ export class InspectionClosingService {
|
|||||||
signature.position,
|
signature.position,
|
||||||
signature.status,
|
signature.status,
|
||||||
signature.reason,
|
signature.reason,
|
||||||
|
signature.company_manifestation AS "companyManifestation",
|
||||||
|
signature.company_statement AS "companyStatement",
|
||||||
signature.original_name AS "originalName",
|
signature.original_name AS "originalName",
|
||||||
signature.stored_name AS "storedName",
|
signature.stored_name AS "storedName",
|
||||||
signature.mime_type AS "mimeType",
|
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(
|
private async assertActorAssigned(
|
||||||
manager: EntityManager,
|
manager: EntityManager,
|
||||||
visitId: string,
|
visitId: string,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { ConflictException, Injectable } from '@nestjs/common';
|
import { Injectable } from '@nestjs/common';
|
||||||
import type { EntityManager } from 'typeorm';
|
import type { EntityManager } from 'typeorm';
|
||||||
|
|
||||||
export interface FieldDiscoveryInspectionLinkResult {
|
export interface FieldDiscoveryInspectionLinkResult {
|
||||||
@@ -18,7 +18,7 @@ export class FieldDiscoveryInspectionLinkService {
|
|||||||
SELECT id, status
|
SELECT id, status
|
||||||
FROM inspection_acts
|
FROM inspection_acts
|
||||||
WHERE visit_id = $1
|
WHERE visit_id = $1
|
||||||
AND status <> 'CANCELLED'
|
AND status = 'DRAFT'
|
||||||
ORDER BY created_at DESC
|
ORDER BY created_at DESC
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
FOR UPDATE
|
FOR UPDATE
|
||||||
@@ -26,12 +26,6 @@ export class FieldDiscoveryInspectionLinkService {
|
|||||||
[visitId],
|
[visitId],
|
||||||
)) as Array<{ id: string; status: string }>;
|
)) 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(
|
await manager.query(
|
||||||
`
|
`
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ function lines(snapshot: Record<string, unknown>): string[] {
|
|||||||
const team=asArray(prepared.team);
|
const team=asArray(prepared.team);
|
||||||
const assets=asArray(prepared.assets);
|
const assets=asArray(prepared.assets);
|
||||||
const findings=asArray(prepared.findings);
|
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 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 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);
|
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');
|
out.push('', 'HALLAZGOS');
|
||||||
if(!findings.length) out.push('Sin hallazgos registrados.');
|
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))); }
|
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)}`);
|
out.push('', 'INTEGRIDAD', `Hash de cierre: ${text(asRecord(snapshot).finalSha256 ?? asRecord(snapshot).preparedSha256)}`);
|
||||||
return out;
|
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 { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
|
||||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
||||||
import { ChangeInspectionVisitStatusDto } from './dto/change-inspection-visit-status.dto';
|
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 { CreateInspectionVisitDto } from './dto/create-inspection-visit.dto';
|
||||||
import { ExcludeInspectionVisitAssetDto } from './dto/exclude-inspection-visit-asset.dto';
|
import { ExcludeInspectionVisitAssetDto } from './dto/exclude-inspection-visit-asset.dto';
|
||||||
import { ListInspectionVisitsQueryDto } from './dto/list-inspection-visits-query.dto';
|
import { ListInspectionVisitsQueryDto } from './dto/list-inspection-visits-query.dto';
|
||||||
@@ -154,4 +155,15 @@ export class InspectionVisitsController {
|
|||||||
) {
|
) {
|
||||||
return this.visits.start(id, principal, request);
|
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,
|
InspectionVisitStatus,
|
||||||
} from '../database/entities';
|
} from '../database/entities';
|
||||||
import type { ChangeInspectionVisitStatusDto } from './dto/change-inspection-visit-status.dto';
|
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 { CreateInspectionVisitDto } from './dto/create-inspection-visit.dto';
|
||||||
import type { ListInspectionVisitsQueryDto } from './dto/list-inspection-visits-query.dto';
|
import type { ListInspectionVisitsQueryDto } from './dto/list-inspection-visits-query.dto';
|
||||||
import type { ReplaceInspectionVisitAssetsDto } from './dto/replace-inspection-visit-assets.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 {
|
private visitSelect(where: string): string {
|
||||||
return `
|
return `
|
||||||
SELECT
|
SELECT
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
export const API_VERSION = '0.19.6-4';
|
export const API_VERSION = '0.20.0-1';
|
||||||
export const API_PHASE = 'D5.6.4';
|
export const API_PHASE = 'F1.1';
|
||||||
|
|||||||
@@ -4,37 +4,29 @@ import { ConflictException } from '@nestjs/common';
|
|||||||
import type { DataSource, EntityManager } from 'typeorm';
|
import type { DataSource, EntityManager } from 'typeorm';
|
||||||
import { InspectionActsService } from '../../src/inspection-acts/inspection-acts.service';
|
import { InspectionActsService } from '../../src/inspection-acts/inspection-acts.service';
|
||||||
|
|
||||||
type SingleActGuard = {
|
type DraftActGuard = {
|
||||||
assertVisitHasNoAct(manager: EntityManager, visitId: string): Promise<void>;
|
assertVisitHasNoDraftAct(manager: EntityManager, visitId: string): Promise<void>;
|
||||||
};
|
};
|
||||||
|
|
||||||
function serviceGuard(): SingleActGuard {
|
function serviceGuard(): DraftActGuard {
|
||||||
return new InspectionActsService(
|
return new InspectionActsService(
|
||||||
{} as DataSource,
|
{} as DataSource,
|
||||||
{} as never,
|
{} as never,
|
||||||
) as unknown as SingleActGuard;
|
) as unknown as DraftActGuard;
|
||||||
}
|
}
|
||||||
|
|
||||||
test('single-act guard allows a visit without an act', async () => {
|
test('multi-act guard allows a new act when the inspection has no draft act', async () => {
|
||||||
const manager = {
|
const manager = { query: async () => [] } as unknown as EntityManager;
|
||||||
query: async () => [],
|
await assert.doesNotReject(serviceGuard().assertVisitHasNoDraftAct(manager, 'visit-id'));
|
||||||
} as unknown as EntityManager;
|
|
||||||
|
|
||||||
await assert.doesNotReject(
|
|
||||||
serviceGuard().assertVisitHasNoAct(manager, 'visit-id'),
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('single-act guard rejects a second act for the same visit', async () => {
|
test('multi-act guard blocks only a second draft act for the same inspection', async () => {
|
||||||
const manager = {
|
const manager = { query: async () => [{ code: 'ACTA-2026-000001' }] } as unknown as EntityManager;
|
||||||
query: async () => [{ code: 'ACTA-2026-000001' }],
|
|
||||||
} as unknown as EntityManager;
|
|
||||||
|
|
||||||
await assert.rejects(
|
await assert.rejects(
|
||||||
serviceGuard().assertVisitHasNoAct(manager, 'visit-id'),
|
serviceGuard().assertVisitHasNoDraftAct(manager, 'visit-id'),
|
||||||
(error: unknown) => error instanceof ConflictException
|
(error: unknown) => error instanceof ConflictException
|
||||||
&& error.getResponse() instanceof Object
|
&& error.getResponse() instanceof Object
|
||||||
&& (error.getResponse() as { code?: string }).code
|
&& (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('replaceTeam'), ['inspections.assign']);
|
||||||
assert.deepEqual(permissionFor('changeStatus'), ['inspections.manage']);
|
assert.deepEqual(permissionFor('changeStatus'), ['inspections.manage']);
|
||||||
assert.deepEqual(permissionFor('start'), ['inspections.execute']);
|
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-findings/inspection-evidence.service.ts'),
|
||||||
source('inspection-closing/inspection-closing.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(acts), 3);
|
||||||
assert.equal(policyCalls(findings), 2);
|
assert.equal(policyCalls(findings), 2);
|
||||||
assert.equal(policyCalls(evidence), 1);
|
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', () => {
|
test('F1.1 supersedes the historical single-act rule while retaining the D5.3.19 filters', () => {
|
||||||
assert.match(actsService, /await this\.assertVisitHasNoAct\(manager, visitId\)/);
|
assert.match(actsService, /await this\.assertVisitHasNoDraftAct\(manager, visitId\)/);
|
||||||
assert.match(actsService, /INSPECTION_VISIT_ACT_ALREADY_EXISTS/);
|
assert.match(actsService, /INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('D5.3.19 does not introduce the contextual finding catalog before its office definition', () => {
|
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);
|
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.match(closing, /findingsRemainOpen: true/);
|
||||||
assert.doesNotMatch(migration, /smtp|email_outbox|mail_delivery/i);
|
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 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 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 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', () => {
|
test('D5.3.22 changes only the report review layer and preserves inspection immutability', () => {
|
||||||
assert.match(acts, /assertVisitHasNoAct/);
|
assert.match(acts, /assertVisitHasNoDraftAct/);
|
||||||
assert.match(acts, /INSPECTION_VISIT_ACT_ALREADY_EXISTS/);
|
assert.match(acts, /INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS/);
|
||||||
assert.match(findings, /INSPECTION_FINDING_RESPONSE_IMMUTABLE/);
|
assert.match(findings, /INSPECTION_FINDING_RESPONSE_IMMUTABLE/);
|
||||||
assert.doesNotMatch(migration, /ALTER TABLE inspection_acts/);
|
assert.doesNotMatch(migration, /ALTER TABLE inspection_acts/);
|
||||||
assert.doesNotMatch(migration, /ALTER TABLE inspection_findings/);
|
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/);
|
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.match(assets, /fieldDiscoveryInspectionLinks\.attach/);
|
||||||
assert.doesNotMatch(assets, /INSERT INTO inspection_/);
|
assert.doesNotMatch(assets, /INSERT INTO inspection_/);
|
||||||
assert.match(inspectionLinks, /INSERT INTO inspection_visit_assets/);
|
assert.match(inspectionLinks, /INSERT INTO inspection_visit_assets/);
|
||||||
assert.match(inspectionLinks, /INSERT INTO inspection_act_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/);
|
assert.match(findings, /assertActAsset/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ import test from 'node:test';
|
|||||||
const root = process.cwd();
|
const root = process.cwd();
|
||||||
const read = (relative: string) => fs.readFileSync(path.join(root, relative), 'utf8');
|
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 acts = read('src/inspection-acts/inspection-acts.service.ts');
|
||||||
const closing = read('src/inspection-closing/inspection-closing.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_snapshot = \$2/);
|
||||||
assert.match(closing, /final_sha256 = \$3/);
|
assert.match(closing, /final_sha256 = \$3/);
|
||||||
assert.match(closing, /InspectionActVersionEvent\.CLOSED/);
|
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/);
|
assert.match(smtp, /MAIL_FROM/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('D5.6 declares a stable Phase D closure across maintenance hotfixes without introducing another functional migration', () => {
|
test('D5.6 remains a historical closure baseline while Phase F introduces an explicit new migration', () => {
|
||||||
const apiVersion = read('src/version.ts');
|
|
||||||
assert.match(apiVersion, /API_VERSION = '0\.19\.6(?:-\d+)?'/);
|
|
||||||
assert.match(apiVersion, /API_PHASE = 'D5\.6(?:\.\d+)?'/);
|
|
||||||
const migrations = fs.readdirSync(path.join(root, 'src/database/migrations'));
|
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-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'/);
|
||||||
|
});
|
||||||
@@ -16,6 +16,7 @@ PREV_SHA=""
|
|||||||
TARGET_SHA=""
|
TARGET_SHA=""
|
||||||
EXPECTED_API_VERSION=""
|
EXPECTED_API_VERSION=""
|
||||||
EXPECTED_WEB_VERSION=""
|
EXPECTED_WEB_VERSION=""
|
||||||
|
APP_TOUCHED=0
|
||||||
|
|
||||||
cd "$APP"
|
cd "$APP"
|
||||||
export GIT_SSH_COMMAND="ssh -i $KEY -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new"
|
export GIT_SSH_COMMAND="ssh -i $KEY -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new"
|
||||||
@@ -52,6 +53,7 @@ publish_status() {
|
|||||||
echo "current_sha=$current"
|
echo "current_sha=$current"
|
||||||
echo "api_version=${EXPECTED_API_VERSION:-unknown}"
|
echo "api_version=${EXPECTED_API_VERSION:-unknown}"
|
||||||
echo "web_version=${EXPECTED_WEB_VERSION:-unknown}"
|
echo "web_version=${EXPECTED_WEB_VERSION:-unknown}"
|
||||||
|
echo "app_touched=$APP_TOUCHED"
|
||||||
echo "backup=${BACKUP:-unknown}"
|
echo "backup=${BACKUP:-unknown}"
|
||||||
} > "$status_file"
|
} > "$status_file"
|
||||||
|
|
||||||
@@ -90,21 +92,32 @@ rollback() {
|
|||||||
echo "============================================================"
|
echo "============================================================"
|
||||||
|
|
||||||
cd "$APP"
|
cd "$APP"
|
||||||
if [ -n "${PREV_SHA:-}" ]; then
|
if [ "$APP_TOUCHED" -eq 1 ] && [ -n "${PREV_SHA:-}" ]; then
|
||||||
|
echo "Restaurando aplicación al commit previo: $PREV_SHA"
|
||||||
git reset --hard "$PREV_SHA" || true
|
git reset --hard "$PREV_SHA" || true
|
||||||
docker compose build api web </dev/null || true
|
docker compose build api web </dev/null || true
|
||||||
docker compose up -d --no-deps --force-recreate 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
|
fi
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "Estado tras rollback:"
|
echo "Estado actual:"
|
||||||
docker compose ps -a </dev/null || true
|
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
|
echo
|
||||||
echo "Últimos logs:"
|
if [ -d "$BACKUP" ]; then
|
||||||
docker compose logs --tail=160 api web </dev/null || true
|
echo "Backup PRE disponible en: $BACKUP"
|
||||||
echo
|
echo "Las migraciones son forward-only; database-before.dump queda disponible para restauración manual si hiciera falta."
|
||||||
echo "Backup PRE disponible en: $BACKUP"
|
else
|
||||||
echo "Las migraciones son forward-only; database-before.dump queda disponible para restauración manual si hiciera falta."
|
echo "No fue necesario crear backup PRE: el fallo ocurrió durante el preflight del candidato, antes de tocar producción."
|
||||||
|
fi
|
||||||
exit "$rc"
|
exit "$rc"
|
||||||
}
|
}
|
||||||
trap rollback ERR
|
trap rollback ERR
|
||||||
@@ -119,8 +132,9 @@ for cmd in git docker curl tar node; do
|
|||||||
done
|
done
|
||||||
[ -f "$KEY" ] || { echo "ERROR: falta deploy key $KEY"; false; }
|
[ -f "$KEY" ] || { echo "ERROR: falta deploy key $KEY"; false; }
|
||||||
[ -d .git ] || { echo "ERROR: $APP no es repositorio Git"; false; }
|
[ -d .git ] || { echo "ERROR: $APP no es repositorio Git"; false; }
|
||||||
|
[ -f .env ] || { echo "ERROR: falta $APP/.env"; false; }
|
||||||
|
|
||||||
git config --global --add safe.directory "$APP" >/dev/null 2>&1 || true
|
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
|
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
|
||||||
echo "ERROR: hay cambios locales versionados en producción."
|
echo "ERROR: hay cambios locales versionados en producción."
|
||||||
@@ -148,7 +162,7 @@ if ! git merge-base --is-ancestor "$PREV_SHA" "$TARGET_SHA"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
PHASE="candidate-preflight"
|
PHASE="candidate-preflight"
|
||||||
mkdir -p "$STAGE"
|
rm -rf "$STAGE"
|
||||||
git worktree add --detach "$STAGE" "$TARGET_SHA" >/dev/null
|
git worktree add --detach "$STAGE" "$TARGET_SHA" >/dev/null
|
||||||
|
|
||||||
EXPECTED_API_VERSION="$(node -p "require('$STAGE/api-v3/package.json').version")"
|
EXPECTED_API_VERSION="$(node -p "require('$STAGE/api-v3/package.json').version")"
|
||||||
@@ -204,6 +218,7 @@ PHASE="fast-forward"
|
|||||||
echo
|
echo
|
||||||
echo "========== FAST-FORWARD =========="
|
echo "========== FAST-FORWARD =========="
|
||||||
git log --oneline --no-decorate "$PREV_SHA..$TARGET_SHA"
|
git log --oneline --no-decorate "$PREV_SHA..$TARGET_SHA"
|
||||||
|
APP_TOUCHED=1
|
||||||
git merge --ff-only "origin/$DEPLOY_REF"
|
git merge --ff-only "origin/$DEPLOY_REF"
|
||||||
|
|
||||||
PHASE="build"
|
PHASE="build"
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "dhv2-web",
|
"name": "dhv2-web",
|
||||||
"version": "0.19.6-4",
|
"version": "0.20.0-1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
export const APP_VERSION = '0.19.6-4';
|
export const APP_VERSION = '0.20.0-1';
|
||||||
export const APP_PHASE = 'Fase D5.6.4 · Inspecciones simples y combobox buscables';
|
export const APP_PHASE = 'Fase F1.1 · Inspección multi-Acta y firma diferida';
|
||||||
|
|||||||
@@ -29,13 +29,13 @@ export function InspectionActsPanel({ visit }: { visit: InspectionVisit }) {
|
|||||||
|
|
||||||
return <section className="inspection-acts-panel">
|
return <section className="inspection-acts-panel">
|
||||||
<div className="panel-heading">
|
<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>
|
<span className="status-badge pending">Sólo lectura</span>
|
||||||
</div>
|
</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>}
|
{error && <Alert>{error}</Alert>}
|
||||||
{loading ? <LoadingBlock label="Cargando actas…" /> : acts.length === 0
|
{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.'} />
|
? <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>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>}
|
: <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>;
|
</section>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ export function InspectionClosurePanel({ act }: { act: InspectionAct }) {
|
|||||||
const constanciasCompletas = inspectorSignatures.length > 0 && Boolean(companyOutcome);
|
const constanciasCompletas = inspectorSignatures.length > 0 && Boolean(companyOutcome);
|
||||||
|
|
||||||
return <section className="panel inspection-closure-panel">
|
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>}
|
{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>
|
<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.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>;
|
</section>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1129,6 +1129,8 @@ export interface InspectionActSignature {
|
|||||||
position: string | null;
|
position: string | null;
|
||||||
status: InspectionActSignatureStatus;
|
status: InspectionActSignatureStatus;
|
||||||
reason: string | null;
|
reason: string | null;
|
||||||
|
companyManifestation: 'CONFORMITY' | 'DISSENT' | null;
|
||||||
|
companyStatement: string | null;
|
||||||
mimeType: string | null;
|
mimeType: string | null;
|
||||||
sizeBytes: number | null;
|
sizeBytes: number | null;
|
||||||
imageSha256: string | null;
|
imageSha256: string | null;
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ const actions: Record<string, string> = {
|
|||||||
INSPECTION_ACT_REOPENED: 'Acta devuelta a borrador',
|
INSPECTION_ACT_REOPENED: 'Acta devuelta a borrador',
|
||||||
INSPECTION_ACT_SIGNATURE_RECORDED: 'Firma manuscrita incorporada al acta',
|
INSPECTION_ACT_SIGNATURE_RECORDED: 'Firma manuscrita incorporada al acta',
|
||||||
INSPECTION_ACT_COMPANY_OUTCOME_RECORDED: 'Resultado de recepción empresarial registrado',
|
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_REPORT_GENERATED: 'Informe de inspección generado',
|
||||||
INSPECTION_VERIFICATION_PLANNED: 'Visita de verificación preparada',
|
INSPECTION_VERIFICATION_PLANNED: 'Visita de verificación preparada',
|
||||||
INSPECTION_FINDING_CREATED: 'Hallazgo abierto',
|
INSPECTION_FINDING_CREATED: 'Hallazgo abierto',
|
||||||
|
|||||||
@@ -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 && <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 === '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>}
|
{visit?.status === 'CANCELLED' && <Alert>Cancelada: {visit.cancellationReason}</Alert>}
|
||||||
</section>;
|
</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>)}
|
{statusTabs.map((item) => <Link key={item.value || 'all'} className={status === item.value ? 'active' : ''} to={statusHref(item.value)}>{item.label}</Link>)}
|
||||||
</nav>
|
</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}>
|
<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>
|
<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