Compare commits

..
Author SHA1 Message Date
admin ccca7a6ff1 F4.8 · pruebas de cierre de Inspección 2026-09-07 20:13:41 -03:00
admin 63671686a9 F4.8 · sellado físico del Acta 2026-09-07 20:13:28 -03:00
admin 8baba89ce6 F4.8 · registrar cierre autoritativo 2026-09-07 20:13:17 -03:00
admin ad65b44142 F4.8 · activar cierre autoritativo 2026-09-07 20:13:10 -03:00
admin d0cc7c6f9d F4.8 · cierre autoritativo de Inspección 2026-09-07 20:12:48 -03:00
admin b80f83ed5f F4.7 · retirar respuesta de empresa por Hallazgo 2026-09-07 20:11:46 -03:00
admin fbc63fafb5 F4.7 · pruebas de reincidencia 2026-09-07 20:11:16 -03:00
admin edc05a5f50 F4.7 · activar reincidencias 2026-09-07 20:11:06 -03:00
admin ae583a8e45 F4.7 · endpoints de reincidencia 2026-09-07 20:10:54 -03:00
admin b160e7344b F4.7 · servicio de reincidencias 2026-09-07 20:10:38 -03:00
admin 41b52d34bf F4.7 · DTO de reincidencia 2026-09-07 20:10:11 -03:00
admin 7dab175958 F4.6 · retirar pruebas históricas de Survey 2026-09-07 20:09:28 -03:00
admin f1dbb75834 F4.6 · eliminar código muerto de Campañas 2026-09-07 20:07:23 -03:00
admin e9b318fdb5 F4.6 · retirar Campañas del producto activo 2026-09-07 20:06:21 -03:00
admin 890b54f7c8 F4.5 · SMTP Superadmin y Report Word al Inspector 2026-09-07 20:00:53 -03:00
admin 3634768f9a F4.4 · numeración institucional ACT e INF 2026-09-07 19:56:40 -03:00
admin fbe8f2e8cf F4.3 · dossier INF, GEDO IF y seguimiento 2026-09-07 19:55:04 -03:00
admin 367c7df45a F4.2 · bloquear Acta con urgencia y plazo congelado 2026-09-07 19:51:24 -03:00
admin 0f9aa589b5 F4.1 · administración de plazos por JEFE 2026-09-07 19:46:57 -03:00
admin dac6c94370 F4.0 · actualizar contratos y pruebas del nuevo flujo 2026-09-07 19:43:26 -03:00
admin 1cd11e83ab F4.0 · activar entidades de plazo y seguimiento 2026-09-07 19:42:21 -03:00
admin eb89680c32 F4.0 · numeración INSP y lifecycle explícito 2026-09-07 19:41:29 -03:00
admin cbab839935 F4.0 foundation · urgencia, GEDO y seguimiento 2026-09-07 19:39:43 -03:00
233 changed files with 8639 additions and 13916 deletions
+1 -11
View File
@@ -21,20 +21,10 @@ ACCESS_COOKIE_NAME=dhv2_access
REFRESH_COOKIE_NAME=dhv2_refresh
CSRF_COOKIE_NAME=dhv2_csrf
INSPECTION_SIGNATURE_ROOT=/app/storage/asset-media/inspection-signatures
INSPECTION_REPORT_WORD_ROOT=/app/storage/asset-media/inspection-reports-word
INSPECTION_REPORT_REVISION_ROOT=/app/storage/asset-media/inspection-report-revisions
INSPECTION_ACT_PDF_ROOT=/app/storage/asset-media/inspection-acts-pdf
# Enlace público de un solo uso para firma/manifestación de empresa.
# En producción: https://dhv2.korexlabs.com/firma-acta
# En entorno de prueba: https://prueba.dhv2.korexlabs.com/firma-acta
COMPANY_SIGNATURE_PUBLIC_BASE_URL=https://dhv2.korexlabs.com/firma-acta
# Clave maestra de 32 bytes (64 hex o base64) para cifrar la contraseña SMTP guardada por Superadmin.
SMTP_SETTINGS_MASTER_KEY=CHANGE_ME_WITH_32_RANDOM_BYTES
# Fallback SMTP. Se usa sólo hasta que Superadmin guarde una configuración en la base de datos.
SMTP_HOST=
SMTP_PORT=587
SMTP_SECURE=false
-154
View File
@@ -62,159 +62,8 @@ jobs:
while IFS= read -r -d '' script; do
bash -n "$script"
done < <(find scripts -type f -name '*.sh' -print0)
- name: Validate deploy preflight parity
run: |
grep -Fq -- '$STAGE/docker-compose.yml:/docker-compose.yml:ro' scripts/deploy-github.sh
grep -Fq -- '$STAGE/web-v2:/web-v2:ro' scripts/deploy-github.sh
grep -Fq -- '$STAGE/android-app:/android-app:ro' scripts/deploy-github.sh
- name: Validate Compose
run: docker compose --env-file .env.example config >/dev/null
- name: Rehearse migrations on clean PostGIS
run: |
set -Eeuo pipefail
cleanup() {
docker compose --env-file .env.example --profile tools down -v --remove-orphans >/dev/null 2>&1 || true
}
trap cleanup EXIT
cleanup
docker compose --env-file .env.example up -d db
# The historical production reset is a one-shot operational migration,
# not a bootstrap migration: it requires production data/configuration
# that cannot exist at its timestamp in a database rebuilt from zero.
# Prove the clean chain reaches that exact guard, then mark only that
# one-shot migration as already applied and continue the reproducible
# schema chain. The historical migration itself remains untouched.
bootstrap_log="$(mktemp)"
set +e
docker compose --env-file .env.example --profile tools run --build --rm migrate 2>&1 | tee "$bootstrap_log"
bootstrap_status=${PIPESTATUS[0]}
set -e
if [ "$bootstrap_status" -eq 0 ]; then
echo "ERROR: clean migration rehearsal unexpectedly passed the historical production reset." >&2
exit 1
fi
grep -Fq 'Production reset aborted: expected exactly one username admin, found 0' "$bootstrap_log" || {
echo "ERROR: migration rehearsal failed before the expected historical production-reset guard." >&2
exit 1
}
rm -f "$bootstrap_log"
docker compose --env-file .env.example exec -T db \
psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
DO $$
DECLARE
reset_rows integer;
BEGIN
SELECT COUNT(*) INTO reset_rows
FROM typeorm_migrations
WHERE name = 'ResetProductionOperationalData1788652800000';
IF reset_rows <> 0 THEN
RAISE EXCEPTION 'CI one-shot bypass expected reset migration to be pending, found % rows', reset_rows;
END IF;
INSERT INTO typeorm_migrations ("timestamp", name)
VALUES (1788652800000, 'ResetProductionOperationalData1788652800000');
END $$;
SQL
docker compose --env-file .env.example --profile tools run --rm migrate
docker compose --env-file .env.example exec -T db \
psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
DO $$
DECLARE
f5_migrations integer;
real_inventory integer;
source_areas integer;
source_yacimientos integer;
source_installations integer;
source_subinstallations integer;
source_findings integer;
BEGIN
SELECT COUNT(*) INTO f5_migrations
FROM typeorm_migrations
WHERE name IN (
'F5InventoryPhysicalInstance1790087100000',
'F5CanonicalInventoryHierarchy1790087150000',
'F5AuthoritativeTerritory1790087200000',
'F5OperationalContextCompatibility1790087250000',
'F5AuthoritativeInventoryCatalog1790087300000'
);
IF f5_migrations <> 5 THEN
RAISE EXCEPTION 'Expected 5 F5 migrations, got %', f5_migrations;
END IF;
SELECT COUNT(*) INTO real_inventory
FROM assets WHERE is_inventory_instance=true AND information_status<>'INACTIVE';
IF real_inventory <> 0 THEN
RAISE EXCEPTION 'Fresh F5 database must start with 0 real Inventory instances, got %', real_inventory;
END IF;
SELECT COUNT(DISTINCT asset.id) FILTER (WHERE type.operational_role='AREA'),
COUNT(DISTINCT asset.id) FILTER (WHERE lower(type.code)='yacimiento')
INTO source_areas,source_yacimientos
FROM source_documents document
JOIN asset_source_documents link ON link.document_id=document.id
JOIN assets asset ON asset.id=link.asset_id
JOIN asset_types type ON type.id=asset.asset_type_id
WHERE document.document_number='DH-F5-TERRITORY';
IF source_areas <> 64 OR source_yacimientos <> 230 THEN
RAISE EXCEPTION 'F5 territory preload mismatch: areas %, yacimientos %', source_areas,source_yacimientos;
END IF;
SELECT COUNT(*) FILTER (WHERE level='INSTALLATION'),
COUNT(*) FILTER (WHERE level='SUBINSTALLATION')
INTO source_installations,source_subinstallations
FROM inventory_families
WHERE is_active=true AND source_reference LIKE 'F5:final_modelov2.xlsx%';
IF source_installations <> 14 OR source_subinstallations <> 109 THEN
RAISE EXCEPTION 'F5 family preload mismatch: installations %, subinstallations %', source_installations,source_subinstallations;
END IF;
SELECT COUNT(*) INTO source_findings
FROM finding_catalog_items item
JOIN finding_categories category ON category.id=item.category_id
WHERE lower(category.code)='f5model' AND item.is_active=true;
IF source_findings <> 177 THEN
RAISE EXCEPTION 'F5 finding preload mismatch: %', source_findings;
END IF;
END $$;
SQL
# Prove the five F5 migrations are actually reversible on a clean state.
for _ in 1 2 3 4 5; do
docker compose --env-file .env.example --profile tools run --rm migrate npm run migration:revert
done
docker compose --env-file .env.example exec -T db \
psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
DO $$
DECLARE f5_migrations integer; instance_column integer;
BEGIN
SELECT COUNT(*) INTO f5_migrations
FROM typeorm_migrations
WHERE name LIKE 'F5%1790087%';
IF f5_migrations <> 0 THEN
RAISE EXCEPTION 'F5 rollback left % migration rows behind', f5_migrations;
END IF;
SELECT COUNT(*) INTO instance_column
FROM information_schema.columns
WHERE table_schema='public' AND table_name='assets' AND column_name='is_inventory_instance';
IF instance_column <> 0 THEN
RAISE EXCEPTION 'F5 rollback left is_inventory_instance behind';
END IF;
END $$;
SQL
# Reapply them once more. Each F5 migration performs its own source/cardinality checks.
docker compose --env-file .env.example --profile tools run --rm migrate
docker compose --env-file .env.example exec -T db \
psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 -Atc \
"SELECT CASE WHEN COUNT(*)=5 THEN 'F5_REAPPLY_OK' ELSE 'F5_REAPPLY_FAILED:'||COUNT(*) END FROM typeorm_migrations WHERE name IN ('F5InventoryPhysicalInstance1790087100000','F5CanonicalInventoryHierarchy1790087150000','F5AuthoritativeTerritory1790087200000','F5OperationalContextCompatibility1790087250000','F5AuthoritativeInventoryCatalog1790087300000');" \
| grep -Fx 'F5_REAPPLY_OK'
- name: VPS-equivalent isolated API preflight
run: |
set -Eeuo pipefail
@@ -223,9 +72,6 @@ jobs:
docker run --rm \
-v "$PWD/api-v3/test:/app/test:ro" \
-v "$PWD/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
-v "$PWD/docker-compose.yml:/docker-compose.yml:ro" \
-v "$PWD/web-v2:/web-v2:ro" \
-v "$PWD/android-app:/android-app:ro" \
"$image" npm test
docker image rm "$image" >/dev/null 2>&1 || true
- name: Build production images
+89
View File
@@ -0,0 +1,89 @@
name: F4 Document Flow CI
on:
push:
branches:
- 'feature/f4*'
pull_request:
branches:
- main
paths:
- 'api-v3/**'
- 'web-v2/**'
- 'android-app/**'
- 'scripts/**'
- '.github/workflows/f4-ci.yml'
workflow_dispatch:
permissions:
contents: read
jobs:
api:
name: API · F4
runs-on: ubuntu-latest
timeout-minutes: 25
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
- name: Typecheck
run: npm run typecheck
- name: Tests
run: npm test
- name: Build
run: npm run build
web:
name: WEB · regression
runs-on: ubuntu-latest
timeout-minutes: 20
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
- name: F3.1 structural WEB contract
run: bash ../scripts/check-f3-1-web-contract.sh
- run: npm run build
deploy-preflight:
name: VPS-equivalent preflight / Docker
runs-on: ubuntu-latest
timeout-minutes: 30
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: VPS-equivalent isolated API tests
run: |
set -Eeuo pipefail
image="dhv2-api:f4-preflight-${GITHUB_SHA::12}"
docker build --target builder -t "$image" api-v3
docker run --rm \
-v "$PWD/api-v3/test:/app/test:ro" \
-v "$PWD/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
"$image" npm test
docker image rm "$image" >/dev/null 2>&1 || true
- name: Build production images
run: docker compose --env-file .env.example build api migrate web
@@ -151,15 +151,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
}
}
fun createActForSelectedInventory(urgency: String = "NON_URGENT") {
fun createActForSelectedInventory() {
val currentVisit = visit ?: return
val asset = selectedFieldAsset?.asset
if (currentVisit.status != "IN_PROGRESS") {
error = "La Inspección debe estar en curso para crear un Acta."
return
}
if (urgency !in setOf("URGENT", "NON_URGENT")) {
error = "Elegí si el Acta es urgente o no urgente."
error = "La inspección debe estar en curso para crear un Acta."
return
}
if (asset == null) {
@@ -167,21 +163,15 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
return
}
if (acts.any { it.status == "DRAFT" }) {
error = "Ya existe un Acta en borrador. Bloqueala o cancelala antes de crear la siguiente."
error = "Ya existe un Acta en borrador. Cerrala o cancelala antes de crear la siguiente."
return
}
launchBusy {
val created = actsRepository.create(
currentVisit.id,
asset.id,
currentVisit.code,
urgency,
)
val created = actsRepository.create(currentVisit.id, asset.id, currentVisit.code)
selectedAct = created
actClosure = actsRepository.closure(created.id)
loadActsInternal(currentVisit.id, selectDraft = false)
val urgencyLabel = if (urgency == "URGENT") "urgente" else "no urgente"
notice = "${created.code} creada como $urgencyLabel. Los Hallazgos nuevos quedarán vinculados explícitamente a esta Acta."
notice = "${created.code} creada. Los Hallazgos nuevos quedarán vinculados explícitamente a esta Acta."
if (selectedFieldAsset?.capture?.readyForFinding == true) {
loadFindingOptionsInternal(currentVisit.id, asset.id, created.id)
}
@@ -206,7 +196,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
val visitId = visit?.id ?: return
launchBusy {
selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
notice = "Inventario agregado a la Inspección."
notice = "Inventario agregado a la inspección."
inventory = repository.fieldInventory(visitId, null, null).data
val draft = selectedDraftAct()
if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
@@ -232,7 +222,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
) {
val visitId = visit?.id ?: return
if (visit?.status != "IN_PROGRESS") {
error = "La Inspección debe estar en curso para dar de alta Inventario."
error = "La inspección debe estar en curso para dar de alta Inventario."
return
}
if (type.familyRequired && familyId == null) {
@@ -459,21 +449,26 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
absenceReason = reason.trim(),
),
)
notice = "Ausencia del responsable registrada. La manifestación de empresa quedará pendiente y deberá resolverse antes de sellar el Acta."
notice = "Ausencia del responsable registrada."
}
}
fun prepareSelectedAct() {
val actId = selectedAct?.id ?: return
launchBusy {
actClosure = actsRepository.lock(actId)
actClosure = actsRepository.prepare(actId)
refreshSelectedActInternal(actId)
notice = "Acta bloqueada. Su contenido quedó inmutable; ahora deben resolverse las firmas y manifestaciones."
notice = "Acta preparada. Su contenido quedó congelado para las firmas."
}
}
fun reopenSelectedAct() {
error = "Un Acta bloqueada es inmutable y no puede volver a borrador."
val actId = selectedAct?.id ?: return
launchBusy {
actClosure = actsRepository.reopen(actId)
refreshSelectedActInternal(actId)
notice = "Acta reabierta. Podés corregirla antes de volver a preparar."
}
}
fun signSelectedActAsInspector(
@@ -512,17 +507,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
fun recordCompanyOutcome(status: String, reason: String) {
val actId = selectedAct?.id ?: return
if (status != "REFUSED") {
error = "La ausencia no resuelve la manifestación de la empresa. Registrá una firma o una negativa."
return
}
if (reason.trim().length < 10) {
error = "Indicá un motivo de al menos 10 caracteres."
return
}
launchBusy {
actClosure = actsRepository.companyOutcome(actId, status, reason)
notice = "Negativa a firmar asentada."
notice = if (status == "ABSENT") "Ausencia de empresa asentada." else "Negativa a firmar asentada."
}
}
@@ -530,11 +521,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
val currentVisit = visit ?: return
val actId = selectedAct?.id ?: return
launchBusy {
actClosure = actsRepository.seal(actId)
actClosure = actsRepository.closeAct(actId)
refreshSelectedActInternal(actId)
loadActsInternal(currentVisit.id, selectDraft = false)
clearFindingState()
notice = "${selectedAct?.code ?: "Acta"} SELLADA e inmutable. Podés crear otra Acta o continuar hacia el cierre de la Inspección."
notice = "${selectedAct?.code ?: "Acta"} cerrada e inmutable. Podés crear otra Acta o finalizar la inspección."
}
}
@@ -543,7 +534,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
launchBusy {
visit = actsRepository.closeVisit(visitId)
loadVisitsInternal()
notice = "Inspección cerrada. Todas sus Actas quedaron SELLADAS y disponibles para el circuito de oficina."
notice = "Inspección cerrada. Las Actas y documentos quedan disponibles para oficina."
}
}
@@ -90,6 +90,7 @@ data class PersonSummary(
data class VisitSummary(
val id: String,
val code: String,
val title: String? = null,
val objective: String? = null,
val status: String,
val scopeAsset: AssetSummary? = null,
@@ -152,6 +153,7 @@ data class ChecklistSummary(
data class VisitDetail(
val id: String,
val code: String,
val title: String? = null,
val objective: String? = null,
val status: String,
val operationalArea: AssetSummary? = null,
@@ -37,15 +37,6 @@ data class MobileActSummary(
val title: String,
val summary: String,
val observations: String? = null,
val urgency: String = "NON_URGENT",
val deadlineDays: Int? = null,
val deadlineDayType: String? = null,
val deadlineBasis: String? = null,
val deadlineBaseAt: String? = null,
val deadlineAt: String? = null,
val lockedAt: String? = null,
val lockedSha256: String? = null,
val sealedAt: String? = null,
val currentVersion: Int = 0,
val closedAt: String? = null,
val closureSha256: String? = null,
@@ -62,15 +53,6 @@ data class MobileActDetail(
val title: String,
val summary: String,
val observations: String? = null,
val urgency: String = "NON_URGENT",
val deadlineDays: Int? = null,
val deadlineDayType: String? = null,
val deadlineBasis: String? = null,
val deadlineBaseAt: String? = null,
val deadlineAt: String? = null,
val lockedAt: String? = null,
val lockedSha256: String? = null,
val sealedAt: String? = null,
val currentVersion: Int = 0,
val closedAt: String? = null,
val closureSha256: String? = null,
@@ -93,7 +75,6 @@ data class MobileActListResponse(
data class CreateMobileActRequest(
val occurredAt: String,
val urgency: String,
val title: String,
val summary: String,
val observations: String? = null,
@@ -132,15 +113,6 @@ data class MobileActClosureHeader(
val code: String,
val status: String,
val visitId: String,
val urgency: String = "NON_URGENT",
val deadlineDays: Int? = null,
val deadlineDayType: String? = null,
val deadlineBasis: String? = null,
val deadlineBaseAt: String? = null,
val deadlineAt: String? = null,
val lockedAt: String? = null,
val lockedSha256: String? = null,
val sealedAt: String? = null,
val currentVersion: Int = 0,
val closedAt: String? = null,
val closureSha256: String? = null,
@@ -197,7 +169,7 @@ data class MobileCompanyOutcomeRequest(
val reason: String,
)
data class MobileSealActRequest(
data class MobileCloseActRequest(
val clientClosedAt: String = Instant.now().toString(),
val uploadMode: String = "ONLINE",
)
@@ -247,8 +219,14 @@ private interface MobileActsApi {
@Body request: MobileResponsibleRequest,
): MobileActClosure
@POST("inspection-acts/{actId}/lock")
suspend fun lock(
@POST("inspection-acts/{actId}/ready")
suspend fun ready(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
): MobileActClosure
@POST("inspection-acts/{actId}/reopen")
suspend fun reopen(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
): MobileActClosure
@@ -290,11 +268,11 @@ private interface MobileActsApi {
@Body request: MobileCompanyOutcomeRequest,
): MobileActClosure
@POST("inspection-acts/{actId}/seal")
suspend fun sealAct(
@POST("inspection-acts/{actId}/close")
suspend fun closeAct(
@Header("Authorization") authorization: String,
@Path("actId") actId: String,
@Body request: MobileSealActRequest,
@Body request: MobileCloseActRequest,
): MobileActClosure
@POST("inspection-visits/{visitId}/close")
@@ -327,20 +305,14 @@ class MobileActsRepository(context: Context) {
api.act("Bearer ${session.accessToken}", actId)
}
suspend fun create(
visitId: String,
assetId: String,
visitCode: String,
urgency: String = "NON_URGENT",
): MobileActDetail = authorized { session ->
suspend fun create(visitId: String, assetId: String, visitCode: String): MobileActDetail = authorized { session ->
api.createAct(
"Bearer ${session.accessToken}",
visitId,
CreateMobileActRequest(
occurredAt = Instant.now().toString(),
urgency = urgency,
title = "Acta de inspección $visitCode",
summary = "Acta de inspección en curso. Los Hallazgos y observaciones se incorporan de forma trazable durante la inspección.",
summary = "Acta de inspección en curso. Los Hallazgos y observaciones se incorporan de forma trazable durante la visita.",
assetIds = listOf(assetId),
),
)
@@ -363,8 +335,12 @@ class MobileActsRepository(context: Context) {
api.responsible("Bearer ${session.accessToken}", actId, request)
}
suspend fun lock(actId: String): MobileActClosure = authorized { session ->
api.lock("Bearer ${session.accessToken}", actId)
suspend fun prepare(actId: String): MobileActClosure = authorized { session ->
api.ready("Bearer ${session.accessToken}", actId)
}
suspend fun reopen(actId: String): MobileActClosure = authorized { session ->
api.reopen("Bearer ${session.accessToken}", actId)
}
suspend fun signInspector(
@@ -402,8 +378,8 @@ class MobileActsRepository(context: Context) {
)
}
suspend fun seal(actId: String): MobileActClosure = authorized { session ->
api.sealAct("Bearer ${session.accessToken}", actId, MobileSealActRequest())
suspend fun closeAct(actId: String): MobileActClosure = authorized { session ->
api.closeAct("Bearer ${session.accessToken}", actId, MobileCloseActRequest())
}
suspend fun closeVisit(visitId: String): VisitDetail = authorized { session ->
@@ -60,7 +60,6 @@ fun MobileActsScreen(
val context = LocalContext.current
val scope = rememberCoroutineScope()
var newActUrgency by rememberSaveable(visit.id) { mutableStateOf("NON_URGENT") }
var attendance by rememberSaveable(selected?.id) {
mutableStateOf(closure?.responsible?.attendanceStatus ?: "PRESENT")
}
@@ -130,20 +129,19 @@ fun MobileActsScreen(
Card(Modifier.fillMaxWidth()) {
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text("Actas de esta Inspección", fontWeight = FontWeight.Bold)
Text("Actas de esta inspección", fontWeight = FontWeight.Bold)
if (model.acts.isEmpty()) {
Text("Todavía no hay Actas. La primera se inicia sobre una Instalación/Subinstalación seleccionada.")
}
model.acts.forEach { act ->
val active = selected?.id == act.id
val urgency = if (act.urgency == "URGENT") "URGENTE" else "No urgente"
OutlinedButton(
onClick = { model.selectAct(act.id) },
modifier = Modifier.fillMaxWidth(),
) {
Text(
(if (active) "" else "") +
"${act.code} · ${actStatusLabel(act.status)} · $urgency · ${act.findingCount} Hallazgo${if (act.findingCount == 1) "" else "s"}",
"${act.code} · ${actStatusLabel(act.status)} · ${act.findingCount} Hallazgo${if (act.findingCount == 1) "" else "s"}",
)
}
}
@@ -158,31 +156,12 @@ fun MobileActsScreen(
) {
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text("Nueva Acta", fontWeight = FontWeight.Bold)
if (model.acts.any { it.status == "LOCKED" }) {
if (model.acts.any { it.status == "READY" }) {
Text(
"Podés abrir una nueva Acta aunque otra esté BLOQUEADA esperando firmas. Sólo se permite un borrador a la vez.",
"Puede existir una nueva Acta en borrador aunque haya Actas preparadas pendientes de firma de empresa. Sólo se permite un borrador a la vez.",
style = MaterialTheme.typography.bodySmall,
)
}
Text("Urgencia del Acta", fontWeight = FontWeight.Bold)
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
AssistChip(
onClick = { newActUrgency = "NON_URGENT" },
label = { Text(if (newActUrgency == "NON_URGENT") "✓ No urgente" else "No urgente") },
)
AssistChip(
onClick = { newActUrgency = "URGENT" },
label = { Text(if (newActUrgency == "URGENT") "✓ Urgente" else "Urgente") },
)
}
Text(
if (newActUrgency == "URGENT") {
"El plazo urgente se computará desde el Acta según la política institucional vigente al bloquearla."
} else {
"El plazo no urgente se computará desde la oficialización GEDO según la política institucional vigente al bloquearla."
},
style = MaterialTheme.typography.bodySmall,
)
val selectedInventory = model.selectedFieldAsset?.asset
if (selectedInventory == null) {
Text("Primero elegí una Instalación o Subinstalación desde Inventario de campo. Ese registro será el primer elemento del Acta.")
@@ -192,7 +171,7 @@ fun MobileActsScreen(
} else {
Text("Inventario inicial: ${selectedInventory.name} · ${selectedInventory.code}")
Button(
onClick = { model.createActForSelectedInventory(newActUrgency) },
onClick = { model.createActForSelectedInventory() },
enabled = !model.busy,
modifier = Modifier.fillMaxWidth(),
) { Text("Crear nueva Acta") }
@@ -207,14 +186,9 @@ fun MobileActsScreen(
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
Text(selected.code, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text(actStatusLabel(selected.status))
Text(if (selected.urgency == "URGENT") "Urgente" else "No urgente")
Text("${selected.findingCount} Hallazgo${if (selected.findingCount == 1) "" else "s"} · ${selected.assetCount} elemento${if (selected.assetCount == 1) "" else "s"} de Inventario")
selected.deadlineAt?.let { Text("Vencimiento calculado: $it", style = MaterialTheme.typography.bodySmall) }
if (selected.deadlineAt == null && selected.deadlineBasis == "GEDO_DATE") {
Text("Vencimiento pendiente de fecha GEDO.", style = MaterialTheme.typography.bodySmall)
}
selected.lockedSha256?.let { Text("Hash bloqueado: $it", style = MaterialTheme.typography.bodySmall) }
selected.closureSha256?.let { Text("Hash sellado: $it", style = MaterialTheme.typography.bodySmall) }
Text(selected.summary, style = MaterialTheme.typography.bodySmall)
selected.closureSha256?.let { Text("Hash final: $it", style = MaterialTheme.typography.bodySmall) }
}
}
@@ -260,28 +234,31 @@ fun MobileActsScreen(
HorizontalDivider()
Text("2. Hallazgos / verificaciones", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text("Los Hallazgos se cargan desde Inventario y quedan vinculados explícitamente a ${selected.code}. El Acta también puede finalizar sin Hallazgos cuando corresponde dejar constancia de una inspección o verificación sin nuevos incumplimientos.")
Text("Los Hallazgos se cargan desde Inventario y quedan vinculados a ${selected.code} de forma explícita. Un Acta de verificación puede prepararse sin Hallazgos nuevos si la verificación ya fue registrada.")
Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) { Text("Ir a Inventario / Hallazgos") }
HorizontalDivider()
Text("3. Finalizar contenido", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text("Al BLOQUEAR el Acta, el contenido y los Hallazgos quedan inmutables. Esta acción no se puede deshacer.")
Text("3. Preparar Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text("Al preparar, el contenido se congela y se calcula su hash. El servidor exige al menos un Hallazgo o una verificación registrada.")
Button(
onClick = { model.prepareSelectedAct() },
enabled = !model.busy && closure?.responsible != null,
modifier = Modifier.fillMaxWidth(),
) { Text("Finalizar y BLOQUEAR Acta") }
) { Text("Preparar Acta para firmas") }
}
"LOCKED" -> {
"READY" -> {
val signatures = closure?.signatures.orEmpty()
val inspectorSigned = signatures.any { it.signerType == "INSPECTOR" && it.status == "SIGNED" }
val companyOutcome = signatures.firstOrNull { it.signerType == "COMPANY_RESPONSIBLE" }
val companyResolved = companyOutcome?.status == "SIGNED" || companyOutcome?.status == "REFUSED"
Text("Acta BLOQUEADA", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text("El contenido ya es inmutable. Sólo resta resolver firmas y manifestaciones para poder SELLARLA.")
closure?.closure?.preparedSha256?.let { Text("Hash bloqueado: $it", style = MaterialTheme.typography.bodySmall) }
Text("Acta preparada", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
closure?.closure?.preparedSha256?.let { Text("Hash preparado: $it", style = MaterialTheme.typography.bodySmall) }
if (signatures.isEmpty()) {
OutlinedButton(onClick = { model.reopenSelectedAct() }, enabled = !model.busy, modifier = Modifier.fillMaxWidth()) {
Text("Volver a borrador")
}
}
HorizontalDivider()
Text("Firma del inspector", fontWeight = FontWeight.Bold)
@@ -297,21 +274,29 @@ fun MobileActsScreen(
}
HorizontalDivider()
Text("Manifestación de la empresa", fontWeight = FontWeight.Bold)
if (companyOutcome != null && companyResolved) {
Text("Recepción de la empresa", fontWeight = FontWeight.Bold)
if (companyOutcome != null) {
val detail = when (companyOutcome.status) {
"SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma en conformidad"
"SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma registrada"
"REFUSED" -> "Negativa a firmar"
"ABSENT" -> "Responsable ausente"
else -> companyOutcome.status
}
Text("$detail", color = MaterialTheme.colorScheme.primary)
companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
} else if (closure?.responsible?.attendanceStatus == "ABSENT") {
Text(
"El responsable fue registrado como ausente. La ausencia NO resuelve la manifestación: deberá obtenerse firma o negativa posteriormente antes de SELLAR el Acta.",
style = MaterialTheme.typography.bodyMedium,
)
Text("El responsable fue registrado como ausente.")
Button(
onClick = {
model.recordCompanyOutcome(
"ABSENT",
closure.responsible.absenceReason ?: "Responsable de empresa ausente durante la inspección",
)
},
enabled = !model.busy && inspectorSigned,
modifier = Modifier.fillMaxWidth(),
) { Text("Asentar ausencia en el Acta") }
} else {
Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
@@ -348,28 +333,28 @@ fun MobileActsScreen(
}
HorizontalDivider()
if (inspectorSigned && companyResolved) {
if (inspectorSigned && companyOutcome != null) {
Button(
onClick = { model.closeSelectedAct() },
enabled = !model.busy,
modifier = Modifier.fillMaxWidth(),
) { Text("SELLAR Acta definitivamente") }
} else {
) { Text("Cerrar Acta definitivamente") }
} else if (inspectorSigned) {
Text(
"Esta Acta bloquea el cierre de la Inspección hasta tener firma de inspector y firma o negativa válida de la empresa.",
"La inspección puede finalizar con la firma de empresa pendiente; el Acta permanecerá preparada hasta registrar firma, negativa o ausencia.",
style = MaterialTheme.typography.bodySmall,
)
}
}
"SEALED" -> {
"CLOSED" -> {
Card(
Modifier.fillMaxWidth(),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
) {
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
Text("Acta SELLADA e inmutable", fontWeight = FontWeight.Bold)
Text("Desde este sellado se genera el PDF del Acta y el INF Word editable para el Inspector.")
Text("Acta cerrada e inmutable", fontWeight = FontWeight.Bold)
Text("El PDF, informe Word y entregas documentales se generan desde este cierre.")
closure?.closure?.finalSha256?.let { Text("SHA-256: $it", style = MaterialTheme.typography.bodySmall) }
}
}
@@ -381,19 +366,16 @@ fun MobileActsScreen(
if (visit.status == "IN_PROGRESS" && model.acts.isNotEmpty()) {
HorizontalDivider()
val activeActs = model.acts.filter { it.status != "CANCELLED" }
val pendingActs = activeActs.filter { it.status != "SEALED" }
Text("Finalizar Inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
if (pendingActs.isEmpty()) {
Text("Todas las Actas están SELLADAS. La Inspección ya puede cerrarse.")
} else {
Text("No puede cerrarse todavía. Falta SELLAR: ${pendingActs.joinToString { it.code }}")
}
val drafts = model.acts.count { it.status == "DRAFT" }
Text("Finalizar inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
Text(
"No puede quedar ninguna Acta en borrador. Al cerrar, el servidor verifica que cada Acta preparada tenga firma de inspector; si falta alguna, indicará cuál debe completarse.",
)
Button(
onClick = { model.closeInspection() },
enabled = !model.busy && activeActs.isNotEmpty() && pendingActs.isEmpty(),
enabled = !model.busy && drafts == 0,
modifier = Modifier.fillMaxWidth(),
) { Text("Cerrar Inspección y salir de la empresa") }
) { Text("Cerrar inspección y salir de la empresa") }
}
}
}
@@ -415,8 +397,8 @@ private fun F32ActMessage(model: MainViewModel) {
private fun actStatusLabel(status: String): String = when (status) {
"DRAFT" -> "Borrador"
"LOCKED" -> "BLOQUEADA"
"SEALED" -> "SELLADA"
"READY" -> "Preparada para firmas"
"CLOSED" -> "Cerrada"
"CANCELLED" -> "Cancelada"
else -> status
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "dhv2-api",
"version": "0.26.0-1",
"version": "0.25.0-1",
"private": true,
"license": "UNLICENSED",
"scripts": {
@@ -49,7 +49,7 @@ export class ActAdministrationService {
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 ('SEALED', 'CLOSED', 'RECTIFIED')
WHERE ia.status IN ('CLOSED', 'RECTIFIED')
), classified AS (
SELECT *, CASE
WHEN "findingCount" > 0 AND "openFindingCount" = 0 THEN 'REGULARIZED'
@@ -110,7 +110,7 @@ export class ActAdministrationService {
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 (!['SEALED', 'CLOSED', 'RECTIFIED'].includes(act.status)) throw new BadRequestException({ code: 'ACT_ADMIN_REQUIRES_SEALED', message: 'El seguimiento administrativo comienza cuando el Acta está sellada.' });
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;
}
@@ -129,7 +129,7 @@ export class FieldBriefingService {
ORDER BY company_response.received_on DESC, company_response.created_at DESC, company_response.id DESC
LIMIT 1
) response ON true
WHERE act.status IN ('SEALED', 'CLOSED', 'RECTIFIED')
WHERE act.status IN ('CLOSED', 'RECTIFIED')
AND source_visit.id <> $1
AND source_visit.operational_area_id = $2::uuid
AND source_visit.operator_company_id = $3::uuid
+13 -20
View File
@@ -3,26 +3,27 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
import { APP_GUARD } from '@nestjs/core';
import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AuditModule } from './audit/audit.module';
import { ActAdministrationModule } from './act-administration/act-administration.module';
import { AdministrationModule } from './administration/administration.module';
import { AuthorizationModule } from './authorization/authorization.module';
import { PermissionsGuard } from './authorization/guards/permissions.guard';
import { AssetImportsModule } from './asset-imports/asset-imports.module';
import { AssetMasterModule } from './asset-master/asset-master.module';
import { AuditModule } from './audit/audit.module';
import { AuthModule } from './auth/auth.module';
import { AccessTokenGuard } from './auth/guards/access-token.guard';
import { AuthorizationModule } from './authorization/authorization.module';
import { PermissionsGuard } from './authorization/guards/permissions.guard';
import { CsrfGuard } from './auth/guards/csrf.guard';
import { PhaseADataModule } from './core-data/phase-a-data.module';
import { DashboardModule } from './dashboard/dashboard.module';
import { HealthController } from './health.controller';
import { HealthService } from './health.service';
import { DashboardModule } from './dashboard/dashboard.module';
import { AssetMasterModule } from './asset-master/asset-master.module';
import { InspectionVisitsModule } from './inspection-visits/inspection-visits.module';
import { InspectionActsModule } from './inspection-acts/inspection-acts.module';
import { InspectionFindingsModule } from './inspection-findings/inspection-findings.module';
import { InspectionClosingModule } from './inspection-closing/inspection-closing.module';
import { AssetImportsModule } from './asset-imports/asset-imports.module';
import { InspectionDeadlinesModule } from './inspection-deadlines/inspection-deadlines.module';
import { InspectionFindingsModule } from './inspection-findings/inspection-findings.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';
import { InspectionVisitsModule } from './inspection-visits/inspection-visits.module';
function required(config: ConfigService, key: string): string {
const value = config.get<string>(key);
@@ -32,10 +33,7 @@ function required(config: ConfigService, key: string): string {
@Module({
imports: [
ConfigModule.forRoot({
isGlobal: true,
ignoreEnvFile: true,
}),
ConfigModule.forRoot({ isGlobal: true, ignoreEnvFile: true }),
TypeOrmModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService) => ({
@@ -53,13 +51,7 @@ function required(config: ConfigService, key: string): string {
connectTimeoutMS: 5000,
}),
}),
ThrottlerModule.forRoot([
{
name: 'default',
ttl: 60_000,
limit: 120,
},
]),
ThrottlerModule.forRoot([{ name: 'default', ttl: 60_000, limit: 120 }]),
PhaseADataModule,
AuditModule,
AuthorizationModule,
@@ -71,6 +63,7 @@ function required(config: ConfigService, key: string): string {
InspectionActsModule,
InspectionFindingsModule,
InspectionClosingModule,
InspectionDeadlinesModule,
InspectionReportsModule,
InspectionVerificationsModule,
ActAdministrationModule,
+158 -55
View File
@@ -41,14 +41,14 @@ export interface AssetVersionDetail extends AssetVersionSummary {
function assetNotFound(): NotFoundException {
return new NotFoundException({
code: 'ASSET_NOT_FOUND',
message: 'Inventario no encontrado',
message: 'Activo no encontrado',
});
}
function versionNotFound(): NotFoundException {
return new NotFoundException({
code: 'ASSET_VERSION_NOT_FOUND',
message: 'Versión de Inventario no encontrada',
message: 'Versión de activo no encontrada',
});
}
@@ -79,7 +79,7 @@ export class AssetHistoryService {
const versionNumber = Number(versionRow.current_version);
if (!Number.isInteger(versionNumber) || versionNumber < 1) {
throw new Error(`Versión de Inventario inválida después de incrementar: ${versionRow.current_version}`);
throw new Error(`Versión de activo inválida después de incrementar: ${versionRow.current_version}`);
}
const snapshot = await this.loadCurrentSnapshot(manager, assetId);
@@ -101,8 +101,17 @@ export class AssetHistoryService {
asset_id, version_number, change_type, changed_fields, snapshot,
actor_user_id, actor_username, source, request_id
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
[assetId, versionNumber, changeType, changedFields, snapshot,
principal.userId, principal.username, source, request.requestId],
[
assetId,
versionNumber,
changeType,
changedFields,
snapshot,
principal.userId,
principal.username,
source,
request.requestId,
],
);
return versionNumber;
}
@@ -114,21 +123,38 @@ export class AssetHistoryService {
parameters.push(value);
return `$${parameters.length}`;
};
if (query.search?.trim()) {
const search = add(`%${query.search.trim()}%`);
conditions.push(`(version.snapshot->>'code' ILIKE ${search} OR version.snapshot->>'name' ILIKE ${search} OR version.actor_username ILIKE ${search})`);
conditions.push(`(
version.snapshot->>'code' ILIKE ${search}
OR version.snapshot->>'name' ILIKE ${search}
OR version.actor_username ILIKE ${search}
)`);
}
if (query.typeId) {
conditions.push(`version.snapshot #>> '{type,id}' = ${add(query.typeId)}`);
}
if (query.status) {
conditions.push(`version.snapshot->>'informationStatus' = ${add(query.status)}`);
}
if (query.changeType) {
conditions.push(`version.change_type = ${add(query.changeType)}`);
}
if (query.typeId) conditions.push(`version.snapshot #>> '{type,id}' = ${add(query.typeId)}`);
if (query.status) conditions.push(`version.snapshot->>'informationStatus' = ${add(query.status)}`);
if (query.changeType) conditions.push(`version.change_type = ${add(query.changeType)}`);
if (query.from) conditions.push(`version.occurred_at >= ${add(new Date(query.from))}`);
if (query.to) conditions.push(`version.occurred_at <= ${add(new Date(query.to))}`);
return this.listWithConditions(query.page, query.pageSize, conditions, parameters);
}
async listForAsset(assetId: string, query: AssetVersionPageQueryDto) {
await this.requireAsset(assetId);
return this.listWithConditions(query.page, query.pageSize, ['version.asset_id = $1'], [assetId]);
return this.listWithConditions(
query.page,
query.pageSize,
['version.asset_id = $1'],
[assetId],
);
}
async getVersion(assetId: string, versionNumber: number): Promise<AssetVersionDetail> {
@@ -144,9 +170,17 @@ export class AssetHistoryService {
return row;
}
private async listWithConditions(page: number, pageSize: number, conditions: string[], parameters: unknown[]) {
private async listWithConditions(
page: number,
pageSize: number,
conditions: string[],
parameters: unknown[],
) {
const where = conditions.length ? `WHERE ${conditions.join(' AND ')}` : '';
const [countRow] = (await this.dataSource.query(`SELECT COUNT(*)::integer AS total FROM asset_versions version ${where}`, parameters)) as Array<{ total: number }>;
const [countRow] = (await this.dataSource.query(
`SELECT COUNT(*)::integer AS total FROM asset_versions version ${where}`,
parameters,
)) as Array<{ total: number }>;
const total = Number(countRow?.total ?? 0);
const paginated = [...parameters, pageSize, (page - 1) * pageSize];
const limit = `$${parameters.length + 1}`;
@@ -160,29 +194,51 @@ export class AssetHistoryService {
LIMIT ${limit} OFFSET ${offset}`,
paginated,
)) as AssetVersionSummary[];
return { data, meta: { page, pageSize, total, totalPages: total === 0 ? 0 : Math.ceil(total / pageSize) } };
return {
data,
meta: {
page,
pageSize,
total,
totalPages: total === 0 ? 0 : Math.ceil(total / pageSize),
},
};
}
private selectSummary(): string {
return `SELECT
version.id, version.asset_id AS "assetId",
version.snapshot->>'code' AS "assetCode", version.snapshot->>'name' AS "assetName",
version.snapshot #>> '{type,id}' AS "typeId", version.snapshot #>> '{type,name}' AS "typeName",
version.id,
version.asset_id AS "assetId",
version.snapshot->>'code' AS "assetCode",
version.snapshot->>'name' AS "assetName",
version.snapshot #>> '{type,id}' AS "typeId",
version.snapshot #>> '{type,name}' AS "typeName",
version.snapshot->>'informationStatus' AS "informationStatus",
version.snapshot->>'operationalStatus' AS "operationalStatus",
version.version_number AS "versionNumber", version.change_type AS "changeType",
version.changed_fields AS "changedFields", version.occurred_at AS "occurredAt",
version.actor_user_id AS "actorUserId", version.actor_username AS "actorUsername",
version.source, version.request_id AS "requestId",
version.version_number AS "versionNumber",
version.change_type AS "changeType",
version.changed_fields AS "changedFields",
version.occurred_at AS "occurredAt",
version.actor_user_id AS "actorUserId",
version.actor_username AS "actorUsername",
version.source,
version.request_id AS "requestId",
(version.version_number = current_asset.current_version) AS "isCurrent"`;
}
private async requireAsset(assetId: string): Promise<void> {
const [row] = (await this.dataSource.query('SELECT 1 FROM assets WHERE id = $1', [assetId])) as unknown[];
const [row] = (await this.dataSource.query(
'SELECT 1 FROM assets WHERE id = $1',
[assetId],
)) as unknown[];
if (!row) throw assetNotFound();
}
private async loadCurrentSnapshot(manager: EntityManager, assetId: string): Promise<Record<string, unknown>> {
private async loadCurrentSnapshot(
manager: EntityManager,
assetId: string,
): Promise<Record<string, unknown>> {
const [row] = (await manager.query(
`SELECT JSONB_BUILD_OBJECT(
'id', asset.id,
@@ -190,49 +246,82 @@ export class AssetHistoryService {
'name', asset.name,
'commonName', asset.common_name,
'description', asset.description,
'type', JSONB_BUILD_OBJECT('id', asset_type.id,'code', asset_type.code,'name', asset_type.name,'operationalRole', asset_type.operational_role),
'parent', CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id', parent.id,'code', parent.code,'name', parent.name) END,
'operationalArea', CASE WHEN operational_area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id', operational_area.id,'code', operational_area.code,'name', operational_area.name) END,
'operatorCompany', CASE WHEN operator_company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id', operator_company.id,'code', operator_company.code,'name', operator_company.name) END,
'type', JSONB_BUILD_OBJECT(
'id', asset_type.id,
'code', asset_type.code,
'name', asset_type.name,
'operationalRole', asset_type.operational_role
),
'parent', CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', parent.id,
'code', parent.code,
'name', parent.name
) END,
'operationalArea', CASE WHEN operational_area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', operational_area.id,
'code', operational_area.code,
'name', operational_area.name
) END,
'operatorCompany', CASE WHEN operator_company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', operator_company.id,
'code', operator_company.code,
'name', operator_company.name
) END,
'informationStatus', asset.information_status,
'operationalStatus', asset.operational_status,
'currentFunction', (
SELECT JSONB_BUILD_OBJECT(
'assignmentId', assignment.id,
'id', fn.id,
'code', fn.code,
'name', fn.name,
'validFrom', assignment.valid_from,
'reason', assignment.change_reason
)
FROM inventory_function_assignments assignment
JOIN inventory_functions fn ON fn.id=assignment.function_id
WHERE assignment.asset_id=asset.id AND assignment.valid_until IS NULL
ORDER BY assignment.valid_from DESC LIMIT 1
),
'attributes', COALESCE((
SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
'definitionId', definition.id,'code', definition.code,'name', definition.name,
'dataType', definition.data_type,'isRequired', definition.is_required,
'unit', definition.unit,'options', definition.options,'sortOrder', definition.sort_order,'value', value.value
'definitionId', definition.id,
'code', definition.code,
'name', definition.name,
'dataType', definition.data_type,
'isRequired', definition.is_required,
'unit', definition.unit,
'options', definition.options,
'sortOrder', definition.sort_order,
'value', value.value
) ORDER BY definition.sort_order, definition.name)
FROM asset_attribute_definitions definition
LEFT JOIN asset_attribute_values value ON value.definition_id = definition.id AND value.asset_id = asset.id
WHERE definition.asset_type_id = asset.asset_type_id AND definition.is_active = true
LEFT JOIN asset_attribute_values value
ON value.definition_id = definition.id
AND value.asset_id = asset.id
WHERE definition.asset_type_id = asset.asset_type_id
AND definition.is_active = true
), '[]'::jsonb),
'geometry', CASE WHEN geometry.asset_id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'assetId', geometry.asset_id,'geometry', ST_AsGeoJSON(geometry.geometry)::jsonb,'geometryType', geometry.geometry_type,
'source', geometry.source,'accuracyM', geometry.accuracy_m::double precision,'capturedAt', geometry.captured_at,
'deviceLabel', geometry.device_label,'createdAt', geometry.created_at,'updatedAt', geometry.updated_at,'updatedBy', geometry.updated_by
'assetId', geometry.asset_id,
'geometry', ST_AsGeoJSON(geometry.geometry)::jsonb,
'geometryType', geometry.geometry_type,
'source', geometry.source,
'accuracyM', geometry.accuracy_m::double precision,
'capturedAt', geometry.captured_at,
'deviceLabel', geometry.device_label,
'createdAt', geometry.created_at,
'updatedAt', geometry.updated_at,
'updatedBy', geometry.updated_by
) END,
'media', COALESCE((
SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
'id', media.id,'kind', media.kind,'originalName', media.original_name,'mimeType', media.mime_type,
'sizeBytes', media.size_bytes,'sha256', media.sha256,'title', media.title,'description', media.description,
'capturedAt', media.captured_at,'latitude', media.latitude,'longitude', media.longitude,'accuracyM', media.accuracy_m,
'source', media.source,'uploadedBy', media.uploaded_by,'createdAt', media.created_at,'updatedAt', media.updated_at
'id', media.id,
'kind', media.kind,
'originalName', media.original_name,
'mimeType', media.mime_type,
'sizeBytes', media.size_bytes,
'sha256', media.sha256,
'title', media.title,
'description', media.description,
'capturedAt', media.captured_at,
'latitude', media.latitude,
'longitude', media.longitude,
'accuracyM', media.accuracy_m,
'source', media.source,
'uploadedBy', media.uploaded_by,
'createdAt', media.created_at,
'updatedAt', media.updated_at
) ORDER BY media.created_at, media.id)
FROM asset_media media WHERE media.asset_id = asset.id AND media.deleted_at IS NULL
FROM asset_media media
WHERE media.asset_id = asset.id
AND media.deleted_at IS NULL
), '[]'::jsonb),
'organizationProfile', (SELECT TO_JSONB(profile) - 'created_at' - 'updated_at' FROM organization_profiles profile WHERE profile.asset_id=asset.id),
'organizationMemberships', COALESCE((
@@ -248,8 +337,22 @@ export class AssetHistoryService {
'legalRights', COALESCE((
SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',r.id,'rightType',r.right_type,'name',r.name,'instrumentNumber',r.instrument_number,'validFrom',r.valid_from,'validUntil',r.valid_until,'status',r.status,'sourceDocumentId',r.source_document_id,'notes',r.notes,'organizations',COALESCE((SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',o.id,'organizationId',o.organization_id,'role',o.role,'participationPercent',o.participation_percent::double precision,'validFrom',o.valid_from,'validUntil',o.valid_until,'notes',o.notes,'endReason',o.end_reason) ORDER BY o.valid_until NULLS FIRST,o.valid_from DESC) FROM area_legal_right_organizations o WHERE o.right_id=r.id),'[]'::jsonb)) ORDER BY r.valid_until DESC NULLS FIRST,r.valid_from DESC NULLS LAST) FROM area_legal_rights r WHERE r.area_id=asset.id
),'[]'::jsonb),
'provenance', JSONB_BUILD_OBJECT('origin', asset.data_origin,'sourceName', asset.source_name,'sourceReference', asset.source_reference,'observedAt', asset.source_observed_at,'notes', asset.source_notes,'verifiedAt', asset.provenance_verified_at,'verifiedBy', asset.provenance_verified_by,'updatedAt', asset.provenance_updated_at,'updatedBy', asset.provenance_updated_by),
'createdAt', asset.created_at,'updatedAt', asset.updated_at,'createdBy', asset.created_by,'updatedBy', asset.updated_by,'currentVersion', asset.current_version
'provenance', JSONB_BUILD_OBJECT(
'origin', asset.data_origin,
'sourceName', asset.source_name,
'sourceReference', asset.source_reference,
'observedAt', asset.source_observed_at,
'notes', asset.source_notes,
'verifiedAt', asset.provenance_verified_at,
'verifiedBy', asset.provenance_verified_by,
'updatedAt', asset.provenance_updated_at,
'updatedBy', asset.provenance_updated_by
),
'createdAt', asset.created_at,
'updatedAt', asset.updated_at,
'createdBy', asset.created_by,
'updatedBy', asset.updated_by,
'currentVersion', asset.current_version
) AS snapshot
FROM assets asset
INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
@@ -29,8 +29,6 @@ import { InventoryFamilyCatalogService } from './inventory-family-catalog.servic
import { FieldInventoryMergeController, InventoryMergeController } from './inventory-merge.controller';
import { InventoryMergeService } from './inventory-merge.service';
import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
import { InventoryBrowserController } from './inventory-browser.controller';
import { InventoryBrowserService } from './inventory-browser.service';
@Module({
imports: [AuditModule],
@@ -39,7 +37,6 @@ import { InventoryBrowserService } from './inventory-browser.service';
AssetsController,
InventoryStructureController,
InventoryFamilyCatalogController,
InventoryBrowserController,
InventoryMergeController,
FieldInventoryMergeController,
AssetGeometriesController,
@@ -56,7 +53,6 @@ import { InventoryBrowserService } from './inventory-browser.service';
AssetsService,
InventoryStructureService,
InventoryFamilyCatalogService,
InventoryBrowserService,
InventoryMergeService,
MergedInventoryDossierService,
AssetGeometriesService,
@@ -79,15 +79,23 @@ export class AssetOperationalRelationsService {
async listCompaniesForArea(areaId: string): Promise<{ data: OperationalAssetSummary[] }> {
await this.requireAssetRole(this.dataSource.manager, areaId, AssetTypeOperationalRole.AREA);
const data = (await this.dataSource.query(`
SELECT DISTINCT company.id, company.code, company.name,
company.common_name AS "commonName", company_type.name AS "typeName"
FROM area_company_relations relation
INNER JOIN assets company ON company.id = relation.company_id
SELECT DISTINCT company.id, company.code, company.name, company.common_name AS "commonName", company_type.name AS "typeName"
FROM (
SELECT relation.company_id
FROM area_company_relations relation
WHERE relation.area_id = $1
AND relation.relation_role = 'OPERATOR'
AND relation.valid_until IS NULL
UNION
SELECT asset.operator_company_id AS company_id
FROM assets asset
WHERE asset.operational_area_id = $1
AND asset.operator_company_id IS NOT NULL
AND asset.information_status <> 'INACTIVE'
) linked
INNER JOIN assets company ON company.id = linked.company_id
INNER JOIN asset_types company_type ON company_type.id = company.asset_type_id
WHERE relation.area_id = $1
AND relation.relation_role = 'OPERATOR'
AND relation.valid_until IS NULL
AND company.information_status <> 'INACTIVE'
WHERE company.information_status <> 'INACTIVE'
ORDER BY company.name, company.code
`, [areaId])) as OperationalAssetSummary[];
return { data };
@@ -96,15 +104,23 @@ export class AssetOperationalRelationsService {
async listAreasForCompany(companyId: string): Promise<{ data: OperationalAssetSummary[] }> {
await this.requireAssetRole(this.dataSource.manager, companyId, AssetTypeOperationalRole.COMPANY);
const data = (await this.dataSource.query(`
SELECT DISTINCT area.id, area.code, area.name,
area.common_name AS "commonName", area_type.name AS "typeName"
FROM area_company_relations relation
INNER JOIN assets area ON area.id = relation.area_id
SELECT DISTINCT area.id, area.code, area.name, area.common_name AS "commonName", area_type.name AS "typeName"
FROM (
SELECT relation.area_id
FROM area_company_relations relation
WHERE relation.company_id = $1
AND relation.relation_role = 'OPERATOR'
AND relation.valid_until IS NULL
UNION
SELECT asset.operational_area_id AS area_id
FROM assets asset
WHERE asset.operator_company_id = $1
AND asset.operational_area_id IS NOT NULL
AND asset.information_status <> 'INACTIVE'
) linked
INNER JOIN assets area ON area.id = linked.area_id
INNER JOIN asset_types area_type ON area_type.id = area.asset_type_id
WHERE relation.company_id = $1
AND relation.relation_role = 'OPERATOR'
AND relation.valid_until IS NULL
AND area.information_status <> 'INACTIVE'
WHERE area.information_status <> 'INACTIVE'
ORDER BY area.name, area.code
`, [companyId])) as OperationalAssetSummary[];
return { data };
@@ -141,49 +157,12 @@ export class AssetOperationalRelationsService {
const [document] = await manager.query('SELECT 1 FROM source_documents WHERE id=$1', [dto.sourceDocumentId]);
if (!document) throw new BadRequestException({ code: 'SOURCE_DOCUMENT_NOT_FOUND', message: 'El documento fuente no existe' });
}
if (dto.relationRole === AreaOrganizationRole.OPERATOR) {
const [currentOperator] = (await manager.query(`
SELECT relation.id,company.name AS "companyName"
FROM area_company_relations relation
JOIN assets company ON company.id=relation.company_id
WHERE relation.area_id=$1
AND relation.relation_role='OPERATOR'
AND relation.valid_until IS NULL
AND relation.company_id<>$2
ORDER BY relation.valid_from DESC
LIMIT 1
FOR UPDATE OF relation
`,[dto.areaId,dto.companyId])) as Array<{id:string;companyName:string}>;
if (currentOperator) {
throw new ConflictException({
code:'AREA_ACTIVE_OPERATOR_MUST_END_FIRST',
message:`El Área ya tiene una Operadora vigente (${currentOperator.companyName}). Finalizá esa relación antes de registrar la nueva Operadora.`,
});
}
}
const [row] = (await manager.query(`
INSERT INTO area_company_relations (
area_id, company_id, relation_role, participation_percent, legal_instrument, source_document_id, start_reason, created_by
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
RETURNING id
`, [dto.areaId, dto.companyId, dto.relationRole, dto.participationPercent ?? null, dto.legalInstrument ?? null, dto.sourceDocumentId ?? null, dto.reason, principal.userId])) as Array<{ id: string }>;
// Compatibility snapshot only. This does not move or re-parent Inventory.
// area_company_relations remains the temporal source of truth.
if (dto.relationRole === AreaOrganizationRole.OPERATOR) {
await manager.query(`
UPDATE assets asset
SET operator_company_id=$2::uuid,updated_at=CURRENT_TIMESTAMP,updated_by=$3::uuid
FROM asset_types type
WHERE type.id=asset.asset_type_id
AND type.operational_role='GENERIC'
AND asset.operational_area_id=$1::uuid
AND asset.operator_company_id IS DISTINCT FROM $2::uuid
`,[dto.areaId,dto.companyId,principal.userId]);
}
const created = await this.loadRelation(manager, row.id);
await this.audit.record({
...administrationAuditContext(principal, request),
@@ -191,9 +170,6 @@ export class AssetOperationalRelationsService {
entityType: 'area_company_relation',
entityId: row.id,
afterData: this.auditView(created),
metadata: dto.relationRole === AreaOrganizationRole.OPERATOR
? { inventoryHierarchyChanged:false, operatorSnapshotSynchronized:true }
: undefined,
}, manager);
return created;
});
@@ -222,9 +198,12 @@ export class AssetOperationalRelationsService {
message: 'La relación ya se encuentra finalizada',
});
}
// F5: physical Inventory belongs to Area/Yacimiento hierarchy, not to Company.
// Ending an operator relation must never be blocked by existing Inventory.
if (before.assignedAssetCount > 0) {
throw new ConflictException({
code: 'AREA_COMPANY_RELATION_IN_USE',
message: `No se puede finalizar la relación: ${before.assignedAssetCount} activo(s) todavía dependen de esta combinación`,
});
}
await manager.query(`
UPDATE area_company_relations
SET valid_until = CURRENT_TIMESTAMP,
@@ -241,10 +220,6 @@ export class AssetOperationalRelationsService {
entityId: id,
beforeData: this.auditView(before),
afterData: this.auditView(updated),
metadata: {
inventoryHierarchyChanged:false,
retainedCompatibilitySnapshotCount: before.assignedAssetCount,
},
}, manager);
return updated;
});
@@ -355,8 +330,7 @@ export class AssetOperationalRelationsService {
(relation.valid_until IS NULL) AS active,
CASE WHEN relation.relation_role = 'OPERATOR' THEN (SELECT COUNT(*)::integer FROM assets asset
WHERE asset.operational_area_id = relation.area_id
AND asset.operator_company_id = relation.company_id
AND asset.is_inventory_instance=true) ELSE 0 END AS "assignedAssetCount"
AND asset.operator_company_id = relation.company_id) ELSE 0 END AS "assignedAssetCount"
FROM area_company_relations relation
INNER JOIN assets area ON area.id = relation.area_id
INNER JOIN asset_types area_type ON area_type.id = area.asset_type_id
+6 -6
View File
@@ -298,7 +298,7 @@ export class AssetsService {
const [visits, acts, findings, evidence, communications, verificationResults, documents, inspectionReports, media, versions] = await Promise.all([
this.dataSource.query(
`SELECT DISTINCT visit.id, visit.code, visit.status,
`SELECT DISTINCT visit.id, visit.code, visit.title, visit.status,
visit.planned_start_at AS "plannedStartAt",
visit.actual_started_at AS "actualStartedAt",
visit.actual_closed_at AS "actualClosedAt",
@@ -322,7 +322,7 @@ export class AssetsService {
`SELECT DISTINCT act.id, act.visit_id AS "visitId", act.code, act.status,
act.occurred_at AS "occurredAt", act.title, act.summary,
act.closed_at AS "closedAt", act.current_version AS "currentVersion",
visit.code AS "visitCode"
visit.code AS "visitCode", visit.title AS "visitTitle"
FROM inspection_acts act
JOIN inspection_visits visit ON visit.id = act.visit_id
LEFT JOIN inspection_act_assets act_asset
@@ -342,7 +342,7 @@ export class AssetsService {
finding.closed_at AS "closedAt", finding.closure_notes AS "closureNotes",
finding.created_at AS "createdAt", finding.updated_at AS "updatedAt",
act.code AS "actCode", act.occurred_at AS "actOccurredAt",
visit.id AS "visitId", visit.code AS "visitCode"
visit.id AS "visitId", visit.code AS "visitCode", visit.title AS "visitTitle"
FROM inspection_findings finding
JOIN inspection_acts act ON act.id = finding.act_id
JOIN inspection_visits visit ON visit.id = act.visit_id
@@ -389,7 +389,7 @@ export class AssetsService {
verification_link.result_recorded_at AS "resultRecordedAt",
verification_link.rescheduled_control_on AS "rescheduledControlOn",
finding.code AS "findingCode", finding.title AS "findingTitle",
visit.code AS "visitCode", visit.status AS "visitStatus",
visit.code AS "visitCode", visit.title AS "visitTitle", visit.status AS "visitStatus",
(SELECT COUNT(*)::integer
FROM inspection_finding_evidence verification_evidence
WHERE verification_evidence.finding_id = finding.id
@@ -484,7 +484,7 @@ export class AssetsService {
kind: 'INSPECTION',
occurredAt: visit.actualStartedAt ?? visit.plannedStartAt ?? visit.createdAt,
title: `Inspección ${String(visit.code)}`,
description: null,
description: visit.title,
href: `/inspecciones/${String(visit.id)}`,
meta: { status: visit.status },
}));
@@ -867,7 +867,7 @@ export class AssetsService {
private fieldDiscoverySelect(): string {
return `SELECT discovery.id, discovery.status, discovery.discovery_notes AS "discoveryNotes", discovery.observed_at AS "observedAt", discovery.reviewed_at AS "reviewedAt", discovery.review_notes AS "reviewNotes", discovery.created_at AS "createdAt",
JSONB_BUILD_OBJECT('id',asset.id,'code',asset.code,'name',asset.name,'commonName',asset.common_name,'informationStatus',asset.information_status,'typeId',asset.asset_type_id,'typeName',asset_type.name,'parentId',asset.parent_id,'operationalAreaId',asset.operational_area_id,'operatorCompanyId',asset.operator_company_id) AS asset,
JSONB_BUILD_OBJECT('id',visit.id,'code',visit.code,'status',visit.status) AS visit,
JSONB_BUILD_OBJECT('id',visit.id,'code',visit.code,'title',visit.title,'status',visit.status) AS visit,
JSONB_BUILD_OBJECT('id',creator.id,'username',creator.username,'firstName',creator.first_name,'lastName',creator.last_name) AS creator,
CASE WHEN reviewer.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',reviewer.id,'username',reviewer.username,'firstName',reviewer.first_name,'lastName',reviewer.last_name) END AS reviewer,
CASE WHEN matched.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',matched.id,'code',matched.code,'name',matched.name,'commonName',matched.common_name) END AS "matchedAsset"
@@ -10,7 +10,6 @@ import {
} from 'class-validator';
export const INVENTORY_STRUCTURE_KINDS = [
'EMPRESA',
'AREA',
'YACIMIENTO',
'INSTALACION',
@@ -1,63 +0,0 @@
import { Transform, Type } from 'class-transformer';
import {
IsBoolean,
IsEnum,
IsInt,
IsOptional,
IsString,
IsUUID,
Max,
MaxLength,
Min,
} from 'class-validator';
import { AssetInformationStatus, AssetOperationalStatus } from '../../database/entities';
export class InventoryBrowserQueryDto {
@IsOptional()
@IsString()
@MaxLength(200)
search?: string;
@IsOptional()
@IsUUID('4')
typeId?: string;
@IsOptional()
@IsEnum(AssetInformationStatus)
status?: AssetInformationStatus;
@IsOptional()
@IsEnum(AssetOperationalStatus)
operationalStatus?: AssetOperationalStatus;
@IsOptional()
@IsUUID('4')
operationalAreaId?: string;
@IsOptional()
@IsUUID('4')
operatorCompanyId?: string;
@IsOptional()
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
@IsBoolean()
needsValidation?: boolean;
@IsOptional()
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
@IsBoolean()
hasGeometry?: boolean;
@IsOptional()
@Type(() => Number)
@IsInt()
@Min(1)
page = 1;
@IsOptional()
@Type(() => Number)
@IsInt()
@Min(1)
@Max(100)
pageSize = 25;
}
@@ -1,71 +0,0 @@
import { Transform } from 'class-transformer';
import {
ArrayMaxSize,
IsArray,
IsBoolean,
IsIn,
IsOptional,
IsString,
IsUUID,
MaxLength,
MinLength,
} from 'class-validator';
export class CreateInventoryFamilyDto {
@IsIn(['INSTALLATION', 'SUBINSTALLATION'])
level!: 'INSTALLATION' | 'SUBINSTALLATION';
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(1)
@MaxLength(240)
name!: string;
@IsOptional()
@IsUUID('4')
parentFamilyId?: string | null;
@IsOptional()
@IsArray()
@ArrayMaxSize(100)
@IsString({ each: true })
@MaxLength(160, { each: true })
informationLabels?: string[];
}
export class UpdateInventoryFamilyDto {
@IsOptional()
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(1)
@MaxLength(240)
name?: string;
@IsOptional()
@IsUUID('4')
parentFamilyId?: string | null;
@IsOptional()
@IsArray()
@ArrayMaxSize(100)
@IsString({ each: true })
@MaxLength(160, { each: true })
informationLabels?: string[];
@IsOptional()
@IsBoolean()
isActive?: boolean;
}
export class ReplaceInventoryFamilyFindingsDto {
@IsArray()
@ArrayMaxSize(2000)
@IsUUID('4', { each: true })
itemIds!: string[];
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(5)
@MaxLength(2000)
reason!: string;
}
@@ -1,79 +0,0 @@
import { Transform } from 'class-transformer';
import {
IsBoolean,
IsISO8601,
IsInt,
IsOptional,
IsString,
IsUUID,
Max,
MaxLength,
Min,
MinLength,
} from 'class-validator';
export class CreateInventoryFunctionDto {
@Transform(({ value }) => typeof value === 'string' ? value.trim().toUpperCase().replace(/[^A-Z0-9]+/g, '_').replace(/^_+|_+$/g, '') : value)
@IsString()
@MinLength(2)
@MaxLength(120)
code!: string;
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(2)
@MaxLength(240)
name!: string;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
@IsString()
@MaxLength(4000)
description?: string | null;
@IsOptional()
@IsInt()
@Min(0)
@Max(100000)
sortOrder?: number;
}
export class UpdateInventoryFunctionDto {
@IsOptional()
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(2)
@MaxLength(240)
name?: string;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
@IsString()
@MaxLength(4000)
description?: string | null;
@IsOptional()
@IsBoolean()
isActive?: boolean;
@IsOptional()
@IsInt()
@Min(0)
@Max(100000)
sortOrder?: number;
}
export class ChangeInventoryFunctionDto {
@IsUUID('4')
functionId!: string;
@IsOptional()
@IsISO8601({ strict: true })
effectiveAt?: string;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
@IsString()
@MaxLength(4000)
reason?: string | null;
}
@@ -37,9 +37,4 @@ export class ListAssetTreeQueryDto {
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
@IsBoolean()
hasGeometry?: boolean;
@IsOptional()
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
@IsBoolean()
inventoryOnly?: boolean;
}
@@ -39,6 +39,7 @@ export class ListAssetsQueryDto {
@IsEnum(AssetInformationStatus)
status?: AssetInformationStatus;
@IsOptional()
@IsEnum(AssetOperationalStatus)
operationalStatus?: AssetOperationalStatus;
@@ -53,11 +54,6 @@ export class ListAssetsQueryDto {
@IsBoolean()
hasGeometry?: boolean;
@IsOptional()
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
@IsBoolean()
inventoryOnly?: boolean;
@IsOptional()
@IsUUID('4')
parentId?: string;
@@ -1,28 +0,0 @@
import { Controller, Get, Param, ParseUUIDPipe, Query } from '@nestjs/common';
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
import { InventoryBrowserQueryDto } from './dto/inventory-browser-query.dto';
import { InventoryBrowserService } from './inventory-browser.service';
@Controller('inventory-browser')
@RequirePermissions('assets.read')
export class InventoryBrowserController {
constructor(private readonly inventoryBrowser: InventoryBrowserService) {}
@Get('items')
items(@Query() query: InventoryBrowserQueryDto) {
return this.inventoryBrowser.items(query);
}
@Get('areas')
areas(@Query() query: InventoryBrowserQueryDto) {
return this.inventoryBrowser.areas(query);
}
@Get(':parentId/children')
children(
@Param('parentId', new ParseUUIDPipe({ version: '4' })) parentId: string,
@Query() query: InventoryBrowserQueryDto,
) {
return this.inventoryBrowser.children(parentId, query);
}
}
@@ -1,283 +0,0 @@
import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
import { DataSource } from 'typeorm';
import type { InventoryBrowserQueryDto } from './dto/inventory-browser-query.dto';
type ParentContext = {
id: string;
code: string;
name: string;
typeCode: string;
};
@Injectable()
export class InventoryBrowserService {
constructor(private readonly dataSource: DataSource) {}
async items(query: InventoryBrowserQueryDto) {
const params: unknown[] = [];
const conditions = [
'asset.is_inventory_instance=true',
"asset.information_status<>'INACTIVE'",
'type.is_active=true',
];
const add = (value: unknown): string => {
params.push(value);
return `$${params.length}`;
};
if (query.search?.trim()) {
const p = add(`%${query.search.trim()}%`);
conditions.push(`(asset.code ILIKE ${p} OR asset.name ILIKE ${p} OR COALESCE(asset.common_name,'') ILIKE ${p})`);
}
if (query.typeId) conditions.push(`asset.asset_type_id=${add(query.typeId)}::uuid`);
if (query.status) conditions.push(`asset.information_status=${add(query.status)}::asset_information_status`);
if (query.operationalStatus) conditions.push(`asset.operational_status=${add(query.operationalStatus)}::asset_operational_status`);
if (query.needsValidation === true) conditions.push("asset.information_status NOT IN ('VALIDATED','INACTIVE')");
if (query.needsValidation === false) conditions.push("asset.information_status='VALIDATED'");
if (query.hasGeometry === true) conditions.push('EXISTS (SELECT 1 FROM asset_geometries geometry_filter WHERE geometry_filter.asset_id=asset.id)');
if (query.hasGeometry === false) conditions.push('NOT EXISTS (SELECT 1 FROM asset_geometries geometry_filter WHERE geometry_filter.asset_id=asset.id)');
if (query.operationalAreaId) conditions.push(`asset.operational_area_id=${add(query.operationalAreaId)}::uuid`);
if (query.operatorCompanyId) {
const company = add(query.operatorCompanyId);
conditions.push(`EXISTS (
SELECT 1 FROM area_company_relations relation
WHERE relation.area_id=asset.operational_area_id
AND relation.company_id=${company}::uuid
AND relation.relation_role='OPERATOR'
AND relation.valid_until IS NULL
)`);
}
const where = conditions.join(' AND ');
const [countRow] = (await this.dataSource.query(`
SELECT COUNT(*)::integer AS total
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
WHERE ${where}
`,params)) as Array<{total:number}>;
const total=Number(countRow?.total ?? 0);
const offset=(query.page-1)*query.pageSize;
params.push(query.pageSize);
const limit=`$${params.length}`;
params.push(offset);
const offsetParam=`$${params.length}`;
const data=await this.dataSource.query(`
SELECT
asset.id,asset.code,asset.name,asset.common_name AS "commonName",
JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id',parent.id,'code',parent.code,'name',parent.name
) END AS parent,
CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id',area.id,'code',area.code,'name',area.name
) END AS "operationalArea",
(
SELECT JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name)
FROM area_company_relations relation
JOIN assets company ON company.id=relation.company_id
WHERE relation.area_id=asset.operational_area_id
AND relation.relation_role='OPERATOR'
AND relation.valid_until IS NULL
ORDER BY relation.valid_from DESC,relation.created_at DESC
LIMIT 1
) AS "operatorCompany",
asset.information_status AS "informationStatus",
asset.operational_status AS "operationalStatus",
0::integer AS "childrenCount",
EXISTS (SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id=asset.id) AS "hasGeometry",
CASE WHEN geometry_type.type IS NULL THEN NULL ELSE geometry_type.type END AS "geometryType",
(SELECT COUNT(*)::integer FROM asset_media media WHERE media.asset_id=asset.id AND media.deleted_at IS NULL) AS "mediaCount",
asset.data_origin AS "dataOrigin",
(asset.provenance_verified_at IS NOT NULL) AS "provenanceVerified",
asset.current_version AS "currentVersion",
asset.updated_at AS "updatedAt"
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
LEFT JOIN assets parent ON parent.id=asset.parent_id
LEFT JOIN assets area ON area.id=asset.operational_area_id
LEFT JOIN LATERAL (
SELECT ST_GeometryType(geometry.geometry)::text AS type
FROM asset_geometries geometry
WHERE geometry.asset_id=asset.id
ORDER BY geometry.updated_at DESC
LIMIT 1
) geometry_type ON true
WHERE ${where}
ORDER BY asset.name,asset.code
LIMIT ${limit} OFFSET ${offsetParam}
`,params);
return {
data,
meta:{
page:query.page,
pageSize:query.pageSize,
total,
totalPages:total===0 ? 0 : Math.ceil(total/query.pageSize),
},
};
}
async areas(query: InventoryBrowserQueryDto) {
const params: unknown[] = [];
const conditions = [
"type.operational_role='AREA'",
"area.information_status<>'INACTIVE'",
'type.is_active=true',
];
const add = (value: unknown): string => {
params.push(value);
return `$${params.length}`;
};
if (query.search?.trim()) {
const p = add(`%${query.search.trim()}%`);
conditions.push(`(area.code ILIKE ${p} OR area.name ILIKE ${p} OR COALESCE(area.common_name,'') ILIKE ${p})`);
}
if (query.operationalAreaId) conditions.push(`area.id=${add(query.operationalAreaId)}::uuid`);
if (query.operatorCompanyId) {
const p = add(query.operatorCompanyId);
conditions.push(`EXISTS (
SELECT 1 FROM area_company_relations relation
WHERE relation.area_id=area.id
AND relation.company_id=${p}::uuid
AND relation.relation_role='OPERATOR'
AND relation.valid_until IS NULL
)`);
}
const data = await this.dataSource.query(`
SELECT
area.id,area.code,area.name,area.common_name AS "commonName",
JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
area.information_status AS "informationStatus",
area.operational_status AS "operationalStatus",
(
SELECT JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name)
FROM area_company_relations relation
JOIN assets company ON company.id=relation.company_id
WHERE relation.area_id=area.id
AND relation.relation_role='OPERATOR'
AND relation.valid_until IS NULL
ORDER BY relation.valid_from DESC,relation.created_at DESC
LIMIT 1
) AS "currentOperator",
(
SELECT COUNT(*)::integer
FROM assets yacimiento
JOIN asset_types ytype ON ytype.id=yacimiento.asset_type_id
WHERE yacimiento.parent_id=area.id
AND lower(ytype.code)='yacimiento'
AND yacimiento.information_status<>'INACTIVE'
) AS "yacimientoCount",
(
SELECT COUNT(*)::integer
FROM assets inventory
WHERE inventory.is_inventory_instance=true
AND inventory.information_status<>'INACTIVE'
AND inventory.operational_area_id=area.id
) AS "inventoryCount"
FROM assets area
JOIN asset_types type ON type.id=area.asset_type_id
WHERE ${conditions.join(' AND ')}
ORDER BY area.name,area.code
`, params);
return { data, meta: { count: data.length } };
}
async children(parentId: string, query: InventoryBrowserQueryDto) {
const parent = await this.parent(parentId);
const allowedChildType = this.allowedChildType(parent.typeCode);
if (!allowedChildType) return { parent, data: [], meta: { count: 0, hasMore: false } };
const params: unknown[] = [parentId, allowedChildType];
const conditions = [
'asset.parent_id=$1::uuid',
'lower(type.code)=lower($2)',
"asset.information_status<>'INACTIVE'",
'type.is_active=true',
];
if (allowedChildType === 'instalacion' || allowedChildType === 'subinstalacion') {
conditions.push('asset.is_inventory_instance=true');
}
if (query.search?.trim()) {
params.push(`%${query.search.trim()}%`);
const p = `$${params.length}`;
conditions.push(`(asset.code ILIKE ${p} OR asset.name ILIKE ${p} OR COALESCE(asset.common_name,'') ILIKE ${p})`);
}
params.push(201);
const limit = `$${params.length}`;
const rows = await this.dataSource.query(`
SELECT
asset.id,asset.code,asset.name,asset.common_name AS "commonName",
JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
CASE WHEN parent_asset.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id',parent_asset.id,'code',parent_asset.code,'name',parent_asset.name
) END AS parent,
asset.information_status AS "informationStatus",
asset.operational_status AS "operationalStatus",
asset.is_inventory_instance AS "isInventoryInstance",
CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id',family.id,'code',family.code,'name',family.name,'level',family.level
) END AS "inventoryFamily",
(
SELECT COUNT(*)::integer
FROM assets child
WHERE child.parent_id=asset.id
AND child.information_status<>'INACTIVE'
AND (
lower(type.code)='area'
OR child.is_inventory_instance=true
OR EXISTS (
SELECT 1 FROM asset_types child_type
WHERE child_type.id=child.asset_type_id AND lower(child_type.code)='yacimiento'
)
)
) AS "childrenCount",
EXISTS (SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id=asset.id) AS "hasGeometry",
asset.updated_at AS "updatedAt"
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
LEFT JOIN assets parent_asset ON parent_asset.id=asset.parent_id
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
WHERE ${conditions.join(' AND ')}
ORDER BY asset.name,asset.code
LIMIT ${limit}
`, params);
const hasMore = rows.length > 200;
const data = hasMore ? rows.slice(0,200) : rows;
return { parent, data, meta: { count: data.length, hasMore } };
}
private async parent(parentId: string): Promise<ParentContext> {
const [parent] = await this.dataSource.query(`
SELECT asset.id,asset.code,asset.name,type.code AS "typeCode"
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
`,[parentId]) as ParentContext[];
if (!parent) {
throw new NotFoundException({ code:'INVENTORY_BROWSER_PARENT_NOT_FOUND',message:'El nivel de Inventario no existe' });
}
if (!['area','yacimiento','instalacion','subinstalacion'].includes(parent.typeCode.toLowerCase())) {
throw new BadRequestException({
code:'INVENTORY_BROWSER_PARENT_TYPE_INVALID',
message:'La navegación de Inventarios admite Área → Yacimiento → Instalación → Subinstalación',
});
}
return parent;
}
private allowedChildType(typeCode: string): string | null {
switch (typeCode.toLowerCase()) {
case 'area': return 'yacimiento';
case 'yacimiento': return 'instalacion';
case 'instalacion': return 'subinstalacion';
default: return null;
}
}
}
@@ -1,66 +1,11 @@
import {
Body,
Controller,
Get,
Param,
ParseUUIDPipe,
Patch,
Post,
Put,
Req,
} from '@nestjs/common';
import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
import { Controller, Get, Param, ParseUUIDPipe } from '@nestjs/common';
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import {
CreateInventoryFamilyDto,
ReplaceInventoryFamilyFindingsDto,
UpdateInventoryFamilyDto,
} from './dto/inventory-family-admin.dto';
import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
@Controller('inventory-families')
export class InventoryFamilyCatalogController {
constructor(private readonly families: InventoryFamilyCatalogService) {}
@Get('admin')
@RequirePermissions('asset_types.read')
admin() {
return this.families.listAdmin();
}
@Post()
@RequirePermissions('asset_types.manage')
create(
@Body() dto: CreateInventoryFamilyDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.families.create(dto,principal,request);
}
@Patch(':familyId')
@RequirePermissions('asset_types.manage')
update(
@Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string,
@Body() dto:UpdateInventoryFamilyDto,
@CurrentAuth() principal:AuthPrincipal,
@Req() request:RequestWithContext,
) {
return this.families.update(familyId,dto,principal,request);
}
@Put(':familyId/findings')
@RequirePermissions('finding_catalog.manage')
replaceFindings(
@Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string,
@Body() dto:ReplaceInventoryFamilyFindingsDto,
@CurrentAuth() principal:AuthPrincipal,
@Req() request:RequestWithContext,
) {
return this.families.replaceFindings(familyId,dto,principal,request);
}
@Get(':familyId/findings')
@RequirePermissions('assets.read')
findings(@Param('familyId', new ParseUUIDPipe({ version: '4' })) familyId: string) {
@@ -1,71 +1,28 @@
import { randomUUID } from 'node:crypto';
import {
BadRequestException,
ConflictException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { DataSource, EntityManager } from 'typeorm';
import { administrationAuditContext } from '../administration/common/administration-audit';
import { AuditService } from '../audit/audit.service';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import { AuditAction } from '../database/entities';
import type {
CreateInventoryFamilyDto,
ReplaceInventoryFamilyFindingsDto,
UpdateInventoryFamilyDto,
} from './dto/inventory-family-admin.dto';
type FamilyRow = {
id: string;
code: string;
name: string;
level: 'INSTALLATION' | 'SUBINSTALLATION';
informationLabels: string[];
sourceReference: string | null;
isActive: boolean;
parentFamilyId: string | null;
parentFamilyCode: string | null;
parentFamilyName: string | null;
assetCount: number;
findingCount: number;
findingItemIds: string[];
};
import { Injectable, NotFoundException } from '@nestjs/common';
import { DataSource } from 'typeorm';
@Injectable()
export class InventoryFamilyCatalogService {
constructor(
private readonly dataSource: DataSource,
private readonly audit: AuditService,
) {}
async listAdmin() {
const data = await this.dataSource.query(`
SELECT
family.id,family.code,family.name,family.level,
family.information_labels AS "informationLabels",
family.source_reference AS "sourceReference",
family.is_active AS "isActive",
parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName",
(SELECT COUNT(*)::integer FROM assets asset WHERE asset.inventory_family_id=family.id) AS "assetCount",
(SELECT COUNT(*)::integer FROM finding_catalog_item_inventory_families mapping WHERE mapping.inventory_family_id=family.id) AS "findingCount",
COALESCE((
SELECT JSONB_AGG(mapping.catalog_item_id ORDER BY item.title,item.id)
FROM finding_catalog_item_inventory_families mapping
JOIN finding_catalog_items item ON item.id=mapping.catalog_item_id
WHERE mapping.inventory_family_id=family.id
),'[]'::jsonb) AS "findingItemIds"
FROM inventory_families family
LEFT JOIN inventory_family_parent_rules rule ON rule.child_family_id=family.id
LEFT JOIN inventory_families parent ON parent.id=rule.parent_family_id
ORDER BY family.level,family.is_active DESC,
COALESCE(parent.name,''),family.name,family.code
`) as FamilyRow[];
return { data };
}
constructor(private readonly dataSource: DataSource) {}
async findings(familyId: string) {
const family = await this.family(familyId, false);
const [family] = await this.dataSource.query(`
SELECT id,code,name,level,information_labels AS "informationLabels"
FROM inventory_families
WHERE id=$1::uuid AND is_active=true
`, [familyId]) as Array<{
id: string;
code: string;
name: string;
level: string;
informationLabels: string[];
}>;
if (!family) {
throw new NotFoundException({
code: 'INVENTORY_FAMILY_NOT_FOUND',
message: 'La familia técnica no existe',
});
}
const items = await this.dataSource.query(`
SELECT item.id,item.code,item.source_number AS "sourceNumber",item.title,
item.legal_basis AS "legalBasis",item.glossary,item.suggested_severity AS "suggestedSeverity",
@@ -79,221 +36,4 @@ export class InventoryFamilyCatalogService {
`, [familyId]);
return { family, items, count: items.length };
}
async create(
dto: CreateInventoryFamilyDto,
principal: AuthPrincipal,
request: RequestWithContext,
) {
return this.dataSource.transaction(async (manager) => {
const parentId = await this.validateParent(manager,dto.level,dto.parentFamilyId ?? null,null);
const code = `CUSTOM-${dto.level === 'INSTALLATION' ? 'I' : 'S'}-${randomUUID().slice(0,8).toUpperCase()}`;
const [inserted] = (await manager.query(`
INSERT INTO inventory_families(
code,name,level,legacy_type_code,information_labels,source_reference,is_active
) VALUES ($1,$2,$3,NULL,$4::jsonb,'MANUAL:F5',true)
RETURNING id
`,[code,dto.name,dto.level,JSON.stringify(this.cleanLabels(dto.informationLabels ?? []))])) as Array<{id:string}>;
if (!inserted) throw new Error('No se pudo crear la clasificación de Inventario');
if (parentId) {
await manager.query(`
INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
VALUES ($1::uuid,$2::uuid)
`,[inserted.id,parentId]);
}
const created = await this.family(inserted.id,false,manager);
await this.audit.record({
...administrationAuditContext(principal,request),
action: AuditAction.ASSET_UPDATED,
entityType: 'inventory_family',
entityId: inserted.id,
afterData: created as unknown as Record<string,unknown>,
metadata: { operation:'INVENTORY_FAMILY_CREATED', source:'MANUAL:F5' },
},manager);
return created;
});
}
async update(
familyId: string,
dto: UpdateInventoryFamilyDto,
principal: AuthPrincipal,
request: RequestWithContext,
) {
return this.dataSource.transaction(async (manager) => {
const before = await this.family(familyId,false,manager,true);
const nextParentId = dto.parentFamilyId === undefined
? before.parentFamilyId
: dto.parentFamilyId;
const parentId = await this.validateParent(manager,before.level,nextParentId ?? null,familyId);
await manager.query(`
UPDATE inventory_families SET
name=COALESCE($2::varchar,name),
information_labels=COALESCE($3::jsonb,information_labels),
is_active=COALESCE($4::boolean,is_active),
updated_at=CURRENT_TIMESTAMP
WHERE id=$1::uuid
`,[
familyId,
dto.name ?? null,
dto.informationLabels === undefined ? null : JSON.stringify(this.cleanLabels(dto.informationLabels)),
dto.isActive ?? null,
]);
if (before.level==='SUBINSTALLATION') {
await manager.query(`DELETE FROM inventory_family_parent_rules WHERE child_family_id=$1::uuid`,[familyId]);
if (parentId) {
await manager.query(`
INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
VALUES ($1::uuid,$2::uuid)
`,[familyId,parentId]);
}
}
const after = await this.family(familyId,false,manager);
await this.audit.record({
...administrationAuditContext(principal,request),
action: AuditAction.ASSET_UPDATED,
entityType: 'inventory_family',
entityId: familyId,
beforeData: before as unknown as Record<string,unknown>,
afterData: after as unknown as Record<string,unknown>,
metadata: { operation:'INVENTORY_FAMILY_UPDATED' },
},manager);
return after;
});
}
async replaceFindings(
familyId: string,
dto: ReplaceInventoryFamilyFindingsDto,
principal: AuthPrincipal,
request: RequestWithContext,
) {
return this.dataSource.transaction(async (manager) => {
const family = await this.family(familyId,false,manager,true);
const uniqueIds=[...new Set(dto.itemIds)];
if (uniqueIds.length) {
const [count] = (await manager.query(`
SELECT COUNT(*)::integer AS total
FROM finding_catalog_items item
JOIN finding_categories category ON category.id=item.category_id
WHERE item.id=ANY($1::uuid[]) AND item.is_active=true AND category.is_active=true
`,[uniqueIds])) as Array<{total:number}>;
if (Number(count?.total ?? 0)!==uniqueIds.length) {
throw new BadRequestException({
code:'INVENTORY_FAMILY_FINDING_INVALID',
message:'Uno o más Hallazgos elegidos no están activos en el catálogo',
});
}
}
const beforeIds=family.findingItemIds;
await manager.query(`DELETE FROM finding_catalog_item_inventory_families WHERE inventory_family_id=$1::uuid`,[familyId]);
if (uniqueIds.length) {
await manager.query(`
INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
SELECT item_id,$2::uuid FROM UNNEST($1::uuid[]) AS selected(item_id)
ON CONFLICT (catalog_item_id,inventory_family_id) DO NOTHING
`,[uniqueIds,familyId]);
}
const after=await this.family(familyId,false,manager);
await this.audit.record({
...administrationAuditContext(principal,request),
action: AuditAction.ASSET_UPDATED,
entityType:'inventory_family_findings',
entityId:familyId,
beforeData:{ itemIds:beforeIds },
afterData:{ itemIds:after.findingItemIds },
metadata:{ operation:'INVENTORY_FAMILY_FINDINGS_REPLACED', reason:dto.reason },
},manager);
return this.findingsWithManager(manager,familyId);
});
}
private async findingsWithManager(manager:EntityManager,familyId:string) {
const family=await this.family(familyId,false,manager);
const items=await manager.query(`
SELECT item.id,item.code,item.source_number AS "sourceNumber",item.title,
item.legal_basis AS "legalBasis",item.glossary,item.suggested_severity AS "suggestedSeverity",
category.id AS "categoryId",category.code AS "categoryCode",category.name AS "categoryName"
FROM finding_catalog_item_inventory_families mapping
JOIN finding_catalog_items item ON item.id=mapping.catalog_item_id
JOIN finding_categories category ON category.id=item.category_id
WHERE mapping.inventory_family_id=$1::uuid
AND item.is_active=true AND category.is_active=true
ORDER BY category.sort_order,item.source_number,item.title
`,[familyId]);
return {family,items,count:items.length};
}
private async family(
familyId:string,
activeOnly:boolean,
manager:EntityManager=this.dataSource.manager,
lock=false,
):Promise<FamilyRow> {
const rows=(await manager.query(`
SELECT family.id,family.code,family.name,family.level,
family.information_labels AS "informationLabels",
family.source_reference AS "sourceReference",family.is_active AS "isActive",
parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName",
(SELECT COUNT(*)::integer FROM assets asset WHERE asset.inventory_family_id=family.id) AS "assetCount",
(SELECT COUNT(*)::integer FROM finding_catalog_item_inventory_families mapping WHERE mapping.inventory_family_id=family.id) AS "findingCount",
COALESCE((SELECT JSONB_AGG(mapping.catalog_item_id ORDER BY mapping.catalog_item_id)
FROM finding_catalog_item_inventory_families mapping WHERE mapping.inventory_family_id=family.id),'[]'::jsonb) AS "findingItemIds"
FROM inventory_families family
LEFT JOIN inventory_family_parent_rules rule ON rule.child_family_id=family.id
LEFT JOIN inventory_families parent ON parent.id=rule.parent_family_id
WHERE family.id=$1::uuid ${activeOnly ? 'AND family.is_active=true' : ''}
${lock ? 'FOR UPDATE OF family' : ''}
`,[familyId])) as FamilyRow[];
if (!rows[0]) throw new NotFoundException({
code:'INVENTORY_FAMILY_NOT_FOUND',message:'La clasificación de Inventario no existe',
});
return rows[0];
}
private async validateParent(
manager:EntityManager,
level:'INSTALLATION'|'SUBINSTALLATION',
parentFamilyId:string|null,
ownId:string|null,
):Promise<string|null> {
if (level==='INSTALLATION') {
if (parentFamilyId) throw new BadRequestException({
code:'INVENTORY_FAMILY_PARENT_NOT_ALLOWED',
message:'Una clasificación de Instalación no tiene clasificación padre',
});
return null;
}
if (!parentFamilyId) throw new BadRequestException({
code:'INVENTORY_FAMILY_PARENT_REQUIRED',
message:'Una Subinstalación debe pertenecer a un tipo de Instalación',
});
if (parentFamilyId===ownId) throw new BadRequestException({
code:'INVENTORY_FAMILY_PARENT_CYCLE',message:'Una clasificación no puede ser su propio padre',
});
const rows=(await manager.query(`
SELECT id FROM inventory_families
WHERE id=$1::uuid AND level='INSTALLATION' AND is_active=true
LIMIT 1
`,[parentFamilyId])) as Array<{id:string}>;
if (!rows[0]) throw new BadRequestException({
code:'INVENTORY_FAMILY_PARENT_INVALID',
message:'La Subinstalación debe vincularse a una clasificación de Instalación activa',
});
return parentFamilyId;
}
private cleanLabels(labels:string[]):string[] {
const unique=new Map<string,string>();
for (const raw of labels) {
const clean=raw.trim();
if (!clean) continue;
const identity=clean.toLocaleLowerCase('es-AR');
if (!unique.has(identity)) unique.set(identity,clean);
}
if (unique.size>100) throw new ConflictException({
code:'INVENTORY_FAMILY_TOO_MANY_FIELDS',message:'La clasificación admite hasta 100 campos de información',
});
return [...unique.values()];
}
}
@@ -1,69 +0,0 @@
import {
Body,
Controller,
Get,
Param,
ParseUUIDPipe,
Patch,
Post,
Query,
Req,
} from '@nestjs/common';
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 {
ChangeInventoryFunctionDto,
CreateInventoryFunctionDto,
UpdateInventoryFunctionDto,
} from './dto/inventory-function.dto';
import { InventoryFunctionService } from './inventory-function.service';
@Controller()
export class InventoryFunctionController {
constructor(private readonly functions: InventoryFunctionService) {}
@Get('inventory-functions')
@RequirePermissions('assets.read')
list(@Query('includeInactive') includeInactive?: string) {
return this.functions.list(includeInactive === 'true');
}
@Post('inventory-functions')
@RequirePermissions('asset_types.manage')
create(
@Body() dto: CreateInventoryFunctionDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.functions.create(dto, principal, request);
}
@Patch('inventory-functions/:id')
@RequirePermissions('asset_types.manage')
update(
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
@Body() dto: UpdateInventoryFunctionDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.functions.update(id, dto, principal, request);
}
@Get('assets/:id/function-history')
@RequirePermissions('assets.read_history')
history(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
return this.functions.getForAsset(id);
}
@Post('assets/:id/function')
@RequirePermissions('assets.update')
change(
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
@Body() dto: ChangeInventoryFunctionDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.functions.changeForAsset(id, dto, principal, request);
}
}
@@ -1,186 +0,0 @@
import {
BadRequestException,
ConflictException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { DataSource, EntityManager } from 'typeorm';
import { administrationAuditContext } from '../administration/common/administration-audit';
import { AuditService } from '../audit/audit.service';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import { AssetVersionChangeType, AuditAction } from '../database/entities';
import type {
ChangeInventoryFunctionDto,
CreateInventoryFunctionDto,
UpdateInventoryFunctionDto,
} from './dto/inventory-function.dto';
import { AssetHistoryService } from './asset-history.service';
export interface InventoryFunctionRow {
id: string; code: string; name: string; description: string | null;
isActive: boolean; sortOrder: number; createdAt: Date; updatedAt: Date;
}
export interface FunctionAssignmentRow {
id: string; assetId: string; functionId: string; functionCode: string; functionName: string;
validFrom: Date; validUntil: Date | null; reason: string | null;
changedBy: string | null; changedByUsername: string | null; createdAt: Date;
}
interface FunctionEligibleAsset {
id: string; code: string; name: string; typeCode: string; typeName: string;
familyCode: string | null; familyName: string | null;
}
function normalized(value: string | null): string {
return (value ?? '').normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase().replace(/[^a-z0-9]+/g, ' ').trim();
}
@Injectable()
export class InventoryFunctionService {
constructor(
private readonly dataSource: DataSource,
private readonly audit: AuditService,
private readonly history: AssetHistoryService,
) {}
async list(includeInactive = false): Promise<{ data: InventoryFunctionRow[] }> {
const data = await this.dataSource.query(`
SELECT id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",
created_at AS "createdAt",updated_at AS "updatedAt"
FROM inventory_functions
${includeInactive ? '' : 'WHERE is_active=true'}
ORDER BY sort_order,name,code
`) as InventoryFunctionRow[];
return { data };
}
async create(dto: CreateInventoryFunctionDto, principal: AuthPrincipal, request: RequestWithContext): Promise<InventoryFunctionRow> {
return this.dataSource.transaction(async (manager) => {
const [duplicate] = await manager.query('SELECT 1 FROM inventory_functions WHERE lower(code)=lower($1) LIMIT 1', [dto.code]) as unknown[];
if (duplicate) throw new ConflictException({ code: 'INVENTORY_FUNCTION_CODE_EXISTS', message: 'Ya existe una función con ese código' });
const [created] = await manager.query(`
INSERT INTO inventory_functions(code,name,description,is_active,sort_order,created_by,updated_by)
VALUES($1,$2,$3,true,$4,$5,$5)
RETURNING id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",
created_at AS "createdAt",updated_at AS "updatedAt"
`, [dto.code, dto.name, dto.description ?? null, dto.sortOrder ?? 0, principal.userId]) as InventoryFunctionRow[];
await this.audit.record({ ...administrationAuditContext(principal, request), action: AuditAction.INVENTORY_FUNCTION_CREATED,
entityType: 'inventory_function', entityId: created.id, afterData: created as unknown as Record<string, unknown> }, manager);
return created;
});
}
async update(id: string, dto: UpdateInventoryFunctionDto, principal: AuthPrincipal, request: RequestWithContext): Promise<InventoryFunctionRow> {
if (Object.keys(dto).length === 0) throw new BadRequestException({ code: 'NO_CHANGES', message: 'No se recibieron cambios' });
return this.dataSource.transaction(async (manager) => {
const before = await this.requireFunction(manager, id, false);
const [updated] = await manager.query(`
UPDATE inventory_functions SET
name=COALESCE($2,name), description=CASE WHEN $3::boolean THEN $4 ELSE description END,
is_active=COALESCE($5,is_active), sort_order=COALESCE($6,sort_order),
updated_by=$7,updated_at=CURRENT_TIMESTAMP
WHERE id=$1
RETURNING id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",
created_at AS "createdAt",updated_at AS "updatedAt"
`, [id, dto.name ?? null, dto.description !== undefined, dto.description ?? null, dto.isActive ?? null, dto.sortOrder ?? null, principal.userId]) as InventoryFunctionRow[];
await this.audit.record({ ...administrationAuditContext(principal, request), action: AuditAction.INVENTORY_FUNCTION_UPDATED,
entityType: 'inventory_function', entityId: id, beforeData: before as unknown as Record<string, unknown>,
afterData: updated as unknown as Record<string, unknown> }, manager);
return updated;
});
}
async getForAsset(assetId: string) {
return this.dataSource.transaction((manager) => this.getForAssetWithManager(manager, assetId));
}
async changeForAsset(assetId: string, dto: ChangeInventoryFunctionDto, principal: AuthPrincipal, request: RequestWithContext) {
return this.dataSource.transaction(async (manager) => {
const asset = await this.requireEligibleAsset(manager, assetId, true);
const nextFunction = await this.requireFunction(manager, dto.functionId, true);
const effectiveAt = dto.effectiveAt ? new Date(dto.effectiveAt) : new Date();
if (!Number.isFinite(effectiveAt.getTime())) throw new BadRequestException({ code: 'INVENTORY_FUNCTION_EFFECTIVE_DATE_INVALID', message: 'La fecha efectiva del cambio de función no es válida' });
if (effectiveAt.getTime() > Date.now() + 60_000) throw new BadRequestException({ code: 'INVENTORY_FUNCTION_FUTURE_DATE_NOT_ALLOWED', message: 'El cambio de función no puede registrarse con fecha futura' });
const current = await this.currentAssignment(manager, assetId, true);
if (current?.functionId === nextFunction.id) return this.getForAssetWithManager(manager, assetId);
if (current && effectiveAt.getTime() <= new Date(current.validFrom).getTime()) {
throw new ConflictException({ code: 'INVENTORY_FUNCTION_EFFECTIVE_DATE_OVERLAP', message: 'La fecha efectiva debe ser posterior al inicio de la función vigente' });
}
if (current) await manager.query(`UPDATE inventory_function_assignments SET valid_until=$2 WHERE id=$1 AND valid_until IS NULL`, [current.id, effectiveAt]);
await manager.query(`INSERT INTO inventory_function_assignments(asset_id,function_id,valid_from,change_reason,changed_by) VALUES($1,$2,$3,$4,$5)`,
[assetId, nextFunction.id, effectiveAt, dto.reason ?? null, principal.userId]);
await manager.query(`UPDATE assets SET updated_by=$2,updated_at=CURRENT_TIMESTAMP WHERE id=$1`, [assetId, principal.userId]);
const versionNumber = await this.history.capture(manager, assetId, AssetVersionChangeType.FUNCTION_CHANGED, principal, request);
const after = await this.getForAssetWithManager(manager, assetId);
await this.audit.record({
...administrationAuditContext(principal, request), action: AuditAction.ASSET_FUNCTION_CHANGED,
entityType: 'asset', entityId: assetId,
beforeData: current ? { functionId: current.functionId, functionCode: current.functionCode, functionName: current.functionName, validFrom: current.validFrom } : { functionId: null },
afterData: { functionId: nextFunction.id, functionCode: nextFunction.code, functionName: nextFunction.name, effectiveAt, reason: dto.reason ?? null, versionNumber },
metadata: { inventoryCode: asset.code, inventoryName: asset.name, temporal: true, historySource: 'inventory_function_assignments', assetVersionChangeType: AssetVersionChangeType.FUNCTION_CHANGED },
}, manager);
return after;
});
}
private async getForAssetWithManager(manager: EntityManager, assetId: string) {
const asset = await this.requireEligibleAsset(manager, assetId, false);
const currentFunction = await this.currentAssignment(manager, assetId, false);
const history = await manager.query(`
SELECT assignment.id,assignment.asset_id AS "assetId",assignment.function_id AS "functionId",
fn.code AS "functionCode",fn.name AS "functionName",
assignment.valid_from AS "validFrom",assignment.valid_until AS "validUntil",
assignment.change_reason AS reason,assignment.changed_by AS "changedBy",
actor.username AS "changedByUsername",assignment.created_at AS "createdAt"
FROM inventory_function_assignments assignment
JOIN inventory_functions fn ON fn.id=assignment.function_id
LEFT JOIN users actor ON actor.id=assignment.changed_by
WHERE assignment.asset_id=$1
ORDER BY assignment.valid_from DESC,assignment.created_at DESC
`, [assetId]) as FunctionAssignmentRow[];
return { asset: { id: asset.id, code: asset.code, name: asset.name, typeCode: asset.typeCode, typeName: asset.typeName, familyCode: asset.familyCode, familyName: asset.familyName }, currentFunction, history };
}
private async currentAssignment(manager: EntityManager, assetId: string, lock: boolean): Promise<FunctionAssignmentRow | null> {
const [row] = await manager.query(`
SELECT assignment.id,assignment.asset_id AS "assetId",assignment.function_id AS "functionId",
fn.code AS "functionCode",fn.name AS "functionName",
assignment.valid_from AS "validFrom",assignment.valid_until AS "validUntil",
assignment.change_reason AS reason,assignment.changed_by AS "changedBy",
actor.username AS "changedByUsername",assignment.created_at AS "createdAt"
FROM inventory_function_assignments assignment
JOIN inventory_functions fn ON fn.id=assignment.function_id
LEFT JOIN users actor ON actor.id=assignment.changed_by
WHERE assignment.asset_id=$1 AND assignment.valid_until IS NULL
${lock ? 'FOR UPDATE OF assignment' : ''}
`, [assetId]) as FunctionAssignmentRow[];
return row ?? null;
}
private async requireFunction(manager: EntityManager, id: string, active: boolean): Promise<InventoryFunctionRow> {
const [row] = await manager.query(`
SELECT id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",created_at AS "createdAt",updated_at AS "updatedAt"
FROM inventory_functions WHERE id=$1 ${active ? 'AND is_active=true' : ''}
`, [id]) as InventoryFunctionRow[];
if (!row) throw new NotFoundException({ code: 'INVENTORY_FUNCTION_NOT_FOUND', message: active ? 'La función seleccionada no existe o está inactiva' : 'Función no encontrada' });
return row;
}
private async requireEligibleAsset(manager: EntityManager, assetId: string, lock: boolean): Promise<FunctionEligibleAsset> {
const [asset] = await manager.query(`
SELECT asset.id,asset.code,asset.name,asset_type.code AS "typeCode",asset_type.name AS "typeName",
family.code AS "familyCode",family.name AS "familyName"
FROM assets asset JOIN asset_types asset_type ON asset_type.id=asset.asset_type_id
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
WHERE asset.id=$1 ${lock ? 'FOR UPDATE OF asset' : ''}
`, [assetId]) as FunctionEligibleAsset[];
if (!asset) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Inventario no encontrado' });
const values = [asset.typeCode, asset.typeName, asset.familyCode, asset.familyName].map(normalized);
const eligible = values.some((value) => value === 'estacion' || value === 'subestacion' || value.includes('estacion ') || value.includes('subestacion ') || value.endsWith(' estacion') || value.endsWith(' subestacion'));
if (!eligible) throw new ConflictException({ code: 'INVENTORY_FUNCTION_CHANGE_NOT_ALLOWED', message: 'El cambio de función sólo está habilitado para Inventarios de Estación o Subestación' });
return asset;
}
}
@@ -39,22 +39,6 @@ type MergeRow = {
requestId: string | null;
};
type DocumentInvariantRow = {
actId: string;
actStatus: string;
lockedSha256: string | null;
closureSha256: string | null;
sealedAt: Date | null;
actVersion: number;
reportId: string | null;
reportStatus: string | null;
reportActClosureSha256: string | null;
reportFrozenSha256: string | null;
gedoPdfSha256: string | null;
wordSha256: string | null;
reportRevision: number | null;
};
const MERGEABLE_TYPES = new Set(['instalacion', 'subinstalacion']);
@Injectable()
@@ -177,19 +161,6 @@ export class InventoryMergeService {
if (!source || !canonical) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
this.validatePair(source, canonical);
// Empresa is temporal inspection context, not physical ownership. A merge is
// valid when both records resolve to the same Area in the physical hierarchy,
// even if their historical operator snapshots differ.
const [sourceAreaId, canonicalAreaId] = await Promise.all([
this.resolvePhysicalAreaId(manager, source.id),
this.resolvePhysicalAreaId(manager, canonical.id),
]);
if (!sourceAreaId || sourceAreaId !== canonicalAreaId) throw new BadRequestException({
code: 'INVENTORY_MERGE_AREA_MISMATCH',
message: 'Los duplicados deben pertenecer a la misma Área física',
});
const sourceParentCanonical = source.parentId
? await this.resolveCanonicalId(manager, source.parentId)
: null;
@@ -226,8 +197,6 @@ export class InventoryMergeService {
});
}
const affectedAssetIds = [source.id, canonical.id];
const documentInvariantsBefore = await this.documentInvariants(manager, affectedAssetIds);
const [sourceSnapshot, canonicalSnapshot] = await Promise.all([
this.snapshot(manager, source.id),
this.snapshot(manager, canonical.id),
@@ -310,17 +279,6 @@ export class InventoryMergeService {
request,
);
// No historical Acta/Finding/Informe foreign key is rewritten by a merge.
// Verify that legal/documentary fingerprints are byte-for-byte unchanged
// before committing the transaction; otherwise rollback the entire merge.
const documentInvariantsAfter = await this.documentInvariants(manager, affectedAssetIds);
if (JSON.stringify(documentInvariantsBefore) !== JSON.stringify(documentInvariantsAfter)) {
throw new ConflictException({
code: 'INVENTORY_MERGE_DOCUMENT_INVARIANT_BROKEN',
message: 'La fusión intentó alterar la huella documental histórica y fue revertida',
});
}
const result = {
merge: mergeRecord,
source: { id: source.id, code: source.code, name: source.name },
@@ -328,7 +286,6 @@ export class InventoryMergeService {
sourceVersionNumber,
reparentedChildIds,
historyPolicy: 'HISTORICAL_REFERENCES_PRESERVED',
documentaryInvariantsVerified: true,
};
await this.audit.record({
...administrationAuditContext(principal, request),
@@ -341,12 +298,10 @@ export class InventoryMergeService {
operation: 'CHRONOLOGICAL_MERGE',
sourceAssetId: source.id,
canonicalAssetId: canonical.id,
physicalAreaId: sourceAreaId,
reason: dto.reason,
sourceVersionNumber,
reparentedChildIds,
historicalReferencesRewritten: false,
documentaryInvariantsVerified: true,
},
}, manager);
return result;
@@ -367,59 +322,14 @@ export class InventoryMergeService {
code: 'INVENTORY_MERGE_CANONICAL_INACTIVE',
message: 'El registro canónico no puede estar inactivo',
});
}
private async resolvePhysicalAreaId(manager: EntityManager, assetId: string): Promise<string | null> {
const rows = (await manager.query(`
WITH RECURSIVE lineage AS (
SELECT asset.id,asset.parent_id,asset.asset_type_id,0 AS depth
FROM assets asset WHERE asset.id=$1::uuid
UNION ALL
SELECT parent.id,parent.parent_id,parent.asset_type_id,lineage.depth+1
FROM assets parent
JOIN lineage ON lineage.parent_id=parent.id
WHERE lineage.depth<32
)
SELECT lineage.id
FROM lineage
JOIN asset_types type ON type.id=lineage.asset_type_id
WHERE type.operational_role='AREA'
ORDER BY lineage.depth
LIMIT 1
`, [assetId])) as Array<{ id: string }>;
return rows[0]?.id ?? null;
}
private async documentInvariants(manager: EntityManager, assetIds: string[]): Promise<DocumentInvariantRow[]> {
return (await manager.query(`
WITH affected_acts AS (
SELECT DISTINCT act.id
FROM inspection_acts act
LEFT JOIN inspection_act_assets act_asset
ON act_asset.act_id=act.id AND act_asset.included=true
LEFT JOIN inspection_findings finding ON finding.act_id=act.id
WHERE act_asset.asset_id=ANY($1::uuid[])
OR finding.asset_id=ANY($1::uuid[])
)
SELECT
act.id AS "actId",
act.status AS "actStatus",
act.locked_sha256 AS "lockedSha256",
act.closure_sha256 AS "closureSha256",
act.sealed_at AS "sealedAt",
act.current_version AS "actVersion",
report.id AS "reportId",
report.status AS "reportStatus",
report.act_closure_sha256 AS "reportActClosureSha256",
report.frozen_sha256 AS "reportFrozenSha256",
report.gedo_pdf_sha256 AS "gedoPdfSha256",
report.word_sha256 AS "wordSha256",
report.current_revision_number AS "reportRevision"
FROM affected_acts affected
JOIN inspection_acts act ON act.id=affected.id
LEFT JOIN inspection_reports report ON report.act_id=act.id
ORDER BY act.id,report.id NULLS FIRST
`, [assetIds])) as DocumentInvariantRow[];
if (!source.operationalAreaId || !source.operatorCompanyId
|| source.operationalAreaId !== canonical.operationalAreaId
|| source.operatorCompanyId !== canonical.operatorCompanyId) {
throw new BadRequestException({
code: 'INVENTORY_MERGE_CONTEXT_MISMATCH',
message: 'Los registros deben pertenecer a la misma Área y Operadora',
});
}
}
private async loadAsset(manager: EntityManager, id: string, lock: boolean): Promise<MergeableAssetRow> {
@@ -36,17 +36,18 @@ type ParentRow = {
code: string;
name: string;
typeCode: string;
operationalAreaId: string | null;
operatorCompanyId: string | null;
inventoryFamilyId: string | null;
};
const TYPE_CODE_BY_KIND: Record<Exclude<InventoryStructureKind, 'EMPRESA'>, string> = {
const TYPE_CODE_BY_KIND: Record<InventoryStructureKind, string> = {
AREA: 'area',
YACIMIENTO: 'yacimiento',
INSTALACION: 'instalacion',
SUBINSTALACION: 'subinstalacion',
};
const PARENT_TYPE_BY_KIND: Record<InventoryStructureKind, string | null> = {
EMPRESA: null,
AREA: null,
YACIMIENTO: 'area',
INSTALACION: 'yacimiento',
@@ -69,29 +70,18 @@ export class InventoryStructureService {
const types = (await this.dataSource.query(`
SELECT id,code,name
FROM asset_types
WHERE (
lower(code) IN ('area','yacimiento','instalacion','subinstalacion')
OR operational_role='COMPANY'
) AND is_active=true
ORDER BY CASE
WHEN operational_role='COMPANY' THEN 0
WHEN lower(code)='area' THEN 1
WHEN lower(code)='yacimiento' THEN 2
WHEN lower(code)='instalacion' THEN 3
WHEN lower(code)='subinstalacion' THEN 4 ELSE 9 END
WHERE lower(code) IN ('area','yacimiento','instalacion','subinstalacion')
AND is_active=true
ORDER BY CASE lower(code)
WHEN 'area' THEN 1 WHEN 'yacimiento' THEN 2
WHEN 'instalacion' THEN 3 WHEN 'subinstalacion' THEN 4 ELSE 9 END
`)) as StructureTypeRow[];
const company = types.find((item) => ['empresa','organizacion'].includes(item.code.toLowerCase()));
const area = types.find((item) => item.code.toLowerCase()==='area');
const yacimiento = types.find((item) => item.code.toLowerCase()==='yacimiento');
const instalacion = types.find((item) => item.code.toLowerCase()==='instalacion');
const subinstalacion = types.find((item) => item.code.toLowerCase()==='subinstalacion');
if (!company || !area || !yacimiento || !instalacion || !subinstalacion) {
if (types.length !== 4) {
throw new ConflictException({
code: 'INVENTORY_STRUCTURE_TYPES_INCOMPLETE',
message: 'La configuración maestra de Empresa e Inventario todavía no está completa',
message: 'La estructura del Inventario todavía no está completamente configurada',
});
}
const families = (await this.dataSource.query(`
SELECT family.id,family.code,family.name,family.level,
family.legacy_type_code AS "legacyTypeCode",
@@ -103,16 +93,12 @@ export class InventoryStructureService {
WHERE family.is_active=true
ORDER BY family.level,family.name,family.code
`)) as FamilyRow[];
return {
independentMasters: [
{ kind: 'EMPRESA', label: 'Empresa', type: company, parentKind: null, requiresFamily: false },
],
levels: [
{ kind: 'AREA', label: 'Área', type: area, parentKind: null, requiresFamily: false },
{ kind: 'YACIMIENTO', label: 'Yacimiento', type: yacimiento, parentKind: 'AREA', requiresFamily: false },
{ kind: 'INSTALACION', label: 'Instalación', type: instalacion, parentKind: 'YACIMIENTO', requiresFamily: true },
{ kind: 'SUBINSTALACION', label: 'Subinstalación', type: subinstalacion, parentKind: 'INSTALACION', requiresFamily: true },
{ kind: 'AREA', label: 'Área', type: types.find((item) => item.code.toLowerCase()==='area'), parentKind: null, requiresFamily: false },
{ kind: 'YACIMIENTO', label: 'Yacimiento', type: types.find((item) => item.code.toLowerCase()==='yacimiento'), parentKind: 'AREA', requiresFamily: false },
{ kind: 'INSTALACION', label: 'Instalación', type: types.find((item) => item.code.toLowerCase()==='instalacion'), parentKind: 'YACIMIENTO', requiresFamily: true },
{ kind: 'SUBINSTALACION', label: 'Subinstalación', type: types.find((item) => item.code.toLowerCase()==='subinstalacion'), parentKind: 'INSTALACION', requiresFamily: true },
],
installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
@@ -121,7 +107,7 @@ export class InventoryStructureService {
async parents(kindValue: string, search?: string) {
const kind = kindValue.toUpperCase() as InventoryStructureKind;
if (!(kind in PARENT_TYPE_BY_KIND) || kind === 'AREA' || kind === 'EMPRESA') {
if (!(kind in PARENT_TYPE_BY_KIND) || kind === 'AREA') {
throw new BadRequestException({
code: 'INVENTORY_STRUCTURE_PARENT_KIND_INVALID',
message: 'El nivel indicado no requiere un registro padre',
@@ -168,8 +154,9 @@ export class InventoryStructureService {
const type = await this.requireStructureType(manager, dto.kind);
const parent = await this.requireParent(manager, dto.kind, dto.parentId ?? null);
const family = await this.requireFamily(manager, dto.kind, dto.familyId ?? null, parent);
const generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
const operationalAreaId = parent ? await this.resolveAreaId(manager, parent) : null;
const code = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
const operationalAreaId = parent?.operationalAreaId ?? null;
const operatorCompanyId = parent?.operatorCompanyId ?? null;
const inserted = (await manager.query(`
INSERT INTO assets (
@@ -177,37 +164,30 @@ export class InventoryStructureService {
code,name,common_name,description,information_status,operational_status,
data_origin,source_name,source_reference,source_notes,created_by,updated_by,provenance_updated_by
) VALUES (
$1::uuid,$2::uuid,$3::uuid,NULL,$4::uuid,
$5::varchar,$6::varchar,$7::varchar,$8::text,$9::asset_information_status,$10::asset_operational_status,
$11::varchar,$12::varchar,$13::varchar,$14::text,$15::uuid,$15::uuid,$15::uuid
$1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,
$6::varchar,$7::varchar,$8::varchar,$9::text,$10::asset_information_status,$11::asset_operational_status,
$12::varchar,$13::varchar,$14::varchar,$15::text,$16::uuid,$16::uuid,$16::uuid
) RETURNING id
`, [
type.id,
parent?.id ?? null,
operationalAreaId,
operatorCompanyId,
family?.id ?? null,
generatedCode,
code,
dto.name,
dto.commonName ?? null,
dto.description ?? null,
AssetInformationStatus.DRAFT,
AssetOperationalStatus.UNKNOWN,
AssetDataOrigin.MANUAL,
dto.kind === 'EMPRESA' ? 'Maestro de Empresas F5' : 'Estructura de Inventario F5',
dto.kind === 'EMPRESA' ? 'inventory-master:empresa' : `inventory-structure:${dto.kind.toLowerCase()}`,
'Inventario estructural F3.1',
`inventory-structure:${dto.kind.toLowerCase()}`,
family ? `Familia técnica: ${family.code} · ${family.name}` : null,
principal.userId,
])) as Array<{ id: string }>;
const id = inserted[0]?.id;
if (!id) throw new Error('No se pudo crear el registro');
if (dto.kind === 'EMPRESA') {
await manager.query(`
INSERT INTO organization_profiles(asset_id,organization_kind,legal_name,updated_by)
VALUES ($1::uuid,'COMPANY',$2,$3::uuid)
ON CONFLICT (asset_id) DO UPDATE SET legal_name=EXCLUDED.legal_name,updated_by=EXCLUDED.updated_by,updated_at=CURRENT_TIMESTAMP
`,[id,dto.name,principal.userId]);
}
if (!id) throw new Error('No se pudo crear el registro estructural');
const versionNumber = await this.history.capture(
manager,
@@ -220,12 +200,13 @@ export class InventoryStructureService {
INSERT INTO asset_context_history (
asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
change_reason,asset_version_number,source,request_id,created_by
) VALUES ($1,$2,$3,NULL,CURRENT_TIMESTAMP,$4,$5,'WEB',$6,$7)
) VALUES ($1,$2,$3,$4,CURRENT_TIMESTAMP,$5,$6,'WEB',$7,$8)
`, [
id,
parent?.id ?? null,
operationalAreaId,
dto.kind === 'EMPRESA' ? 'Alta guiada de Empresa independiente F5' : 'Alta guiada de estructura de Inventario F5',
operatorCompanyId,
'Alta guiada de Inventario estructural F3.1',
versionNumber,
request.requestId,
principal.userId,
@@ -242,7 +223,6 @@ export class InventoryStructureService {
inventoryStructureKind: dto.kind,
inventoryFamilyId: family?.id ?? null,
inventoryFamilyCode: family?.code ?? null,
operatorOwnership: false,
},
}, manager);
return created;
@@ -251,7 +231,7 @@ export class InventoryStructureService {
if (isUniqueViolation(error)) {
throw new ConflictException({
code: 'ASSET_CODE_ALREADY_EXISTS',
message: 'Ya existe un registro con ese código',
message: 'Ya existe un registro de Inventario con ese código',
});
}
throw error;
@@ -259,11 +239,10 @@ export class InventoryStructureService {
}
private async requireStructureType(manager: EntityManager, kind: InventoryStructureKind): Promise<StructureTypeRow> {
const sql = kind === 'EMPRESA'
? `SELECT id,code,name FROM asset_types WHERE operational_role='COMPANY' AND is_active=true ORDER BY (lower(code)='empresa') DESC,created_at LIMIT 1`
: `SELECT id,code,name FROM asset_types WHERE lower(code)=lower($1::text) AND is_active=true LIMIT 1`;
const params = kind === 'EMPRESA' ? [] : [TYPE_CODE_BY_KIND[kind as Exclude<InventoryStructureKind,'EMPRESA'>]];
const rows = (await manager.query(sql,params)) as StructureTypeRow[];
const rows = (await manager.query(`
SELECT id,code,name FROM asset_types
WHERE lower(code)=lower($1::text) AND is_active=true LIMIT 1
`, [TYPE_CODE_BY_KIND[kind]])) as StructureTypeRow[];
if (!rows[0]) {
throw new ConflictException({
code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED',
@@ -282,10 +261,8 @@ export class InventoryStructureService {
if (!expectedType) {
if (parentId) {
throw new BadRequestException({
code: 'INVENTORY_ROOT_MUST_NOT_HAVE_PARENT',
message: kind === 'EMPRESA'
? 'Una Empresa es un maestro independiente y no puede tener padre'
: 'Un Área es un registro raíz y no puede tener padre',
code: 'INVENTORY_AREA_MUST_BE_ROOT',
message: 'Un Área se crea como registro raíz y no puede tener padre',
});
}
return null;
@@ -298,6 +275,8 @@ export class InventoryStructureService {
}
const rows = (await manager.query(`
SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
asset.operational_area_id AS "operationalAreaId",
asset.operator_company_id AS "operatorCompanyId",
asset.inventory_family_id AS "inventoryFamilyId"
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
@@ -315,30 +294,6 @@ export class InventoryStructureService {
return parent;
}
private async resolveAreaId(manager: EntityManager,parent: ParentRow):Promise<string> {
if (parent.typeCode.toLowerCase()==='area') return parent.id;
const rows = (await manager.query(`
WITH RECURSIVE lineage AS (
SELECT asset.id,asset.parent_id,asset.asset_type_id FROM assets asset WHERE asset.id=$1::uuid
UNION ALL
SELECT parent.id,parent.parent_id,parent.asset_type_id
FROM assets parent JOIN lineage child ON child.parent_id=parent.id
)
SELECT lineage.id
FROM lineage JOIN asset_types type ON type.id=lineage.asset_type_id
WHERE type.operational_role='AREA'
LIMIT 1
`,[parent.id])) as IdRow[];
const areaId=rows[0]?.id;
if (!areaId) {
throw new ConflictException({
code:'INVENTORY_STRUCTURE_AREA_ANCESTOR_MISSING',
message:'La ubicación seleccionada no pertenece a un Área válida',
});
}
return areaId;
}
private async requireFamily(
manager: EntityManager,
kind: InventoryStructureKind,
@@ -349,7 +304,7 @@ export class InventoryStructureService {
if (!expectedLevel) {
if (familyId) throw new BadRequestException({
code: 'INVENTORY_STRUCTURE_FAMILY_NOT_ALLOWED',
message: 'Empresa, Área y Yacimiento no llevan familia técnica',
message: 'Área y Yacimiento no llevan familia técnica',
});
return null;
}
@@ -384,7 +339,7 @@ export class InventoryStructureService {
}
private generatedCode(kind: InventoryStructureKind, name: string): string {
const prefix = kind === 'EMPRESA' ? 'EMP' : kind === 'YACIMIENTO' ? 'YAC' : kind === 'INSTALACION' ? 'INST' : kind === 'SUBINSTALACION' ? 'SUB' : 'AREA';
const prefix = kind === 'YACIMIENTO' ? 'YAC' : kind === 'INSTALACION' ? 'INST' : kind === 'SUBINSTALACION' ? 'SUB' : 'AREA';
const readable = name
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
@@ -401,7 +356,6 @@ export class InventoryStructureService {
asset.information_status AS "informationStatus",asset.operational_status AS "operationalStatus",
JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) END AS parent,
CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name) END AS "operationalArea",
CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id',family.id,'code',family.code,'name',family.name,'level',family.level,
'informationLabels',family.information_labels
@@ -410,12 +364,9 @@ export class InventoryStructureService {
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
LEFT JOIN assets parent ON parent.id=asset.parent_id
LEFT JOIN assets area ON area.id=asset.operational_area_id
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
WHERE asset.id=$1::uuid
`, [id]);
return rows[0];
}
}
type IdRow = { id: string };
@@ -1,6 +1,5 @@
import { Injectable } from '@nestjs/common';
import { AssetsService } from './assets.service';
import { InventoryFunctionService } from './inventory-function.service';
import { InventoryMergeService } from './inventory-merge.service';
type LooseRecord = Record<string, any>;
@@ -30,7 +29,6 @@ export class MergedInventoryDossierService {
constructor(
private readonly assets: AssetsService,
private readonly merges: InventoryMergeService,
private readonly functions: InventoryFunctionService,
) {}
async dossier(requestedAssetId: string): Promise<Record<string, unknown>> {
@@ -46,8 +44,7 @@ export class MergedInventoryDossierService {
const dossiers = await Promise.all(inventoryIds.map(async (assetId) => {
const dossier = await this.assets.dossier(assetId) as LooseRecord;
const identity = dossier.asset as LooseRecord;
const functionDossier = await this.functions.getForAsset(assetId).catch(() => null) as LooseRecord | null;
return { assetId, identity, dossier, functionDossier };
return { assetId, identity, dossier };
}));
const enrich = (entry: LooseRecord, identity: LooseRecord): LooseRecord => ({
@@ -78,15 +75,6 @@ export class MergedInventoryDossierService {
const media = sortDesc(collect('media'), ['capturedAt', 'createdAt']);
const versions = sortDesc(collect('versions'), ['occurredAt']);
const functionHistory = sortDesc(
dossiers.flatMap(({ identity, functionDossier }) =>
(((functionDossier?.history ?? []) as LooseRecord[]).map((entry) => enrich(entry, identity))),
),
['validFrom', 'createdAt'],
);
const canonicalFunctionDossier = dossiers.find((item) => item.assetId === canonical.id)?.functionDossier ?? null;
const currentFunction = canonicalFunctionDossier?.currentFunction ?? null;
const timelineSource: LooseRecord[] = dossiers.flatMap(({ identity, dossier }) =>
((dossier.timeline ?? []) as LooseRecord[]).map((event): LooseRecord => ({
...event,
@@ -103,25 +91,6 @@ export class MergedInventoryDossierService {
);
const timeline: LooseRecord[] = dedupeById<LooseRecord>(timelineSource);
for (const assignment of functionHistory) {
timeline.push({
id: `function:${String(assignment.id)}`,
kind: 'FUNCTION_CHANGED',
occurredAt: assignment.validFrom,
title: `Cambio de función · ${String(assignment.functionName)}`,
description: assignment.reason ?? null,
meta: {
functionId: assignment.functionId,
functionCode: assignment.functionCode,
functionName: assignment.functionName,
validFrom: assignment.validFrom,
validUntil: assignment.validUntil,
changedByUsername: assignment.changedByUsername,
historicalInventory: assignment.historicalInventory,
},
});
}
for (const alias of aliases) {
timeline.push({
id: `merge:${String(alias.id)}:${String(alias.mergedAt)}`,
@@ -152,7 +121,6 @@ export class MergedInventoryDossierService {
code: canonical.code,
name: canonical.name,
commonName: dossiers.find((item) => item.assetId === canonical.id)?.identity?.commonName ?? null,
currentFunction,
},
requestedAsset: {
id: requested.id,
@@ -178,10 +146,7 @@ export class MergedInventoryDossierService {
documents: documents.length + media.filter((item) => item.kind === 'DOCUMENT').length,
photos: evidence.filter((item) => item.kind === 'PHOTO').length + media.filter((item) => item.kind === 'PHOTO').length,
reports: reports.length + inspectionReports.length,
functionChanges: functionHistory.length,
},
currentFunction,
functionHistory,
visits,
acts,
findings,
+51 -104
View File
@@ -1,7 +1,7 @@
import { Injectable } from '@nestjs/common';
import { DataSource } from 'typeorm';
export interface DashboardInspectorActivityItem {
export interface DashboardAuditItem {
id: string;
occurredAt: Date;
actorUsername: string | null;
@@ -19,13 +19,12 @@ interface DashboardCountsRow {
inactiveUsers: number | string;
activeSessions: number | string;
openFindings: number | string;
actsInFollowUp: number | string;
findingsWithoutControlDate: number | string;
awaitingCompanyResponse: number | string;
overdueCompanyResponses: number | string;
companyResponsesDueNext7Days: number | string;
awaitingVerificationSchedule: number | string;
overdueControls: number | string;
controlsNext30Days: number | string;
reportsWorking: number | string;
reportsOfficialized: number | string;
sealedActsWithoutReport: number | string;
}
export interface DashboardUpcomingControl {
@@ -50,14 +49,9 @@ export class DashboardService {
return this.dataSource.transaction('REPEATABLE READ', async (manager) => {
const [counts] = (await manager.query(`
SELECT
(SELECT COUNT(*) FROM assets WHERE is_inventory_instance=true AND information_status <> 'INACTIVE') AS "totalAssets",
(SELECT COUNT(*) FROM assets WHERE is_inventory_instance=true AND information_status NOT IN ('VALIDATED','INACTIVE')) AS "assetsNeedValidation",
(
SELECT COUNT(*) FROM assets asset
WHERE asset.is_inventory_instance=true
AND asset.information_status <> 'INACTIVE'
AND NOT EXISTS (SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id=asset.id)
) AS "assetsWithoutGeometry",
(SELECT COUNT(*) FROM assets WHERE information_status <> 'INACTIVE') AS "totalAssets",
(SELECT COUNT(*) FROM assets WHERE information_status NOT IN ('VALIDATED','INACTIVE')) AS "assetsNeedValidation",
(SELECT COUNT(*) FROM assets asset WHERE asset.information_status <> 'INACTIVE' AND NOT EXISTS (SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id=asset.id)) AS "assetsWithoutGeometry",
(SELECT COUNT(*) FROM inspection_visits WHERE status='PLANNED') AS "plannedInspections",
(SELECT COUNT(*) FROM users WHERE status = 'ACTIVE') AS "activeUsers",
(SELECT COUNT(*) FROM users WHERE status = 'INACTIVE') AS "inactiveUsers",
@@ -67,74 +61,50 @@ export class DashboardService {
WHERE revoked_at IS NULL
AND expires_at > CURRENT_TIMESTAMP
) AS "activeSessions",
(SELECT COUNT(*) FROM inspection_findings WHERE status = 'OPEN') AS "openFindings",
(
SELECT COUNT(*)
FROM inspection_acts act
WHERE act.status IN ('SEALED','CLOSED','RECTIFIED')
AND NOT (
EXISTS (
SELECT 1 FROM inspection_findings finding
WHERE finding.act_id=act.id AND finding.status<>'VOIDED'
)
AND NOT EXISTS (
SELECT 1 FROM inspection_findings finding
WHERE finding.act_id=act.id AND finding.status='OPEN'
)
)
) AS "actsInFollowUp",
SELECT COUNT(*) FROM inspection_findings WHERE status = 'OPEN'
) AS "openFindings",
(
SELECT COUNT(*)
FROM inspection_findings finding
WHERE finding.status = 'OPEN'
AND finding.next_control_on IS NULL
AND COALESCE((
SELECT verification.outcome
FROM inspection_finding_verification_visits verification
WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
LIMIT 1
), '') <> 'RESOLVED'
) AS "findingsWithoutControlDate",
SELECT COUNT(*) FROM inspection_findings
WHERE status = 'OPEN' AND company_response_received_on IS NULL
) AS "awaitingCompanyResponse",
(
SELECT COUNT(*)
FROM inspection_findings finding
WHERE finding.status = 'OPEN'
AND finding.next_control_on < (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
AND COALESCE((
SELECT verification.outcome
FROM inspection_finding_verification_visits verification
WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
LIMIT 1
), '') <> 'RESOLVED'
SELECT COUNT(*) FROM inspection_findings
WHERE status = 'OPEN'
AND company_response_received_on IS NULL
AND correction_due_on IS NOT NULL
AND correction_due_on < (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
) AS "overdueCompanyResponses",
(
SELECT COUNT(*) FROM inspection_findings
WHERE status = 'OPEN'
AND company_response_received_on IS NULL
AND correction_due_on BETWEEN
(CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
AND (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date + 7
) AS "companyResponsesDueNext7Days",
(
SELECT COUNT(*) FROM inspection_findings
WHERE status = 'OPEN'
AND company_response_received_on IS NOT NULL
AND next_control_on IS NULL
) AS "awaitingVerificationSchedule",
(
SELECT COUNT(*) FROM inspection_findings
WHERE status = 'OPEN'
AND company_response_received_on IS NOT NULL
AND next_control_on < (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
) AS "overdueControls",
(
SELECT COUNT(*)
FROM inspection_findings finding
WHERE finding.status = 'OPEN'
AND finding.next_control_on BETWEEN
SELECT COUNT(*) FROM inspection_findings
WHERE status = 'OPEN'
AND next_control_on BETWEEN
(CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
AND (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date + 30
AND COALESCE((
SELECT verification.outcome
FROM inspection_finding_verification_visits verification
WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
LIMIT 1
), '') <> 'RESOLVED'
) AS "controlsNext30Days",
(SELECT COUNT(*) FROM inspection_reports WHERE status='WORKING') AS "reportsWorking",
(SELECT COUNT(*) FROM inspection_reports WHERE status='OFFICIALIZED') AS "reportsOfficialized",
(
SELECT COUNT(*)
FROM inspection_acts act
WHERE act.status='SEALED'
AND NOT EXISTS (SELECT 1 FROM inspection_reports report WHERE report.act_id=act.id)
) AS "sealedActsWithoutReport"
) AS "controlsNext30Days"
`)) as DashboardCountsRow[];
const recentInspectorActivity = (await manager.query(`
const recentAudit = (await manager.query(`
SELECT
event.id,
event.occurred_at AS "occurredAt",
@@ -143,25 +113,9 @@ export class DashboardService {
event.entity_type AS "entityType",
event.entity_id AS "entityId"
FROM audit_events event
WHERE event.actor_user_id IS NOT NULL
AND (
EXISTS (
SELECT 1 FROM inspection_visit_members member
WHERE member.user_id=event.actor_user_id AND member.included=true
)
OR EXISTS (
SELECT 1 FROM inspection_visits visit
WHERE visit.lead_inspector_user_id=event.actor_user_id
)
)
AND (
event.action LIKE 'INSPECTION_%'
OR event.action LIKE 'ASSET_%'
OR event.action LIKE 'FINDING_%'
)
ORDER BY event.occurred_at DESC, event.id DESC
LIMIT 8
`)) as DashboardInspectorActivityItem[];
LIMIT 6
`)) as DashboardAuditItem[];
const upcomingControls = (await manager.query(`
SELECT
@@ -181,14 +135,8 @@ export class DashboardService {
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
INNER JOIN assets asset ON asset.id = finding.asset_id
WHERE finding.status = 'OPEN'
AND finding.company_response_received_on IS NOT NULL
AND finding.next_control_on IS NOT NULL
AND COALESCE((
SELECT verification.outcome
FROM inspection_finding_verification_visits verification
WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
LIMIT 1
), '') <> 'RESOLVED'
ORDER BY finding.next_control_on, finding.code
LIMIT 8
`)) as DashboardUpcomingControl[];
@@ -203,15 +151,14 @@ export class DashboardService {
inactiveUsers: Number(counts?.inactiveUsers ?? 0),
activeSessions: Number(counts?.activeSessions ?? 0),
openFindings: Number(counts?.openFindings ?? 0),
actsInFollowUp: Number(counts?.actsInFollowUp ?? 0),
findingsWithoutControlDate: Number(counts?.findingsWithoutControlDate ?? 0),
awaitingCompanyResponse: Number(counts?.awaitingCompanyResponse ?? 0),
overdueCompanyResponses: Number(counts?.overdueCompanyResponses ?? 0),
companyResponsesDueNext7Days: Number(counts?.companyResponsesDueNext7Days ?? 0),
awaitingVerificationSchedule: Number(counts?.awaitingVerificationSchedule ?? 0),
overdueControls: Number(counts?.overdueControls ?? 0),
controlsNext30Days: Number(counts?.controlsNext30Days ?? 0),
reportsWorking: Number(counts?.reportsWorking ?? 0),
reportsOfficialized: Number(counts?.reportsOfficialized ?? 0),
sealedActsWithoutReport: Number(counts?.sealedActsWithoutReport ?? 0),
},
recentInspectorActivity,
recentAudit,
upcomingControls,
generatedAt: new Date().toISOString(),
};
@@ -5,7 +5,6 @@ export enum AssetVersionChangeType {
CREATED = 'CREATED',
UPDATED = 'UPDATED',
CONTEXT_CHANGED = 'CONTEXT_CHANGED',
FUNCTION_CHANGED = 'FUNCTION_CHANGED',
STATUS_CHANGED = 'STATUS_CHANGED',
OPERATIONAL_STATUS_CHANGED = 'OPERATIONAL_STATUS_CHANGED',
REGISTRY_UPDATED = 'REGISTRY_UPDATED',
@@ -57,9 +57,6 @@ export class Asset extends TimestampedEntity {
@Column({ name: 'inventory_family_id', type: 'uuid', nullable: true })
inventoryFamilyId!: string | null;
@Column({ name: 'is_inventory_instance', type: 'boolean', default: false })
isInventoryInstance!: boolean;
@Column({ type: 'varchar', length: 120 })
code!: string;
@@ -35,9 +35,6 @@ export enum AuditAction {
ASSET_FIELD_DISCOVERY_REJECTED = 'ASSET_FIELD_DISCOVERY_REJECTED',
ASSET_UPDATED = 'ASSET_UPDATED',
ASSET_CONTEXT_CHANGED = 'ASSET_CONTEXT_CHANGED',
ASSET_FUNCTION_CHANGED = 'ASSET_FUNCTION_CHANGED',
INVENTORY_FUNCTION_CREATED = 'INVENTORY_FUNCTION_CREATED',
INVENTORY_FUNCTION_UPDATED = 'INVENTORY_FUNCTION_UPDATED',
ASSET_INFORMATION_STATUS_CHANGED = 'ASSET_INFORMATION_STATUS_CHANGED',
ASSET_OPERATIONAL_STATUS_CHANGED = 'ASSET_OPERATIONAL_STATUS_CHANGED',
ASSET_REGISTRY_UPDATED = 'ASSET_REGISTRY_UPDATED',
@@ -85,24 +82,15 @@ export enum AuditAction {
INSPECTION_ACT_UPDATED = 'INSPECTION_ACT_UPDATED',
INSPECTION_ACT_CANCELLED = 'INSPECTION_ACT_CANCELLED',
INSPECTION_ACT_RESPONSIBLE_UPDATED = 'INSPECTION_ACT_RESPONSIBLE_UPDATED',
INSPECTION_ACT_LOCKED = 'INSPECTION_ACT_LOCKED',
INSPECTION_ACT_SEALED = 'INSPECTION_ACT_SEALED',
INSPECTION_ACT_READY = 'INSPECTION_ACT_READY',
INSPECTION_ACT_REOPENED = 'INSPECTION_ACT_REOPENED',
INSPECTION_ACT_SIGNATURE_RECORDED = 'INSPECTION_ACT_SIGNATURE_RECORDED',
INSPECTION_ACT_COMPANY_OUTCOME_RECORDED = 'INSPECTION_ACT_COMPANY_OUTCOME_RECORDED',
INSPECTION_ACT_CLOSED = 'INSPECTION_ACT_CLOSED',
INSPECTION_REPORT_GENERATED = 'INSPECTION_REPORT_GENERATED',
INSPECTION_REPORT_UPDATED = 'INSPECTION_REPORT_UPDATED',
INSPECTION_REPORT_REVISION_ADDED = 'INSPECTION_REPORT_REVISION_ADDED',
INSPECTION_REPORT_OFFICIALIZED = 'INSPECTION_REPORT_OFFICIALIZED',
INSPECTION_REPORT_FOLLOW_UP_ADDED = 'INSPECTION_REPORT_FOLLOW_UP_ADDED',
INSPECTION_REPORT_APPROVED = 'INSPECTION_REPORT_APPROVED',
INSPECTION_REPORT_SIGNED = 'INSPECTION_REPORT_SIGNED',
INSPECTION_DEADLINE_POLICY_UPDATED = 'INSPECTION_DEADLINE_POLICY_UPDATED',
INSPECTION_BUSINESS_CALENDAR_UPDATED = 'INSPECTION_BUSINESS_CALENDAR_UPDATED',
SMTP_SETTINGS_UPDATED = 'SMTP_SETTINGS_UPDATED',
SMTP_TEST_SENT = 'SMTP_TEST_SENT',
DOCUMENT_DELIVERY_SETTINGS_UPDATED = 'DOCUMENT_DELIVERY_SETTINGS_UPDATED',
DOCUMENT_DELIVERY_RETRY_REQUESTED = 'DOCUMENT_DELIVERY_RETRY_REQUESTED',
DOCUMENT_DELIVERY_SENT = 'DOCUMENT_DELIVERY_SENT',
+27 -95
View File
@@ -25,38 +25,17 @@ export { InspectionVisit, InspectionVisitStatus } from './inspection-visit.entit
export { InspectionVisitAsset, InspectionVisitAssetPlanningSource } from './inspection-visit-asset.entity';
export { InspectionVisitMember } from './inspection-visit-member.entity';
export { DocumentAnnualSequence, DocumentSequenceType } from './document-annual-sequence.entity';
export {
InspectionAct,
InspectionActStatus,
InspectionActUrgency,
InspectionDeadlineBasis,
InspectionDeadlineDayType,
} from './inspection-act.entity';
export { InspectionAct, InspectionActStatus, InspectionActUrgency, InspectionDeadlineBasis, InspectionDeadlineDayType } from './inspection-act.entity';
export { InspectionActAsset } from './inspection-act-asset.entity';
export {
InspectionReport,
InspectionReportPdfStatus,
InspectionReportStatus,
InspectionReportWordStatus,
} from './inspection-report.entity';
export { InspectionActVersion, InspectionActVersionEvent } from './inspection-act-version.entity';
export {
InspectionActResponsible,
InspectionResponsibleAttendanceStatus,
InspectionResponsibleDocumentType,
} from './inspection-act-responsible.entity';
export { InspectionActClosure, InspectionActUploadMode } from './inspection-act-closure.entity';
export {
InspectionActSignature,
InspectionActSignatureSource,
InspectionActSignatureStatus,
InspectionActSignerType,
InspectionCompanySignatureManifestation,
} from './inspection-act-signature.entity';
export { InspectionDeadlinePolicy } from './inspection-deadline-policy.entity';
export { InspectionBusinessCalendarDay } from './inspection-business-calendar-day.entity';
export { InspectionNonWorkingDay } from './inspection-non-working-day.entity';
export { InspectionReport, InspectionReportPdfStatus, InspectionReportReviewStatus, InspectionReportStatus, InspectionReportWordStatus } from './inspection-report.entity';
export { InspectionReportFollowUp, InspectionReportFollowUpType } from './inspection-report-follow-up.entity';
export { SystemSmtpSettings, SmtpSecurityMode } from './system-smtp-settings.entity';
export { InspectionReportFollowUpFile } from './inspection-report-follow-up-file.entity';
export { InspectionActVersion, InspectionActVersionEvent } from './inspection-act-version.entity';
export { InspectionActResponsible, InspectionResponsibleAttendanceStatus, InspectionResponsibleDocumentType } from './inspection-act-responsible.entity';
export { InspectionActClosure, InspectionActUploadMode } from './inspection-act-closure.entity';
export { InspectionActSignature, InspectionActSignatureSource, InspectionActSignatureStatus, InspectionActSignerType, InspectionCompanySignatureManifestation } from './inspection-act-signature.entity';
export { FindingCategory } from './finding-category.entity';
export { FindingCatalogItem } from './finding-catalog-item.entity';
export { FindingCatalogItemAssetType } from './finding-catalog-item-asset-type.entity';
@@ -65,18 +44,8 @@ export { FindingCatalogAssetOverride } from './finding-catalog-asset-override.en
export { FindingCatalogProposal, FindingCatalogProposalStatus } from './finding-catalog-proposal.entity';
export { InspectionFinding, InspectionFindingResponseDueBasis, InspectionFindingStatus } from './inspection-finding.entity';
export { InspectionFindingVersion, InspectionFindingVersionEvent } from './inspection-finding-version.entity';
export {
InspectionCommunicationChannel,
InspectionCommunicationDirection,
InspectionCommunicationType,
InspectionFindingCommunication,
} from './inspection-finding-communication.entity';
export {
InspectionEvidenceKind,
InspectionEvidencePurpose,
InspectionEvidenceSource,
InspectionFindingEvidence,
} from './inspection-finding-evidence.entity';
export { InspectionCommunicationChannel, InspectionCommunicationDirection, InspectionCommunicationType, InspectionFindingCommunication } from './inspection-finding-communication.entity';
export { InspectionEvidenceKind, InspectionEvidencePurpose, InspectionEvidenceSource, InspectionFindingEvidence } from './inspection-finding-evidence.entity';
export { InspectionFindingVerificationVisit, InspectionVerificationOutcome } from './inspection-finding-verification-visit.entity';
export { InspectionFindingVerificationEvent, InspectionFindingVerificationEventType } from './inspection-finding-verification-event.entity';
@@ -109,15 +78,15 @@ import { InspectionVisitMember } from './inspection-visit-member.entity';
import { DocumentAnnualSequence } from './document-annual-sequence.entity';
import { InspectionAct } from './inspection-act.entity';
import { InspectionActAsset } from './inspection-act-asset.entity';
import { InspectionDeadlinePolicy } from './inspection-deadline-policy.entity';
import { InspectionNonWorkingDay } from './inspection-non-working-day.entity';
import { InspectionReport } from './inspection-report.entity';
import { InspectionReportFollowUp } from './inspection-report-follow-up.entity';
import { InspectionReportFollowUpFile } from './inspection-report-follow-up-file.entity';
import { InspectionActVersion } from './inspection-act-version.entity';
import { InspectionActResponsible } from './inspection-act-responsible.entity';
import { InspectionActClosure } from './inspection-act-closure.entity';
import { InspectionActSignature } from './inspection-act-signature.entity';
import { InspectionDeadlinePolicy } from './inspection-deadline-policy.entity';
import { InspectionBusinessCalendarDay } from './inspection-business-calendar-day.entity';
import { InspectionReportFollowUp } from './inspection-report-follow-up.entity';
import { SystemSmtpSettings } from './system-smtp-settings.entity';
import { FindingCategory } from './finding-category.entity';
import { FindingCatalogItem } from './finding-catalog-item.entity';
import { FindingCatalogItemAssetType } from './finding-catalog-item-asset-type.entity';
@@ -132,54 +101,17 @@ import { InspectionFindingVerificationVisit } from './inspection-finding-verific
import { InspectionFindingVerificationEvent } from './inspection-finding-verification-event.entity';
export const PHASE_A_ENTITIES = [
User,
Role,
Permission,
UserRole,
RolePermission,
AuthSession,
AuditEvent,
AssetType,
AssetTypeParentRule,
AssetAttributeDefinition,
Asset,
AssetAttributeValue,
AreaCompanyRelation,
OrganizationProfile,
OrganizationMembership,
SourceDocument,
AssetSourceDocument,
AssetExternalIdentifier,
AreaLegalRight,
AreaLegalRightOrganization,
AssetGeometry,
AssetVersion,
AssetMedia,
InspectionVisit,
InspectionVisitAsset,
InspectionVisitMember,
DocumentAnnualSequence,
InspectionAct,
InspectionActAsset,
InspectionReport,
InspectionActVersion,
InspectionActResponsible,
InspectionActClosure,
InspectionActSignature,
InspectionDeadlinePolicy,
InspectionBusinessCalendarDay,
InspectionReportFollowUp,
SystemSmtpSettings,
FindingCategory,
FindingCatalogItem,
FindingCatalogItemAssetType,
FindingCatalogAssetTypeProfile,
FindingCatalogAssetOverride,
FindingCatalogProposal,
InspectionFinding,
InspectionFindingVersion,
InspectionFindingCommunication,
InspectionFindingEvidence,
InspectionFindingVerificationVisit,
InspectionFindingVerificationEvent,
User, Role, Permission, UserRole, RolePermission, AuthSession, AuditEvent,
AssetType, AssetTypeParentRule, AssetAttributeDefinition, Asset, AssetAttributeValue,
AreaCompanyRelation, OrganizationProfile, OrganizationMembership, SourceDocument,
AssetSourceDocument, AssetExternalIdentifier, AreaLegalRight, AreaLegalRightOrganization,
AssetGeometry, AssetVersion, AssetMedia, InspectionVisit, InspectionVisitAsset,
InspectionVisitMember, DocumentAnnualSequence, InspectionAct, InspectionActAsset,
InspectionDeadlinePolicy, InspectionNonWorkingDay, InspectionReport,
InspectionReportFollowUp, InspectionReportFollowUpFile, InspectionActVersion,
InspectionActResponsible, InspectionActClosure, InspectionActSignature, FindingCategory,
FindingCatalogItem, FindingCatalogItemAssetType, FindingCatalogAssetTypeProfile,
FindingCatalogAssetOverride, FindingCatalogProposal, InspectionFinding,
InspectionFindingVersion, InspectionFindingCommunication, InspectionFindingEvidence,
InspectionFindingVerificationVisit, InspectionFindingVerificationEvent,
];
@@ -3,8 +3,6 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
export enum InspectionActVersionEvent {
CREATED = 'CREATED',
UPDATED = 'UPDATED',
LOCKED = 'LOCKED',
SEALED = 'SEALED',
READY = 'READY',
REOPENED = 'REOPENED',
CLOSED = 'CLOSED',
@@ -3,8 +3,6 @@ import { TimestampedEntity } from './timestamped.entity';
export enum InspectionActStatus {
DRAFT = 'DRAFT',
LOCKED = 'LOCKED',
SEALED = 'SEALED',
READY = 'READY',
CLOSED = 'CLOSED',
CANCELLED = 'CANCELLED',
@@ -23,11 +21,7 @@ export enum InspectionDeadlineDayType {
export enum InspectionDeadlineBasis {
ACT_DATE = 'ACT_DATE',
// La columna F4 temprana usó GEDO_DATE. Se conserva el valor físico por
// compatibilidad de migración, pero funcionalmente significa "pendiente de
// fecha de notificación" hasta que el procedimiento defina el evento válido.
NOTIFICATION_DATE = 'GEDO_DATE',
GEDO_DATE = 'GEDO_DATE',
GEDO_LOAD_DATE = 'GEDO_LOAD_DATE',
}
@Entity({ name: 'inspection_acts' })
@@ -37,7 +31,6 @@ export enum InspectionDeadlineBasis {
@Index('idx_inspection_acts_visit_status', ['visitId', 'status'])
@Index('idx_inspection_acts_occurred_at', ['occurredAt'])
@Index('idx_inspection_acts_created_by', ['createdBy'])
@Index('idx_inspection_acts_deadline', ['deadlineAt'])
export class InspectionAct extends TimestampedEntity {
@PrimaryGeneratedColumn('uuid')
id!: string;
@@ -51,7 +44,7 @@ export class InspectionAct extends TimestampedEntity {
@Column({ name: 'act_number', type: 'integer' })
actNumber!: number;
@Column({ type: 'varchar', length: 40 })
@Column({ type: 'varchar', length: 24 })
code!: string;
@Column({ type: 'varchar', length: 24, default: InspectionActStatus.DRAFT })
@@ -69,23 +62,26 @@ export class InspectionAct extends TimestampedEntity {
@Column({ type: 'text', nullable: true })
observations!: string | null;
@Column({ name: 'urgency', type: 'varchar', length: 24, default: InspectionActUrgency.NON_URGENT })
urgency!: InspectionActUrgency;
@Column({ type: 'varchar', length: 20, nullable: true })
urgency!: InspectionActUrgency | null;
@Column({ name: 'deadline_days', type: 'integer', nullable: true })
deadlineDays!: number | null;
@Column({ name: 'deadline_day_type', type: 'varchar', length: 24, nullable: true })
@Column({ name: 'deadline_day_type', type: 'varchar', length: 20, nullable: true })
deadlineDayType!: InspectionDeadlineDayType | null;
@Column({ name: 'deadline_basis', type: 'varchar', length: 24, nullable: true })
deadlineBasis!: InspectionDeadlineBasis | null;
@Column({ name: 'deadline_base_at', type: 'timestamptz', nullable: true })
deadlineBaseAt!: Date | null;
@Column({ name: 'deadline_base_on', type: 'date', nullable: true })
deadlineBaseOn!: string | null;
@Column({ name: 'deadline_at', type: 'timestamptz', nullable: true })
deadlineAt!: Date | null;
@Column({ name: 'deadline_due_on', type: 'date', nullable: true })
deadlineDueOn!: string | null;
@Column({ name: 'deadline_policy_snapshot', type: 'jsonb', nullable: true })
deadlinePolicySnapshot!: Record<string, unknown> | null;
@Column({ name: 'locked_at', type: 'timestamptz', nullable: true })
lockedAt!: Date | null;
@@ -1,21 +0,0 @@
import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
import { TimestampedEntity } from './timestamped.entity';
@Entity({ name: 'inspection_business_calendar_days' })
@Index('uq_inspection_business_calendar_day', ['date'], { unique: true })
export class InspectionBusinessCalendarDay extends TimestampedEntity {
@PrimaryGeneratedColumn('uuid')
id!: string;
@Column({ type: 'date' })
date!: string;
@Column({ name: 'is_business_day', type: 'boolean', default: false })
isBusinessDay!: boolean;
@Column({ type: 'varchar', length: 200 })
label!: string;
@Column({ name: 'updated_by', type: 'uuid', nullable: true })
updatedBy!: string | null;
}
@@ -1,23 +1,24 @@
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
import { InspectionDeadlineDayType } from './inspection-act.entity';
import { Column, Entity, PrimaryColumn } from 'typeorm';
import { TimestampedEntity } from './timestamped.entity';
import {
InspectionActUrgency,
InspectionDeadlineBasis,
InspectionDeadlineDayType,
} from './inspection-act.entity';
@Entity({ name: 'inspection_deadline_policies' })
export class InspectionDeadlinePolicy extends TimestampedEntity {
@PrimaryGeneratedColumn('uuid')
id!: string;
@PrimaryColumn({ type: 'varchar', length: 20 })
urgency!: InspectionActUrgency;
@Column({ name: 'urgent_days', type: 'integer', default: 5 })
urgentDays!: number;
@Column({ type: 'integer' })
days!: number;
@Column({ name: 'urgent_day_type', type: 'varchar', length: 24, default: InspectionDeadlineDayType.BUSINESS })
urgentDayType!: InspectionDeadlineDayType;
@Column({ name: 'day_type', type: 'varchar', length: 20 })
dayType!: InspectionDeadlineDayType;
@Column({ name: 'non_urgent_days', type: 'integer', default: 10 })
nonUrgentDays!: number;
@Column({ name: 'non_urgent_day_type', type: 'varchar', length: 24, default: InspectionDeadlineDayType.BUSINESS })
nonUrgentDayType!: InspectionDeadlineDayType;
@Column({ type: 'varchar', length: 24 })
basis!: InspectionDeadlineBasis;
@Column({ name: 'updated_by', type: 'uuid', nullable: true })
updatedBy!: string | null;
@@ -1,7 +1,6 @@
import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
import { TimestampedEntity } from './timestamped.entity';
/** @deprecated Los plazos de respuesta pasan al nivel Acta/Informe en F4. */
export enum InspectionFindingResponseDueBasis {
FINDING_DATE = 'FINDING_DATE',
REPORT_NOTIFICATION = 'REPORT_NOTIFICATION',
@@ -19,7 +18,7 @@ export enum InspectionFindingStatus {
@Index('idx_inspection_findings_status_control', ['status', 'nextControlOn'])
@Index('idx_inspection_findings_asset_status', ['assetId', 'status'])
@Index('idx_inspection_findings_catalog_item', ['catalogItemId'])
@Index('idx_inspection_findings_recurrence_of', ['recurrenceOfFindingId'])
@Index('idx_inspection_findings_antecedent', ['antecedentFindingId'])
export class InspectionFinding extends TimestampedEntity {
@PrimaryGeneratedColumn('uuid')
id!: string;
@@ -66,13 +65,12 @@ export class InspectionFinding extends TimestampedEntity {
@Column({ name: 'is_recurrence', type: 'boolean', default: false })
isRecurrence!: boolean;
@Column({ name: 'recurrence_of_finding_id', type: 'uuid', nullable: true })
recurrenceOfFindingId!: string | null;
@Column({ name: 'antecedent_finding_id', type: 'uuid', nullable: true })
antecedentFindingId!: string | null;
@Column({ name: 'correction_due_on', type: 'date', nullable: true })
correctionDueOn!: string | null;
// Campos legacy conservados temporalmente para migrar datos sin pérdida.
@Column({ name: 'response_due_basis', type: 'varchar', length: 32, nullable: true })
responseDueBasis!: InspectionFindingResponseDueBasis | null;
@@ -0,0 +1,20 @@
import { Column, Entity, PrimaryColumn } from 'typeorm';
import { TimestampedEntity } from './timestamped.entity';
@Entity({ name: 'inspection_non_working_days' })
export class InspectionNonWorkingDay extends TimestampedEntity {
@PrimaryColumn({ type: 'date' })
day!: string;
@Column({ type: 'varchar', length: 200 })
label!: string;
@Column({ type: 'boolean', default: true })
enabled!: boolean;
@Column({ name: 'created_by', type: 'uuid', nullable: true })
createdBy!: string | null;
@Column({ name: 'updated_by', type: 'uuid', nullable: true })
updatedBy!: string | null;
}
@@ -0,0 +1,30 @@
import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
import { TimestampedEntity } from './timestamped.entity';
@Entity({ name: 'inspection_report_follow_up_files' })
@Index('idx_inspection_report_follow_up_files_follow_up', ['followUpId'])
export class InspectionReportFollowUpFile extends TimestampedEntity {
@PrimaryGeneratedColumn('uuid')
id!: string;
@Column({ name: 'follow_up_id', type: 'uuid' })
followUpId!: string;
@Column({ name: 'original_name', type: 'varchar', length: 255 })
originalName!: string;
@Column({ name: 'stored_name', type: 'varchar', length: 255 })
storedName!: string;
@Column({ name: 'mime_type', type: 'varchar', length: 120 })
mimeType!: string;
@Column({ name: 'size_bytes', type: 'integer' })
sizeBytes!: number;
@Column({ type: 'char', length: 64 })
sha256!: string;
@Column({ name: 'created_by', type: 'uuid', nullable: true })
createdBy!: string | null;
}
@@ -10,7 +10,8 @@ export enum InspectionReportFollowUpType {
}
@Entity({ name: 'inspection_report_follow_ups' })
@Index('idx_inspection_report_follow_ups_report_created', ['reportId', 'createdAt'])
@Index('idx_inspection_report_follow_ups_report_occurred', ['reportId', 'occurredOn'])
@Index('idx_inspection_report_follow_ups_type', ['eventType'])
export class InspectionReportFollowUp extends TimestampedEntity {
@PrimaryGeneratedColumn('uuid')
id!: string;
@@ -18,33 +19,18 @@ export class InspectionReportFollowUp extends TimestampedEntity {
@Column({ name: 'report_id', type: 'uuid' })
reportId!: string;
@Column({ type: 'varchar', length: 40 })
type!: InspectionReportFollowUpType;
@Column({ name: 'event_type', type: 'varchar', length: 32 })
eventType!: InspectionReportFollowUpType;
@Column({ name: 'external_reference', type: 'varchar', length: 255, nullable: true })
externalReference!: string | null;
@Column({ name: 'reference_number', type: 'varchar', length: 255, nullable: true })
referenceNumber!: string | null;
@Column({ name: 'occurred_at', type: 'timestamptz' })
occurredAt!: Date;
@Column({ name: 'occurred_on', type: 'date' })
occurredOn!: string;
@Column({ type: 'text', nullable: true })
description!: string | null;
@Column({ name: 'original_name', type: 'varchar', length: 255, nullable: true })
originalName!: string | null;
@Column({ name: 'stored_name', type: 'varchar', length: 255, nullable: true })
storedName!: string | null;
@Column({ name: 'mime_type', type: 'varchar', length: 120, nullable: true })
mimeType!: string | null;
@Column({ name: 'size_bytes', type: 'integer', nullable: true })
sizeBytes!: number | null;
@Column({ name: 'sha256', type: 'char', length: 64, nullable: true })
sha256!: string | null;
@Column({ name: 'created_by', type: 'uuid', nullable: true })
createdBy!: string | null;
}
@@ -2,8 +2,6 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
import { TimestampedEntity } from './timestamped.entity';
export enum InspectionReportStatus {
WORKING = 'WORKING',
OFFICIALIZED = 'OFFICIALIZED',
FROZEN = 'FROZEN',
CANCELLED = 'CANCELLED',
}
@@ -20,6 +18,12 @@ export enum InspectionReportWordStatus {
FAILED = 'FAILED',
}
export enum InspectionReportReviewStatus {
PENDING_REVIEW = 'PENDING_REVIEW',
APPROVED = 'APPROVED',
SIGNED = 'SIGNED',
}
@Entity({ name: 'inspection_reports' })
@Index('idx_inspection_reports_visit_id', ['visitId'])
@Index('uq_inspection_reports_act', ['actId'], { unique: true })
@@ -27,7 +31,7 @@ export enum InspectionReportWordStatus {
@Index('uq_inspection_reports_code', ['code'], { unique: true })
@Index('idx_inspection_reports_generated_at', ['generatedAt'])
@Index('idx_inspection_reports_status', ['status', 'pdfStatus'])
@Index('idx_inspection_reports_gedo_officialized_at', ['gedoOfficializedAt'])
@Index('idx_inspection_reports_gedo_if_identifier', ['gedoIfIdentifier'])
export class InspectionReport extends TimestampedEntity {
@PrimaryGeneratedColumn('uuid')
id!: string;
@@ -44,39 +48,12 @@ export class InspectionReport extends TimestampedEntity {
@Column({ name: 'report_number', type: 'integer' })
reportNumber!: number;
@Column({ type: 'varchar', length: 40 })
@Column({ type: 'varchar', length: 24 })
code!: string;
@Column({ type: 'varchar', length: 24, default: InspectionReportStatus.WORKING })
@Column({ type: 'varchar', length: 24, default: InspectionReportStatus.FROZEN })
status!: InspectionReportStatus;
@Column({ name: 'executive_summary', type: 'text', nullable: true })
executiveSummary!: string | null;
@Column({ name: 'report_description', type: 'text', nullable: true })
reportDescription!: string | null;
@Column({ name: 'gedo_if_identifier', type: 'varchar', length: 255, nullable: true })
gedoIfIdentifier!: string | null;
@Column({ name: 'gedo_officialized_at', type: 'timestamptz', nullable: true })
gedoOfficializedAt!: Date | null;
@Column({ name: 'gedo_pdf_original_name', type: 'varchar', length: 255, nullable: true })
gedoPdfOriginalName!: string | null;
@Column({ name: 'gedo_pdf_stored_name', type: 'varchar', length: 255, nullable: true })
gedoPdfStoredName!: string | null;
@Column({ name: 'gedo_pdf_mime_type', type: 'varchar', length: 120, nullable: true })
gedoPdfMimeType!: string | null;
@Column({ name: 'gedo_pdf_size_bytes', type: 'integer', nullable: true })
gedoPdfSizeBytes!: number | null;
@Column({ name: 'gedo_pdf_sha256', type: 'char', length: 64, nullable: true })
gedoPdfSha256!: string | null;
@Column({ name: 'pdf_status', type: 'varchar', length: 24, default: InspectionReportPdfStatus.PENDING })
pdfStatus!: InspectionReportPdfStatus;
@@ -104,9 +81,78 @@ export class InspectionReport extends TimestampedEntity {
@Column({ name: 'word_error', type: 'varchar', length: 500, nullable: true })
wordError!: string | null;
@Column({ name: 'reference_text', type: 'text', nullable: true })
referenceText!: string | null;
@Column({ name: 'general_objective', type: 'text', nullable: true })
generalObjective!: string | null;
@Column({ name: 'specific_objective', type: 'text', nullable: true })
specificObjective!: string | null;
@Column({ type: 'text', nullable: true })
background!: string | null;
@Column({ name: 'legal_framework', type: 'text', nullable: true })
legalFramework!: string | null;
@Column({ name: 'executive_summary', type: 'text', nullable: true })
executiveSummary!: string | null;
@Column({ type: 'text', nullable: true })
description!: string | null;
@Column({ type: 'text', nullable: true })
conclusion!: string | null;
@Column({ name: 'gedo_if_identifier', type: 'varchar', length: 255, nullable: true })
gedoIfIdentifier!: string | null;
@Column({ name: 'gedo_officialized_on', type: 'date', nullable: true })
gedoOfficializedOn!: string | null;
@Column({ name: 'gedo_pdf_original_name', type: 'varchar', length: 255, nullable: true })
gedoPdfOriginalName!: string | null;
@Column({ name: 'gedo_pdf_stored_name', type: 'varchar', length: 255, nullable: true })
gedoPdfStoredName!: string | null;
@Column({ name: 'gedo_pdf_mime_type', type: 'varchar', length: 120, nullable: true })
gedoPdfMimeType!: string | null;
@Column({ name: 'gedo_pdf_size_bytes', type: 'integer', nullable: true })
gedoPdfSizeBytes!: number | null;
@Column({ name: 'gedo_pdf_sha256', type: 'char', length: 64, nullable: true })
gedoPdfSha256!: string | null;
@Column({ name: 'gedo_pdf_uploaded_at', type: 'timestamptz', nullable: true })
gedoPdfUploadedAt!: Date | null;
@Column({ name: 'gedo_pdf_uploaded_by', type: 'uuid', nullable: true })
gedoPdfUploadedBy!: string | null;
@Column({ name: 'review_status', type: 'varchar', length: 32, default: InspectionReportReviewStatus.PENDING_REVIEW })
reviewStatus!: InspectionReportReviewStatus;
@Column({ name: 'current_revision_number', type: 'integer', default: 0 })
currentRevisionNumber!: number;
@Column({ name: 'approved_revision_id', type: 'uuid', nullable: true })
approvedRevisionId!: string | null;
@Column({ name: 'approved_by', type: 'uuid', nullable: true })
approvedBy!: string | null;
@Column({ name: 'approved_at', type: 'timestamptz', nullable: true })
approvedAt!: Date | null;
@Column({ name: 'review_note', type: 'varchar', length: 1000, nullable: true })
reviewNote!: string | null;
@Column({ name: 'signed_at', type: 'timestamptz', nullable: true })
signedAt!: Date | null;
@Column({ type: 'varchar', length: 220 })
title!: string;
@@ -14,7 +14,7 @@ export enum InspectionVisitStatus {
@Index('idx_inspection_visits_status', ['status'])
@Index('idx_inspection_visits_scope_asset_id', ['scopeAssetId'])
@Index('idx_inspection_visits_lead_inspector_user_id', ['leadInspectorUserId'])
@Index('idx_inspection_visits_planned_start_at', ['plannedStartAt'])
@Index('idx_inspection_visits_planned_dates', ['plannedStartAt', 'plannedEndAt'])
@Index('idx_inspection_visits_operational_context', ['operationalAreaId', 'operatorCompanyId'])
export class InspectionVisit extends TimestampedEntity {
@PrimaryGeneratedColumn('uuid')
@@ -23,6 +23,9 @@ export class InspectionVisit extends TimestampedEntity {
@Column({ type: 'varchar', length: 80 })
code!: string;
@Column({ type: 'varchar', length: 200 })
title!: string;
@Column({ type: 'text', nullable: true })
objective!: string | null;
@@ -44,6 +47,9 @@ export class InspectionVisit extends TimestampedEntity {
@Column({ name: 'planned_start_at', type: 'timestamptz', nullable: true })
plannedStartAt!: Date | null;
@Column({ name: 'planned_end_at', type: 'timestamptz', nullable: true })
plannedEndAt!: Date | null;
@Column({ name: 'actual_started_at', type: 'timestamptz', nullable: true })
actualStartedAt!: Date | null;
@@ -1,44 +0,0 @@
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
import { TimestampedEntity } from './timestamped.entity';
export enum SmtpSecurityMode {
NONE = 'NONE',
STARTTLS = 'STARTTLS',
TLS = 'TLS',
}
@Entity({ name: 'system_smtp_settings' })
export class SystemSmtpSettings extends TimestampedEntity {
@PrimaryGeneratedColumn('uuid')
id!: string;
@Column({ type: 'varchar', length: 255 })
host!: string;
@Column({ type: 'integer' })
port!: number;
@Column({ name: 'security_mode', type: 'varchar', length: 24, default: SmtpSecurityMode.STARTTLS })
securityMode!: SmtpSecurityMode;
@Column({ type: 'varchar', length: 255, nullable: true })
username!: string | null;
@Column({ name: 'password_enc', type: 'text', nullable: true })
passwordEnc!: string | null;
@Column({ name: 'from_name', type: 'varchar', length: 200 })
fromName!: string;
@Column({ name: 'from_email', type: 'varchar', length: 320 })
fromEmail!: string;
@Column({ name: 'reply_to', type: 'varchar', length: 320, nullable: true })
replyTo!: string | null;
@Column({ type: 'boolean', default: true })
enabled!: boolean;
@Column({ name: 'updated_by', type: 'uuid', nullable: true })
updatedBy!: string | null;
}
@@ -1,161 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class F4DocumentWorkflowFoundation1790000000000 implements MigrationInterface {
name = 'F4DocumentWorkflowFoundation1790000000000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE inspection_acts ALTER COLUMN code TYPE varchar(40)`);
await queryRunner.query(`ALTER TABLE inspection_reports ALTER COLUMN code TYPE varchar(40)`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS urgency varchar(24) NOT NULL DEFAULT 'NON_URGENT'`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_days integer`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_day_type varchar(24)`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_basis varchar(24)`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_base_at timestamptz`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_at timestamptz`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS locked_at timestamptz`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS locked_by uuid`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS locked_sha256 char(64)`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS sealed_at timestamptz`);
await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS sealed_by uuid`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_inspection_acts_deadline ON inspection_acts(deadline_at)`);
await queryRunner.query(`ALTER TABLE inspection_findings ADD COLUMN IF NOT EXISTS is_recurrence boolean NOT NULL DEFAULT false`);
await queryRunner.query(`ALTER TABLE inspection_findings ADD COLUMN IF NOT EXISTS recurrence_of_finding_id uuid`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_inspection_findings_recurrence_of ON inspection_findings(recurrence_of_finding_id)`);
await queryRunner.query(`
DO $$ BEGIN
ALTER TABLE inspection_findings
ADD CONSTRAINT fk_inspection_findings_recurrence_of
FOREIGN KEY (recurrence_of_finding_id) REFERENCES inspection_findings(id) ON DELETE RESTRICT;
EXCEPTION WHEN duplicate_object THEN NULL; END $$;
`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS executive_summary text`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS report_description text`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_if_identifier varchar(255)`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_officialized_at timestamptz`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_original_name varchar(255)`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_stored_name varchar(255)`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_mime_type varchar(120)`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_size_bytes integer`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_sha256 char(64)`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_inspection_reports_gedo_officialized_at ON inspection_reports(gedo_officialized_at)`);
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS inspection_deadline_policies (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
urgent_days integer NOT NULL DEFAULT 5 CHECK (urgent_days > 0),
urgent_day_type varchar(24) NOT NULL DEFAULT 'BUSINESS',
non_urgent_days integer NOT NULL DEFAULT 10 CHECK (non_urgent_days > 0),
non_urgent_day_type varchar(24) NOT NULL DEFAULT 'BUSINESS',
updated_by uuid,
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
CONSTRAINT ck_inspection_deadline_policy_urgent_type CHECK (urgent_day_type IN ('BUSINESS','CALENDAR')),
CONSTRAINT ck_inspection_deadline_policy_non_urgent_type CHECK (non_urgent_day_type IN ('BUSINESS','CALENDAR'))
)
`);
await queryRunner.query(`
INSERT INTO inspection_deadline_policies (urgent_days, urgent_day_type, non_urgent_days, non_urgent_day_type)
SELECT 5, 'BUSINESS', 10, 'BUSINESS'
WHERE NOT EXISTS (SELECT 1 FROM inspection_deadline_policies)
`);
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS inspection_business_calendar_days (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
date date NOT NULL,
is_business_day boolean NOT NULL DEFAULT false,
label varchar(200) NOT NULL,
updated_by uuid,
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
CONSTRAINT uq_inspection_business_calendar_day UNIQUE(date)
)
`);
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS inspection_report_follow_ups (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
report_id uuid NOT NULL,
type varchar(40) NOT NULL,
external_reference varchar(255),
occurred_at timestamptz NOT NULL,
description text,
original_name varchar(255),
stored_name varchar(255),
mime_type varchar(120),
size_bytes integer,
sha256 char(64),
created_by uuid,
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
CONSTRAINT fk_inspection_report_follow_ups_report FOREIGN KEY(report_id) REFERENCES inspection_reports(id) ON DELETE CASCADE,
CONSTRAINT ck_inspection_report_follow_up_type CHECK (type IN ('COMPANY_NOTE','COMPANY_DOCUMENT','INTERNAL_NOTE','VERIFICATION','OTHER'))
)
`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_inspection_report_follow_ups_report_created ON inspection_report_follow_ups(report_id, created_at)`);
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS system_smtp_settings (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
host varchar(255) NOT NULL,
port integer NOT NULL CHECK (port > 0 AND port <= 65535),
security_mode varchar(24) NOT NULL DEFAULT 'STARTTLS',
username varchar(255),
password_enc text,
from_name varchar(200) NOT NULL,
from_email varchar(320) NOT NULL,
reply_to varchar(320),
enabled boolean NOT NULL DEFAULT true,
updated_by uuid,
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
CONSTRAINT ck_system_smtp_security_mode CHECK (security_mode IN ('NONE','STARTTLS','TLS'))
)
`);
await queryRunner.query(`
UPDATE inspection_acts
SET
deadline_days = COALESCE(deadline_days, 10),
deadline_day_type = COALESCE(deadline_day_type, 'BUSINESS'),
deadline_basis = COALESCE(deadline_basis, 'GEDO_DATE')
WHERE deadline_days IS NULL OR deadline_day_type IS NULL OR deadline_basis IS NULL
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP TABLE IF EXISTS system_smtp_settings`);
await queryRunner.query(`DROP TABLE IF EXISTS inspection_report_follow_ups`);
await queryRunner.query(`DROP TABLE IF EXISTS inspection_business_calendar_days`);
await queryRunner.query(`DROP TABLE IF EXISTS inspection_deadline_policies`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_sha256`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_size_bytes`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_mime_type`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_stored_name`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_original_name`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_officialized_at`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_if_identifier`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS report_description`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS executive_summary`);
await queryRunner.query(`ALTER TABLE inspection_findings DROP CONSTRAINT IF EXISTS fk_inspection_findings_recurrence_of`);
await queryRunner.query(`ALTER TABLE inspection_findings DROP COLUMN IF EXISTS recurrence_of_finding_id`);
await queryRunner.query(`ALTER TABLE inspection_findings DROP COLUMN IF EXISTS is_recurrence`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS sealed_by`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS sealed_at`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS locked_sha256`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS locked_by`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS locked_at`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_at`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_base_at`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_basis`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_day_type`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_days`);
await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS urgency`);
}
}
@@ -1,80 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class F4InventoryFunctionHistory1790000100000 implements MigrationInterface {
name = 'F4InventoryFunctionHistory1790000100000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE TABLE inventory_functions (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
code varchar(120) NOT NULL UNIQUE,
name varchar(240) NOT NULL,
description text,
is_active boolean NOT NULL DEFAULT true,
sort_order integer NOT NULL DEFAULT 0,
created_by uuid,
updated_by uuid,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT fk_inventory_functions_created_by FOREIGN KEY (created_by)
REFERENCES users(id) ON DELETE SET NULL,
CONSTRAINT fk_inventory_functions_updated_by FOREIGN KEY (updated_by)
REFERENCES users(id) ON DELETE SET NULL
)
`);
await queryRunner.query(`
CREATE INDEX idx_inventory_functions_active_sort
ON inventory_functions(is_active,sort_order,name)
`);
await queryRunner.query(`
CREATE TABLE inventory_function_assignments (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
asset_id uuid NOT NULL,
function_id uuid NOT NULL,
valid_from timestamptz NOT NULL,
valid_until timestamptz,
change_reason text,
changed_by uuid,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT fk_inventory_function_assignment_asset FOREIGN KEY (asset_id)
REFERENCES assets(id) ON DELETE CASCADE,
CONSTRAINT fk_inventory_function_assignment_function FOREIGN KEY (function_id)
REFERENCES inventory_functions(id) ON DELETE RESTRICT,
CONSTRAINT fk_inventory_function_assignment_user FOREIGN KEY (changed_by)
REFERENCES users(id) ON DELETE SET NULL,
CONSTRAINT chk_inventory_function_assignment_dates CHECK (
valid_until IS NULL OR valid_until > valid_from
)
)
`);
await queryRunner.query(`
CREATE UNIQUE INDEX uq_inventory_function_assignment_current
ON inventory_function_assignments(asset_id)
WHERE valid_until IS NULL
`);
await queryRunner.query(`
CREATE INDEX idx_inventory_function_assignment_history
ON inventory_function_assignments(asset_id,valid_from DESC,created_at DESC)
`);
await queryRunner.query(`
CREATE INDEX idx_inventory_function_assignment_function
ON inventory_function_assignments(function_id,valid_from DESC)
`);
await queryRunner.query(`
INSERT INTO inventory_functions(code,name,description,sort_order)
VALUES
('BOMBEO_MECANICO_AIB','Bombeo mecánico AIB',
'Función técnica de bombeo mecánico mediante aparato individual de bombeo (AIB).',10),
('BOMBEO_MECANICO_ROTAFLEX','Bombeo mecánico Rotaflex',
'Función técnica de bombeo mecánico mediante sistema Rotaflex.',20)
ON CONFLICT (code) DO NOTHING
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query('DROP TABLE IF EXISTS inventory_function_assignments');
await queryRunner.query('DROP TABLE IF EXISTS inventory_functions');
}
}
@@ -1,51 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class F4CompanySignatureInvites1790000200000 implements MigrationInterface {
name = 'F4CompanySignatureInvites1790000200000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE TABLE inspection_act_company_signature_invites (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
act_id uuid NOT NULL,
token_sha256 char(64) NOT NULL UNIQUE,
recipient_email varchar(320) NOT NULL,
recipient_name varchar(200),
recipient_document_type varchar(20),
recipient_document_number varchar(40),
recipient_position varchar(200),
status varchar(20) NOT NULL DEFAULT 'PENDING',
expires_at timestamptz NOT NULL,
sent_at timestamptz,
used_at timestamptz,
revoked_at timestamptz,
created_by uuid NOT NULL,
revoked_by uuid,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT fk_company_signature_invite_act FOREIGN KEY (act_id)
REFERENCES inspection_acts(id) ON DELETE CASCADE,
CONSTRAINT fk_company_signature_invite_created_by FOREIGN KEY (created_by)
REFERENCES users(id) ON DELETE RESTRICT,
CONSTRAINT fk_company_signature_invite_revoked_by FOREIGN KEY (revoked_by)
REFERENCES users(id) ON DELETE SET NULL,
CONSTRAINT chk_company_signature_invite_status CHECK (
status IN ('PENDING','USED','REVOKED','EXPIRED')
)
)
`);
await queryRunner.query(`
CREATE INDEX idx_company_signature_invites_act_created
ON inspection_act_company_signature_invites(act_id,created_at DESC)
`);
await queryRunner.query(`
CREATE INDEX idx_company_signature_invites_pending_expiry
ON inspection_act_company_signature_invites(status,expires_at)
WHERE status='PENDING'
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query('DROP TABLE IF EXISTS inspection_act_company_signature_invites');
}
}
@@ -1,220 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
const surveyPermissions = [
'surveys.read',
'surveys.manage',
'surveys.assign',
'surveys.execute',
'surveys.read_reports',
'surveys.capture',
'surveys.review',
] as const;
const rolePermissionValues = `
('admin', 'surveys.read'),
('admin', 'surveys.manage'),
('admin', 'surveys.assign'),
('admin', 'surveys.execute'),
('admin', 'surveys.read_reports'),
('admin', 'surveys.capture'),
('admin', 'surveys.review'),
('director', 'surveys.read'),
('director', 'surveys.read_reports'),
('director', 'surveys.review'),
('supervisor', 'surveys.read'),
('supervisor', 'surveys.manage'),
('supervisor', 'surveys.assign'),
('supervisor', 'surveys.execute'),
('supervisor', 'surveys.read_reports'),
('supervisor', 'surveys.capture'),
('supervisor', 'surveys.review'),
('inspector', 'surveys.read'),
('inspector', 'surveys.execute'),
('inspector', 'surveys.read_reports'),
('inspector', 'surveys.capture'),
('auditor', 'surveys.read'),
('auditor', 'surveys.read_reports')
`;
function quoteIdentifier(identifier: string): string {
return `"${identifier.replaceAll('"', '""')}"`;
}
export class F4RemoveSurveySubsystem1790000300000 implements MigrationInterface {
name = 'F4RemoveSurveySubsystem1790000300000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
DELETE FROM role_permissions
WHERE permission_id IN (
SELECT id FROM permissions WHERE code = ANY($1::varchar[])
)
`, [surveyPermissions]);
await queryRunner.query(
`DELETE FROM permissions WHERE code = ANY($1::varchar[])`,
[surveyPermissions],
);
// Deliberadamente sin CASCADE: una dependencia externa debe detener la migración.
await queryRunner.query(`DROP TABLE IF EXISTS survey_target_report_versions`);
await queryRunner.query(`DROP TABLE IF EXISTS survey_target_report_media`);
await queryRunner.query(`DROP TABLE IF EXISTS survey_target_reports`);
await queryRunner.query(`DROP TABLE IF EXISTS survey_campaign_targets`);
await queryRunner.query(`DROP TABLE IF EXISTS survey_campaigns`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS survey_campaigns (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
code varchar(80) NOT NULL UNIQUE,
name varchar(200) NOT NULL,
description text,
status varchar(24) NOT NULL DEFAULT 'DRAFT',
planned_start_at timestamptz,
planned_end_at timestamptz,
scope_asset_id uuid REFERENCES assets(id) ON DELETE RESTRICT,
coordinator_user_id uuid REFERENCES users(id) ON DELETE SET NULL,
created_by uuid REFERENCES users(id) ON DELETE SET NULL,
updated_by uuid REFERENCES users(id) ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT chk_survey_campaigns_status CHECK (
status IN ('DRAFT','PLANNED','IN_PROGRESS','COMPLETED','CANCELLED')
),
CONSTRAINT chk_survey_campaigns_dates CHECK (
planned_start_at IS NULL OR planned_end_at IS NULL OR planned_end_at >= planned_start_at
)
)
`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaigns_status ON survey_campaigns(status)`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaigns_scope_asset_id ON survey_campaigns(scope_asset_id)`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaigns_coordinator_user_id ON survey_campaigns(coordinator_user_id)`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaigns_planned_dates ON survey_campaigns(planned_start_at,planned_end_at)`);
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS survey_campaign_targets (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
campaign_id uuid NOT NULL REFERENCES survey_campaigns(id) ON DELETE RESTRICT,
asset_id uuid NOT NULL REFERENCES assets(id) ON DELETE RESTRICT,
assigned_user_id uuid REFERENCES users(id) ON DELETE SET NULL,
status varchar(24) NOT NULL DEFAULT 'PENDING',
due_at timestamptz,
instructions text,
created_by uuid REFERENCES users(id) ON DELETE SET NULL,
updated_by uuid REFERENCES users(id) ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT uq_survey_campaign_targets_campaign_asset UNIQUE(campaign_id,asset_id),
CONSTRAINT chk_survey_campaign_targets_status CHECK (
status IN ('PENDING','IN_PROGRESS','SUBMITTED','COMPLETED','SKIPPED')
)
)
`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaign_targets_campaign_status ON survey_campaign_targets(campaign_id,status)`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaign_targets_asset_id ON survey_campaign_targets(asset_id)`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaign_targets_assigned_user_id ON survey_campaign_targets(assigned_user_id)`);
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS survey_target_reports (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
target_id uuid NOT NULL UNIQUE REFERENCES survey_campaign_targets(id) ON DELETE RESTRICT,
outcome varchar(32),
status varchar(24) NOT NULL DEFAULT 'DRAFT',
observed_at timestamptz,
latitude numeric(9,6),
longitude numeric(9,6),
accuracy_m numeric(12,3),
notes text,
asset_version_at_submission integer,
submitted_at timestamptz,
submitted_by uuid REFERENCES users(id) ON DELETE SET NULL,
reviewed_at timestamptz,
reviewed_by uuid REFERENCES users(id) ON DELETE SET NULL,
review_notes text,
created_by uuid REFERENCES users(id) ON DELETE SET NULL,
updated_by uuid REFERENCES users(id) ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT chk_survey_target_reports_outcome CHECK (
outcome IS NULL OR outcome IN ('CONFIRMED','CHANGES_RECORDED','NOT_LOCATED')
),
CONSTRAINT chk_survey_target_reports_status CHECK (
status IN ('DRAFT','SUBMITTED','APPROVED','REJECTED')
),
CONSTRAINT chk_survey_target_reports_coordinates CHECK (
(latitude IS NULL AND longitude IS NULL)
OR (latitude IS NOT NULL AND longitude IS NOT NULL
AND latitude BETWEEN -90 AND 90 AND longitude BETWEEN -180 AND 180)
),
CONSTRAINT chk_survey_target_reports_accuracy CHECK (
accuracy_m IS NULL OR (accuracy_m >= 0 AND latitude IS NOT NULL AND longitude IS NOT NULL)
)
)
`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_reports_status ON survey_target_reports(status)`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_reports_submitted_by ON survey_target_reports(submitted_by)`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_reports_reviewed_by ON survey_target_reports(reviewed_by)`);
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS survey_target_report_media (
report_id uuid NOT NULL REFERENCES survey_target_reports(id) ON DELETE RESTRICT,
media_id uuid NOT NULL REFERENCES asset_media(id) ON DELETE RESTRICT,
included boolean NOT NULL DEFAULT true,
added_by uuid REFERENCES users(id) ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY(report_id,media_id)
)
`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_report_media_media_id ON survey_target_report_media(media_id)`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_report_media_included ON survey_target_report_media(report_id,included)`);
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS survey_target_report_versions (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
report_id uuid NOT NULL REFERENCES survey_target_reports(id) ON DELETE RESTRICT,
version_number integer NOT NULL,
event varchar(24) NOT NULL,
snapshot jsonb NOT NULL,
actor_user_id uuid REFERENCES users(id) ON DELETE SET NULL,
actor_username varchar(80),
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT uq_survey_target_report_versions_number UNIQUE(report_id,version_number),
CONSTRAINT chk_survey_target_report_versions_event CHECK (
event IN ('SUBMITTED','APPROVED','REJECTED')
)
)
`);
await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_report_versions_created_at ON survey_target_report_versions(created_at)`);
await queryRunner.query(`
INSERT INTO permissions(code,description) VALUES
('surveys.read','Consultar planificación de relevamientos'),
('surveys.manage','Crear y actualizar campañas de relevamiento'),
('surveys.assign','Asignar objetivos de relevamiento'),
('surveys.execute','Actualizar el avance de objetivos asignados'),
('surveys.read_reports','Consultar capturas y versiones de relevamientos'),
('surveys.capture','Capturar y enviar relevamientos de campo'),
('surveys.review','Aprobar o rechazar relevamientos enviados')
ON CONFLICT(code) DO UPDATE SET description=EXCLUDED.description
`);
await queryRunner.query(`
WITH mapping(role_code,permission_code) AS (VALUES ${rolePermissionValues})
INSERT INTO role_permissions(role_id,permission_id)
SELECT role.id,permission.id
FROM mapping
JOIN roles role ON role.code=mapping.role_code
JOIN permissions permission ON permission.code=mapping.permission_code
ON CONFLICT(role_id,permission_id) DO NOTHING
`);
const appRole = process.env.DB_APP_USER;
if (!appRole) throw new Error('Missing required environment variable: DB_APP_USER');
const applicationRole = quoteIdentifier(appRole);
await queryRunner.query(`GRANT SELECT,INSERT,UPDATE ON TABLE survey_campaigns,survey_campaign_targets,survey_target_reports,survey_target_report_media TO ${applicationRole}`);
await queryRunner.query(`GRANT SELECT,INSERT ON TABLE survey_target_report_versions TO ${applicationRole}`);
await queryRunner.query(`REVOKE DELETE ON TABLE survey_campaigns,survey_campaign_targets,survey_target_reports,survey_target_report_media,survey_target_report_versions FROM ${applicationRole}`);
await queryRunner.query(`REVOKE UPDATE ON TABLE survey_target_report_versions FROM ${applicationRole}`);
}
}
@@ -1,113 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
const legacyDirectorPermissions = [
['inspection_reports.revise', 'Cargar versiones corregidas del informe para revisión directiva'],
['inspection_reports.review', 'Aprobar la versión vigente del informe'],
['inspection_reports.sign_final', 'Firmar electrónicamente el informe final aprobado'],
] as const;
/**
* Retira definitivamente el circuito activo legacy Director -> revisión -> aprobación -> firma.
*
* current_revision_number e inspection_report_revisions se conservan porque forman parte del
* versionado útil del INF. inspection_report_signatures también se conserva como archivo
* histórico: F4 quita sus endpoints/permisos pero no destruye evidencia documental ya emitida.
*/
export class F4RemoveDirectorReportLegacy1790000400000 implements MigrationInterface {
name = 'F4RemoveDirectorReportLegacy1790000400000';
public async up(queryRunner: QueryRunner): Promise<void> {
// Las entregas al Director pertenecían al flujo retirado y no deben seguir
// apareciendo como pendientes/reintentables en F4.
await queryRunner.query(`
DELETE FROM inspection_document_deliveries
WHERE recipient_kind = 'DIRECTOR'
`);
// Retira permisos huérfanos del circuito anterior para que tampoco aparezcan
// como capacidades administrables en RBAC una vez eliminados sus endpoints.
await queryRunner.query(`
DELETE FROM role_permissions
WHERE permission_id IN (
SELECT id FROM permissions
WHERE code IN (
'inspection_reports.revise',
'inspection_reports.review',
'inspection_reports.sign_final'
)
)
`);
await queryRunner.query(`
DELETE FROM permissions
WHERE code IN (
'inspection_reports.revise',
'inspection_reports.review',
'inspection_reports.sign_final'
)
`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS approved_revision_id`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS approved_by`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS approved_at`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS review_note`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS signed_at`);
await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS review_status`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
// El rollback reconstruye el contrato técnico legacy, pero no recrea entregas Director
// ni valores de aprobación eliminados. El backup PRE-F4 sigue siendo la fuente de
// recuperación de esos datos históricos si alguna vez fuera necesario volver al circuito.
await queryRunner.query(`
ALTER TABLE inspection_reports
ADD COLUMN IF NOT EXISTS review_status varchar(32) NOT NULL DEFAULT 'PENDING_REVIEW'
`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS approved_revision_id uuid`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS approved_by uuid`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS approved_at timestamptz`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS review_note varchar(1000)`);
await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS signed_at timestamptz`);
await queryRunner.query(`
DO $$ BEGIN
ALTER TABLE inspection_reports
ADD CONSTRAINT chk_inspection_reports_review_status
CHECK (review_status IN ('PENDING_REVIEW','APPROVED','SIGNED'));
EXCEPTION WHEN duplicate_object THEN NULL; END $$;
`);
await queryRunner.query(`
DO $$ BEGIN
ALTER TABLE inspection_reports
ADD CONSTRAINT fk_inspection_reports_approved_by
FOREIGN KEY (approved_by) REFERENCES users(id) ON DELETE SET NULL;
EXCEPTION WHEN duplicate_object THEN NULL; END $$;
`);
await queryRunner.query(`
DO $$ BEGIN
ALTER TABLE inspection_reports
ADD CONSTRAINT fk_inspection_reports_approved_revision
FOREIGN KEY (approved_revision_id) REFERENCES inspection_report_revisions(id) ON DELETE RESTRICT;
EXCEPTION WHEN duplicate_object THEN NULL; END $$;
`);
for (const [code, description] of legacyDirectorPermissions) {
await queryRunner.query(
`INSERT INTO permissions (code, description) VALUES ($1, $2) ON CONFLICT (code) DO UPDATE SET description = EXCLUDED.description`,
[code, description],
);
}
await queryRunner.query(`
WITH mapping(role_code, permission_code) AS (VALUES
('director', 'inspection_reports.revise'),
('director', 'inspection_reports.review'),
('director', 'inspection_reports.sign_final')
)
INSERT INTO role_permissions (role_id, permission_id)
SELECT role.id, permission.id
FROM mapping
JOIN roles role ON role.code = mapping.role_code
JOIN permissions permission ON permission.code = mapping.permission_code
ON CONFLICT (role_id, permission_id) DO NOTHING
`);
}
}
@@ -1,118 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
/**
* F4 elimina dos campos heredados de la planificación original de Inspecciones:
* - title: la Inspección se identifica por su código autogenerado.
* - planned_end_at: la planificación sólo define la fecha/hora prevista de inicio.
*
* La migración conserva una copia técnica de los valores eliminados para que un
* rollback restaure los datos exactos existentes antes del cambio. Inspecciones
* creadas después del up() reciben code como title y planned_end_at NULL al bajar.
*
* Se conserva un índice sobre planned_start_at porque sigue siendo un criterio de
* orden y filtro operativo. Ninguna migración histórica se modifica.
*/
export class F4RemoveInspectionLegacyFields1790000500000 implements MigrationInterface {
name = 'F4RemoveInspectionLegacyFields1790000500000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE TABLE IF NOT EXISTS f4_inspection_visit_legacy_fields_backup (
visit_id uuid PRIMARY KEY,
title varchar(200) NOT NULL,
planned_end_at timestamptz NULL,
backed_up_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP
)
`);
await queryRunner.query(`
INSERT INTO f4_inspection_visit_legacy_fields_backup (
visit_id,
title,
planned_end_at,
backed_up_at
)
SELECT
id,
title,
planned_end_at,
CURRENT_TIMESTAMP
FROM inspection_visits
ON CONFLICT (visit_id) DO UPDATE SET
title = EXCLUDED.title,
planned_end_at = EXCLUDED.planned_end_at,
backed_up_at = EXCLUDED.backed_up_at
`);
await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_visits_planned_dates`);
await queryRunner.query(`
ALTER TABLE inspection_visits
DROP CONSTRAINT IF EXISTS chk_inspection_visits_planned_dates
`);
await queryRunner.query(`ALTER TABLE inspection_visits DROP COLUMN IF EXISTS planned_end_at`);
await queryRunner.query(`ALTER TABLE inspection_visits DROP COLUMN IF EXISTS title`);
await queryRunner.query(`
CREATE INDEX IF NOT EXISTS idx_inspection_visits_planned_start_at
ON inspection_visits (planned_start_at)
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_visits_planned_start_at`);
await queryRunner.query(`
ALTER TABLE inspection_visits
ADD COLUMN IF NOT EXISTS title varchar(200)
`);
await queryRunner.query(`
ALTER TABLE inspection_visits
ADD COLUMN IF NOT EXISTS planned_end_at timestamptz
`);
await queryRunner.query(`
UPDATE inspection_visits visit
SET
title = backup.title,
planned_end_at = backup.planned_end_at
FROM f4_inspection_visit_legacy_fields_backup backup
WHERE backup.visit_id = visit.id
`);
await queryRunner.query(`
UPDATE inspection_visits
SET title = code
WHERE title IS NULL
`);
await queryRunner.query(`
ALTER TABLE inspection_visits
ALTER COLUMN title SET NOT NULL
`);
await queryRunner.query(`
DO $$
BEGIN
IF NOT EXISTS (
SELECT 1
FROM pg_constraint
WHERE conname = 'chk_inspection_visits_planned_dates'
AND conrelid = 'inspection_visits'::regclass
) THEN
ALTER TABLE inspection_visits
ADD CONSTRAINT chk_inspection_visits_planned_dates CHECK (
planned_start_at IS NULL
OR planned_end_at IS NULL
OR planned_end_at >= planned_start_at
);
END IF;
END
$$
`);
await queryRunner.query(`
CREATE INDEX IF NOT EXISTS idx_inspection_visits_planned_dates
ON inspection_visits (planned_start_at, planned_end_at)
`);
await queryRunner.query(`DROP TABLE IF EXISTS f4_inspection_visit_legacy_fields_backup`);
}
}
@@ -1,274 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
/**
* Alinea las restricciones físicas heredadas de D5 con el ciclo documental F4.
*
* F4 incorpora estados LOCKED/SEALED para Actas y WORKING/OFFICIALIZED para INF.
* También usa el código visible ACT-NNNNN-DD-MM-YY y entrega copia al INSPECTOR.
* Las migraciones históricas conservaban CHECKs, triggers y contratos de D5, por lo
* que el servicio podía compilar pero PostgreSQL rechazaba las transiciones nuevas.
*/
export class F4AlignDocumentLifecycleConstraints1790000600000 implements MigrationInterface {
name = 'F4AlignDocumentLifecycleConstraints1790000600000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE inspection_reports
DROP CONSTRAINT IF EXISTS chk_inspection_reports_status
`);
await queryRunner.query(`
ALTER TABLE inspection_reports
ADD CONSTRAINT chk_inspection_reports_status CHECK (
status IN ('WORKING','OFFICIALIZED','FROZEN','CANCELLED')
)
`);
await queryRunner.query(`
ALTER TABLE inspection_reports
ALTER COLUMN status SET DEFAULT 'WORKING'
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
DROP CONSTRAINT IF EXISTS chk_inspection_acts_status
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
ADD CONSTRAINT chk_inspection_acts_status CHECK (
status IN ('DRAFT','LOCKED','SEALED','READY','CLOSED','CANCELLED','RECTIFIED')
)
`);
// Conservamos los códigos históricos ACTA-* ya emitidos y habilitamos el
// formato F4 realmente generado por InspectionActsService.
await queryRunner.query(`
ALTER TABLE inspection_acts
DROP CONSTRAINT IF EXISTS chk_inspection_acts_code
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
ADD CONSTRAINT chk_inspection_acts_code CHECK (
code ~ '^(ACTA-[0-9]{4}-[0-9]{6}|ACT-[0-9]{5}-[0-9]{2}-[0-9]{2}-[0-9]{2})$'
)
`);
await queryRunner.query(`
ALTER TABLE inspection_act_versions
DROP CONSTRAINT IF EXISTS chk_inspection_act_versions_event
`);
await queryRunner.query(`
ALTER TABLE inspection_act_versions
ADD CONSTRAINT chk_inspection_act_versions_event CHECK (
event IN ('CREATED','UPDATED','LOCKED','SEALED','READY','REOPENED','CLOSED','CANCELLED')
)
`);
// El cierre físico F4 se representa como SEALED. Conservamos CLOSED como
// compatibilidad histórica y exigimos la misma integridad en ambos estados.
await queryRunner.query(`
ALTER TABLE inspection_acts
DROP CONSTRAINT IF EXISTS chk_inspection_acts_closure
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
ADD CONSTRAINT chk_inspection_acts_closure CHECK (
status NOT IN ('SEALED','CLOSED')
OR (
closed_at IS NOT NULL
AND closed_by IS NOT NULL
AND closure_sha256 ~ '^[0-9a-f]{64}$'
)
)
`);
// F4 retira Director como destinatario activo y agrega copia al inspector.
// La migración 040 ya eliminó previamente las filas DIRECTOR existentes.
await queryRunner.query(`
ALTER TABLE inspection_document_deliveries
DROP CONSTRAINT IF EXISTS chk_inspection_document_deliveries_recipient_kind
`);
await queryRunner.query(`
ALTER TABLE inspection_document_deliveries
ADD CONSTRAINT chk_inspection_document_deliveries_recipient_kind CHECK (
recipient_kind IN ('COMPANY','OFFICE','INSPECTOR')
)
`);
// Las firmas F4 pertenecen al snapshot LOCKED. El trigger D5 exigía READY.
await queryRunner.query(`
CREATE OR REPLACE FUNCTION dhv2_guard_act_signature_ready()
RETURNS trigger LANGUAGE plpgsql AS $$
DECLARE current_status varchar(24);
DECLARE current_sha char(64);
BEGIN
SELECT act.status, closure.prepared_sha256
INTO current_status, current_sha
FROM inspection_acts act
INNER JOIN inspection_act_closures closure ON closure.act_id = act.id
WHERE act.id = NEW.act_id;
IF current_status <> 'LOCKED' OR current_sha IS DISTINCT FROM NEW.prepared_sha256 THEN
RAISE EXCEPTION 'La firma no corresponde a un acta bloqueada vigente';
END IF;
RETURN NEW;
END
$$
`);
// SEALED es tan inmutable como CLOSED/RECTIFIED en el contrato histórico.
await queryRunner.query(`
CREATE OR REPLACE FUNCTION dhv2_guard_closed_act_immutable()
RETURNS trigger LANGUAGE plpgsql AS $$
BEGIN
IF OLD.status IN ('SEALED','CLOSED','RECTIFIED') THEN
RAISE EXCEPTION 'El acta sellada es inmutable';
END IF;
RETURN NEW;
END
$$
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
// Primero restauramos la guarda D5. De otro modo el propio trigger F4 impediría
// traducir una fila SEALED a CLOSED durante el rollback.
await queryRunner.query(`
CREATE OR REPLACE FUNCTION dhv2_guard_closed_act_immutable()
RETURNS trigger LANGUAGE plpgsql AS $$
BEGIN
IF OLD.status IN ('CLOSED','RECTIFIED') THEN
RAISE EXCEPTION 'El acta cerrada es inmutable';
END IF;
RETURN NEW;
END
$$
`);
// Los códigos F4 se traducen antes de convertir SEALED a CLOSED, porque una vez
// restaurada la guarda D5 una fila CLOSED ya no puede modificarse.
await queryRunner.query(`
UPDATE inspection_acts
SET code='ACTA-' || act_year::text || '-' || LPAD(act_number::text, 6, '0')
WHERE code ~ '^ACT-[0-9]{5}-[0-9]{2}-[0-9]{2}-[0-9]{2}$'
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
DROP CONSTRAINT IF EXISTS chk_inspection_acts_code
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
ADD CONSTRAINT chk_inspection_acts_code CHECK (
code ~ '^ACTA-[0-9]{4}-[0-9]{6}$'
)
`);
// El contrato D5 no conoce los estados F4. Reducimos las representaciones
// nuevas a sus equivalentes históricos antes de restaurar sus CHECKs.
await queryRunner.query(`
UPDATE inspection_reports
SET status='FROZEN'
WHERE status IN ('WORKING','OFFICIALIZED')
`);
await queryRunner.query(`
ALTER TABLE inspection_reports
ALTER COLUMN status SET DEFAULT 'FROZEN'
`);
await queryRunner.query(`
ALTER TABLE inspection_reports
DROP CONSTRAINT IF EXISTS chk_inspection_reports_status
`);
await queryRunner.query(`
ALTER TABLE inspection_reports
ADD CONSTRAINT chk_inspection_reports_status CHECK (
status IN ('FROZEN','CANCELLED')
)
`);
await queryRunner.query(`
UPDATE inspection_acts
SET status=CASE
WHEN status='LOCKED' THEN 'READY'
WHEN status='SEALED' THEN 'CLOSED'
ELSE status
END
WHERE status IN ('LOCKED','SEALED')
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
DROP CONSTRAINT IF EXISTS chk_inspection_acts_status
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
ADD CONSTRAINT chk_inspection_acts_status CHECK (
status IN ('DRAFT','READY','CLOSED','CANCELLED','RECTIFIED')
)
`);
await queryRunner.query(`
UPDATE inspection_act_versions
SET event=CASE
WHEN event='LOCKED' THEN 'READY'
WHEN event='SEALED' THEN 'CLOSED'
ELSE event
END
WHERE event IN ('LOCKED','SEALED')
`);
await queryRunner.query(`
ALTER TABLE inspection_act_versions
DROP CONSTRAINT IF EXISTS chk_inspection_act_versions_event
`);
await queryRunner.query(`
ALTER TABLE inspection_act_versions
ADD CONSTRAINT chk_inspection_act_versions_event CHECK (
event IN ('CREATED','UPDATED','READY','REOPENED','CLOSED','CANCELLED')
)
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
DROP CONSTRAINT IF EXISTS chk_inspection_acts_closure
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
ADD CONSTRAINT chk_inspection_acts_closure CHECK (
status <> 'CLOSED'
OR (
closed_at IS NOT NULL
AND closed_by IS NOT NULL
AND closure_sha256 ~ '^[0-9a-f]{64}$'
)
)
`);
// Conservamos INSPECTOR en el CHECK de rollback para no destruir ni falsificar
// entregas F4 ya auditadas. D5 puede seguir operando con sus tres valores y el
// backup PRE-F4 sigue siendo la fuente de una restauración histórica exacta.
await queryRunner.query(`
ALTER TABLE inspection_document_deliveries
DROP CONSTRAINT IF EXISTS chk_inspection_document_deliveries_recipient_kind
`);
await queryRunner.query(`
ALTER TABLE inspection_document_deliveries
ADD CONSTRAINT chk_inspection_document_deliveries_recipient_kind CHECK (
recipient_kind IN ('COMPANY','OFFICE','DIRECTOR','INSPECTOR')
)
`);
await queryRunner.query(`
CREATE OR REPLACE FUNCTION dhv2_guard_act_signature_ready()
RETURNS trigger LANGUAGE plpgsql AS $$
DECLARE current_status varchar(24);
DECLARE current_sha char(64);
BEGIN
SELECT act.status, closure.prepared_sha256
INTO current_status, current_sha
FROM inspection_acts act
INNER JOIN inspection_act_closures closure ON closure.act_id = act.id
WHERE act.id = NEW.act_id;
IF current_status <> 'READY' OR current_sha IS DISTINCT FROM NEW.prepared_sha256 THEN
RAISE EXCEPTION 'La firma no corresponde a un acta preparada vigente';
END IF;
RETURN NEW;
END
$$
`);
}
}
@@ -1,44 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class F4AlignAssetVersionFunctionChange1790000700000 implements MigrationInterface {
name = 'F4AlignAssetVersionFunctionChange1790000700000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE asset_versions
DROP CONSTRAINT IF EXISTS chk_asset_versions_change_type
`);
await queryRunner.query(`
ALTER TABLE asset_versions
ADD CONSTRAINT chk_asset_versions_change_type CHECK (change_type IN (
'BASELINE', 'CREATED', 'UPDATED', 'CONTEXT_CHANGED', 'FUNCTION_CHANGED',
'STATUS_CHANGED', 'OPERATIONAL_STATUS_CHANGED', 'REGISTRY_UPDATED',
'GEOMETRY_UPDATED', 'GEOMETRY_REMOVED',
'MEDIA_UPLOADED', 'MEDIA_UPDATED', 'MEDIA_REMOVED',
'PROVENANCE_BASELINE', 'PROVENANCE_UPDATED', 'PROVENANCE_VERIFIED'
))
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
UPDATE asset_versions
SET change_type='UPDATED'
WHERE change_type='FUNCTION_CHANGED'
`);
await queryRunner.query(`
ALTER TABLE asset_versions
DROP CONSTRAINT IF EXISTS chk_asset_versions_change_type
`);
await queryRunner.query(`
ALTER TABLE asset_versions
ADD CONSTRAINT chk_asset_versions_change_type CHECK (change_type IN (
'BASELINE', 'CREATED', 'UPDATED', 'CONTEXT_CHANGED',
'STATUS_CHANGED', 'OPERATIONAL_STATUS_CHANGED', 'REGISTRY_UPDATED',
'GEOMETRY_UPDATED', 'GEOMETRY_REMOVED',
'MEDIA_UPLOADED', 'MEDIA_UPDATED', 'MEDIA_REMOVED',
'PROVENANCE_BASELINE', 'PROVENANCE_UPDATED', 'PROVENANCE_VERIFIED'
))
`);
}
}
@@ -0,0 +1,263 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class PhaseF4DocumentFlowFoundation1790035200000 implements MigrationInterface {
name = 'PhaseF4DocumentFlowFoundation1790035200000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE inspection_acts
ADD COLUMN urgency varchar(20),
ADD COLUMN deadline_days integer,
ADD COLUMN deadline_day_type varchar(20),
ADD COLUMN deadline_basis varchar(24),
ADD COLUMN deadline_base_on date,
ADD COLUMN deadline_due_on date,
ADD COLUMN deadline_policy_snapshot jsonb,
ADD COLUMN locked_at timestamptz,
ADD COLUMN locked_by uuid,
ADD COLUMN locked_sha256 char(64),
ADD COLUMN sealed_at timestamptz,
ADD COLUMN sealed_by uuid
`);
await queryRunner.query(`
ALTER TABLE inspection_acts
ADD CONSTRAINT chk_inspection_acts_urgency
CHECK (urgency IS NULL OR urgency IN ('URGENT','NON_URGENT')),
ADD CONSTRAINT chk_inspection_acts_deadline_days
CHECK (deadline_days IS NULL OR deadline_days > 0),
ADD CONSTRAINT chk_inspection_acts_deadline_day_type
CHECK (deadline_day_type IS NULL OR deadline_day_type IN ('BUSINESS','CALENDAR')),
ADD CONSTRAINT chk_inspection_acts_deadline_basis
CHECK (deadline_basis IS NULL OR deadline_basis IN ('ACT_DATE','GEDO_LOAD_DATE')),
ADD CONSTRAINT fk_inspection_acts_locked_by
FOREIGN KEY (locked_by) REFERENCES users(id) ON DELETE SET NULL,
ADD CONSTRAINT fk_inspection_acts_sealed_by
FOREIGN KEY (sealed_by) REFERENCES users(id) ON DELETE SET NULL
`);
await queryRunner.query(`
CREATE INDEX idx_inspection_acts_deadline_due_on
ON inspection_acts(deadline_due_on)
WHERE deadline_due_on IS NOT NULL
`);
await queryRunner.query(`
CREATE TABLE inspection_deadline_policies (
urgency varchar(20) PRIMARY KEY,
days integer NOT NULL,
day_type varchar(20) NOT NULL,
basis varchar(24) NOT NULL,
updated_by uuid,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT chk_inspection_deadline_policies_urgency
CHECK (urgency IN ('URGENT','NON_URGENT')),
CONSTRAINT chk_inspection_deadline_policies_days
CHECK (days > 0),
CONSTRAINT chk_inspection_deadline_policies_day_type
CHECK (day_type IN ('BUSINESS','CALENDAR')),
CONSTRAINT chk_inspection_deadline_policies_basis
CHECK (basis IN ('ACT_DATE','GEDO_LOAD_DATE')),
CONSTRAINT fk_inspection_deadline_policies_updated_by
FOREIGN KEY (updated_by) REFERENCES users(id) ON DELETE SET NULL
)
`);
await queryRunner.query(`
INSERT INTO inspection_deadline_policies (urgency, days, day_type, basis)
VALUES
('URGENT', 5, 'BUSINESS', 'ACT_DATE'),
('NON_URGENT', 10, 'BUSINESS', 'GEDO_LOAD_DATE')
`);
await queryRunner.query(`
CREATE TABLE inspection_non_working_days (
day date PRIMARY KEY,
label varchar(200) NOT NULL,
enabled boolean NOT NULL DEFAULT true,
created_by uuid,
updated_by uuid,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT chk_inspection_non_working_days_label
CHECK (LENGTH(TRIM(label)) > 0),
CONSTRAINT fk_inspection_non_working_days_created_by
FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE SET NULL,
CONSTRAINT fk_inspection_non_working_days_updated_by
FOREIGN KEY (updated_by) REFERENCES users(id) ON DELETE SET NULL
)
`);
await queryRunner.query(`
ALTER TABLE inspection_findings
ADD COLUMN is_recurrence boolean NOT NULL DEFAULT false,
ADD COLUMN antecedent_finding_id uuid
`);
await queryRunner.query(`
ALTER TABLE inspection_findings
ADD CONSTRAINT fk_inspection_findings_antecedent
FOREIGN KEY (antecedent_finding_id) REFERENCES inspection_findings(id) ON DELETE RESTRICT,
ADD CONSTRAINT chk_inspection_findings_recurrence_link
CHECK (
(is_recurrence = false AND antecedent_finding_id IS NULL)
OR (is_recurrence = true AND antecedent_finding_id IS NOT NULL)
),
ADD CONSTRAINT chk_inspection_findings_not_self_antecedent
CHECK (antecedent_finding_id IS NULL OR antecedent_finding_id <> id)
`);
await queryRunner.query(`
CREATE INDEX idx_inspection_findings_antecedent
ON inspection_findings(antecedent_finding_id)
WHERE antecedent_finding_id IS NOT NULL
`);
await queryRunner.query(`
ALTER TABLE inspection_reports
ADD COLUMN reference_text text,
ADD COLUMN general_objective text,
ADD COLUMN specific_objective text,
ADD COLUMN background text,
ADD COLUMN legal_framework text,
ADD COLUMN executive_summary text,
ADD COLUMN description text,
ADD COLUMN conclusion text,
ADD COLUMN gedo_if_identifier varchar(255),
ADD COLUMN gedo_officialized_on date,
ADD COLUMN gedo_pdf_original_name varchar(255),
ADD COLUMN gedo_pdf_stored_name varchar(255),
ADD COLUMN gedo_pdf_mime_type varchar(120),
ADD COLUMN gedo_pdf_size_bytes integer,
ADD COLUMN gedo_pdf_sha256 char(64),
ADD COLUMN gedo_pdf_uploaded_at timestamptz,
ADD COLUMN gedo_pdf_uploaded_by uuid
`);
await queryRunner.query(`
ALTER TABLE inspection_reports
ADD CONSTRAINT chk_inspection_reports_gedo_pdf_size
CHECK (gedo_pdf_size_bytes IS NULL OR gedo_pdf_size_bytes >= 0),
ADD CONSTRAINT fk_inspection_reports_gedo_pdf_uploaded_by
FOREIGN KEY (gedo_pdf_uploaded_by) REFERENCES users(id) ON DELETE SET NULL
`);
await queryRunner.query(`
CREATE INDEX idx_inspection_reports_gedo_if_identifier
ON inspection_reports(gedo_if_identifier)
WHERE gedo_if_identifier IS NOT NULL
`);
await queryRunner.query(`
CREATE TABLE inspection_report_follow_ups (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
report_id uuid NOT NULL,
event_type varchar(32) NOT NULL,
reference_number varchar(255),
occurred_on date NOT NULL,
description text,
created_by uuid,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT chk_inspection_report_follow_ups_type
CHECK (event_type IN ('COMPANY_NOTE','COMPANY_DOCUMENT','INTERNAL_NOTE','VERIFICATION','OTHER')),
CONSTRAINT fk_inspection_report_follow_ups_report
FOREIGN KEY (report_id) REFERENCES inspection_reports(id) ON DELETE RESTRICT,
CONSTRAINT fk_inspection_report_follow_ups_created_by
FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE SET NULL
)
`);
await queryRunner.query(`
CREATE INDEX idx_inspection_report_follow_ups_report_occurred
ON inspection_report_follow_ups(report_id, occurred_on, created_at)
`);
await queryRunner.query(`
CREATE INDEX idx_inspection_report_follow_ups_type
ON inspection_report_follow_ups(event_type)
`);
await queryRunner.query(`
CREATE TABLE inspection_report_follow_up_files (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
follow_up_id uuid NOT NULL,
original_name varchar(255) NOT NULL,
stored_name varchar(255) NOT NULL,
mime_type varchar(120) NOT NULL,
size_bytes integer NOT NULL,
sha256 char(64) NOT NULL,
created_by uuid,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT chk_inspection_report_follow_up_files_size
CHECK (size_bytes >= 0),
CONSTRAINT fk_inspection_report_follow_up_files_follow_up
FOREIGN KEY (follow_up_id) REFERENCES inspection_report_follow_ups(id) ON DELETE RESTRICT,
CONSTRAINT fk_inspection_report_follow_up_files_created_by
FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE SET NULL
)
`);
await queryRunner.query(`
CREATE INDEX idx_inspection_report_follow_up_files_follow_up
ON inspection_report_follow_up_files(follow_up_id)
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP TABLE IF EXISTS inspection_report_follow_up_files`);
await queryRunner.query(`DROP TABLE IF EXISTS inspection_report_follow_ups`);
await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_reports_gedo_if_identifier`);
await queryRunner.query(`
ALTER TABLE inspection_reports
DROP CONSTRAINT IF EXISTS fk_inspection_reports_gedo_pdf_uploaded_by,
DROP CONSTRAINT IF EXISTS chk_inspection_reports_gedo_pdf_size,
DROP COLUMN IF EXISTS gedo_pdf_uploaded_by,
DROP COLUMN IF EXISTS gedo_pdf_uploaded_at,
DROP COLUMN IF EXISTS gedo_pdf_sha256,
DROP COLUMN IF EXISTS gedo_pdf_size_bytes,
DROP COLUMN IF EXISTS gedo_pdf_mime_type,
DROP COLUMN IF EXISTS gedo_pdf_stored_name,
DROP COLUMN IF EXISTS gedo_pdf_original_name,
DROP COLUMN IF EXISTS gedo_officialized_on,
DROP COLUMN IF EXISTS gedo_if_identifier,
DROP COLUMN IF EXISTS conclusion,
DROP COLUMN IF EXISTS description,
DROP COLUMN IF EXISTS executive_summary,
DROP COLUMN IF EXISTS legal_framework,
DROP COLUMN IF EXISTS background,
DROP COLUMN IF EXISTS specific_objective,
DROP COLUMN IF EXISTS general_objective,
DROP COLUMN IF EXISTS reference_text
`);
await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_findings_antecedent`);
await queryRunner.query(`
ALTER TABLE inspection_findings
DROP CONSTRAINT IF EXISTS chk_inspection_findings_not_self_antecedent,
DROP CONSTRAINT IF EXISTS chk_inspection_findings_recurrence_link,
DROP CONSTRAINT IF EXISTS fk_inspection_findings_antecedent,
DROP COLUMN IF EXISTS antecedent_finding_id,
DROP COLUMN IF EXISTS is_recurrence
`);
await queryRunner.query(`DROP TABLE IF EXISTS inspection_non_working_days`);
await queryRunner.query(`DROP TABLE IF EXISTS inspection_deadline_policies`);
await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_acts_deadline_due_on`);
await queryRunner.query(`
ALTER TABLE inspection_acts
DROP CONSTRAINT IF EXISTS fk_inspection_acts_sealed_by,
DROP CONSTRAINT IF EXISTS fk_inspection_acts_locked_by,
DROP CONSTRAINT IF EXISTS chk_inspection_acts_deadline_basis,
DROP CONSTRAINT IF EXISTS chk_inspection_acts_deadline_day_type,
DROP CONSTRAINT IF EXISTS chk_inspection_acts_deadline_days,
DROP CONSTRAINT IF EXISTS chk_inspection_acts_urgency,
DROP COLUMN IF EXISTS sealed_by,
DROP COLUMN IF EXISTS sealed_at,
DROP COLUMN IF EXISTS locked_sha256,
DROP COLUMN IF EXISTS locked_by,
DROP COLUMN IF EXISTS locked_at,
DROP COLUMN IF EXISTS deadline_policy_snapshot,
DROP COLUMN IF EXISTS deadline_due_on,
DROP COLUMN IF EXISTS deadline_base_on,
DROP COLUMN IF EXISTS deadline_basis,
DROP COLUMN IF EXISTS deadline_day_type,
DROP COLUMN IF EXISTS deadline_days,
DROP COLUMN IF EXISTS urgency
`);
}
}
@@ -0,0 +1,38 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class PhaseF4DeadlineAdministration1790038800000 implements MigrationInterface {
name = 'PhaseF4DeadlineAdministration1790038800000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
INSERT INTO permissions (code, description)
VALUES ('inspection_deadlines.manage', 'Administrar plazos institucionales y calendario no laborable de Actas')
ON CONFLICT (code) DO UPDATE SET description = EXCLUDED.description
`);
await queryRunner.query(`
WITH mapping(role_code, permission_code) AS (
VALUES
('admin', 'inspection_deadlines.manage'),
('supervisor', 'inspection_deadlines.manage')
)
INSERT INTO role_permissions (role_id, permission_id)
SELECT role.id, permission.id
FROM mapping
INNER JOIN roles role ON role.code = mapping.role_code
INNER JOIN permissions permission ON permission.code = mapping.permission_code
ON CONFLICT DO NOTHING
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
DELETE FROM role_permissions
WHERE permission_id IN (
SELECT id FROM permissions WHERE code = 'inspection_deadlines.manage'
)
`);
await queryRunner.query(`
DELETE FROM permissions WHERE code = 'inspection_deadlines.manage'
`);
}
}
@@ -0,0 +1,64 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class PhaseF4ReportDossierPermissions1790042400000 implements MigrationInterface {
name = 'PhaseF4ReportDossierPermissions1790042400000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
INSERT INTO permissions (code, description)
VALUES
('inspection_reports.edit', 'Editar el contenido de trabajo del Informe de inspección'),
('inspection_reports.officialize', 'Registrar el IF y PDF oficial generado por GEDO'),
('inspection_reports.follow_up', 'Agregar respuestas, notas y documentos al seguimiento del Informe')
ON CONFLICT (code) DO UPDATE SET description = EXCLUDED.description
`);
await queryRunner.query(`
WITH mapping(role_code, permission_code) AS (
VALUES
('admin', 'inspection_reports.edit'),
('admin', 'inspection_reports.officialize'),
('admin', 'inspection_reports.follow_up'),
('supervisor', 'inspection_reports.edit'),
('supervisor', 'inspection_reports.officialize'),
('supervisor', 'inspection_reports.follow_up'),
('inspector', 'inspection_reports.edit'),
('inspector', 'inspection_reports.officialize'),
('inspector', 'inspection_reports.follow_up')
)
INSERT INTO role_permissions (role_id, permission_id)
SELECT role.id, permission.id
FROM mapping
INNER JOIN roles role ON role.code = mapping.role_code
INNER JOIN permissions permission ON permission.code = mapping.permission_code
ON CONFLICT DO NOTHING
`);
await queryRunner.query(`
CREATE UNIQUE INDEX IF NOT EXISTS uq_inspection_reports_gedo_if_identifier
ON inspection_reports(gedo_if_identifier)
WHERE gedo_if_identifier IS NOT NULL
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP INDEX IF EXISTS uq_inspection_reports_gedo_if_identifier`);
await queryRunner.query(`
DELETE FROM role_permissions
WHERE permission_id IN (
SELECT id FROM permissions
WHERE code IN (
'inspection_reports.edit',
'inspection_reports.officialize',
'inspection_reports.follow_up'
)
)
`);
await queryRunner.query(`
DELETE FROM permissions
WHERE code IN (
'inspection_reports.edit',
'inspection_reports.officialize',
'inspection_reports.follow_up'
)
`);
}
}
@@ -0,0 +1,144 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class PhaseF4DocumentNumbering1790046000000 implements MigrationInterface {
name = 'PhaseF4DocumentNumbering1790046000000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
DO $$
BEGIN
IF EXISTS (SELECT 1 FROM inspection_acts WHERE act_number > 99999) THEN
RAISE EXCEPTION 'F4 numbering requires inspection act numbers <= 99999';
END IF;
IF EXISTS (
SELECT 1
FROM inspection_visits
WHERE code ~ '^INS-[0-9]{4}-[0-9]{6}$'
AND RIGHT(code, 6)::integer > 99999
) THEN
RAISE EXCEPTION 'F4 numbering requires inspection visit numbers <= 99999';
END IF;
END $$
`);
await queryRunner.query(`
UPDATE inspection_visits
SET code = 'INSP-'
|| LPAD(RIGHT(code, 6)::integer::text, 5, '0')
|| '-'
|| TO_CHAR(
COALESCE(planned_start_at, created_at) AT TIME ZONE 'America/Argentina/Mendoza',
'DD-MM-YY'
),
title = CASE
WHEN title = inspection_visits.code THEN 'INSP-'
|| LPAD(RIGHT(inspection_visits.code, 6)::integer::text, 5, '0')
|| '-'
|| TO_CHAR(
COALESCE(planned_start_at, created_at) AT TIME ZONE 'America/Argentina/Mendoza',
'DD-MM-YY'
)
ELSE title
END
WHERE code ~ '^INS-[0-9]{4}-[0-9]{6}$'
`);
await queryRunner.query(`
UPDATE inspection_acts
SET code = 'ACT-'
|| LPAD(act_number::text, 5, '0')
|| '-'
|| TO_CHAR(occurred_at AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY')
`);
await queryRunner.query(`DROP INDEX IF EXISTS uq_inspection_reports_year_number`);
await queryRunner.query(`
UPDATE inspection_reports report
SET report_year = act.act_year,
report_number = act.act_number,
code = 'INF-'
|| LPAD(act.act_number::text, 5, '0')
|| '-'
|| TO_CHAR(act.occurred_at AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY')
FROM inspection_acts act
WHERE act.id = report.act_id
`);
await queryRunner.query(`
CREATE UNIQUE INDEX uq_inspection_reports_year_number
ON inspection_reports(report_year, report_number)
`);
await queryRunner.query(`
CREATE OR REPLACE FUNCTION dhv2_f4_set_act_code()
RETURNS trigger
LANGUAGE plpgsql
AS $$
BEGIN
IF NEW.act_number > 99999 THEN
RAISE EXCEPTION 'Inspection Act sequence exhausted for F4 institutional format';
END IF;
NEW.code := 'ACT-'
|| LPAD(NEW.act_number::text, 5, '0')
|| '-'
|| TO_CHAR(NEW.occurred_at AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY');
RETURN NEW;
END;
$$
`);
await queryRunner.query(`
DROP TRIGGER IF EXISTS trg_dhv2_f4_set_act_code ON inspection_acts
`);
await queryRunner.query(`
CREATE TRIGGER trg_dhv2_f4_set_act_code
BEFORE INSERT OR UPDATE OF act_number, occurred_at
ON inspection_acts
FOR EACH ROW
EXECUTE FUNCTION dhv2_f4_set_act_code()
`);
await queryRunner.query(`
CREATE OR REPLACE FUNCTION dhv2_f4_set_report_code()
RETURNS trigger
LANGUAGE plpgsql
AS $$
DECLARE
source_act inspection_acts%ROWTYPE;
BEGIN
SELECT * INTO source_act
FROM inspection_acts
WHERE id = NEW.act_id;
IF NOT FOUND THEN
RAISE EXCEPTION 'Inspection Act not found for report %', NEW.act_id;
END IF;
IF source_act.act_number > 99999 THEN
RAISE EXCEPTION 'Inspection Report sequence exhausted for F4 institutional format';
END IF;
NEW.report_year := source_act.act_year;
NEW.report_number := source_act.act_number;
NEW.code := 'INF-'
|| LPAD(source_act.act_number::text, 5, '0')
|| '-'
|| TO_CHAR(source_act.occurred_at AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY');
RETURN NEW;
END;
$$
`);
await queryRunner.query(`
DROP TRIGGER IF EXISTS trg_dhv2_f4_set_report_code ON inspection_reports
`);
await queryRunner.query(`
CREATE TRIGGER trg_dhv2_f4_set_report_code
BEFORE INSERT OR UPDATE OF act_id
ON inspection_reports
FOR EACH ROW
EXECUTE FUNCTION dhv2_f4_set_report_code()
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP TRIGGER IF EXISTS trg_dhv2_f4_set_report_code ON inspection_reports`);
await queryRunner.query(`DROP FUNCTION IF EXISTS dhv2_f4_set_report_code()`);
await queryRunner.query(`DROP TRIGGER IF EXISTS trg_dhv2_f4_set_act_code ON inspection_acts`);
await queryRunner.query(`DROP FUNCTION IF EXISTS dhv2_f4_set_act_code()`);
}
}
@@ -0,0 +1,87 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class PhaseF4SmtpSuperadmin1790049600000 implements MigrationInterface {
name = 'PhaseF4SmtpSuperadmin1790049600000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE TABLE smtp_settings (
id smallint PRIMARY KEY,
enabled boolean NOT NULL DEFAULT false,
host varchar(255),
port integer,
security_mode varchar(20),
username varchar(255),
password_encrypted text,
from_name varchar(160),
from_email varchar(255),
reply_to varchar(255),
updated_by uuid,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT chk_smtp_settings_singleton CHECK (id = 1),
CONSTRAINT chk_smtp_settings_port CHECK (port IS NULL OR port BETWEEN 1 AND 65535),
CONSTRAINT chk_smtp_settings_security CHECK (
security_mode IS NULL OR security_mode IN ('TLS','STARTTLS')
),
CONSTRAINT fk_smtp_settings_updated_by
FOREIGN KEY (updated_by) REFERENCES users(id) ON DELETE SET NULL
)
`);
await queryRunner.query(`
INSERT INTO smtp_settings (id, enabled)
VALUES (1, false)
`);
await queryRunner.query(`
INSERT INTO permissions (code, description)
VALUES ('system_mail.manage', 'Configurar la salida SMTP del sistema y probar el transporte')
ON CONFLICT (code) DO UPDATE SET description = EXCLUDED.description
`);
await queryRunner.query(`
INSERT INTO role_permissions (role_id, permission_id)
SELECT role.id, permission.id
FROM roles role
CROSS JOIN permissions permission
WHERE role.code = 'admin'
AND permission.code = 'system_mail.manage'
ON CONFLICT DO NOTHING
`);
await queryRunner.query(`
UPDATE inspection_document_deliveries delivery
SET recipient_kind = 'INSPECTOR',
recipient_user_id = visit.lead_inspector_user_id,
recipient_key = visit.lead_inspector_user_id,
recipient_email = inspector.email,
status = CASE WHEN inspector.email IS NULL THEN 'WAITING_RECIPIENT' ELSE 'PENDING' END,
last_error = NULL,
updated_at = CURRENT_TIMESTAMP
FROM inspection_acts act
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
INNER JOIN users inspector ON inspector.id = visit.lead_inspector_user_id
WHERE delivery.act_id = act.id
AND delivery.document_kind = 'REPORT_WORD'
AND delivery.recipient_kind = 'DIRECTOR'
AND delivery.status <> 'SENT'
AND NOT EXISTS (
SELECT 1
FROM inspection_document_deliveries existing
WHERE existing.act_id = delivery.act_id
AND existing.document_kind = 'REPORT_WORD'
AND existing.recipient_kind = 'INSPECTOR'
AND existing.recipient_key = visit.lead_inspector_user_id
)
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
DELETE FROM role_permissions
WHERE permission_id IN (
SELECT id FROM permissions WHERE code = 'system_mail.manage'
)
`);
await queryRunner.query(`DELETE FROM permissions WHERE code = 'system_mail.manage'`);
await queryRunner.query(`DROP TABLE IF EXISTS smtp_settings`);
}
}
@@ -0,0 +1,28 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class PhaseF4RemoveSurveySubsystem1790053200000 implements MigrationInterface {
name = 'PhaseF4RemoveSurveySubsystem1790053200000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
DELETE FROM role_permissions
WHERE permission_id IN (
SELECT id FROM permissions WHERE code LIKE 'surveys.%'
)
`);
await queryRunner.query(`
DELETE FROM permissions WHERE code LIKE 'surveys.%'
`);
await queryRunner.query(`DROP TABLE IF EXISTS survey_target_report_media`);
await queryRunner.query(`DROP TABLE IF EXISTS survey_target_report_versions`);
await queryRunner.query(`DROP TABLE IF EXISTS survey_target_reports`);
await queryRunner.query(`DROP TABLE IF EXISTS survey_campaign_targets`);
await queryRunner.query(`DROP TABLE IF EXISTS survey_campaigns`);
}
public async down(_queryRunner: QueryRunner): Promise<void> {
// Intentionally irreversible: historical migrations still document the old
// Survey schema, but restoring dropped campaign/report data would be unsafe.
}
}
@@ -0,0 +1,43 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class PhaseF4SealedActs1790056800000 implements MigrationInterface {
name = 'PhaseF4SealedActs1790056800000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
UPDATE inspection_acts
SET sealed_at = COALESCE(closed_at, updated_at, CURRENT_TIMESTAMP),
sealed_by = closed_by
WHERE status = 'CLOSED'
AND sealed_at IS NULL
`);
await queryRunner.query(`
CREATE OR REPLACE FUNCTION dhv2_f4_stamp_act_seal()
RETURNS trigger
LANGUAGE plpgsql
AS $$
BEGIN
IF NEW.status = 'CLOSED' AND OLD.status IS DISTINCT FROM 'CLOSED' THEN
NEW.sealed_at := COALESCE(NEW.closed_at, CURRENT_TIMESTAMP);
NEW.sealed_by := NEW.closed_by;
END IF;
RETURN NEW;
END;
$$
`);
await queryRunner.query(`
DROP TRIGGER IF EXISTS trg_dhv2_f4_stamp_act_seal ON inspection_acts
`);
await queryRunner.query(`
CREATE TRIGGER trg_dhv2_f4_stamp_act_seal
BEFORE UPDATE OF status ON inspection_acts
FOR EACH ROW
EXECUTE FUNCTION dhv2_f4_stamp_act_seal()
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP TRIGGER IF EXISTS trg_dhv2_f4_stamp_act_seal ON inspection_acts`);
await queryRunner.query(`DROP FUNCTION IF EXISTS dhv2_f4_stamp_act_seal()`);
}
}
@@ -1,52 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class F5InventoryPhysicalInstance1790087100000 implements MigrationInterface {
name = 'F5InventoryPhysicalInstance1790087100000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE assets
ADD COLUMN is_inventory_instance boolean NOT NULL DEFAULT false
`);
await queryRunner.query(`
CREATE INDEX idx_assets_inventory_instance_active
ON assets (is_inventory_instance, information_status)
WHERE is_inventory_instance = true
`);
await queryRunner.query(`
COMMENT ON COLUMN assets.is_inventory_instance IS
'True only for a concrete Instalacion/Subinstalacion instance. Empresa, Area and Yacimiento are structural/context masters.'
`);
await queryRunner.query(`
CREATE OR REPLACE FUNCTION classify_new_asset_inventory_instance()
RETURNS trigger
LANGUAGE plpgsql
AS $$
DECLARE
type_code varchar;
BEGIN
SELECT lower(code)
INTO type_code
FROM asset_types
WHERE id = NEW.asset_type_id;
NEW.is_inventory_instance := COALESCE(type_code, '') IN ('instalacion', 'subinstalacion');
RETURN NEW;
END;
$$
`);
await queryRunner.query(`
CREATE TRIGGER trg_assets_classify_inventory_instance
BEFORE INSERT OR UPDATE OF asset_type_id ON assets
FOR EACH ROW EXECUTE FUNCTION classify_new_asset_inventory_instance()
`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query('DROP TRIGGER IF EXISTS trg_assets_classify_inventory_instance ON assets');
await queryRunner.query('DROP FUNCTION IF EXISTS classify_new_asset_inventory_instance()');
await queryRunner.query('DROP INDEX IF EXISTS idx_assets_inventory_instance_active');
await queryRunner.query('ALTER TABLE assets DROP COLUMN IF EXISTS is_inventory_instance');
}
}
@@ -1,192 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
type TypeRow = {
id: string;
code: string;
role: string;
active: boolean;
canBeRoot: boolean;
};
type RuleRow = {
childTypeId: string;
parentTypeId: string;
};
type CountRow = { total: number };
const CREATED_TYPES_TABLE = 'f5_canonical_hierarchy_created_types';
const CREATED_RULES_TABLE = 'f5_canonical_hierarchy_created_rules';
const CANONICAL_TYPES = [
{
code: 'yacimiento',
name: 'Yacimiento',
description: 'Yacimiento perteneciente a un Área.',
},
{
code: 'instalacion',
name: 'Instalación',
description: 'Instancia física de una Instalación dentro de un Yacimiento.',
},
{
code: 'subinstalacion',
name: 'Subinstalación',
description: 'Instancia física subordinada a una Instalación.',
},
] as const;
const CANONICAL_RULES = [
['yacimiento', 'area'],
['instalacion', 'yacimiento'],
['subinstalacion', 'instalacion'],
] as const;
export class F5CanonicalInventoryHierarchy1790087150000 implements MigrationInterface {
name = 'F5CanonicalInventoryHierarchy1790087150000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE TABLE ${CREATED_TYPES_TABLE} (
type_id uuid PRIMARY KEY,
code varchar(80) NOT NULL UNIQUE,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT fk_f5_canonical_created_type FOREIGN KEY (type_id)
REFERENCES asset_types(id) ON DELETE CASCADE
)
`);
await queryRunner.query(`
CREATE TABLE ${CREATED_RULES_TABLE} (
child_type_id uuid NOT NULL,
parent_type_id uuid NOT NULL,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (child_type_id,parent_type_id),
CONSTRAINT fk_f5_canonical_created_rule_child FOREIGN KEY (child_type_id)
REFERENCES asset_types(id) ON DELETE CASCADE,
CONSTRAINT fk_f5_canonical_created_rule_parent FOREIGN KEY (parent_type_id)
REFERENCES asset_types(id) ON DELETE CASCADE
)
`);
const area = await this.requireType(queryRunner, 'area');
if (area.role !== 'AREA' || !area.active || !area.canBeRoot) {
throw new Error('F5 requires canonical active root type area with AREA operational role');
}
for (const definition of CANONICAL_TYPES) {
const inserted = (await queryRunner.query(`
INSERT INTO asset_types(code,name,description,can_be_root,is_active,operational_role)
SELECT $1::varchar,$2::varchar,$3::text,false,true,'GENERIC'
WHERE NOT EXISTS (
SELECT 1 FROM asset_types WHERE lower(code)=lower($1::varchar)
)
RETURNING id,code,operational_role AS role,is_active AS active,can_be_root AS "canBeRoot"
`, [definition.code, definition.name, definition.description])) as TypeRow[];
if (inserted[0]?.id) {
await queryRunner.query(`
INSERT INTO ${CREATED_TYPES_TABLE}(type_id,code)
VALUES ($1::uuid,$2::varchar)
`, [inserted[0].id, definition.code]);
}
const type = await this.requireType(queryRunner, definition.code);
if (type.role !== 'GENERIC' || !type.active || type.canBeRoot) {
throw new Error(`F5 incompatible canonical type configuration: ${definition.code}`);
}
}
for (const [childCode, parentCode] of CANONICAL_RULES) {
const inserted = (await queryRunner.query(`
INSERT INTO asset_type_parent_rules(child_type_id,parent_type_id)
SELECT child.id,parent.id
FROM asset_types child CROSS JOIN asset_types parent
WHERE lower(child.code)=lower($1::varchar)
AND lower(parent.code)=lower($2::varchar)
AND NOT EXISTS (
SELECT 1 FROM asset_type_parent_rules existing
WHERE existing.child_type_id=child.id AND existing.parent_type_id=parent.id
)
RETURNING child_type_id AS "childTypeId",parent_type_id AS "parentTypeId"
`, [childCode, parentCode])) as RuleRow[];
if (inserted[0]?.childTypeId && inserted[0]?.parentTypeId) {
await queryRunner.query(`
INSERT INTO ${CREATED_RULES_TABLE}(child_type_id,parent_type_id)
VALUES ($1::uuid,$2::uuid)
`, [inserted[0].childTypeId, inserted[0].parentTypeId]);
}
}
const [verified] = (await queryRunner.query(`
SELECT COUNT(*)::integer AS total
FROM asset_type_parent_rules rule
JOIN asset_types child ON child.id=rule.child_type_id
JOIN asset_types parent ON parent.id=rule.parent_type_id
WHERE (lower(child.code)='yacimiento' AND lower(parent.code)='area')
OR (lower(child.code)='instalacion' AND lower(parent.code)='yacimiento')
OR (lower(child.code)='subinstalacion' AND lower(parent.code)='instalacion')
`)) as CountRow[];
if (Number(verified?.total ?? 0) !== 3) {
throw new Error(`F5 canonical hierarchy verification failed: rules=${Number(verified?.total ?? 0)}`);
}
}
public async down(queryRunner: QueryRunner): Promise<void> {
const [usedCreatedTypes] = (await queryRunner.query(`
SELECT COUNT(*)::integer AS total
FROM assets asset
JOIN ${CREATED_TYPES_TABLE} owned ON owned.type_id=asset.asset_type_id
`)) as CountRow[];
if (Number(usedCreatedTypes?.total ?? 0) !== 0) {
throw new Error('Cannot safely rollback F5 canonical hierarchy: an F5-created type is already used by Inventory');
}
const [foreignRules] = (await queryRunner.query(`
SELECT COUNT(*)::integer AS total
FROM asset_type_parent_rules rule
WHERE (
rule.child_type_id IN (SELECT type_id FROM ${CREATED_TYPES_TABLE})
OR rule.parent_type_id IN (SELECT type_id FROM ${CREATED_TYPES_TABLE})
)
AND NOT EXISTS (
SELECT 1 FROM ${CREATED_RULES_TABLE} owned
WHERE owned.child_type_id=rule.child_type_id
AND owned.parent_type_id=rule.parent_type_id
)
`)) as CountRow[];
if (Number(foreignRules?.total ?? 0) !== 0) {
throw new Error('Cannot safely rollback F5 canonical hierarchy: an F5-created type gained external parent rules');
}
await queryRunner.query(`
DELETE FROM asset_type_parent_rules rule
USING ${CREATED_RULES_TABLE} owned
WHERE rule.child_type_id=owned.child_type_id
AND rule.parent_type_id=owned.parent_type_id
`);
await queryRunner.query(`
DELETE FROM asset_types type
USING ${CREATED_TYPES_TABLE} owned
WHERE type.id=owned.type_id
`);
await queryRunner.query(`DROP TABLE ${CREATED_RULES_TABLE}`);
await queryRunner.query(`DROP TABLE ${CREATED_TYPES_TABLE}`);
}
private async requireType(queryRunner: QueryRunner, code: string): Promise<TypeRow> {
const rows = (await queryRunner.query(`
SELECT id,code,operational_role AS role,is_active AS active,can_be_root AS "canBeRoot"
FROM asset_types
WHERE lower(code)=lower($1::varchar)
ORDER BY created_at
`, [code])) as TypeRow[];
if (rows.length !== 1) {
throw new Error(`F5 requires exactly one canonical asset type ${code}; found ${rows.length}`);
}
return rows[0];
}
}
@@ -1,602 +0,0 @@
import { createHash } from 'node:crypto';
import { MigrationInterface, QueryRunner } from 'typeorm';
import { loadF5InventoryAuthoritativeSource } from '../../reference-data/f5-authoritative-inventory-source';
type IdRow = { id: string };
type CountRow = { total: number };
const TERRITORY_DOCUMENT_NUMBER = 'DH-F5-TERRITORY';
const TERRITORY_SOURCE_NAME = 'Tablas de yacimiento y areas.xlsx';
const BACKUP_TABLE = 'f5_territory_relation_backups';
function key(value: string): string {
return value.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
.toLowerCase()
.replace(/[^a-z0-9]+/g, ' ')
.trim()
.replace(/\s+/g, ' ');
}
function code(prefix: string, value: string, length = 12): string {
return `${prefix}-${createHash('sha1').update(value).digest('hex').slice(0, length).toUpperCase()}`;
}
function uniqueBy<T>(values: T[], identity: (value: T) => string): T[] {
const seen = new Set<string>();
const output: T[] = [];
for (const value of values) {
const id = identity(value);
if (seen.has(id)) continue;
seen.add(id);
output.push(value);
}
return output;
}
export class F5AuthoritativeTerritory1790087200000 implements MigrationInterface {
name = 'F5AuthoritativeTerritory1790087200000';
public async up(queryRunner: QueryRunner): Promise<void> {
const source = loadF5InventoryAuthoritativeSource();
if (
source.areaSource.file !== TERRITORY_SOURCE_NAME
|| source.areaSource.sheet !== 'cr26e_tabla1'
|| source.areaSource.sha256 !== '8260fcadebbcd631a4c95260d0a67c3ecb28d497b32decb02a1c0847be5afa78'
|| source.areaSource.rows.length !== 230
) {
throw new Error('F5 territory source contract mismatch');
}
const rows = source.areaSource.rows;
const areaRows = uniqueBy(rows, (row) => key(row.area));
const pairRows = uniqueBy(rows, (row) => `${key(row.area)}|${key(row.yacimiento)}`);
if (areaRows.length !== 64 || pairRows.length !== 230) {
throw new Error(`F5 territory cardinality mismatch: areas=${areaRows.length}, pairs=${pairRows.length}`);
}
// Every Area must have one unambiguous source context. The workbook is the
// only authority for this preload; conflicting rows must abort the migration.
for (const areaRow of areaRows) {
const sameArea = rows.filter((row) => key(row.area)===key(areaRow.area));
const dimensions = [
new Set(sameArea.map((row) => key(row.departamento))),
new Set(sameArea.map((row) => key(row.tipoConcesion))),
new Set(sameArea.map((row) => key(row.empresaOperadora))),
];
if (dimensions.some((values) => values.size !== 1)) {
throw new Error(`F5 territory source has conflicting Area context: ${areaRow.area}`);
}
}
await this.assertCanonicalTypesAndRules(queryRunner);
await this.installHierarchyGuard(queryRunner);
await this.ensureBackupTable(queryRunner);
const preExistingDocument = await this.optionalId(
queryRunner,
`SELECT id FROM source_documents WHERE document_number=$1 AND issuer='Dirección de Hidrocarburos' LIMIT 1`,
[TERRITORY_DOCUMENT_NUMBER],
);
if (preExistingDocument) {
throw new Error('F5 territory source document already exists before migration');
}
const insertedDocument = (await queryRunner.query(`
INSERT INTO source_documents (
document_type, document_number, title, issuer, external_reference, notes
) VALUES ('SPREADSHEET',$1,$2,'Dirección de Hidrocarburos',$3,$4)
RETURNING id
`, [
TERRITORY_DOCUMENT_NUMBER,
TERRITORY_SOURCE_NAME,
`sha256:${source.areaSource.sha256}`,
`F5 · fuente territorial autorizada · hoja ${source.areaSource.sheet} · ${rows.length} filas`,
])) as IdRow[];
const sourceDocumentId = insertedDocument[0]?.id;
if (!sourceDocumentId) throw new Error('F5 could not create territory source document');
const companyTypeId = await this.id(
queryRunner,
`SELECT id FROM asset_types WHERE operational_role='COMPANY' AND is_active=true ORDER BY (lower(code)='empresa') DESC,created_at LIMIT 1`,
[],
'COMPANY asset type',
);
const areaTypeId = await this.id(
queryRunner,
`SELECT id FROM asset_types WHERE operational_role='AREA' AND is_active=true ORDER BY (lower(code)='area') DESC,created_at LIMIT 1`,
[],
'AREA asset type',
);
const fieldTypeId = await this.id(
queryRunner,
`SELECT id FROM asset_types WHERE lower(code)='yacimiento' AND is_active=true LIMIT 1`,
[],
'Yacimiento asset type',
);
const companyNames = [...new Set(rows.map((row) => row.empresaOperadora.trim()))]
.filter((name) => name && key(name) !== key('Sin Empresa Operadora'))
.sort((a, b) => a.localeCompare(b, 'es'));
const companyIds = new Map<string, string>();
for (const companyName of companyNames) {
const companyId = await this.ensureRootAsset(queryRunner, {
typeId: companyTypeId,
role: 'COMPANY',
code: code('F5-ORG', key(companyName)),
name: companyName,
sourceDocumentId,
sourceReference: `F5:TERRITORY:COMPANY:${code('SRC', key(companyName), 10)}`,
});
companyIds.set(key(companyName), companyId);
await queryRunner.query(`
INSERT INTO organization_profiles (asset_id,organization_kind,legal_name)
VALUES ($1::uuid,$2::organization_kind,$3)
ON CONFLICT (asset_id) DO NOTHING
`, [companyId, companyName.trim().toUpperCase().startsWith('UTE (') ? 'UTE' : 'COMPANY', companyName]);
}
const departmentIds = new Map<string, string>();
for (const departmentName of [...new Set(rows.map((row) => row.departamento.trim()))].sort((a,b)=>a.localeCompare(b,'es'))) {
const normalized = key(departmentName);
let departmentId = await this.optionalId(queryRunner, `
SELECT id FROM administrative_departments
WHERE province_code='MENDOZA' AND normalized_name=$1 AND is_active=true
LIMIT 1
`, [normalized]);
if (!departmentId) {
const inserted = (await queryRunner.query(`
INSERT INTO administrative_departments (
province_code,code,name,normalized_name,is_active,source_document_id
) VALUES ('MENDOZA',$1,$2,$3,true,$4::uuid)
RETURNING id
`, [code('F5-DEP', normalized, 10), departmentName, normalized, sourceDocumentId])) as IdRow[];
departmentId=inserted[0]?.id ?? null;
}
if (!departmentId) throw new Error(`F5 could not seed department ${departmentName}`);
departmentIds.set(normalized, departmentId);
}
const areaIds = new Map<string, string>();
for (const areaRow of areaRows) {
const areaId = await this.ensureRootAsset(queryRunner, {
typeId: areaTypeId,
role: 'AREA',
code: code('F5-AREA', key(areaRow.area)),
name: areaRow.area,
sourceDocumentId,
sourceReference: `F5:TERRITORY:AREA:${code('SRC', key(areaRow.area), 10)}`,
});
areaIds.set(key(areaRow.area), areaId);
const departmentId = departmentIds.get(key(areaRow.departamento));
if (!departmentId) throw new Error(`F5 missing department ${areaRow.departamento}`);
await this.backupAndCloseDepartmentRelations(queryRunner,areaId,departmentId);
await queryRunner.query(`
INSERT INTO area_department_relations (
area_id,department_id,valid_from,source_document_id,notes
)
SELECT $1::uuid,$2::uuid,CURRENT_DATE,$3::uuid,$4
WHERE NOT EXISTS (
SELECT 1 FROM area_department_relations
WHERE area_id=$1::uuid AND department_id=$2::uuid AND valid_until IS NULL
)
`, [
areaId,
departmentId,
sourceDocumentId,
`F5 · ${TERRITORY_SOURCE_NAME} · ${source.areaSource.sheet}`,
]);
const operatorId = companyIds.get(key(areaRow.empresaOperadora)) ?? null;
await this.backupAndCloseOperatorRelations(queryRunner,areaId,operatorId);
if (operatorId) {
await queryRunner.query(`
INSERT INTO area_company_relations (
area_id,company_id,relation_role,source_document_id,valid_from,start_reason
)
SELECT $1::uuid,$2::uuid,'OPERATOR',$3::uuid,CURRENT_TIMESTAMP,$4
WHERE NOT EXISTS (
SELECT 1 FROM area_company_relations
WHERE area_id=$1::uuid AND company_id=$2::uuid
AND relation_role='OPERATOR' AND valid_until IS NULL
)
`, [
areaId,
operatorId,
sourceDocumentId,
`F5 · operadora vigente según ${TERRITORY_SOURCE_NAME}`,
]);
}
const rightType = areaRow.tipoConcesion === 'Exploración'
? 'EXPLORATION_PERMIT'
: areaRow.tipoConcesion === 'Explotación'
? 'EXPLOITATION_CONCESSION'
: 'OTHER';
const rightName = `${areaRow.tipoConcesion} · ${areaRow.area}`;
await queryRunner.query(`
INSERT INTO area_legal_rights (
area_id,right_type,name,status,source_document_id,notes
)
SELECT $1::uuid,$2::area_legal_right_type,$3::varchar,'ACTIVE',$4::uuid,$5
WHERE NOT EXISTS (
SELECT 1 FROM area_legal_rights
WHERE area_id=$1::uuid
AND right_type=$2::area_legal_right_type
AND lower(btrim(name))=lower(btrim($3::varchar))
AND status IN ('ACTIVE','PENDING')
)
`, [
areaId,
rightType,
rightName,
sourceDocumentId,
`F5 · tipo de concesión tomado literalmente de ${TERRITORY_SOURCE_NAME}`,
]);
}
for (const row of pairRows) {
const areaId = areaIds.get(key(row.area));
if (!areaId) throw new Error(`F5 missing area ${row.area}`);
const sourceReference = `F5:TERRITORY:YAC:${code('SRC', `${key(row.area)}|${key(row.yacimiento)}`, 12)}`;
let yacimientoId = await this.optionalId(queryRunner, `
SELECT asset.id
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
WHERE lower(type.code)='yacimiento'
AND asset.parent_id=$1::uuid
AND asset.information_status<>'INACTIVE'
AND lower(btrim(asset.name))=lower(btrim($2))
ORDER BY asset.created_at
LIMIT 1
`, [areaId, row.yacimiento]);
if (!yacimientoId) {
const inserted = (await queryRunner.query(`
INSERT INTO assets (
asset_type_id,parent_id,operational_area_id,operator_company_id,
code,name,description,information_status,operational_status,
data_origin,source_name,source_reference,source_notes,is_inventory_instance
) VALUES (
$1::uuid,$2::uuid,NULL,NULL,$3,$4,$5,'VALIDATED','UNKNOWN',
'PROVIDED_DOCUMENT',$6,$7,$8,false
) RETURNING id
`, [
fieldTypeId,
areaId,
code('F5-YAC', `${key(row.area)}|${key(row.yacimiento)}`),
row.yacimiento,
`Yacimiento del Área ${row.area}`,
TERRITORY_SOURCE_NAME,
sourceReference,
`${source.areaSource.sheet} · fila ${row.sourceRow}`,
])) as IdRow[];
yacimientoId = inserted[0]?.id ?? null;
}
if (!yacimientoId) throw new Error(`F5 could not seed yacimiento ${row.area} / ${row.yacimiento}`);
await this.linkSource(queryRunner, yacimientoId, sourceDocumentId, `Hoja ${source.areaSource.sheet} · fila ${row.sourceRow}`);
}
const [verification] = (await queryRunner.query(`
SELECT
COUNT(DISTINCT asset.id) FILTER (WHERE type.operational_role='AREA')::integer AS areas,
COUNT(DISTINCT asset.id) FILTER (WHERE lower(type.code)='yacimiento')::integer AS yacimientos
FROM asset_source_documents link
JOIN assets asset ON asset.id=link.asset_id
JOIN asset_types type ON type.id=asset.asset_type_id
WHERE link.document_id=$1::uuid
`, [sourceDocumentId])) as Array<{ areas: number; yacimientos: number }>;
if (Number(verification?.areas ?? 0) !== 64 || Number(verification?.yacimientos ?? 0) !== 230) {
throw new Error(`F5 territory preload verification failed: ${JSON.stringify(verification ?? {})}`);
}
}
public async down(queryRunner: QueryRunner): Promise<void> {
const sourceDocumentId = await this.optionalId(
queryRunner,
`SELECT id FROM source_documents WHERE document_number=$1 AND issuer='Dirección de Hidrocarburos' LIMIT 1`,
[TERRITORY_DOCUMENT_NUMBER],
);
if (!sourceDocumentId) {
await queryRunner.query('DROP TRIGGER IF EXISTS trg_f5_canonical_asset_hierarchy ON assets');
await queryRunner.query('DROP FUNCTION IF EXISTS enforce_f5_canonical_asset_hierarchy()');
await queryRunner.query(`DROP TABLE IF EXISTS ${BACKUP_TABLE}`);
return;
}
await this.assertRelationBackupsUnchanged(queryRunner);
await this.assertCreatedMastersUnused(queryRunner,sourceDocumentId);
await queryRunner.query(`DELETE FROM area_legal_rights WHERE source_document_id=$1::uuid`,[sourceDocumentId]);
// Remove relations created by F5 first so restoring the previously-active
// relation cannot violate active-relation uniqueness constraints.
await queryRunner.query(`DELETE FROM area_company_relations WHERE source_document_id=$1::uuid`,[sourceDocumentId]);
await queryRunner.query(`DELETE FROM area_department_relations WHERE source_document_id=$1::uuid`,[sourceDocumentId]);
await this.restoreRelationBackups(queryRunner);
await queryRunner.query(`DELETE FROM asset_source_documents WHERE document_id=$1::uuid`,[sourceDocumentId]);
await queryRunner.query(`DELETE FROM assets WHERE source_reference LIKE 'F5:TERRITORY:YAC:%'`);
await queryRunner.query(`DELETE FROM organization_profiles profile USING assets asset WHERE profile.asset_id=asset.id AND asset.source_reference LIKE 'F5:TERRITORY:COMPANY:%'`);
await queryRunner.query(`DELETE FROM assets WHERE source_reference LIKE 'F5:TERRITORY:COMPANY:%'`);
await queryRunner.query(`DELETE FROM assets WHERE source_reference LIKE 'F5:TERRITORY:AREA:%'`);
await queryRunner.query(`DELETE FROM administrative_departments WHERE source_document_id=$1::uuid`,[sourceDocumentId]);
await queryRunner.query(`DELETE FROM source_documents WHERE id=$1::uuid`,[sourceDocumentId]);
await queryRunner.query('DROP TRIGGER IF EXISTS trg_f5_canonical_asset_hierarchy ON assets');
await queryRunner.query('DROP FUNCTION IF EXISTS enforce_f5_canonical_asset_hierarchy()');
await queryRunner.query(`DROP TABLE IF EXISTS ${BACKUP_TABLE}`);
}
private async assertCanonicalTypesAndRules(queryRunner: QueryRunner): Promise<void> {
const [roles] = (await queryRunner.query(`
SELECT
COUNT(*) FILTER (WHERE operational_role='AREA' AND is_active=true)::integer AS areas,
COUNT(*) FILTER (WHERE operational_role='COMPANY' AND is_active=true)::integer AS companies
FROM asset_types
`)) as Array<{areas:number; companies:number}>;
if (Number(roles?.areas ?? 0)<1 || Number(roles?.companies ?? 0)<1) {
throw new Error('F5 requires active AREA and COMPANY master types');
}
for (const [typeCode,typeName,description] of [
['yacimiento','Yacimiento','Yacimiento perteneciente a un Área.'],
['instalacion','Instalación','Instancia física de una Instalación dentro de un Yacimiento.'],
['subinstalacion','Subinstalación','Instancia física subordinada a una Instalación.'],
] as const) {
await queryRunner.query(`
INSERT INTO asset_types(code,name,description,can_be_root,is_active,operational_role)
SELECT $1::varchar,$2,$3,false,true,'GENERIC'
WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)=lower($1::varchar))
`,[typeCode,typeName,description]);
const [type] = (await queryRunner.query(`
SELECT operational_role AS role,is_active AS active,can_be_root AS "canBeRoot"
FROM asset_types WHERE lower(code)=lower($1) LIMIT 1
`,[typeCode])) as Array<{role:string;active:boolean;canBeRoot:boolean}>;
if (!type || type.role!=='GENERIC' || !type.active || type.canBeRoot) {
throw new Error(`F5 incompatible master type configuration: ${typeCode}`);
}
}
const [ruleCount] = (await queryRunner.query(`
SELECT COUNT(*)::integer AS total
FROM asset_type_parent_rules rule
JOIN asset_types child ON child.id=rule.child_type_id
JOIN asset_types parent ON parent.id=rule.parent_type_id
WHERE (lower(child.code)='yacimiento' AND lower(parent.code)='area')
OR (lower(child.code)='instalacion' AND lower(parent.code)='yacimiento')
OR (lower(child.code)='subinstalacion' AND lower(parent.code)='instalacion')
`)) as CountRow[];
if (Number(ruleCount?.total ?? 0)!==3) {
throw new Error('F5 requires canonical parent rules Area → Yacimiento → Instalación → Subinstalación');
}
}
private async installHierarchyGuard(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE OR REPLACE FUNCTION enforce_f5_canonical_asset_hierarchy()
RETURNS trigger LANGUAGE plpgsql AS $$
DECLARE child_code text; parent_code text;
BEGIN
SELECT lower(code) INTO child_code FROM asset_types WHERE id=NEW.asset_type_id;
IF child_code IN ('empresa','organizacion','area') THEN
IF NEW.parent_id IS NOT NULL THEN
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa y Área son maestros raíz independientes';
END IF;
RETURN NEW;
END IF;
IF child_code NOT IN ('yacimiento','instalacion','subinstalacion') THEN RETURN NEW; END IF;
IF NEW.parent_id IS NULL THEN
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento, Instalación y Subinstalación requieren padre';
END IF;
SELECT lower(type.code) INTO parent_code
FROM assets parent JOIN asset_types type ON type.id=parent.asset_type_id
WHERE parent.id=NEW.parent_id;
IF (child_code='yacimiento' AND parent_code<>'area')
OR (child_code='instalacion' AND parent_code<>'yacimiento')
OR (child_code='subinstalacion' AND parent_code<>'instalacion') THEN
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Jerarquía F5 inválida: Área → Yacimiento → Instalación → Subinstalación';
END IF;
RETURN NEW;
END $$;
`);
await queryRunner.query('DROP TRIGGER IF EXISTS trg_f5_canonical_asset_hierarchy ON assets');
await queryRunner.query(`
CREATE TRIGGER trg_f5_canonical_asset_hierarchy
BEFORE INSERT OR UPDATE OF asset_type_id,parent_id ON assets
FOR EACH ROW EXECUTE FUNCTION enforce_f5_canonical_asset_hierarchy()
`);
}
private async ensureBackupTable(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE TABLE ${BACKUP_TABLE} (
relation_kind varchar(32) NOT NULL,
relation_id uuid NOT NULL,
previous_values jsonb NOT NULL,
applied_values jsonb NOT NULL,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (relation_kind,relation_id),
CONSTRAINT chk_f5_territory_backup_kind CHECK (relation_kind IN ('AREA_COMPANY','AREA_DEPARTMENT'))
)
`);
}
private async backupAndCloseDepartmentRelations(queryRunner: QueryRunner,areaId:string,departmentId:string):Promise<void> {
const marker='F5: reemplazada por fuente territorial autorizada';
await queryRunner.query(`
INSERT INTO ${BACKUP_TABLE}(relation_kind,relation_id,previous_values,applied_values)
SELECT 'AREA_DEPARTMENT',relation.id,
jsonb_build_object('validUntil',relation.valid_until,'notes',relation.notes),
jsonb_build_object('validUntil',CURRENT_DATE,'notes',concat_ws(E'\n',relation.notes,$3::text))
FROM area_department_relations relation
WHERE relation.area_id=$1::uuid
AND relation.valid_until IS NULL
AND relation.department_id<>$2::uuid
ON CONFLICT DO NOTHING
`,[areaId,departmentId,marker]);
await queryRunner.query(`
UPDATE area_department_relations relation
SET valid_until=(backup.applied_values->>'validUntil')::date,
notes=backup.applied_values->>'notes',
updated_at=CURRENT_TIMESTAMP
FROM ${BACKUP_TABLE} backup
WHERE backup.relation_kind='AREA_DEPARTMENT'
AND backup.relation_id=relation.id
AND relation.area_id=$1::uuid
AND relation.valid_until IS NULL
`,[areaId]);
}
private async backupAndCloseOperatorRelations(queryRunner: QueryRunner,areaId:string,operatorId:string|null):Promise<void> {
const marker='F5: reemplazada por fuente territorial autorizada';
await queryRunner.query(`
INSERT INTO ${BACKUP_TABLE}(relation_kind,relation_id,previous_values,applied_values)
SELECT 'AREA_COMPANY',relation.id,
jsonb_build_object('validUntil',relation.valid_until,'endReason',relation.end_reason),
jsonb_build_object('validUntil',CURRENT_TIMESTAMP,'endReason',$3::text)
FROM area_company_relations relation
WHERE relation.area_id=$1::uuid
AND relation.relation_role='OPERATOR'
AND relation.valid_until IS NULL
AND ($2::uuid IS NULL OR relation.company_id<>$2::uuid)
ON CONFLICT DO NOTHING
`,[areaId,operatorId,marker]);
await queryRunner.query(`
UPDATE area_company_relations relation
SET valid_until=(backup.applied_values->>'validUntil')::timestamptz,
end_reason=backup.applied_values->>'endReason',
updated_at=CURRENT_TIMESTAMP
FROM ${BACKUP_TABLE} backup
WHERE backup.relation_kind='AREA_COMPANY'
AND backup.relation_id=relation.id
AND relation.area_id=$1::uuid
AND relation.valid_until IS NULL
`,[areaId]);
}
private async assertRelationBackupsUnchanged(queryRunner: QueryRunner):Promise<void> {
const [changed] = (await queryRunner.query(`
SELECT COUNT(*)::integer AS total
FROM ${BACKUP_TABLE} backup
LEFT JOIN area_company_relations company_relation
ON backup.relation_kind='AREA_COMPANY' AND company_relation.id=backup.relation_id
LEFT JOIN area_department_relations department_relation
ON backup.relation_kind='AREA_DEPARTMENT' AND department_relation.id=backup.relation_id
WHERE (
backup.relation_kind='AREA_COMPANY'
AND (
company_relation.id IS NULL
OR company_relation.valid_until IS DISTINCT FROM (backup.applied_values->>'validUntil')::timestamptz
OR company_relation.end_reason IS DISTINCT FROM backup.applied_values->>'endReason'
)
) OR (
backup.relation_kind='AREA_DEPARTMENT'
AND (
department_relation.id IS NULL
OR department_relation.valid_until IS DISTINCT FROM (backup.applied_values->>'validUntil')::date
OR department_relation.notes IS DISTINCT FROM backup.applied_values->>'notes'
)
)
`)) as CountRow[];
if (Number(changed?.total ?? 0)>0) {
throw new Error('Cannot safely rollback F5 territory: a relation closed by the preload was modified afterwards');
}
}
private async restoreRelationBackups(queryRunner: QueryRunner):Promise<void> {
await queryRunner.query(`
UPDATE area_company_relations relation
SET valid_until=(backup.previous_values->>'validUntil')::timestamptz,
end_reason=backup.previous_values->>'endReason',
updated_at=CURRENT_TIMESTAMP
FROM ${BACKUP_TABLE} backup
WHERE backup.relation_kind='AREA_COMPANY' AND backup.relation_id=relation.id
`);
await queryRunner.query(`
UPDATE area_department_relations relation
SET valid_until=(backup.previous_values->>'validUntil')::date,
notes=backup.previous_values->>'notes',
updated_at=CURRENT_TIMESTAMP
FROM ${BACKUP_TABLE} backup
WHERE backup.relation_kind='AREA_DEPARTMENT' AND backup.relation_id=relation.id
`);
}
private async assertCreatedMastersUnused(queryRunner:QueryRunner,sourceDocumentId:string):Promise<void> {
const [used] = (await queryRunner.query(`
SELECT COUNT(*)::integer AS total
FROM assets asset
WHERE asset.source_reference LIKE 'F5:TERRITORY:%'
AND (
EXISTS (SELECT 1 FROM assets child WHERE child.parent_id=asset.id AND child.source_reference NOT LIKE 'F5:TERRITORY:%')
OR EXISTS (SELECT 1 FROM inspection_visits visit WHERE visit.operational_area_id=asset.id OR visit.operator_company_id=asset.id)
OR EXISTS (SELECT 1 FROM inspection_visit_assets link WHERE link.asset_id=asset.id)
OR EXISTS (SELECT 1 FROM inspection_findings finding WHERE finding.asset_id=asset.id)
)
`)) as CountRow[];
if (Number(used?.total ?? 0)>0) {
throw new Error('Cannot safely rollback F5 territory: F5-created master data is already used by operational records');
}
void sourceDocumentId;
}
private async ensureRootAsset(
queryRunner: QueryRunner,
input: {
typeId: string;
role: 'AREA' | 'COMPANY';
code: string;
name: string;
sourceDocumentId: string;
sourceReference: string;
},
): Promise<string> {
let assetId = await this.optionalId(queryRunner, `
SELECT asset.id
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
WHERE type.operational_role=$1::asset_type_operational_role
AND asset.information_status<>'INACTIVE'
AND lower(btrim(asset.name))=lower(btrim($2))
ORDER BY asset.created_at
LIMIT 1
`,[input.role,input.name]);
if (!assetId) {
const inserted = (await queryRunner.query(`
INSERT INTO assets (
asset_type_id,parent_id,operational_area_id,operator_company_id,
code,name,information_status,operational_status,data_origin,
source_name,source_reference,source_notes,is_inventory_instance
) VALUES ($1::uuid,NULL,NULL,NULL,$2,$3,'VALIDATED','UNKNOWN','PROVIDED_DOCUMENT',$4,$5,$6,false)
RETURNING id
`,[
input.typeId,input.code,input.name,TERRITORY_SOURCE_NAME,input.sourceReference,
'F5 · fuente territorial autorizada',
])) as IdRow[];
assetId=inserted[0]?.id ?? null;
}
if (!assetId) throw new Error(`F5 could not seed ${input.role} ${input.name}`);
await this.linkSource(queryRunner,assetId,input.sourceDocumentId,'F5 · fuente territorial autorizada');
return assetId;
}
private async linkSource(queryRunner:QueryRunner,assetId:string,documentId:string,notes:string):Promise<void> {
await queryRunner.query(`
INSERT INTO asset_source_documents(asset_id,document_id,relation_type,notes)
VALUES ($1::uuid,$2::uuid,'SOURCE',$3)
ON CONFLICT (asset_id,document_id,relation_type) DO UPDATE SET notes=EXCLUDED.notes,updated_at=CURRENT_TIMESTAMP
`,[assetId,documentId,notes]);
}
private async id(queryRunner: QueryRunner,sql:string,params:unknown[],label:string):Promise<string> {
const value=await this.optionalId(queryRunner,sql,params);
if (!value) throw new Error(`F5 could not resolve ${label}`);
return value;
}
private async optionalId(queryRunner: QueryRunner,sql:string,params:unknown[]):Promise<string|null> {
const result=(await queryRunner.query(sql,params)) as IdRow[];
return result[0]?.id ?? null;
}
}
@@ -1,182 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
/**
* F5 makes the physical hierarchy Area-owned. Empresa is never a parent nor a
* required property of Yacimiento/Instalación/Subinstalación. The current and
* historical operator/concession truth lives in area_company_relations and is
* frozen separately by each Inspección/Acta.
*
* operator_company_id is retained only as a backwards-compatible creation/
* historical snapshot. Runtime ownership and search MUST NOT depend on it.
*/
export class F5OperationalContextCompatibility1790087250000 implements MigrationInterface {
name = 'F5OperationalContextCompatibility1790087250000';
public async up(queryRunner: QueryRunner): Promise<void> {
await this.installAreaOwnedGuard(queryRunner);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await this.installLegacyPairedGuard(queryRunner);
}
private async installAreaOwnedGuard(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE OR REPLACE FUNCTION enforce_asset_operational_context()
RETURNS trigger LANGUAGE plpgsql AS $$
DECLARE
asset_role asset_type_operational_role;
area_role asset_type_operational_role;
company_role asset_type_operational_role;
active_relation_id uuid;
BEGIN
SELECT operational_role INTO asset_role
FROM asset_types WHERE id=NEW.asset_type_id;
IF asset_role <> 'GENERIC'::asset_type_operational_role THEN
IF NEW.operational_area_id IS NOT NULL OR NEW.operator_company_id IS NOT NULL THEN
RAISE EXCEPTION USING ERRCODE='23514',
MESSAGE='Área y Empresa no reciben contexto operativo de Inventario';
END IF;
RETURN NEW;
END IF;
IF NEW.operator_company_id IS NOT NULL AND NEW.operational_area_id IS NULL THEN
RAISE EXCEPTION USING ERRCODE='23514',
MESSAGE='Un snapshot de Empresa requiere un Área física';
END IF;
-- Once written, an old/current company snapshot cannot be repointed to
-- simulate physical ownership. Company changes happen in the temporal
-- Area↔Empresa relation instead.
IF TG_OP='UPDATE'
AND NEW.operator_company_id IS DISTINCT FROM OLD.operator_company_id THEN
RAISE EXCEPTION USING ERRCODE='23514',
MESSAGE='La Empresa se cambia en la relación temporal del Área, no en el Inventario';
END IF;
IF NEW.operational_area_id IS NULL THEN
RETURN NEW;
END IF;
SELECT type.operational_role INTO area_role
FROM assets area
JOIN asset_types type ON type.id=area.asset_type_id
WHERE area.id=NEW.operational_area_id
AND area.information_status<>'INACTIVE'
AND type.is_active=true;
IF area_role IS DISTINCT FROM 'AREA'::asset_type_operational_role THEN
RAISE EXCEPTION USING ERRCODE='23514',
MESSAGE='operational area must be an active AREA asset';
END IF;
IF NEW.parent_id IS NULL OR NOT EXISTS (
WITH RECURSIVE ancestors AS (
SELECT id,parent_id FROM assets WHERE id=NEW.parent_id
UNION ALL
SELECT parent.id,parent.parent_id
FROM assets parent
JOIN ancestors child ON parent.id=child.parent_id
)
SELECT 1 FROM ancestors WHERE id=NEW.operational_area_id LIMIT 1
) THEN
RAISE EXCEPTION USING ERRCODE='23514',
MESSAGE='operational area must be an ancestor in the physical hierarchy';
END IF;
-- A company value is allowed only as the context snapshot that was valid
-- at creation time. It is never used to decide future membership.
IF NEW.operator_company_id IS NOT NULL THEN
SELECT type.operational_role INTO company_role
FROM assets company
JOIN asset_types type ON type.id=company.asset_type_id
WHERE company.id=NEW.operator_company_id
AND company.information_status<>'INACTIVE'
AND type.is_active=true;
IF company_role IS DISTINCT FROM 'COMPANY'::asset_type_operational_role THEN
RAISE EXCEPTION USING ERRCODE='23514',
MESSAGE='operator snapshot must reference an active COMPANY-role asset';
END IF;
IF TG_OP='INSERT' THEN
SELECT relation.id INTO active_relation_id
FROM area_company_relations relation
WHERE relation.area_id=NEW.operational_area_id
AND relation.company_id=NEW.operator_company_id
AND relation.relation_role='OPERATOR'::area_organization_role
AND relation.valid_until IS NULL
FOR KEY SHARE;
IF active_relation_id IS NULL THEN
RAISE EXCEPTION USING ERRCODE='23514',
MESSAGE='creation operator snapshot must be active for the selected Area';
END IF;
END IF;
END IF;
RETURN NEW;
END $$;
`);
}
/** Restores the production F4-era paired Area+Empresa guard on rollback. */
private async installLegacyPairedGuard(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE OR REPLACE FUNCTION enforce_asset_operational_context()
RETURNS trigger LANGUAGE plpgsql AS $$
DECLARE
asset_role asset_type_operational_role;
area_role asset_type_operational_role;
company_role asset_type_operational_role;
active_relation_id uuid;
BEGIN
IF NEW.operational_area_id IS NULL AND NEW.operator_company_id IS NULL THEN
RETURN NEW;
END IF;
IF NEW.operational_area_id IS NULL OR NEW.operator_company_id IS NULL THEN
RAISE EXCEPTION USING ERRCODE='23514',
MESSAGE='operational area and organization must be assigned together';
END IF;
SELECT operational_role INTO asset_role FROM asset_types WHERE id=NEW.asset_type_id;
IF asset_role <> 'GENERIC'::asset_type_operational_role THEN
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='area and organization assets cannot receive an operational assignment';
END IF;
SELECT type.operational_role INTO area_role
FROM assets area JOIN asset_types type ON type.id=area.asset_type_id
WHERE area.id=NEW.operational_area_id AND area.information_status<>'INACTIVE' AND type.is_active=true;
SELECT type.operational_role INTO company_role
FROM assets company JOIN asset_types type ON type.id=company.asset_type_id
WHERE company.id=NEW.operator_company_id AND company.information_status<>'INACTIVE' AND type.is_active=true;
IF area_role IS DISTINCT FROM 'AREA'::asset_type_operational_role THEN
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='operational area must be an active AREA asset';
END IF;
IF company_role IS DISTINCT FROM 'COMPANY'::asset_type_operational_role THEN
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='operator organization must be an active COMPANY-role asset';
END IF;
SELECT relation.id INTO active_relation_id
FROM area_company_relations relation
WHERE relation.area_id=NEW.operational_area_id
AND relation.company_id=NEW.operator_company_id
AND relation.relation_role='OPERATOR'::area_organization_role
AND relation.valid_until IS NULL
FOR KEY SHARE;
IF active_relation_id IS NULL THEN
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='operational area and organization do not have an active OPERATOR relation';
END IF;
IF NEW.parent_id IS NULL OR NOT EXISTS (
WITH RECURSIVE ancestors AS (
SELECT id,parent_id FROM assets WHERE id=NEW.parent_id
UNION ALL
SELECT parent.id,parent.parent_id FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
) SELECT 1 FROM ancestors WHERE id=NEW.operational_area_id LIMIT 1
) THEN
RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='operational area must be an ancestor in the physical hierarchy';
END IF;
RETURN NEW;
END $$;
`);
}
}
@@ -1,606 +0,0 @@
import { createHash } from 'node:crypto';
import { MigrationInterface, QueryRunner } from 'typeorm';
import {
loadF5InventoryAuthoritativeSource,
type F5InstallationCatalogRow,
type F5SubinstallationCatalogRow,
} from '../../reference-data/f5-authoritative-inventory-source';
type IdRow = { id: string };
type CountRow = { total: number };
const CATALOG_DOCUMENT_NUMBER = 'DH-F5-INVENTORY-CATALOG';
const CATALOG_CATEGORY_CODE = 'F5MODEL';
const CATALOG_SOURCE_NAME = 'final_modelov2.xlsx';
const F5_AUTO_REASON = 'F5 familia técnica: catálogo contextual automático';
const F5_SOURCE_FAMILY_COUNT = 123;
function findingKey(value: string): string {
return value.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
.toLowerCase()
.replace(/[^a-z0-9]+/g, ' ')
.trim()
.replace(/\s+/g, ' ');
}
function hashCode(prefix: string, value: string, length = 12): string {
return `${prefix}-${createHash('sha1').update(value).digest('hex').slice(0, length).toUpperCase()}`;
}
function installationCode(name: string): string {
return hashCode('F5-I', findingKey(name));
}
function subinstallationCode(installation: string, name: string): string {
return hashCode('F5-S', `${findingKey(installation)}|${findingKey(name)}`);
}
function subOtherCode(parentCode: string): string {
return hashCode('F5-S-OTRO', parentCode);
}
export class F5AuthoritativeInventoryCatalog1790087300000 implements MigrationInterface {
name = 'F5AuthoritativeInventoryCatalog1790087300000';
public async up(queryRunner: QueryRunner): Promise<void> {
const source = loadF5InventoryAuthoritativeSource();
if (
source.catalogSource.file !== CATALOG_SOURCE_NAME
|| source.catalogSource.sheet !== 'Hoja1'
|| source.catalogSource.sha256 !== 'c9a2d1db59fff2157162c41009b8c9042a3c7a3001649239a07732a3b8fca155'
|| source.catalogSource.installations.length !== 14
|| source.catalogSource.subinstallations.length !== 109
) {
throw new Error('F5 inventory catalog source contract mismatch');
}
if (source.catalogSource.universalFindings.length !== 3) {
throw new Error(`F5 universal finding contract mismatch: ${source.catalogSource.universalFindings.length}`);
}
const universalKeys = new Set(source.catalogSource.universalFindings.map(findingKey));
for (const required of [
'ORDEN Y LIMPIEZA',
'CARTELERIA PREVENTIVA / INFORMATIVA',
'EXTINTORES',
]) {
if (!universalKeys.has(findingKey(required))) {
throw new Error(`F5 missing authoritative universal finding: ${required}`);
}
}
await queryRunner.query(`
INSERT INTO source_documents (
document_type,document_number,title,issuer,external_reference,notes
)
VALUES ('SPREADSHEET',$1,$2,'Dirección de Hidrocarburos',$3,$4)
ON CONFLICT (document_number,issuer) WHERE document_number IS NOT NULL AND issuer IS NOT NULL
DO UPDATE SET
title=EXCLUDED.title,
external_reference=EXCLUDED.external_reference,
notes=EXCLUDED.notes,
updated_at=CURRENT_TIMESTAMP
`, [
CATALOG_DOCUMENT_NUMBER,
CATALOG_SOURCE_NAME,
`sha256:${source.catalogSource.sha256}`,
`F5 · catálogo técnico autorizado · hoja ${source.catalogSource.sheet} · 14 Instalaciones · 109 Subinstalaciones`,
]);
// Only the known historical spreadsheet catalog is superseded. Families
// created manually by DH (including source_reference NULL) remain untouched.
await queryRunner.query(`
UPDATE inventory_families
SET is_active=false,updated_at=CURRENT_TIMESTAMP
WHERE source_reference LIKE 'APLICACION APP%'
OR source_reference LIKE 'SYSTEM:F3.1:%'
`);
await queryRunner.query(`
UPDATE finding_categories
SET is_active=false,updated_at=CURRENT_TIMESTAMP
WHERE lower(code) IN ('app26','app26r2')
`);
const installationIds = new Map<string,string>();
for (const installation of source.catalogSource.installations) {
const familyId = await this.upsertFamily(
queryRunner,
installationCode(installation.name),
installation.name,
'INSTALLATION',
`F5:${CATALOG_SOURCE_NAME}|${source.catalogSource.sheet}|rows:${installation.sourceStartRow}-${installation.sourceEndRow}`,
);
installationIds.set(findingKey(installation.name),familyId);
}
for (const subinstallation of source.catalogSource.subinstallations) {
const parentId = installationIds.get(findingKey(subinstallation.installation));
if (!parentId) throw new Error(`F5 missing installation family ${subinstallation.installation}`);
const childId = await this.upsertFamily(
queryRunner,
subinstallationCode(subinstallation.installation,subinstallation.name),
subinstallation.name,
'SUBINSTALLATION',
`F5:${CATALOG_SOURCE_NAME}|${source.catalogSource.sheet}|rows:${subinstallation.sourceStartRow}-${subinstallation.sourceEndRow}${subinstallation.reference ? `|reference:${subinstallation.reference}` : ''}`,
);
await this.parentRule(queryRunner,childId,parentId);
}
const installationOtherId = await this.upsertFamily(
queryRunner,
'F5-I-OTRO',
'Otro / no catalogado',
'INSTALLATION',
'F5:SYSTEM:OTHER:INSTALLATION',
);
for (const [installationKey,parentId] of installationIds) {
const parent = source.catalogSource.installations.find((item) => findingKey(item.name)===installationKey);
if (!parent) continue;
const childId = await this.upsertFamily(
queryRunner,
subOtherCode(installationCode(parent.name)),
'Otro / no catalogado',
'SUBINSTALLATION',
`F5:SYSTEM:OTHER:SUBINSTALLATION:${installationCode(parent.name)}`,
);
await this.parentRule(queryRunner,childId,parentId);
}
const rootOtherChild = await this.upsertFamily(
queryRunner,
subOtherCode('F5-I-OTRO'),
'Otro / no catalogado',
'SUBINSTALLATION',
'F5:SYSTEM:OTHER:SUBINSTALLATION:F5-I-OTRO',
);
await this.parentRule(queryRunner,rootOtherChild,installationOtherId);
await queryRunner.query(`
INSERT INTO finding_categories(code,name,sort_order,is_active)
SELECT $1::varchar,'DH · Modelo de Inventarios F5',270,true
WHERE NOT EXISTS (SELECT 1 FROM finding_categories WHERE lower(code)=lower($1::varchar))
`, [CATALOG_CATEGORY_CODE]);
await queryRunner.query(`
UPDATE finding_categories
SET name='DH · Modelo de Inventarios F5',sort_order=270,is_active=true,updated_at=CURRENT_TIMESTAMP
WHERE lower(code)=lower($1::varchar)
`,[CATALOG_CATEGORY_CODE]);
const categoryId = await this.id(
queryRunner,
`SELECT id FROM finding_categories WHERE lower(code)=lower($1::varchar) LIMIT 1`,
[CATALOG_CATEGORY_CODE],
'F5 finding category',
);
const titleByKey = new Map<string,string>();
const register = (title: string): void => {
const clean = title.trim();
if (!clean || /^idem\b/i.test(clean) || findingKey(clean)==='hallazgos') return;
const itemKey = findingKey(clean);
if (!titleByKey.has(itemKey)) titleByKey.set(itemKey,clean);
};
for (const title of source.catalogSource.universalFindings) register(title);
for (const family of source.catalogSource.installations) for (const title of family.findings) register(title);
for (const family of source.catalogSource.subinstallations) for (const title of family.findings) register(title);
if (titleByKey.size !== 177) {
throw new Error(`F5 finding normalization contract mismatch: ${titleByKey.size}`);
}
const itemIdByKey = new Map<string,string>();
const orderedTitles = [...titleByKey.entries()].sort((a,b)=>a[1].localeCompare(b[1],'es'));
let sourceNumber=1;
for (const [itemKey,title] of orderedTitles) {
const itemCode = hashCode('F5-H',itemKey);
let itemId = await this.optionalId(
queryRunner,
`SELECT id FROM finding_catalog_items WHERE lower(code)=lower($1::varchar) LIMIT 1`,
[itemCode],
);
if (!itemId) {
const itemRows = (await queryRunner.query(`
INSERT INTO finding_catalog_items (
category_id,code,source_number,title,import_note,revision,is_active
) VALUES ($1::uuid,$2,$3,$4,$5,1,true)
RETURNING id
`,[
categoryId,itemCode,sourceNumber,title,
`${CATALOG_SOURCE_NAME} · ${source.catalogSource.sheet} · F5 authoritative catalog`,
])) as IdRow[];
itemId=itemRows[0]?.id ?? null;
} else {
await queryRunner.query(`
UPDATE finding_catalog_items
SET category_id=$2::uuid,source_number=$3,title=$4,import_note=$5,
is_active=true,updated_at=CURRENT_TIMESTAMP
WHERE id=$1::uuid
`,[
itemId,categoryId,sourceNumber,title,
`${CATALOG_SOURCE_NAME} · ${source.catalogSource.sheet} · F5 authoritative catalog`,
]);
}
if (!itemId) throw new Error(`F5 could not create finding ${title}`);
itemIdByKey.set(itemKey,itemId);
await queryRunner.query(`
INSERT INTO finding_catalog_item_versions(item_id,revision,snapshot,actor_username)
SELECT item.id,item.revision,
jsonb_build_object(
'id',item.id,'categoryId',category.id,'categoryCode',category.code,
'categoryName',category.name,'code',item.code,'sourceNumber',item.source_number,
'title',item.title,'legalBasis',item.legal_basis,'glossary',item.glossary,
'importNote',item.import_note,'revision',item.revision,'isActive',item.is_active
),'migration:F5'
FROM finding_catalog_items item
JOIN finding_categories category ON category.id=item.category_id
WHERE item.id=$1::uuid
AND NOT EXISTS (
SELECT 1 FROM finding_catalog_item_versions version
WHERE version.item_id=item.id AND version.revision=item.revision
)
`,[itemId]);
sourceNumber+=1;
}
// Add F5 mappings only. Never delete mappings created by office users or by
// historical migrations; inactive historical families simply stop being offered.
for (const family of source.catalogSource.installations) {
await this.mapFindings(
queryRunner,
installationCode(family.name),
family,
source.catalogSource.universalFindings,
itemIdByKey,
);
}
for (const family of source.catalogSource.subinstallations) {
await this.mapFindings(
queryRunner,
subinstallationCode(family.installation,family.name),
family,
source.catalogSource.universalFindings,
itemIdByKey,
);
}
await this.installFamilySyncFunctions(queryRunner);
// Keep pre-existing profile administration untouched. Yacimiento needs a
// profile only to expose OTROS because the source does not provide a family.
await queryRunner.query(`
INSERT INTO finding_catalog_asset_type_profiles(asset_type_id,reason)
SELECT id,'F5: Yacimiento admite Hallazgos mediante OTROS; no posee familia precargada en final_modelov2.xlsx.'
FROM asset_types WHERE lower(code)='yacimiento'
ON CONFLICT (asset_type_id) DO NOTHING
`);
const [counts] = (await queryRunner.query(`
SELECT
COUNT(*) FILTER (WHERE level='INSTALLATION' AND source_reference LIKE 'F5:${CATALOG_SOURCE_NAME}%')::integer AS installations,
COUNT(*) FILTER (WHERE level='SUBINSTALLATION' AND source_reference LIKE 'F5:${CATALOG_SOURCE_NAME}%')::integer AS subinstallations
FROM inventory_families WHERE is_active=true
`)) as Array<{ installations:number; subinstallations:number }>;
if (Number(counts?.installations ?? 0)!==14 || Number(counts?.subinstallations ?? 0)!==109) {
throw new Error(`F5 family preload verification failed: ${JSON.stringify(counts ?? {})}`);
}
const [itemCount] = (await queryRunner.query(`
SELECT COUNT(*)::integer AS total
FROM finding_catalog_items
WHERE category_id=$1::uuid AND is_active=true
`,[categoryId])) as CountRow[];
if (Number(itemCount?.total ?? 0)!==177) {
throw new Error(`F5 finding preload verification failed: ${itemCount?.total ?? 0}`);
}
// Verify every universal finding is independently attached to every one of
// the 14 + 109 source families. This intentionally avoids optional DB text
// extensions such as unaccent.
for (const universalTitle of source.catalogSource.universalFindings) {
const universalItemId = itemIdByKey.get(findingKey(universalTitle));
if (!universalItemId) throw new Error(`F5 missing universal catalog item ${universalTitle}`);
const [mappedCount] = (await queryRunner.query(`
SELECT COUNT(DISTINCT mapping.inventory_family_id)::integer AS total
FROM finding_catalog_item_inventory_families mapping
JOIN inventory_families family ON family.id=mapping.inventory_family_id
WHERE mapping.catalog_item_id=$1::uuid
AND family.is_active=true
AND family.source_reference LIKE $2
`,[universalItemId,`F5:${CATALOG_SOURCE_NAME}%`])) as CountRow[];
if (Number(mappedCount?.total ?? 0)!==F5_SOURCE_FAMILY_COUNT) {
throw new Error(`F5 universal mapping verification failed for ${universalTitle}: ${mappedCount?.total ?? 0}`);
}
}
}
public async down(queryRunner: QueryRunner): Promise<void> {
const categoryId = await this.optionalId(
queryRunner,
`SELECT id FROM finding_categories WHERE lower(code)=lower($1::varchar) LIMIT 1`,
[CATALOG_CATEGORY_CODE],
);
if (categoryId) {
const [usedFinding] = (await queryRunner.query(`
SELECT COUNT(*)::integer AS total
FROM inspection_findings finding
JOIN finding_catalog_items item ON item.id=finding.catalog_item_id
WHERE item.category_id=$1::uuid
`,[categoryId])) as CountRow[];
if (Number(usedFinding?.total ?? 0)>0) {
throw new Error('Cannot safely rollback F5 catalog: inspection findings already reference F5 catalog items');
}
}
const [usedFamily] = (await queryRunner.query(`
SELECT COUNT(*)::integer AS total
FROM assets asset
JOIN inventory_families family ON family.id=asset.inventory_family_id
WHERE family.source_reference LIKE 'F5:%'
`)) as CountRow[];
if (Number(usedFamily?.total ?? 0)>0) {
throw new Error('Cannot safely rollback F5 catalog: inventory instances already reference F5 families');
}
await queryRunner.query(`
DELETE FROM finding_catalog_asset_overrides
WHERE reason=$1::text
`,[F5_AUTO_REASON]);
if (categoryId) {
await queryRunner.query(`
DELETE FROM finding_catalog_item_inventory_families mapping
USING finding_catalog_items item
WHERE item.id=mapping.catalog_item_id AND item.category_id=$1::uuid
`,[categoryId]);
await queryRunner.query(`
DELETE FROM finding_catalog_item_versions version
USING finding_catalog_items item
WHERE item.id=version.item_id AND item.category_id=$1::uuid
`,[categoryId]);
await queryRunner.query(`DELETE FROM finding_catalog_items WHERE category_id=$1::uuid`,[categoryId]);
await queryRunner.query(`DELETE FROM finding_categories WHERE id=$1::uuid`,[categoryId]);
}
await queryRunner.query(`
DELETE FROM inventory_family_parent_rules rule
USING inventory_families child
WHERE child.id=rule.child_family_id AND child.source_reference LIKE 'F5:%'
`);
await queryRunner.query(`DELETE FROM inventory_families WHERE source_reference LIKE 'F5:%'`);
await queryRunner.query(`
UPDATE inventory_families
SET is_active=true,updated_at=CURRENT_TIMESTAMP
WHERE source_reference LIKE 'APLICACION APP%'
OR source_reference LIKE 'SYSTEM:F3.1:%'
`);
await queryRunner.query(`
UPDATE finding_categories SET is_active=true,updated_at=CURRENT_TIMESTAMP
WHERE lower(code)='app26r2'
`);
await queryRunner.query(`
DELETE FROM finding_catalog_asset_type_profiles profile
USING asset_types type
WHERE profile.asset_type_id=type.id
AND lower(type.code)='yacimiento'
AND profile.reason='F5: Yacimiento admite Hallazgos mediante OTROS; no posee familia precargada en final_modelov2.xlsx.'
`);
await queryRunner.query(`
DELETE FROM source_documents
WHERE document_number=$1::varchar AND issuer='Dirección de Hidrocarburos'
`,[CATALOG_DOCUMENT_NUMBER]);
await this.restoreF31FamilySyncFunctions(queryRunner);
// Rebuild only automatic historical overrides. Manual overrides have never
// been touched by this migration.
await queryRunner.query(`
DELETE FROM finding_catalog_asset_overrides
WHERE reason LIKE 'F3.1 familia técnica:%'
`);
await queryRunner.query(`
INSERT INTO finding_catalog_asset_overrides(
asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
)
SELECT asset.id,mapping.catalog_item_id,true,
'F3.1 familia técnica: catálogo contextual automático',
asset.created_by,asset.updated_by
FROM assets asset
JOIN finding_catalog_item_inventory_families mapping
ON mapping.inventory_family_id=asset.inventory_family_id
WHERE asset.inventory_family_id IS NOT NULL
ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
is_enabled=true,
reason='F3.1 familia técnica: catálogo contextual automático',
updated_at=CURRENT_TIMESTAMP
`);
}
private async upsertFamily(
queryRunner: QueryRunner,
familyCode: string,
name: string,
level: 'INSTALLATION'|'SUBINSTALLATION',
sourceReference: string,
): Promise<string> {
await queryRunner.query(`
INSERT INTO inventory_families(
code,name,level,legacy_type_code,information_labels,source_reference,is_active
) VALUES ($1,$2,$3,NULL,'[]'::jsonb,$4,true)
ON CONFLICT (code) DO UPDATE SET
name=EXCLUDED.name,level=EXCLUDED.level,legacy_type_code=NULL,
information_labels='[]'::jsonb,source_reference=EXCLUDED.source_reference,
is_active=true,updated_at=CURRENT_TIMESTAMP
`,[familyCode,name,level,sourceReference]);
return this.id(
queryRunner,
`SELECT id FROM inventory_families WHERE code=$1::varchar LIMIT 1`,
[familyCode],
`inventory family ${familyCode}`,
);
}
private async parentRule(queryRunner: QueryRunner,childId:string,parentId:string):Promise<void> {
await queryRunner.query(`
INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
VALUES ($1::uuid,$2::uuid)
ON CONFLICT (child_family_id) DO UPDATE SET parent_family_id=EXCLUDED.parent_family_id
`,[childId,parentId]);
}
private async mapFindings(
queryRunner: QueryRunner,
familyCode: string,
family: F5InstallationCatalogRow|F5SubinstallationCatalogRow,
universalFindings: string[],
itemIdByKey: Map<string,string>,
): Promise<void> {
const familyId = await this.id(
queryRunner,
`SELECT id FROM inventory_families WHERE code=$1::varchar LIMIT 1`,
[familyCode],
`family ${familyCode}`,
);
const mapped = new Set<string>();
for (const rawTitle of [...family.findings,...universalFindings]) {
const itemKey=findingKey(rawTitle);
if (!itemKey || itemKey==='hallazgos' || mapped.has(itemKey)) continue;
mapped.add(itemKey);
const itemId=itemIdByKey.get(itemKey);
if (!itemId) throw new Error(`F5 missing finding item ${rawTitle}`);
await queryRunner.query(`
INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
VALUES ($1::uuid,$2::uuid)
ON CONFLICT (catalog_item_id,inventory_family_id) DO NOTHING
`,[itemId,familyId]);
}
}
private async installFamilySyncFunctions(queryRunner: QueryRunner):Promise<void> {
await queryRunner.query(`
CREATE OR REPLACE FUNCTION sync_asset_inventory_family_catalog()
RETURNS trigger LANGUAGE plpgsql AS $$
BEGIN
DELETE FROM finding_catalog_asset_overrides
WHERE asset_id=NEW.id AND reason LIKE 'F% familia técnica:%';
IF NEW.inventory_family_id IS NOT NULL THEN
INSERT INTO finding_catalog_asset_overrides(
asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
)
SELECT NEW.id,mapping.catalog_item_id,true,
'F5 familia técnica: catálogo contextual automático',
NEW.created_by,NEW.updated_by
FROM finding_catalog_item_inventory_families mapping
WHERE mapping.inventory_family_id=NEW.inventory_family_id
ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
is_enabled=true,reason='F5 familia técnica: catálogo contextual automático',
updated_by=NEW.updated_by,updated_at=CURRENT_TIMESTAMP;
END IF;
RETURN NEW;
END $$;
`);
await queryRunner.query(`
CREATE OR REPLACE FUNCTION sync_inventory_family_mapping_assets()
RETURNS trigger LANGUAGE plpgsql AS $$
BEGIN
IF TG_OP='DELETE' THEN
DELETE FROM finding_catalog_asset_overrides override_record
USING assets asset
WHERE override_record.asset_id=asset.id
AND asset.inventory_family_id=OLD.inventory_family_id
AND override_record.catalog_item_id=OLD.catalog_item_id
AND override_record.reason LIKE 'F% familia técnica:%';
RETURN OLD;
END IF;
INSERT INTO finding_catalog_asset_overrides(
asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
)
SELECT asset.id,NEW.catalog_item_id,true,
'F5 familia técnica: catálogo contextual automático',
asset.created_by,asset.updated_by
FROM assets asset
WHERE asset.inventory_family_id=NEW.inventory_family_id
ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
is_enabled=true,reason='F5 familia técnica: catálogo contextual automático',updated_at=CURRENT_TIMESTAMP;
RETURN NEW;
END $$;
`);
await queryRunner.query(`
DELETE FROM finding_catalog_asset_overrides
WHERE reason LIKE 'F% familia técnica:%'
`);
await queryRunner.query(`
INSERT INTO finding_catalog_asset_overrides(
asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
)
SELECT asset.id,mapping.catalog_item_id,true,$1::text,
asset.created_by,asset.updated_by
FROM assets asset
JOIN finding_catalog_item_inventory_families mapping
ON mapping.inventory_family_id=asset.inventory_family_id
WHERE asset.inventory_family_id IS NOT NULL
ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
is_enabled=true,reason=$1::text,updated_at=CURRENT_TIMESTAMP
`,[F5_AUTO_REASON]);
}
private async restoreF31FamilySyncFunctions(queryRunner: QueryRunner):Promise<void> {
await queryRunner.query(`
CREATE OR REPLACE FUNCTION sync_asset_inventory_family_catalog()
RETURNS trigger LANGUAGE plpgsql AS $$
BEGIN
DELETE FROM finding_catalog_asset_overrides
WHERE asset_id=NEW.id AND reason LIKE 'F3.1 familia técnica:%';
IF NEW.inventory_family_id IS NOT NULL THEN
INSERT INTO finding_catalog_asset_overrides(
asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
)
SELECT NEW.id,mapping.catalog_item_id,true,
'F3.1 familia técnica: catálogo contextual automático',
NEW.created_by,NEW.updated_by
FROM finding_catalog_item_inventory_families mapping
WHERE mapping.inventory_family_id=NEW.inventory_family_id
ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
is_enabled=true,reason='F3.1 familia técnica: catálogo contextual automático',
updated_by=NEW.updated_by,updated_at=CURRENT_TIMESTAMP;
END IF;
RETURN NEW;
END $$;
`);
await queryRunner.query(`
CREATE OR REPLACE FUNCTION sync_inventory_family_mapping_assets()
RETURNS trigger LANGUAGE plpgsql AS $$
BEGIN
IF TG_OP='DELETE' THEN
DELETE FROM finding_catalog_asset_overrides override_record
USING assets asset
WHERE override_record.asset_id=asset.id
AND asset.inventory_family_id=OLD.inventory_family_id
AND override_record.catalog_item_id=OLD.catalog_item_id
AND override_record.reason LIKE 'F3.1 familia técnica:%';
RETURN OLD;
END IF;
INSERT INTO finding_catalog_asset_overrides(
asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
)
SELECT asset.id,NEW.catalog_item_id,true,
'F3.1 familia técnica: catálogo contextual automático',
asset.created_by,asset.updated_by
FROM assets asset
WHERE asset.inventory_family_id=NEW.inventory_family_id
ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
is_enabled=true,reason='F3.1 familia técnica: catálogo contextual automático',
updated_at=CURRENT_TIMESTAMP;
RETURN NEW;
END $$;
`);
}
private async id(queryRunner: QueryRunner,sql:string,params:unknown[],label:string):Promise<string> {
const value=await this.optionalId(queryRunner,sql,params);
if (!value) throw new Error(`F5 could not resolve ${label}`);
return value;
}
private async optionalId(queryRunner: QueryRunner,sql:string,params:unknown[]):Promise<string|null> {
const rows=(await queryRunner.query(sql,params)) as IdRow[];
return rows[0]?.id ?? null;
}
}
@@ -4,7 +4,6 @@ import {
ArrayMinSize,
ArrayUnique,
IsArray,
IsEnum,
IsISO8601,
IsOptional,
IsString,
@@ -12,15 +11,11 @@ import {
MaxLength,
MinLength,
} from 'class-validator';
import { InspectionActUrgency } from '../../database/entities';
export class CreateInspectionActDto {
@IsISO8601({ strict: true })
occurredAt!: string;
@IsEnum(InspectionActUrgency)
urgency!: InspectionActUrgency;
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
@IsString()
@MinLength(1)
@@ -4,7 +4,6 @@ import {
ArrayMinSize,
ArrayUnique,
IsArray,
IsEnum,
IsISO8601,
IsOptional,
IsString,
@@ -12,17 +11,12 @@ import {
MaxLength,
MinLength,
} from 'class-validator';
import { InspectionActUrgency } from '../../database/entities';
export class UpdateInspectionActDto {
@IsOptional()
@IsISO8601({ strict: true })
occurredAt?: string;
@IsOptional()
@IsEnum(InspectionActUrgency)
urgency?: InspectionActUrgency;
@IsOptional()
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
@IsString()
@@ -14,9 +14,6 @@ import {
DocumentSequenceType,
InspectionAct,
InspectionActStatus,
InspectionActUrgency,
InspectionDeadlineBasis,
InspectionDeadlineDayType,
InspectionActVersionEvent,
InspectionVisit,
InspectionVisitStatus,
@@ -44,6 +41,7 @@ interface ActAsset {
interface ActVisitSummary {
id: string;
code: string;
title: string;
status: InspectionVisitStatus;
actualStartedAt: Date | null;
}
@@ -74,17 +72,6 @@ export interface InspectionActListItem {
title: string;
summary: string;
observations: string | null;
urgency: InspectionActUrgency;
deadlineDays: number | null;
deadlineDayType: InspectionDeadlineDayType | null;
deadlineBasis: InspectionDeadlineBasis | null;
deadlineBaseAt: Date | null;
deadlineAt: Date | null;
lockedAt: Date | null;
lockedBy: string | null;
lockedSha256: string | null;
sealedAt: Date | null;
sealedBy: string | null;
currentVersion: number;
cancellationReason: string | null;
closedAt: Date | null;
@@ -150,6 +137,7 @@ export class InspectionActsService {
act.code ILIKE ${search}
OR act.title ILIKE ${search}
OR visit.code ILIKE ${search}
OR visit.title ILIKE ${search}
OR EXISTS (
SELECT 1
FROM inspection_act_assets search_link
@@ -325,16 +313,13 @@ export class InspectionActsService {
const occurredAt = new Date(dto.occurredAt);
const actYear = await this.yearAtProjectTimezone(manager, occurredAt);
const actNumber = await this.allocateNumber(manager, actYear);
if (actNumber > 99999) {
if (actNumber > 999999) {
throw new ConflictException({
code: 'INSPECTION_ACT_SEQUENCE_EXHAUSTED',
message: 'La numeración anual de actas agotó su rango disponible',
});
}
const [dateRow] = (await manager.query(`
SELECT TO_CHAR($1::timestamptz AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY') AS date_part
`, [occurredAt])) as Array<{ date_part: string }>;
const code = `ACT-${String(actNumber).padStart(5, '0')}-${dateRow.date_part}`;
const code = `ACTA-${actYear}-${String(actNumber).padStart(6, '0')}`;
const act = manager.getRepository(InspectionAct).create({
visitId,
actYear,
@@ -345,17 +330,6 @@ export class InspectionActsService {
title: dto.title,
summary: dto.summary,
observations: dto.observations ?? null,
urgency: dto.urgency,
deadlineDays: null,
deadlineDayType: null,
deadlineBasis: null,
deadlineBaseAt: null,
deadlineAt: null,
lockedAt: null,
lockedBy: null,
lockedSha256: null,
sealedAt: null,
sealedBy: null,
currentVersion: 0,
cancellationReason: null,
createdBy: principal.userId,
@@ -410,7 +384,6 @@ export class InspectionActsService {
await this.assertVisitAssets(manager, visit.id, nextAssetIds);
const before = await this.loadView(manager, id);
if (dto.occurredAt !== undefined) act.occurredAt = nextOccurredAt;
if (dto.urgency !== undefined) act.urgency = dto.urgency;
if (dto.title !== undefined) act.title = dto.title;
if (dto.summary !== undefined) act.summary = dto.summary;
if (dto.observations !== undefined) act.observations = dto.observations;
@@ -489,6 +462,7 @@ export class InspectionActsService {
JSONB_BUILD_OBJECT(
'id', visit.id,
'code', visit.code,
'title', visit.title,
'status', visit.status,
'actualStartedAt', visit.actual_started_at
) AS visit,
@@ -500,17 +474,6 @@ export class InspectionActsService {
act.title,
act.summary,
act.observations,
act.urgency,
act.deadline_days AS "deadlineDays",
act.deadline_day_type AS "deadlineDayType",
act.deadline_basis AS "deadlineBasis",
act.deadline_base_at AS "deadlineBaseAt",
act.deadline_at AS "deadlineAt",
act.locked_at AS "lockedAt",
act.locked_by AS "lockedBy",
act.locked_sha256 AS "lockedSha256",
act.sealed_at AS "sealedAt",
act.sealed_by AS "sealedBy",
act.current_version AS "currentVersion",
act.cancellation_reason AS "cancellationReason",
act.closed_at AS "closedAt",
@@ -682,7 +645,7 @@ export class InspectionActsService {
if (rows.length > 0) {
throw new ConflictException({
code: 'INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS',
message: 'La inspección ya tiene un acta en borrador; finalizala o cancelala antes de crear otra',
message: 'La inspección ya tiene un acta en borrador; preparala o cancelala antes de crear otra',
});
}
}
@@ -702,7 +665,7 @@ export class InspectionActsService {
if (assetIds.length < 1 || Number(row?.count ?? 0) !== assetIds.length) {
throw new BadRequestException({
code: 'INSPECTION_ACT_ASSET_INVALID',
message: 'Cada inventario del acta debe estar incluido en la inspección',
message: 'Cada activo del acta debe estar incluido en la visita',
});
}
}
@@ -795,15 +758,6 @@ export class InspectionActsService {
'title', act.title,
'summary', act.summary,
'observations', act.observations,
'urgency', act.urgency,
'deadlineDays', act.deadline_days,
'deadlineDayType', act.deadline_day_type,
'deadlineBasis', act.deadline_basis,
'deadlineBaseAt', act.deadline_base_at,
'deadlineAt', act.deadline_at,
'lockedAt', act.locked_at,
'lockedSha256', act.locked_sha256,
'sealedAt', act.sealed_at,
'currentVersion', act.current_version,
'cancellationReason', act.cancellation_reason,
'createdBy', act.created_by,
@@ -811,6 +765,7 @@ export class InspectionActsService {
'visit', JSONB_BUILD_OBJECT(
'id', visit.id,
'code', visit.code,
'title', visit.title,
'status', visit.status,
'scopeAssetId', visit.scope_asset_id,
'actualStartedAt', visit.actual_started_at
@@ -849,15 +804,6 @@ export class InspectionActsService {
title: act.title,
summary: act.summary,
observations: act.observations,
urgency: act.urgency,
deadlineDays: act.deadlineDays,
deadlineDayType: act.deadlineDayType,
deadlineBasis: act.deadlineBasis,
deadlineBaseAt: act.deadlineBaseAt,
deadlineAt: act.deadlineAt,
lockedAt: act.lockedAt,
lockedSha256: act.lockedSha256,
sealedAt: act.sealedAt,
currentVersion: act.currentVersion,
cancellationReason: act.cancellationReason,
closedAt: act.closedAt,
@@ -1,77 +0,0 @@
import {
Body,
Controller,
Get,
Param,
ParseUUIDPipe,
Post,
Req,
UploadedFile,
UseInterceptors,
} from '@nestjs/common';
import { FileInterceptor } from '@nestjs/platform-express';
import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
import { Public } from '../auth/decorators/public.decorator';
import { SkipCsrf } from '../auth/decorators/skip-csrf.decorator';
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import { CompanySignatureInviteService } from './company-signature-invite.service';
import {
CreateCompanySignatureInviteDto,
PublicCompanyRefusalDto,
PublicCompanySignatureDto,
} from './dto/company-signature-invite.dto';
import {
MAX_INSPECTION_SIGNATURE_BYTES,
type UploadedInspectionSignatureFile,
} from './inspection-signature-file';
@Controller('inspection-acts/:actId/company-signature-invitations')
export class CompanySignatureInviteController {
constructor(private readonly invites: CompanySignatureInviteService) {}
@Post()
@RequirePermissions('inspection_closure.sign')
create(
@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
@Body() dto: CreateCompanySignatureInviteDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.invites.create(actId, dto, principal, request);
}
}
@Public()
@SkipCsrf()
@Controller('public/company-signatures')
export class PublicCompanySignatureController {
constructor(private readonly invites: CompanySignatureInviteService) {}
@Get(':token')
view(@Param('token') token: string) {
return this.invites.view(token);
}
@Post(':token/sign')
@UseInterceptors(FileInterceptor('file', {
limits: { fileSize: MAX_INSPECTION_SIGNATURE_BYTES, files: 1 },
}))
sign(
@Param('token') token: string,
@Body() dto: PublicCompanySignatureDto,
@UploadedFile() file: UploadedInspectionSignatureFile | undefined,
@Req() request: RequestWithContext,
) {
return this.invites.sign(token, dto, file, request);
}
@Post(':token/refuse')
refuse(
@Param('token') token: string,
@Body() dto: PublicCompanyRefusalDto,
@Req() request: RequestWithContext,
) {
return this.invites.refuse(token, dto, request);
}
}
@@ -1,624 +0,0 @@
import { createHash, randomBytes, randomUUID } from 'node:crypto';
import { mkdir, unlink, writeFile } from 'node:fs/promises';
import { isAbsolute, parse, resolve } from 'node:path';
import {
ConflictException,
GoneException,
Injectable,
InternalServerErrorException,
NotFoundException,
} from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { DataSource, EntityManager } from 'typeorm';
import { administrationAuditContext } from '../administration/common/administration-audit';
import { AuditService } from '../audit/audit.service';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import {
AuditSource,
InspectionActSignatureSource,
InspectionActSignatureStatus,
InspectionActSignerType,
InspectionCompanySignatureManifestation,
} from '../database/entities';
import { SmtpDeliveryService } from '../inspection-reports/smtp-delivery.service';
import { sha256CanonicalJson } from './canonical-json';
import type {
CreateCompanySignatureInviteDto,
PublicCompanyRefusalDto,
PublicCompanySignatureDto,
} from './dto/company-signature-invite.dto';
import {
inspectInspectionSignatureFile,
type UploadedInspectionSignatureFile,
} from './inspection-signature-file';
const REMOTE_CONSENT_VERSION = 'F4-1';
const REMOTE_COMPANY_CONSENT = 'Declaro haber leído o recibido explicación del contenido del Acta y que esta firma se incorpora como constancia de recepción, sin implicar aceptación de los Hallazgos.';
interface InviteContext {
id: string;
actId: string;
tokenSha256: string;
recipientEmail: string;
recipientName: string | null;
recipientDocumentType: string | null;
recipientDocumentNumber: string | null;
recipientPosition: string | null;
status: 'PENDING' | 'USED' | 'REVOKED' | 'EXPIRED';
expiresAt: Date;
sentAt: Date | null;
usedAt: Date | null;
createdBy: string;
actCode: string;
actStatus: string;
lockedSha256: string | null;
lockedAt: Date | null;
inspectionCode: string;
lockedSnapshot: Record<string, unknown> | null;
}
@Injectable()
export class CompanySignatureInviteService {
private readonly signatureRoot: string;
constructor(
private readonly dataSource: DataSource,
private readonly audit: AuditService,
private readonly smtp: SmtpDeliveryService,
private readonly config: ConfigService,
) {
const configured = config.get<string>('INSPECTION_SIGNATURE_ROOT')
?? '/app/storage/asset-media/inspection-signatures';
if (!isAbsolute(configured)) throw new Error('INSPECTION_SIGNATURE_ROOT must be an absolute path');
this.signatureRoot = resolve(configured);
if (this.signatureRoot === parse(this.signatureRoot).root) {
throw new Error('INSPECTION_SIGNATURE_ROOT cannot be the filesystem root');
}
}
async create(
actId: string,
dto: CreateCompanySignatureInviteDto,
principal: AuthPrincipal,
request: RequestWithContext,
) {
const token = randomBytes(32).toString('base64url');
const tokenSha256 = this.hashToken(token);
const expiresAt = new Date(Date.now() + (dto.expiresInDays ?? 7) * 24 * 60 * 60 * 1000);
const created = await this.dataSource.transaction(async (manager) => {
await this.assertActorAssigned(manager, actId, principal);
const [context] = await manager.query(`
SELECT
act.id,
act.code,
act.status,
act.locked_sha256 AS "lockedSha256",
responsible.full_name AS "fullName",
responsible.document_type AS "documentType",
responsible.document_number AS "documentNumber",
responsible.position,
responsible.email AS "responsibleEmail",
visit.code AS "inspectionCode",
(
SELECT profile.notification_email
FROM inspection_act_assets link
JOIN assets inventory ON inventory.id=link.asset_id
JOIN asset_types inventory_type ON inventory_type.id=inventory.asset_type_id
JOIN assets company ON company.id=COALESCE(
inventory.operator_company_id,
CASE WHEN inventory_type.operational_role='COMPANY' THEN inventory.id END
)
LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
WHERE link.act_id=act.id AND link.included=true
AND profile.notification_email IS NOT NULL
ORDER BY company.id
LIMIT 1
) AS "companyEmail"
FROM inspection_acts act
JOIN inspection_visits visit ON visit.id=act.visit_id
LEFT JOIN inspection_act_responsibles responsible ON responsible.act_id=act.id
WHERE act.id=$1
FOR UPDATE OF act
`, [actId]) as Array<{
id: string;
code: string;
status: string;
lockedSha256: string | null;
fullName: string | null;
documentType: string | null;
documentNumber: string | null;
position: string | null;
responsibleEmail: string | null;
inspectionCode: string;
companyEmail: string | null;
}>;
if (!context) {
throw new NotFoundException({ code: 'INSPECTION_ACT_NOT_FOUND', message: 'Acta no encontrada' });
}
if (context.status !== 'LOCKED' || !context.lockedSha256) {
throw new ConflictException({
code: 'COMPANY_SIGNATURE_INVITE_ACT_NOT_LOCKED',
message: 'La invitación de firma sólo puede emitirse para un Acta BLOQUEADA',
});
}
if (await this.hasCompanyOutcome(manager, actId)) {
throw new ConflictException({
code: 'COMPANY_SIGNATURE_ALREADY_RESOLVED',
message: 'La manifestación de la empresa ya fue registrada',
});
}
const recipientEmail = dto.recipientEmail
?? context.responsibleEmail?.toLowerCase()
?? context.companyEmail?.toLowerCase()
?? null;
if (!recipientEmail) {
throw new ConflictException({
code: 'COMPANY_SIGNATURE_EMAIL_REQUIRED',
message: 'No hay email de responsable ni email institucional de empresa; indicá un destinatario',
});
}
await manager.query(`
UPDATE inspection_act_company_signature_invites
SET status='REVOKED',revoked_at=CURRENT_TIMESTAMP,revoked_by=$2,updated_at=CURRENT_TIMESTAMP
WHERE act_id=$1 AND status='PENDING'
`, [actId, principal.userId]);
const [invite] = await manager.query(`
INSERT INTO inspection_act_company_signature_invites(
act_id,token_sha256,recipient_email,recipient_name,recipient_document_type,
recipient_document_number,recipient_position,expires_at,created_by
) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9)
RETURNING id,act_id AS "actId",recipient_email AS "recipientEmail",
expires_at AS "expiresAt",created_at AS "createdAt"
`, [
actId,
tokenSha256,
recipientEmail,
context.fullName,
context.documentType,
context.documentNumber,
context.position,
expiresAt,
principal.userId,
]) as Array<{
id: string;
actId: string;
recipientEmail: string;
expiresAt: Date;
createdAt: Date;
}>;
await this.audit.record({
...administrationAuditContext(principal, request),
action: 'INSPECTION_ACT_COMPANY_SIGNATURE_INVITE_CREATED',
entityType: 'inspection_act_company_signature_invite',
entityId: invite.id,
afterData: {
actId,
actCode: context.code,
recipientEmail,
expiresAt,
},
metadata: { tokenStoredAsHashOnly: true },
}, manager);
return { ...invite, actCode: context.code, inspectionCode: context.inspectionCode };
});
const publicBase = this.config.get<string>('COMPANY_SIGNATURE_PUBLIC_BASE_URL')?.trim().replace(/\/$/, '') ?? null;
const publicUrl = publicBase ? `${publicBase}?token=${encodeURIComponent(token)}` : null;
let emailSent = false;
let deliveryError: string | null = null;
if (!publicUrl) {
deliveryError = 'COMPANY_SIGNATURE_PUBLIC_BASE_URL no configurada';
} else if (!(await this.smtp.configured())) {
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 contenido del Acta está bloqueado y no puede modificarse desde este enlace.',
'',
`Enlace seguro: ${publicUrl}`,
`Válido hasta: ${new Date(created.expiresAt).toLocaleString('es-AR')}`,
].join('\n');
try {
await this.smtp.send({
to: created.recipientEmail,
subject: `DH Inspección · Firma de ${created.actCode}`,
text: body,
attachment: {
filename: `${created.actCode}-instrucciones.txt`,
mimeType: 'text/plain',
content: Buffer.from(body, 'utf8'),
},
});
emailSent = true;
await this.dataSource.query(`
UPDATE inspection_act_company_signature_invites
SET sent_at=CURRENT_TIMESTAMP,updated_at=CURRENT_TIMESTAMP
WHERE id=$1
`, [created.id]);
} catch (error) {
deliveryError = error instanceof Error ? error.message.slice(0, 500) : 'No se pudo enviar el email';
}
}
return {
id: created.id,
actId: created.actId,
actCode: created.actCode,
recipientEmail: created.recipientEmail,
expiresAt: created.expiresAt,
emailSent,
deliveryError,
publicUrl,
};
}
async view(token: string) {
const invite = await this.resolveToken(this.dataSource.manager, token, false);
const locked = invite.lockedSnapshot ?? {};
const act = this.record(locked.act);
const inventories = this.records(locked.inventories);
const findings = this.records(locked.findings).map((finding) => ({
id: finding.id,
code: finding.code,
title: finding.title,
description: finding.description,
legalBasis: finding.legalBasis ?? null,
severity: finding.severity ?? null,
isRecurrence: finding.isRecurrence === true,
recurrenceOfFindingId: finding.recurrenceOfFindingId ?? null,
}));
return {
invitation: {
id: invite.id,
recipientEmail: invite.recipientEmail,
expiresAt: invite.expiresAt,
},
act: {
code: invite.actCode,
inspectionCode: invite.inspectionCode,
lockedAt: invite.lockedAt,
lockedSha256: invite.lockedSha256,
urgency: act.urgency ?? null,
summary: act.summary ?? null,
observations: act.observations ?? null,
},
responsibleDefaults: {
fullName: invite.recipientName,
documentType: invite.recipientDocumentType,
documentNumber: invite.recipientDocumentNumber,
position: invite.recipientPosition,
},
inventories: inventories.map((inventory) => ({
id: inventory.id,
code: inventory.code,
name: inventory.name,
typeName: inventory.typeName ?? inventory.typeCode ?? null,
})),
findings,
consent: REMOTE_COMPANY_CONSENT,
allowedActions: ['SIGN_CONFORMITY', 'SIGN_DISSENT', 'REFUSE'],
};
}
async sign(
token: string,
dto: PublicCompanySignatureDto,
file: UploadedInspectionSignatureFile | undefined,
request: RequestWithContext,
) {
if (!dto.consentAccepted) {
throw new ConflictException({
code: 'COMPANY_SIGNATURE_CONSENT_REQUIRED',
message: 'Debe aceptarse la constancia antes de firmar',
});
}
const inspected = inspectInspectionSignatureFile(file);
const id = randomUUID();
const storedName = `${id}.png`;
const filePath = resolve(this.signatureRoot, storedName);
const imageSha256 = createHash('sha256').update(file!.buffer).digest('hex');
await mkdir(this.signatureRoot, { recursive: true, mode: 0o700 });
await writeFile(filePath, file!.buffer, { flag: 'wx', mode: 0o600 });
try {
const result = await this.dataSource.transaction(async (manager) => {
const invite = await this.resolveToken(manager, token, true);
await this.assertNoCompanyOutcome(manager, invite.actId);
const signedAt = new Date();
const manifestation = dto.manifestation === 'DISSENT'
? InspectionCompanySignatureManifestation.DISSENT
: InspectionCompanySignatureManifestation.CONFORMITY;
const statement = manifestation === InspectionCompanySignatureManifestation.DISSENT
? dto.statement?.trim() ?? null
: null;
const payload = {
invitationId: invite.id,
actId: invite.actId,
lockedSha256: invite.lockedSha256,
signerType: InspectionActSignerType.COMPANY_RESPONSIBLE,
signerName: dto.fullName,
documentType: dto.documentType,
documentNumber: dto.documentNumber,
position: dto.position,
status: InspectionActSignatureStatus.SIGNED,
companyManifestation: manifestation,
companyStatement: statement,
imageSha256,
consentText: REMOTE_COMPANY_CONSENT,
consentVersion: REMOTE_CONSENT_VERSION,
signedAt: signedAt.toISOString(),
source: InspectionActSignatureSource.WEB,
};
const signaturePayloadSha256 = sha256CanonicalJson(payload);
await manager.query(`
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,
signed_at,device_label,source,prepared_sha256,signature_payload_sha256,uploaded_by,created_at
) VALUES(
$1,$2,'COMPANY_RESPONSIBLE',NULL,$3,$4,$5,$6,'SIGNED',$7,$8,$9,$10,$11,$12,$13,
$14,$15,$16,$16,'Firma remota por enlace seguro','WEB',$17,$18,$19,$16
)
`, [
id,
invite.actId,
dto.fullName,
dto.documentType,
dto.documentNumber,
dto.position,
manifestation,
statement,
inspected.originalName,
storedName,
inspected.mimeType,
file!.buffer.length,
imageSha256,
REMOTE_COMPANY_CONSENT,
REMOTE_CONSENT_VERSION,
signedAt,
invite.lockedSha256,
signaturePayloadSha256,
invite.createdBy,
]);
await manager.query(`
UPDATE inspection_act_company_signature_invites
SET status='USED',used_at=$2,updated_at=$2
WHERE id=$1
`, [invite.id, signedAt]);
await this.audit.record({
action: 'INSPECTION_ACT_COMPANY_REMOTE_SIGNATURE_RECORDED',
entityType: 'inspection_act_signature',
entityId: id,
source: AuditSource.WEB,
actorUserId: null,
actorUsername: null,
requestId: request.requestId,
ip: request.ip ?? null,
userAgent: request.get('user-agent') ?? null,
afterData: payload,
metadata: {
invitationId: invite.id,
recipientEmail: invite.recipientEmail,
immutable: true,
signaturePayloadSha256,
},
}, manager);
return { actCode: invite.actCode, signatureId: id, manifestation };
});
return { ok: true, ...result };
} catch (error) {
await unlink(filePath).catch(() => undefined);
throw error;
}
}
async refuse(
token: string,
dto: PublicCompanyRefusalDto,
request: RequestWithContext,
) {
return this.dataSource.transaction(async (manager) => {
const invite = await this.resolveToken(manager, token, true);
await this.assertNoCompanyOutcome(manager, invite.actId);
const createdAt = new Date();
const id = randomUUID();
const payload = {
invitationId: invite.id,
actId: invite.actId,
lockedSha256: invite.lockedSha256,
signerType: InspectionActSignerType.COMPANY_RESPONSIBLE,
signerName: dto.fullName,
documentType: dto.documentType,
documentNumber: dto.documentNumber,
position: dto.position,
status: InspectionActSignatureStatus.REFUSED,
reason: dto.reason,
source: InspectionActSignatureSource.WEB,
createdAt: createdAt.toISOString(),
};
const signaturePayloadSha256 = sha256CanonicalJson(payload);
await manager.query(`
INSERT INTO inspection_act_signatures(
id,act_id,signer_type,signer_user_id,signer_name,document_type,document_number,
position,status,reason,source,prepared_sha256,signature_payload_sha256,uploaded_by,created_at
) VALUES($1,$2,'COMPANY_RESPONSIBLE',NULL,$3,$4,$5,$6,'REFUSED',$7,'WEB',$8,$9,$10,$11)
`, [
id,
invite.actId,
dto.fullName,
dto.documentType,
dto.documentNumber,
dto.position,
dto.reason,
invite.lockedSha256,
signaturePayloadSha256,
invite.createdBy,
createdAt,
]);
await manager.query(`
UPDATE inspection_act_company_signature_invites
SET status='USED',used_at=$2,updated_at=$2
WHERE id=$1
`, [invite.id, createdAt]);
await this.audit.record({
action: 'INSPECTION_ACT_COMPANY_REMOTE_REFUSAL_RECORDED',
entityType: 'inspection_act_signature',
entityId: id,
source: AuditSource.WEB,
actorUserId: null,
actorUsername: null,
requestId: request.requestId,
ip: request.ip ?? null,
userAgent: request.get('user-agent') ?? null,
afterData: payload,
metadata: {
invitationId: invite.id,
recipientEmail: invite.recipientEmail,
immutable: true,
signaturePayloadSha256,
},
}, manager);
return { ok: true, actCode: invite.actCode, refusalId: id };
});
}
private async resolveToken(
manager: EntityManager,
token: string,
lock: boolean,
): Promise<InviteContext> {
if (!/^[A-Za-z0-9_-]{40,120}$/.test(token)) throw this.invalidInvite();
const tokenSha256 = this.hashToken(token);
const [invite] = await manager.query(`
SELECT
invite.id,
invite.act_id AS "actId",
invite.token_sha256 AS "tokenSha256",
invite.recipient_email AS "recipientEmail",
invite.recipient_name AS "recipientName",
invite.recipient_document_type AS "recipientDocumentType",
invite.recipient_document_number AS "recipientDocumentNumber",
invite.recipient_position AS "recipientPosition",
invite.status,
invite.expires_at AS "expiresAt",
invite.sent_at AS "sentAt",
invite.used_at AS "usedAt",
invite.created_by AS "createdBy",
act.code AS "actCode",
act.status AS "actStatus",
act.locked_sha256 AS "lockedSha256",
act.locked_at AS "lockedAt",
visit.code AS "inspectionCode",
closure.prepared_snapshot AS "lockedSnapshot"
FROM inspection_act_company_signature_invites invite
JOIN inspection_acts act ON act.id=invite.act_id
JOIN inspection_visits visit ON visit.id=act.visit_id
JOIN inspection_act_closures closure ON closure.act_id=act.id
WHERE invite.token_sha256=$1
${lock ? 'FOR UPDATE OF invite,act' : ''}
`, [tokenSha256]) as InviteContext[];
if (!invite) throw this.invalidInvite();
if (invite.status !== 'PENDING') {
throw new GoneException({
code: 'COMPANY_SIGNATURE_INVITE_NOT_ACTIVE',
message: invite.status === 'USED'
? 'Este enlace ya fue utilizado'
: 'Este enlace ya no está vigente',
});
}
if (new Date(invite.expiresAt).getTime() <= Date.now()) {
await manager.query(`
UPDATE inspection_act_company_signature_invites
SET status='EXPIRED',updated_at=CURRENT_TIMESTAMP
WHERE id=$1 AND status='PENDING'
`, [invite.id]);
throw new GoneException({
code: 'COMPANY_SIGNATURE_INVITE_EXPIRED',
message: 'El enlace de firma venció. Solicitá una nueva invitación.',
});
}
if (invite.actStatus !== 'LOCKED' || !invite.lockedSha256 || !invite.lockedSnapshot) {
throw new ConflictException({
code: 'COMPANY_SIGNATURE_ACT_NOT_AVAILABLE',
message: 'El Acta ya no está disponible para manifestación remota',
});
}
return invite;
}
private async assertActorAssigned(
manager: EntityManager,
actId: string,
principal: AuthPrincipal,
): Promise<void> {
if (principal.permissions.includes('inspections.manage')) return;
const [row] = await manager.query(`
SELECT 1
FROM inspection_acts act
JOIN inspection_visit_members member ON member.visit_id=act.visit_id
WHERE act.id=$1 AND member.user_id=$2 AND member.included=true
LIMIT 1
`, [actId, principal.userId]) as unknown[];
if (!row) {
throw new ConflictException({
code: 'COMPANY_SIGNATURE_INVITE_NOT_ASSIGNED',
message: 'Sólo un Inspector asignado puede emitir la invitación',
});
}
}
private async assertNoCompanyOutcome(manager: EntityManager, actId: string): Promise<void> {
if (await this.hasCompanyOutcome(manager, actId)) {
throw new ConflictException({
code: 'COMPANY_SIGNATURE_ALREADY_RESOLVED',
message: 'La manifestación de la empresa ya fue registrada',
});
}
}
private async hasCompanyOutcome(manager: EntityManager, actId: string): Promise<boolean> {
const rows = await manager.query(`
SELECT 1 FROM inspection_act_signatures
WHERE act_id=$1 AND signer_type='COMPANY_RESPONSIBLE'
LIMIT 1
`, [actId]) as unknown[];
return rows.length > 0;
}
private hashToken(token: string): string {
return createHash('sha256').update(token, 'utf8').digest('hex');
}
private invalidInvite(): NotFoundException {
return new NotFoundException({
code: 'COMPANY_SIGNATURE_INVITE_NOT_FOUND',
message: 'El enlace de firma no es válido',
});
}
private record(value: unknown): Record<string, unknown> {
return value && typeof value === 'object' && !Array.isArray(value)
? value as Record<string, unknown>
: {};
}
private records(value: unknown): Array<Record<string, unknown>> {
return Array.isArray(value) ? value.map((item) => this.record(item)) : [];
}
private storageError(): InternalServerErrorException {
return new InternalServerErrorException({
code: 'COMPANY_SIGNATURE_STORAGE_ERROR',
message: 'No se pudo almacenar la firma remota',
});
}
}
@@ -1,101 +0,0 @@
import { Transform, Type } from 'class-transformer';
import {
IsBoolean,
IsEmail,
IsIn,
IsInt,
IsOptional,
IsString,
Max,
MaxLength,
Min,
MinLength,
ValidateIf,
} from 'class-validator';
export class CreateCompanySignatureInviteDto {
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : undefined)
@IsEmail()
@MaxLength(320)
recipientEmail?: string;
@IsOptional()
@Type(() => Number)
@IsInt()
@Min(1)
@Max(30)
expiresInDays?: number;
}
export class PublicCompanySignatureDto {
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(2)
@MaxLength(200)
fullName!: string;
@Transform(({ value }) => typeof value === 'string' ? value.trim().toUpperCase() : value)
@IsString()
@IsIn(['DNI', 'CUIL', 'PASSPORT', 'OTHER'])
documentType!: string;
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(3)
@MaxLength(40)
documentNumber!: string;
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(2)
@MaxLength(200)
position!: string;
@Transform(({ value }) => typeof value === 'string' ? value.trim().toUpperCase() : value)
@IsString()
@IsIn(['CONFORMITY', 'DISSENT'])
manifestation!: 'CONFORMITY' | 'DISSENT';
@ValidateIf((value: PublicCompanySignatureDto) => value.manifestation === 'DISSENT')
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(10)
@MaxLength(8000)
statement?: string;
@Transform(({ value }) => value === true || value === 'true')
@IsBoolean()
consentAccepted!: boolean;
}
export class PublicCompanyRefusalDto {
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(2)
@MaxLength(200)
fullName!: string;
@Transform(({ value }) => typeof value === 'string' ? value.trim().toUpperCase() : value)
@IsString()
@IsIn(['DNI', 'CUIL', 'PASSPORT', 'OTHER'])
documentType!: string;
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(3)
@MaxLength(40)
documentNumber!: string;
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(2)
@MaxLength(200)
position!: string;
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(10)
@MaxLength(8000)
reason!: string;
}
@@ -0,0 +1,7 @@
import { IsEnum } from 'class-validator';
import { InspectionActUrgency } from '../../database/entities';
export class LockInspectionActDto {
@IsEnum(InspectionActUrgency)
urgency!: InspectionActUrgency;
}
@@ -0,0 +1,22 @@
import { Body, Controller, Param, ParseUUIDPipe, Post, Req } from '@nestjs/common';
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 { LockInspectionActDto } from './dto/lock-inspection-act.dto';
import { InspectionActLifecycleService } from './inspection-act-lifecycle.service';
@Controller('inspection-acts/:actId')
export class InspectionActLifecycleController {
constructor(private readonly lifecycle: InspectionActLifecycleService) {}
@Post('lock')
@RequirePermissions('inspection_closure.prepare')
lock(
@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
@Body() dto: LockInspectionActDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.lifecycle.lock(actId, dto, principal, request);
}
}
@@ -0,0 +1,509 @@
import {
ConflictException,
ForbiddenException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { DataSource, EntityManager } from 'typeorm';
import { administrationAuditContext } from '../administration/common/administration-audit';
import { AuditService } from '../audit/audit.service';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import {
AuditAction,
InspectionActStatus,
InspectionActVersionEvent,
InspectionVisitStatus,
} from '../database/entities';
import { InspectionDeadlinesService } from '../inspection-deadlines/inspection-deadlines.service';
import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
import { sha256CanonicalJson } from './canonical-json';
import type { LockInspectionActDto } from './dto/lock-inspection-act.dto';
const CLOSURE_SCHEMA_VERSION = 'DH-ACT-CLOSURE-V2';
interface LockContext {
id: string;
code: string;
visitId: string;
status: InspectionActStatus;
occurredAt: Date;
currentVersion: number;
visitStatus: InspectionVisitStatus;
leadInspectorUserId: string;
}
@Injectable()
export class InspectionActLifecycleService {
constructor(
private readonly dataSource: DataSource,
private readonly audit: AuditService,
private readonly deadlines: InspectionDeadlinesService,
) {}
async lock(
actId: string,
dto: LockInspectionActDto,
principal: AuthPrincipal,
request: RequestWithContext,
) {
assertMobileInspector(principal);
return this.dataSource.transaction(async (manager) => {
const context = await this.lockContext(manager, actId);
if (context.status !== InspectionActStatus.DRAFT) {
throw new ConflictException({
code: 'INSPECTION_ACT_NOT_DRAFT',
message: 'Sólo puede finalizarse y bloquearse un Acta que esté en borrador',
});
}
if (context.visitStatus !== InspectionVisitStatus.IN_PROGRESS) {
throw new ConflictException({
code: 'INSPECTION_VISIT_NOT_IN_PROGRESS',
message: 'El Acta sólo puede bloquearse durante una inspección en curso',
});
}
await this.assertActorAssigned(manager, context, principal);
await this.requireResponsible(manager, actId);
await this.requireVerificationResults(manager, context.visitId);
const [signatureCount] = (await manager.query(`
SELECT COUNT(*)::integer AS total
FROM inspection_act_signatures
WHERE act_id = $1
`, [actId])) as Array<{ total: number }>;
if (Number(signatureCount?.total ?? 0) > 0) {
throw new ConflictException({
code: 'INSPECTION_ACT_ALREADY_SIGNED',
message: 'El Acta ya tiene una manifestación de firma y no puede volver a bloquearse',
});
}
const deadline = await this.deadlines.snapshotForLock(
manager,
dto.urgency,
new Date(context.occurredAt),
);
const lockedAt = new Date();
const [updated] = (await manager.query(`
UPDATE inspection_acts
SET status = 'READY',
urgency = $2,
deadline_days = $3,
deadline_day_type = $4,
deadline_basis = $5,
deadline_base_on = $6::date,
deadline_due_on = $7::date,
deadline_policy_snapshot = $8::jsonb,
locked_at = $9,
locked_by = $10,
current_version = current_version + 1,
updated_by = $10,
updated_at = CURRENT_TIMESTAMP
WHERE id = $1
RETURNING current_version AS "versionNumber"
`, [
actId,
dto.urgency,
deadline.snapshot.days,
deadline.snapshot.dayType,
deadline.snapshot.basis,
deadline.baseOn,
deadline.dueOn,
deadline.snapshot,
lockedAt,
principal.userId,
])) as Array<{ versionNumber: number }>;
const preparedSnapshot = await this.buildPreparedSnapshot(manager, actId, lockedAt);
const preparedSha256 = sha256CanonicalJson(preparedSnapshot);
await manager.query(`
UPDATE inspection_acts
SET locked_sha256 = $2
WHERE id = $1
`, [actId, preparedSha256]);
await manager.query(`
INSERT INTO inspection_act_closures (
act_id, schema_version, prepared_snapshot, prepared_sha256,
prepared_at, prepared_by
) VALUES ($1, $2, $3, $4, $5, $6)
ON CONFLICT (act_id) DO UPDATE SET
schema_version = EXCLUDED.schema_version,
prepared_snapshot = EXCLUDED.prepared_snapshot,
prepared_sha256 = EXCLUDED.prepared_sha256,
prepared_at = EXCLUDED.prepared_at,
prepared_by = EXCLUDED.prepared_by
`, [
actId,
CLOSURE_SCHEMA_VERSION,
preparedSnapshot,
preparedSha256,
lockedAt,
principal.userId,
]);
await manager.query(`
INSERT INTO inspection_act_versions (
act_id, version_number, event, snapshot, actor_user_id, actor_username
) VALUES ($1, $2, $3, $4, $5, $6)
`, [
actId,
Number(updated.versionNumber),
InspectionActVersionEvent.READY,
preparedSnapshot,
principal.userId,
principal.username,
]);
await this.audit.record({
...administrationAuditContext(principal, request),
action: AuditAction.INSPECTION_ACT_READY,
entityType: 'inspection_act',
entityId: actId,
afterData: {
status: 'LOCKED_PENDING_SIGNATURE',
physicalStatus: InspectionActStatus.READY,
urgency: dto.urgency,
deadlineDays: deadline.snapshot.days,
deadlineDayType: deadline.snapshot.dayType,
deadlineBasis: deadline.snapshot.basis,
deadlineBaseOn: deadline.baseOn,
deadlineDueOn: deadline.dueOn,
lockedAt: lockedAt.toISOString(),
preparedSha256,
},
metadata: {
actId,
visitId: context.visitId,
versionNumber: Number(updated.versionNumber),
immutable: true,
},
}, manager);
return {
id: actId,
code: context.code,
status: 'LOCKED_PENDING_SIGNATURE' as const,
physicalStatus: InspectionActStatus.READY,
urgency: dto.urgency,
deadline: {
days: deadline.snapshot.days,
dayType: deadline.snapshot.dayType,
basis: deadline.snapshot.basis,
baseOn: deadline.baseOn,
dueOn: deadline.dueOn,
},
lockedAt,
preparedSha256,
currentVersion: Number(updated.versionNumber),
};
});
}
private async lockContext(manager: EntityManager, actId: string): Promise<LockContext> {
const [row] = (await manager.query(`
SELECT
act.id,
act.code,
act.visit_id AS "visitId",
act.status,
act.occurred_at AS "occurredAt",
act.current_version AS "currentVersion",
visit.status AS "visitStatus",
visit.lead_inspector_user_id AS "leadInspectorUserId"
FROM inspection_acts act
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
WHERE act.id = $1
FOR UPDATE OF act, visit
`, [actId])) as LockContext[];
if (!row) {
throw new NotFoundException({
code: 'INSPECTION_ACT_NOT_FOUND',
message: 'Acta de inspección no encontrada',
});
}
return row;
}
private async assertActorAssigned(
manager: EntityManager,
context: LockContext,
principal: AuthPrincipal,
): Promise<void> {
if (context.leadInspectorUserId === principal.userId) return;
const [membership] = (await manager.query(`
SELECT 1 AS found
FROM inspection_visit_members
WHERE visit_id = $1
AND user_id = $2
AND included = true
LIMIT 1
`, [context.visitId, principal.userId])) as Array<{ found: number }>;
if (!membership) {
throw new ForbiddenException({
code: 'INSPECTION_ACT_ACTOR_NOT_ASSIGNED',
message: 'Sólo un inspector asignado a la inspección puede finalizar el Acta',
});
}
}
private async requireResponsible(manager: EntityManager, actId: string): Promise<void> {
const [row] = (await manager.query(`
SELECT act_id
FROM inspection_act_responsibles
WHERE act_id = $1
`, [actId])) as Array<{ act_id: string }>;
if (!row) {
throw new ConflictException({
code: 'INSPECTION_ACT_RESPONSIBLE_REQUIRED',
message: 'Antes de finalizar el Acta debe identificarse al responsable de la empresa o documentar su ausencia',
});
}
}
private async requireVerificationResults(manager: EntityManager, visitId: string): Promise<void> {
const [verification] = (await manager.query(`
SELECT
COUNT(*)::integer AS total,
COUNT(*) FILTER (WHERE outcome IS NOT NULL)::integer AS completed
FROM inspection_finding_verification_visits
WHERE visit_id = $1
`, [visitId])) as Array<{ total: number; completed: number }>;
const total = Number(verification?.total ?? 0);
const completed = Number(verification?.completed ?? 0);
if (total > 0 && completed !== total) {
throw new ConflictException({
code: 'INSPECTION_VERIFICATION_RESULTS_REQUIRED',
message: 'Registrá el resultado de todas las verificaciones antes de finalizar el Acta',
});
}
}
private async buildPreparedSnapshot(
manager: EntityManager,
actId: string,
preparedAt: Date,
): Promise<Record<string, unknown>> {
const [act] = (await manager.query(`
SELECT
act.id,
act.code,
act.act_year AS "actYear",
act.act_number AS "actNumber",
act.status,
act.occurred_at AS "occurredAt",
act.title,
act.summary,
act.observations,
act.urgency,
act.deadline_days AS "deadlineDays",
act.deadline_day_type AS "deadlineDayType",
act.deadline_basis AS "deadlineBasis",
act.deadline_base_on AS "deadlineBaseOn",
act.deadline_due_on AS "deadlineDueOn",
act.deadline_policy_snapshot AS "deadlinePolicySnapshot",
act.locked_at AS "lockedAt",
act.current_version AS "currentVersion",
act.created_at AS "createdAt",
act.updated_at AS "updatedAt",
JSONB_BUILD_OBJECT(
'id', visit.id,
'code', visit.code,
'title', visit.title,
'objective', visit.objective,
'status', visit.status,
'scopeAssetId', visit.scope_asset_id,
'leadInspectorUserId', visit.lead_inspector_user_id,
'plannedStartAt', visit.planned_start_at,
'plannedEndAt', visit.planned_end_at,
'actualStartedAt', visit.actual_started_at,
'instructions', visit.instructions
) AS visit
FROM inspection_acts act
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
WHERE act.id = $1
`, [actId])) as Array<Record<string, unknown>>;
if (!act) {
throw new NotFoundException({
code: 'INSPECTION_ACT_NOT_FOUND',
message: 'Acta de inspección no encontrada',
});
}
const [responsible] = (await manager.query(`
SELECT
act_id AS "actId",
attendance_status AS "attendanceStatus",
full_name AS "fullName",
document_type AS "documentType",
document_number AS "documentNumber",
position,
email,
phone,
absence_reason AS "absenceReason",
updated_by AS "updatedBy",
created_at AS "createdAt",
updated_at AS "updatedAt"
FROM inspection_act_responsibles
WHERE act_id = $1
`, [actId])) as Array<Record<string, unknown>>;
const team = await manager.query(`
SELECT
member.user_id AS "userId",
user_account.username,
user_account.first_name AS "firstName",
user_account.last_name AS "lastName",
user_account.email,
(visit.lead_inspector_user_id = member.user_id) AS "isLead"
FROM inspection_visit_members member
INNER JOIN inspection_visits visit ON visit.id = member.visit_id
INNER JOIN users user_account ON user_account.id = member.user_id
WHERE member.visit_id = $1 AND member.included = true
ORDER BY "isLead" DESC, user_account.username, member.user_id
`, [(act.visit as { id: string }).id]) as Array<Record<string, unknown>>;
const assets = await manager.query(`
SELECT
asset.id,
asset.code,
asset.name,
asset.common_name AS "commonName",
asset.description,
asset.parent_id AS "parentId",
CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', company.id,
'code', company.code,
'name', company.name,
'commonName', company.common_name
) END AS "operatorCompany",
CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', area.id,
'code', area.code,
'name', area.name,
'commonName', area.common_name
) END AS "operationalArea",
asset.information_status AS "informationStatus",
asset.current_version AS "currentVersion",
asset.data_origin AS "dataOrigin",
asset.source_name AS "sourceName",
asset.source_reference AS "sourceReference",
asset.source_observed_at AS "sourceObservedAt",
asset_type.id AS "typeId",
asset_type.code AS "typeCode",
asset_type.name AS "typeName",
COALESCE((
SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
'definitionId', definition.id,
'code', definition.code,
'name', definition.name,
'dataType', definition.data_type,
'value', attribute_value.value
) ORDER BY definition.sort_order, definition.code, definition.id)
FROM asset_attribute_values attribute_value
INNER JOIN asset_attribute_definitions definition
ON definition.id = attribute_value.definition_id
WHERE attribute_value.asset_id = asset.id
), '[]'::jsonb) AS attributes,
CASE WHEN geometry.asset_id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'type', geometry.geometry_type,
'geojson', ST_AsGeoJSON(geometry.geometry)::jsonb,
'source', geometry.source,
'accuracyM', geometry.accuracy_m,
'capturedAt', geometry.captured_at,
'deviceLabel', geometry.device_label
) END AS geometry
FROM inspection_act_assets link
INNER JOIN assets asset ON asset.id = link.asset_id
INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
LEFT JOIN assets company ON company.id = asset.operator_company_id
LEFT JOIN assets area ON area.id = asset.operational_area_id
LEFT JOIN asset_geometries geometry ON geometry.asset_id = asset.id
WHERE link.act_id = $1 AND link.included = true
ORDER BY asset.code, asset.id
`, [actId]) as Array<Record<string, unknown>>;
const findings = await manager.query(`
SELECT
finding.id,
finding.finding_number AS "findingNumber",
finding.code,
finding.status,
finding.asset_id AS "assetId",
finding.catalog_item_id AS "catalogItemId",
finding.title,
finding.description,
finding.legal_basis AS "legalBasis",
finding.glossary,
finding.catalog_revision AS "catalogRevision",
finding.suggested_severity AS "suggestedSeverity",
finding.severity,
finding.is_recurrence AS "isRecurrence",
finding.antecedent_finding_id AS "antecedentFindingId",
finding.correction_due_on AS "correctionDueOn",
finding.next_control_on AS "nextControlOn",
finding.current_version AS "currentVersion",
JSONB_BUILD_OBJECT(
'code', catalog.code,
'sourceNumber', catalog.source_number,
'title', catalog.title,
'revision', catalog.revision,
'suggestedSeverity', finding.suggested_severity,
'categoryCode', category.code,
'categoryName', category.name
) AS catalog,
COALESCE((
SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
'id', evidence.id,
'communicationId', evidence.communication_id,
'kind', evidence.kind,
'purpose', evidence.purpose,
'originalName', evidence.original_name,
'mimeType', evidence.mime_type,
'sizeBytes', evidence.size_bytes,
'sha256', evidence.sha256,
'title', evidence.title,
'description', evidence.description,
'capturedAt', evidence.captured_at,
'latitude', evidence.latitude,
'longitude', evidence.longitude,
'accuracyM', evidence.accuracy_m,
'deviceLabel', evidence.device_label,
'source', evidence.source,
'uploadedBy', evidence.uploaded_by,
'createdAt', evidence.created_at
) ORDER BY evidence.created_at, evidence.id)
FROM inspection_finding_evidence evidence
WHERE evidence.finding_id = finding.id
), '[]'::jsonb) AS evidence
FROM inspection_findings finding
LEFT JOIN finding_catalog_items catalog ON catalog.id = finding.catalog_item_id
LEFT JOIN finding_categories category ON category.id = catalog.category_id
WHERE finding.act_id = $1 AND finding.status <> 'VOIDED'
ORDER BY finding.finding_number, finding.id
`, [actId]) as Array<Record<string, unknown>>;
const verificationResults = await manager.query(`
SELECT
verification_link.finding_id AS "findingId",
finding.code AS "findingCode",
finding.title AS "findingTitle",
finding.description AS "findingDescription",
finding.asset_id AS "assetId",
asset.code AS "assetCode",
asset.name AS "assetName",
verification_link.target_control_on AS "targetControlOn",
verification_link.outcome,
verification_link.result_notes AS "resultNotes",
verification_link.verified_at AS "verifiedAt",
verification_link.result_recorded_at AS "resultRecordedAt",
verification_link.rescheduled_control_on AS "rescheduledControlOn"
FROM inspection_finding_verification_visits verification_link
INNER JOIN inspection_findings finding ON finding.id = verification_link.finding_id
INNER JOIN assets asset ON asset.id = finding.asset_id
WHERE verification_link.visit_id = $1
ORDER BY finding.code
`, [(act.visit as { id: string }).id]) as Array<Record<string, unknown>>;
return {
schemaVersion: CLOSURE_SCHEMA_VERSION,
preparedAt: preparedAt.toISOString(),
act,
responsible: responsible ?? null,
team,
assets,
findings,
verificationResults,
};
}
}
@@ -48,16 +48,6 @@ export class InspectionClosingController {
return this.closing.upsertResponsible(actId, dto, principal, request);
}
@Post('lock')
@RequirePermissions('inspection_closure.prepare')
lock(
@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.closing.prepare(actId, principal, request);
}
@Post('signatures/inspector')
@RequirePermissions('inspection_closure.sign')
@UseInterceptors(FileInterceptor('file', {
@@ -99,9 +89,9 @@ export class InspectionClosingController {
return this.closing.recordCompanyOutcome(actId, dto, principal, request);
}
@Post('seal')
@Post('close')
@RequirePermissions('inspection_closure.close')
seal(
close(
@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
@Body() dto: CloseInspectionActDto,
@CurrentAuth() principal: AuthPrincipal,
@@ -1,11 +1,9 @@
import { Module } from '@nestjs/common';
import { AuditModule } from '../audit/audit.module';
import { InspectionDeadlinesModule } from '../inspection-deadlines/inspection-deadlines.module';
import { InspectionReportsModule } from '../inspection-reports/inspection-reports.module';
import {
CompanySignatureInviteController,
PublicCompanySignatureController,
} from './company-signature-invite.controller';
import { CompanySignatureInviteService } from './company-signature-invite.service';
import { InspectionActLifecycleController } from './inspection-act-lifecycle.controller';
import { InspectionActLifecycleService } from './inspection-act-lifecycle.service';
import {
InspectionClosingController,
InspectionSignatureContentController,
@@ -13,13 +11,12 @@ import {
import { InspectionClosingService } from './inspection-closing.service';
@Module({
imports: [AuditModule, InspectionReportsModule],
imports: [AuditModule, InspectionDeadlinesModule, InspectionReportsModule],
controllers: [
InspectionActLifecycleController,
InspectionClosingController,
InspectionSignatureContentController,
CompanySignatureInviteController,
PublicCompanySignatureController,
],
providers: [InspectionClosingService, CompanySignatureInviteService],
providers: [InspectionActLifecycleService, InspectionClosingService],
})
export class InspectionClosingModule {}
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,14 @@
import { Transform } from 'class-transformer';
import { IsEnum, IsInt, Max, Min } from 'class-validator';
import { InspectionDeadlineDayType } from '../../database/entities';
export class UpdateInspectionDeadlinePolicyDto {
@Transform(({ value }) => Number(value))
@IsInt()
@Min(1)
@Max(365)
days!: number;
@IsEnum(InspectionDeadlineDayType)
dayType!: InspectionDeadlineDayType;
}
@@ -0,0 +1,18 @@
import { Transform } from 'class-transformer';
import { IsBoolean, IsOptional, IsString, Matches, MaxLength, MinLength } from 'class-validator';
export class UpsertInspectionNonWorkingDayDto {
@Matches(/^\d{4}-\d{2}-\d{2}$/)
day!: string;
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
@IsString()
@MinLength(2)
@MaxLength(200)
label!: string;
@IsOptional()
@Transform(({ value }) => value === true || value === 'true')
@IsBoolean()
enabled?: boolean;
}
@@ -0,0 +1,46 @@
import { Body, Controller, Get, Param, ParseEnumPipe, Post, Query, Req } from '@nestjs/common';
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 { InspectionActUrgency } from '../database/entities';
import { UpdateInspectionDeadlinePolicyDto } from './dto/update-inspection-deadline-policy.dto';
import { UpsertInspectionNonWorkingDayDto } from './dto/upsert-inspection-non-working-day.dto';
import { InspectionDeadlinesService } from './inspection-deadlines.service';
@Controller('inspection-deadlines')
export class InspectionDeadlinesController {
constructor(private readonly deadlines: InspectionDeadlinesService) {}
@Get('policies')
@RequirePermissions('inspection_deadlines.manage')
policies() {
return this.deadlines.listPolicies();
}
@Post('policies/:urgency')
@RequirePermissions('inspection_deadlines.manage')
updatePolicy(
@Param('urgency', new ParseEnumPipe(InspectionActUrgency)) urgency: InspectionActUrgency,
@Body() dto: UpdateInspectionDeadlinePolicyDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.deadlines.updatePolicy(urgency, dto, principal, request);
}
@Get('non-working-days')
@RequirePermissions('inspection_deadlines.manage')
nonWorkingDays(@Query('year') year?: string) {
return this.deadlines.listNonWorkingDays(year);
}
@Post('non-working-days')
@RequirePermissions('inspection_deadlines.manage')
upsertNonWorkingDay(
@Body() dto: UpsertInspectionNonWorkingDayDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.deadlines.upsertNonWorkingDay(dto, principal, request);
}
}
@@ -0,0 +1,12 @@
import { Module } from '@nestjs/common';
import { AuditModule } from '../audit/audit.module';
import { InspectionDeadlinesController } from './inspection-deadlines.controller';
import { InspectionDeadlinesService } from './inspection-deadlines.service';
@Module({
imports: [AuditModule],
controllers: [InspectionDeadlinesController],
providers: [InspectionDeadlinesService],
exports: [InspectionDeadlinesService],
})
export class InspectionDeadlinesModule {}
@@ -0,0 +1,302 @@
import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
import { DataSource, EntityManager } from 'typeorm';
import { administrationAuditContext } from '../administration/common/administration-audit';
import { AuditService } from '../audit/audit.service';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import {
InspectionActUrgency,
InspectionDeadlineBasis,
InspectionDeadlineDayType,
InspectionDeadlinePolicy,
InspectionNonWorkingDay,
} from '../database/entities';
import type { UpdateInspectionDeadlinePolicyDto } from './dto/update-inspection-deadline-policy.dto';
import type { UpsertInspectionNonWorkingDayDto } from './dto/upsert-inspection-non-working-day.dto';
export interface InspectionDeadlineSnapshot {
urgency: InspectionActUrgency;
days: number;
dayType: InspectionDeadlineDayType;
basis: InspectionDeadlineBasis;
capturedAt: string;
}
export interface InspectionDeadlineLockResult {
snapshot: InspectionDeadlineSnapshot;
baseOn: string | null;
dueOn: string | null;
}
@Injectable()
export class InspectionDeadlinesService {
constructor(
private readonly dataSource: DataSource,
private readonly audit: AuditService,
) {}
async listPolicies() {
const data = await this.dataSource.getRepository(InspectionDeadlinePolicy).find({
order: { urgency: 'ASC' },
});
return { data };
}
async updatePolicy(
urgency: InspectionActUrgency,
dto: UpdateInspectionDeadlinePolicyDto,
principal: AuthPrincipal,
request: RequestWithContext,
) {
return this.dataSource.transaction(async (manager) => {
const repository = manager.getRepository(InspectionDeadlinePolicy);
const policy = await repository.findOne({ where: { urgency } });
if (!policy) {
throw new NotFoundException({
code: 'INSPECTION_DEADLINE_POLICY_NOT_FOUND',
message: 'No se encontró la política de plazo solicitada',
});
}
const before = {
urgency: policy.urgency,
days: policy.days,
dayType: policy.dayType,
basis: policy.basis,
};
policy.days = dto.days;
policy.dayType = dto.dayType;
policy.updatedBy = principal.userId;
await repository.save(policy);
const after = {
urgency: policy.urgency,
days: policy.days,
dayType: policy.dayType,
basis: policy.basis,
};
await this.audit.record({
...administrationAuditContext(principal, request),
action: 'INSPECTION_DEADLINE_POLICY_UPDATED',
entityType: 'inspection_deadline_policy',
entityId: urgency,
beforeData: before,
afterData: after,
}, manager);
return policy;
});
}
async snapshotForLock(
manager: EntityManager,
urgency: InspectionActUrgency,
occurredAt: Date,
): Promise<InspectionDeadlineLockResult> {
const [policy] = (await manager.query(`
SELECT
urgency,
days,
day_type AS "dayType",
basis
FROM inspection_deadline_policies
WHERE urgency = $1
FOR SHARE
`, [urgency])) as Array<{
urgency: InspectionActUrgency;
days: number;
dayType: InspectionDeadlineDayType;
basis: InspectionDeadlineBasis;
}>;
if (!policy) {
throw new NotFoundException({
code: 'INSPECTION_DEADLINE_POLICY_NOT_FOUND',
message: 'No existe una política de plazo para la urgencia seleccionada',
});
}
const snapshot: InspectionDeadlineSnapshot = {
urgency: policy.urgency,
days: Number(policy.days),
dayType: policy.dayType,
basis: policy.basis,
capturedAt: new Date().toISOString(),
};
if (policy.basis === InspectionDeadlineBasis.GEDO_LOAD_DATE) {
return { snapshot, baseOn: null, dueOn: null };
}
const [base] = (await manager.query(`
SELECT TO_CHAR(
$1::timestamptz AT TIME ZONE 'America/Argentina/Mendoza',
'YYYY-MM-DD'
) AS day
`, [occurredAt])) as Array<{ day: string }>;
if (!base?.day) {
throw new BadRequestException({
code: 'INSPECTION_ACT_DATE_INVALID',
message: 'No se pudo determinar la fecha del Acta para calcular el plazo',
});
}
const dueOn = await this.calculateDueOn(
manager,
base.day,
snapshot.days,
snapshot.dayType,
);
return { snapshot, baseOn: base.day, dueOn };
}
async calculateDueOn(
manager: EntityManager,
baseOn: string,
days: number,
dayType: InspectionDeadlineDayType,
): Promise<string> {
if (!Number.isInteger(days) || days < 1 || days > 365) {
throw new BadRequestException({
code: 'INSPECTION_DEADLINE_DAYS_INVALID',
message: 'La cantidad de días del plazo no es válida',
});
}
if (dayType === InspectionDeadlineDayType.CALENDAR) {
const [row] = (await manager.query(`
SELECT ($1::date + $2::integer)::text AS "dueOn"
`, [baseOn, days])) as Array<{ dueOn: string }>;
return row.dueOn;
}
const [row] = (await manager.query(`
SELECT candidate.day::text AS "dueOn"
FROM (
SELECT generated::date AS day
FROM generate_series(
$1::date + 1,
$1::date + (($2::integer * 3) + 31),
interval '1 day'
) generated
WHERE EXTRACT(ISODOW FROM generated) BETWEEN 1 AND 5
AND NOT EXISTS (
SELECT 1
FROM inspection_non_working_days holiday
WHERE holiday.day = generated::date
AND holiday.enabled = true
)
ORDER BY generated
LIMIT 1 OFFSET ($2::integer - 1)
) candidate
`, [baseOn, days])) as Array<{ dueOn: string }>;
if (!row?.dueOn) {
throw new BadRequestException({
code: 'INSPECTION_DEADLINE_CALCULATION_FAILED',
message: 'No se pudo calcular el vencimiento con el calendario configurado',
});
}
return row.dueOn;
}
async applyGedoOfficialization(
manager: EntityManager,
actId: string,
officializedOn: string,
): Promise<string | null> {
const [act] = (await manager.query(`
SELECT
deadline_days AS "days",
deadline_day_type AS "dayType",
deadline_basis AS "basis"
FROM inspection_acts
WHERE id = $1
FOR UPDATE
`, [actId])) as Array<{
days: number | null;
dayType: InspectionDeadlineDayType | null;
basis: InspectionDeadlineBasis | null;
}>;
if (!act || act.basis !== InspectionDeadlineBasis.GEDO_LOAD_DATE) return null;
if (!act.days || !act.dayType) {
throw new BadRequestException({
code: 'INSPECTION_ACT_DEADLINE_SNAPSHOT_MISSING',
message: 'El Acta no conserva la política de plazo requerida',
});
}
const dueOn = await this.calculateDueOn(manager, officializedOn, Number(act.days), act.dayType);
await manager.query(`
UPDATE inspection_acts
SET deadline_base_on = $2::date,
deadline_due_on = $3::date,
updated_at = CURRENT_TIMESTAMP
WHERE id = $1
`, [actId, officializedOn, dueOn]);
return dueOn;
}
async listNonWorkingDays(year?: string) {
const parsedYear = year === undefined ? null : Number(year);
if (parsedYear !== null && (!Number.isInteger(parsedYear) || parsedYear < 2000 || parsedYear > 2200)) {
throw new BadRequestException({
code: 'INVALID_NON_WORKING_DAY_YEAR',
message: 'El año del calendario no es válido',
});
}
const parameters: unknown[] = [];
const where = parsedYear === null
? ''
: `WHERE EXTRACT(YEAR FROM day)::integer = $1`;
if (parsedYear !== null) parameters.push(parsedYear);
const data = await this.dataSource.query(`
SELECT
day::text AS day,
label,
enabled,
created_at AS "createdAt",
updated_at AS "updatedAt"
FROM inspection_non_working_days
${where}
ORDER BY day ASC
`, parameters);
return { data };
}
async upsertNonWorkingDay(
dto: UpsertInspectionNonWorkingDayDto,
principal: AuthPrincipal,
request: RequestWithContext,
) {
const parsed = new Date(`${dto.day}T00:00:00Z`);
if (!Number.isFinite(parsed.getTime()) || parsed.toISOString().slice(0, 10) !== dto.day) {
throw new BadRequestException({
code: 'INVALID_NON_WORKING_DAY',
message: 'La fecha no laborable no es válida',
});
}
return this.dataSource.transaction(async (manager) => {
const repository = manager.getRepository(InspectionNonWorkingDay);
const existing = await repository.findOne({ where: { day: dto.day } });
const before = existing
? { day: existing.day, label: existing.label, enabled: existing.enabled }
: null;
const row = existing ?? repository.create({
day: dto.day,
label: dto.label,
enabled: dto.enabled ?? true,
createdBy: principal.userId,
updatedBy: principal.userId,
});
row.label = dto.label;
row.enabled = dto.enabled ?? true;
row.updatedBy = principal.userId;
await repository.save(row);
const after = { day: row.day, label: row.label, enabled: row.enabled };
await this.audit.record({
...administrationAuditContext(principal, request),
action: existing
? 'INSPECTION_NON_WORKING_DAY_UPDATED'
: 'INSPECTION_NON_WORKING_DAY_CREATED',
entityType: 'inspection_non_working_day',
entityId: row.day,
beforeData: before,
afterData: after,
}, manager);
return row;
});
}
}
@@ -0,0 +1,38 @@
import { Transform, Type } from 'class-transformer';
import {
IsInt,
IsOptional,
IsString,
IsUUID,
Matches,
Max,
MaxLength,
Min,
MinLength,
} from 'class-validator';
const optionalText = ({ value }: { value: unknown }) =>
typeof value === 'string' && value.trim() ? value.trim() : null;
export class CreateRecurrentInspectionFindingDto {
@IsUUID('4')
antecedentFindingId!: string;
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
@IsString()
@MinLength(1)
@MaxLength(20000)
description!: string;
@IsOptional()
@Type(() => Number)
@IsInt()
@Min(1)
@Max(10)
severity?: number;
@IsOptional()
@Transform(optionalText)
@Matches(/^\d{4}-\d{2}-\d{2}$/)
correctionDueOn?: string | null;
}
@@ -1,6 +0,0 @@
import { IsUUID } from 'class-validator';
export class SetFindingRecurrenceDto {
@IsUUID('4')
recurrenceOfFindingId!: string;
}
@@ -1,65 +1,41 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import { DataSource } from 'typeorm';
import type { ListFindingCatalogQueryDto } from './dto/list-finding-catalog-query.dto';
import { FindingCatalogService } from './finding-catalog.service';
@Injectable()
export class F3FindingCatalogResolverService {
constructor(private readonly dataSource: DataSource) {}
constructor(
private readonly dataSource: DataSource,
private readonly legacyCatalog: FindingCatalogService,
) {}
async listApplicableForAsset(assetId: string, query: ListFindingCatalogQueryDto) {
const [asset] = await this.dataSource.query(`
SELECT asset.id,asset.code,asset.name,
type.code AS "typeCode",
asset.inventory_family_id AS "familyId",
family.code AS "familyCode",family.name AS "familyName",family.level AS "familyLevel",
family.is_active AS "familyActive"
family.code AS "familyCode",family.name AS "familyName",family.level AS "familyLevel"
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
WHERE asset.id=$1::uuid
`, [assetId]) as Array<{
id: string;
code: string;
name: string;
typeCode: string;
familyId: string | null;
familyCode: string | null;
familyName: string | null;
familyLevel: string | null;
familyActive: boolean | null;
}>;
if (!asset) {
throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
}
const other = {
enabled: true,
code: 'OTHER',
label: 'OTROS',
help: 'Usalo cuando el Hallazgo no exista en el catálogo aplicable. Se enviará una propuesta a revisión de oficina.',
};
// F5: no se mezclan catálogos históricos. Yacimiento no posee familia técnica
// en final_modelov2.xlsx, por lo que puede registrar Hallazgos mediante OTROS.
if (!asset.familyId || asset.familyActive !== true) {
return {
asset: { id: asset.id, code: asset.code, name: asset.name },
inventoryFamily: null,
typeConfigured: false,
configurationReason: asset.typeCode.toLowerCase() === 'yacimiento'
? 'F5 · Yacimiento sin catálogo precargado: Hallazgos disponibles mediante OTROS.'
: 'F5 · El elemento todavía no tiene una clasificación técnica activa.',
categories: [],
items: [],
other,
};
}
if (!asset.familyId) return this.legacyCatalog.listApplicableForAsset(assetId, query);
const filters = [
'mapping.inventory_family_id=$1::uuid',
'item.is_active=true',
'category.is_active=true',
"lower(category.code)='f5model'",
'merge_record.source_item_id IS NULL',
];
const params: unknown[] = [asset.familyId];
@@ -107,10 +83,15 @@ export class F3FindingCatalogResolverService {
level: asset.familyLevel,
},
typeConfigured: true,
configurationReason: `F5 · Catálogo final_modelov2.xlsx asociado a ${asset.familyName ?? 'la clasificación técnica'}`,
configurationReason: `F3.1 · Catálogo del Excel asociado a ${asset.familyName ?? 'la familia técnica'}`,
categories,
items,
other,
other: {
enabled: true,
code: 'OTHER',
label: 'OTROS',
help: 'Usalo cuando el hallazgo no exista en la familia técnica. Se enviará una propuesta a revisión de oficina.',
},
};
}
}
@@ -1,53 +0,0 @@
import {
Body,
Controller,
Delete,
Get,
Param,
ParseUUIDPipe,
Post,
Req,
} from '@nestjs/common';
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 { SetFindingRecurrenceDto } from './dto/set-finding-recurrence.dto';
import { FindingRecurrenceService } from './finding-recurrence.service';
@Controller('inspection-findings')
export class FindingRecurrenceController {
constructor(private readonly recurrence: FindingRecurrenceService) {}
@Get(':id/recurrence')
@RequirePermissions('inspection_findings.read')
state(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
return this.recurrence.state(id);
}
@Get(':id/recurrence-candidates')
@RequirePermissions('inspection_findings.read')
candidates(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
return this.recurrence.candidates(id);
}
@Post(':id/recurrence')
@RequirePermissions('inspection_findings.update')
link(
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
@Body() dto: SetFindingRecurrenceDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.recurrence.link(id, dto, principal, request);
}
@Delete(':id/recurrence')
@RequirePermissions('inspection_findings.update')
clear(
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.recurrence.clear(id, principal, request);
}
}
@@ -1,268 +0,0 @@
import {
BadRequestException,
ConflictException,
ForbiddenException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { DataSource, EntityManager } from 'typeorm';
import { administrationAuditContext } from '../administration/common/administration-audit';
import { AuditService } from '../audit/audit.service';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import { AuditAction } from '../database/entities';
import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
import type { SetFindingRecurrenceDto } from './dto/set-finding-recurrence.dto';
import { InspectionFindingsService } from './inspection-findings.service';
import type { InspectionFindingView } from './inspection-findings.service';
interface FindingRecurrenceContext {
id: string;
assetId: string;
catalogItemId: string | null;
title: string;
createdAt: Date;
actId: string;
actStatus: string;
visitId: string;
visitStatus: string;
}
export interface FindingRecurrenceState {
isRecurrence: boolean;
recurrenceOfFindingId: string | null;
recurrenceOfFindingCode: string | null;
}
export type FindingWithRecurrenceView = InspectionFindingView & FindingRecurrenceState;
function comparable(value: string): string {
return value
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
.toLowerCase()
.replace(/[^a-z0-9]+/g, ' ')
.trim()
.replace(/\s+/g, ' ');
}
@Injectable()
export class FindingRecurrenceService {
constructor(
private readonly dataSource: DataSource,
private readonly audit: AuditService,
private readonly findings: InspectionFindingsService,
) {}
async state(id: string): Promise<FindingRecurrenceState> {
const [row] = await this.dataSource.query(`
SELECT
finding.is_recurrence AS "isRecurrence",
finding.recurrence_of_finding_id AS "recurrenceOfFindingId",
antecedent.code AS "recurrenceOfFindingCode"
FROM inspection_findings finding
LEFT JOIN inspection_findings antecedent ON antecedent.id = finding.recurrence_of_finding_id
WHERE finding.id = $1
`, [id]) as FindingRecurrenceState[];
if (!row) {
throw new NotFoundException({
code: 'INSPECTION_FINDING_NOT_FOUND',
message: 'Hallazgo no encontrado',
});
}
return row;
}
async candidates(id: string) {
const current = await this.requireFinding(this.dataSource.manager, id, false);
const rows = await this.dataSource.query(`
SELECT
finding.id,finding.code,finding.title,finding.description,finding.status,
finding.catalog_item_id AS "catalogItemId",finding.created_at AS "createdAt",
act.id AS "actId",act.code AS "actCode",act.occurred_at AS "actOccurredAt",
visit.id AS "visitId",visit.code AS "visitCode",visit.status AS "visitStatus"
FROM inspection_findings finding
JOIN inspection_acts act ON act.id=finding.act_id
JOIN inspection_visits visit ON visit.id=act.visit_id
WHERE finding.asset_id=$1
AND finding.id<>$2
AND finding.status<>'VOIDED'
AND finding.created_at<$3
AND (
($4::uuid IS NOT NULL AND finding.catalog_item_id=$4::uuid)
OR ($4::uuid IS NULL AND lower(btrim(finding.title))=lower(btrim($5)))
)
ORDER BY finding.created_at DESC,finding.id DESC
LIMIT 20
`, [current.assetId, current.id, current.createdAt, current.catalogItemId, current.title]);
return {
findingId: current.id,
assetId: current.assetId,
hasCandidates: rows.length > 0,
data: rows,
};
}
async link(
id: string,
dto: SetFindingRecurrenceDto,
principal: AuthPrincipal,
request: RequestWithContext,
): Promise<FindingWithRecurrenceView> {
assertMobileInspector(principal);
await this.dataSource.transaction(async (manager) => {
const current = await this.requireFinding(manager, id, true);
this.assertEditable(current);
await this.assertActorAssigned(manager, current.visitId, principal);
if (id === dto.recurrenceOfFindingId) {
throw new BadRequestException({
code: 'FINDING_CANNOT_RECUR_FROM_SELF',
message: 'Un Hallazgo no puede ser reincidencia de sí mismo',
});
}
const previous = await this.requireFinding(manager, dto.recurrenceOfFindingId, false);
if (previous.assetId !== current.assetId) {
throw new ConflictException({
code: 'FINDING_RECURRENCE_DIFFERENT_INVENTORY',
message: 'La reincidencia debe referir a un Hallazgo anterior del mismo Inventario',
});
}
if (new Date(previous.createdAt).getTime() >= new Date(current.createdAt).getTime()) {
throw new ConflictException({
code: 'FINDING_RECURRENCE_NOT_PREVIOUS',
message: 'El Hallazgo de referencia debe ser anterior al actual',
});
}
const sameCatalog = current.catalogItemId && previous.catalogItemId
? current.catalogItemId === previous.catalogItemId
: current.catalogItemId === previous.catalogItemId;
const sameTitle = comparable(current.title) === comparable(previous.title);
if (!sameCatalog && !sameTitle) {
throw new ConflictException({
code: 'FINDING_RECURRENCE_NOT_EQUIVALENT',
message: 'El antecedente seleccionado no corresponde al mismo tipo de Hallazgo',
});
}
const [before] = await manager.query(`
SELECT is_recurrence AS "isRecurrence",recurrence_of_finding_id AS "recurrenceOfFindingId"
FROM inspection_findings WHERE id=$1 FOR UPDATE
`, [id]) as Array<{ isRecurrence: boolean; recurrenceOfFindingId: string | null }>;
await manager.query(`
UPDATE inspection_findings
SET is_recurrence=true,recurrence_of_finding_id=$2,updated_by=$3,updated_at=CURRENT_TIMESTAMP
WHERE id=$1
`, [id, previous.id, principal.userId]);
await this.audit.record({
...administrationAuditContext(principal, request),
action: AuditAction.INSPECTION_FINDING_UPDATED,
entityType: 'inspection_finding',
entityId: id,
beforeData: before ?? { isRecurrence: false, recurrenceOfFindingId: null },
afterData: {
isRecurrence: true,
recurrenceOfFindingId: previous.id,
recurrenceOfFindingCode: await this.codeForFinding(manager, previous.id),
},
metadata: { actId: current.actId, visitId: current.visitId, recurrenceAction: 'LINKED' },
}, manager);
});
const [finding, recurrence] = await Promise.all([
this.findings.getById(id),
this.state(id),
]);
return { ...finding, ...recurrence };
}
async clear(
id: string,
principal: AuthPrincipal,
request: RequestWithContext,
): Promise<FindingWithRecurrenceView> {
assertMobileInspector(principal);
await this.dataSource.transaction(async (manager) => {
const current = await this.requireFinding(manager, id, true);
this.assertEditable(current);
await this.assertActorAssigned(manager, current.visitId, principal);
const [before] = await manager.query(`
SELECT is_recurrence AS "isRecurrence",recurrence_of_finding_id AS "recurrenceOfFindingId"
FROM inspection_findings WHERE id=$1 FOR UPDATE
`, [id]) as Array<{ isRecurrence: boolean; recurrenceOfFindingId: string | null }>;
if (!before?.isRecurrence && !before?.recurrenceOfFindingId) return;
await manager.query(`
UPDATE inspection_findings
SET is_recurrence=false,recurrence_of_finding_id=NULL,updated_by=$2,updated_at=CURRENT_TIMESTAMP
WHERE id=$1
`, [id, principal.userId]);
await this.audit.record({
...administrationAuditContext(principal, request),
action: AuditAction.INSPECTION_FINDING_UPDATED,
entityType: 'inspection_finding',
entityId: id,
beforeData: before,
afterData: { isRecurrence: false, recurrenceOfFindingId: null },
metadata: { actId: current.actId, visitId: current.visitId, recurrenceAction: 'CLEARED' },
}, manager);
});
const [finding, recurrence] = await Promise.all([
this.findings.getById(id),
this.state(id),
]);
return { ...finding, ...recurrence };
}
private async requireFinding(
manager: EntityManager,
id: string,
lock: boolean,
): Promise<FindingRecurrenceContext> {
const [row] = await manager.query(`
SELECT finding.id,finding.asset_id AS "assetId",finding.catalog_item_id AS "catalogItemId",
finding.title,finding.created_at AS "createdAt",finding.act_id AS "actId",
act.status AS "actStatus",visit.id AS "visitId",visit.status AS "visitStatus"
FROM inspection_findings finding
JOIN inspection_acts act ON act.id=finding.act_id
JOIN inspection_visits visit ON visit.id=act.visit_id
WHERE finding.id=$1
${lock ? 'FOR UPDATE OF finding,act,visit' : ''}
`, [id]) as FindingRecurrenceContext[];
if (!row) {
throw new NotFoundException({
code: 'INSPECTION_FINDING_NOT_FOUND',
message: 'Hallazgo no encontrado',
});
}
return row;
}
private assertEditable(finding: FindingRecurrenceContext): void {
if (finding.actStatus !== 'DRAFT' || finding.visitStatus !== 'IN_PROGRESS') {
throw new ConflictException({
code: 'FINDING_RECURRENCE_IMMUTABLE',
message: 'La reincidencia sólo puede definirse mientras el Acta está en BORRADOR y la Inspección en curso',
});
}
}
private async assertActorAssigned(
manager: EntityManager,
visitId: string,
principal: AuthPrincipal,
): Promise<void> {
if (principal.permissions.includes('inspections.manage')) return;
const [row] = await manager.query(`
SELECT 1 FROM inspection_visit_members
WHERE visit_id=$1 AND user_id=$2 AND included=true LIMIT 1
`, [visitId, principal.userId]) as unknown[];
if (!row) {
throw new ForbiddenException({
code: 'INSPECTION_NOT_ASSIGNED',
message: 'La Inspección no está asignada al usuario actual',
});
}
}
private async codeForFinding(manager: EntityManager, id: string): Promise<string | null> {
const [row] = await manager.query('SELECT code FROM inspection_findings WHERE id=$1', [id]) as Array<{ code: string }>;
return row?.code ?? null;
}
}
@@ -0,0 +1,31 @@
import { Body, Controller, Get, Param, ParseUUIDPipe, Post, Query, Req } from '@nestjs/common';
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 { CreateRecurrentInspectionFindingDto } from './dto/create-recurrent-inspection-finding.dto';
import { InspectionFindingRecurrenceService } from './inspection-finding-recurrence.service';
@Controller('inspection-acts/:actId/findings')
export class InspectionFindingRecurrenceController {
constructor(private readonly recurrence: InspectionFindingRecurrenceService) {}
@Get('recurrence-candidates')
@RequirePermissions('inspection_findings.read')
candidates(
@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
@Query('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
) {
return this.recurrence.candidates(actId, assetId);
}
@Post('recurrence')
@RequirePermissions('inspection_findings.create')
create(
@Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
@Body() dto: CreateRecurrentInspectionFindingDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.recurrence.create(actId, dto, principal, request);
}
}
@@ -0,0 +1,301 @@
import {
ConflictException,
ForbiddenException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { DataSource } from 'typeorm';
import { administrationAuditContext } from '../administration/common/administration-audit';
import { AuditService } from '../audit/audit.service';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import { AuditAction } from '../database/entities';
import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
import type { CreateRecurrentInspectionFindingDto } from './dto/create-recurrent-inspection-finding.dto';
@Injectable()
export class InspectionFindingRecurrenceService {
constructor(
private readonly dataSource: DataSource,
private readonly audit: AuditService,
) {}
async candidates(actId: string, assetId: string) {
await this.requireDraftActAsset(actId, assetId);
const data = await this.dataSource.query(`
SELECT
finding.id,
finding.code,
finding.title,
finding.description,
finding.severity,
finding.catalog_item_id AS "catalogItemId",
finding.is_recurrence AS "isRecurrence",
finding.antecedent_finding_id AS "antecedentFindingId",
finding.created_at AS "createdAt",
act.id AS "actId",
act.code AS "actCode",
act.occurred_at AS "actOccurredAt",
visit.id AS "visitId",
visit.code AS "visitCode"
FROM inspection_findings finding
INNER JOIN inspection_acts act ON act.id = finding.act_id
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
WHERE finding.asset_id = $1
AND finding.status = 'OPEN'
AND finding.act_id <> $2
ORDER BY act.occurred_at DESC, finding.created_at DESC, finding.id DESC
`, [assetId, actId]);
return { data };
}
async create(
actId: string,
dto: CreateRecurrentInspectionFindingDto,
principal: AuthPrincipal,
request: RequestWithContext,
) {
assertMobileInspector(principal);
return this.dataSource.transaction(async (manager) => {
const [act] = await manager.query(`
SELECT
act.id,
act.code,
act.status,
act.occurred_at AS "occurredAt",
act.visit_id AS "visitId",
visit.status AS "visitStatus"
FROM inspection_acts act
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
WHERE act.id = $1
FOR UPDATE OF act, visit
`, [actId]) as Array<{
id: string;
code: string;
status: string;
occurredAt: Date;
visitId: string;
visitStatus: string;
}>;
if (!act) throw this.actNotFound();
if (act.status !== 'DRAFT' || act.visitStatus !== 'IN_PROGRESS') {
throw new ConflictException({
code: 'INSPECTION_FINDING_ACT_NOT_EDITABLE',
message: 'La reincidencia sólo puede registrarse mientras el Acta está en borrador y la inspección en curso',
});
}
if (!principal.permissions.includes('inspections.manage')) {
const [member] = await manager.query(`
SELECT 1 AS found
FROM inspection_visit_members
WHERE visit_id = $1
AND user_id = $2
AND included = true
LIMIT 1
`, [act.visitId, principal.userId]) as Array<{ found: number }>;
if (!member) {
throw new ForbiddenException({
code: 'INSPECTION_VISIT_NOT_ASSIGNED',
message: 'La inspección no está asignada al usuario actual',
});
}
}
const [antecedent] = await manager.query(`
SELECT
finding.id,
finding.act_id AS "actId",
finding.asset_id AS "assetId",
finding.catalog_item_id AS "catalogItemId",
finding.title,
finding.legal_basis AS "legalBasis",
finding.glossary,
finding.catalog_revision AS "catalogRevision",
finding.suggested_severity AS "suggestedSeverity",
finding.severity,
finding.status,
previous_act.code AS "actCode",
previous_act.occurred_at AS "occurredAt"
FROM inspection_findings finding
INNER JOIN inspection_acts previous_act ON previous_act.id = finding.act_id
WHERE finding.id = $1
FOR SHARE OF finding, previous_act
`, [dto.antecedentFindingId]) as Array<{
id: string;
actId: string;
assetId: string;
catalogItemId: string | null;
title: string;
legalBasis: string | null;
glossary: string | null;
catalogRevision: number | null;
suggestedSeverity: number | null;
severity: number | null;
status: string;
actCode: string;
occurredAt: Date;
}>;
if (!antecedent) {
throw new NotFoundException({
code: 'INSPECTION_FINDING_ANTECEDENT_NOT_FOUND',
message: 'No se encontró el Hallazgo antecedente seleccionado',
});
}
if (antecedent.status !== 'OPEN') {
throw new ConflictException({
code: 'INSPECTION_FINDING_ANTECEDENT_RESOLVED',
message: 'Sólo un Hallazgo anterior todavía abierto puede originar una reincidencia',
});
}
if (antecedent.actId === actId) {
throw new ConflictException({
code: 'INSPECTION_FINDING_RECURRENCE_SAME_ACT',
message: 'Una reincidencia debe referenciar un Hallazgo de un Acta anterior',
});
}
if (new Date(antecedent.occurredAt).getTime() > new Date(act.occurredAt).getTime()) {
throw new ConflictException({
code: 'INSPECTION_FINDING_ANTECEDENT_AFTER_ACT',
message: 'El antecedente no puede pertenecer a un Acta posterior a la actual',
});
}
const [assetLink] = await manager.query(`
SELECT 1 AS found
FROM inspection_act_assets
WHERE act_id = $1 AND asset_id = $2 AND included = true
LIMIT 1
`, [actId, antecedent.assetId]) as Array<{ found: number }>;
if (!assetLink) {
throw new ConflictException({
code: 'INSPECTION_FINDING_RECURRENCE_ASSET_NOT_IN_ACT',
message: 'El Inventario del Hallazgo antecedente no forma parte del Acta actual',
});
}
const [sequence] = await manager.query(`
SELECT COALESCE(MAX(finding_number), 0)::integer + 1 AS number
FROM inspection_findings
WHERE act_id = $1
`, [actId]) as Array<{ number: number }>;
const findingNumber = Number(sequence?.number ?? 1);
if (findingNumber > 999) {
throw new ConflictException({
code: 'INSPECTION_FINDING_SEQUENCE_EXHAUSTED',
message: 'El Acta alcanzó el máximo de 999 Hallazgos',
});
}
const code = `${act.code}-H${String(findingNumber).padStart(3, '0')}`;
const [created] = await manager.query(`
INSERT INTO inspection_findings (
act_id,
asset_id,
catalog_item_id,
finding_number,
code,
status,
title,
description,
legal_basis,
glossary,
catalog_revision,
suggested_severity,
severity,
is_recurrence,
antecedent_finding_id,
correction_due_on,
current_version,
created_by,
updated_by
) VALUES (
$1,$2,$3,$4,$5,'OPEN',$6,$7,$8,$9,$10,$11,$12,true,$13,$14,1,$15,$15
)
RETURNING id, created_at AS "createdAt", updated_at AS "updatedAt"
`, [
actId,
antecedent.assetId,
antecedent.catalogItemId,
findingNumber,
code,
antecedent.title,
dto.description,
antecedent.legalBasis,
antecedent.glossary,
antecedent.catalogRevision,
antecedent.suggestedSeverity,
dto.severity ?? antecedent.severity ?? antecedent.suggestedSeverity,
antecedent.id,
dto.correctionDueOn ?? null,
principal.userId,
]) as Array<{ id: string; createdAt: Date; updatedAt: Date }>;
const snapshot = {
id: created.id,
actId,
assetId: antecedent.assetId,
catalogItemId: antecedent.catalogItemId,
findingNumber,
code,
status: 'OPEN',
title: antecedent.title,
description: dto.description,
legalBasis: antecedent.legalBasis,
glossary: antecedent.glossary,
catalogRevision: antecedent.catalogRevision,
suggestedSeverity: antecedent.suggestedSeverity,
severity: dto.severity ?? antecedent.severity ?? antecedent.suggestedSeverity,
isRecurrence: true,
antecedentFindingId: antecedent.id,
antecedentCode: `${antecedent.actCode}`,
correctionDueOn: dto.correctionDueOn ?? null,
currentVersion: 1,
createdAt: created.createdAt,
updatedAt: created.updatedAt,
};
await manager.query(`
INSERT INTO inspection_finding_versions (
finding_id, version_number, event, snapshot, actor_user_id, actor_username
) VALUES ($1, 1, 'CREATED', $2::jsonb, $3, $4)
`, [created.id, snapshot, principal.userId, principal.username]);
await this.audit.record({
...administrationAuditContext(principal, request),
action: AuditAction.INSPECTION_FINDING_CREATED,
entityType: 'inspection_finding',
entityId: created.id,
afterData: snapshot,
metadata: {
actId,
visitId: act.visitId,
recurrence: true,
antecedentFindingId: antecedent.id,
},
}, manager);
return snapshot;
});
}
private async requireDraftActAsset(actId: string, assetId: string): Promise<void> {
const [row] = await this.dataSource.query(`
SELECT 1 AS found
FROM inspection_acts act
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
INNER JOIN inspection_act_assets link
ON link.act_id = act.id AND link.asset_id = $2 AND link.included = true
WHERE act.id = $1
AND act.status = 'DRAFT'
AND visit.status = 'IN_PROGRESS'
LIMIT 1
`, [actId, assetId]) as Array<{ found: number }>;
if (!row) {
throw new ConflictException({
code: 'INSPECTION_FINDING_RECURRENCE_CONTEXT_INVALID',
message: 'El Inventario debe estar incluido en un Acta en borrador de una inspección en curso',
});
}
}
private actNotFound(): NotFoundException {
return new NotFoundException({
code: 'INSPECTION_ACT_NOT_FOUND',
message: 'Acta de inspección no encontrada',
});
}
}
@@ -1,331 +0,0 @@
import { Injectable } from '@nestjs/common';
import { DataSource } from 'typeorm';
import type { ListInspectionFindingsQueryDto } from './dto/list-inspection-findings-query.dto';
export interface InspectionFindingWorklistCounters {
open: number;
withoutControlDate: number;
toVerify: number;
verificationOverdue: number;
verificationNext30Days: number;
readyToClose: number;
closed: number;
}
export interface InspectionFindingWorklistItem {
id: string;
actId: string;
assetId: string;
code: string;
status: 'OPEN' | 'CLOSED' | 'VOIDED';
title: string;
description: string;
severity: number | null;
nextControlOn: string | null;
closedAt: Date | null;
closureNotes: string | null;
asset: {
id: string;
code: string;
name: string;
commonName: string | null;
typeName: string;
operatorCompany: { id: string; code: string; name: string } | null;
operationalArea: { id: string; code: string; name: string } | null;
};
document: {
actId: string;
actCode: string;
actStatus: string;
visitId: string;
visitCode: string;
visitStatus: string;
};
verificationVisit: {
id: string;
code: string;
status: string;
plannedStartAt: Date | null;
} | null;
latestVerification: {
visitId: string;
visitCode: string;
visitStatus: string;
targetControlOn: string | null;
outcome: 'RESOLVED' | 'NOT_RESOLVED' | 'REQUIRES_NEW_DATE' | null;
resultNotes: string | null;
verifiedAt: Date | null;
resultRecordedAt: Date | null;
rescheduledControlOn: string | null;
evidenceCount: number;
} | null;
createdAt: Date;
updatedAt: Date;
}
export interface InspectionFindingWorklistPage {
data: InspectionFindingWorklistItem[];
meta: { page: number; pageSize: number; total: number; totalPages: number };
counters: InspectionFindingWorklistCounters;
}
@Injectable()
export class InspectionFindingWorklistService {
constructor(private readonly dataSource: DataSource) {}
async list(query: ListInspectionFindingsQueryDto): Promise<InspectionFindingWorklistPage> {
const page = query.page ?? 1;
const pageSize = query.pageSize ?? 25;
const workflow = query.workflow ?? 'OPEN';
const values: unknown[] = [];
const contextFilters: string[] = [];
const today = `(CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date`;
const latestOutcome = `(SELECT latest_verification.outcome
FROM inspection_finding_verification_visits latest_verification
WHERE latest_verification.finding_id = finding.id
AND latest_verification.outcome IS NOT NULL
ORDER BY latest_verification.result_recorded_at DESC NULLS LAST,
latest_verification.created_at DESC,
latest_verification.id DESC
LIMIT 1)`;
const latestVisitStatus = `(SELECT latest_visit.status
FROM inspection_finding_verification_visits latest_verification
INNER JOIN inspection_visits latest_visit ON latest_visit.id = latest_verification.visit_id
WHERE latest_verification.finding_id = finding.id
AND latest_verification.outcome IS NOT NULL
ORDER BY latest_verification.result_recorded_at DESC NULLS LAST,
latest_verification.created_at DESC,
latest_verification.id DESC
LIMIT 1)`;
const add = (value: unknown): string => {
values.push(value);
return `$${values.length}`;
};
if (query.search) {
const parameter = add(`%${query.search}%`);
contextFilters.push(`(
finding.code ILIKE ${parameter}
OR finding.title ILIKE ${parameter}
OR finding.description ILIKE ${parameter}
OR asset.code ILIKE ${parameter}
OR asset.name ILIKE ${parameter}
OR company.name ILIKE ${parameter}
OR area.name ILIKE ${parameter}
OR act.code ILIKE ${parameter}
)`);
}
if (query.companyId) contextFilters.push(`company.id = ${add(query.companyId)}::uuid`);
if (query.areaId) contextFilters.push(`area.id = ${add(query.areaId)}::uuid`);
if (query.inspectorId) {
const inspector = add(query.inspectorId);
contextFilters.push(`(
visit.lead_inspector_user_id = ${inspector}::uuid
OR EXISTS (
SELECT 1 FROM inspection_visit_members member_filter
WHERE member_filter.visit_id = visit.id
AND member_filter.included = true
AND member_filter.user_id = ${inspector}::uuid
)
)`);
}
if (query.dateFrom) contextFilters.push(`act.occurred_at::date >= ${add(query.dateFrom)}::date`);
if (query.dateTo) contextFilters.push(`act.occurred_at::date <= ${add(query.dateTo)}::date`);
const workflowFilters: string[] = [];
if (workflow === 'OPEN') workflowFilters.push(`finding.status = 'OPEN'`);
if (workflow === 'TO_SCHEDULE_VERIFICATION') {
workflowFilters.push(`finding.status = 'OPEN' AND finding.next_control_on IS NULL AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'`);
}
if (workflow === 'TO_VERIFY') {
workflowFilters.push(`finding.status = 'OPEN' AND finding.next_control_on IS NOT NULL AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'`);
}
if (workflow === 'VERIFICATION_OVERDUE') {
workflowFilters.push(`finding.status = 'OPEN' AND finding.next_control_on IS NOT NULL AND finding.next_control_on < ${today} AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'`);
}
if (workflow === 'READY_TO_CLOSE') {
workflowFilters.push(`finding.status = 'OPEN' AND ${latestOutcome} = 'RESOLVED' AND ${latestVisitStatus} = 'CLOSED'`);
}
if (workflow === 'CLOSED') workflowFilters.push(`finding.status = 'CLOSED'`);
if (workflow === 'WAITING_COMPANY' || workflow === 'COMPANY_OVERDUE') {
// Compatibilidad de URL histórica: estos estados dejaron de existir en F4.
workflowFilters.push(`finding.status = 'OPEN'`);
}
const joins = `
INNER JOIN inspection_acts act ON act.id = finding.act_id
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
INNER JOIN assets asset ON asset.id = finding.asset_id
INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
LEFT JOIN assets company ON company.id = asset.operator_company_id
LEFT JOIN assets area ON area.id = asset.operational_area_id
`;
const filters = [...contextFilters, ...workflowFilters];
const where = filters.length ? `WHERE ${filters.join(' AND ')}` : '';
const contextWhere = contextFilters.length ? `WHERE ${contextFilters.join(' AND ')}` : '';
const [countRow] = await this.dataSource.query(`
SELECT COUNT(*)::integer AS total
FROM inspection_findings finding
${joins}
${where}
`, values) as Array<{ total: number }>;
const total = Number(countRow?.total ?? 0);
const listValues = [...values, pageSize, (page - 1) * pageSize];
const limitParameter = `$${values.length + 1}`;
const offsetParameter = `$${values.length + 2}`;
const data = await this.dataSource.query(`
SELECT
finding.id,
finding.act_id AS "actId",
finding.asset_id AS "assetId",
finding.code,
finding.status,
finding.title,
finding.description,
finding.severity,
finding.next_control_on AS "nextControlOn",
finding.closed_at AS "closedAt",
finding.closure_notes AS "closureNotes",
JSONB_BUILD_OBJECT(
'id', asset.id,
'code', asset.code,
'name', asset.name,
'commonName', asset.common_name,
'typeName', asset_type.name,
'operatorCompany', CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', company.id, 'code', company.code, 'name', company.name
) END,
'operationalArea', CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', area.id, 'code', area.code, 'name', area.name
) END
) AS asset,
JSONB_BUILD_OBJECT(
'actId', act.id,
'actCode', act.code,
'actStatus', act.status,
'visitId', visit.id,
'visitCode', visit.code,
'visitStatus', visit.status
) AS document,
CASE WHEN verification_visit.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', verification_visit.id,
'code', verification_visit.code,
'status', verification_visit.status,
'plannedStartAt', verification_visit.planned_start_at
) END AS "verificationVisit",
CASE WHEN latest_verification.visit_id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'visitId', latest_verification.visit_id,
'visitCode', latest_verification.visit_code,
'visitStatus', latest_verification.visit_status,
'targetControlOn', latest_verification.target_control_on,
'outcome', latest_verification.outcome,
'resultNotes', latest_verification.result_notes,
'verifiedAt', latest_verification.verified_at,
'resultRecordedAt', latest_verification.result_recorded_at,
'rescheduledControlOn', latest_verification.rescheduled_control_on,
'evidenceCount', latest_verification.evidence_count
) END AS "latestVerification",
finding.created_at AS "createdAt",
finding.updated_at AS "updatedAt"
FROM inspection_findings finding
${joins}
LEFT JOIN LATERAL (
SELECT verification_target.id, verification_target.code,
verification_target.status, verification_target.planned_start_at
FROM inspection_finding_verification_visits verification_link
INNER JOIN inspection_visits verification_target ON verification_target.id = verification_link.visit_id
WHERE verification_link.finding_id = finding.id
AND verification_target.status IN ('DRAFT', 'PLANNED', 'IN_PROGRESS')
ORDER BY verification_link.created_at DESC, verification_link.id DESC
LIMIT 1
) verification_visit ON true
LEFT JOIN LATERAL (
SELECT
verification_link.visit_id,
verification_target.code AS visit_code,
verification_target.status AS visit_status,
verification_link.target_control_on,
verification_link.outcome,
verification_link.result_notes,
verification_link.verified_at,
verification_link.result_recorded_at,
verification_link.rescheduled_control_on,
(SELECT COUNT(*)::integer
FROM inspection_finding_evidence evidence
WHERE evidence.finding_id = finding.id
AND evidence.verification_visit_id = verification_link.visit_id
AND evidence.purpose = 'VERIFICATION') AS evidence_count
FROM inspection_finding_verification_visits verification_link
INNER JOIN inspection_visits verification_target ON verification_target.id = verification_link.visit_id
WHERE verification_link.finding_id = finding.id
ORDER BY COALESCE(verification_link.result_recorded_at, verification_link.created_at) DESC,
verification_link.id DESC
LIMIT 1
) latest_verification ON true
${where}
ORDER BY
CASE WHEN finding.status = 'OPEN' THEN 0 ELSE 1 END,
COALESCE(finding.next_control_on, '9999-12-31'::date),
finding.updated_at DESC,
finding.code
LIMIT ${limitParameter} OFFSET ${offsetParameter}
`, listValues) as InspectionFindingWorklistItem[];
const [counterRow] = await this.dataSource.query(`
SELECT
COUNT(*) FILTER (WHERE finding.status='OPEN')::integer AS "open",
COUNT(*) FILTER (
WHERE finding.status='OPEN'
AND finding.next_control_on IS NULL
AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'
)::integer AS "withoutControlDate",
COUNT(*) FILTER (
WHERE finding.status='OPEN'
AND finding.next_control_on IS NOT NULL
AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'
)::integer AS "toVerify",
COUNT(*) FILTER (
WHERE finding.status='OPEN'
AND finding.next_control_on IS NOT NULL
AND finding.next_control_on < ${today}
AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'
)::integer AS "verificationOverdue",
COUNT(*) FILTER (
WHERE finding.status='OPEN'
AND finding.next_control_on BETWEEN ${today} AND ${today} + 30
AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'
)::integer AS "verificationNext30Days",
COUNT(*) FILTER (
WHERE finding.status='OPEN'
AND ${latestOutcome}='RESOLVED'
AND ${latestVisitStatus}='CLOSED'
)::integer AS "readyToClose",
COUNT(*) FILTER (WHERE finding.status='CLOSED')::integer AS "closed"
FROM inspection_findings finding
${joins}
${contextWhere}
`, values) as InspectionFindingWorklistCounters[];
return {
data,
meta: {
page,
pageSize,
total,
totalPages: total === 0 ? 0 : Math.ceil(total / pageSize),
},
counters: {
open: Number(counterRow?.open ?? 0),
withoutControlDate: Number(counterRow?.withoutControlDate ?? 0),
toVerify: Number(counterRow?.toVerify ?? 0),
verificationOverdue: Number(counterRow?.verificationOverdue ?? 0),
verificationNext30Days: Number(counterRow?.verificationNext30Days ?? 0),
readyToClose: Number(counterRow?.readyToClose ?? 0),
closed: Number(counterRow?.closed ?? 0),
},
};
}
}
@@ -16,11 +16,7 @@ import { CloseInspectionFindingDto } from './dto/close-inspection-finding.dto';
import { CreateInspectionFindingDto } from './dto/create-inspection-finding.dto';
import { ListInspectionFindingsQueryDto } from './dto/list-inspection-findings-query.dto';
import { UpdateInspectionFindingDto } from './dto/update-inspection-finding.dto';
import { FindingRecurrenceService } from './finding-recurrence.service';
import type { FindingRecurrenceState } from './finding-recurrence.service';
import { InspectionFindingWorklistService } from './inspection-finding-worklist.service';
import { InspectionFindingsService } from './inspection-findings.service';
import type { InspectionFindingView } from './inspection-findings.service';
@Controller('inspection-acts/:actId/findings')
export class InspectionActFindingsController {
@@ -46,28 +42,18 @@ export class InspectionActFindingsController {
@Controller('inspection-findings')
export class InspectionFindingsController {
constructor(
private readonly findings: InspectionFindingsService,
private readonly worklist: InspectionFindingWorklistService,
private readonly recurrence: FindingRecurrenceService,
) {}
constructor(private readonly findings: InspectionFindingsService) {}
@Get()
@RequirePermissions('inspection_findings.read')
list(@Query() query: ListInspectionFindingsQueryDto) {
return this.worklist.list(query);
return this.findings.listGlobal(query);
}
@Get(':id')
@RequirePermissions('inspection_findings.read')
async get(
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
): Promise<InspectionFindingView & FindingRecurrenceState> {
const [finding, recurrence] = await Promise.all([
this.findings.getById(id),
this.recurrence.state(id),
]);
return { ...finding, ...recurrence };
get(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
return this.findings.getById(id);
}
@Get(':id/verification-history')
@@ -4,9 +4,8 @@ import { FindingCatalogController } from './finding-catalog.controller';
import { FindingCatalogMergeService } from './finding-catalog-merge.service';
import { FindingCatalogService } from './finding-catalog.service';
import { F3FindingCatalogResolverService } from './f3-finding-catalog-resolver.service';
import { FindingRecurrenceController } from './finding-recurrence.controller';
import { FindingRecurrenceService } from './finding-recurrence.service';
import { InspectionFindingWorklistService } from './inspection-finding-worklist.service';
import { InspectionFindingRecurrenceController } from './inspection-finding-recurrence.controller';
import { InspectionFindingRecurrenceService } from './inspection-finding-recurrence.service';
import {
InspectionActFindingsController,
InspectionFindingsController,
@@ -24,8 +23,8 @@ import { InspectionEvidenceService } from './inspection-evidence.service';
controllers: [
FindingCatalogController,
InspectionActFindingsController,
InspectionFindingRecurrenceController,
InspectionFindingsController,
FindingRecurrenceController,
InspectionFindingEvidenceController,
InspectionFindingCommunicationsController,
InspectionEvidenceContentController,
@@ -35,8 +34,7 @@ import { InspectionEvidenceService } from './inspection-evidence.service';
F3FindingCatalogResolverService,
FindingCatalogMergeService,
InspectionFindingsService,
InspectionFindingWorklistService,
FindingRecurrenceService,
InspectionFindingRecurrenceService,
InspectionEvidenceService,
],
exports: [
@@ -44,8 +42,7 @@ import { InspectionEvidenceService } from './inspection-evidence.service';
F3FindingCatalogResolverService,
FindingCatalogMergeService,
InspectionFindingsService,
InspectionFindingWorklistService,
FindingRecurrenceService,
InspectionFindingRecurrenceService,
],
})
export class InspectionFindingsModule {}
@@ -62,6 +62,7 @@ interface FindingDocumentView {
actStatus: InspectionActStatus;
visitId: string;
visitCode: string;
visitTitle: string;
visitStatus: InspectionVisitStatus;
}
@@ -98,6 +99,7 @@ export interface InspectionFindingListItem {
verificationVisit: {
id: string;
code: string;
title: string;
status: InspectionVisitStatus;
plannedStartAt: Date | null;
} | null;
@@ -141,6 +143,7 @@ export interface FindingVerificationHistoryEvent {
verificationVisit: {
id: string;
code: string;
title: string;
status: InspectionVisitStatus;
plannedStartAt: Date | null;
} | null;
@@ -808,11 +811,13 @@ export class InspectionFindingsService {
'actStatus', act.status,
'visitId', visit.id,
'visitCode', visit.code,
'visitTitle', visit.title,
'visitStatus', visit.status
) AS document,
CASE WHEN verification_visit.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', verification_visit.id,
'code', verification_visit.code,
'title', verification_visit.title,
'status', verification_visit.status,
'plannedStartAt', verification_visit.planned_start_at
) END AS "verificationVisit",
@@ -840,7 +845,7 @@ export class InspectionFindingsService {
LEFT JOIN finding_catalog_items catalog ON catalog.id = finding.catalog_item_id
LEFT JOIN finding_categories category ON category.id = catalog.category_id
LEFT JOIN LATERAL (
SELECT verification_target.id, verification_target.code,
SELECT verification_target.id, verification_target.code, verification_target.title,
verification_target.status, verification_target.planned_start_at
FROM inspection_finding_verification_visits verification_link
INNER JOIN inspection_visits verification_target ON verification_target.id = verification_link.visit_id
@@ -918,6 +923,7 @@ export class InspectionFindingsService {
CASE WHEN visit.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
'id', visit.id,
'code', visit.code,
'title', visit.title,
'status', visit.status,
'plannedStartAt', visit.planned_start_at
) END AS "verificationVisit",
@@ -1,128 +1,17 @@
import { Body, Controller, ForbiddenException, Get, Param, ParseUUIDPipe, Patch, Post, Put, Req } from '@nestjs/common';
import { Body, Controller, Get, Param, ParseUUIDPipe, Patch, Post, Req } from '@nestjs/common';
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 { administrationAuditContext } from '../administration/common/administration-audit';
import { AuditService } from '../audit/audit.service';
import { AuditAction } from '../database/entities';
import { InspectionDocumentDeliveryService } from './inspection-document-delivery.service';
import type { DeliveryRow } from './inspection-document-delivery.service';
import { SmtpDeliveryService } from './smtp-delivery.service';
import { UpdateDocumentDeliverySettingsDto } from './dto/update-document-delivery-settings.dto';
import { TestSmtpSettingsDto, UpdateSmtpSettingsDto } from './dto/update-smtp-settings.dto';
@Controller('document-delivery')
export class DocumentDeliveryController {
constructor(
private readonly delivery: InspectionDocumentDeliveryService,
private readonly smtp: SmtpDeliveryService,
private readonly audit: AuditService,
) {}
@Get('settings')
@RequirePermissions('document_delivery.read')
settings() {
return this.delivery.settings();
}
@Patch('settings')
@RequirePermissions('document_delivery.manage')
update(
@Body() dto: UpdateDocumentDeliverySettingsDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.delivery.updateSettings(dto, principal, request);
}
@Get('smtp')
@RequirePermissions('document_delivery.manage')
smtpSettings(@CurrentAuth() principal: AuthPrincipal) {
this.assertSystemAdmin(principal);
return this.smtp.publicSettings();
}
@Put('smtp')
@RequirePermissions('document_delivery.manage')
async updateSmtp(
@Body() dto: UpdateSmtpSettingsDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
this.assertSystemAdmin(principal);
const before = await this.smtp.publicSettings();
const after = await this.smtp.saveSettings(dto, principal.userId);
await this.audit.record({
...administrationAuditContext(principal, request),
action: AuditAction.SMTP_SETTINGS_UPDATED,
entityType: 'system_smtp_settings',
entityId: 'singleton',
beforeData: before as Record<string, unknown>,
afterData: after as Record<string, unknown>,
metadata: { passwordNeverReturned: true, restrictedToRole: 'admin' },
});
return after;
}
@Post('smtp/test')
@RequirePermissions('document_delivery.manage')
async testSmtp(
@Body() dto: TestSmtpSettingsDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
this.assertSystemAdmin(principal);
const sent = await this.smtp.send({
to: dto.email,
subject: 'DH Inspección · Prueba SMTP',
text: 'Este correo confirma que la configuración SMTP de DH Inspección funciona correctamente.',
attachment: {
filename: 'dh-inspeccion-smtp-test.txt',
mimeType: 'text/plain',
content: Buffer.from('DH Inspección · Prueba SMTP OK\n', 'utf8'),
},
});
await this.audit.record({
...administrationAuditContext(principal, request),
action: AuditAction.SMTP_TEST_SENT,
entityType: 'system_smtp_settings',
entityId: 'singleton',
afterData: { recipient: dto.email, messageId: sent.messageId },
metadata: { restrictedToRole: 'admin' },
});
return { ok: true, recipient: dto.email, messageId: sent.messageId };
}
@Get('outbox')
@RequirePermissions('document_delivery.read')
outbox() {
return this.delivery.list();
}
@Post('outbox/:id/retry')
@RequirePermissions('document_delivery.manage')
retry(
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
): Promise<DeliveryRow> {
return this.delivery.retry(id, principal, request);
}
@Post('outbox/retry-pending')
@RequirePermissions('document_delivery.manage')
retryPending(
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.delivery.retryPending(principal, request);
}
private assertSystemAdmin(principal: AuthPrincipal): void {
if (principal.roles.includes('admin')) return;
throw new ForbiddenException({
code: 'SMTP_SUPERADMIN_REQUIRED',
message: 'La configuración SMTP está reservada al Superadmin del sistema',
});
}
constructor(private readonly delivery:InspectionDocumentDeliveryService){}
@Get('settings') @RequirePermissions('document_delivery.read') settings(){return this.delivery.settings();}
@Patch('settings') @RequirePermissions('document_delivery.manage') update(@Body() dto:UpdateDocumentDeliverySettingsDto,@CurrentAuth() principal:AuthPrincipal,@Req() request:RequestWithContext){return this.delivery.updateSettings(dto,principal,request);}
@Get('outbox') @RequirePermissions('document_delivery.read') outbox(){return this.delivery.list();}
@Post('outbox/:id/retry') @RequirePermissions('document_delivery.manage') retry(@Param('id',new ParseUUIDPipe({version:'4'})) id:string,@CurrentAuth() principal:AuthPrincipal,@Req() request:RequestWithContext):Promise<DeliveryRow>{return this.delivery.retry(id,principal,request);}
@Post('outbox/retry-pending') @RequirePermissions('document_delivery.manage') retryPending(@CurrentAuth() principal:AuthPrincipal,@Req() request:RequestWithContext){return this.delivery.retryPending(principal,request);}
}
@@ -1,22 +1,22 @@
import { Transform } from 'class-transformer';
import { IsEnum, IsISO8601, IsOptional, IsString, MaxLength } from 'class-validator';
import { IsEnum, IsOptional, IsString, Matches, MaxLength } from 'class-validator';
import { InspectionReportFollowUpType } from '../../database/entities';
export class CreateInspectionReportFollowUpDto {
@IsEnum(InspectionReportFollowUpType)
type!: InspectionReportFollowUpType;
@IsISO8601({ strict: true })
occurredAt!: string;
eventType!: InspectionReportFollowUpType;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' ? value.trim() || null : value)
@Transform(({ value }) => (typeof value === 'string' && value.trim() ? value.trim() : null))
@IsString()
@MaxLength(255)
externalReference?: string | null;
referenceNumber?: string | null;
@Matches(/^\d{4}-\d{2}-\d{2}$/)
occurredOn!: string;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' ? value.trim() || null : value)
@Transform(({ value }) => (typeof value === 'string' && value.trim() ? value.trim() : null))
@IsString()
@MaxLength(20000)
description?: string | null;
@@ -0,0 +1,13 @@
import { Transform } from 'class-transformer';
import { IsString, Matches, MaxLength, MinLength } from 'class-validator';
export class OfficializeInspectionReportGedoDto {
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
@IsString()
@MinLength(3)
@MaxLength(255)
ifIdentifier!: string;
@Matches(/^\d{4}-\d{2}-\d{2}$/)
officializedOn!: string;
}
@@ -1,13 +0,0 @@
import { Transform } from 'class-transformer';
import { IsISO8601, IsString, MaxLength, MinLength } from 'class-validator';
export class OfficializeInspectionReportDto {
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(2)
@MaxLength(255)
gedoIfIdentifier!: string;
@IsISO8601({ strict: true })
gedoOfficializedAt!: string;
}
@@ -1,48 +0,0 @@
import { Transform, Type } from 'class-transformer';
import {
IsBoolean,
IsDateString,
IsEnum,
IsInt,
IsString,
Max,
MaxLength,
Min,
MinLength,
} from 'class-validator';
import { InspectionDeadlineDayType } from '../../database/entities';
export class UpdateDeadlinePolicyDto {
@Type(() => Number)
@IsInt()
@Min(1)
@Max(365)
urgentDays!: number;
@IsEnum(InspectionDeadlineDayType)
urgentDayType!: InspectionDeadlineDayType;
@Type(() => Number)
@IsInt()
@Min(1)
@Max(365)
nonUrgentDays!: number;
@IsEnum(InspectionDeadlineDayType)
nonUrgentDayType!: InspectionDeadlineDayType;
}
export class UpsertBusinessCalendarDayDto {
@IsDateString()
date!: string;
@Transform(({ value }) => value === true || value === 'true')
@IsBoolean()
isBusinessDay!: boolean;
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
@IsString()
@MinLength(1)
@MaxLength(200)
label!: string;
}
@@ -0,0 +1,58 @@
import { Transform } from 'class-transformer';
import { IsOptional, IsString, MaxLength } from 'class-validator';
function optionalText(value: unknown): unknown {
if (typeof value !== 'string') return value;
const trimmed = value.trim();
return trimmed.length ? trimmed : null;
}
export class UpdateInspectionReportContentDto {
@IsOptional()
@Transform(({ value }) => optionalText(value))
@IsString()
@MaxLength(10000)
referenceText?: string | null;
@IsOptional()
@Transform(({ value }) => optionalText(value))
@IsString()
@MaxLength(20000)
generalObjective?: string | null;
@IsOptional()
@Transform(({ value }) => optionalText(value))
@IsString()
@MaxLength(20000)
specificObjective?: string | null;
@IsOptional()
@Transform(({ value }) => optionalText(value))
@IsString()
@MaxLength(40000)
background?: string | null;
@IsOptional()
@Transform(({ value }) => optionalText(value))
@IsString()
@MaxLength(40000)
legalFramework?: string | null;
@IsOptional()
@Transform(({ value }) => optionalText(value))
@IsString()
@MaxLength(40000)
executiveSummary?: string | null;
@IsOptional()
@Transform(({ value }) => optionalText(value))
@IsString()
@MaxLength(80000)
description?: string | null;
@IsOptional()
@Transform(({ value }) => optionalText(value))
@IsString()
@MaxLength(40000)
conclusion?: string | null;
}

Some files were not shown because too many files have changed in this diff Show More