feat(f6.2): add per-act representative signing and user smtp
Android CI / RC / Android · lint, tests, debug APK, release compile (push) Failing after 1m25s
DH V2 CI / API · typecheck, tests, build (push) Successful in 34s
DH V2 CI / WEB · typecheck, build (push) Successful in 20s
Production dependency audit / API · production dependencies (push) Successful in 9s
Production dependency audit / WEB · production dependencies (push) Successful in 9s
DH V2 CI / Docker / scripts contract (push) Successful in 1m16s
Android CI / RC / Android · lint, tests, debug APK, release compile (push) Failing after 1m25s
DH V2 CI / API · typecheck, tests, build (push) Successful in 34s
DH V2 CI / WEB · typecheck, build (push) Successful in 20s
Production dependency audit / API · production dependencies (push) Successful in 9s
Production dependency audit / WEB · production dependencies (push) Successful in 9s
DH V2 CI / Docker / scripts contract (push) Successful in 1m16s
This commit is contained in:
@@ -213,14 +213,14 @@ export class CompanySignatureInviteService {
|
||||
|
||||
if (!publicUrl) {
|
||||
deliveryError = 'COMPANY_SIGNATURE_PUBLIC_BASE_URL no configurada';
|
||||
} else if (!(await this.smtp.configured())) {
|
||||
} else if (!(await this.smtp.configured(principal.userId))) {
|
||||
deliveryError = 'SMTP no configurado';
|
||||
} else {
|
||||
const body = [
|
||||
`Se solicita revisar y manifestarse sobre el Acta ${created.actCode}.`,
|
||||
`Inspección: ${created.inspectionCode}.`,
|
||||
'',
|
||||
'El enlace permite firmar en conformidad, firmar en disidencia o registrar una negativa a firmar.',
|
||||
'El enlace permite firmar en conformidad, firmar en disconformidad o registrar una negativa a firmar.',
|
||||
'El contenido del Acta está bloqueado y no puede modificarse desde este enlace.',
|
||||
'',
|
||||
`Enlace seguro: ${publicUrl}`,
|
||||
@@ -236,7 +236,7 @@ export class CompanySignatureInviteService {
|
||||
mimeType: 'text/plain',
|
||||
content: Buffer.from(body, 'utf8'),
|
||||
},
|
||||
});
|
||||
}, principal.userId);
|
||||
emailSent = true;
|
||||
await this.dataSource.query(`
|
||||
UPDATE inspection_act_company_signature_invites
|
||||
|
||||
@@ -54,7 +54,9 @@ export class UpsertInspectionResponsibleDto {
|
||||
@MaxLength(200)
|
||||
position?: string;
|
||||
|
||||
@IsOptional()
|
||||
@ValidateIf((dto: UpsertInspectionResponsibleDto) => (
|
||||
dto.attendanceStatus === InspectionResponsibleAttendanceStatus.PRESENT
|
||||
))
|
||||
@Transform(trimOrUndefined)
|
||||
@IsEmail()
|
||||
@MaxLength(320)
|
||||
|
||||
@@ -152,6 +152,7 @@ export interface InspectionClosureView {
|
||||
actualClosedAt: Date | null;
|
||||
};
|
||||
responsible: ResponsibleView | null;
|
||||
representativeSuggestion: ResponsibleView | null;
|
||||
closure: null | {
|
||||
schemaVersion: string;
|
||||
preparedSha256: string;
|
||||
@@ -1022,6 +1023,7 @@ export class InspectionClosingService {
|
||||
}>;
|
||||
if (!context) throw actNotFound();
|
||||
const responsible = await this.loadResponsible(manager, actId);
|
||||
const representativeSuggestion = responsible ? null : await this.loadResponsibleSuggestion(manager, actId);
|
||||
const closure = await this.loadClosure(manager, actId);
|
||||
const signatures = await this.loadSignatures(manager, actId);
|
||||
return {
|
||||
@@ -1051,6 +1053,7 @@ export class InspectionClosingService {
|
||||
actualClosedAt: context.visitActualClosedAt,
|
||||
},
|
||||
responsible,
|
||||
representativeSuggestion,
|
||||
closure: closure ? {
|
||||
schemaVersion: closure.schemaVersion,
|
||||
preparedSha256: closure.preparedSha256,
|
||||
@@ -1083,12 +1086,30 @@ export class InspectionClosingService {
|
||||
return row ?? null;
|
||||
}
|
||||
|
||||
private async loadResponsibleSuggestion(manager: EntityManager, actId: string): Promise<ResponsibleView | null> {
|
||||
const [row] = await manager.query(`
|
||||
SELECT responsible.act_id AS "actId",responsible.attendance_status AS "attendanceStatus",
|
||||
responsible.full_name AS "fullName",responsible.document_type AS "documentType",
|
||||
responsible.document_number AS "documentNumber",responsible.position,responsible.email,responsible.phone,
|
||||
responsible.absence_reason AS "absenceReason",responsible.updated_by AS "updatedBy",
|
||||
responsible.created_at AS "createdAt",responsible.updated_at AS "updatedAt"
|
||||
FROM inspection_acts current_act
|
||||
JOIN inspection_acts previous_act
|
||||
ON previous_act.visit_id=current_act.visit_id AND previous_act.id<>current_act.id
|
||||
JOIN inspection_act_responsibles responsible ON responsible.act_id=previous_act.id
|
||||
WHERE current_act.id=$1 AND responsible.attendance_status='PRESENT'
|
||||
ORDER BY responsible.updated_at DESC,previous_act.created_at DESC
|
||||
LIMIT 1
|
||||
`, [actId]) as ResponsibleView[];
|
||||
return row ?? null;
|
||||
}
|
||||
|
||||
private async requireResponsible(manager: EntityManager, actId: string): Promise<ResponsibleView> {
|
||||
const responsible = await this.loadResponsible(manager, actId);
|
||||
if (!responsible) {
|
||||
throw new ConflictException({
|
||||
code: 'INSPECTION_ACT_RESPONSIBLE_REQUIRED',
|
||||
message: 'Debe identificarse al responsable o documentar su ausencia antes de finalizar el acta',
|
||||
message: 'Debe identificarse al representante de la empresa o documentar su ausencia antes de cerrar el Acta',
|
||||
});
|
||||
}
|
||||
return responsible;
|
||||
|
||||
Reference in New Issue
Block a user