F4.8 · pruebas de cierre de Inspección

.env.example

@@ -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

.github/workflows/android.yml

@@ -1,36 +1,31 @@
-name: Android CI / RC
-# F6.1 presentation barrier: lint + real tests + debug artifact + release compile.
+name: Android APK
+# F3.2: genera la APK debug verificable antes de promover la integración multi-Acta.
 
 on:
   push:
     branches:
-      - 'main'
-      - 'release/f6-1*'
+      - 'feature/f2-2*'
+      - 'feature/f2-3*'
+      - 'feature/f2-4*'
+      - 'feature/f3-1*'
+      - 'feature/f3-2*'
     paths:
       - 'android-app/**'
-      - 'api-v3/src/**'
       - '.github/workflows/android.yml'
   pull_request:
-    branches:
-      - 'main'
     paths:
       - 'android-app/**'
-      - 'api-v3/src/**'
+      - 'api-v3/src/auth/**'
       - '.github/workflows/android.yml'
   workflow_dispatch:
 
 permissions:
   contents: read
 
-concurrency:
-  group: dhv2-android-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  android:
-    name: Android · lint, tests, debug APK, release compile
+  build-debug-apk:
     runs-on: ubuntu-latest
-    timeout-minutes: 35
+    timeout-minutes: 30
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -52,92 +47,18 @@ jobs:
         with:
           gradle-version: '8.13'
 
-      - name: Validate mobile security and identity contract
-        run: |
-          set -Eeuo pipefail
-          grep -Fq 'applicationId = "com.korexlabs.dhinspeccion"' android-app/app/build.gradle.kts
-          grep -Fq 'applicationIdSuffix = ".debug"' android-app/app/build.gradle.kts
-          grep -Fq 'buildConfigField("String", "API_BASE_URL", "\"https://dhv2.korexlabs.com/api/v3/\"")' android-app/app/build.gradle.kts
-          grep -Fq 'android:allowBackup="false"' android-app/app/src/main/AndroidManifest.xml
-          grep -Fq 'android:usesCleartextTraffic="false"' android-app/app/src/main/AndroidManifest.xml
-
-      - name: Android lint
-        working-directory: android-app
-        run: gradle --no-daemon :app:lintDebug
-
-      - name: Print complete lint failures
-        if: failure()
-        run: |
-          report="android-app/app/build/intermediates/lint_intermediate_text_report/debug/lintReportDebug/lint-results-debug.txt"
-          if [ -f "$report" ]; then
-            echo '========== ANDROID LINT =========='
-            cat "$report"
-          fi
-
-      - name: Android unit tests
-        working-directory: android-app
-        run: gradle --no-daemon :app:testDebugUnitTest
-
-      - name: Require real unit-test results
-        run: |
-          set -Eeuo pipefail
-          test_dir="android-app/app/build/test-results/testDebugUnitTest"
-          test -d "$test_dir"
-          total="$(grep -h -oE '<testsuite[^>]+tests="[0-9]+"' "$test_dir"/TEST-*.xml 2>/dev/null | sed -E 's/.*tests="([0-9]+)"/\1/' | awk '{sum += $1} END {print sum + 0}')"
-          test "$total" -gt 0
-          echo "Android unit tests discovered: $total"
-
-      - name: Assemble debug APK
+      - name: Assemble debug
         working-directory: android-app
         run: gradle --no-daemon :app:assembleDebug
 
-      - name: Compile unsigned release variant
+      - name: Unit tests
         working-directory: android-app
-        run: gradle --no-daemon :app:assembleRelease
+        run: gradle --no-daemon :app:testDebugUnitTest
 
-      - name: Package RC artifact and checksum
-        id: package
-        run: |
-          set -Eeuo pipefail
-          version="$(sed -n 's/^[[:space:]]*versionName = "\([^"]*\)"/\1/p' android-app/app/build.gradle.kts | head -n1)"
-          code="$(sed -n 's/^[[:space:]]*versionCode = \([0-9][0-9]*\)/\1/p' android-app/app/build.gradle.kts | head -n1)"
-          test -n "$version"
-          test -n "$code"
-          short_sha="${GITHUB_SHA::12}"
-          mkdir -p android-app/dist
-          apk="android-app/dist/DH-Inspeccion-${version}-vc${code}-${short_sha}-debug.apk"
-          cp android-app/app/build/outputs/apk/debug/app-debug.apk "$apk"
-          sha256sum "$apk" > "${apk}.sha256"
-          {
-            echo "phase=F6.1"
-            echo "version=$version"
-            echo "versionCode=$code"
-            echo "commit=$GITHUB_SHA"
-            echo "artifact=$(basename "$apk")"
-            echo "applicationId=com.korexlabs.dhinspeccion.debug"
-            echo "apiBaseUrl=https://dhv2.korexlabs.com/api/v3/"
-            echo "channel=DEBUG_RC"
-          } > android-app/dist/release-metadata.txt
-          echo "version=$version" >> "$GITHUB_OUTPUT"
-          echo "version_code=$code" >> "$GITHUB_OUTPUT"
-          echo "short_sha=$short_sha" >> "$GITHUB_OUTPUT"
-
-      - name: Upload debug RC
+      - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
-          name: DH-Inspeccion-${{ steps.package.outputs.version }}-vc${{ steps.package.outputs.version_code }}-${{ steps.package.outputs.short_sha }}-debug
-          path: android-app/dist/*
+          name: DH-Inspeccion-F3.2-0.12.0-debug
+          path: android-app/app/build/outputs/apk/debug/app-debug.apk
           if-no-files-found: error
-          retention-days: 30
-
-      - name: Upload Android diagnostics
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: android-diagnostics-${{ github.sha }}
-          path: |
-            android-app/app/build/reports/lint-results-debug.html
-            android-app/app/build/reports/tests/testDebugUnitTest/**
-            android-app/app/build/test-results/testDebugUnitTest/**
-          if-no-files-found: ignore
           retention-days: 14

.github/workflows/ci.yml

@@ -62,272 +62,9 @@ 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 and real API startup 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
-
-          # Historical production reset is a one-shot migration that expects the
-          # production admin. Prove the clean chain reaches that exact guard,
-          # mark only that historical reset as applied, then continue the chain.
-          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
-
-          # The completed chain must end in the exact authoritative SQL model:
-          # 7 Departamentos, 64 Áreas, 230 Yacimientos, 13 Empresas, 2 Tipos de
-          # concesión, 14/109 technical families, 181 Hallazgos and their exact
-          # 48 + 880 contextual mappings.
-          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;
-            domain_assets integer;
-            audits integer;
-            applicability integer;
-            legacy_territory_sources integer;
-            legacy_presentation_sources integer;
-            authoritative_sources integer;
-            source_installations integer;
-            source_subinstallations integer;
-            source_findings integer;
-            concession_types integer;
-            departments integer;
-            areas integer;
-            yacimientos integer;
-            companies integer;
-            invalid_yacimientos integer;
-            department_types integer;
-            area_department_rules integer;
-            yacimiento_area_rules integer;
-            installation_yacimiento_rules integer;
-            subinstallation_installation_rules integer;
-          BEGIN
-            SELECT COUNT(*) INTO f5_migrations
-            FROM typeorm_migrations
-            WHERE name IN (
-              'F5InventoryPhysicalInstance1790087100000',
-              'F5CanonicalInventoryHierarchy1790087150000',
-              'F5AuthoritativeTerritory1790087200000',
-              'F5OperationalContextCompatibility1790087250000',
-              'F5AuthoritativeInventoryCatalog1790087300000',
-              'F51CleanManualInventory1790087400000'
-            );
-            IF f5_migrations <> 6 THEN
-              RAISE EXCEPTION 'Expected 6 F5/F5.1 migrations, got %', f5_migrations;
-            END IF;
-
-            SELECT COUNT(*) INTO domain_assets FROM assets;
-            IF domain_assets <> 314 THEN
-              RAISE EXCEPTION 'Authoritative model must contain 314 Assets, got %', domain_assets;
-            END IF;
-
-            SELECT COUNT(*) INTO audits FROM audit_events;
-            IF audits <> 0 THEN
-              RAISE EXCEPTION 'Clean authoritative rehearsal must start with 0 audit events, got %', audits;
-            END IF;
-
-            SELECT COUNT(*) INTO applicability FROM finding_catalog_item_inventory_families;
-            IF applicability <> 928 THEN
-              RAISE EXCEPTION 'Authoritative model must contain 928 finding applicability links, got %', applicability;
-            END IF;
-
-            SELECT COUNT(*) INTO legacy_territory_sources
-            FROM source_documents
-            WHERE document_number='DH-F5-TERRITORY';
-            IF legacy_territory_sources <> 0 THEN
-              RAISE EXCEPTION 'Authoritative model must remove the old F5 territory source, got % rows', legacy_territory_sources;
-            END IF;
-
-            SELECT COUNT(*) INTO legacy_presentation_sources
-            FROM source_documents
-            WHERE document_number='DH-F6.1-PRESENTATION-TERRITORY-20260909';
-            IF legacy_presentation_sources <> 0 THEN
-              RAISE EXCEPTION 'Authoritative model must remove the F6.1 presentation source, got % rows', legacy_presentation_sources;
-            END IF;
-
-            SELECT COUNT(*) INTO authoritative_sources
-            FROM source_documents
-            WHERE document_number IN ('DH-AUTH-TERRITORY-20260911','DH-AUTH-INVENTORY-20260911');
-            IF authoritative_sources <> 2 THEN
-              RAISE EXCEPTION 'Authoritative model must contain its two SQL source documents, got %', authoritative_sources;
-            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 'modelo_relacional:%';
-            IF source_installations <> 14 OR source_subinstallations <> 109 THEN
-              RAISE EXCEPTION 'Authoritative technical families must be 14 installations and 109 subinstallations, got % and %', 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)='authmodel' AND item.is_active=true;
-            IF source_findings <> 181 THEN
-              RAISE EXCEPTION 'Authoritative finding catalog must contain 181 items, got %', source_findings;
-            END IF;
-
-            SELECT COUNT(*) INTO concession_types FROM concession_types WHERE is_active=true;
-            IF concession_types <> 2 THEN
-              RAISE EXCEPTION 'Authoritative model must contain 2 concession types, got %', concession_types;
-            END IF;
-
-            SELECT COUNT(*) FILTER (WHERE lower(type.code)='departamento'),
-                   COUNT(*) FILTER (WHERE lower(type.code)='area'),
-                   COUNT(*) FILTER (WHERE lower(type.code)='yacimiento'),
-                   COUNT(*) FILTER (WHERE type.operational_role='COMPANY')
-            INTO departments,areas,yacimientos,companies
-            FROM assets asset
-            JOIN asset_types type ON type.id=asset.asset_type_id;
-            IF departments <> 7 OR areas <> 64 OR yacimientos <> 230 OR companies <> 13 THEN
-              RAISE EXCEPTION 'Authoritative territory mismatch: departments %, areas %, yacimientos %, companies %', departments,areas,yacimientos,companies;
-            END IF;
-
-            SELECT COUNT(*) INTO invalid_yacimientos
-            FROM assets yacimiento
-            JOIN asset_types type ON type.id=yacimiento.asset_type_id
-            JOIN assets area ON area.id=yacimiento.parent_id
-            WHERE lower(type.code)='yacimiento'
-              AND (
-                yacimiento.operational_area_id IS DISTINCT FROM area.id
-                OR yacimiento.operator_company_id IS NULL
-                OR yacimiento.concession_type_id IS NULL
-              );
-            IF invalid_yacimientos <> 0 THEN
-              RAISE EXCEPTION 'Authoritative model contains % invalid Yacimiento relationships', invalid_yacimientos;
-            END IF;
-
-            SELECT COUNT(*) INTO department_types
-            FROM asset_types
-            WHERE lower(code)='departamento' AND can_be_root=true AND is_active=true;
-            IF department_types <> 1 THEN
-              RAISE EXCEPTION 'Expected one active root Departamento type, got %', department_types;
-            END IF;
-
-            SELECT COUNT(*) INTO area_department_rules
-            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)='area' AND lower(parent.code)='departamento';
-            IF area_department_rules <> 1 THEN
-              RAISE EXCEPTION 'Expected Area → Departamento canonical rule, got %', area_department_rules;
-            END IF;
-
-            SELECT COUNT(*) INTO yacimiento_area_rules
-            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';
-            IF yacimiento_area_rules <> 1 THEN
-              RAISE EXCEPTION 'Expected Yacimiento → Área canonical rule, got %', yacimiento_area_rules;
-            END IF;
-
-            SELECT COUNT(*) INTO installation_yacimiento_rules
-            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)='instalacion' AND lower(parent.code)='yacimiento';
-            IF installation_yacimiento_rules <> 1 THEN
-              RAISE EXCEPTION 'Expected Instalación → Yacimiento canonical rule, got %', installation_yacimiento_rules;
-            END IF;
-
-            SELECT COUNT(*) INTO subinstallation_installation_rules
-            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)='subinstalacion' AND lower(parent.code)='instalacion';
-            IF subinstallation_installation_rules <> 1 THEN
-              RAISE EXCEPTION 'Expected Subinstalación → Instalación canonical rule, got %', subinstallation_installation_rules;
-            END IF;
-          END $$;
-          SQL
-
-          # Destructive cuts are intentionally one-way: production rollback is
-          # the PRE database backup, not migration:revert. Prove the completed
-          # chain is idempotent and has no pending migration on a second run.
-          rerun_log="$(mktemp)"
-          docker compose --env-file .env.example --profile tools run --rm migrate 2>&1 | tee "$rerun_log"
-          grep -Eq 'No pending migrations|Applied migrations: 0' "$rerun_log" || {
-            echo "ERROR: authoritative migration chain is not idempotent." >&2
-            cat "$rerun_log" >&2
-            exit 1
-          }
-          rm -f "$rerun_log"
-
-          # A build-only preflight cannot catch Nest dependency-injection or
-          # runtime configuration failures. Start the production API image against
-          # the migrated database and require the public health endpoint to answer.
-          export JWT_ACCESS_SECRET='CI_ACCESS_SECRET_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-          export REFRESH_TOKEN_PEPPER='CI_REFRESH_PEPPER_bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
-          export SMTP_SETTINGS_MASTER_KEY=''
-          docker compose --env-file .env.example build api
-          docker compose --env-file .env.example up -d api
-
-          api_ready=0
-          for _ in $(seq 1 30); do
-            if curl -fsS http://127.0.0.1:3101/api/v3/health >/tmp/dhv2-health.json 2>/dev/null; then
-              api_ready=1
-              break
-            fi
-            sleep 2
-          done
-          if [ "$api_ready" -ne 1 ]; then
-            echo 'ERROR: production API image did not become healthy.' >&2
-            docker compose --env-file .env.example logs --no-color api >&2 || true
-            exit 1
-          fi
-          grep -Fq '"status":"ok"' /tmp/dhv2-health.json || {
-            echo 'ERROR: /api/v3/health did not report status ok.' >&2
-            cat /tmp/dhv2-health.json >&2
-            exit 1
-          }
-      - name: Isolated builder test preflight
+      - name: VPS-equivalent isolated API preflight
         run: |
           set -Eeuo pipefail
           image="dhv2-api:ci-vps-preflight-${GITHUB_SHA::12}"
@@ -335,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

.github/workflows/f4-ci.yml

@@ -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

.github/workflows/inspection-planning-smoke.yml

@@ -1,26 +0,0 @@
-name: Inspection planning smoke
-
-on:
-  pull_request:
-    branches: [main]
-    paths:
-      - 'api-v3/src/inspection-visits/**'
-      - 'api-v3/src/database/migrations/**'
-      - 'api-v3/src/reference-data/**'
-      - 'web-v2/src/pages/InspectionVisitCreateF61Page.tsx'
-      - 'web-v2/src/pages/FieldBriefingsPage.tsx'
-      - 'web-v2/src/layout/AppLayout.tsx'
-      - 'scripts/ci-inspection-planning-smoke.sh'
-      - '.github/workflows/inspection-planning-smoke.yml'
-
-permissions:
-  contents: read
-
-jobs:
-  create-inspection:
-    name: F6.1 · real inspection create
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Rehearse hierarchy and create a real Inspection
-        run: bash scripts/ci-inspection-planning-smoke.sh

.github/workflows/security-audit.yml

@@ -1,48 +0,0 @@
-name: Production dependency audit
-
-on:
-  pull_request:
-    branches: [main]
-  push:
-    branches: [main]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: dhv2-production-audit-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  api:
-    name: API · production dependencies
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: api-v3
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-          cache: npm
-          cache-dependency-path: api-v3/package-lock.json
-      - name: Reject high/critical runtime advisories
-        run: npm audit --omit=dev --audit-level=high
-
-  web:
-    name: WEB · production dependencies
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: web-v2
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-          cache: npm
-          cache-dependency-path: web-v2/package-lock.json
-      - name: Reject high/critical runtime advisories
-        run: npm audit --omit=dev --audit-level=high

README.md

@@ -2,30 +2,9 @@
 
 Repositorio del sistema DH Inspección V2.
 
-## Componentes
+## Estructura
 
-- `api-v3/`: API NestJS/TypeORM y contratos de dominio.
-- `web-v2/`: aplicación WEB React/Vite.
-- `android-app/`: aplicación Android para trabajo de campo.
-- `scripts/`: utilidades operativas, preflight y despliegue.
-- `docs/`: documentación funcional y técnica.
-
-## Documentación vigente
-
-- [Corte de presentación F6.1](docs/PRESENTACION_F6_1.md)
-- [Manual del Programador](docs/MANUAL_PROGRAMADOR.md)
-- [Manual de Usuario](docs/MANUAL_USUARIO.md)
-- [Modelo canónico de Inventarios F6.1](docs/F6_INVENTORY_MODEL.md)
-- [Auditoría de consistencia F6.1](docs/AUDITORIA_CONSISTENCIA_F6_1.md)
-- [Contrato de release Android F6.1](android-app/RELEASE.md)
-
-## Contratos que no deben romperse
-
-- Inventario físico: **Departamento → Área → Yacimiento → Instalación → Subinstalación**.
-- Empresa es un maestro independiente; la Operadora se relaciona temporalmente con Área.
-- Una Inspección puede tener múltiples Actas, pero sólo un Acta `DRAFT` simultánea.
-- Hallazgos directos: Yacimiento, Instalación y Subinstalación, siempre con `OTROS` disponible.
-- La APK puede abrir una Inspección reutilizando el lifecycle canónico del backend.
-- GEDO/IF oficializa el Informe, pero no activa por sí solo el vencimiento No urgente.
-
-Las reglas detalladas, el procedimiento de cambio seguro y el recorrido de demo están en los documentos enlazados arriba.
+- `api-v3/`: API v3.
+- `web-v2/`: aplicación web.
+- `scripts/`: utilidades operativas y de despliegue.
+- `docs/`: documentación técnica.

_ci_notes/F6_4_ANDROID_MODERN_UI.md

@@ -1,11 +0,0 @@
-# F6.4 · Android Campo Moderno
-
-Criterios de aceptación:
-
-- el buscador de Instalación padre consulta mientras se escribe y cada resultado se puede seleccionar directamente;
-- la selección de Instalación abre la clasificación compatible de Subinstalación;
-- Actas utiliza un read-model móvil desacoplado del módulo documental de oficina;
-- la APK conserva GPS + foto antes de habilitar Hallazgos sobre Inventario nacido en campo;
-- el lifecycle Acta DRAFT → LOCKED → SEALED no cambia;
-- la interfaz de campo usa el tema DH moderno y mantiene acceso claro a Actas, Inventario y Hallazgos;
-- Android lint/tests/debug/release, API tests/build, WEB build y Docker contract deben quedar verdes.

android-app/FINAL_RELEASE_CHECKLIST.md

@@ -1,15 +0,0 @@
-# Checklist final Android 0.19.0
-
-La candidata sólo se promueve si el mismo SHA cumple:
-
-- iniciar Inspección;
-- crear/abrir Acta;
-- seleccionar o crear Instalación/Subinstalación;
-- exigir GPS + fotografía para Inventario nacido en campo antes de Hallazgos;
-- registrar Hallazgos sobre el elemento seleccionado;
-- cerrar contenido del Acta y mostrar **Pendiente de firma**;
-- completar firma del Inspector y manifestación/firma o negativa de la empresa;
-- mostrar el Acta como **Firmada y cerrada**;
-- permitir cerrar la Inspección sólo con todas las Actas activas firmadas y cerradas;
-- no exponer estados internos en inglés en la interfaz de campo;
-- Android CI / RC, DH V2 CI y auditoría de dependencias en verde.

android-app/RELEASE.md

@@ -1,97 +0,0 @@
-# DH Inspección Android · release final de campo 0.19.0
-
-## Candidata vigente
-
-- Fase funcional: **Flujo final de campo · Inspección → Acta → Hallazgos → Firma**.
-- `versionName`: **0.19.0**.
-- `versionCode`: **28**.
-- Application ID release: `com.korexlabs.dhinspeccion`.
-- Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
-- API: `https://dhv2.korexlabs.com/api/v3/`.
-
-La variante debug es independiente de la app productiva y puede instalarse para QA/presentación sin sobrescribir una instalación release histórica.
-
-## Procedimiento operativo validado
-
-La APK 0.19.0 fija como recorrido principal de campo:
-
-1. **Iniciar Inspección**. Al iniciarla se habilitan Actas, Hallazgos e Inventario de campo.
-2. **Crear o abrir un Acta**. Puede haber varias Actas dentro de una misma Inspección, pero sólo una puede permanecer en elaboración al mismo tiempo.
-3. **Agregar Hallazgos** sobre una Instalación o Subinstalación seleccionada.
-4. Si el elemento ya existe, se lo selecciona desde el Inventario del Área/Yacimiento de la Inspección.
-5. Si no existe, se da de alta desde campo sin abandonar el Acta.
-6. Un elemento nuevo debe completar **GPS + fotografía** antes de poder recibir Hallazgos.
-7. Al terminar el contenido del Acta se usa **Cerrar Acta y dejar pendiente de firma**. Desde ese momento el contenido queda inmutable y el estado visible es **Pendiente de firma**.
-8. La firma del Inspector y la manifestación/firma o negativa de la empresa completan el Acta, que pasa a **Firmada y cerrada**.
-9. La Inspección sólo puede cerrarse cuando todas sus Actas no canceladas están firmadas y cerradas.
-
-La nomenclatura técnica interna de API (`DRAFT`, `LOCKED`, `SEALED`, etc.) no se muestra al inspector: la interfaz usa textos operativos en castellano.
-
-## Alta de Instalaciones y Subinstalaciones
-
-El alta móvil queda alineada con el Dashboard y con las validaciones del servidor.
-
-### Instalación
-
-- contexto territorial: Yacimiento/Área de la Inspección;
-- clasificación técnica compatible;
-- **Nombre técnico** obligatorio;
-- Nombre habitual opcional;
-- Descripción opcional;
-- atributos técnicos definidos por el tipo; sólo los marcados como obligatorios bloquean el guardado;
-- código DH generado por el sistema cuando corresponde;
-- GPS de la tablet;
-- fotografía obligatoria antes de crear Hallazgos.
-
-### Subinstalación
-
-Además de lo anterior requiere elegir primero la **Instalación padre**. El buscador consulta mientras se escribe y cada resultado es seleccionable tocando la tarjeta.
-
-La clasificación y los atributos se obtienen dinámicamente desde el mismo catálogo administrado por el Dashboard; la APK no mantiene listas técnicas paralelas.
-
-## Actas y firma
-
-La terminología visible se simplifica:
-
-- `DRAFT` → **En elaboración**;
-- `LOCKED` → **Pendiente de firma**;
-- `SEALED` → **Firmada y cerrada**.
-
-Cerrar el contenido no cierra automáticamente la Inspección y tampoco obliga a terminar la firma en ese instante: puede continuarse con otra Acta. Una vez cerrado el contenido, el Acta es inmutable.
-
-Después de la firma/cierre definitivo se mantiene el circuito documental existente: PDF del Acta e informe INF editable (DOCX) para oficina.
-
-## Castellano e identidad visual
-
-Se revisaron las pantallas activas de campo para evitar exponer estados y opciones internas en inglés. Entre otros cambios: Pasaporte/Otro en documentos, estados de Inspección/Acta/Hallazgo en castellano, Correo electrónico, Huella de integridad y terminología de cierre orientada al usuario.
-
-La pantalla de ingreso y el desbloqueo biométrico utilizan la identidad visual de Mendoza ya incorporada al proyecto.
-
-## Barrera obligatoria
-
-Todo cambio Android o de API que pueda afectar al cliente móvil debe pasar `Android CI / RC`:
-
-1. validación de identidad, HTTPS y políticas básicas del manifest;
-2. Android lint;
-3. pruebas unitarias Android reales, con verificación de que exista al menos una prueba ejecutada;
-4. `assembleDebug`;
-5. `assembleRelease` para comprobar que la variante productiva compile;
-6. empaquetado del APK debug con SHA-256 y metadata de commit/versionado.
-
-Además, `DH V2 CI` debe mantener verdes API, WEB y contrato Docker/migraciones antes de promover cambios que afecten al servidor.
-
-## Firma release
-
-La clave histórica de firma **no se versiona ni se reemplaza**. La CI compila la variante release para detectar roturas, pero una APK productiva que deba actualizar `com.korexlabs.dhinspeccion` tiene que firmarse con la clave histórica.
-
-No se debe crear una clave nueva para resolver una falta de acceso: eso rompería la continuidad de actualización de tablets que ya tengan una versión firmada con la clave anterior.
-
-## Criterio de distribución
-
-Antes de distribuir una APK productiva:
-
-- todas las barreras de CI del SHA exacto deben estar verdes;
-- comprobar certificado/huella de firma contra la versión histórica si se distribuirá como actualización productiva;
-- realizar actualización sobre al menos una tablet con la versión productiva anterior cuando corresponda;
-- ejecutar smoke funcional: ingreso, iniciar Inspección, crear Acta, seleccionar/crear Instalación o Subinstalación, GPS/foto, Hallazgo, cerrar Acta → Pendiente de firma, firma/manifestación, cierre de Acta y cierre de Inspección;
-- registrar el SHA Git y SHA-256 de la APK distribuida.

android-app/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.korexlabs.dhinspeccion"
         minSdk = 26
         targetSdk = 36
-        versionCode = 28
-        versionName = "0.19.0"
+        versionCode = 19
+        versionName = "0.12.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

android-app/app/src/main/AndroidManifest.xml

@@ -3,14 +3,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:allowBackup="false"
-        android:icon="@drawable/ic_mendoza_launcher_exact"
-        android:roundIcon="@drawable/ic_mendoza_launcher_exact"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.DHInspeccion"

android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt

@@ -49,8 +49,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
 
     var inventory: List<FieldInventoryItem> by mutableStateOf(emptyList())
         private set
-    var inventoryParentId: String? by mutableStateOf(null)
-        private set
     var fieldTypes: List<FieldType> by mutableStateOf(emptyList())
         private set
     var selectedFieldAsset: FieldAssetDetail? by mutableStateOf(null)
@@ -98,7 +96,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             visits = emptyList()
             visit = null
             inventory = emptyList()
-            inventoryParentId = null
             fieldTypes = emptyList()
             selectedFieldAsset = null
             clearActState()
@@ -115,7 +112,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun openVisit(id: String) = launchBusy {
         visit = repository.visit(id)
         inventory = emptyList()
-        inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
         fieldTypes = emptyList()
         selectedFieldAsset = null
         clearFindingState()
@@ -125,7 +121,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun closeVisitView() {
         visit = null
         inventory = emptyList()
-        inventoryParentId = null
         fieldTypes = emptyList()
         selectedFieldAsset = null
         clearActState()
@@ -137,7 +132,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         val id = visit?.id ?: return
         launchBusy {
             visit = repository.startVisit(id)
-            inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
             notice = "Inspección iniciada."
             loadActsInternal(id, selectDraft = true)
             loadVisitsInternal()
@@ -157,69 +151,53 @@ 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."
+            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."
+        if (asset == null) {
+            error = "Seleccioná primero una Instalación o Subinstalación para iniciar el Acta."
             return
         }
         if (acts.any { it.status == "DRAFT" }) {
-            error = "Ya existe un Acta en elaboración. Cerrala 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."
-            if (asset != null && selectedFieldAsset?.capture?.readyForFinding == true) {
+            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)
             }
         }
     }
 
-    fun createAct(urgency: String = "NON_URGENT") = createActForSelectedInventory(urgency)
-
     fun searchInventory(search: String, parentId: String? = null) {
-        val currentVisit = visit ?: return
+        val id = visit?.id ?: return
         launchBusy {
-            inventory = repository.fieldInventory(currentVisit.id, search, parentId).data
+            inventory = repository.fieldInventory(id, search, parentId).data
         }
     }
 
     fun loadFieldTypes(parentId: String? = null) {
-        val currentVisit = visit ?: return
+        val id = visit?.id ?: return
         launchBusy {
-            val effectiveParentId = parentId ?: currentVisit.scopeAsset?.id ?: currentVisit.operationalArea?.id
-            inventoryParentId = effectiveParentId
-            fieldTypes = repository.fieldTypes(currentVisit.id, parentId).data
-            inventory = repository.fieldInventory(currentVisit.id, null, effectiveParentId).data
+            fieldTypes = repository.fieldTypes(id, parentId).data
         }
     }
 
-    private suspend fun reloadCurrentInventory(visitId: String) {
-        val effectiveParentId = inventoryParentId ?: visit?.scopeAsset?.id ?: visit?.operationalArea?.id
-        inventory = repository.fieldInventory(visitId, null, effectiveParentId).data
-    }
-
     fun selectExisting(item: FieldInventoryItem) {
         val visitId = visit?.id ?: return
         launchBusy {
             selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
-            notice = "Inventario agregado a la Inspección."
-            reloadCurrentInventory(visitId)
+            notice = "Inventario agregado a la inspección."
+            inventory = repository.fieldInventory(visitId, null, null).data
             val draft = selectedDraftAct()
             if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
                 selectedAct = actsRepository.ensureAsset(draft.id, item.id)
@@ -241,15 +219,14 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         latitude: Double,
         longitude: Double,
         accuracyM: Double?,
-        description: String? = null,
     ) {
         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) {
-            error = "Elegí una clasificación técnica o la opción Otro / no catalogado."
+            error = "Elegí una familia técnica o la opción Otro / no catalogado."
             return
         }
         launchBusy {
@@ -259,7 +236,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 familyId = familyId,
                 name = name.trim(),
                 commonName = commonName?.trim()?.takeIf { it.isNotBlank() },
-                description = description?.trim()?.takeIf { it.isNotBlank() },
                 attributes = attributes,
                 deviceLatitude = latitude,
                 deviceLongitude = longitude,
@@ -268,7 +244,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             )
             selectedFieldAsset = repository.createFieldAsset(visitId, request)
             notice = "Inventario creado con GPS. Falta la fotografía obligatoria. Si ya existía, podés fusionarlo antes de continuar."
-            reloadCurrentInventory(visitId)
+            inventory = repository.fieldInventory(visitId, null, null).data
         }
     }
 
@@ -292,7 +268,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             )
             selectedFieldAsset = repository.selectFieldAsset(visitId, result.canonical.id)
             notice = "Fusión registrada. Se conserva ${result.canonical.code} y la historia de ${result.source.code} permanece trazable."
-            reloadCurrentInventory(visitId)
+            inventory = repository.fieldInventory(visitId, null, null).data
             val draft = selectedDraftAct()
             if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
                 selectedAct = actsRepository.ensureAsset(draft.id, result.canonical.id)
@@ -325,7 +301,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             } else {
                 "Fotografía registrada."
             }
-            reloadCurrentInventory(visitId)
+            inventory = repository.fieldInventory(visitId, null, null).data
             val draft = selectedDraftAct()
             if (response.capture.readyForFinding && draft != null) {
                 selectedAct = actsRepository.ensureAsset(draft.id, asset.id)
@@ -342,7 +318,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         val assetId = selectedFieldAsset?.asset?.id ?: return
         val draft = selectedDraftAct()
         if (draft == null) {
-            error = "Creá o seleccioná el Acta en elaboración antes de registrar Hallazgos."
+            error = "Creá o seleccioná el Acta en borrador antes de registrar Hallazgos."
             return
         }
         launchBusy {
@@ -364,7 +340,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         val assetId = selectedFieldAsset?.asset?.id ?: return
         val actId = selectedDraftAct()?.id
         if (actId == null) {
-            error = "No hay un Acta en elaboración seleccionada."
+            error = "No hay un Acta en borrador seleccionada."
             return
         }
         if (description.isBlank()) {
@@ -473,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 firmar y cerrar 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 cerrada y pendiente de firma. Su contenido quedó inmutable; las firmas y manifestaciones pueden completarse a continuación."
+            notice = "Acta preparada. Su contenido quedó congelado para las firmas."
         }
     }
 
     fun reopenSelectedAct() {
-        error = "Un Acta pendiente de firma es inmutable y no puede volver a edición."
+        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(
@@ -526,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."
         }
     }
 
@@ -544,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"} firmada y cerrada. 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."
         }
     }
 
@@ -557,7 +534,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         launchBusy {
             visit = actsRepository.closeVisit(visitId)
             loadVisitsInternal()
-            notice = "Inspección cerrada. Todas sus Actas quedaron firmadas y disponibles para el circuito de oficina."
+            notice = "Inspección cerrada. Las Actas y documentos quedan disponibles para oficina."
         }
     }
 

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt

@@ -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,9 +153,9 @@ data class ChecklistSummary(
 data class VisitDetail(
     val id: String,
     val code: String,
+    val title: String? = null,
     val objective: String? = null,
     val status: String,
-    val scopeAsset: AssetSummary? = null,
     val operationalArea: AssetSummary? = null,
     val operatorCompany: AssetSummary? = null,
     val leadInspector: PersonSummary? = null,

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/MobileActs.kt

@@ -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",
 )
@@ -207,7 +179,7 @@ data class MobileCloseVisitRequest(
 )
 
 private interface MobileActsApi {
-    @GET("inspection-visits/{visitId}/acts/mobile")
+    @GET("inspection-visits/{visitId}/acts")
     suspend fun listActs(
         @Header("Authorization") authorization: String,
         @Path("visitId") visitId: String,
@@ -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,21 +305,15 @@ class MobileActsRepository(context: Context) {
         api.act("Bearer ${session.accessToken}", actId)
     }
 
-    suspend fun create(
-        visitId: String,
-        assetId: String? = null,
-        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.",
-                assetIds = listOfNotNull(assetId),
+                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 ->

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/MobileInspectionOpen.kt

@@ -1,103 +0,0 @@
-package com.korexlabs.dhinspeccion.data
-
-import android.content.Context
-import com.korexlabs.dhinspeccion.BuildConfig
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import okhttp3.OkHttpClient
-import retrofit2.HttpException
-import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Header
-import retrofit2.http.POST
-import retrofit2.http.Path
-
-data class MobilePlanningAsset(
-    val id: String,
-    val code: String,
-    val name: String,
-)
-
-data class MobilePlanningAssetResponse(
-    val data: List<MobilePlanningAsset> = emptyList(),
-)
-
-data class OpenMobileInspectionRequest(
-    val operationalAreaId: String,
-    val operatorCompanyId: String,
-)
-
-private interface MobileInspectionOpenApi {
-    @GET("inspection-visits/mobile/planning-context/areas")
-    suspend fun areas(
-        @Header("Authorization") authorization: String,
-    ): MobilePlanningAssetResponse
-
-    @GET("inspection-visits/mobile/planning-context/areas/{areaId}/operators")
-    suspend fun operators(
-        @Header("Authorization") authorization: String,
-        @Path("areaId") areaId: String,
-    ): MobilePlanningAssetResponse
-
-    @POST("inspection-visits/mobile/open")
-    suspend fun open(
-        @Header("Authorization") authorization: String,
-        @Body request: OpenMobileInspectionRequest,
-    ): VisitDetail
-
-    @POST("auth/mobile/refresh")
-    suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
-}
-
-class MobileInspectionOpenRepository(context: Context) {
-    private val store = SecureSessionStore(context.applicationContext)
-    private val refreshMutex = Mutex()
-    private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
-    private val api: MobileInspectionOpenApi = Retrofit.Builder()
-        .baseUrl(BuildConfig.API_BASE_URL)
-        .client(OkHttpClient.Builder().build())
-        .addConverterFactory(MoshiConverterFactory.create(moshi))
-        .build()
-        .create(MobileInspectionOpenApi::class.java)
-
-    suspend fun areas(): MobilePlanningAssetResponse = authorized { session ->
-        api.areas("Bearer ${session.accessToken}")
-    }
-
-    suspend fun operators(areaId: String): MobilePlanningAssetResponse = authorized { session ->
-        api.operators("Bearer ${session.accessToken}", areaId)
-    }
-
-    suspend fun open(areaId: String, companyId: String): VisitDetail = authorized { session ->
-        api.open(
-            "Bearer ${session.accessToken}",
-            OpenMobileInspectionRequest(areaId, companyId),
-        )
-    }
-
-    private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
-        var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
-        try {
-            return block(session)
-        } catch (error: HttpException) {
-            if (error.code() != 401) throw error
-        }
-        session = refresh(session.refreshToken)
-        return block(session)
-    }
-
-    private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
-        val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
-        if (latest.refreshToken != previousRefreshToken) return@withLock latest
-        try {
-            store.save(api.refresh(RefreshRequest(previousRefreshToken)))
-        } catch (error: Throwable) {
-            store.clear()
-            throw error
-        }
-    }
-}

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt

@@ -547,17 +547,13 @@ private suspend fun currentGeo(context: Context): GeoSnapshot = suspendCancellab
     }
     val source = CancellationTokenSource()
     val client = LocationServices.getFusedLocationProviderClient(context)
-    try {
-        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-                else continuation.resume(GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
-            }
-            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-    } catch (error: SecurityException) {
-        if (continuation.isActive) continuation.resumeWithException(error)
-    }
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            else continuation.resume(GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
     continuation.invokeOnCancellation { source.cancel() }
 }
 

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhTheme.kt

@@ -1,73 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-
-private val DhLightColors = lightColorScheme(
-    primary = Color(0xFF075E63),
-    onPrimary = Color(0xFFFFFFFF),
-    primaryContainer = Color(0xFFD6F0F0),
-    onPrimaryContainer = Color(0xFF073F43),
-    secondary = Color(0xFF445E74),
-    onSecondary = Color(0xFFFFFFFF),
-    secondaryContainer = Color(0xFFDCE7F1),
-    onSecondaryContainer = Color(0xFF243F54),
-    tertiary = Color(0xFF6A5A42),
-    background = Color(0xFFF6F8FA),
-    onBackground = Color(0xFF182025),
-    surface = Color(0xFFFFFFFF),
-    onSurface = Color(0xFF182025),
-    surfaceVariant = Color(0xFFEDF1F4),
-    onSurfaceVariant = Color(0xFF455158),
-    outline = Color(0xFF77848B),
-    outlineVariant = Color(0xFFD7DEE2),
-    error = Color(0xFFB3261E),
-    onError = Color(0xFFFFFFFF),
-    errorContainer = Color(0xFFF9DEDC),
-    onErrorContainer = Color(0xFF6F1713),
-)
-
-private val DhDarkColors = darkColorScheme(
-    primary = Color(0xFF88D4D7),
-    onPrimary = Color(0xFF00373A),
-    primaryContainer = Color(0xFF074F53),
-    onPrimaryContainer = Color(0xFFB7EBED),
-    secondary = Color(0xFFB6CBE0),
-    onSecondary = Color(0xFF203646),
-    secondaryContainer = Color(0xFF344C60),
-    onSecondaryContainer = Color(0xFFDCE7F1),
-    background = Color(0xFF101416),
-    onBackground = Color(0xFFE0E4E6),
-    surface = Color(0xFF171C1F),
-    onSurface = Color(0xFFE0E4E6),
-    surfaceVariant = Color(0xFF263035),
-    onSurfaceVariant = Color(0xFFC3CDD2),
-    outline = Color(0xFF8C989E),
-    error = Color(0xFFFFB4AB),
-    onError = Color(0xFF690005),
-    errorContainer = Color(0xFF93000A),
-    onErrorContainer = Color(0xFFFFDAD6),
-)
-
-private val DhShapes = androidx.compose.material3.Shapes(
-    extraSmall = RoundedCornerShape(8.dp),
-    small = RoundedCornerShape(12.dp),
-    medium = RoundedCornerShape(16.dp),
-    large = RoundedCornerShape(22.dp),
-    extraLarge = RoundedCornerShape(28.dp),
-)
-
-@Composable
-fun DhTheme(content: @Composable () -> Unit) {
-    MaterialTheme(
-        colorScheme = if (isSystemInDarkTheme()) DhDarkColors else DhLightColors,
-        shapes = DhShapes,
-        content = content,
-    )
-}

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DynamicVisitRoot.kt

@@ -1,972 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import android.Manifest
-import android.content.Context
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Environment
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.AssistChip
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateMapOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import androidx.exifinterface.media.ExifInterface
-import com.google.android.gms.location.LocationServices
-import com.google.android.gms.location.Priority
-import com.google.android.gms.tasks.CancellationTokenSource
-import com.korexlabs.dhinspeccion.MainViewModel
-import com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
-import com.korexlabs.dhinspeccion.data.FieldInventoryItem
-import com.korexlabs.dhinspeccion.data.FieldType
-import com.korexlabs.dhinspeccion.data.VisitDetail
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import java.io.File
-import java.time.Instant
-import java.time.ZoneId
-import java.time.format.DateTimeFormatter
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-
-private data class DynamicGeoSnapshot(
-    val latitude: Double,
-    val longitude: Double,
-    val accuracyM: Double?,
-)
-
-private enum class DynamicInventoryMode {
-    BROWSE,
-    PICK_PARENT,
-    CREATE_INSTALLATION,
-    CREATE_SUBINSTALLATION,
-}
-
-@Composable
-fun DynamicVisitRoot(model: MainViewModel) {
-    var inventoryMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
-    var actsMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
-
-    when {
-        actsMode -> MobileActsScreen(
-            model = model,
-            onBack = { actsMode = false },
-            onGoInventory = {
-                actsMode = false
-                inventoryMode = true
-            },
-        )
-        inventoryMode -> DynamicFieldInventoryScreen(
-            model = model,
-            onBack = {
-                inventoryMode = false
-                actsMode = true
-            },
-        )
-        else -> DynamicVisitOverview(
-            model = model,
-            onInventory = { inventoryMode = true },
-            onActs = { actsMode = true },
-        )
-    }
-}
-
-@Composable
-private fun DynamicVisitOverview(
-    model: MainViewModel,
-    onInventory: () -> Unit,
-    onActs: () -> Unit,
-) {
-    val visit = model.visit ?: return
-    Column(
-        Modifier
-            .fillMaxSize()
-            .verticalScroll(rememberScrollState())
-            .padding(top = 28.dp, start = 16.dp, end = 16.dp, bottom = 30.dp),
-        verticalArrangement = Arrangement.spacedBy(12.dp),
-    ) {
-        Row(
-            Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            OutlinedButton(onClick = { model.closeVisitView() }) { Text("Volver") }
-            Text(dynamicStatusLabel(visit.status), fontWeight = FontWeight.Bold)
-        }
-        Text(visit.code, style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
-        Text("${visit.operatorCompany?.name ?: "Sin operadora"} · ${visit.operationalArea?.name ?: "Sin área"}")
-        visit.scopeAsset?.let {
-            Text("Yacimiento: ${it.name}", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
-        }
-        visit.plannedStartAt?.let {
-            Text("Planificada: ${dynamicShortDate(it)}", style = MaterialTheme.typography.bodySmall)
-        }
-        visit.instructions?.takeIf { it.isNotBlank() }?.let {
-            Card(Modifier.fillMaxWidth()) {
-                Column(Modifier.padding(12.dp)) {
-                    Text("Instrucciones", fontWeight = FontWeight.Bold)
-                    Text(it)
-                }
-            }
-        }
-        DynamicMessageStrip(model)
-
-        if (visit.status == "PLANNED") {
-            Card(
-                Modifier.fillMaxWidth(),
-                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
-            ) {
-                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Text("Todo listo para comenzar", fontWeight = FontWeight.Bold)
-                    Text("Al iniciar se habilitan Actas, Hallazgos y altas rápidas de campo.")
-                    Button(
-                        onClick = { model.startVisit(); onActs() },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text(if (model.busy) "Iniciando…" else "Iniciar inspección") }
-                }
-            }
-        }
-
-        if (visit.status == "IN_PROGRESS") {
-            Card(
-                Modifier.fillMaxWidth(),
-                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer),
-            ) {
-                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Text("Modo campo rápido", fontWeight = FontWeight.Bold)
-                    Text(
-                        "Desde Inventario podés cargar una Subinstalación en tres pasos: elegir Instalación, identificarla y capturar GPS + foto.",
-                        style = MaterialTheme.typography.bodySmall,
-                    )
-                    Button(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
-                        Text("+ Nueva subinstalación / inventario")
-                    }
-                }
-            }
-
-            Button(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
-                val open = model.acts.count { it.status == "DRAFT" || it.status == "READY" }
-                Text("Abrir Actas · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
-            }
-            OutlinedButton(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
-                Text("Buscar Inventario / Hallazgos")
-            }
-        } else if (visit.status == "CLOSED") {
-            OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
-                Text("Ver Actas · ${model.acts.size}")
-            }
-        }
-
-        DynamicChecklistCard(visit)
-
-        Text("Inventario planificado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-        if (visit.planningAssets.none { it.included }) {
-            Text("Sin elementos planificados.")
-        }
-        visit.planningAssets.filter { it.included }.forEach { asset ->
-            Card(Modifier.fillMaxWidth()) {
-                Column(Modifier.padding(10.dp)) {
-                    Text(asset.name, fontWeight = FontWeight.SemiBold)
-                    Text("${asset.code} · ${asset.typeName.orEmpty()}", style = MaterialTheme.typography.bodySmall)
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicChecklistCard(visit: VisitDetail) {
-    val checklist = visit.checklist
-    Card(Modifier.fillMaxWidth()) {
-        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
-            Text("Antecedentes antes de salir", fontWeight = FontWeight.Bold)
-            Text("Vencidos empresa: ${checklist.companyOverdue} · Verificaciones vencidas: ${checklist.verificationOverdue}")
-            Text("Antecedentes: ${checklist.antecedents} · Próximos controles: ${checklist.upcomingControls}")
-            if (checklist.stale) {
-                Text("El checklist requiere revisión/actualización.", color = MaterialTheme.colorScheme.error)
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
-    val visit = model.visit ?: return
-
-    var modeName by rememberSaveable(visit.id) { mutableStateOf(DynamicInventoryMode.BROWSE.name) }
-    val mode = runCatching { DynamicInventoryMode.valueOf(modeName) }.getOrDefault(DynamicInventoryMode.BROWSE)
-    var search by rememberSaveable(visit.id) { mutableStateOf("") }
-    var parentSearch by rememberSaveable(visit.id) { mutableStateOf("") }
-    var parentId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var parentLabel by rememberSaveable(visit.id) { mutableStateOf("") }
-    var name by rememberSaveable(visit.id) { mutableStateOf("") }
-    var commonName by rememberSaveable(visit.id) { mutableStateOf("") }
-    var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var selectedFamilyId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var familySearch by rememberSaveable(visit.id) { mutableStateOf("") }
-    val attributeValues = remember { mutableStateMapOf<String, String>() }
-    var pendingAutoPhoto by rememberSaveable(visit.id) { mutableStateOf(false) }
-    var localError by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var permissionAction by rememberSaveable(visit.id) { mutableStateOf("PHOTO") }
-
-    var mergeSearch by rememberSaveable(visit.id) { mutableStateOf("") }
-    var mergeCandidateId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var mergeReason by rememberSaveable(visit.id) { mutableStateOf("") }
-
-    fun resetForm() {
-        name = ""
-        commonName = ""
-        selectedTypeId = null
-        selectedFamilyId = null
-        familySearch = ""
-        attributeValues.clear()
-        localError = null
-    }
-
-    fun backToBrowse() {
-        modeName = DynamicInventoryMode.BROWSE.name
-        parentId = null
-        parentLabel = ""
-        parentSearch = ""
-        resetForm()
-        model.loadFieldTypes(null)
-    }
-
-    fun startInstallation() {
-        model.clearSelectedFieldAsset()
-        modeName = DynamicInventoryMode.CREATE_INSTALLATION.name
-        parentId = null
-        parentLabel = visit.scopeAsset?.name ?: "Yacimiento de la inspección"
-        resetForm()
-        model.loadFieldTypes(null)
-    }
-
-    fun startSubinstallation() {
-        model.clearSelectedFieldAsset()
-        modeName = DynamicInventoryMode.PICK_PARENT.name
-        parentId = null
-        parentLabel = ""
-        parentSearch = ""
-        resetForm()
-        model.searchInventory("", visit.scopeAsset?.id)
-    }
-
-    fun chooseParent(item: FieldInventoryItem) {
-        parentId = item.id
-        parentLabel = "${item.name} (${item.code})"
-        modeName = DynamicInventoryMode.CREATE_SUBINSTALLATION.name
-        resetForm()
-        model.loadFieldTypes(item.id)
-    }
-
-    LaunchedEffect(visit.id) {
-        model.searchInventory("", visit.scopeAsset?.id)
-    }
-
-    LaunchedEffect(model.fieldTypes, modeName) {
-        if (mode == DynamicInventoryMode.CREATE_INSTALLATION || mode == DynamicInventoryMode.CREATE_SUBINSTALLATION) {
-            val preferred = model.fieldTypes.firstOrNull { type ->
-                val normalized = dynamicNormalize(type.structuralKind ?: type.code.ifBlank { type.name })
-                when (mode) {
-                    DynamicInventoryMode.CREATE_INSTALLATION -> normalized.contains("instalacion") && !normalized.contains("subinstalacion")
-                    DynamicInventoryMode.CREATE_SUBINSTALLATION -> normalized.contains("subinstalacion")
-                    else -> false
-                }
-            } ?: model.fieldTypes.firstOrNull()
-            if (model.fieldTypes.none { it.id == selectedTypeId }) {
-                selectedTypeId = preferred?.id
-                selectedFamilyId = null
-                familySearch = ""
-                attributeValues.clear()
-            }
-        }
-    }
-
-    val selectedType = model.fieldTypes.firstOrNull { it.id == selectedTypeId }
-    val selectedFamily = selectedType?.families?.firstOrNull { it.id == selectedFamilyId }
-    val filteredFamilies = remember(selectedType, familySearch) {
-        val needle = dynamicNormalize(familySearch)
-        selectedType?.families.orEmpty().filter { family ->
-            needle.isBlank() || dynamicNormalize("${family.code} ${family.name}").contains(needle)
-        }
-    }
-
-    var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
-    var pendingPhotoGeo by remember { mutableStateOf<DynamicGeoSnapshot?>(null) }
-
-    val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
-        val file = pendingPhotoFile
-        val geo = pendingPhotoGeo
-        if (success && file != null && geo != null) {
-            runCatching { writeDynamicExif(file, geo) }
-            model.uploadFieldPhoto(file, geo.latitude, geo.longitude, geo.accuracyM)
-        } else if (!success) {
-            localError = "La foto quedó pendiente. Podés tomarla cuando estés listo."
-        }
-        pendingPhotoFile = null
-        pendingPhotoGeo = null
-    }
-
-    val beginPhoto: () -> Unit = {
-        scope.launch {
-            runCatching { currentDynamicGeo(context) }
-                .onSuccess { geo ->
-                    val (file, uri) = newDynamicPhoto(context)
-                    pendingPhotoFile = file
-                    pendingPhotoGeo = geo
-                    takePicture.launch(uri)
-                }
-                .onFailure { localError = it.message ?: "No se pudo obtener el GPS para la fotografía." }
-        }
-    }
-
-    fun createWithLocation() {
-        val type = selectedType ?: return
-        val effectiveParent = when (mode) {
-            DynamicInventoryMode.CREATE_SUBINSTALLATION -> parentId
-            else -> null
-        }
-        scope.launch {
-            runCatching { currentDynamicGeo(context) }
-                .onSuccess { geo ->
-                    pendingAutoPhoto = true
-                    model.createFieldAsset(
-                        type = type,
-                        parentId = effectiveParent,
-                        familyId = selectedFamilyId,
-                        name = name,
-                        commonName = commonName,
-                        attributes = buildDynamicAttributes(type, attributeValues),
-                        latitude = geo.latitude,
-                        longitude = geo.longitude,
-                        accuracyM = geo.accuracyM,
-                    )
-                }
-                .onFailure { localError = it.message ?: "No se pudo capturar la ubicación GPS." }
-        }
-    }
-
-    val permissionsLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
-        val cameraAllowed = result[Manifest.permission.CAMERA] == true || dynamicHasPermission(context, Manifest.permission.CAMERA)
-        val locationAllowed = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
-            result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || dynamicHasLocation(context)
-        when (permissionAction) {
-            "CREATE" -> {
-                if (cameraAllowed && locationAllowed) createWithLocation()
-                else localError = "Para el alta rápida se necesitan cámara y ubicación."
-            }
-            else -> {
-                if (cameraAllowed && locationAllowed) beginPhoto()
-                else localError = "Para completar el alta se necesitan cámara y ubicación."
-            }
-        }
-    }
-
-    fun requestCreate() {
-        permissionAction = "CREATE"
-        if (dynamicHasPermission(context, Manifest.permission.CAMERA) && dynamicHasLocation(context)) {
-            createWithLocation()
-        } else {
-            permissionsLauncher.launch(
-                arrayOf(
-                    Manifest.permission.CAMERA,
-                    Manifest.permission.ACCESS_FINE_LOCATION,
-                    Manifest.permission.ACCESS_COARSE_LOCATION,
-                ),
-            )
-        }
-    }
-
-    fun requestPhoto() {
-        permissionAction = "PHOTO"
-        if (dynamicHasPermission(context, Manifest.permission.CAMERA) && dynamicHasLocation(context)) {
-            beginPhoto()
-        } else {
-            permissionsLauncher.launch(
-                arrayOf(
-                    Manifest.permission.CAMERA,
-                    Manifest.permission.ACCESS_FINE_LOCATION,
-                    Manifest.permission.ACCESS_COARSE_LOCATION,
-                ),
-            )
-        }
-    }
-
-    val selectedCapture = model.selectedFieldAsset
-    LaunchedEffect(selectedCapture?.asset?.id, pendingAutoPhoto) {
-        val capture = selectedCapture?.capture
-        if (pendingAutoPhoto && capture?.captureRequired == true && capture.creationGpsCaptured && capture.fieldPhotoCount == 0) {
-            pendingAutoPhoto = false
-            requestPhoto()
-        }
-    }
-
-    val mergeSource = selectedCapture?.takeIf {
-        it.capture.captureRequired && dynamicItemTypeCode(it.asset) in setOf("instalacion", "subinstalacion")
-    }
-    val mergeCandidates = remember(model.inventory, mergeSource) {
-        if (mergeSource == null) emptyList() else model.inventory.filter { candidate ->
-            candidate.id != mergeSource.asset.id &&
-                candidate.informationStatus != "INACTIVE" &&
-                candidate.type?.id == mergeSource.asset.type?.id &&
-                candidate.parent?.id == mergeSource.asset.parent?.id &&
-                !candidate.captureRequired
-        }
-    }
-
-    Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
-        Row(
-            Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            OutlinedButton(onClick = { if (mode == DynamicInventoryMode.BROWSE) onBack() else backToBrowse() }) {
-                Text(if (mode == DynamicInventoryMode.BROWSE) "Acta" else "Atrás")
-            }
-            Column(horizontalAlignment = Alignment.End) {
-                Text(
-                    when (mode) {
-                        DynamicInventoryMode.PICK_PARENT -> "Elegir Instalación"
-                        DynamicInventoryMode.CREATE_INSTALLATION -> "Nueva Instalación"
-                        DynamicInventoryMode.CREATE_SUBINSTALLATION -> "Nueva Subinstalación"
-                        else -> "Inventario de campo"
-                    },
-                    style = MaterialTheme.typography.titleLarge,
-                    fontWeight = FontWeight.Bold,
-                )
-                Text(visit.scopeAsset?.name ?: visit.code, style = MaterialTheme.typography.bodySmall)
-            }
-        }
-
-        Column(Modifier.padding(horizontal = 16.dp)) {
-            DynamicMessageStrip(model)
-            localError?.let {
-                Card(
-                    modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp),
-                    colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer),
-                    onClick = { localError = null },
-                ) { Text(it, Modifier.padding(12.dp)) }
-            }
-        }
-
-        if (selectedCapture != null) {
-            DynamicCaptureCard(
-                item = selectedCapture.asset,
-                gps = selectedCapture.capture.creationGpsCaptured,
-                photos = selectedCapture.capture.fieldPhotoCount,
-                ready = selectedCapture.capture.readyForFinding,
-                onPhoto = { requestPhoto() },
-                onClose = { model.clearSelectedFieldAsset() },
-                onCreateAnother = {
-                    if (dynamicItemTypeCode(selectedCapture.asset) == "subinstalacion" && selectedCapture.asset.parent != null) {
-                        chooseParent(
-                            FieldInventoryItem(
-                                id = selectedCapture.asset.parent.id,
-                                code = selectedCapture.asset.parent.code,
-                                name = selectedCapture.asset.parent.name,
-                                type = null,
-                            ),
-                        )
-                    } else {
-                        startSubinstallation()
-                    }
-                },
-            )
-        }
-
-        if (mergeSource != null && !mergeSource.capture.readyForFinding) {
-            Card(
-                Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 4.dp),
-                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer),
-            ) {
-                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Text("¿Ya existía?", fontWeight = FontWeight.Bold)
-                    Text("Antes de seguir, podés fusionar el alta con un registro existente compatible.", style = MaterialTheme.typography.bodySmall)
-                    OutlinedTextField(
-                        value = mergeSearch,
-                        onValueChange = { mergeSearch = it },
-                        label = { Text("Buscar posible duplicado") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-                    OutlinedButton(
-                        onClick = {
-                            mergeCandidateId = null
-                            model.searchInventory(mergeSearch, mergeSource.asset.parent?.id)
-                        },
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Buscar coincidencias") }
-                    mergeCandidates.take(6).forEach { candidate ->
-                        AssistChip(
-                            onClick = { mergeCandidateId = candidate.id },
-                            label = {
-                                Text(if (mergeCandidateId == candidate.id) "✓ ${candidate.code} · ${candidate.name}" else "${candidate.code} · ${candidate.name}")
-                            },
-                        )
-                    }
-                    if (mergeCandidateId != null) {
-                        OutlinedTextField(
-                            value = mergeReason,
-                            onValueChange = { mergeReason = it },
-                            label = { Text("Motivo de la fusión") },
-                            modifier = Modifier.fillMaxWidth(),
-                            minLines = 2,
-                        )
-                        Button(
-                            onClick = { model.mergeCreatedFieldAsset(mergeCandidateId!!, mergeReason) },
-                            enabled = mergeReason.trim().length >= 8 && !model.busy,
-                            modifier = Modifier.fillMaxWidth(),
-                        ) { Text("Fusionar con el existente") }
-                    }
-                }
-            }
-        }
-
-        when (mode) {
-            DynamicInventoryMode.BROWSE -> {
-                Column(
-                    Modifier.fillMaxWidth().padding(horizontal = 16.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    Card(
-                        Modifier.fillMaxWidth(),
-                        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
-                    ) {
-                        Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                            Text("Alta rápida en campo", fontWeight = FontWeight.Bold)
-                            Text("La Subinstalación se carga guiada, sin navegar por formularios largos.", style = MaterialTheme.typography.bodySmall)
-                            Button(onClick = { startSubinstallation() }, modifier = Modifier.fillMaxWidth(), enabled = visit.status == "IN_PROGRESS") {
-                                Text("+ Nueva Subinstalación")
-                            }
-                            OutlinedButton(onClick = { startInstallation() }, modifier = Modifier.fillMaxWidth(), enabled = visit.status == "IN_PROGRESS") {
-                                Text("+ Nueva Instalación")
-                            }
-                        }
-                    }
-                    OutlinedTextField(
-                        value = search,
-                        onValueChange = { search = it },
-                        label = { Text("Buscar instalación, subinstalación o código") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-                    Button(
-                        onClick = { model.searchInventory(search) },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Buscar") }
-                }
-
-                Text("Inventario disponible", Modifier.padding(horizontal = 16.dp, vertical = 8.dp), fontWeight = FontWeight.Bold)
-                LazyColumn(
-                    Modifier.fillMaxSize().padding(horizontal = 16.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    items(
-                        model.inventory.filter { dynamicItemTypeCode(it) in setOf("instalacion", "subinstalacion") },
-                        key = { it.id },
-                    ) { item ->
-                        DynamicInventoryCard(
-                            item = item,
-                            onInspect = { model.selectExisting(item) },
-                            onAddChild = { chooseParent(item) },
-                        )
-                    }
-                    item { Spacer(Modifier.height(30.dp)) }
-                }
-            }
-
-            DynamicInventoryMode.PICK_PARENT -> {
-                Column(
-                    Modifier.fillMaxWidth().padding(horizontal = 16.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    DynamicStepHeader(1, "Elegí la Instalación padre")
-                    Text("Solo se muestran Instalaciones del Yacimiento de esta inspección.", style = MaterialTheme.typography.bodySmall)
-                    OutlinedTextField(
-                        value = parentSearch,
-                        onValueChange = { parentSearch = it },
-                        label = { Text("Buscar Instalación por nombre o código") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-                    Button(
-                        onClick = { model.searchInventory(parentSearch, visit.scopeAsset?.id) },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Buscar Instalación") }
-                }
-                LazyColumn(
-                    Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 8.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    items(
-                        model.inventory.filter { dynamicItemTypeCode(it) == "instalacion" },
-                        key = { it.id },
-                    ) { item ->
-                        Card(onClick = { chooseParent(item) }, modifier = Modifier.fillMaxWidth()) {
-                            Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
-                                Text(item.name, fontWeight = FontWeight.Bold)
-                                Text(item.code, style = MaterialTheme.typography.bodySmall)
-                                Text("Tocar para agregar una Subinstalación", color = MaterialTheme.colorScheme.primary, style = MaterialTheme.typography.bodySmall)
-                            }
-                        }
-                    }
-                    item { Spacer(Modifier.height(24.dp)) }
-                }
-            }
-
-            DynamicInventoryMode.CREATE_INSTALLATION,
-            DynamicInventoryMode.CREATE_SUBINSTALLATION -> {
-                val isSubinstallation = mode == DynamicInventoryMode.CREATE_SUBINSTALLATION
-                Column(
-                    Modifier
-                        .fillMaxSize()
-                        .padding(horizontal = 16.dp)
-                        .verticalScroll(rememberScrollState()),
-                    verticalArrangement = Arrangement.spacedBy(10.dp),
-                ) {
-                    DynamicStepHeader(if (isSubinstallation) 2 else 1, if (isSubinstallation) "Identificá la Subinstalación" else "Identificá la Instalación")
-                    Text("Ubicación: $parentLabel", style = MaterialTheme.typography.bodySmall, fontWeight = FontWeight.SemiBold)
-                    if (isSubinstallation) {
-                        OutlinedButton(onClick = { startSubinstallation() }, modifier = Modifier.fillMaxWidth()) {
-                            Text("Cambiar Instalación padre")
-                        }
-                    }
-
-                    if (model.fieldTypes.isEmpty()) {
-                        Text("No hay un tipo habilitado para esta ubicación.", color = MaterialTheme.colorScheme.error)
-                    }
-
-                    if (model.fieldTypes.size > 1) {
-                        Text("Nivel de Inventario", fontWeight = FontWeight.Bold)
-                        model.fieldTypes.forEach { type ->
-                            AssistChip(
-                                onClick = {
-                                    selectedTypeId = type.id
-                                    selectedFamilyId = null
-                                    attributeValues.clear()
-                                },
-                                label = { Text(if (selectedTypeId == type.id) "✓ ${type.name}" else type.name) },
-                            )
-                        }
-                    }
-
-                    if (selectedType?.familyRequired == true) {
-                        Text("Clasificación técnica *", fontWeight = FontWeight.Bold)
-                        OutlinedTextField(
-                            value = familySearch,
-                            onValueChange = { familySearch = it },
-                            label = { Text("Buscar clasificación") },
-                            supportingText = { Text("${filteredFamilies.size} opciones compatibles") },
-                            modifier = Modifier.fillMaxWidth(),
-                            singleLine = true,
-                        )
-                        filteredFamilies.take(12).forEach { family ->
-                            AssistChip(
-                                onClick = { selectedFamilyId = family.id },
-                                label = {
-                                    val prefix = when {
-                                        selectedFamilyId == family.id -> "✓ "
-                                        family.isOther -> "+ "
-                                        else -> ""
-                                    }
-                                    Text(prefix + family.name)
-                                },
-                            )
-                        }
-                        if (filteredFamilies.size > 12) {
-                            Text("Escribí parte del nombre para reducir la lista.", style = MaterialTheme.typography.bodySmall)
-                        }
-                        selectedFamily?.let { family ->
-                            if (family.isOther) {
-                                Text("Quedará marcado como no catalogado para revisión en oficina.", color = MaterialTheme.colorScheme.secondary)
-                            }
-                            if (family.informationLabels.isNotEmpty()) {
-                                Text("Datos esperados: ${family.informationLabels.joinToString(" · ")}", style = MaterialTheme.typography.bodySmall)
-                            }
-                        }
-                    }
-
-                    OutlinedTextField(
-                        value = name,
-                        onValueChange = { name = it },
-                        label = { Text("Nombre o código visible *") },
-                        supportingText = { Text("Usá lo que ve el inspector en la placa o en campo.") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-                    OutlinedTextField(
-                        value = commonName,
-                        onValueChange = { commonName = it },
-                        label = { Text("Nombre habitual") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-
-                    selectedType?.attributes?.forEach { definition ->
-                        OutlinedTextField(
-                            value = attributeValues[definition.code].orEmpty(),
-                            onValueChange = { attributeValues[definition.code] = it },
-                            label = { Text(definition.name + if (definition.isRequired) " *" else "") },
-                            supportingText = {
-                                val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
-                                if (details.isNotBlank()) Text(details)
-                            },
-                            keyboardOptions = KeyboardOptions(
-                                keyboardType = if (definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")) KeyboardType.Decimal else KeyboardType.Text,
-                            ),
-                            modifier = Modifier.fillMaxWidth(),
-                        )
-                    }
-
-                    HorizontalDivider()
-                    DynamicStepHeader(if (isSubinstallation) 3 else 2, "GPS + foto en un solo paso")
-                    Text(
-                        "Al guardar se captura la ubicación actual y la cámara se abre automáticamente. La foto sigue siendo obligatoria antes de crear Hallazgos.",
-                        style = MaterialTheme.typography.bodySmall,
-                    )
-
-                    val attributesReady = selectedType?.attributes
-                        ?.filter { it.isRequired }
-                        ?.all { attributeValues[it.code].orEmpty().isNotBlank() }
-                        ?: false
-                    val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
-                    Button(
-                        onClick = { requestCreate() },
-                        enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text(if (model.busy) "Guardando…" else "Guardar y tomar foto") }
-                    Spacer(Modifier.height(30.dp))
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicStepHeader(step: Int, title: String) {
-    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-        Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer)) {
-            Text(step.toString(), Modifier.padding(horizontal = 10.dp, vertical = 6.dp), fontWeight = FontWeight.Bold)
-        }
-        Spacer(Modifier.width(8.dp))
-        Text(title, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-    }
-}
-
-@Composable
-private fun DynamicCaptureCard(
-    item: FieldInventoryItem,
-    gps: Boolean,
-    photos: Int,
-    ready: Boolean,
-    onPhoto: () -> Unit,
-    onClose: () -> Unit,
-    onCreateAnother: () -> Unit,
-) {
-    Card(
-        Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp),
-        colors = CardDefaults.cardColors(
-            containerColor = if (ready) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant,
-        ),
-    ) {
-        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(7.dp)) {
-            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-                Column(Modifier.weight(1f)) {
-                    Text(item.name, fontWeight = FontWeight.Bold)
-                    Text(item.code, style = MaterialTheme.typography.bodySmall)
-                }
-                OutlinedButton(onClick = onClose) { Text("Cerrar") }
-            }
-            Text("GPS: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
-            if (!ready) {
-                Text("Falta la fotografía obligatoria.", color = MaterialTheme.colorScheme.error)
-                Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto ahora") }
-            } else {
-                Text("Alta completa · lista para Hallazgos", color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.Bold)
-                OutlinedButton(onClick = onCreateAnother, modifier = Modifier.fillMaxWidth()) {
-                    Text("+ Crear otra Subinstalación")
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicInventoryCard(
-    item: FieldInventoryItem,
-    onInspect: () -> Unit,
-    onAddChild: () -> Unit,
-) {
-    val typeCode = dynamicItemTypeCode(item)
-    Card(Modifier.fillMaxWidth()) {
-        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-                Text(item.name, fontWeight = FontWeight.SemiBold)
-                Text(if (typeCode == "subinstalacion") "Subinstalación" else "Instalación", style = MaterialTheme.typography.bodySmall)
-            }
-            Text(item.code, style = MaterialTheme.typography.bodySmall)
-            item.commonName?.takeIf { it.isNotBlank() }?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
-            Text(
-                if (item.readyForFinding) "Disponible" else "GPS/foto pendiente",
-                color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
-                style = MaterialTheme.typography.bodySmall,
-            )
-            Button(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
-                Text(if (item.selectedInInspection) "Abrir para Hallazgo" else "Usar para Hallazgo")
-            }
-            if (typeCode == "instalacion") {
-                OutlinedButton(onClick = onAddChild, modifier = Modifier.fillMaxWidth()) {
-                    Text("+ Agregar Subinstalación")
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicMessageStrip(model: MainViewModel) {
-    val error = model.error
-    val notice = model.notice
-    if (error != null || notice != null) {
-        Card(
-            modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp),
-            colors = CardDefaults.cardColors(
-                containerColor = if (error != null) MaterialTheme.colorScheme.errorContainer else MaterialTheme.colorScheme.secondaryContainer,
-            ),
-            onClick = { model.clearMessages() },
-        ) {
-            Text(error ?: notice.orEmpty(), Modifier.padding(12.dp))
-        }
-    }
-}
-
-private fun dynamicItemTypeCode(item: FieldInventoryItem): String {
-    val type = item.type ?: return ""
-    return dynamicNormalize(type.typeName ?: type.name)
-}
-
-private fun dynamicNormalize(value: String): String = value.trim().lowercase()
-    .replace('ó', 'o')
-    .replace('í', 'i')
-    .replace('á', 'a')
-    .replace('é', 'e')
-    .replace('ú', 'u')
-    .replace("_", "")
-    .replace("-", "")
-    .replace(" ", "")
-
-private fun dynamicStatusLabel(status: String): String = when (status) {
-    "PLANNED" -> "Planificada"
-    "IN_PROGRESS" -> "En curso"
-    "CLOSED" -> "Cerrada"
-    "CANCELLED" -> "Cancelada"
-    else -> status
-}
-
-private fun buildDynamicAttributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
-    type.attributes.mapNotNull { definition ->
-        val raw = values[definition.code]?.trim().orEmpty()
-        if (raw.isBlank()) return@mapNotNull null
-        definition.code to coerceDynamicAttribute(definition, raw)
-    }.toMap()
-
-private fun coerceDynamicAttribute(definition: FieldAttributeDefinition, raw: String): Any = when (definition.dataType.uppercase()) {
-    "INTEGER", "INT" -> raw.toLongOrNull() ?: raw
-    "NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
-    "BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
-    else -> raw
-}
-
-private fun dynamicHasPermission(context: Context, permission: String): Boolean =
-    ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
-
-private fun dynamicHasLocation(context: Context): Boolean =
-    dynamicHasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ||
-        dynamicHasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
-
-private suspend fun currentDynamicGeo(context: Context): DynamicGeoSnapshot = suspendCancellableCoroutine { continuation ->
-    if (!dynamicHasLocation(context)) {
-        continuation.resumeWithException(SecurityException("Se necesita permiso de ubicación."))
-        return@suspendCancellableCoroutine
-    }
-    val source = CancellationTokenSource()
-    val client = LocationServices.getFusedLocationProviderClient(context)
-    try {
-        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) {
-                    continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-                } else {
-                    continuation.resume(DynamicGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
-                }
-            }
-            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-    } catch (error: SecurityException) {
-        if (continuation.isActive) continuation.resumeWithException(error)
-    }
-    continuation.invokeOnCancellation { source.cancel() }
-}
-
-private fun newDynamicPhoto(context: Context): Pair<File, Uri> {
-    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
-        ?: throw IllegalStateException("No se pudo acceder al almacenamiento de fotografías.")
-    directory.mkdirs()
-    val file = File.createTempFile("DH_FAST_${System.currentTimeMillis()}_", ".jpg", directory)
-    val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
-    return file to uri
-}
-
-private fun writeDynamicExif(file: File, geo: DynamicGeoSnapshot) {
-    val now = Instant.now()
-    val exif = ExifInterface(file)
-    exif.setLatLong(geo.latitude, geo.longitude)
-    val formatter = DateTimeFormatter.ofPattern("yyyy:MM:dd HH:mm:ss").withZone(ZoneId.systemDefault())
-    exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, formatter.format(now))
-    exif.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, formatter.format(now))
-    exif.saveAttributes()
-}
-
-private fun dynamicShortDate(value: String): String = value.replace('T', ' ').take(16)

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/F3VisitRoot.kt

@@ -86,10 +86,7 @@ fun F3VisitRoot(model: MainViewModel) {
                 inventoryMode = true
             },
         )
-        inventoryMode -> F3FieldInventoryScreen(model, onBack = {
-            inventoryMode = false
-            actsMode = true
-        })
+        inventoryMode -> F3FieldInventoryScreen(model, onBack = { inventoryMode = false })
         else -> F3VisitOverview(
             model = model,
             onInventory = { inventoryMode = true },
@@ -122,9 +119,6 @@ private fun F3VisitOverview(
         }
         Text(visit.code, style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
         Text("${visit.operatorCompany?.name ?: "Sin operadora"} · ${visit.operationalArea?.name ?: "Sin área"}")
-        visit.scopeAsset?.let {
-            Text("Yacimiento: ${it.name}", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
-        }
         visit.plannedStartAt?.let {
             Text("Planificada: ${f3ShortDate(it)}", style = MaterialTheme.typography.bodySmall)
         }
@@ -144,10 +138,10 @@ private fun F3VisitOverview(
                 colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
             ) {
                 Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Text("Todo listo para comenzar", fontWeight = FontWeight.Bold)
-                    Text("Al iniciar, pasás directamente a las Actas de esta inspección.")
+                    Text("La inspección todavía no comenzó", fontWeight = FontWeight.Bold)
+                    Text("Iniciarla registra fecha/hora real y tu usuario como actor de campo.")
                     Button(
-                        onClick = { model.startVisit(); onActs() },
+                        onClick = { model.startVisit() },
                         enabled = !model.busy,
                         modifier = Modifier.fillMaxWidth(),
                     ) { Text(if (model.busy) "Iniciando…" else "Iniciar inspección") }
@@ -156,12 +150,12 @@ private fun F3VisitOverview(
         }
 
         if (visit.status == "IN_PROGRESS") {
-            Button(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
-                val open = model.acts.count { it.status == "DRAFT" || it.status == "READY" }
-                Text("Abrir Actas · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
+            Button(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
+                Text("Abrir Inventario de campo")
             }
-            OutlinedButton(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
-                Text("Inventario / Hallazgos")
+            OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
+                val open = model.acts.count { it.status == "DRAFT" || it.status == "READY" }
+                Text("Actas de la inspección · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
             }
         } else if (visit.status == "CLOSED") {
             OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
@@ -169,7 +163,7 @@ private fun F3VisitOverview(
             }
         } else if (visit.status == "PLANNED") {
             Text(
-                "Primero iniciá la inspección para habilitar Actas, Hallazgos y altas de campo.",
+                "Primero iniciá la inspección para habilitar altas, fotografías, Actas y Hallazgos.",
                 style = MaterialTheme.typography.bodySmall,
             )
         }
@@ -215,9 +209,7 @@ private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
     var search by rememberSaveable(visit.id) { mutableStateOf("") }
     var showCreate by rememberSaveable(visit.id) { mutableStateOf(false) }
     var parentId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var parentLabel by rememberSaveable(visit.id) {
-        mutableStateOf(visit.scopeAsset?.name ?: "Yacimiento de la inspección")
-    }
+    var parentLabel by rememberSaveable(visit.id) { mutableStateOf("Área de la inspección") }
     var name by rememberSaveable(visit.id) { mutableStateOf("") }
     var commonName by rememberSaveable(visit.id) { mutableStateOf("") }
     var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
@@ -331,10 +323,10 @@ private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
             horizontalArrangement = Arrangement.SpaceBetween,
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            OutlinedButton(onClick = onBack) { Text("Acta") }
+            OutlinedButton(onClick = onBack) { Text("Volver") }
             Column(horizontalAlignment = Alignment.End) {
-                Text("Nuevo Hallazgo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
-                Text("Elegí una Instalación o Subinstalación", style = MaterialTheme.typography.bodySmall)
+                Text("Inventario de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+                Text("Área → Yacimiento → Instalación → Subinstalación", style = MaterialTheme.typography.bodySmall)
             }
         }
         Column(Modifier.padding(horizontal = 16.dp)) { F3MessageStrip(model) }
@@ -418,182 +410,170 @@ private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
             }
         }
 
-        Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 4.dp)) {
-            Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                Text("¿Dónde encontraste el Hallazgo?", fontWeight = FontWeight.Bold)
-                OutlinedTextField(
-                    value = search,
-                    onValueChange = { search = it },
-                    label = { Text("Buscar instalación o subinstalación") },
-                    modifier = Modifier.fillMaxWidth(),
-                    singleLine = true,
-                )
-                Row(
-                    Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    Button(
-                        onClick = { model.searchInventory(search) },
-                        enabled = !model.busy,
-                        modifier = Modifier.weight(1f),
-                    ) { Text("Buscar") }
-                    OutlinedButton(
-                        onClick = {
-                            showCreate = !showCreate
-                            if (showCreate) model.loadFieldTypes(parentId)
-                        },
-                        modifier = Modifier.weight(1f),
-                    ) { Text(if (showCreate) "Cancelar" else "+ Agregar") }
-                }
+        Row(
+            Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                value = search,
+                onValueChange = { search = it },
+                label = { Text("Buscar por nombre o código") },
+                modifier = Modifier.weight(1f),
+                singleLine = true,
+            )
+            Spacer(Modifier.width(8.dp))
+            Button(onClick = { model.searchInventory(search) }, enabled = !model.busy) { Text("Buscar") }
+        }
+
+        Row(
+            Modifier.fillMaxWidth().padding(16.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Column {
+                Text("Alta en campo", fontWeight = FontWeight.Bold)
+                Text("Padre: $parentLabel", style = MaterialTheme.typography.bodySmall)
             }
+            OutlinedButton(onClick = {
+                showCreate = !showCreate
+                if (showCreate) model.loadFieldTypes(parentId)
+            }) { Text(if (showCreate) "Ocultar" else "Agregar") }
         }
 
         if (showCreate) {
-            Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp)) {
-                Column(
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(12.dp)
-                        .verticalScroll(rememberScrollState())
-                        .weight(1f, fill = false),
-                    verticalArrangement = Arrangement.spacedBy(10.dp),
-                ) {
-                    Text("Nueva alta de campo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    Text("Ubicación: $parentLabel", style = MaterialTheme.typography.bodySmall)
-                    if (parentId != null) {
-                        OutlinedButton(onClick = {
-                            parentId = null
-                            parentLabel = visit.scopeAsset?.name ?: "Yacimiento de la inspección"
-                            resetCreateForm()
-                            selectedTypeId = null
-                            model.loadFieldTypes(null)
-                        }) { Text("Volver al Yacimiento") }
-                    }
-
-                    if (model.fieldTypes.isEmpty()) {
-                        Text("No hay un tipo disponible para esta ubicación.")
-                    } else {
-                        Text("Tipo de registro", style = MaterialTheme.typography.bodySmall)
-                        LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            items(model.fieldTypes, key = { it.id }) { type ->
-                                AssistChip(
-                                    onClick = {
-                                        selectedTypeId = type.id
-                                        selectedFamilyId = null
-                                        attributeValues.clear()
-                                    },
-                                    label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
-                                )
-                            }
-                        }
-                    }
-
-                    if (selectedType?.familyRequired == true) {
-                        Text("Clasificación", fontWeight = FontWeight.Bold)
-                        Text(
-                            "Elegí el tipo técnico. Si no está catalogado, usá Otro / no catalogado.",
-                            style = MaterialTheme.typography.bodySmall,
-                        )
-                        LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            items(selectedType.families, key = { it.id }) { family ->
-                                AssistChip(
-                                    onClick = { selectedFamilyId = family.id },
-                                    label = {
-                                        val prefix = when {
-                                            selectedFamilyId == family.id -> "✓ "
-                                            family.isOther -> "+ "
-                                            else -> ""
-                                        }
-                                        Text(prefix + family.name)
-                                    },
-                                )
-                            }
-                        }
-                        selectedFamily?.let { family ->
-                            if (family.isOther) {
-                                Text(
-                                    "Se registrará como no catalogado para revisión posterior en oficina.",
-                                    color = MaterialTheme.colorScheme.secondary,
-                                    style = MaterialTheme.typography.bodySmall,
-                                )
-                            }
-                            if (family.informationLabels.isNotEmpty()) {
-                                Text(
-                                    "Información esperada: ${family.informationLabels.joinToString(" · ")}",
-                                    style = MaterialTheme.typography.bodySmall,
-                                )
-                            }
-                        }
-                    }
-
-                    OutlinedTextField(
-                        value = name,
-                        onValueChange = { name = it },
-                        label = { Text("Nombre o código identificable *") },
-                        modifier = Modifier.fillMaxWidth(),
-                    )
-                    OutlinedTextField(
-                        value = commonName,
-                        onValueChange = { commonName = it },
-                        label = { Text("Nombre habitual") },
-                        modifier = Modifier.fillMaxWidth(),
-                    )
-
-                    selectedType?.attributes?.forEach { definition ->
-                        OutlinedTextField(
-                            value = attributeValues[definition.code].orEmpty(),
-                            onValueChange = { attributeValues[definition.code] = it },
-                            label = { Text(definition.name + if (definition.isRequired) " *" else "") },
-                            supportingText = {
-                                val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
-                                if (details.isNotBlank()) Text(details)
-                            },
-                            keyboardOptions = KeyboardOptions(
-                                keyboardType = if (
-                                    definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")
-                                ) KeyboardType.Decimal else KeyboardType.Text,
-                            ),
-                            modifier = Modifier.fillMaxWidth(),
-                        )
-                    }
-
-                    val attributesReady = selectedType?.attributes
-                        ?.filter { it.isRequired }
-                        ?.all { attributeValues[it.code].orEmpty().isNotBlank() }
-                        ?: false
-                    val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
-                    Button(
-                        onClick = {
-                            if (f3HasLocation(context)) createWithLocation()
-                            else locationPermissionLauncher.launch(
-                                arrayOf(
-                                    Manifest.permission.ACCESS_FINE_LOCATION,
-                                    Manifest.permission.ACCESS_COARSE_LOCATION,
-                                ),
-                            )
-                        },
-                        enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Guardar alta y capturar GPS") }
+            Column(
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
+                    .verticalScroll(rememberScrollState())
+                    .weight(1f, fill = false),
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                if (parentId != null) {
+                    OutlinedButton(onClick = {
+                        parentId = null
+                        parentLabel = "Área de la inspección"
+                        resetCreateForm()
+                        selectedTypeId = null
+                        model.loadFieldTypes(null)
+                    }) { Text("Volver al Área") }
                 }
+
+                if (model.fieldTypes.isEmpty()) {
+                    Text("Este nivel no admite más hijos estructurales.")
+                } else {
+                    Text("Vas a crear", style = MaterialTheme.typography.bodySmall)
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        items(model.fieldTypes, key = { it.id }) { type ->
+                            AssistChip(
+                                onClick = {
+                                    selectedTypeId = type.id
+                                    selectedFamilyId = null
+                                    attributeValues.clear()
+                                },
+                                label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
+                            )
+                        }
+                    }
+                }
+
+                if (selectedType?.familyRequired == true) {
+                    Text("Familia técnica", fontWeight = FontWeight.Bold)
+                    Text(
+                        "Elegí la que corresponda al Excel. Si no existe, usá Otro / no catalogado; nunca quedás bloqueado.",
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        items(selectedType.families, key = { it.id }) { family ->
+                            AssistChip(
+                                onClick = { selectedFamilyId = family.id },
+                                label = {
+                                    val prefix = when {
+                                        selectedFamilyId == family.id -> "✓ "
+                                        family.isOther -> "+ "
+                                        else -> ""
+                                    }
+                                    Text(prefix + family.name)
+                                },
+                            )
+                        }
+                    }
+                    selectedFamily?.let { family ->
+                        if (family.isOther) {
+                            Text(
+                                "Se registrará como familia no catalogada para revisión posterior en oficina.",
+                                color = MaterialTheme.colorScheme.secondary,
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                        if (family.informationLabels.isNotEmpty()) {
+                            Text(
+                                "Información esperada: ${family.informationLabels.joinToString(" · ")}",
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                    }
+                }
+
+                OutlinedTextField(
+                    value = name,
+                    onValueChange = { name = it },
+                    label = { Text("Nombre identificable *") },
+                    modifier = Modifier.fillMaxWidth(),
+                )
+                OutlinedTextField(
+                    value = commonName,
+                    onValueChange = { commonName = it },
+                    label = { Text("Nombre habitual") },
+                    modifier = Modifier.fillMaxWidth(),
+                )
+
+                selectedType?.attributes?.forEach { definition ->
+                    OutlinedTextField(
+                        value = attributeValues[definition.code].orEmpty(),
+                        onValueChange = { attributeValues[definition.code] = it },
+                        label = { Text(definition.name + if (definition.isRequired) " *" else "") },
+                        supportingText = {
+                            val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
+                            if (details.isNotBlank()) Text(details)
+                        },
+                        keyboardOptions = KeyboardOptions(
+                            keyboardType = if (
+                                definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")
+                            ) KeyboardType.Decimal else KeyboardType.Text,
+                        ),
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                }
+
+                val attributesReady = selectedType?.attributes
+                    ?.filter { it.isRequired }
+                    ?.all { attributeValues[it.code].orEmpty().isNotBlank() }
+                    ?: false
+                val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
+                Button(
+                    onClick = {
+                        if (f3HasLocation(context)) createWithLocation()
+                        else locationPermissionLauncher.launch(
+                            arrayOf(
+                                Manifest.permission.ACCESS_FINE_LOCATION,
+                                Manifest.permission.ACCESS_COARSE_LOCATION,
+                            ),
+                        )
+                    },
+                    enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
+                    modifier = Modifier.fillMaxWidth(),
+                ) { Text("Capturar GPS y crear") }
+                HorizontalDivider()
             }
         }
 
-        Text(
-            "Instalaciones y subinstalaciones",
-            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            fontWeight = FontWeight.Bold,
-        )
+        Text("Estructura disponible", modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), fontWeight = FontWeight.Bold)
         LazyColumn(
             Modifier.fillMaxSize().padding(horizontal = 16.dp),
             verticalArrangement = Arrangement.spacedBy(8.dp),
         ) {
-            items(
-                model.inventory.filter { candidate ->
-                    candidate.type?.let(::f3TypeCode) in setOf("instalacion", "subinstalacion")
-                },
-                key = { it.id },
-            ) { item ->
+            items(model.inventory, key = { it.id }) { item ->
                 F3InventoryCard(
                     item = item,
                     onInspect = { model.selectExisting(item) },
@@ -631,10 +611,10 @@ private fun F3CaptureCard(
             if (captureRequired) {
                 Text("GPS de alta: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
                 if (!ready) {
-                    Text("Antes de registrar el Hallazgo, completá GPS + foto.", color = MaterialTheme.colorScheme.error)
+                    Text("Antes de registrar Hallazgos, completá GPS + foto.", color = MaterialTheme.colorScheme.error)
                     Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto obligatoria") }
                 } else {
-                    Text("Captura completa · listo para el Hallazgo", color = MaterialTheme.colorScheme.primary)
+                    Text("Captura completa · listo para Hallazgos", color = MaterialTheme.colorScheme.primary)
                 }
             } else {
                 Text("Registro existente seleccionado.", style = MaterialTheme.typography.bodySmall)
@@ -651,8 +631,8 @@ private fun F3InventoryCard(
 ) {
     val typeCode = item.type?.let(::f3TypeCode).orEmpty()
     val canHaveFinding = typeCode in setOf("instalacion", "subinstalacion")
-    val canHaveChild = typeCode == "instalacion"
-    val childLabel = "+ Agregar subinstalación"
+    val canHaveChild = typeCode in setOf("yacimiento", "instalacion")
+    val childLabel = if (typeCode == "yacimiento") "Agregar instalación aquí" else "Agregar subinstalación aquí"
 
     Card(Modifier.fillMaxWidth()) {
         Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
@@ -666,12 +646,12 @@ private fun F3InventoryCard(
             }
             if (canHaveFinding) {
                 Text(
-                    if (item.readyForFinding) "Disponible" else "GPS/foto pendiente",
+                    if (item.readyForFinding) "Disponible para Hallazgos" else "GPS/foto pendiente",
                     color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
                     style = MaterialTheme.typography.bodySmall,
                 )
-                Button(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
-                    Text(if (item.selectedInInspection) "Seleccionar para Hallazgo" else "Usar para Hallazgo")
+                OutlinedButton(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
+                    Text(if (item.selectedInInspection) "Abrir Hallazgos" else "Usar en esta inspección")
                 }
             }
             if (canHaveChild) {
@@ -747,20 +727,16 @@ private suspend fun currentF3Geo(context: Context): F3GeoSnapshot = suspendCance
     }
     val source = CancellationTokenSource()
     val client = LocationServices.getFusedLocationProviderClient(context)
-    try {
-        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) {
-                    continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-                } else {
-                    continuation.resume(F3GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
-                }
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) {
+                continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            } else {
+                continuation.resume(F3GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
             }
-            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-    } catch (error: SecurityException) {
-        if (continuation.isActive) continuation.resumeWithException(error)
-    }
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
     continuation.invokeOnCancellation { source.cancel() }
 }
 

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt

@@ -185,7 +185,7 @@ fun FieldFindingScreen(model: MainViewModel) {
                 Text(asset.name, fontWeight = FontWeight.Bold)
                 Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall)
                 Text(
-                    "GPS + foto del Inventario: ${if (options.capture.readyForFinding) "completo" else "pendiente"}",
+                    "GPS + foto del Inventario: ${if (options.capture.readyForFinding) "OK" else "pendiente"}",
                     color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
                     style = MaterialTheme.typography.bodySmall,
                 )
@@ -210,7 +210,7 @@ fun FieldFindingScreen(model: MainViewModel) {
                 Card(Modifier.fillMaxWidth()) {
                     Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
                         Text("${finding.code} · ${finding.title}", fontWeight = FontWeight.SemiBold)
-                        Text("Gravedad: ${finding.severity ?: "s/d"} · ${findingStatusLabelEs(finding.status)}", style = MaterialTheme.typography.bodySmall)
+                        Text("Gravedad: ${finding.severity ?: "s/d"} · ${finding.status}", style = MaterialTheme.typography.bodySmall)
                         Text(
                             "Evidencias: ${evidence.size} · Fotos: ${evidence.count { it.kind == "PHOTO" }}",
                             style = MaterialTheme.typography.bodySmall,
@@ -389,17 +389,13 @@ private suspend fun currentFindingGeo(context: Context): FindingGeoSnapshot = su
     }
     val source = CancellationTokenSource()
     val client = LocationServices.getFusedLocationProviderClient(context)
-    try {
-        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-                else continuation.resume(FindingGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
-            }
-            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-    } catch (error: SecurityException) {
-        if (continuation.isActive) continuation.resumeWithException(error)
-    }
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            else continuation.resume(FindingGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
     continuation.invokeOnCancellation { source.cancel() }
 }
 

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt

@@ -3,13 +3,11 @@ package com.korexlabs.dhinspeccion.ui
 import android.content.Context
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Visibility
@@ -31,9 +29,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
@@ -41,7 +37,6 @@ import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.korexlabs.dhinspeccion.MainViewModel
-import com.korexlabs.dhinspeccion.R
 
 private const val BIOMETRIC_PREFS = "dh_v2_biometric"
 private const val BIOMETRIC_ENABLED = "enabled"
@@ -79,7 +74,7 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
         if (model.session == null) unlocked = false
     }
 
-    DhTheme {
+    MaterialTheme {
         Surface(Modifier.fillMaxSize()) {
             when {
                 model.session == null -> EnhancedLoginScreen(model) {
@@ -96,8 +91,8 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
                     },
                 )
                 model.fieldFindingOptions != null -> FieldFindingScreen(model)
-                model.visit != null -> ModernVisitRoot(model)
-                else -> MobileHomeScreen(model)
+                model.visit != null -> F3VisitRoot(model)
+                else -> DhApp(model)
             }
         }
     }
@@ -110,13 +105,7 @@ private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Uni
     var passwordVisible by rememberSaveable { mutableStateOf(false) }
 
     Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
-        Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp), horizontalAlignment = Alignment.CenterHorizontally) {
-            Image(
-                painter = painterResource(R.drawable.ic_mendoza_launcher_exact),
-                contentDescription = "Gobierno de Mendoza",
-                modifier = Modifier.fillMaxWidth().height(170.dp),
-                contentScale = ContentScale.Fit,
-            )
+        Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp)) {
             Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
             Text("Aplicación de campo · Dirección de Hidrocarburos")
             model.error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
@@ -124,7 +113,7 @@ private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Uni
             OutlinedTextField(
                 value = identifier,
                 onValueChange = { identifier = it },
-                label = { Text("Usuario o correo electrónico") },
+                label = { Text("Usuario o email") },
                 modifier = Modifier.fillMaxWidth(),
                 singleLine = true,
             )
@@ -209,12 +198,6 @@ private fun BiometricUnlockScreen(
             verticalArrangement = Arrangement.spacedBy(14.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            Image(
-                painter = painterResource(R.drawable.ic_mendoza_launcher_exact),
-                contentDescription = "Gobierno de Mendoza",
-                modifier = Modifier.fillMaxWidth().height(140.dp),
-                contentScale = ContentScale.Fit,
-            )
             Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
             Text("Ingresá con tu huella")
             error?.let { Text(it, color = MaterialTheme.colorScheme.error) }

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/MobileActsScreen.kt

@@ -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")
     }
@@ -126,25 +125,23 @@ fun MobileActsScreen(
             Text("Actas", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
         }
         Text("${visit.code} · ${visit.operatorCompany?.name.orEmpty()}")
-        visit.scopeAsset?.let { Text("Yacimiento: ${it.name}", style = MaterialTheme.typography.bodySmall) }
         F32ActMessage(model)
 
         Card(Modifier.fillMaxWidth()) {
             Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
                 Text("Actas de esta inspección", fontWeight = FontWeight.Bold)
                 if (model.acts.isEmpty()) {
-                    Text("Todavía no hay Actas. Creá la primera y después agregá los Hallazgos.")
+                    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"}",
                         )
                     }
                 }
@@ -157,42 +154,28 @@ fun MobileActsScreen(
                 Modifier.fillMaxWidth(),
                 colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
             ) {
-                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                    Text("Nueva Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    if (model.acts.any { it.status == "LOCKED" }) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text("Nueva Acta", fontWeight = FontWeight.Bold)
+                    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", 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") },
-                        )
+                    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.")
+                        Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
+                            Text("Ir a Inventario y elegir")
+                        }
+                    } else {
+                        Text("Inventario inicial: ${selectedInventory.name} · ${selectedInventory.code}")
+                        Button(
+                            onClick = { model.createActForSelectedInventory() },
+                            enabled = !model.busy,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Crear nueva Acta") }
                     }
-                    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,
-                    )
-                    Text(
-                        "Abrí el Acta primero. Después elegís la Instalación o Subinstalación al agregar cada Hallazgo.",
-                        style = MaterialTheme.typography.bodySmall,
-                    )
-                    Button(
-                        onClick = { model.createAct(newActUrgency) },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Crear nueva Acta") }
                 }
             }
         }
@@ -203,34 +186,15 @@ 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) }
                 }
             }
 
             when (selected.status) {
                 "DRAFT" -> {
-                    Card(
-                        Modifier.fillMaxWidth(),
-                        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
-                    ) {
-                        Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                            Text("Hallazgos", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            Text("Buscá una Instalación o Subinstalación existente. Si no está, podés agregarla en campo en el mismo flujo.")
-                            Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
-                                Text("+ Agregar Hallazgo")
-                            }
-                        }
-                    }
-
-                    HorizontalDivider()
-                    Text("Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text("1. Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
                     Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                         AssistChip(onClick = { attendance = "PRESENT" }, label = { Text(if (attendance == "PRESENT") "✓ Presente" else "Presente") })
                         AssistChip(onClick = { attendance = "ABSENT" }, label = { Text(if (attendance == "ABSENT") "✓ Ausente" else "Ausente") })
@@ -269,24 +233,32 @@ fun MobileActsScreen(
                     }
 
                     HorizontalDivider()
-                    Text("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("2. Hallazgos / verificaciones", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    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. 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)
@@ -302,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)) {
@@ -353,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) }
                         }
                     }
@@ -386,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") }
         }
     }
 }
@@ -420,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
 }
@@ -436,17 +413,13 @@ private suspend fun currentActSignatureGeo(context: Context): ActSignatureGeo =
         return@suspendCancellableCoroutine
     }
     val source = CancellationTokenSource()
-    try {
-        LocationServices.getFusedLocationProviderClient(context)
-            .getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) continuation.resumeWithException(IllegalStateException("Ubicación no disponible"))
-                else continuation.resume(ActSignatureGeo(location.latitude, location.longitude, location.accuracy.toDouble()))
-            }
-            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-    } catch (error: SecurityException) {
-        if (continuation.isActive) continuation.resumeWithException(error)
-    }
+    LocationServices.getFusedLocationProviderClient(context)
+        .getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("Ubicación no disponible"))
+            else continuation.resume(ActSignatureGeo(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
     continuation.invokeOnCancellation { source.cancel() }
 }

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/MobileHomeScreen.kt

@@ -1,231 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.AssistChip
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import com.korexlabs.dhinspeccion.MainViewModel
-import com.korexlabs.dhinspeccion.data.DhRepository
-import com.korexlabs.dhinspeccion.data.MobileInspectionOpenRepository
-import com.korexlabs.dhinspeccion.data.MobilePlanningAsset
-import com.korexlabs.dhinspeccion.data.VisitSummary
-import kotlinx.coroutines.launch
-
-@Composable
-fun MobileHomeScreen(model: MainViewModel) {
-    val session = model.session ?: return
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
-    val openRepository = remember(context) { MobileInspectionOpenRepository(context) }
-
-    var showOpen by rememberSaveable { mutableStateOf(false) }
-    var areas by remember { mutableStateOf<List<MobilePlanningAsset>>(emptyList()) }
-    var operators by remember { mutableStateOf<List<MobilePlanningAsset>>(emptyList()) }
-    var selectedAreaId by rememberSaveable { mutableStateOf<String?>(null) }
-    var selectedCompanyId by rememberSaveable { mutableStateOf<String?>(null) }
-    var loadingContext by remember { mutableStateOf(false) }
-    var opening by remember { mutableStateOf(false) }
-    var localError by remember { mutableStateOf<String?>(null) }
-
-    fun loadAreas() {
-        scope.launch {
-            loadingContext = true
-            localError = null
-            runCatching { openRepository.areas().data }
-                .onSuccess { areas = it }
-                .onFailure { localError = DhRepository.humanError(it) }
-            loadingContext = false
-        }
-    }
-
-    fun chooseArea(areaId: String) {
-        selectedAreaId = areaId
-        selectedCompanyId = null
-        operators = emptyList()
-        scope.launch {
-            loadingContext = true
-            localError = null
-            runCatching { openRepository.operators(areaId).data }
-                .onSuccess { operators = it }
-                .onFailure { localError = DhRepository.humanError(it) }
-            loadingContext = false
-        }
-    }
-
-    LaunchedEffect(showOpen) {
-        if (showOpen && areas.isEmpty()) loadAreas()
-    }
-
-    Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
-        Row(
-            Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 10.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            Column {
-                Text("Mis inspecciones", style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold)
-                Text(session.displayName, style = MaterialTheme.typography.bodySmall)
-            }
-            Row {
-                OutlinedButton(onClick = { model.loadVisits() }, enabled = !model.busy && !opening) {
-                    Text("Actualizar")
-                }
-                Spacer(Modifier.width(8.dp))
-                OutlinedButton(onClick = { model.logout() }, enabled = !opening) { Text("Salir") }
-            }
-        }
-
-        Column(
-            Modifier.fillMaxWidth().padding(horizontal = 16.dp),
-            verticalArrangement = Arrangement.spacedBy(10.dp),
-        ) {
-            model.error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
-            model.notice?.let { Text(it, color = MaterialTheme.colorScheme.primary) }
-            localError?.let { Text(it, color = MaterialTheme.colorScheme.error) }
-
-            Button(
-                onClick = {
-                    showOpen = !showOpen
-                    localError = null
-                },
-                modifier = Modifier.fillMaxWidth(),
-                enabled = !opening,
-            ) {
-                Text(if (showOpen) "Cancelar nueva inspección" else "Abrir inspección")
-            }
-
-            if (showOpen) {
-                Card(Modifier.fillMaxWidth()) {
-                    Column(
-                        Modifier.fillMaxWidth().padding(14.dp),
-                        verticalArrangement = Arrangement.spacedBy(10.dp),
-                    ) {
-                        Text("Abrir inspección en campo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                        Text(
-                            "Elegí el Área y la Operadora vigente. La inspección se crea autoasignada a vos y queda iniciada con la fecha y hora del servidor.",
-                            style = MaterialTheme.typography.bodySmall,
-                        )
-
-                        Text("1. Área", fontWeight = FontWeight.SemiBold)
-                        if (loadingContext && areas.isEmpty()) CircularProgressIndicator()
-                        LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            items(areas, key = { it.id }) { area ->
-                                AssistChip(
-                                    onClick = { chooseArea(area.id) },
-                                    label = { Text(if (area.id == selectedAreaId) "✓ ${area.name}" else area.name) },
-                                )
-                            }
-                        }
-
-                        if (selectedAreaId != null) {
-                            Text("2. Operadora", fontWeight = FontWeight.SemiBold)
-                            if (loadingContext && operators.isEmpty()) {
-                                CircularProgressIndicator()
-                            } else if (operators.isEmpty()) {
-                                Text("No hay una Operadora vigente para el Área seleccionada.", color = MaterialTheme.colorScheme.error)
-                            }
-                            LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                                items(operators, key = { it.id }) { company ->
-                                    AssistChip(
-                                        onClick = { selectedCompanyId = company.id },
-                                        label = { Text(if (company.id == selectedCompanyId) "✓ ${company.name}" else company.name) },
-                                    )
-                                }
-                            }
-                        }
-
-                        Button(
-                            onClick = {
-                                val areaId = selectedAreaId ?: return@Button
-                                val companyId = selectedCompanyId ?: return@Button
-                                scope.launch {
-                                    opening = true
-                                    localError = null
-                                    runCatching { openRepository.open(areaId, companyId) }
-                                        .onSuccess { opened ->
-                                            showOpen = false
-                                            model.openVisit(opened.id)
-                                        }
-                                        .onFailure { localError = DhRepository.humanError(it) }
-                                    opening = false
-                                }
-                            },
-                            modifier = Modifier.fillMaxWidth(),
-                            enabled = selectedAreaId != null && selectedCompanyId != null && !opening && !loadingContext,
-                        ) {
-                            Text(if (opening) "Abriendo…" else "Abrir inspección ahora")
-                        }
-                    }
-                }
-            }
-        }
-
-        if (model.busy && model.visits.isEmpty()) {
-            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { CircularProgressIndicator() }
-        } else if (model.visits.isEmpty()) {
-            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                Text("No tenés inspecciones asignadas. Podés abrir una nueva desde esta tablet.")
-            }
-        } else {
-            LazyColumn(
-                Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 10.dp),
-                verticalArrangement = Arrangement.spacedBy(10.dp),
-            ) {
-                items(model.visits, key = { it.id }) { visit ->
-                    MobileVisitCard(visit) { model.openVisit(visit.id) }
-                }
-                item { Spacer(Modifier.height(24.dp)) }
-            }
-        }
-    }
-}
-
-@Composable
-private fun MobileVisitCard(visit: VisitSummary, onOpen: () -> Unit) {
-    Card(onClick = onOpen, modifier = Modifier.fillMaxWidth()) {
-        Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-                Text(visit.code, fontWeight = FontWeight.Bold)
-                Text(visitStatusLabelEs(visit.status))
-            }
-            Text(visit.operatorCompany?.name ?: "Operadora sin definir")
-            Text(visit.operationalArea?.name ?: "Área sin definir", style = MaterialTheme.typography.bodySmall)
-            visit.plannedStartAt?.let {
-                Text("Prevista: ${it.replace('T', ' ').take(16)}", style = MaterialTheme.typography.bodySmall)
-            }
-            Text(
-                "Inventario: ${visit.assetCount} · Equipo inspector: ${visit.memberCount}",
-                style = MaterialTheme.typography.bodySmall,
-            )
-        }
-    }
-}

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/ModernMobileActsScreen.kt

@@ -1,559 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import android.Manifest
-import android.content.Context
-import android.content.pm.PackageManager
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Assignment
-import androidx.compose.material.icons.filled.CheckCircle
-import androidx.compose.material.icons.filled.EditNote
-import androidx.compose.material.icons.filled.ErrorOutline
-import androidx.compose.material.icons.filled.Lock
-import androidx.compose.material.icons.filled.Person
-import androidx.compose.material3.Button
-import androidx.compose.material3.ElevatedCard
-import androidx.compose.material3.FilterChip
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import com.google.android.gms.location.LocationServices
-import com.google.android.gms.location.Priority
-import com.google.android.gms.tasks.CancellationTokenSource
-import com.korexlabs.dhinspeccion.MainViewModel
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import java.io.File
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-
-private data class ModernActSignatureGeo(
-    val latitude: Double,
-    val longitude: Double,
-    val accuracyM: Double?,
-)
-
-@Composable
-fun ModernMobileActsScreen(
-    model: MainViewModel,
-    onBack: () -> Unit,
-    onGoInventory: () -> Unit,
-) {
-    val visit = model.visit ?: return
-    val selected = model.selectedAct
-    val closure = model.actClosure
-    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") }
-    var fullName by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.fullName.orEmpty()) }
-    var documentType by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.documentType ?: "DNI") }
-    var documentNumber by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.documentNumber.orEmpty()) }
-    var position by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.position.orEmpty()) }
-    var email by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.email.orEmpty()) }
-    var phone by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.phone.orEmpty()) }
-    var absenceReason by rememberSaveable(selected?.id) { mutableStateOf(closure?.responsible?.absenceReason.orEmpty()) }
-    var refusalReason by rememberSaveable(selected?.id) { mutableStateOf("") }
-    var manifestation by rememberSaveable(selected?.id) { mutableStateOf("CONFORMITY") }
-    var dissentStatement by rememberSaveable(selected?.id) { mutableStateOf("") }
-
-    LaunchedEffect(visit.id) { model.reloadActs() }
-
-    fun signWithGeo(file: File, company: Boolean) {
-        scope.launch {
-            val geo = runCatching { currentModernActSignatureGeo(context) }.getOrNull()
-            if (company) {
-                model.signSelectedActAsCompany(
-                    png = file,
-                    latitude = geo?.latitude,
-                    longitude = geo?.longitude,
-                    accuracyM = geo?.accuracyM,
-                    manifestation = manifestation,
-                    statement = dissentStatement.takeIf { manifestation == "DISSENT" },
-                )
-            } else {
-                model.signSelectedActAsInspector(
-                    png = file,
-                    latitude = geo?.latitude,
-                    longitude = geo?.longitude,
-                    accuracyM = geo?.accuracyM,
-                )
-            }
-        }
-    }
-
-    Column(
-        Modifier
-            .fillMaxSize()
-            .verticalScroll(rememberScrollState())
-            .padding(horizontal = 18.dp, vertical = 16.dp),
-        verticalArrangement = Arrangement.spacedBy(14.dp),
-    ) {
-        ModernHeader(title = "Actas", subtitle = visit.code, onBack = onBack)
-
-        Surface(
-            modifier = Modifier.fillMaxWidth(),
-            shape = MaterialTheme.shapes.large,
-            tonalElevation = 1.dp,
-        ) {
-            Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-                Text(
-                    visit.scopeAsset?.name ?: "Yacimiento",
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Bold,
-                )
-                visit.operatorCompany?.name?.takeIf { it.isNotBlank() }?.let {
-                    Text(
-                        it,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-        }
-
-        ModernMessage(model)
-
-        if (model.acts.isEmpty()) {
-            ElevatedCard(Modifier.fillMaxWidth()) {
-                Column(
-                    Modifier.padding(20.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                ) {
-                    Icon(Icons.Filled.Assignment, contentDescription = null, tint = MaterialTheme.colorScheme.secondary)
-                    Text("Todavía no hay Actas", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    Text(
-                        "Creá la primera Acta y después incorporá Hallazgos seleccionando el Inventario.",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                }
-            }
-        } else {
-            Text("Actas de esta inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-            model.acts.forEach { act ->
-                val active = selected?.id == act.id
-                Surface(
-                    onClick = { model.selectAct(act.id) },
-                    modifier = Modifier.fillMaxWidth(),
-                    shape = MaterialTheme.shapes.large,
-                    color = if (active) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface,
-                    tonalElevation = if (active) 1.dp else 0.dp,
-                    border = BorderStroke(
-                        if (active) 2.dp else 1.dp,
-                        if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outlineVariant,
-                    ),
-                ) {
-                    Row(
-                        Modifier.padding(15.dp),
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(12.dp),
-                    ) {
-                        Icon(
-                            when (act.status) {
-                                "LOCKED" -> Icons.Filled.Lock
-                                "SEALED" -> Icons.Filled.CheckCircle
-                                else -> Icons.Filled.EditNote
-                            },
-                            contentDescription = null,
-                            tint = if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.secondary,
-                        )
-                        Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {
-                            Text(act.code, fontWeight = FontWeight.Bold)
-                            Text(
-                                "${modernActStatusLabel(act.status)} · ${if (act.urgency == "URGENT") "Urgente" else "No urgente"}",
-                                style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            )
-                            Text(
-                                "${act.findingCount} Hallazgo${if (act.findingCount == 1) "" else "s"} · ${act.assetCount} elemento${if (act.assetCount == 1) "" else "s"}",
-                                style = MaterialTheme.typography.bodySmall,
-                            )
-                        }
-                        if (active) Icon(Icons.Filled.CheckCircle, "Seleccionada", tint = MaterialTheme.colorScheme.primary)
-                    }
-                }
-            }
-        }
-
-        val hasDraftAct = model.acts.any { it.status == "DRAFT" }
-        if (visit.status == "IN_PROGRESS" && !hasDraftAct) {
-            ElevatedCard(Modifier.fillMaxWidth()) {
-                Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                    Row(verticalAlignment = Alignment.CenterVertically) {
-                        Surface(shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.primaryContainer) {
-                            Icon(Icons.Filled.Add, null, Modifier.padding(10.dp), tint = MaterialTheme.colorScheme.primary)
-                        }
-                        Spacer(Modifier.width(10.dp))
-                        Column {
-                            Text("Nueva Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            Text("Un solo borrador activo por vez", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-                        }
-                    }
-
-                    Text("Urgencia", fontWeight = FontWeight.SemiBold)
-                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                        FilterChip(
-                            selected = newActUrgency == "NON_URGENT",
-                            onClick = { newActUrgency = "NON_URGENT" },
-                            label = { Text("No urgente") },
-                        )
-                        FilterChip(
-                            selected = newActUrgency == "URGENT",
-                            onClick = { newActUrgency = "URGENT" },
-                            label = { Text("Urgente") },
-                        )
-                    }
-                    Surface(
-                        Modifier.fillMaxWidth(),
-                        shape = MaterialTheme.shapes.medium,
-                        color = MaterialTheme.colorScheme.surfaceVariant,
-                    ) {
-                        Text(
-                            if (newActUrgency == "URGENT") {
-                                "El plazo urgente se computará desde el Acta conforme a la política institucional vigente al cerrar su contenido."
-                            } else {
-                                "El plazo no urgente comienza con la oficialización GEDO, no al crear el Acta."
-                            },
-                            Modifier.padding(12.dp),
-                            style = MaterialTheme.typography.bodySmall,
-                        )
-                    }
-                    Button(
-                        onClick = { model.createAct(newActUrgency) },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) {
-                        Icon(Icons.Filled.Add, null)
-                        Spacer(Modifier.width(7.dp))
-                        Text(if (model.busy) "Creando…" else "Crear nueva Acta")
-                    }
-                }
-            }
-        }
-
-        if (selected != null) {
-            HorizontalDivider()
-            Surface(
-                Modifier.fillMaxWidth(),
-                shape = MaterialTheme.shapes.large,
-                color = MaterialTheme.colorScheme.surfaceVariant,
-            ) {
-                Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) {
-                        Text(selected.code, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                        StatusPill(modernActStatusLabel(selected.status))
-                    }
-                    Text(if (selected.urgency == "URGENT") "Urgente" else "No urgente", color = MaterialTheme.colorScheme.onSurfaceVariant)
-                    Text("${selected.findingCount} Hallazgos · ${selected.assetCount} elementos de Inventario", style = MaterialTheme.typography.bodySmall)
-                    selected.deadlineAt?.let { Text("Vencimiento · $it", style = MaterialTheme.typography.bodySmall) }
-                    if (selected.deadlineAt == null && selected.deadlineBasis == "GEDO_DATE") {
-                        Text("Vencimiento pendiente de fecha GEDO", style = MaterialTheme.typography.bodySmall)
-                    }
-                }
-            }
-
-            when (selected.status) {
-                "DRAFT" -> {
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                            Text("Hallazgos", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            Text(
-                                "Elegí una Instalación o Subinstalación existente, o creala en campo si todavía no está registrada.",
-                                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            )
-                            Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
-                                Icon(Icons.Filled.Add, null)
-                                Spacer(Modifier.width(6.dp))
-                                Text("Agregar Hallazgo")
-                            }
-                        }
-                    }
-
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                Icon(Icons.Filled.Person, null, tint = MaterialTheme.colorScheme.primary)
-                                Spacer(Modifier.width(8.dp))
-                                Text("Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            }
-                            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                                FilterChip(selected = attendance == "PRESENT", onClick = { attendance = "PRESENT" }, label = { Text("Presente") })
-                                FilterChip(selected = attendance == "ABSENT", onClick = { attendance = "ABSENT" }, label = { Text("Ausente") })
-                            }
-                            if (attendance == "PRESENT") {
-                                OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombre y apellido *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-                                    listOf("DNI", "CUIL", "PASSPORT", "OTHER").forEach { kind ->
-                                        FilterChip(selected = documentType == kind, onClick = { documentType = kind }, label = { Text(documentTypeLabelEs(kind)) })
-                                    }
-                                }
-                                OutlinedTextField(documentNumber, { documentNumber = it }, label = { Text("Documento *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                OutlinedTextField(position, { position = it }, label = { Text("Cargo *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                OutlinedTextField(email, { email = it }, label = { Text("Correo electrónico") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                OutlinedTextField(phone, { phone = it }, label = { Text("Teléfono") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                Button(
-                                    onClick = { model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone) },
-                                    enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank(),
-                                    modifier = Modifier.fillMaxWidth(),
-                                ) { Text("Guardar responsable") }
-                            } else {
-                                OutlinedTextField(
-                                    absenceReason,
-                                    { absenceReason = it },
-                                    label = { Text("Motivo de ausencia *") },
-                                    minLines = 2,
-                                    modifier = Modifier.fillMaxWidth(),
-                                )
-                                Button(
-                                    onClick = { model.setCompanyResponsibleAbsent(absenceReason) },
-                                    enabled = !model.busy && absenceReason.trim().length >= 10,
-                                    modifier = Modifier.fillMaxWidth(),
-                                ) { Text("Guardar ausencia") }
-                            }
-                        }
-                    }
-
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                Icon(Icons.Filled.Lock, null, tint = MaterialTheme.colorScheme.error)
-                                Spacer(Modifier.width(8.dp))
-                                Text("Cerrar Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            }
-                            Text(
-                                "Al cerrar el contenido, el Acta queda inmutable y pasa a Pendiente de firma. Podés firmarla ahora o continuar con otra Acta.",
-                                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            )
-                            Button(
-                                onClick = { model.prepareSelectedAct() },
-                                enabled = !model.busy && closure?.responsible != null,
-                                modifier = Modifier.fillMaxWidth(),
-                            ) { Text("Cerrar Acta y dejar pendiente de firma") }
-                        }
-                    }
-                }
-
-                "LOCKED" -> {
-                    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"
-
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                Icon(Icons.Filled.Lock, null, tint = MaterialTheme.colorScheme.secondary)
-                                Spacer(Modifier.width(8.dp))
-                                Text("Acta pendiente de firma", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            }
-                            Text("El contenido ya está cerrado e inmutable. Completá la firma del inspector y la manifestación de la empresa cuando corresponda.")
-                            closure?.closure?.preparedSha256?.let { Text("Huella de integridad · $it", style = MaterialTheme.typography.bodySmall) }
-
-                            HorizontalDivider()
-                            Text("Firma del inspector", fontWeight = FontWeight.Bold)
-                            if (inspectorSigned) {
-                                SuccessLine("Firma del inspector registrada")
-                            } else {
-                                Text(closure?.consents?.inspector.orEmpty(), style = MaterialTheme.typography.bodySmall)
-                                SignaturePad(
-                                    label = "Firmá como inspector/a",
-                                    enabled = !model.busy,
-                                    onCaptured = { file -> signWithGeo(file, company = false) },
-                                )
-                            }
-
-                            HorizontalDivider()
-                            Text("Manifestación de la empresa", fontWeight = FontWeight.Bold)
-                            if (companyOutcome != null && companyResolved) {
-                                val detail = when (companyOutcome.status) {
-                                    "SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma en conformidad"
-                                    "REFUSED" -> "Negativa a firmar"
-                                    else -> humanBackendLabelEs(companyOutcome.status)
-                                }
-                                SuccessLine(detail)
-                                companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
-                                companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
-                            } else if (closure?.responsible?.attendanceStatus == "ABSENT") {
-                                Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.errorContainer) {
-                                    Row(Modifier.padding(12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                                        Icon(Icons.Filled.ErrorOutline, null, tint = MaterialTheme.colorScheme.error)
-                                        Text(
-                                            "La ausencia no resuelve la manifestación. Debe registrarse firma o negativa antes de firmar y cerrar el Acta.",
-                                            Modifier.weight(1f),
-                                            style = MaterialTheme.typography.bodySmall,
-                                        )
-                                    }
-                                }
-                            } else {
-                                Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
-                                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                                    FilterChip(selected = manifestation == "CONFORMITY", onClick = { manifestation = "CONFORMITY" }, label = { Text("Conforme") })
-                                    FilterChip(selected = manifestation == "DISSENT", onClick = { manifestation = "DISSENT" }, label = { Text("En disidencia") })
-                                }
-                                if (manifestation == "DISSENT") {
-                                    OutlinedTextField(
-                                        dissentStatement,
-                                        { dissentStatement = it },
-                                        label = { Text("Manifestación de disidencia *") },
-                                        minLines = 2,
-                                        modifier = Modifier.fillMaxWidth(),
-                                    )
-                                }
-                                SignaturePad(
-                                    label = "Firma del responsable de empresa",
-                                    enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
-                                    onCaptured = { file -> signWithGeo(file, company = true) },
-                                )
-                                Text("Si se niega a firmar, registrá el motivo.", style = MaterialTheme.typography.bodySmall)
-                                OutlinedTextField(
-                                    refusalReason,
-                                    { refusalReason = it },
-                                    label = { Text("Motivo de negativa") },
-                                    minLines = 2,
-                                    modifier = Modifier.fillMaxWidth(),
-                                )
-                                OutlinedButton(
-                                    onClick = { model.recordCompanyOutcome("REFUSED", refusalReason) },
-                                    enabled = !model.busy && inspectorSigned && refusalReason.trim().length >= 10,
-                                    modifier = Modifier.fillMaxWidth(),
-                                ) { Text("Registrar negativa a firmar") }
-                            }
-
-                            if (inspectorSigned && companyResolved) {
-                                Button(
-                                    onClick = { model.closeSelectedAct() },
-                                    enabled = !model.busy,
-                                    modifier = Modifier.fillMaxWidth(),
-                                ) {
-                                    Icon(Icons.Filled.CheckCircle, null)
-                                    Spacer(Modifier.width(6.dp))
-                                    Text("Firmar y cerrar Acta")
-                                }
-                            } else {
-                                Text(
-                                    "La Inspección no puede cerrarse hasta completar las manifestaciones de esta Acta.",
-                                    style = MaterialTheme.typography.bodySmall,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                )
-                            }
-                        }
-                    }
-                }
-
-                "SEALED" -> {
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Row(Modifier.padding(18.dp), horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.Top) {
-                            Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
-                            Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-                                Text("Acta firmada y cerrada", fontWeight = FontWeight.Bold)
-                                Text("Desde este cierre se genera el PDF del Acta y el informe INF editable (DOCX) para el Inspector.")
-                                closure?.closure?.finalSha256?.let { Text("SHA-256 · $it", style = MaterialTheme.typography.bodySmall) }
-                            }
-                        }
-                    }
-                }
-
-                "CANCELLED" -> {
-                    Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.surfaceVariant) {
-                        Text("Esta Acta fue cancelada y permanece como antecedente.", Modifier.padding(14.dp))
-                    }
-                }
-            }
-        }
-
-        if (visit.status == "IN_PROGRESS" && model.acts.isNotEmpty()) {
-            val activeActs = model.acts.filter { it.status != "CANCELLED" }
-            val pendingActs = activeActs.filter { it.status != "SEALED" }
-            ElevatedCard(Modifier.fillMaxWidth()) {
-                Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(9.dp)) {
-                    Text("Finalizar Inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    if (pendingActs.isEmpty()) {
-                        SuccessLine("Todas las Actas están firmadas y cerradas")
-                    } else {
-                        Text(
-                            "Falta firmar y cerrar: ${pendingActs.joinToString { it.code }}",
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.error,
-                        )
-                    }
-                    Button(
-                        onClick = { model.closeInspection() },
-                        enabled = !model.busy && activeActs.isNotEmpty() && pendingActs.isEmpty(),
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Cerrar Inspección y salir") }
-                }
-            }
-        }
-        Spacer(Modifier.height(32.dp))
-    }
-}
-
-@Composable
-private fun SuccessLine(text: String) {
-    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp)) {
-        Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
-        Text(text, color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.SemiBold)
-    }
-}
-
-private fun modernActStatusLabel(status: String): String = actStatusLabelEs(status)
-
-private fun hasModernActLocation(context: Context): Boolean =
-    ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
-        ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
-
-private suspend fun currentModernActSignatureGeo(context: Context): ModernActSignatureGeo = suspendCancellableCoroutine { continuation ->
-    if (!hasModernActLocation(context)) {
-        continuation.resumeWithException(SecurityException("Ubicación no autorizada"))
-        return@suspendCancellableCoroutine
-    }
-    val source = CancellationTokenSource()
-    try {
-        LocationServices.getFusedLocationProviderClient(context)
-            .getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) continuation.resumeWithException(IllegalStateException("Ubicación no disponible"))
-                else continuation.resume(ModernActSignatureGeo(location.latitude, location.longitude, location.accuracy.toDouble()))
-            }
-            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-    } catch (error: SecurityException) {
-        if (continuation.isActive) continuation.resumeWithException(error)
-    }
-    continuation.invokeOnCancellation { source.cancel() }
-}

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/SignaturePad.kt

@@ -49,7 +49,7 @@ fun SignaturePad(
     Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
         Text(label, fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold)
         Text(
-            "Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora a la huella de integridad del Acta.",
+            "Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora al hash del Acta.",
             style = MaterialTheme.typography.bodySmall,
         )
         Canvas(

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/UiSpanishLabels.kt

@@ -1,50 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import java.util.Locale
-
-internal fun visitStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
-    "PLANNED" -> "Planificada"
-    "IN_PROGRESS" -> "En curso"
-    "CLOSED" -> "Cerrada"
-    "CANCELLED" -> "Cancelada"
-    null, "" -> "Sin estado"
-    else -> humanBackendLabelEs(status)
-}
-
-internal fun actStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
-    "DRAFT" -> "En elaboración"
-    "LOCKED" -> "Pendiente de firma"
-    "SEALED" -> "Firmada y cerrada"
-    "CLOSED" -> "Cerrada"
-    "RECTIFIED" -> "Rectificada"
-    "CANCELLED" -> "Cancelada"
-    null, "" -> "Sin estado"
-    else -> humanBackendLabelEs(status)
-}
-
-internal fun findingStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
-    "OPEN" -> "Abierto"
-    "PENDING" -> "Pendiente"
-    "COMPANY_RESPONSE_PENDING" -> "Pendiente de respuesta de la empresa"
-    "COMPANY_RESPONDED" -> "Respondido por la empresa"
-    "VERIFICATION_PENDING" -> "Pendiente de verificación"
-    "VERIFICATION_SCHEDULED" -> "Verificación programada"
-    "READY_TO_CLOSE" -> "Listo para cierre"
-    "CLOSED" -> "Cerrado"
-    "CANCELLED" -> "Cancelado"
-    null, "" -> "Sin estado"
-    else -> humanBackendLabelEs(status)
-}
-
-internal fun documentTypeLabelEs(type: String): String = when (type.uppercase(Locale.ROOT)) {
-    "DNI" -> "DNI"
-    "CUIL" -> "CUIL"
-    "PASSPORT" -> "Pasaporte"
-    "OTHER" -> "Otro"
-    else -> humanBackendLabelEs(type)
-}
-
-internal fun humanBackendLabelEs(value: String): String {
-    val clean = value.trim().replace('_', ' ').replace('-', ' ').lowercase(Locale("es", "AR"))
-    return clean.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale("es", "AR")) else it.toString() }
-}

android-app/app/src/main/res/drawable/ic_mendoza_launcher.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Launcher de presentación F6.1 inspirado en el escudo institucional publicado
-  por Gobierno de Mendoza en mendoza.gov.ar. Se mantiene como vector local para
-  evitar el ícono genérico del sistema y no depender de assets remotos.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-
-    <!-- fondo institucional -->
-    <path
-        android:fillColor="#0B5FA5"
-        android:pathData="M54,4 A50,50 0,1 0,54 104 A50,50 0,1 0,54 4" />
-
-    <!-- escudo exterior -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M54,13 C72,13 84,22 87,38 L83,65 C80,81 68,93 54,99 C40,93 28,81 25,65 L21,38 C24,22 36,13 54,13 Z" />
-
-    <!-- campo superior celeste -->
-    <path
-        android:fillColor="#22A9E0"
-        android:pathData="M27,38 C30,27 39,21 54,21 C69,21 78,27 81,38 L78,59 L30,59 Z" />
-
-    <!-- campo inferior dorado -->
-    <path
-        android:fillColor="#C6A66A"
-        android:pathData="M30,63 L78,63 L76,68 C73,80 65,89 54,94 C43,89 35,80 32,68 Z" />
-
-    <!-- gorro frigio simplificado -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M47,31 C52,26 61,25 67,28 C64,31 63,35 64,39 C58,37 52,37 46,40 C44,36 44,33 47,31 Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M53,39 L57,39 L56,48 L52,48 Z" />
-
-    <!-- racimo de uva simplificado -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M53,69 C56,69 58,71 58,74 C58,77 56,79 53,79 C50,79 48,77 48,74 C48,71 50,69 53,69 Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M45,73 C48,73 50,75 50,78 C50,81 48,83 45,83 C42,83 40,81 40,78 C40,75 42,73 45,73 Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M61,73 C64,73 66,75 66,78 C66,81 64,83 61,83 C58,83 56,81 56,78 C56,75 58,73 61,73 Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M53,80 C56,80 58,82 58,85 C58,88 56,90 53,90 C50,90 48,88 48,85 C48,82 50,80 53,80 Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M52,67 C54,63 58,61 62,61 C60,65 57,68 53,70 Z" />
-</vector>

android-app/app/src/test/java/com/korexlabs/dhinspeccion/DynamicFieldFlowContractTest.kt

@@ -1,26 +0,0 @@
-package com.korexlabs.dhinspeccion
-
-import java.io.File
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class DynamicFieldFlowContractTest {
-    private val source = File("src/main/java/com/korexlabs/dhinspeccion/ui/DynamicVisitRoot.kt").readText()
-
-    @Test
-    fun fastSubinstallationFlowKeepsParentClassificationAndCaptureSteps() {
-        assertTrue(source.contains("Elegí la Instalación padre"))
-        assertTrue(source.contains("Clasificación técnica *"))
-        assertTrue(source.contains("Guardar y tomar foto"))
-        assertTrue(source.contains("model.loadFieldTypes(item.id)"))
-        assertTrue(source.contains("parentId = item.id"))
-    }
-
-    @Test
-    fun fieldCaptureStillRequiresGpsAndPhotoBeforeFindings() {
-        assertTrue(source.contains("La foto sigue siendo obligatoria antes de crear Hallazgos"))
-        assertTrue(source.contains("creationGpsCaptured"))
-        assertTrue(source.contains("fieldPhotoCount == 0"))
-        assertTrue(source.contains("model.uploadFieldPhoto"))
-    }
-}

android-app/app/src/test/java/com/korexlabs/dhinspeccion/FinalFieldFlowContractTest.kt

@@ -1,57 +0,0 @@
-package com.korexlabs.dhinspeccion
-
-import java.io.File
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class FinalFieldFlowContractTest {
-    private val visit = File("src/main/java/com/korexlabs/dhinspeccion/ui/ModernVisitRoot.kt").readText()
-    private val acts = File("src/main/java/com/korexlabs/dhinspeccion/ui/ModernMobileActsScreen.kt").readText()
-    private val findings = File("src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt").readText()
-    private val home = File("src/main/java/com/korexlabs/dhinspeccion/ui/MobileHomeScreen.kt").readText()
-    private val labels = File("src/main/java/com/korexlabs/dhinspeccion/ui/UiSpanishLabels.kt").readText()
-
-    @Test
-    fun inspectionActFindingFlowMatchesFieldProcedure() {
-        assertTrue(visit.contains("Iniciar inspección"))
-        assertTrue(acts.contains("Crear nueva Acta"))
-        assertTrue(acts.contains("Agregar Hallazgo"))
-        assertTrue(visit.contains("Instalación"))
-        assertTrue(visit.contains("Subinstalación"))
-        assertTrue(visit.contains("Guardar y tomar foto"))
-        assertTrue(acts.contains("Cerrar Acta y dejar pendiente de firma"))
-        assertTrue(labels.contains("\"LOCKED\" -> \"Pendiente de firma\""))
-    }
-
-    @Test
-    fun fieldCreateKeepsDashboardEquivalentMinimumAndCaptureBarrier() {
-        assertTrue(visit.contains("Nombre técnico *"))
-        assertTrue(visit.contains("Nombre habitual (opcional)"))
-        assertTrue(visit.contains("Descripción (opcional)"))
-        assertTrue(visit.contains("familyReady"))
-        assertTrue(visit.contains("attributesReady"))
-        assertTrue(visit.contains("GPS + foto"))
-        assertTrue(visit.contains("La foto es obligatoria antes de registrar Hallazgos"))
-    }
-
-    @Test
-    fun structuralSelectionUsesTheServerTypeCode() {
-        assertTrue(visit.contains("type.code.ifBlank { type.typeName ?: type.name }"))
-        assertTrue(visit.contains("modernItemTypeCode(it) in setOf(\"instalacion\", \"subinstalacion\")"))
-    }
-
-    @Test
-    fun currentFieldUiDoesNotExposeBackendEnglishStates() {
-        assertTrue(home.contains("visitStatusLabelEs(visit.status)"))
-        assertTrue(findings.contains("findingStatusLabelEs(finding.status)"))
-        assertTrue(acts.contains("documentTypeLabelEs(kind)"))
-        assertTrue(labels.contains("\"PASSPORT\" -> \"Pasaporte\""))
-        assertTrue(labels.contains("\"OTHER\" -> \"Otro\""))
-        assertFalse(acts.contains("Finalizar y BLOQUEAR Acta"))
-        assertFalse(acts.contains("Acta BLOQUEADA"))
-        assertFalse(acts.contains("SELLAR Acta"))
-        assertFalse(acts.contains("Acta SELLADA"))
-        assertFalse(acts.contains("Text(\"Email\")"))
-    }
-}

android-app/app/src/test/java/com/korexlabs/dhinspeccion/ReleaseMetadataTest.kt

@@ -1,20 +0,0 @@
-package com.korexlabs.dhinspeccion
-
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class ReleaseMetadataTest {
-    @Test
-    fun debugBuildKeepsSeparateApplicationIdentity() {
-        assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
-        assertEquals(28, BuildConfig.VERSION_CODE)
-        assertEquals("0.19.0-debug", BuildConfig.VERSION_NAME)
-    }
-
-    @Test
-    fun fieldBuildTargetsOnlyTheHttpsProductionApi() {
-        assertEquals("https://dhv2.korexlabs.com/api/v3/", BuildConfig.API_BASE_URL)
-        assertTrue(BuildConfig.API_BASE_URL.startsWith("https://"))
-    }
-}

api-v3/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "dhv2-api",
-  "version": "0.29.0-1",
+  "version": "0.20.0-2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dhv2-api",
-      "version": "0.29.0-1",
+      "version": "0.20.0-2",
       "license": "UNLICENSED",
       "dependencies": {
         "@nestjs/common": "^11.0.0",
@@ -4166,9 +4166,9 @@
       "license": "MIT"
     },
     "node_modules/multer": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.3.0.tgz",
-      "integrity": "sha512-cjNbm3sttszgZeGfJR124D+jFEfkXCVAsoPBmFn9X7UxmDSFHWqE2CoEj0vrmSpuAFnqWR1Szcm9QTsiHr60Xw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.2.0.tgz",
+      "integrity": "sha512-6rdyFg2kLrMh9Jee7/BMPuV9lEAd7lLW2YUpF9/YxR7njyoUwwQ0ZPh3TaIY50Sw6vlyD2HW3wGOkTS4P79xrQ==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
@@ -4666,9 +4666,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.0.tgz",
-      "integrity": "sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==",
+      "version": "6.15.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
+      "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "es-define-property": "^1.0.1",

api-v3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhv2-api",
-  "version": "0.29.0-1",
+  "version": "0.25.0-1",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -42,9 +42,5 @@
     "ts-node": "^10.9.2",
     "tsx": "^4.20.6",
     "typescript": "^5.9.0"
-  },
-  "overrides": {
-    "multer": "2.3.0",
-    "qs": "6.16.0"
   }
 }

api-v3/src/act-administration/act-administration.service.ts

@@ -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;
   }
 

api-v3/src/act-administration/field-briefing.service.ts

@@ -36,20 +36,6 @@ export interface FieldBriefingAct {
   findings: FieldBriefingFinding[];
 }
 
-function toIsoDate(value: unknown): string {
-  const parsed = value instanceof Date
-    ? value
-    : value == null
-      ? new Date()
-      : new Date(String(value));
-
-  if (Number.isNaN(parsed.getTime())) {
-    throw new Error('La fecha planificada de la inspección no es válida');
-  }
-
-  return parsed.toISOString().slice(0, 10);
-}
-
 @Injectable()
 export class FieldBriefingService {
   constructor(private readonly dataSource: DataSource) {}
@@ -81,9 +67,7 @@ export class FieldBriefingService {
       });
     }
 
-    // PostgreSQL/pg entrega los timestamptz como Date. String(date).slice(0, 10)
-    // produce textos como "Thu Sep 17", que PostgreSQL rechaza al castear a date.
-    const plannedOn = toIsoDate(visit.plannedStartAt);
+    const plannedOn = String(visit.plannedStartAt ?? new Date().toISOString()).slice(0, 10);
 
     const rows = (await this.dataSource.query(`
       WITH prior_acts AS (
@@ -145,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

api-v3/src/app.module.ts

@@ -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,

api-v3/src/asset-master/asset-history.service.ts

@@ -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

api-v3/src/asset-master/asset-master.module.ts

@@ -24,17 +24,11 @@ import { AssetRegistryService } from './asset-registry.service';
 import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.service';
 import { InventoryStructureController } from './inventory-structure.controller';
 import { InventoryStructureService } from './inventory-structure.service';
-import { SimpleInventoryStructureService } from './simple-inventory-structure.service';
 import { InventoryFamilyCatalogController } from './inventory-family-catalog.controller';
 import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
-import { InventoryTechnicalValuesController } from './inventory-technical-values.controller';
-import { InventoryTechnicalValuesService } from './inventory-technical-values.service';
-import { InventoryFunctionService } from './inventory-function.service';
 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],
@@ -43,8 +37,6 @@ import { InventoryBrowserService } from './inventory-browser.service';
     AssetsController,
     InventoryStructureController,
     InventoryFamilyCatalogController,
-    InventoryTechnicalValuesController,
-    InventoryBrowserController,
     InventoryMergeController,
     FieldInventoryMergeController,
     AssetGeometriesController,
@@ -60,11 +52,7 @@ import { InventoryBrowserService } from './inventory-browser.service';
     AssetTypesService,
     AssetsService,
     InventoryStructureService,
-    SimpleInventoryStructureService,
     InventoryFamilyCatalogService,
-    InventoryTechnicalValuesService,
-    InventoryFunctionService,
-    InventoryBrowserService,
     InventoryMergeService,
     MergedInventoryDossierService,
     AssetGeometriesService,

api-v3/src/asset-master/asset-operational-relations.service.ts

@@ -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,16 +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' });
         }
-
-        // F7: un Área puede estar explotada por varias Empresas simultáneamente.
-        // La unicidad válida es Área + Empresa + rol activo; no existe una única Operadora por Área.
         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 }>;
-
         const created = await this.loadRelation(manager, row.id);
         await this.audit.record({
           ...administrationAuditContext(principal, request),
@@ -158,9 +170,6 @@ export class AssetOperationalRelationsService {
           entityType: 'area_company_relation',
           entityId: row.id,
           afterData: this.auditView(created),
-          metadata: dto.relationRole === AreaOrganizationRole.OPERATOR
-            ? { inventoryHierarchyChanged:false, multipleAreaOperatorsAllowed:true }
-            : undefined,
         }, manager);
         return created;
       });
@@ -189,8 +198,12 @@ export class AssetOperationalRelationsService {
           message: 'La relación ya se encuentra finalizada',
         });
       }
-
-      // Ending an operator relation never moves, rewrites or blocks 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,
@@ -207,11 +220,6 @@ export class AssetOperationalRelationsService {
         entityId: id,
         beforeData: this.auditView(before),
         afterData: this.auditView(updated),
-        metadata: {
-          inventoryHierarchyChanged:false,
-          operatorSnapshotPreserved:true,
-          retainedCompatibilitySnapshotCount: before.assignedAssetCount,
-        },
       }, manager);
       return updated;
     });
@@ -322,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

api-v3/src/asset-master/asset-temporal.service.ts

@@ -137,41 +137,21 @@ export class AssetTemporalService {
     if (!row) throw temporalAssetNotFound();
     const asOf = new Date(query.at);
     row.asOf = asOf;
-
-    // Physical context is reconstructed from the Inventory history, while the
-    // operator is resolved independently from the temporal Area↔Empresa ledger.
-    // This keeps historical operator changes from rewriting the Inventory.
     const [context] = (await this.dataSource.query(`
       SELECT
         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 operator_company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
-          'id',operator_company.id,'code',operator_company.code,'name',operator_company.name
-        ) END AS "operatorCompany"
+        CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name) END AS "operatorCompany"
       FROM asset_context_history history
       LEFT JOIN assets parent ON parent.id=history.parent_id
       LEFT JOIN assets area ON area.id=history.operational_area_id
-      LEFT JOIN LATERAL (
-        SELECT relation.company_id
-        FROM area_company_relations relation
-        WHERE relation.area_id=history.operational_area_id
-          AND relation.relation_role='OPERATOR'
-          AND relation.valid_from <= $2
-          AND (relation.valid_until IS NULL OR relation.valid_until > $2)
-        ORDER BY relation.valid_from DESC, relation.created_at DESC, relation.id DESC
-        LIMIT 1
-      ) operator_relation ON true
-      LEFT JOIN assets operator_company ON operator_company.id=operator_relation.company_id
+      LEFT JOIN assets company ON company.id=history.operator_company_id
       WHERE history.asset_id=$1
         AND history.valid_from <= $2
         AND (history.valid_until IS NULL OR history.valid_until > $2)
       ORDER BY history.valid_from DESC
       LIMIT 1
-    `, [assetId, asOf])) as Array<{
-      parent: Record<string, unknown> | null;
-      operationalArea: Record<string, unknown> | null;
-      operatorCompany: Record<string, unknown> | null;
-    }>;
+    `, [assetId, asOf])) as Array<{ parent: Record<string, unknown> | null; operationalArea: Record<string, unknown> | null; operatorCompany: Record<string, unknown> | null }>;
     if (context && row.snapshot) {
       row.snapshot = {
         ...row.snapshot,

api-v3/src/asset-master/assets.service.ts

@@ -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"

api-v3/src/asset-master/dto/change-asset-context.dto.ts

@@ -1,5 +1,5 @@
 import { Transform, Type } from 'class-transformer';
-import { IsDate, IsEmpty, IsOptional, IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
+import { IsDate, IsOptional, IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
 
 export class ChangeAssetContextDto {
   @IsOptional()
@@ -10,13 +10,8 @@ export class ChangeAssetContextDto {
   @IsUUID('4')
   operationalAreaId?: string | null;
 
-  /**
-   * Compatibilidad de contrato únicamente. F5/F6 separa la ubicación física
-   * del Inventario de la Operadora temporal del Área, por lo que este valor no
-   * puede modificarse desde un cambio de contexto del Inventario.
-   */
   @IsOptional()
-  @IsEmpty({ message: 'La Operadora se administra en la relación temporal del Área, no en el Inventario' })
+  @IsUUID('4')
   operatorCompanyId?: string | null;
 
   @IsOptional()

api-v3/src/asset-master/dto/create-asset.dto.ts

@@ -54,10 +54,6 @@ export class CreateAssetDto {
   @IsUUID('4')
   operatorCompanyId?: string | null;
 
-  @IsOptional()
-  @IsUUID('4')
-  concessionTypeId?: string | null;
-
   @IsOptional()
   @Transform(({ value }) =>
     typeof value === 'string' && value.trim() ? value.trim() : null,

api-v3/src/asset-master/dto/create-inventory-structure.dto.ts

@@ -9,12 +9,7 @@ import {
   MinLength,
 } from 'class-validator';
 
-// Invariante de dominio: Empresa es un maestro independiente. La jerarquía física
-// se expresa sólo como Departamento → Área → Yacimiento → Instalación → Subinstalación.
-// La Empresa y el Tipo de concesión se relacionan directamente con el Yacimiento.
 export const INVENTORY_STRUCTURE_KINDS = [
-  'EMPRESA',
-  'DEPARTAMENTO',
   'AREA',
   'YACIMIENTO',
   'INSTALACION',
@@ -53,14 +48,6 @@ export class CreateInventoryStructureDto {
   @IsUUID('4')
   familyId?: string | null;
 
-  @IsOptional()
-  @IsUUID('4')
-  operatorCompanyId?: string | null;
-
-  @IsOptional()
-  @IsUUID('4')
-  concessionTypeId?: string | null;
-
   @IsOptional()
   @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
   @IsString()

api-v3/src/asset-master/dto/inventory-browser-query.dto.ts

@@ -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;
-}

api-v3/src/asset-master/dto/inventory-family-admin.dto.ts

@@ -1,75 +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()
-  @IsArray()
-  @ArrayMaxSize(200)
-  @IsUUID('4', { each: true })
-  parentFamilyIds?: string[];
-
-  @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()
-  @IsArray()
-  @ArrayMaxSize(200)
-  @IsUUID('4', { each: true })
-  parentFamilyIds?: string[];
-
-  @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;
-}

api-v3/src/asset-master/dto/inventory-family-attribute.dto.ts

@@ -1,103 +0,0 @@
-import { Transform, Type } from 'class-transformer';
-import {
-  ArrayMaxSize,
-  IsArray,
-  IsBoolean,
-  IsIn,
-  IsInt,
-  IsOptional,
-  IsString,
-  Matches,
-  Max,
-  MaxLength,
-  Min,
-  MinLength,
-  ValidateIf,
-} from 'class-validator';
-
-const DATA_TYPES = ['TEXT','NUMBER','BOOLEAN','DATE','DATETIME','SELECT'] as const;
-export type InventoryFamilyAttributeDataType = typeof DATA_TYPES[number];
-
-export class CreateInventoryFamilyAttributeDto {
-  @Transform(({ value }) => typeof value === 'string' ? value.trim().toLowerCase() : value)
-  @IsString()
-  @Matches(/^[a-z][a-z0-9_]*$/)
-  @MaxLength(80)
-  code!: string;
-
-  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
-  @IsString()
-  @MinLength(1)
-  @MaxLength(160)
-  name!: string;
-
-  @IsIn(DATA_TYPES)
-  dataType!: InventoryFamilyAttributeDataType;
-
-  @IsOptional()
-  @IsBoolean()
-  isRequired?: boolean;
-
-  @IsOptional()
-  @Transform(({ value }) => typeof value === 'string' ? value.trim() || null : value)
-  @ValidateIf((_object, value) => value !== null && value !== undefined)
-  @IsString()
-  @MaxLength(40)
-  unit?: string | null;
-
-  @ValidateIf((object) => object.dataType === 'SELECT')
-  @IsArray()
-  @ArrayMaxSize(200)
-  @IsString({ each: true })
-  @MaxLength(160, { each: true })
-  options?: string[];
-
-  @IsOptional()
-  @Type(() => Number)
-  @IsInt()
-  @Min(0)
-  @Max(10000)
-  sortOrder?: number;
-}
-
-export class UpdateInventoryFamilyAttributeDto {
-  @IsOptional()
-  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
-  @IsString()
-  @MinLength(1)
-  @MaxLength(160)
-  name?: string;
-
-  @IsOptional()
-  @IsIn(DATA_TYPES)
-  dataType?: InventoryFamilyAttributeDataType;
-
-  @IsOptional()
-  @IsBoolean()
-  isRequired?: boolean;
-
-  @IsOptional()
-  @IsBoolean()
-  isActive?: boolean;
-
-  @IsOptional()
-  @Transform(({ value }) => typeof value === 'string' ? value.trim() || null : value)
-  @ValidateIf((_object, value) => value !== null && value !== undefined)
-  @IsString()
-  @MaxLength(40)
-  unit?: string | null;
-
-  @IsOptional()
-  @IsArray()
-  @ArrayMaxSize(200)
-  @IsString({ each: true })
-  @MaxLength(160, { each: true })
-  options?: string[] | null;
-
-  @IsOptional()
-  @Type(() => Number)
-  @IsInt()
-  @Min(0)
-  @Max(10000)
-  sortOrder?: number;
-}

api-v3/src/asset-master/dto/inventory-function.dto.ts

@@ -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;
-}

api-v3/src/asset-master/dto/list-asset-tree-query.dto.ts

@@ -1,5 +1,5 @@
 import { Transform } from 'class-transformer';
-import { IsBoolean, IsEmpty, IsEnum, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
+import { IsBoolean, IsEnum, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
 import { AssetInformationStatus, AssetOperationalStatus } from '../../database/entities';
 
 export class ListAssetTreeQueryDto {
@@ -24,12 +24,8 @@ export class ListAssetTreeQueryDto {
   @IsUUID('4')
   operationalAreaId?: string;
 
-  /**
-   * Retenido sólo para compatibilidad tipada. El árbol operativo no puede
-   * filtrar por el snapshot histórico de Empresa del Inventario.
-   */
   @IsOptional()
-  @IsEmpty({ message: 'Filtrá la Operadora mediante la relación temporal del Área, no mediante el snapshot del Inventario' })
+  @IsUUID('4')
   operatorCompanyId?: string;
 
   @IsOptional()
@@ -41,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;
 }

api-v3/src/asset-master/dto/list-assets-query.dto.ts

@@ -1,7 +1,6 @@
 import { Transform, Type } from 'class-transformer';
 import {
   IsBoolean,
-  IsEmpty,
   IsEnum,
   IsInt,
   IsOptional,
@@ -40,6 +39,7 @@ export class ListAssetsQueryDto {
   @IsEnum(AssetInformationStatus)
   status?: AssetInformationStatus;
 
+
   @IsOptional()
   @IsEnum(AssetOperationalStatus)
   operationalStatus?: AssetOperationalStatus;
@@ -54,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;
@@ -67,12 +62,7 @@ export class ListAssetsQueryDto {
   @IsUUID('4')
   operationalAreaId?: string;
 
-  /**
-   * Retenido sólo para compatibilidad tipada con consumidores históricos.
-   * F5/F6 no permite buscar ownership actual por el snapshot de Empresa del
-   * Inventario; la navegación Área↔Operadora usa area_company_relations.
-   */
   @IsOptional()
-  @IsEmpty({ message: 'Filtrá la Operadora mediante la relación temporal del Área, no mediante el snapshot del Inventario' })
+  @IsUUID('4')
   operatorCompanyId?: string;
 }

api-v3/src/asset-master/dto/update-asset.dto.ts

@@ -1,6 +1,5 @@
 import { Transform } from 'class-transformer';
 import {
-  IsEmpty,
   IsObject,
   IsOptional,
   IsString,
@@ -49,13 +48,9 @@ export class UpdateAssetDto {
   operationalAreaId?: string | null;
 
   @IsOptional()
-  @IsEmpty({ message: 'La Empresa relacionada se administra en el Yacimiento, no desde la edición genérica del Inventario' })
+  @IsUUID('4')
   operatorCompanyId?: string | null;
 
-  @IsOptional()
-  @IsEmpty({ message: 'El Tipo de concesión se administra en el Yacimiento, no desde la edición genérica del Inventario' })
-  concessionTypeId?: string | null;
-
   @IsOptional()
   @Transform(({ value }) =>
     typeof value === 'string' && value.trim() ? value.trim() : null,

api-v3/src/asset-master/dto/update-inventory-technical-values.dto.ts

@@ -1,6 +0,0 @@
-import { IsObject } from 'class-validator';
-
-export class UpdateInventoryTechnicalValuesDto {
-  @IsObject()
-  values!: Record<string, unknown>;
-}

api-v3/src/asset-master/inventory-browser.controller.ts

@@ -1,38 +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('departments')
-  departments(@Query() query: InventoryBrowserQueryDto) {
-    return this.inventoryBrowser.departments(query);
-  }
-
-  @Get('companies')
-  companies(@Query() query: InventoryBrowserQueryDto) {
-    return this.inventoryBrowser.companies(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);
-  }
-}

api-v3/src/asset-master/inventory-browser.service.ts

@@ -1,335 +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.information_status<>'INACTIVE'",
-      'type.is_active=true',
-      "(type.operational_role='COMPANY' OR lower(type.code) IN ('departamento','area','yacimiento','instalacion','subinstalacion'))",
-    ];
-    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) {
-      const area = add(query.operationalAreaId);
-      conditions.push(`(asset.id=${area}::uuid OR asset.operational_area_id=${area}::uuid)`);
-    }
-    if (query.operatorCompanyId) {
-      const company = add(query.operatorCompanyId);
-      conditions.push(`(
-        asset.id=${company}::uuid
-        OR EXISTS (
-          SELECT 1 FROM area_company_relations relation
-          WHERE (relation.area_id=asset.operational_area_id OR relation.area_id=asset.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=COALESCE(asset.operational_area_id,
-            CASE WHEN type.operational_role='AREA' THEN asset.id ELSE NULL END)
-            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",
-        (SELECT COUNT(*)::integer FROM assets child
-          WHERE child.parent_id=asset.id AND child.information_status<>'INACTIVE') 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 CASE
-        WHEN lower(type.code)='departamento' THEN 0
-        WHEN type.operational_role='COMPANY' THEN 1
-        WHEN lower(type.code)='area' THEN 2
-        WHEN lower(type.code)='yacimiento' THEN 3
-        WHEN lower(type.code)='instalacion' THEN 4
-        WHEN lower(type.code)='subinstalacion' THEN 5 ELSE 9 END,
-        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 departments(query: InventoryBrowserQueryDto) {
-    const params: unknown[] = [];
-    const conditions = [
-      "lower(type.code)='departamento'",
-      "department.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(`(department.code ILIKE ${p} OR department.name ILIKE ${p} OR COALESCE(department.common_name,'') ILIKE ${p})`);
-    }
-    if (query.operatorCompanyId) {
-      const p = add(query.operatorCompanyId);
-      conditions.push(`EXISTS (
-        SELECT 1
-        FROM assets area
-        JOIN asset_types atype ON atype.id=area.asset_type_id
-        JOIN area_company_relations relation ON relation.area_id=area.id
-        WHERE area.parent_id=department.id
-          AND lower(atype.code)='area'
-          AND relation.company_id=${p}::uuid
-          AND relation.relation_role='OPERATOR'
-          AND relation.valid_until IS NULL
-      )`);
-    }
-
-    const data = await this.dataSource.query(`
-      SELECT
-        department.id,department.code,department.name,department.common_name AS "commonName",
-        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
-        department.information_status AS "informationStatus",
-        department.operational_status AS "operationalStatus",
-        (SELECT COUNT(*)::integer FROM assets area
-          JOIN asset_types atype ON atype.id=area.asset_type_id
-          WHERE area.parent_id=department.id AND lower(atype.code)='area'
-            AND area.information_status<>'INACTIVE') AS "areaCount",
-        (SELECT COUNT(*)::integer FROM assets child
-          WHERE child.parent_id=department.id AND child.information_status<>'INACTIVE') AS "childrenCount"
-      FROM assets department
-      JOIN asset_types type ON type.id=department.asset_type_id
-      WHERE ${conditions.join(' AND ')}
-      ORDER BY department.name,department.code
-    `, params);
-    return { data, meta: { count: data.length } };
-  }
-
-  async companies(query: InventoryBrowserQueryDto) {
-    const params: unknown[] = [];
-    const conditions = [
-      "type.operational_role='COMPANY'",
-      "company.information_status<>'INACTIVE'",
-      'type.is_active=true',
-    ];
-    if (query.search?.trim()) {
-      params.push(`%${query.search.trim()}%`);
-      conditions.push(`(company.code ILIKE $1 OR company.name ILIKE $1 OR COALESCE(company.common_name,'') ILIKE $1)`);
-    }
-    const data = await this.dataSource.query(`
-      SELECT company.id,company.code,company.name,company.common_name AS "commonName",
-        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
-        company.information_status AS "informationStatus",
-        (SELECT COUNT(*)::integer FROM area_company_relations relation
-          WHERE relation.company_id=company.id AND relation.relation_role='OPERATOR'
-            AND relation.valid_until IS NULL) AS "areaCount"
-      FROM assets company
-      JOIN asset_types type ON type.id=company.asset_type_id
-      WHERE ${conditions.join(' AND ')}
-      ORDER BY company.name,company.code
-    `,params);
-    return { data,meta:{count:data.length} };
-  }
-
-  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.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 (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') AS "childrenCount",
-        CASE WHEN family.id IS NULL THEN 0 ELSE (
-          SELECT COUNT(*)::integer FROM finding_catalog_item_inventory_families mapping
-          WHERE mapping.inventory_family_id=family.id
-        ) END AS "findingCount",
-        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 (!['departamento','area','yacimiento','instalacion','subinstalacion'].includes(parent.typeCode.toLowerCase())) {
-      throw new BadRequestException({
-        code:'INVENTORY_BROWSER_PARENT_TYPE_INVALID',
-        message:'La navegación de Inventarios admite Departamento → Área → Yacimiento → Instalación → Subinstalación',
-      });
-    }
-    return parent;
-  }
-
-  private allowedChildType(typeCode: string): string | null {
-    switch (typeCode.toLowerCase()) {
-      case 'departamento': return 'area';
-      case 'area': return 'yacimiento';
-      case 'yacimiento': return 'instalacion';
-      case 'instalacion': return 'subinstalacion';
-      default: return null;
-    }
-  }
-}

api-v3/src/asset-master/inventory-family-catalog.controller.ts

@@ -1,99 +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 {
-  CreateInventoryFamilyAttributeDto,
-  UpdateInventoryFamilyAttributeDto,
-} from './dto/inventory-family-attribute.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);
-  }
-
-  @Get(':familyId/attributes')
-  @RequirePermissions('asset_types.read')
-  attributes(@Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string) {
-    return this.families.attributes(familyId);
-  }
-
-  @Post(':familyId/attributes')
-  @RequirePermissions('asset_types.manage')
-  createAttribute(
-    @Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string,
-    @Body() dto:CreateInventoryFamilyAttributeDto,
-    @CurrentAuth() principal:AuthPrincipal,
-    @Req() request:RequestWithContext,
-  ) {
-    return this.families.createAttribute(familyId,dto,principal,request);
-  }
-
-  @Patch(':familyId/attributes/:attributeId')
-  @RequirePermissions('asset_types.manage')
-  updateAttribute(
-    @Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string,
-    @Param('attributeId',new ParseUUIDPipe({version:'4'})) attributeId:string,
-    @Body() dto:UpdateInventoryFamilyAttributeDto,
-    @CurrentAuth() principal:AuthPrincipal,
-    @Req() request:RequestWithContext,
-  ) {
-    return this.families.updateAttribute(familyId,attributeId,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) {

api-v3/src/asset-master/inventory-family-catalog.service.ts

@@ -1,69 +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';
-import type {
-  CreateInventoryFamilyAttributeDto,
-  InventoryFamilyAttributeDataType,
-  UpdateInventoryFamilyAttributeDto,
-} from './dto/inventory-family-attribute.dto';
-
-type FamilyParent = { id: string; code: string; name: string };
-type FamilyRow = {
-  id: string;
-  code: string;
-  name: string;
-  level: 'INSTALLATION' | 'SUBINSTALLATION';
-  informationLabels: string[];
-  sourceReference: string | null;
-  isActive: boolean;
-  parentFamilyIds: string[];
-  parentFamilies: FamilyParent[];
-  assetCount: number;
-  findingCount: number;
-  findingItemIds: string[];
-  technicalAttributeCount: number;
-};
-type AttributeRow = {
-  id: string;
-  inventoryFamilyId: string;
-  code: string;
-  name: string;
-  dataType: InventoryFamilyAttributeDataType;
-  isRequired: boolean;
-  isActive: boolean;
-  unit: string | null;
-  options: string[] | null;
-  sortOrder: number;
-};
+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(this.familySelect(`ORDER BY family.level,family.is_active DESC,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",
@@ -77,369 +36,4 @@ export class InventoryFamilyCatalogService {
     `, [familyId]);
     return { family, items, count: items.length };
   }
-
-  async attributes(familyId: string) {
-    const family = await this.family(familyId, false);
-    const items = await this.attributeRows(this.dataSource.manager, familyId);
-    return { family, items, count: items.length };
-  }
-
-  async create(
-    dto: CreateInventoryFamilyDto,
-    principal: AuthPrincipal,
-    request: RequestWithContext,
-  ) {
-    return this.dataSource.transaction(async (manager) => {
-      const parentIds = await this.validateParents(manager, dto.level, dto.parentFamilyIds ?? [], 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:F6',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');
-      await this.replaceParents(manager, inserted.id, parentIds);
-      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:F6' },
-      },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 nextParentIds = dto.parentFamilyIds === undefined
-        ? before.parentFamilyIds
-        : dto.parentFamilyIds;
-      const parentIds = await this.validateParents(manager,before.level,nextParentIds,familyId);
-      if (before.level === 'SUBINSTALLATION' && dto.parentFamilyIds !== undefined) {
-        await this.assertRemovedCompatibilitiesUnused(manager, familyId, parentIds);
-      }
-      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 (dto.parentFamilyIds !== undefined) await this.replaceParents(manager, familyId, parentIds);
-      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 createAttribute(
-    familyId: string,
-    dto: CreateInventoryFamilyAttributeDto,
-    principal: AuthPrincipal,
-    request: RequestWithContext,
-  ) {
-    return this.dataSource.transaction(async (manager) => {
-      await this.family(familyId,false,manager,true);
-      const options = this.attributeOptions(dto.dataType,dto.options);
-      try {
-        const [created] = (await manager.query(`
-          INSERT INTO inventory_family_attribute_definitions(
-            inventory_family_id,code,name,data_type,is_required,is_active,unit,options,sort_order,created_by,updated_by
-          ) VALUES ($1::uuid,$2,$3,$4::asset_attribute_data_type,$5,true,$6,$7::jsonb,$8,$9::uuid,$9::uuid)
-          RETURNING id,inventory_family_id AS "inventoryFamilyId",code,name,data_type AS "dataType",
-            is_required AS "isRequired",is_active AS "isActive",unit,options,sort_order AS "sortOrder"
-        `,[familyId,dto.code,dto.name,dto.dataType,dto.isRequired ?? false,dto.unit ?? null,
-          options === null ? null : JSON.stringify(options),dto.sortOrder ?? 0,principal.userId])) as AttributeRow[];
-        if (!created) throw new Error('No se pudo crear el campo técnico');
-        await this.audit.record({
-          ...administrationAuditContext(principal,request),
-          action: AuditAction.ASSET_UPDATED,
-          entityType:'inventory_family_attribute',entityId:created.id,
-          afterData:created as unknown as Record<string,unknown>,
-          metadata:{operation:'INVENTORY_FAMILY_ATTRIBUTE_CREATED',inventoryFamilyId:familyId},
-        },manager);
-        return created;
-      } catch (error) {
-        if (this.isUniqueViolation(error)) throw new ConflictException({
-          code:'INVENTORY_FAMILY_ATTRIBUTE_CODE_EXISTS',
-          message:'Ya existe un campo técnico con ese código en la clasificación',
-        });
-        throw error;
-      }
-    });
-  }
-
-  async updateAttribute(
-    familyId: string,
-    attributeId: string,
-    dto: UpdateInventoryFamilyAttributeDto,
-    principal: AuthPrincipal,
-    request: RequestWithContext,
-  ) {
-    return this.dataSource.transaction(async (manager) => {
-      await this.family(familyId,false,manager,true);
-      const before = await this.attribute(manager,familyId,attributeId,true);
-      const nextType = dto.dataType ?? before.dataType;
-      const nextOptions = dto.options === undefined
-        ? this.attributeOptions(nextType,before.options ?? undefined)
-        : this.attributeOptions(nextType,dto.options ?? undefined);
-      const [after] = (await manager.query(`
-        UPDATE inventory_family_attribute_definitions SET
-          name=COALESCE($3::varchar,name),
-          data_type=COALESCE($4::asset_attribute_data_type,data_type),
-          is_required=COALESCE($5::boolean,is_required),
-          is_active=COALESCE($6::boolean,is_active),
-          unit=CASE WHEN $7::boolean THEN $8::varchar ELSE unit END,
-          options=$9::jsonb,
-          sort_order=COALESCE($10::integer,sort_order),
-          updated_by=$11::uuid,updated_at=CURRENT_TIMESTAMP
-        WHERE id=$1::uuid AND inventory_family_id=$2::uuid
-        RETURNING id,inventory_family_id AS "inventoryFamilyId",code,name,data_type AS "dataType",
-          is_required AS "isRequired",is_active AS "isActive",unit,options,sort_order AS "sortOrder"
-      `,[attributeId,familyId,dto.name ?? null,dto.dataType ?? null,dto.isRequired ?? null,dto.isActive ?? null,
-        dto.unit !== undefined,dto.unit ?? null,nextOptions === null ? null : JSON.stringify(nextOptions),
-        dto.sortOrder ?? null,principal.userId])) as AttributeRow[];
-      if (!after) throw new NotFoundException({code:'INVENTORY_FAMILY_ATTRIBUTE_NOT_FOUND',message:'El campo técnico no existe'});
-      await this.audit.record({
-        ...administrationAuditContext(principal,request),
-        action: AuditAction.ASSET_UPDATED,
-        entityType:'inventory_family_attribute',entityId:attributeId,
-        beforeData:before as unknown as Record<string,unknown>,afterData:after as unknown as Record<string,unknown>,
-        metadata:{operation:'INVENTORY_FAMILY_ATTRIBUTE_UPDATED',inventoryFamilyId:familyId},
-      },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 familySelect(suffix:string) {
-    return `
-      SELECT family.id,family.code,family.name,family.level,
-        family.information_labels AS "informationLabels",
-        family.source_reference AS "sourceReference",family.is_active AS "isActive",
-        COALESCE((SELECT JSONB_AGG(rule.parent_family_id ORDER BY parent.name,parent.code)
-          FROM inventory_family_parent_rules rule
-          JOIN inventory_families parent ON parent.id=rule.parent_family_id
-          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilyIds",
-        COALESCE((SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) ORDER BY parent.name,parent.code)
-          FROM inventory_family_parent_rules rule
-          JOIN inventory_families parent ON parent.id=rule.parent_family_id
-          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilies",
-        (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",
-        (SELECT COUNT(*)::integer FROM inventory_family_attribute_definitions definition
-          WHERE definition.inventory_family_id=family.id AND definition.is_active=true) AS "technicalAttributeCount"
-      FROM inventory_families family
-      ${suffix}
-    `;
-  }
-
-  private async family(
-    familyId:string,
-    activeOnly:boolean,
-    manager:EntityManager=this.dataSource.manager,
-    lock=false,
-  ):Promise<FamilyRow> {
-    const lockClause=lock ? 'FOR UPDATE OF family' : '';
-    const rows=(await manager.query(this.familySelect(`
-      WHERE family.id=$1::uuid ${activeOnly ? 'AND family.is_active=true' : ''}
-      ${lockClause}
-    `),[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 validateParents(
-    manager:EntityManager,
-    level:'INSTALLATION'|'SUBINSTALLATION',
-    requestedIds:string[],
-    ownId:string|null,
-  ):Promise<string[]> {
-    const ids=[...new Set(requestedIds)];
-    if (level==='INSTALLATION') {
-      if (ids.length) throw new BadRequestException({
-        code:'INVENTORY_FAMILY_PARENT_NOT_ALLOWED',
-        message:'Una clasificación de Instalación no lleva compatibilidades padre',
-      });
-      return [];
-    }
-    if (!ids.length) throw new BadRequestException({
-      code:'INVENTORY_FAMILY_PARENT_REQUIRED',
-      message:'Elegí al menos un tipo de Instalación compatible con esta Subinstalación',
-    });
-    if (ownId && ids.includes(ownId)) throw new BadRequestException({
-      code:'INVENTORY_FAMILY_PARENT_CYCLE',message:'Una clasificación no puede ser compatible consigo misma',
-    });
-    const [count]=(await manager.query(`
-      SELECT COUNT(*)::integer AS total FROM inventory_families
-      WHERE id=ANY($1::uuid[]) AND level='INSTALLATION' AND is_active=true
-    `,[ids])) as Array<{total:number}>;
-    if (Number(count?.total ?? 0)!==ids.length) throw new BadRequestException({
-      code:'INVENTORY_FAMILY_PARENT_INVALID',
-      message:'Todas las compatibilidades deben ser clasificaciones de Instalación activas',
-    });
-    return ids;
-  }
-
-  private async replaceParents(manager:EntityManager,familyId:string,parentIds:string[]) {
-    await manager.query(`DELETE FROM inventory_family_parent_rules WHERE child_family_id=$1::uuid`,[familyId]);
-    if (parentIds.length) await manager.query(`
-      INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
-      SELECT $1::uuid,parent_id FROM UNNEST($2::uuid[]) AS selected(parent_id)
-      ON CONFLICT (child_family_id,parent_family_id) DO NOTHING
-    `,[familyId,parentIds]);
-  }
-
-  private async assertRemovedCompatibilitiesUnused(manager:EntityManager,childFamilyId:string,nextParentIds:string[]) {
-    const rows=await manager.query(`
-      SELECT child.name AS "childName",parent.name AS "parentName",COUNT(*)::integer AS total
-      FROM assets child
-      JOIN assets parent ON parent.id=child.parent_id
-      WHERE child.inventory_family_id=$1::uuid
-        AND parent.inventory_family_id IS NOT NULL
-        AND NOT (parent.inventory_family_id=ANY($2::uuid[]))
-      GROUP BY child.name,parent.name
-      ORDER BY total DESC
-      LIMIT 1
-    `,[childFamilyId,nextParentIds]);
-    if (rows[0]) throw new ConflictException({
-      code:'INVENTORY_FAMILY_COMPATIBILITY_IN_USE',
-      message:`No podés quitar esa compatibilidad: ya existen Subinstalaciones de este tipo dentro de ${rows[0].parentName}`,
-    });
-  }
-
-  private async attributeRows(manager:EntityManager,familyId:string):Promise<AttributeRow[]> {
-    return manager.query(`
-      SELECT id,inventory_family_id AS "inventoryFamilyId",code,name,data_type AS "dataType",
-        is_required AS "isRequired",is_active AS "isActive",unit,options,sort_order AS "sortOrder"
-      FROM inventory_family_attribute_definitions
-      WHERE inventory_family_id=$1::uuid
-      ORDER BY is_active DESC,sort_order,name,code
-    `,[familyId]) as Promise<AttributeRow[]>;
-  }
-
-  private async attribute(manager:EntityManager,familyId:string,attributeId:string,lock=false):Promise<AttributeRow> {
-    const rows=(await manager.query(`
-      SELECT id,inventory_family_id AS "inventoryFamilyId",code,name,data_type AS "dataType",
-        is_required AS "isRequired",is_active AS "isActive",unit,options,sort_order AS "sortOrder"
-      FROM inventory_family_attribute_definitions
-      WHERE id=$1::uuid AND inventory_family_id=$2::uuid
-      ${lock ? 'FOR UPDATE' : ''}
-    `,[attributeId,familyId])) as AttributeRow[];
-    if (!rows[0]) throw new NotFoundException({code:'INVENTORY_FAMILY_ATTRIBUTE_NOT_FOUND',message:'El campo técnico no existe'});
-    return rows[0];
-  }
-
-  private attributeOptions(type:InventoryFamilyAttributeDataType,raw:string[]|undefined):string[]|null {
-    if (type!=='SELECT') return null;
-    const values=[...new Map((raw ?? []).map((value) => {
-      const clean=value.trim(); return [clean.toLocaleLowerCase('es-AR'),clean] as const;
-    }).filter(([,value]) => Boolean(value))).values()];
-    if (!values.length) throw new BadRequestException({
-      code:'INVENTORY_FAMILY_ATTRIBUTE_OPTIONS_REQUIRED',
-      message:'Un campo de lista necesita al menos una opción',
-    });
-    return values;
-  }
-
-  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()];
-  }
-
-  private isUniqueViolation(error:unknown) {
-    return Boolean(error && typeof error==='object' && 'code' in error && (error as {code?:string}).code==='23505');
-  }
 }

api-v3/src/asset-master/inventory-function.controller.ts

@@ -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);
-  }
-}

api-v3/src/asset-master/inventory-function.service.ts

@@ -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;
-  }
-}

api-v3/src/asset-master/inventory-merge.service.ts

@@ -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> {

api-v3/src/asset-master/inventory-structure.controller.ts

@@ -4,14 +4,10 @@ import { RequirePermissions } from '../authorization/decorators/require-permissi
 import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
 import { CreateInventoryStructureDto } from './dto/create-inventory-structure.dto';
 import { InventoryStructureService } from './inventory-structure.service';
-import { SimpleInventoryStructureService } from './simple-inventory-structure.service';
 
 @Controller('inventory-structure')
 export class InventoryStructureController {
-  constructor(
-    private readonly inventoryStructure: InventoryStructureService,
-    private readonly simpleInventoryStructure: SimpleInventoryStructureService,
-  ) {}
+  constructor(private readonly inventoryStructure: InventoryStructureService) {}
 
   @Get()
   @RequirePermissions('assets.read')
@@ -28,17 +24,6 @@ export class InventoryStructureController {
     return this.inventoryStructure.parents(kind, search);
   }
 
-  @Post('simple')
-  @RequirePermissions('assets.create')
-  createSimple(
-    @Body() dto: CreateInventoryStructureDto,
-    @CurrentAuth() principal: AuthPrincipal,
-    @Req() request: RequestWithContext,
-  ) {
-    return this.simpleInventoryStructure.create(dto, principal, request);
-  }
-
-  // Compatibilidad temporal con el alta anterior. La WEB F7 utiliza /simple.
   @Post()
   @RequirePermissions('assets.create')
   create(

api-v3/src/asset-master/inventory-structure.service.ts

@@ -20,8 +20,6 @@ import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/
 import { AssetHistoryService } from './asset-history.service';
 
 type StructureTypeRow = { id: string; code: string; name: string };
-type SimpleOptionRow = { id: string; code: string; name: string };
-type FamilyParent = { id: string; code: string; name: string };
 type FamilyRow = {
   id: string;
   code: string;
@@ -29,37 +27,28 @@ type FamilyRow = {
   level: 'INSTALLATION' | 'SUBINSTALLATION';
   legacyTypeCode: string | null;
   informationLabels: string[];
-  parentFamilyIds: string[];
-  parentFamilies: FamilyParent[];
+  parentFamilyId: string | null;
+  parentFamilyCode: string | null;
+  parentFamilyName: string | null;
 };
 type ParentRow = {
   id: string;
   code: string;
   name: string;
   typeCode: string;
-  inventoryFamilyId: string | null;
   operationalAreaId: string | null;
   operatorCompanyId: string | null;
-};
-type IdRow = { id: string };
-
-type YacimientoContext = {
-  companyId: string;
-  concessionTypeId: string;
-  concessionName: string;
+  inventoryFamilyId: string | null;
 };
 
-const TYPE_CODE_BY_KIND: Record<Exclude<InventoryStructureKind, 'EMPRESA'>, string> = {
-  DEPARTAMENTO: 'departamento',
+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,
-  DEPARTAMENTO: null,
-  AREA: 'departamento',
+  AREA: null,
   YACIMIENTO: 'area',
   INSTALACION: 'yacimiento',
   SUBINSTALACION: 'instalacion',
@@ -81,76 +70,36 @@ export class InventoryStructureService {
     const types = (await this.dataSource.query(`
       SELECT id,code,name
       FROM asset_types
-      WHERE (
-        lower(code) IN ('departamento','area','yacimiento','instalacion','subinstalacion')
-        OR operational_role='COMPANY'
-      ) AND is_active=true
-      ORDER BY CASE
-        WHEN operational_role='COMPANY' THEN 0
-        WHEN lower(code)='departamento' THEN 1
-        WHEN lower(code)='area' THEN 2
-        WHEN lower(code)='yacimiento' THEN 3
-        WHEN lower(code)='instalacion' THEN 4
-        WHEN lower(code)='subinstalacion' THEN 5 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 departamento = types.find((item) => item.code.toLowerCase()==='departamento');
-    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 || !departamento || !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",
         family.information_labels AS "informationLabels",
-        COALESCE((SELECT JSONB_AGG(rule.parent_family_id ORDER BY parent.name,parent.code)
-          FROM inventory_family_parent_rules rule
-          JOIN inventory_families parent ON parent.id=rule.parent_family_id
-          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilyIds",
-        COALESCE((SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) ORDER BY parent.name,parent.code)
-          FROM inventory_family_parent_rules rule
-          JOIN inventory_families parent ON parent.id=rule.parent_family_id
-          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilies"
+        parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName"
       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.is_active=true
       ORDER BY family.level,family.name,family.code
     `)) as FamilyRow[];
-
-    const companies = (await this.dataSource.query(`
-      SELECT asset.id,asset.code,COALESCE(profile.legal_name,asset.name) AS name
-      FROM assets asset
-      JOIN asset_types type ON type.id=asset.asset_type_id AND type.operational_role='COMPANY' AND type.is_active=true
-      LEFT JOIN organization_profiles profile ON profile.asset_id=asset.id
-      WHERE asset.information_status<>'INACTIVE'
-      ORDER BY COALESCE(profile.legal_name,asset.name),asset.code
-    `)) as SimpleOptionRow[];
-    const concessionTypes = (await this.dataSource.query(`
-      SELECT id,code,name
-      FROM concession_types
-      WHERE is_active=true
-      ORDER BY CASE lower(name) WHEN 'explotación' THEN 1 WHEN 'exploración' THEN 2 ELSE 9 END,name,code
-    `)) as SimpleOptionRow[];
-
     return {
-      independentMasters: [
-        { kind: 'EMPRESA', label: 'Empresa', type: company, parentKind: null, requiresFamily: false },
-      ],
       levels: [
-        { kind: 'DEPARTAMENTO', label: 'Departamento', type: departamento, parentKind: null, requiresFamily: false },
-        { kind: 'AREA', label: 'Área', type: area, parentKind: 'DEPARTAMENTO', 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 },
       ],
-      companies,
-      concessionTypes,
       installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
       subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
     };
@@ -158,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 === 'DEPARTAMENTO' || 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',
@@ -190,7 +139,7 @@ export class InventoryStructureService {
         AND asset.information_status<>'INACTIVE'
         ${searchSql}
       ORDER BY asset.name,asset.code
-      LIMIT 100
+      LIMIT 80
     `, parameters);
     return { data: rows };
   }
@@ -205,82 +154,47 @@ 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 yacimientoContext = await this.requireYacimientoContext(manager, dto);
-        const generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
-        const operationalAreaId = parent && ['YACIMIENTO','INSTALACION','SUBINSTALACION'].includes(dto.kind)
-          ? await this.resolveAreaId(manager, parent)
-          : null;
-        const operatorCompanyId = dto.kind === 'YACIMIENTO'
-          ? yacimientoContext?.companyId ?? null
-          : dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION'
-            ? parent?.operatorCompanyId ?? null
-            : null;
-        const concessionTypeId = dto.kind === 'YACIMIENTO'
-          ? yacimientoContext?.concessionTypeId ?? null
-          : null;
-
-        if ((dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION') && !operatorCompanyId) {
-          throw new ConflictException({
-            code: 'INVENTORY_YACIMIENTO_COMPANY_MISSING',
-            message: 'El Yacimiento de origen no tiene una Empresa relacionada válida',
-          });
-        }
+        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 (
-            asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
+            asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,
             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,$4::uuid,$5::uuid,$6::uuid,
-            $7::varchar,$8::varchar,$9::varchar,$10::text,$11::asset_information_status,$12::asset_operational_status,
-            $13::varchar,$14::varchar,$15::varchar,$16::text,$17::uuid,$17::uuid,$17::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,
-          concessionTypeId,
           family?.id ?? null,
-          generatedCode,
+          code,
           dto.name,
           dto.commonName ?? null,
           dto.description ?? null,
           AssetInformationStatus.DRAFT,
           AssetOperationalStatus.UNKNOWN,
           AssetDataOrigin.MANUAL,
-          dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas' : 'Estructura manual de Inventario',
-          dto.kind === 'EMPRESA' ? 'inventory-master:empresa' : `inventory-structure:${dto.kind.toLowerCase()}`,
-          family
-            ? `Clasificación técnica: ${family.code} · ${family.name}`
-            : yacimientoContext
-              ? `Tipo de concesión: ${yacimientoContext.concessionName}`
-              : null,
+          '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 (dto.kind === 'YACIMIENTO' && operationalAreaId && operatorCompanyId && concessionTypeId) {
-          await this.ensureCompatibilityProjection(
-            manager,
-            operationalAreaId,
-            operatorCompanyId,
-            concessionTypeId,
-            yacimientoContext?.concessionName ?? 'Concesión',
-          );
-        }
+        if (!id) throw new Error('No se pudo crear el registro estructural');
 
         const versionNumber = await this.history.capture(
-          manager,id,AssetVersionChangeType.CREATED,principal,request,
+          manager,
+          id,
+          AssetVersionChangeType.CREATED,
+          principal,
+          request,
         );
         await manager.query(`
           INSERT INTO asset_context_history (
@@ -288,46 +202,53 @@ export class InventoryStructureService {
             change_reason,asset_version_number,source,request_id,created_by
           ) VALUES ($1,$2,$3,$4,CURRENT_TIMESTAMP,$5,$6,'WEB',$7,$8)
         `, [
-          id,parent?.id ?? null,operationalAreaId,operatorCompanyId,
-          dto.kind === 'YACIMIENTO'
-            ? 'Alta manual de Yacimiento con Área, Empresa y Tipo de concesión'
-            : dto.kind === 'EMPRESA'
-              ? 'Alta manual de Empresa independiente'
-              : 'Alta manual de estructura de Inventario',
-          versionNumber,request.requestId,principal.userId,
+          id,
+          parent?.id ?? null,
+          operationalAreaId,
+          operatorCompanyId,
+          'Alta guiada de Inventario estructural F3.1',
+          versionNumber,
+          request.requestId,
+          principal.userId,
         ]);
         const created = await this.loadView(manager, id);
         await this.audit.record({
           ...administrationAuditContext(principal, request),
           action: AuditAction.ASSET_CREATED,
-          entityType: 'asset',entityId: id,
+          entityType: 'asset',
+          entityId: id,
           afterData: created as unknown as Record<string, unknown>,
           metadata: {
-            versionNumber,inventoryStructureKind: dto.kind,
-            inventoryFamilyId: family?.id ?? null,inventoryFamilyCode: family?.code ?? null,
-            operatorCompanyId,
-            concessionTypeId,
+            versionNumber,
+            inventoryStructureKind: dto.kind,
+            inventoryFamilyId: family?.id ?? null,
+            inventoryFamilyCode: family?.code ?? null,
           },
         }, manager);
         return created;
       });
     } catch (error) {
-      if (isUniqueViolation(error)) throw new ConflictException({
-        code: 'ASSET_CODE_ALREADY_EXISTS',message: 'Ya existe un registro con ese código',
-      });
+      if (isUniqueViolation(error)) {
+        throw new ConflictException({
+          code: 'ASSET_CODE_ALREADY_EXISTS',
+          message: 'Ya existe un registro de Inventario con ese código',
+        });
+      }
       throw error;
     }
   }
 
   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[];
-    if (!rows[0]) throw new ConflictException({
-      code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED',message: `El nivel ${kind} no está configurado`,
-    });
+    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',
+        message: `El nivel ${kind} no está configurado`,
+      });
+    }
     return rows[0];
   }
 
@@ -338,23 +259,25 @@ export class InventoryStructureService {
   ): Promise<ParentRow | null> {
     const expectedType = PARENT_TYPE_BY_KIND[kind];
     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 Departamento es un registro raíz y no puede tener padre',
-      });
+      if (parentId) {
+        throw new BadRequestException({
+          code: 'INVENTORY_AREA_MUST_BE_ROOT',
+          message: 'Un Área se crea como registro raíz y no puede tener padre',
+        });
+      }
       return null;
     }
-    if (!parentId) throw new BadRequestException({
-      code: 'INVENTORY_STRUCTURE_PARENT_REQUIRED',
-      message: `Para crear ${kind.toLowerCase()} primero tenés que elegir su ${expectedType}`,
-    });
+    if (!parentId) {
+      throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_PARENT_REQUIRED',
+        message: `Para crear ${kind.toLowerCase()} primero tenés que elegir su ${expectedType}`,
+      });
+    }
     const rows = (await manager.query(`
       SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
-        asset.inventory_family_id AS "inventoryFamilyId",
         asset.operational_area_id AS "operationalAreaId",
-        asset.operator_company_id AS "operatorCompanyId"
+        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
       WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
@@ -362,92 +285,15 @@ export class InventoryStructureService {
     `, [parentId])) as ParentRow[];
     const parent = rows[0];
     if (!parent) throw new NotFoundException({ code: 'INVENTORY_STRUCTURE_PARENT_NOT_FOUND', message: 'El registro padre no existe' });
-    if (parent.typeCode.toLowerCase() !== expectedType) throw new BadRequestException({
-      code: 'INVENTORY_STRUCTURE_PARENT_INVALID',
-      message: 'La jerarquía requerida es Departamento → Área → Yacimiento → Instalación → Subinstalación',
-    });
+    if (parent.typeCode.toLowerCase() !== expectedType) {
+      throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_PARENT_INVALID',
+        message: 'La jerarquía requerida es Área → Yacimiento → Instalación → Subinstalación',
+      });
+    }
     return parent;
   }
 
-  private async requireYacimientoContext(
-    manager: EntityManager,
-    dto: CreateInventoryStructureDto,
-  ): Promise<YacimientoContext | null> {
-    if (dto.kind !== 'YACIMIENTO') {
-      if (dto.operatorCompanyId || dto.concessionTypeId) {
-        throw new BadRequestException({
-          code: 'INVENTORY_YACIMIENTO_CONTEXT_NOT_ALLOWED',
-          message: 'Empresa relacionada y Tipo de concesión sólo corresponden al Yacimiento',
-        });
-      }
-      return null;
-    }
-    if (!dto.operatorCompanyId) {
-      throw new BadRequestException({
-        code: 'INVENTORY_YACIMIENTO_COMPANY_REQUIRED',
-        message: 'Seleccioná la Empresa relacionada del Yacimiento',
-      });
-    }
-    if (!dto.concessionTypeId) {
-      throw new BadRequestException({
-        code: 'INVENTORY_YACIMIENTO_CONCESSION_REQUIRED',
-        message: 'Seleccioná el Tipo de concesión del Yacimiento',
-      });
-    }
-    const companyRows = (await manager.query(`
-      SELECT asset.id
-      FROM assets asset
-      JOIN asset_types type ON type.id=asset.asset_type_id
-      WHERE asset.id=$1::uuid
-        AND type.operational_role='COMPANY'
-        AND type.is_active=true
-        AND asset.information_status<>'INACTIVE'
-      FOR KEY SHARE
-    `,[dto.operatorCompanyId])) as IdRow[];
-    if (!companyRows[0]) throw new BadRequestException({
-      code: 'INVENTORY_YACIMIENTO_COMPANY_INVALID',
-      message: 'La Empresa relacionada seleccionada no es válida',
-    });
-    const concessionRows = (await manager.query(`
-      SELECT id,name
-      FROM concession_types
-      WHERE id=$1::uuid AND is_active=true
-      FOR KEY SHARE
-    `,[dto.concessionTypeId])) as Array<{id:string;name:string}>;
-    if (!concessionRows[0]) throw new BadRequestException({
-      code: 'INVENTORY_YACIMIENTO_CONCESSION_INVALID',
-      message: 'El Tipo de concesión seleccionado no es válido',
-    });
-    return {
-      companyId: dto.operatorCompanyId,
-      concessionTypeId: dto.concessionTypeId,
-      concessionName: concessionRows[0].name,
-    };
-  }
-
-  private async resolveAreaId(manager: EntityManager,parent: ParentRow):Promise<string> {
-    if (parent.typeCode.toLowerCase()==='area') return parent.id;
-    if (parent.operationalAreaId) return parent.operationalAreaId;
-    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,
@@ -458,93 +304,49 @@ export class InventoryStructureService {
     if (!expectedLevel) {
       if (familyId) throw new BadRequestException({
         code: 'INVENTORY_STRUCTURE_FAMILY_NOT_ALLOWED',
-        message: 'Empresa, Departamento, Área y Yacimiento no llevan clasificación técnica',
+        message: 'Área y Yacimiento no llevan familia técnica',
       });
       return null;
     }
     if (!familyId) throw new BadRequestException({
       code: 'INVENTORY_STRUCTURE_FAMILY_REQUIRED',
-      message: `Elegí la clasificación técnica de la ${kind.toLowerCase()}`,
+      message: `Elegí la familia técnica de la ${kind.toLowerCase()}`,
     });
     const rows = (await manager.query(`
       SELECT family.id,family.code,family.name,family.level,
-        family.legacy_type_code AS "legacyTypeCode",family.information_labels AS "informationLabels",
-        COALESCE((SELECT JSONB_AGG(rule.parent_family_id ORDER BY rule.parent_family_id)
-          FROM inventory_family_parent_rules rule WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilyIds",
-        COALESCE((SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) ORDER BY parent.name,parent.code)
-          FROM inventory_family_parent_rules rule JOIN inventory_families parent ON parent.id=rule.parent_family_id
-          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilies"
+        family.legacy_type_code AS "legacyTypeCode",
+        family.information_labels AS "informationLabels",
+        parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName"
       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 AND family.is_active=true
       LIMIT 1
     `, [familyId])) as FamilyRow[];
     const family = rows[0];
-    if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'La clasificación técnica no existe' });
+    if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'La familia técnica no existe' });
     if (family.level !== expectedLevel) throw new BadRequestException({
       code: 'INVENTORY_FAMILY_LEVEL_INVALID',
-      message: 'La clasificación técnica no corresponde al nivel seleccionado',
+      message: 'La familia técnica no corresponde al nivel seleccionado',
     });
-    if (kind === 'SUBINSTALACION') {
-      if (!parent?.inventoryFamilyId) throw new BadRequestException({
-        code:'INVENTORY_PARENT_FAMILY_REQUIRED',
-        message:'La Instalación padre debe tener una clasificación técnica válida',
-      });
-      const [compatible]=(await manager.query(`
-        SELECT 1 AS ok FROM inventory_family_parent_rules
-        WHERE child_family_id=$1::uuid AND parent_family_id=$2::uuid
-        LIMIT 1
-      `,[family.id,parent.inventoryFamilyId])) as Array<{ok:number}>;
-      if (!compatible) throw new BadRequestException({
+    if (kind === 'SUBINSTALACION' && family.parentFamilyId !== parent?.inventoryFamilyId) {
+      throw new BadRequestException({
         code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID',
-        message: 'Ese tipo de Subinstalación no es compatible con la clasificación de la Instalación seleccionada',
+        message: 'La Subinstalación elegida no pertenece a la familia de la Instalación seleccionada',
       });
     }
     return family;
   }
 
-  private async ensureCompatibilityProjection(
-    manager: EntityManager,
-    areaId: string,
-    companyId: string,
-    concessionTypeId: string,
-    concessionName: string,
-  ): Promise<void> {
-    const companyProjection = await manager.query(`
-      SELECT id FROM area_company_relations
-      WHERE area_id=$1::uuid AND company_id=$2::uuid AND relation_role='OPERATOR' AND valid_to IS NULL
-      LIMIT 1
-    `,[areaId,companyId]);
-    if (!companyProjection[0]) {
-      await manager.query(`
-        INSERT INTO area_company_relations(area_id,company_id,relation_role,valid_from,start_reason)
-        VALUES($1::uuid,$2::uuid,'OPERATOR',CURRENT_TIMESTAMP,'Proyección derivada de Yacimiento')
-      `,[areaId,companyId]);
-    }
-    const rightType = concessionName.toLocaleLowerCase('es-AR').includes('explor')
-      ? 'EXPLORATION_PERMIT'
-      : 'EXPLOITATION_CONCESSION';
-    const rightProjection = await manager.query(`
-      SELECT id FROM area_legal_rights
-      WHERE area_id=$1::uuid AND right_type=$2::area_legal_right_type AND status='ACTIVE'
-      LIMIT 1
-    `,[areaId,rightType]);
-    if (!rightProjection[0]) {
-      await manager.query(`
-        INSERT INTO area_legal_rights(area_id,right_type,name,status,notes)
-        VALUES($1::uuid,$2::area_legal_right_type,$3,'ACTIVE',$4)
-      `,[areaId,rightType,`${concessionName} · proyección de Yacimiento`,`Tipo de concesión canónico: ${concessionTypeId}`]);
-    }
-  }
-
   private generatedCode(kind: InventoryStructureKind, name: string): string {
-    const prefix = kind === 'EMPRESA' ? 'EMP'
-      : kind === 'DEPARTAMENTO' ? 'DEP'
-        : kind === 'AREA' ? 'AREA'
-          : kind === 'YACIMIENTO' ? 'YAC'
-            : kind === 'INSTALACION' ? 'INST'
-              : 'SUB';
-    const readable = name.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toUpperCase()
-      .replace(/[^A-Z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 48) || 'REGISTRO';
+    const prefix = kind === 'YACIMIENTO' ? 'YAC' : kind === 'INSTALACION' ? 'INST' : kind === 'SUBINSTALACION' ? 'SUB' : 'AREA';
+    const readable = name
+      .normalize('NFD')
+      .replace(/[\u0300-\u036f]/g, '')
+      .toUpperCase()
+      .replace(/[^A-Z0-9]+/g, '-')
+      .replace(/^-+|-+$/g, '')
+      .slice(0, 48) || 'REGISTRO';
     return `${prefix}-${readable}-${randomUUID().slice(0, 8).toUpperCase()}`.slice(0, 120);
   }
 
@@ -554,9 +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 company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',COALESCE(profile.legal_name,company.name)) END AS "operatorCompany",
-        CASE WHEN concession.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',concession.id,'code',concession.code,'name',concession.name) END AS "concessionType",
         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
@@ -565,10 +364,6 @@ 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 assets company ON company.id=asset.operator_company_id
-      LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
-      LEFT JOIN concession_types concession ON concession.id=asset.concession_type_id
       LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
       WHERE asset.id=$1::uuid
     `, [id]);

api-v3/src/asset-master/inventory-technical-values.controller.ts

@@ -1,28 +0,0 @@
-import { Body, Controller, Get, Param, ParseUUIDPipe, Put, 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 { UpdateInventoryTechnicalValuesDto } from './dto/update-inventory-technical-values.dto';
-import { InventoryTechnicalValuesService } from './inventory-technical-values.service';
-
-@Controller('assets/:assetId/technical-values')
-export class InventoryTechnicalValuesController {
-  constructor(private readonly technical:InventoryTechnicalValuesService) {}
-
-  @Get()
-  @RequirePermissions('assets.read')
-  get(@Param('assetId',new ParseUUIDPipe({version:'4'})) assetId:string) {
-    return this.technical.get(assetId);
-  }
-
-  @Put()
-  @RequirePermissions('assets.update')
-  replace(
-    @Param('assetId',new ParseUUIDPipe({version:'4'})) assetId:string,
-    @Body() dto:UpdateInventoryTechnicalValuesDto,
-    @CurrentAuth() principal:AuthPrincipal,
-    @Req() request:RequestWithContext,
-  ) {
-    return this.technical.replace(assetId,dto,principal,request);
-  }
-}

api-v3/src/asset-master/inventory-technical-values.service.ts

@@ -1,118 +0,0 @@
-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 { AuditAction } from '../database/entities';
-import type { UpdateInventoryTechnicalValuesDto } from './dto/update-inventory-technical-values.dto';
-
-type DefinitionRow = {
-  id:string; code:string; name:string; dataType:'TEXT'|'NUMBER'|'BOOLEAN'|'DATE'|'DATETIME'|'SELECT';
-  isRequired:boolean; isActive:boolean; unit:string|null; options:string[]|null; sortOrder:number;
-};
-type AssetRow = { id:string; inventoryFamilyId:string|null; familyCode:string|null; familyName:string|null; familyLevel:string|null };
-
-@Injectable()
-export class InventoryTechnicalValuesService {
-  constructor(private readonly dataSource:DataSource,private readonly audit:AuditService) {}
-
-  async get(assetId:string) {
-    return this.load(this.dataSource.manager,assetId);
-  }
-
-  async replace(assetId:string,dto:UpdateInventoryTechnicalValuesDto,principal:AuthPrincipal,request:RequestWithContext) {
-    return this.dataSource.transaction(async(manager) => {
-      const before=await this.load(manager,assetId,true);
-      const definitions=before.definitions as DefinitionRow[];
-      const definitionById=new Map(definitions.map((definition)=>[definition.id,definition]));
-      const normalized:Record<string,unknown>={};
-      for (const [definitionId,raw] of Object.entries(dto.values)) {
-        const definition=definitionById.get(definitionId);
-        if (!definition || !definition.isActive) throw new BadRequestException({
-          code:'INVENTORY_TECHNICAL_FIELD_INVALID',message:'Uno o más campos técnicos no pertenecen a la clasificación actual',
-        });
-        const value=this.normalize(definition,raw);
-        if (value!==undefined) normalized[definitionId]=value;
-      }
-      for (const definition of definitions.filter((item)=>item.isActive && item.isRequired)) {
-        if (!(definition.id in normalized)) throw new BadRequestException({
-          code:'INVENTORY_TECHNICAL_FIELD_REQUIRED',message:`Completá el campo técnico obligatorio: ${definition.name}`,
-        });
-      }
-      await manager.query('DELETE FROM asset_inventory_attribute_values WHERE asset_id=$1::uuid',[assetId]);
-      const entries=Object.entries(normalized);
-      if (entries.length) await manager.query(`
-        INSERT INTO asset_inventory_attribute_values(asset_id,definition_id,value,updated_by)
-        SELECT $1::uuid,item.definition_id,item.value,$3::uuid
-        FROM JSONB_TO_RECORDSET($2::jsonb) AS item(definition_id uuid,value jsonb)
-      `,[assetId,JSON.stringify(entries.map(([definition_id,value])=>({definition_id,value}))),principal.userId]);
-      const after=await this.load(manager,assetId);
-      await this.audit.record({
-        ...administrationAuditContext(principal,request),action:AuditAction.ASSET_UPDATED,
-        entityType:'asset_inventory_technical_values',entityId:assetId,
-        beforeData:{values:before.values},afterData:{values:after.values},
-        metadata:{operation:'INVENTORY_TECHNICAL_VALUES_REPLACED',inventoryFamilyId:after.family.id},
-      },manager);
-      return after;
-    });
-  }
-
-  private async load(manager:EntityManager,assetId:string,lock=false) {
-    const rows=(await manager.query(`
-      SELECT asset.id,asset.inventory_family_id AS "inventoryFamilyId",
-        family.code AS "familyCode",family.name AS "familyName",family.level::text AS "familyLevel"
-      FROM assets asset LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
-      WHERE asset.id=$1::uuid ${lock ? 'FOR UPDATE OF asset' : ''}
-    `,[assetId])) as AssetRow[];
-    const asset=rows[0];
-    if (!asset) throw new NotFoundException({code:'ASSET_NOT_FOUND',message:'El registro de Inventario no existe'});
-    if (!asset.inventoryFamilyId || !asset.familyCode || !asset.familyName || !asset.familyLevel) throw new BadRequestException({
-      code:'INVENTORY_TECHNICAL_FAMILY_REQUIRED',message:'Este nivel no tiene clasificación técnica y no admite campos técnicos por rubro',
-    });
-    const definitions=(await manager.query(`
-      SELECT id,code,name,data_type AS "dataType",is_required AS "isRequired",is_active AS "isActive",
-        unit,options,sort_order AS "sortOrder"
-      FROM inventory_family_attribute_definitions
-      WHERE inventory_family_id=$1::uuid
-      ORDER BY is_active DESC,sort_order,name,code
-    `,[asset.inventoryFamilyId])) as DefinitionRow[];
-    const valueRows=await manager.query(`
-      SELECT definition_id AS id,value FROM asset_inventory_attribute_values WHERE asset_id=$1::uuid
-    `,[assetId]) as Array<{id:string;value:unknown}>;
-    return {
-      assetId,
-      family:{id:asset.inventoryFamilyId,code:asset.familyCode,name:asset.familyName,level:asset.familyLevel},
-      definitions,
-      values:Object.fromEntries(valueRows.map((row)=>[row.id,row.value])),
-    };
-  }
-
-  private normalize(definition:DefinitionRow,raw:unknown):unknown|undefined {
-    if (raw===null || raw===undefined || raw==='') return undefined;
-    switch(definition.dataType) {
-      case 'TEXT': {
-        if (typeof raw!=='string') return this.invalid(definition);
-        const value=raw.trim(); if (!value) return undefined; if (value.length>4000) return this.invalid(definition); return value;
-      }
-      case 'NUMBER': {
-        const value=typeof raw==='number' ? raw : typeof raw==='string' ? Number(raw) : Number.NaN;
-        if (!Number.isFinite(value)) return this.invalid(definition); return value;
-      }
-      case 'BOOLEAN': if (typeof raw!=='boolean') return this.invalid(definition); return raw;
-      case 'DATE': {
-        if (typeof raw!=='string' || !/^\d{4}-\d{2}-\d{2}$/.test(raw) || Number.isNaN(Date.parse(`${raw}T00:00:00Z`))) return this.invalid(definition);
-        return raw;
-      }
-      case 'DATETIME': {
-        if (typeof raw!=='string' || Number.isNaN(Date.parse(raw))) return this.invalid(definition); return new Date(raw).toISOString();
-      }
-      case 'SELECT': {
-        if (typeof raw!=='string' || !definition.options?.includes(raw)) return this.invalid(definition); return raw;
-      }
-    }
-  }
-
-  private invalid(definition:DefinitionRow):never {
-    throw new BadRequestException({code:'INVENTORY_TECHNICAL_VALUE_INVALID',message:`Valor inválido para ${definition.name}`});
-  }
-}

api-v3/src/asset-master/merged-inventory-dossier.service.ts

@@ -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,

api-v3/src/asset-master/simple-inventory-structure.service.ts

@@ -1,323 +0,0 @@
-import { randomUUID } from 'node:crypto';
-import {
-  BadRequestException,
-  ConflictException,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
-import { DataSource, EntityManager } from 'typeorm';
-import { administrationAuditContext, isUniqueViolation } from '../administration/common/administration-audit';
-import { AuditService } from '../audit/audit.service';
-import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
-import {
-  AssetDataOrigin,
-  AssetInformationStatus,
-  AssetOperationalStatus,
-  AssetVersionChangeType,
-  AuditAction,
-} from '../database/entities';
-import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/create-inventory-structure.dto';
-import { AssetHistoryService } from './asset-history.service';
-
-type StructureTypeRow = { id: string; code: string; name: string };
-type ParentRow = {
-  id: string;
-  code: string;
-  name: string;
-  typeCode: string;
-  inventoryFamilyId: string | null;
-  operationalAreaId: string | null;
-  operatorCompanyId: string | null;
-};
-type FamilyRow = {
-  id: string;
-  code: string;
-  name: string;
-  level: 'INSTALLATION' | 'SUBINSTALLATION';
-};
-
-const TYPE_CODE_BY_KIND: Record<Exclude<InventoryStructureKind, 'EMPRESA'>, string> = {
-  DEPARTAMENTO: 'departamento',
-  AREA: 'area',
-  YACIMIENTO: 'yacimiento',
-  INSTALACION: 'instalacion',
-  SUBINSTALACION: 'subinstalacion',
-};
-
-const PARENT_TYPE_BY_KIND: Record<InventoryStructureKind, string | null> = {
-  EMPRESA: null,
-  DEPARTAMENTO: null,
-  AREA: 'departamento',
-  YACIMIENTO: 'area',
-  INSTALACION: 'yacimiento',
-  SUBINSTALACION: 'instalacion',
-};
-
-@Injectable()
-export class SimpleInventoryStructureService {
-  constructor(
-    private readonly dataSource: DataSource,
-    private readonly audit: AuditService,
-    private readonly history: AssetHistoryService,
-  ) {}
-
-  async create(
-    dto: CreateInventoryStructureDto,
-    principal: AuthPrincipal,
-    request: RequestWithContext,
-  ) {
-    try {
-      return await this.dataSource.transaction(async (manager) => {
-        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);
-
-        let operationalAreaId: string | null = null;
-        let operatorCompanyId: string | null = null;
-
-        if (dto.kind === 'YACIMIENTO') {
-          if (!parent) throw new BadRequestException({ code: 'INVENTORY_YACIMIENTO_AREA_REQUIRED', message: 'Seleccioná el Área del Yacimiento' });
-          if (!dto.operatorCompanyId) throw new BadRequestException({ code: 'INVENTORY_YACIMIENTO_COMPANY_REQUIRED', message: 'Seleccioná la Empresa operadora del Yacimiento' });
-          await this.requireAreaCompanyRelation(manager, parent.id, dto.operatorCompanyId);
-          operationalAreaId = parent.id;
-          operatorCompanyId = dto.operatorCompanyId;
-        } else if (dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION') {
-          operationalAreaId = parent?.operationalAreaId ?? null;
-          operatorCompanyId = parent?.operatorCompanyId ?? null;
-          if (!operationalAreaId || !operatorCompanyId) {
-            throw new ConflictException({
-              code: 'INVENTORY_YACIMIENTO_CONTEXT_MISSING',
-              message: 'El Yacimiento de origen debe tener Área y Empresa operadora válidas',
-            });
-          }
-        } else if (dto.operatorCompanyId || dto.concessionTypeId) {
-          throw new BadRequestException({
-            code: 'INVENTORY_SIMPLE_CONTEXT_NOT_ALLOWED',
-            message: 'Empresa operadora sólo corresponde al Yacimiento',
-          });
-        }
-
-        const generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
-        const rows = (await manager.query(`
-          INSERT INTO assets (
-            asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
-            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,$4::uuid,NULL,$5::uuid,
-            $6::varchar,$7::varchar,NULL,NULL,$8::asset_information_status,$9::asset_operational_status,
-            $10::varchar,$11::varchar,$12::varchar,$13::text,$14::uuid,$14::uuid,$14::uuid
-          ) RETURNING id
-        `, [
-          type.id,
-          parent?.id ?? null,
-          operationalAreaId,
-          operatorCompanyId,
-          family?.id ?? null,
-          generatedCode,
-          dto.name,
-          AssetInformationStatus.DRAFT,
-          AssetOperationalStatus.UNKNOWN,
-          AssetDataOrigin.MANUAL,
-          dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas' : 'Alta simple de Inventario',
-          `inventory-simple:${dto.kind.toLowerCase()}`,
-          family ? `Tipo: ${family.name}` : null,
-          principal.userId,
-        ])) as Array<{ id: string }>;
-        const id = rows[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]);
-        }
-
-        const versionNumber = await this.history.capture(
-          manager,
-          id,
-          AssetVersionChangeType.CREATED,
-          principal,
-          request,
-        );
-
-        await manager.query(`
-          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,$4,CURRENT_TIMESTAMP,$5,$6,'WEB',$7,$8)
-        `, [
-          id,
-          parent?.id ?? null,
-          operationalAreaId,
-          operatorCompanyId,
-          dto.kind === 'YACIMIENTO'
-            ? 'Alta de Yacimiento con Empresa operadora vinculada al Área'
-            : 'Alta simple de Inventario',
-          versionNumber,
-          request.requestId,
-          principal.userId,
-        ]);
-
-        const created = await this.loadView(manager, id);
-        await this.audit.record({
-          ...administrationAuditContext(principal, request),
-          action: AuditAction.ASSET_CREATED,
-          entityType: 'asset',
-          entityId: id,
-          afterData: created as Record<string, unknown>,
-          metadata: {
-            versionNumber,
-            inventoryStructureKind: dto.kind,
-            inventoryFamilyId: family?.id ?? null,
-            inventoryFamilyCode: family?.code ?? null,
-            operatorCompanyId,
-            simpleInventoryFlow: true,
-          },
-        }, manager);
-        return created;
-      });
-    } catch (error) {
-      if (isUniqueViolation(error)) {
-        throw new ConflictException({ code: 'ASSET_CODE_ALREADY_EXISTS', message: 'Ya existe un registro con ese código' });
-      }
-      throw error;
-    }
-  }
-
-  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[];
-    if (!rows[0]) throw new ConflictException({ code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED', message: `El nivel ${kind} no está configurado` });
-    return rows[0];
-  }
-
-  private async requireParent(
-    manager: EntityManager,
-    kind: InventoryStructureKind,
-    parentId: string | null,
-  ): Promise<ParentRow | null> {
-    const expectedType = PARENT_TYPE_BY_KIND[kind];
-    if (!expectedType) {
-      if (parentId) throw new BadRequestException({ code: 'INVENTORY_ROOT_MUST_NOT_HAVE_PARENT', message: `${kind === 'EMPRESA' ? 'Empresa' : 'Departamento'} no admite padre` });
-      return null;
-    }
-    if (!parentId) throw new BadRequestException({ code: 'INVENTORY_PARENT_REQUIRED', message: `Seleccioná el nivel superior para crear ${kind.toLowerCase()}` });
-
-    const rows = (await manager.query(`
-      SELECT asset.id,asset.code,asset.name,lower(type.code) AS "typeCode",
-        asset.inventory_family_id AS "inventoryFamilyId",
-        CASE WHEN lower(type.code)='area' THEN asset.id ELSE asset.operational_area_id END AS "operationalAreaId",
-        asset.operator_company_id AS "operatorCompanyId"
-      FROM assets asset
-      JOIN asset_types type ON type.id=asset.asset_type_id
-      WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
-      FOR KEY SHARE OF asset
-    `, [parentId])) as ParentRow[];
-    const parent = rows[0];
-    if (!parent || parent.typeCode !== expectedType) {
-      throw new BadRequestException({ code: 'INVENTORY_PARENT_INVALID', message: `El registro padre debe ser ${expectedType}` });
-    }
-    return parent;
-  }
-
-  private async requireAreaCompanyRelation(manager: EntityManager, areaId: string, companyId: string): Promise<void> {
-    const rows = await manager.query(`
-      SELECT 1
-      FROM area_company_relations relation
-      JOIN assets company ON company.id=relation.company_id
-      JOIN asset_types company_type ON company_type.id=company.asset_type_id
-      WHERE relation.area_id=$1::uuid
-        AND relation.company_id=$2::uuid
-        AND relation.relation_role='OPERATOR'
-        AND relation.valid_until IS NULL
-        AND company.information_status<>'INACTIVE'
-        AND company_type.operational_role='COMPANY'
-        AND company_type.is_active=true
-      LIMIT 1
-      FOR KEY SHARE OF relation
-    `, [areaId, companyId]);
-    if (!rows[0]) {
-      throw new BadRequestException({
-        code: 'INVENTORY_YACIMIENTO_COMPANY_NOT_IN_AREA',
-        message: 'La Empresa seleccionada no está vinculada como explotadora del Área',
-      });
-    }
-  }
-
-  private async requireFamily(
-    manager: EntityManager,
-    kind: InventoryStructureKind,
-    familyId: string | null,
-    parent: ParentRow | null,
-  ): Promise<FamilyRow | null> {
-    if (kind !== 'INSTALACION' && kind !== 'SUBINSTALACION') {
-      if (familyId) throw new BadRequestException({ code: 'INVENTORY_FAMILY_NOT_ALLOWED', message: 'Este nivel no usa Tipo de Instalación/Subinstalación' });
-      return null;
-    }
-    if (!familyId) throw new BadRequestException({ code: 'INVENTORY_FAMILY_REQUIRED', message: `Seleccioná el tipo de ${kind === 'INSTALACION' ? 'Instalación' : 'Subinstalación'}` });
-
-    const rows = (await manager.query(`
-      SELECT id,code,name,level::text AS level
-      FROM inventory_families
-      WHERE id=$1::uuid AND is_active=true
-      LIMIT 1
-      FOR KEY SHARE
-    `, [familyId])) as FamilyRow[];
-    const family = rows[0];
-    if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'El tipo seleccionado no existe o está oculto' });
-    const expected = kind === 'INSTALACION' ? 'INSTALLATION' : 'SUBINSTALLATION';
-    if (family.level !== expected) throw new BadRequestException({ code: 'INVENTORY_FAMILY_LEVEL_INVALID', message: 'El tipo seleccionado no corresponde a este nivel' });
-
-    if (kind === 'SUBINSTALACION') {
-      if (!parent?.inventoryFamilyId) throw new BadRequestException({ code: 'INVENTORY_PARENT_FAMILY_REQUIRED', message: 'La Instalación debe tener un tipo configurado' });
-      const compatible = await manager.query(`
-        SELECT 1 FROM inventory_family_parent_rules
-        WHERE child_family_id=$1::uuid AND parent_family_id=$2::uuid
-        LIMIT 1
-      `, [family.id, parent.inventoryFamilyId]);
-      if (!compatible[0]) throw new BadRequestException({ code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID', message: 'Ese tipo de Subinstalación no está habilitado dentro de la Instalación seleccionada' });
-    }
-    return family;
-  }
-
-  private generatedCode(kind: InventoryStructureKind, name: string): string {
-    const prefix = kind === 'EMPRESA' ? 'EMP'
-      : kind === 'DEPARTAMENTO' ? 'DEP'
-        : kind === 'AREA' ? 'AREA'
-          : kind === 'YACIMIENTO' ? 'YAC'
-            : kind === 'INSTALACION' ? 'INST'
-              : 'SUB';
-    const readable = name.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toUpperCase()
-      .replace(/[^A-Z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 48) || 'REGISTRO';
-    return `${prefix}-${readable}-${randomUUID().slice(0, 8).toUpperCase()}`.slice(0, 120);
-  }
-
-  private async loadView(manager: EntityManager, id: string) {
-    const rows = await manager.query(`
-      SELECT asset.id,asset.code,asset.name,asset.common_name AS "commonName",asset.description,
-        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 company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',COALESCE(profile.legal_name,company.name)) END AS "operatorCompany",
-        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",
-        asset.created_at AS "createdAt",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 assets company ON company.id=asset.operator_company_id
-      LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
-      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
-      WHERE asset.id=$1::uuid
-    `, [id]);
-    return rows[0];
-  }
-}

api-v3/src/dashboard/dashboard.service.ts

@@ -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(),
       };

api-v3/src/database/entities/asset-version.entity.ts

@@ -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',

api-v3/src/database/entities/asset.entity.ts

@@ -33,7 +33,6 @@ export enum AssetDataOrigin {
 @Index('idx_assets_parent_id', ['parentId'])
 @Index('idx_assets_operational_area_id', ['operationalAreaId'])
 @Index('idx_assets_operator_company_id', ['operatorCompanyId'])
-@Index('idx_assets_concession_type_id', ['concessionTypeId'])
 @Index('idx_assets_inventory_family_id', ['inventoryFamilyId'])
 @Index('idx_assets_information_status', ['informationStatus'])
 @Index('idx_assets_operational_status', ['operationalStatus'])
@@ -55,15 +54,9 @@ export class Asset extends TimestampedEntity {
   @Column({ name: 'operator_company_id', type: 'uuid', nullable: true })
   operatorCompanyId!: string | null;
 
-  @Column({ name: 'concession_type_id', type: 'uuid', nullable: true })
-  concessionTypeId!: string | null;
-
   @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;
 

api-v3/src/database/entities/audit-event.entity.ts

@@ -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',

api-v3/src/database/entities/index.ts

@@ -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,
 ];

api-v3/src/database/entities/inspection-act-version.entity.ts

@@ -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',

api-v3/src/database/entities/inspection-act.entity.ts

@@ -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,15 +21,9 @@ 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',
 }
 
-// Una Inspección puede acumular múltiples Actas. El índice parcial de DRAFT es
-// deliberado: permite el historial multi-Acta y bloquea dos borradores simultáneos.
 @Entity({ name: 'inspection_acts' })
 @Index('uq_inspection_acts_one_draft_per_visit', ['visitId'], { unique: true, where: "status = 'DRAFT'" })
 @Index('uq_inspection_acts_year_number', ['actYear', 'actNumber'], { unique: true })
@@ -39,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;
@@ -53,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 })
@@ -71,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;

api-v3/src/database/entities/inspection-business-calendar-day.entity.ts

@@ -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;
-}

api-v3/src/database/entities/inspection-deadline-policy.entity.ts

@@ -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;

api-v3/src/database/entities/inspection-finding.entity.ts

@@ -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;
 

api-v3/src/database/entities/inspection-non-working-day.entity.ts

@@ -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;
+}

api-v3/src/database/entities/inspection-report-follow-up-file.entity.ts

@@ -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;
+}

api-v3/src/database/entities/inspection-report-follow-up.entity.ts

@@ -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;
 }

api-v3/src/database/entities/inspection-report.entity.ts

@@ -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;
 

api-v3/src/database/entities/inspection-visit.entity.ts

@@ -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;
 

api-v3/src/database/entities/system-smtp-settings.entity.ts

@@ -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;
-}

api-v3/src/database/migrations/1790000000000-f4-document-workflow-foundation.ts

@@ -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`);
-  }
-}

api-v3/src/database/migrations/1790000100000-f4-inventory-function-history.ts

@@ -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');
-  }
-}

api-v3/src/database/migrations/1790000200000-f4-company-signature-invites.ts

@@ -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');
-  }
-}

api-v3/src/database/migrations/1790000300000-f4-remove-survey-subsystem.ts

@@ -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}`);
-  }
-}

api-v3/src/database/migrations/1790000400000-f4-remove-director-report-legacy.ts

@@ -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
-    `);
-  }
-}

api-v3/src/database/migrations/1790000500000-f4-remove-inspection-legacy-fields.ts

@@ -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`);
-  }
-}

api-v3/src/database/migrations/1790000600000-f4-align-document-lifecycle-constraints.ts

@@ -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
-      $$
-    `);
-  }
-}

api-v3/src/database/migrations/1790000700000-f4-align-asset-version-function-change.ts

@@ -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'
-      ))
-    `);
-  }
-}

api-v3/src/database/migrations/1790035200000-phase-f4-document-flow-foundation.ts

@@ -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
+    `);
+  }
+}

api-v3/src/database/migrations/1790038800000-phase-f4-deadline-administration.ts

@@ -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'
+    `);
+  }
+}

api-v3/src/database/migrations/1790042400000-phase-f4-report-dossier-permissions.ts

@@ -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'
+      )
+    `);
+  }
+}

api-v3/src/database/migrations/1790046000000-phase-f4-document-numbering.ts

@@ -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()`);
+  }
+}

api-v3/src/database/migrations/1790049600000-phase-f4-smtp-superadmin.ts

@@ -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`);
+  }
+}

api-v3/src/database/migrations/1790053200000-phase-f4-remove-survey-subsystem.ts

@@ -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.
+  }
+}

api-v3/src/database/migrations/1790056800000-phase-f4-sealed-acts.ts

@@ -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()`);
+  }
+}

api-v3/src/database/migrations/1790087100000-f5-inventory-physical-instance.ts

@@ -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');
-  }
-}

api-v3/src/database/migrations/1790087150000-f5-canonical-inventory-hierarchy.ts

@@ -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];
-  }
-}