admin/dh-inspeccion-v2
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(F6.1): enforce Yacimiento scope end to end

Browse Source
This commit is contained in:
github-actions[bot]
2026-09-10 18:45:42 +00:00
parent f99452c21c
commit b1f0064b40
8 changed files with 129 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/f6-1-address-review.yml
-184
View File
@@ -1,184 +0,0 @@
name: F6.1 address inspection review
on:
push:
branches:
- 'hotfix/f6-1-inspection-planning-hierarchy'
paths:
- '.github/workflows/f6-1-address-review.yml'
permissions:
contents: write
jobs:
apply:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: hotfix/f6-1-inspection-planning-hierarchy
fetch-depth: 0
- name: Apply reviewed F6.1 scope fixes
run: |
python - <<'PY'
from pathlib import Path
def replace_once(path, before, after, label):
p = Path(path)
text = p.read_text()
count = text.count(before)
if count != 1:
raise SystemExit(f'{label}: expected one match, got {count}')
p.write_text(text.replace(before, after))
# Controller: WEB operator choices are resolved at the planned timestamp.
replace_once(
'api-v3/src/inspection-visits/inspection-visits.controller.ts',
''' planningOperators(\n @Param('areaId', new ParseUUIDPipe({ version: '4' })) areaId: string,\n ) {\n return this.visits.listPlanningOperators(areaId);\n }''',
''' planningOperators(\n @Param('areaId', new ParseUUIDPipe({ version: '4' })) areaId: string,\n @Query('at') at?: string,\n ) {\n return this.planningHierarchy.operatorsForArea(areaId, at);\n }''',
'controller planned operator lookup',
)
# WEB create: Yacimientos depend on Area; Operators depend on Area + planned date.
replace_once(
'web-v2/src/pages/InspectionVisitCreateF61Page.tsx',
''' useEffect(() => {\n setYacimientoId('');\n setOperatorId('');\n setYacimientos([]);\n setOperators([]);\n if (!areaId) return;\n Promise.all([\n requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/yacimientos`),\n requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/operators`),\n ]).then(([yacimientoResponse, operatorResponse]) => {\n setYacimientos(yacimientoResponse.data);\n setOperators(operatorResponse.data);\n if (operatorResponse.data.length === 1 && operatorResponse.data[0]) {\n setOperatorId(operatorResponse.data[0].id);\n }\n }).catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));\n }, [areaId]);''',
''' useEffect(() => {\n setYacimientoId('');\n setOperatorId('');\n setYacimientos([]);\n setOperators([]);\n if (!areaId) return;\n requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/yacimientos`)\n .then((response) => setYacimientos(response.data))\n .catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));\n }, [areaId]);\n\n useEffect(() => {\n setOperatorId('');\n setOperators([]);\n if (!areaId || !plannedStartAt) return;\n const parsedStart = new Date(plannedStartAt);\n if (Number.isNaN(parsedStart.getTime())) return;\n const at = encodeURIComponent(parsedStart.toISOString());\n requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/operators?at=${at}`)\n .then((response) => {\n setOperators(response.data);\n if (response.data.length === 1 && response.data[0]) setOperatorId(response.data[0].id);\n })\n .catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));\n }, [areaId, plannedStartAt]);''',
'WEB planned operator effect',
)
p = Path('web-v2/src/pages/InspectionVisitCreateF61Page.tsx')
text = p.read_text()
text = text.replace('disabled={!areaId || operators.length === 0}', 'disabled={!areaId || !plannedStartAt || operators.length === 0}')
text = text.replace("{operators.length === 0 && areaId ? 'Sin Operadora vigente' : 'Seleccionar Operadora…'}", "{operators.length === 0 && areaId && plannedStartAt ? 'Sin Operadora vigente para esa fecha' : 'Seleccionar Operadora…'}")
text = text.replace('{areaId && operators.length === 0 && <Alert>', '{areaId && plannedStartAt && operators.length === 0 && <Alert>')
p.write_text(text)
# Field Inventory: scope is the selected Yacimiento (or Area for a legacy mobile visit).
p = Path('api-v3/src/inspection-visits/field-inventory.service.ts')
text = p.read_text()
text = text.replace(' areaId: string;\n areaCode: string;', ' areaId: string;\n scopeAssetId: string;\n areaCode: string;', 1)
text = text.replace('// Empresa is visit context, never physical ownership. Search by Area ancestry.\n const args: unknown[] = [context.areaId, visitId];', '// Empresa is visit context, never physical ownership. Search stays inside the frozen Yacimiento scope.\n const args: unknown[] = [context.scopeAssetId, visitId];', 1)
text = text.replace(''' `(\n asset.operational_area_id = $1::uuid\n OR EXISTS (\n WITH RECURSIVE ancestors AS (\n SELECT id,parent_id FROM assets WHERE id=asset.parent_id\n UNION ALL\n SELECT parent.id,parent.parent_id\n FROM assets parent JOIN ancestors child ON parent.id=child.parent_id\n )\n SELECT 1 FROM ancestors WHERE id=$1::uuid LIMIT 1\n )\n )`,''', ''' `(\n asset.id = $1::uuid\n OR EXISTS (\n WITH RECURSIVE ancestors AS (\n SELECT id,parent_id FROM assets WHERE id=asset.parent_id\n UNION ALL\n SELECT parent.id,parent.parent_id\n FROM assets parent JOIN ancestors child ON parent.id=child.parent_id\n )\n SELECT 1 FROM ancestors WHERE id=$1::uuid LIMIT 1\n )\n )`,''', 1)
text = text.replace('const effectiveParentId = parentId ?? context.areaId;', 'const effectiveParentId = parentId ?? context.scopeAssetId;', 1)
text = text.replace('const parentId = dto.parentId ?? context.areaId;', 'const parentId = dto.parentId ?? context.scopeAssetId;', 1)
text = text.replace(' visit.status,\n visit.operational_area_id AS "areaId",', ' visit.status,\n COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",\n visit.operational_area_id AS "areaId",', 1)
text = text.replace("inspection: { id: context.id, code: context.code, status: context.status },\n area:", "inspection: { id: context.id, code: context.code, status: context.status },\n scopeAssetId: context.scopeAssetId,\n area:", 1)
text = text.replace(' asset.id=$2::uuid\n OR asset.operational_area_id=$2::uuid\n OR EXISTS (', ' asset.id=$2::uuid\n OR EXISTS (', 1)
text = text.replace(' ) AS "insideArea"', ' ) AS "insideScope"', 2)
text = text.replace(' insideArea: boolean;', ' insideScope: boolean;', 2)
text = text.replace('[parentId, context.areaId]', '[parentId, context.scopeAssetId]', 1)
text = text.replace('if (!parent.insideArea)', 'if (!parent.insideScope)', 1)
text = text.replace("message: 'La ubicación padre no pertenece al Área de la inspección'", "message: 'La ubicación padre no pertenece al Yacimiento definido como alcance de la inspección'", 1)
text = text.replace(' asset.operational_area_id=$2::uuid\n OR EXISTS (', ' asset.id=$2::uuid\n OR EXISTS (', 1)
text = text.replace('[assetId, context.areaId]', '[assetId, context.scopeAssetId]', 1)
text = text.replace('if (!asset.insideArea)', 'if (!asset.insideScope)', 1)
text = text.replace("message: 'El registro no pertenece al Área de esta inspección'", "message: 'El registro no pertenece al Yacimiento definido como alcance de esta inspección'", 1)
p.write_text(text)
# Field Findings: the same server-side scope gate applies before any finding operation.
p = Path('api-v3/src/inspection-visits/field-findings.service.ts')
text = p.read_text()
text = text.replace(' visit.status AS "visitStatus",\n visit.operational_area_id AS "areaId",', ' visit.status AS "visitStatus",\n COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",\n visit.operational_area_id AS "areaId",', 1)
before = ''' (\n asset.operational_area_id=visit.operational_area_id\n OR asset.id=visit.operational_area_id\n OR EXISTS (\n WITH RECURSIVE ancestors AS (\n SELECT id,parent_id FROM assets WHERE id=asset.parent_id\n UNION ALL\n SELECT parent.id,parent.parent_id\n FROM assets parent JOIN ancestors child ON parent.id=child.parent_id\n )\n SELECT 1 FROM ancestors WHERE id=visit.operational_area_id LIMIT 1\n )\n ) AS "insideArea",'''
after = ''' (\n asset.id=COALESCE(visit.scope_asset_id, visit.operational_area_id)\n OR EXISTS (\n WITH RECURSIVE ancestors AS (\n SELECT id,parent_id FROM assets WHERE id=asset.parent_id\n UNION ALL\n SELECT parent.id,parent.parent_id\n FROM assets parent JOIN ancestors child ON parent.id=child.parent_id\n )\n SELECT 1 FROM ancestors\n WHERE id=COALESCE(visit.scope_asset_id, visit.operational_area_id)\n LIMIT 1\n )\n ) AS "insideScope",'''
if text.count(before) != 1:
raise SystemExit(f'field findings insideArea block: {text.count(before)}')
text = text.replace(before, after)
text = text.replace(' areaId: string | null;', ' scopeAssetId: string | null;\n areaId: string | null;', 1)
text = text.replace(' insideArea: boolean;', ' insideScope: boolean;', 1)
text = text.replace('if (!row.insideArea)', 'if (!row.insideScope)', 1)
text = text.replace("message: 'El Inventario no pertenece al Área de esta inspección'", "message: 'El Inventario no pertenece al Yacimiento definido como alcance de esta inspección'", 1)
p.write_text(text)
# New inspection: actionable checklist rows must also select the corresponding inventory.
replace_once(
'api-v3/src/inspection-visits/inspection-planning-create.service.ts',
''' stage = 'audit:record';''',
''' stage = 'checklist:assets';\n await manager.query(`\n INSERT INTO inspection_visit_assets (\n visit_id, asset_id, included, planning_source, added_by\n )\n SELECT DISTINCT $1::uuid, item.asset_id, true, 'AUTOMATIC', $2::uuid\n FROM inspection_visit_checklist_items item\n WHERE item.visit_id=$1::uuid\n AND item.generation_number=1\n AND item.item_kind IN ('COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL')\n ON CONFLICT (visit_id,asset_id) DO UPDATE SET\n included=true,\n planning_source=CASE\n WHEN inspection_visit_assets.planning_source='VERIFICATION' THEN 'VERIFICATION'\n ELSE 'AUTOMATIC'\n END,\n exclusion_reason=NULL,\n excluded_by=NULL,\n excluded_at=NULL,\n added_by=EXCLUDED.added_by,\n updated_at=CURRENT_TIMESTAMP\n `, [visit.id, principal.userId]);\n\n stage = 'checklist:asset-events';\n await manager.query(`\n INSERT INTO inspection_visit_asset_events (\n visit_id, asset_id, event_type, reason, actor_user_id, metadata\n )\n SELECT DISTINCT\n $1::uuid, item.asset_id, 'AUTO_INCLUDED', NULL, $2::uuid,\n jsonb_build_object('generation',1,'source','F6.1_CREATE')\n FROM inspection_visit_checklist_items item\n WHERE item.visit_id=$1::uuid\n AND item.generation_number=1\n AND item.item_kind IN ('COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL')\n AND NOT EXISTS (\n SELECT 1 FROM inspection_visit_asset_events event\n WHERE event.visit_id=$1::uuid\n AND event.asset_id=item.asset_id\n AND event.event_type='AUTO_INCLUDED'\n )\n `, [visit.id, principal.userId]);\n\n stage = 'audit:record';''',
'create actionable assets',
)
# Canonical update/generator: preserve scope, validate it and stop using operator snapshots as membership.
p = Path('api-v3/src/inspection-visits/inspection-visits.service.ts')
text = p.read_text()
text = text.replace("import { nextInspectionVisitCode } from './inspection-visit-code';", "import { nextInspectionVisitCode } from './inspection-visit-code';\nimport { validateInspectionPlanningScope } from './inspection-planning-scope';", 1)
text = text.replace('await this.validatePlanningContext(manager, operationalAreaId, operatorCompanyId);', 'await this.validatePlanningContext(manager, operationalAreaId, operatorCompanyId, plannedStartAt);', 1)
before = ''' const contextTouched = dto.operationalAreaId !== undefined || dto.operatorCompanyId !== undefined;\n const nextScope = contextTouched\n ? nextAreaId\n : dto.scopeAssetId === undefined\n ? visit.scopeAssetId\n : dto.scopeAssetId;\n await this.validatePlanningContext(manager, nextAreaId, nextCompanyId);\n await this.requireAsset(manager, nextScope);\n if (contextTouched && nextAreaId && nextCompanyId) {\n await this.assertCurrentAssetsMatchContext(manager, id, nextAreaId, nextCompanyId);\n } else if (dto.scopeAssetId !== undefined) {\n await this.assertCurrentAssetsInScope(manager, id, nextScope);\n }'''
after = ''' const contextTouched = dto.operationalAreaId !== undefined || dto.operatorCompanyId !== undefined;\n const nextScope = dto.scopeAssetId === undefined ? visit.scopeAssetId : dto.scopeAssetId;\n await this.validatePlanningContext(manager, nextAreaId, nextCompanyId, nextStart);\n await this.requireAsset(manager, nextScope);\n if (nextAreaId && nextScope) {\n await validateInspectionPlanningScope(manager, nextAreaId, nextScope);\n await this.assertCurrentAssetsInScope(manager, id, nextScope);\n }'''
if text.count(before) != 1:
raise SystemExit(f'update scope block: {text.count(before)}')
text = text.replace(before, after)
before = ''' if (contextTouched) {\n visit.operationalAreaId = nextAreaId;\n visit.operatorCompanyId = nextCompanyId;\n visit.scopeAssetId = nextAreaId;\n } else if (dto.scopeAssetId !== undefined) {\n visit.scopeAssetId = dto.scopeAssetId;\n }'''
after = ''' if (contextTouched) {\n visit.operationalAreaId = nextAreaId;\n visit.operatorCompanyId = nextCompanyId;\n }\n if (dto.scopeAssetId !== undefined) {\n visit.scopeAssetId = dto.scopeAssetId;\n }'''
if text.count(before) != 1:
raise SystemExit(f'update assignment block: {text.count(before)}')
text = text.replace(before, after)
text = text.replace('if (contextTouched || dto.plannedStartAt !== undefined) visit.checklistGeneratedAt = null;', 'if (contextTouched || dto.scopeAssetId !== undefined || dto.plannedStartAt !== undefined) visit.checklistGeneratedAt = null;', 1)
# Preventive/reinclude actions are constrained by scope, not historical Company snapshot.
old_call = ''' await this.assertAssetsMatchContext(\n manager,\n additions,\n visit.operationalAreaId,\n visit.operatorCompanyId,\n );'''
new_call = ''' await this.assertAssetsInScope(\n manager,\n additions,\n visit.scopeAssetId ?? visit.operationalAreaId,\n );'''
if text.count(old_call) != 1:
raise SystemExit(f'replaceAssets context call: {text.count(old_call)}')
text = text.replace(old_call, new_call)
old_call = ''' await this.assertAssetsMatchContext(\n manager,\n [assetId],\n visit.operationalAreaId,\n visit.operatorCompanyId,\n );'''
new_call = ''' await this.assertAssetsInScope(\n manager,\n [assetId],\n visit.scopeAssetId ?? visit.operationalAreaId,\n );'''
if text.count(old_call) != 1:
raise SystemExit(f'includeAsset context call: {text.count(old_call)}')
text = text.replace(old_call, new_call)
# Planning context validation can use the visit's planned timestamp.
before = ''' private async validatePlanningContext(\n manager: EntityManager,\n operationalAreaId: string | null,\n operatorCompanyId: string | null,\n ): Promise<void> {'''
after = ''' private async validatePlanningContext(\n manager: EntityManager,\n operationalAreaId: string | null,\n operatorCompanyId: string | null,\n effectiveAt: Date | null = null,\n ): Promise<void> {'''
if text.count(before) != 1:
raise SystemExit(f'validate signature: {text.count(before)}')
text = text.replace(before, after)
text = text.replace(''' AND relation.valid_from <= CURRENT_TIMESTAMP\n AND (relation.valid_until IS NULL OR relation.valid_until > CURRENT_TIMESTAMP)''', ''' AND relation.valid_from <= $3::timestamptz\n AND (relation.valid_until IS NULL OR relation.valid_until > $3::timestamptz)''', 1)
text = text.replace(' `, [operationalAreaId, operatorCompanyId])) as Array<{', ' `, [operationalAreaId, operatorCompanyId, effectiveAt ?? new Date()])) as Array<{', 1)
text = text.replace('await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId);', 'await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId, visit.plannedStartAt);', 1)
# Regenerated checklist is Area + Yacimiento scoped and never filters by snapshot Company.
before = ''' WHERE asset.operational_area_id = $3\n AND asset.operator_company_id = $4\n AND finding.status <> 'VOIDED'\n ORDER BY finding.created_at, finding.id\n `, [\n visit.id,\n generation,\n visit.operationalAreaId,\n visit.operatorCompanyId,\n visit.plannedStartAt.toISOString().slice(0, 10),\n ]);'''
after = ''' WHERE asset.operational_area_id = $3\n AND finding.status <> 'VOIDED'\n AND (\n asset.id=$4::uuid\n OR EXISTS (\n WITH RECURSIVE ancestors AS (\n SELECT id,parent_id FROM assets WHERE id=asset.parent_id\n UNION ALL\n SELECT parent.id,parent.parent_id\n FROM assets parent JOIN ancestors child ON parent.id=child.parent_id\n )\n SELECT 1 FROM ancestors WHERE id=$4::uuid LIMIT 1\n )\n )\n ORDER BY finding.created_at, finding.id\n `, [\n visit.id,\n generation,\n visit.operationalAreaId,\n visit.scopeAssetId ?? visit.operationalAreaId,\n visit.plannedStartAt.toISOString().slice(0, 10),\n ]);'''
if text.count(before) != 1:
raise SystemExit(f'generator snapshot filter: {text.count(before)}')
text = text.replace(before, after)
p.write_text(text)
# Detail page: name Area/Yacimiento separately and explicitly preserve scope on PATCH.
p = Path('web-v2/src/pages/InspectionVisitEditorF4Page.tsx')
text = p.read_text()
text = text.replace(" objective: form.objective.trim() || null,\n operationalAreaId:", " objective: form.objective.trim() || null,\n scopeAssetId: visit?.scopeAsset?.id ?? null,\n operationalAreaId:", 1)
text = text.replace('<span>Área / Yacimiento</span>', '<span>Área</span>', 1)
anchor = ''' <label className="field"><span>Operadora</span>'''
insertion = ''' {!isNew && <label className="field"><span>Yacimiento</span><input value={visit?.scopeAsset?.name ?? 'Sin Yacimiento'} readOnly aria-readonly="true" /></label>}\n <label className="field"><span>Operadora</span>'''
if text.count(anchor) != 1:
raise SystemExit(f'editor operator anchor: {text.count(anchor)}')
text = text.replace(anchor, insertion)
p.write_text(text)
# Self-delete after applying the reviewed patch.
Path('.github/workflows/f6-1-address-review.yml').unlink()
PY
- name: Sanity checks
run: |
set -Eeuo pipefail
grep -Fq 'scopeAssetId: context.scopeAssetId' api-v3/src/inspection-visits/field-inventory.service.ts
grep -Fq 'AS "insideScope"' api-v3/src/inspection-visits/field-findings.service.ts
grep -Fq "planning_source, added_by" api-v3/src/inspection-visits/inspection-planning-create.service.ts
grep -Fq 'visit.scopeAssetId ?? visit.operationalAreaId' api-v3/src/inspection-visits/inspection-visits.service.ts
grep -Fq 'operators?at=' web-v2/src/pages/InspectionVisitCreateF61Page.tsx
grep -Fq 'scopeAssetId: visit?.scopeAsset?.id ?? null' web-v2/src/pages/InspectionVisitEditorF4Page.tsx
! grep -Fq '<span>Área / Yacimiento</span>' web-v2/src/pages/InspectionVisitEditorF4Page.tsx
- name: Commit reviewed fixes
run: |
set -Eeuo pipefail
git config user.name 'github-actions[bot]'
git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
git add api-v3 web-v2 .github/workflows/f6-1-address-review.yml
git diff --cached --check
git commit -m 'fix(F6.1): enforce Yacimiento scope end to end'
git push origin HEAD:hotfix/f6-1-inspection-planning-hierarchy
api-v3/src/inspection-visits/field-findings.service.ts
+10 -7
View File
@@ -129,6 +129,7 @@ export class FieldFindingsService {
visit.id AS "visitId",
visit.code AS "visitCode",
visit.status AS "visitStatus",
COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",
visit.operational_area_id AS "areaId",
area.code AS "areaCode",
area.name AS "areaName",
@@ -139,8 +140,7 @@ export class FieldFindingsService {
asset_type.code AS "assetTypeCode",
asset.inventory_family_id AS "inventoryFamilyId",
(
asset.operational_area_id=visit.operational_area_id
OR asset.id=visit.operational_area_id
asset.id=COALESCE(visit.scope_asset_id, visit.operational_area_id)
OR EXISTS (
WITH RECURSIVE ancestors AS (
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
@@ -148,9 +148,11 @@ export class FieldFindingsService {
SELECT parent.id,parent.parent_id
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
)
SELECT 1 FROM ancestors WHERE id=visit.operational_area_id LIMIT 1
SELECT 1 FROM ancestors
WHERE id=COALESCE(visit.scope_asset_id, visit.operational_area_id)
LIMIT 1
)
) AS "insideArea",
) AS "insideScope",
EXISTS (
SELECT 1
FROM area_company_relations relation
@@ -213,6 +215,7 @@ export class FieldFindingsService {
visitId: string;
visitCode: string;
visitStatus: string;
scopeAssetId: string | null;
areaId: string | null;
areaCode: string | null;
areaName: string | null;
@@ -222,7 +225,7 @@ export class FieldFindingsService {
assetId: string | null;
assetTypeCode: string | null;
inventoryFamilyId: string | null;
insideArea: boolean;
insideScope: boolean;
operatorRelationValid: boolean;
assigned: boolean;
selected: boolean;
@@ -278,10 +281,10 @@ export class FieldFindingsService {
message: 'La Instalación/Subinstalación debe tener una clasificación técnica antes de registrar Hallazgos',
});
}
if (!row.insideArea) {
if (!row.insideScope) {
throw new BadRequestException({
code: 'FIELD_FINDING_INVENTORY_OUTSIDE_CONTEXT',
message: 'El Inventario no pertenece al Área de esta inspección',
message: 'El Inventario no pertenece al Yacimiento definido como alcance de esta inspección',
});
}
if (!row.selected) {
api-v3/src/inspection-visits/field-inventory.service.ts
+19 -17
View File
@@ -23,6 +23,7 @@ interface MobileVisitContext {
code: string;
status: string;
areaId: string;
scopeAssetId: string;
areaCode: string;
areaName: string;
companyId: string;
@@ -80,12 +81,12 @@ export class FieldInventoryService {
const context = await this.requireVisitContext(visitId, principal, false);
if (query.parentId) await this.requireParentInContext(query.parentId, context);
// Empresa is visit context, never physical ownership. Search by Area ancestry.
const args: unknown[] = [context.areaId, visitId];
// Empresa is visit context, never physical ownership. Search stays inside the frozen Yacimiento scope.
const args: unknown[] = [context.scopeAssetId, visitId];
const conditions = [
"asset.information_status <> 'INACTIVE'",
`(
asset.operational_area_id = $1::uuid
asset.id = $1::uuid
OR EXISTS (
WITH RECURSIVE ancestors AS (
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
@@ -198,7 +199,7 @@ export class FieldInventoryService {
principal: AuthPrincipal,
) {
const context = await this.requireVisitContext(visitId, principal, false);
const effectiveParentId = parentId ?? context.areaId;
const effectiveParentId = parentId ?? context.scopeAssetId;
const parent = await this.requireParentInContext(effectiveParentId, context);
const data = await this.dataSource.query(`
@@ -272,7 +273,7 @@ export class FieldInventoryService {
request: RequestWithContext,
) {
const context = await this.requireVisitContext(visitId, principal, true);
const parentId = dto.parentId ?? context.areaId;
const parentId = dto.parentId ?? context.scopeAssetId;
await this.requireParentInContext(parentId, context);
const capturedAt = new Date(dto.deviceCapturedAt);
@@ -412,6 +413,7 @@ export class FieldInventoryService {
visit.id,
visit.code,
visit.status,
COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",
visit.operational_area_id AS "areaId",
area.code AS "areaCode",
area.name AS "areaName",
@@ -485,6 +487,7 @@ export class FieldInventoryService {
private publicContext(context: MobileVisitContext) {
return {
inspection: { id: context.id, code: context.code, status: context.status },
scopeAssetId: context.scopeAssetId,
area: { id: context.areaId, code: context.areaCode, name: context.areaName },
operatorCompany: {
id: context.companyId,
@@ -503,7 +506,6 @@ export class FieldInventoryService {
asset.asset_type_id AS "typeId",
(
asset.id=$2::uuid
OR asset.operational_area_id=$2::uuid
OR EXISTS (
WITH RECURSIVE ancestors AS (
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
@@ -512,16 +514,16 @@ export class FieldInventoryService {
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
) SELECT 1 FROM ancestors WHERE id=$2::uuid LIMIT 1
)
) AS "insideArea"
) AS "insideScope"
FROM assets asset
WHERE asset.id = $1::uuid
AND asset.information_status <> 'INACTIVE'
`, [parentId, context.areaId])) as Array<{
`, [parentId, context.scopeAssetId])) as Array<{
id: string;
code: string;
name: string;
typeId: string;
insideArea: boolean;
insideScope: boolean;
}>;
if (!parent) {
@@ -530,10 +532,10 @@ export class FieldInventoryService {
message: 'La ubicación padre no existe',
});
}
if (!parent.insideArea) {
if (!parent.insideScope) {
throw new BadRequestException({
code: 'FIELD_INVENTORY_PARENT_OUTSIDE_CONTEXT',
message: 'La ubicación padre no pertenece al Área de la inspección',
message: 'La ubicación padre no pertenece al Yacimiento definido como alcance de la inspección',
});
}
return parent;
@@ -545,7 +547,7 @@ export class FieldInventoryService {
asset.id,
(asset.is_inventory_instance=true OR lower(type.code)='yacimiento') AS "eligibleTarget",
(
asset.operational_area_id=$2::uuid
asset.id=$2::uuid
OR EXISTS (
WITH RECURSIVE ancestors AS (
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
@@ -554,15 +556,15 @@ export class FieldInventoryService {
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
) SELECT 1 FROM ancestors WHERE id=$2::uuid LIMIT 1
)
) AS "insideArea"
) AS "insideScope"
FROM assets asset
JOIN asset_types type ON type.id=asset.asset_type_id
WHERE asset.id = $1::uuid
AND asset.information_status <> 'INACTIVE'
`, [assetId, context.areaId])) as Array<{
`, [assetId, context.scopeAssetId])) as Array<{
id: string;
eligibleTarget: boolean;
insideArea: boolean;
insideScope: boolean;
}>;
if (!asset) {
@@ -571,10 +573,10 @@ export class FieldInventoryService {
message: 'Registro de Inventario no encontrado',
});
}
if (!asset.insideArea) {
if (!asset.insideScope) {
throw new BadRequestException({
code: 'FIELD_INVENTORY_OUTSIDE_CONTEXT',
message: 'El registro no pertenece al Área de esta inspección',
message: 'El registro no pertenece al Yacimiento definido como alcance de esta inspección',
});
}
if (!asset.eligibleTarget) {
api-v3/src/inspection-visits/inspection-planning-create.service.ts
+43
View File
@@ -167,6 +167,49 @@ export class InspectionPlanningCreateService {
ORDER BY finding.created_at,finding.id
`, [visit.id, dto.operationalAreaId, scopeAssetId, plannedStartAt.toISOString().slice(0, 10)]);
stage = 'checklist:assets';
await manager.query(`
INSERT INTO inspection_visit_assets (
visit_id, asset_id, included, planning_source, added_by
)
SELECT DISTINCT $1::uuid, item.asset_id, true, 'AUTOMATIC', $2::uuid
FROM inspection_visit_checklist_items item
WHERE item.visit_id=$1::uuid
AND item.generation_number=1
AND item.item_kind IN ('COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL')
ON CONFLICT (visit_id,asset_id) DO UPDATE SET
included=true,
planning_source=CASE
WHEN inspection_visit_assets.planning_source='VERIFICATION' THEN 'VERIFICATION'
ELSE 'AUTOMATIC'
END,
exclusion_reason=NULL,
excluded_by=NULL,
excluded_at=NULL,
added_by=EXCLUDED.added_by,
updated_at=CURRENT_TIMESTAMP
`, [visit.id, principal.userId]);
stage = 'checklist:asset-events';
await manager.query(`
INSERT INTO inspection_visit_asset_events (
visit_id, asset_id, event_type, reason, actor_user_id, metadata
)
SELECT DISTINCT
$1::uuid, item.asset_id, 'AUTO_INCLUDED', NULL, $2::uuid,
jsonb_build_object('generation',1,'source','F6.1_CREATE')
FROM inspection_visit_checklist_items item
WHERE item.visit_id=$1::uuid
AND item.generation_number=1
AND item.item_kind IN ('COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL')
AND NOT EXISTS (
SELECT 1 FROM inspection_visit_asset_events event
WHERE event.visit_id=$1::uuid
AND event.asset_id=item.asset_id
AND event.event_type='AUTO_INCLUDED'
)
`, [visit.id, principal.userId]);
stage = 'audit:record';
await this.audit.record({
...administrationAuditContext(principal, request),
api-v3/src/inspection-visits/inspection-visits.controller.ts
+2 -1
View File
@@ -82,8 +82,9 @@ export class InspectionVisitsController {
@RequirePermissions('inspections.read')
planningOperators(
@Param('areaId', new ParseUUIDPipe({ version: '4' })) areaId: string,
@Query('at') at?: string,
) {
return this.visits.listPlanningOperators(areaId);
return this.planningHierarchy.operatorsForArea(areaId, at);
}
@Get('mobile/planning-context/areas')
api-v3/src/inspection-visits/inspection-visits.service.ts
+31 -25
View File
@@ -23,6 +23,7 @@ import type { ReplaceInspectionVisitAssetsDto } from './dto/replace-inspection-v
import type { ReplaceInspectionVisitTeamDto } from './dto/replace-inspection-visit-team.dto';
import type { UpdateInspectionVisitDto } from './dto/update-inspection-visit.dto';
import { nextInspectionVisitCode } from './inspection-visit-code';
import { validateInspectionPlanningScope } from './inspection-planning-scope';
export interface InspectionPerson {
id: string;
@@ -312,7 +313,7 @@ export class InspectionVisitsService {
}
const operationalAreaId = dto.operationalAreaId;
const operatorCompanyId = dto.operatorCompanyId;
await this.validatePlanningContext(manager, operationalAreaId, operatorCompanyId);
await this.validatePlanningContext(manager, operationalAreaId, operatorCompanyId, plannedStartAt);
await this.requireAsset(manager, operationalAreaId);
await this.requireInspectors(manager, [dto.leadInspectorUserId]);
const code = await nextInspectionVisitCode(manager, plannedStartAt);
@@ -382,29 +383,24 @@ export class InspectionVisitsService {
? visit.operatorCompanyId
: dto.operatorCompanyId;
const contextTouched = dto.operationalAreaId !== undefined || dto.operatorCompanyId !== undefined;
const nextScope = contextTouched
? nextAreaId
: dto.scopeAssetId === undefined
? visit.scopeAssetId
: dto.scopeAssetId;
await this.validatePlanningContext(manager, nextAreaId, nextCompanyId);
const nextScope = dto.scopeAssetId === undefined ? visit.scopeAssetId : dto.scopeAssetId;
await this.validatePlanningContext(manager, nextAreaId, nextCompanyId, nextStart);
await this.requireAsset(manager, nextScope);
if (contextTouched && nextAreaId && nextCompanyId) {
await this.assertCurrentAssetsMatchContext(manager, id, nextAreaId, nextCompanyId);
} else if (dto.scopeAssetId !== undefined) {
if (nextAreaId && nextScope) {
await validateInspectionPlanningScope(manager, nextAreaId, nextScope);
await this.assertCurrentAssetsInScope(manager, id, nextScope);
}
if (dto.objective !== undefined) visit.objective = dto.objective;
if (contextTouched) {
visit.operationalAreaId = nextAreaId;
visit.operatorCompanyId = nextCompanyId;
visit.scopeAssetId = nextAreaId;
} else if (dto.scopeAssetId !== undefined) {
}
if (dto.scopeAssetId !== undefined) {
visit.scopeAssetId = dto.scopeAssetId;
}
if (dto.plannedStartAt !== undefined) visit.plannedStartAt = nextStart;
if (dto.instructions !== undefined) visit.instructions = dto.instructions;
if (contextTouched || dto.plannedStartAt !== undefined) visit.checklistGeneratedAt = null;
if (contextTouched || dto.scopeAssetId !== undefined || dto.plannedStartAt !== undefined) visit.checklistGeneratedAt = null;
visit.updatedBy = principal.userId;
await manager.getRepository(InspectionVisit).save(visit);
const updated = await this.loadView(manager, id);
@@ -463,11 +459,10 @@ export class InspectionVisitsService {
message: 'Seleccioná Área y Operadora antes de agregar registros preventivos',
});
}
await this.assertAssetsMatchContext(
await this.assertAssetsInScope(
manager,
additions,
visit.operationalAreaId,
visit.operatorCompanyId,
visit.scopeAssetId ?? visit.operationalAreaId,
);
for (const assetId of additions) {
await manager.query(`
@@ -629,11 +624,10 @@ export class InspectionVisitsService {
if (!visit.operationalAreaId || !visit.operatorCompanyId) {
throw new BadRequestException({ code: 'INSPECTION_CONTEXT_REQUIRED', message: 'La visita no tiene Área y Operadora definidas' });
}
await this.assertAssetsMatchContext(
await this.assertAssetsInScope(
manager,
[assetId],
visit.operationalAreaId,
visit.operatorCompanyId,
visit.scopeAssetId ?? visit.operationalAreaId,
);
await manager.query(`
UPDATE inspection_visit_assets
@@ -920,6 +914,7 @@ export class InspectionVisitsService {
manager: EntityManager,
operationalAreaId: string | null,
operatorCompanyId: string | null,
effectiveAt: Date | null = null,
): Promise<void> {
if (!operationalAreaId && !operatorCompanyId) return;
if (!operationalAreaId || !operatorCompanyId) {
@@ -938,8 +933,8 @@ export class InspectionVisitsService {
WHERE relation.area_id = area.id
AND relation.company_id = company.id
AND relation.relation_role = 'OPERATOR'
AND relation.valid_from <= CURRENT_TIMESTAMP
AND (relation.valid_until IS NULL OR relation.valid_until > CURRENT_TIMESTAMP)
AND relation.valid_from <= $3::timestamptz
AND (relation.valid_until IS NULL OR relation.valid_until > $3::timestamptz)
) AS "activeOperatorRelation"
FROM assets area
INNER JOIN asset_types area_type ON area_type.id = area.asset_type_id
@@ -951,7 +946,7 @@ export class InspectionVisitsService {
AND company_type.operational_role = 'COMPANY'
AND area.information_status <> 'INACTIVE'
AND company.information_status <> 'INACTIVE'
`, [operationalAreaId, operatorCompanyId])) as Array<{
`, [operationalAreaId, operatorCompanyId, effectiveAt ?? new Date()])) as Array<{
areaId: string;
companyId: string;
activeOperatorRelation: boolean;
@@ -1041,7 +1036,7 @@ export class InspectionVisitsService {
message: 'Indicá la fecha prevista antes de generar el checklist',
});
}
await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId);
await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId, visit.plannedStartAt);
const generation = visit.checklistGeneration + 1;
await manager.query(`
INSERT INTO inspection_visit_checklist_items (
@@ -1106,14 +1101,25 @@ export class InspectionVisitsService {
FROM inspection_findings finding
INNER JOIN assets asset ON asset.id = finding.asset_id
WHERE asset.operational_area_id = $3
AND asset.operator_company_id = $4
AND finding.status <> 'VOIDED'
AND (
asset.id=$4::uuid
OR EXISTS (
WITH RECURSIVE ancestors AS (
SELECT id,parent_id FROM assets WHERE id=asset.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=$4::uuid LIMIT 1
)
)
ORDER BY finding.created_at, finding.id
`, [
visit.id,
generation,
visit.operationalAreaId,
visit.operatorCompanyId,
visit.scopeAssetId ?? visit.operationalAreaId,
visit.plannedStartAt.toISOString().slice(0, 10),
]);
web-v2/src/pages/InspectionVisitCreateF61Page.tsx
+21 -13
View File
@@ -98,18 +98,26 @@ export function InspectionVisitCreateF61Page() {
setYacimientos([]);
setOperators([]);
if (!areaId) return;
Promise.all([
requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/yacimientos`),
requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/operators`),
]).then(([yacimientoResponse, operatorResponse]) => {
setYacimientos(yacimientoResponse.data);
setOperators(operatorResponse.data);
if (operatorResponse.data.length === 1 && operatorResponse.data[0]) {
setOperatorId(operatorResponse.data[0].id);
}
}).catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));
requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/yacimientos`)
.then((response) => setYacimientos(response.data))
.catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));
}, [areaId]);
useEffect(() => {
setOperatorId('');
setOperators([]);
if (!areaId || !plannedStartAt) return;
const parsedStart = new Date(plannedStartAt);
if (Number.isNaN(parsedStart.getTime())) return;
const at = encodeURIComponent(parsedStart.toISOString());
requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/operators?at=${at}`)
.then((response) => {
setOperators(response.data);
if (response.data.length === 1 && response.data[0]) setOperatorId(response.data[0].id);
})
.catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));
}, [areaId, plannedStartAt]);
const submit = async (event: FormEvent) => {
event.preventDefault();
setError('');
@@ -193,8 +201,8 @@ export function InspectionVisitCreateF61Page() {
<label className="field">
<span>Operadora del Área</span>
<SearchableSelect value={operatorId} onChange={(event) => setOperatorId(event.target.value)} searchPlaceholder="Buscar Operadora…" required disabled={!areaId || operators.length === 0}>
<option value="">{operators.length === 0 && areaId ? 'Sin Operadora vigente' : 'Seleccionar Operadora…'}</option>
<SearchableSelect value={operatorId} onChange={(event) => setOperatorId(event.target.value)} searchPlaceholder="Buscar Operadora…" required disabled={!areaId || !plannedStartAt || operators.length === 0}>
<option value="">{operators.length === 0 && areaId && plannedStartAt ? 'Sin Operadora vigente para esa fecha' : 'Seleccionar Operadora…'}</option>
{operators.map((operator) => <option key={operator.id} value={operator.id}>{operator.name}</option>)}
</SearchableSelect>
</label>
@@ -214,7 +222,7 @@ export function InspectionVisitCreateF61Page() {
</div>
{areaId && yacimientos.length === 0 && <Alert>Esta Área no tiene Yacimientos cargados. No se puede planificar una Inspección hasta corregir su jerarquía.</Alert>}
{areaId && operators.length === 0 && <Alert>Esta Área no tiene una Operadora vigente. Podés consultar el Inventario, pero no planificar una Inspección operativa hasta definir esa relación.</Alert>}
{areaId && plannedStartAt && operators.length === 0 && <Alert>Esta Área no tiene una Operadora vigente. Podés consultar el Inventario, pero no planificar una Inspección operativa hasta definir esa relación.</Alert>}
<div className="form-actions">
<Link className="button secondary" to="/inspecciones">Volver</Link>
web-v2/src/pages/InspectionVisitEditorF4Page.tsx
+3 -1
View File
@@ -207,6 +207,7 @@ export function InspectionVisitEditorF4Page() {
} else if (id) {
applyVisit(await updateInspectionVisit(id, {
objective: form.objective.trim() || null,
scopeAssetId: visit?.scopeAsset?.id ?? null,
operationalAreaId: form.operationalAreaId || null,
operatorCompanyId: form.operatorCompanyId || null,
plannedStartAt,
@@ -325,7 +326,8 @@ export function InspectionVisitEditorF4Page() {
<div className="panel-heading"><div><span className="eyebrow">{isNew ? 'CREACIÓN RÁPIDA' : 'PLANIFICACIÓN'}</span><h2>Contexto y fecha de inicio</h2><p className="section-copy">No existe título independiente ni fecha de fin planificada. El cierre real se registra al terminar el trabajo de campo.</p></div>{visit && <small className="muted">Actualizado {formatDate(visit.updatedAt)}</small>}</div>
{visit && <div className="inspection-generated-code"><small>Identificador institucional</small><strong>{visit.code}</strong></div>}
<div className="form-grid">
<label className="field"><span>Área / Yacimiento</span><SearchableSelect searchPlaceholder="Buscar Área…" value={form.operationalAreaId} onChange={(event) => { context.setAreaId(event.target.value); setForm((current) => ({ ...current, operationalAreaId: event.target.value, operatorCompanyId: '' })); }} required disabled={!canManage || !planningEditable}><option value="">Seleccionar Área…</option>{areas.map((area) => <option key={area.id} value={area.id}>{area.name} · {area.code}</option>)}</SearchableSelect></label>
<label className="field"><span>Área</span><SearchableSelect searchPlaceholder="Buscar Área…" value={form.operationalAreaId} onChange={(event) => { context.setAreaId(event.target.value); setForm((current) => ({ ...current, operationalAreaId: event.target.value, operatorCompanyId: '' })); }} required disabled={!canManage || !planningEditable}><option value="">Seleccionar Área…</option>{areas.map((area) => <option key={area.id} value={area.id}>{area.name} · {area.code}</option>)}</SearchableSelect></label>
{!isNew && <label className="field"><span>Yacimiento</span><input value={visit?.scopeAsset?.name ?? 'Sin Yacimiento'} readOnly aria-readonly="true" /></label>}
<label className="field"><span>Operadora</span><SearchableSelect searchPlaceholder="Buscar Operadora…" value={form.operatorCompanyId} onChange={(event) => { context.setCompanyId(event.target.value); setForm((current) => ({ ...current, operatorCompanyId: event.target.value })); }} required disabled={!canManage || !planningEditable || !form.operationalAreaId}><option value="">Seleccionar Operadora…</option>{operators.map((operator) => <option key={operator.id} value={operator.id}>{operator.name} · {operator.code}</option>)}</SearchableSelect></label>
<label className="field"><span>Fecha y hora de inicio</span><input type="datetime-local" value={form.plannedStartAt} onChange={(event) => setForm((current) => ({ ...current, plannedStartAt: event.target.value }))} required disabled={!canManage || !planningEditable} /></label>
{isNew && <label className="field"><span>Inspector responsable</span><SearchableSelect searchPlaceholder="Buscar Inspector…" value={leadInspectorId} onChange={(event) => setLeadInspectorId(event.target.value)} required disabled={!canAssign}><option value="">Seleccionar Inspector…</option>{assignees.map((person) => <option key={person.id} value={person.id}>{personName(person)} · {person.username}</option>)}</SearchableSelect></label>}