Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b86dbbc17 | ||
|
|
0279c22e20 | ||
|
|
2571bda8c4 |
+1
-11
@@ -21,20 +21,10 @@ ACCESS_COOKIE_NAME=dhv2_access
|
|||||||
REFRESH_COOKIE_NAME=dhv2_refresh
|
REFRESH_COOKIE_NAME=dhv2_refresh
|
||||||
CSRF_COOKIE_NAME=dhv2_csrf
|
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_WORD_ROOT=/app/storage/asset-media/inspection-reports-word
|
||||||
INSPECTION_REPORT_REVISION_ROOT=/app/storage/asset-media/inspection-report-revisions
|
INSPECTION_REPORT_REVISION_ROOT=/app/storage/asset-media/inspection-report-revisions
|
||||||
|
|
||||||
INSPECTION_ACT_PDF_ROOT=/app/storage/asset-media/inspection-acts-pdf
|
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_HOST=
|
||||||
SMTP_PORT=587
|
SMTP_PORT=587
|
||||||
SMTP_SECURE=false
|
SMTP_SECURE=false
|
||||||
|
|||||||
@@ -1,151 +0,0 @@
|
|||||||
name: Android CI / RC
|
|
||||||
# F6.1 presentation barrier: lint + real tests + debug artifact + release compile.
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'main'
|
|
||||||
- 'release/f6-1*'
|
|
||||||
paths:
|
|
||||||
- 'android-app/**'
|
|
||||||
- 'api-v3/src/**'
|
|
||||||
- '.github/workflows/android.yml'
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- 'main'
|
|
||||||
paths:
|
|
||||||
- 'android-app/**'
|
|
||||||
- 'api-v3/src/**'
|
|
||||||
- '.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
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 35
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Java 17
|
|
||||||
uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
distribution: temurin
|
|
||||||
java-version: '17'
|
|
||||||
|
|
||||||
- name: Android SDK
|
|
||||||
uses: android-actions/setup-android@v3
|
|
||||||
|
|
||||||
- name: Android API 36
|
|
||||||
run: sdkmanager 'platforms;android-36' 'build-tools;36.0.0'
|
|
||||||
|
|
||||||
- name: Gradle 8.13
|
|
||||||
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
|
|
||||||
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 :app:lintRelease
|
|
||||||
|
|
||||||
- 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
|
|
||||||
working-directory: android-app
|
|
||||||
run: gradle --no-daemon :app:assembleDebug
|
|
||||||
|
|
||||||
- name: Compile unsigned release variant
|
|
||||||
working-directory: android-app
|
|
||||||
run: gradle --no-daemon :app:assembleRelease
|
|
||||||
|
|
||||||
- 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
|
|
||||||
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/*
|
|
||||||
if-no-files-found: error
|
|
||||||
retention-days: 30
|
|
||||||
|
|
||||||
- name: Upload unsigned release candidate
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: DH-Inspeccion-${{ steps.package.outputs.version }}-vc${{ steps.package.outputs.version_code }}-${{ steps.package.outputs.short_sha }}-UNSIGNED
|
|
||||||
path: android-app/app/build/outputs/apk/release/app-release-unsigned.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
|
|
||||||
@@ -47,8 +47,6 @@ jobs:
|
|||||||
cache-dependency-path: web-v2/package-lock.json
|
cache-dependency-path: web-v2/package-lock.json
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
- run: npm run typecheck
|
- run: npm run typecheck
|
||||||
- name: F3.1 WEB contract
|
|
||||||
run: bash ../scripts/check-f3-1-web-contract.sh
|
|
||||||
- run: npm run build
|
- run: npm run build
|
||||||
|
|
||||||
contract:
|
contract:
|
||||||
@@ -62,288 +60,7 @@ jobs:
|
|||||||
while IFS= read -r -d '' script; do
|
while IFS= read -r -d '' script; do
|
||||||
bash -n "$script"
|
bash -n "$script"
|
||||||
done < <(find scripts -type f -name '*.sh' -print0)
|
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
|
- name: Validate Compose
|
||||||
run: docker compose --env-file .env.example config >/dev/null
|
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
|
|
||||||
|
|
||||||
# In containerized runners (Gitea DinD), 127.0.0.1 of the job
|
|
||||||
# is not the Docker daemon host. Probe the production API from
|
|
||||||
# inside its own container so this barrier works on GitHub and Gitea.
|
|
||||||
api_ready=0
|
|
||||||
for _ in $(seq 1 30); do
|
|
||||||
if docker compose --env-file .env.example exec -T api \
|
|
||||||
node -e 'fetch(`http://127.0.0.1:${process.env.API_PORT}/api/v3/health`).then(async r => { const t = await r.text(); process.stdout.write(t); if (!r.ok) process.exit(1); }).catch(() => process.exit(1))' \
|
|
||||||
>/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
|
|
||||||
run: |
|
|
||||||
set -Eeuo pipefail
|
|
||||||
image="dhv2-api:ci-vps-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" \
|
|
||||||
-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
|
- name: Build production images
|
||||||
run: docker compose --env-file .env.example build api migrate web
|
run: docker compose --env-file .env.example build api migrate web
|
||||||
|
|||||||
@@ -1,136 +0,0 @@
|
|||||||
name: F2.2 Integration CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'feature/f2-2*'
|
|
||||||
paths:
|
|
||||||
- 'api-v3/**'
|
|
||||||
- 'web-v2/**'
|
|
||||||
- 'scripts/**'
|
|
||||||
- 'docker-compose.yml'
|
|
||||||
- '.github/workflows/f2-2-ci.yml'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
api:
|
|
||||||
name: API · typecheck, tests, build
|
|
||||||
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
|
|
||||||
- run: npm ci
|
|
||||||
- run: npm run typecheck
|
|
||||||
- run: npm test
|
|
||||||
- run: npm run build
|
|
||||||
|
|
||||||
migrations:
|
|
||||||
name: DB · migrations on PostgreSQL 16/PostGIS
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgis/postgis:16-3.4
|
|
||||||
env:
|
|
||||||
POSTGRES_USER: dhv2_owner
|
|
||||||
POSTGRES_PASSWORD: owner_test_password
|
|
||||||
POSTGRES_DB: dhv2_ci
|
|
||||||
ports:
|
|
||||||
- 5432:5432
|
|
||||||
options: >-
|
|
||||||
--health-cmd "pg_isready -U dhv2_owner -d dhv2_ci"
|
|
||||||
--health-interval 5s
|
|
||||||
--health-timeout 5s
|
|
||||||
--health-retries 20
|
|
||||||
env:
|
|
||||||
DB_HOST: 127.0.0.1
|
|
||||||
DB_PORT: 5432
|
|
||||||
DB_NAME: dhv2_ci
|
|
||||||
DB_MIGRATION_USER: dhv2_owner
|
|
||||||
DB_MIGRATION_PASSWORD: owner_test_password
|
|
||||||
DB_APP_USER: dhv2_app
|
|
||||||
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: PostgreSQL client
|
|
||||||
run: |
|
|
||||||
command -v psql >/dev/null || {
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y postgresql-client
|
|
||||||
}
|
|
||||||
- name: Prepare roles and extensions
|
|
||||||
env:
|
|
||||||
PGPASSWORD: owner_test_password
|
|
||||||
run: |
|
|
||||||
psql -v ON_ERROR_STOP=1 -h 127.0.0.1 -U dhv2_owner -d dhv2_ci <<'SQL'
|
|
||||||
CREATE EXTENSION IF NOT EXISTS postgis;
|
|
||||||
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname='dhv2_app') THEN
|
|
||||||
CREATE ROLE dhv2_app LOGIN PASSWORD 'app_test_password';
|
|
||||||
END IF;
|
|
||||||
END
|
|
||||||
$$;
|
|
||||||
GRANT CONNECT ON DATABASE dhv2_ci TO dhv2_app;
|
|
||||||
GRANT USAGE ON SCHEMA public TO dhv2_app;
|
|
||||||
|
|
||||||
-- This reset was a one-time late production operation. It is marked as
|
|
||||||
-- executed on the clean CI database so the historical schema can be
|
|
||||||
-- constructed chronologically without running that production-only wipe.
|
|
||||||
CREATE TABLE IF NOT EXISTS typeorm_migrations (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
timestamp bigint NOT NULL,
|
|
||||||
name varchar NOT NULL
|
|
||||||
);
|
|
||||||
INSERT INTO typeorm_migrations (timestamp,name)
|
|
||||||
VALUES (1788652800000,'ResetProductionOperationalData1788652800000');
|
|
||||||
SQL
|
|
||||||
- run: npm ci
|
|
||||||
- run: npm run build
|
|
||||||
- name: Run every pending migration
|
|
||||||
run: npm run migration:run
|
|
||||||
- name: Assert no pending migrations
|
|
||||||
run: |
|
|
||||||
npm run migration:show | tee /tmp/migrations.txt
|
|
||||||
grep -Fq 'Pending migrations: no' /tmp/migrations.txt
|
|
||||||
- name: Assert F2.2.1 reference import
|
|
||||||
env:
|
|
||||||
PGPASSWORD: owner_test_password
|
|
||||||
run: |
|
|
||||||
test "$(psql -At -h 127.0.0.1 -U dhv2_owner -d dhv2_ci -c "SELECT count(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE a.data_origin='IMPORT' AND a.source_name='Tablas de yacimiento(1).xlsx' AND lower(t.code)='yacimiento'")" = "230"
|
|
||||||
test "$(psql -At -h 127.0.0.1 -U dhv2_owner -d dhv2_ci -c "SELECT count(*) FROM assets WHERE (operational_area_id IS NULL) <> (operator_company_id IS NULL)")" = "0"
|
|
||||||
test "$(psql -At -h 127.0.0.1 -U dhv2_owner -d dhv2_ci -c "SELECT count(*) FROM source_documents WHERE document_number IN ('DH-F221-TERRITORIO','DH-F221-APP')")" = "2"
|
|
||||||
|
|
||||||
web:
|
|
||||||
name: WEB · typecheck, build
|
|
||||||
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
|
|
||||||
- run: npm ci
|
|
||||||
- run: npm run typecheck
|
|
||||||
- run: npm run build
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
name: F2.3 Field Finding CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'feature/f2-3*'
|
|
||||||
paths:
|
|
||||||
- 'api-v3/**'
|
|
||||||
- '.github/workflows/f2-3-ci.yml'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
api:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 20
|
|
||||||
defaults:
|
|
||||||
run:
|
|
||||||
working-directory: api-v3
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Node 24
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '24'
|
|
||||||
cache: npm
|
|
||||||
cache-dependency-path: api-v3/package-lock.json
|
|
||||||
- name: Install
|
|
||||||
run: npm ci
|
|
||||||
- name: Typecheck
|
|
||||||
run: npm run typecheck 2>&1 | tee typecheck.log
|
|
||||||
- name: Upload TypeScript diagnostic
|
|
||||||
if: always()
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: f2-3-typecheck-diagnostic
|
|
||||||
path: api-v3/typecheck.log
|
|
||||||
if-no-files-found: warn
|
|
||||||
retention-days: 3
|
|
||||||
- name: Tests
|
|
||||||
run: npm test 2>&1 | tee test.log
|
|
||||||
- name: Upload test diagnostic
|
|
||||||
if: always()
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: f2-3-test-diagnostic
|
|
||||||
path: api-v3/test.log
|
|
||||||
if-no-files-found: warn
|
|
||||||
retention-days: 3
|
|
||||||
- name: Build
|
|
||||||
run: npm run build 2>&1 | tee build.log
|
|
||||||
- name: Upload build diagnostic
|
|
||||||
if: always()
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: f2-3-build-diagnostic
|
|
||||||
path: api-v3/build.log
|
|
||||||
if-no-files-found: warn
|
|
||||||
retention-days: 3
|
|
||||||
@@ -1,205 +0,0 @@
|
|||||||
name: F3.1 Inventory CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'feature/f3-1*'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
api:
|
|
||||||
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 2>&1 | tee typecheck.log
|
|
||||||
- name: Tests
|
|
||||||
run: npm test 2>&1 | tee test.log
|
|
||||||
- name: Build
|
|
||||||
run: npm run build 2>&1 | tee build.log
|
|
||||||
- name: Diagnostics
|
|
||||||
if: always()
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: f3-1-api-diagnostics
|
|
||||||
path: |
|
|
||||||
api-v3/typecheck.log
|
|
||||||
api-v3/test.log
|
|
||||||
api-v3/build.log
|
|
||||||
if-no-files-found: warn
|
|
||||||
retention-days: 3
|
|
||||||
|
|
||||||
migrations:
|
|
||||||
name: DB · F3.1 on PostgreSQL 16/PostGIS
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 30
|
|
||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgis/postgis:16-3.4
|
|
||||||
env:
|
|
||||||
POSTGRES_USER: dhv2_owner
|
|
||||||
POSTGRES_PASSWORD: owner_test_password
|
|
||||||
POSTGRES_DB: dhv2_ci
|
|
||||||
ports:
|
|
||||||
- 5432:5432
|
|
||||||
options: >-
|
|
||||||
--health-cmd "pg_isready -U dhv2_owner -d dhv2_ci"
|
|
||||||
--health-interval 5s
|
|
||||||
--health-timeout 5s
|
|
||||||
--health-retries 20
|
|
||||||
env:
|
|
||||||
DB_HOST: 127.0.0.1
|
|
||||||
DB_PORT: 5432
|
|
||||||
DB_NAME: dhv2_ci
|
|
||||||
DB_MIGRATION_USER: dhv2_owner
|
|
||||||
DB_MIGRATION_PASSWORD: owner_test_password
|
|
||||||
DB_APP_USER: dhv2_app
|
|
||||||
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: PostgreSQL client
|
|
||||||
run: |
|
|
||||||
command -v psql >/dev/null || {
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y postgresql-client
|
|
||||||
}
|
|
||||||
- name: Prepare roles and extensions
|
|
||||||
env:
|
|
||||||
PGPASSWORD: owner_test_password
|
|
||||||
run: |
|
|
||||||
psql -v ON_ERROR_STOP=1 -h 127.0.0.1 -U dhv2_owner -d dhv2_ci <<'SQL'
|
|
||||||
CREATE EXTENSION IF NOT EXISTS postgis;
|
|
||||||
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname='dhv2_app') THEN
|
|
||||||
CREATE ROLE dhv2_app LOGIN PASSWORD 'app_test_password';
|
|
||||||
END IF;
|
|
||||||
END
|
|
||||||
$$;
|
|
||||||
GRANT CONNECT ON DATABASE dhv2_ci TO dhv2_app;
|
|
||||||
GRANT USAGE ON SCHEMA public TO dhv2_app;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS typeorm_migrations (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
timestamp bigint NOT NULL,
|
|
||||||
name varchar NOT NULL
|
|
||||||
);
|
|
||||||
INSERT INTO typeorm_migrations (timestamp,name)
|
|
||||||
VALUES (1788652800000,'ResetProductionOperationalData1788652800000');
|
|
||||||
SQL
|
|
||||||
- run: npm ci
|
|
||||||
- run: npm run build
|
|
||||||
- name: Run every pending migration
|
|
||||||
run: npm run migration:run
|
|
||||||
- name: Assert no pending migrations
|
|
||||||
run: |
|
|
||||||
npm run migration:show | tee /tmp/migrations.txt
|
|
||||||
grep -Fq 'Pending migrations: no' /tmp/migrations.txt
|
|
||||||
- name: Assert F3.1 structure, merges and Inspector profile
|
|
||||||
env:
|
|
||||||
PGPASSWORD: owner_test_password
|
|
||||||
run: |
|
|
||||||
set -Eeuo pipefail
|
|
||||||
|
|
||||||
query() {
|
|
||||||
psql -At -v ON_ERROR_STOP=1 \
|
|
||||||
-h 127.0.0.1 \
|
|
||||||
-U dhv2_owner \
|
|
||||||
-d dhv2_ci \
|
|
||||||
-c "$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
assert_eq() {
|
|
||||||
local expected="$1"
|
|
||||||
local sql="$2"
|
|
||||||
local actual
|
|
||||||
actual="$(query "$sql")"
|
|
||||||
if [ "$actual" != "$expected" ]; then
|
|
||||||
echo "ASSERT FAILED"
|
|
||||||
echo "SQL: $sql"
|
|
||||||
echo "Expected: $expected"
|
|
||||||
echo "Actual: $actual"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
assert_eq 15 "SELECT count(*) FROM inventory_families WHERE level='INSTALLATION' AND is_active=true"
|
|
||||||
assert_eq 124 "SELECT count(*) FROM inventory_families WHERE level='SUBINSTALLATION' AND is_active=true"
|
|
||||||
assert_eq 16 "SELECT count(*) FROM inventory_families WHERE source_reference LIKE 'SYSTEM:F3.1:OTHER%'"
|
|
||||||
assert_eq 1 "SELECT count(*) FROM finding_categories WHERE lower(code)='app26r2' AND is_active=true"
|
|
||||||
assert_eq 1 "SELECT count(*) FROM finding_categories WHERE lower(code)='app26' AND is_active=false"
|
|
||||||
|
|
||||||
assert_eq 1 "SELECT count(*) FROM information_schema.tables WHERE table_name='asset_merges'"
|
|
||||||
assert_eq 1 "SELECT count(*) FROM pg_trigger WHERE tgname='trg_asset_merges_append_only' AND NOT tgisinternal"
|
|
||||||
assert_eq 1 "SELECT count(*) FROM information_schema.tables WHERE table_name='finding_catalog_item_merges'"
|
|
||||||
assert_eq 1 "SELECT count(*) FROM pg_trigger WHERE tgname='trg_finding_catalog_item_merges_append_only' AND NOT tgisinternal"
|
|
||||||
|
|
||||||
assert_eq 4 "SELECT count(*) FROM information_schema.columns WHERE table_name='users' AND column_name IN ('dni','phone','job_title','employee_number')"
|
|
||||||
assert_eq 2 "SELECT count(*) FROM pg_trigger WHERE tgname IN ('trg_user_roles_inspector_email','trg_users_inspector_email') AND NOT tgisinternal"
|
|
||||||
assert_eq 1 "SELECT count(*) FROM information_schema.columns WHERE table_name='inspection_document_deliveries' AND column_name='recipient_user_id'"
|
|
||||||
assert_eq 1 "SELECT count(*) FROM pg_constraint WHERE conname='chk_inspection_document_deliveries_recipient_kind' AND pg_get_constraintdef(oid) LIKE '%INSPECTOR%'"
|
|
||||||
assert_eq 1 "SELECT count(*) FROM pg_constraint WHERE conname='fk_inspection_document_deliveries_recipient_user'"
|
|
||||||
|
|
||||||
assert_eq 230 "SELECT count(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE a.data_origin='IMPORT' AND a.source_name='Tablas de yacimiento(1).xlsx' AND lower(t.code)='yacimiento'"
|
|
||||||
assert_eq 0 "SELECT count(*) FROM assets WHERE (operational_area_id IS NULL) <> (operator_company_id IS NULL)"
|
|
||||||
|
|
||||||
web:
|
|
||||||
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
|
|
||||||
- name: Typecheck
|
|
||||||
run: npm run typecheck 2>&1 | tee typecheck.log
|
|
||||||
- name: Build
|
|
||||||
run: npm run build 2>&1 | tee build.log
|
|
||||||
- name: Diagnostics
|
|
||||||
if: always()
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: f3-1-web-diagnostics
|
|
||||||
path: |
|
|
||||||
web-v2/typecheck.log
|
|
||||||
web-v2/build.log
|
|
||||||
if-no-files-found: warn
|
|
||||||
retention-days: 3
|
|
||||||
|
|
||||||
docker:
|
|
||||||
needs: [api, web, migrations]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 25
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Validate Compose
|
|
||||||
run: docker compose --env-file .env.example config >/dev/null
|
|
||||||
- name: Build production images
|
|
||||||
run: docker compose --env-file .env.example build api migrate web
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
name: F3.2 Multi-Acta CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'feature/f3-2*'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
api:
|
|
||||||
name: API · F3.2
|
|
||||||
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:f3-2-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
|
|
||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -1,31 +1,35 @@
|
|||||||
|
# DH Inspección V2 · D5.6.2
|
||||||
|
|
||||||
|
Hotfix de mantenimiento de Fase D para accesos Android y contrato de regresión de cierre.
|
||||||
|
|
||||||
# DH Inspección V2
|
# DH Inspección V2
|
||||||
|
|
||||||
Repositorio del sistema DH Inspección V2.
|
Versión: **0.19.5-1**
|
||||||
|
Fase: **D5.5.1 · Corrección de staging de planificación**
|
||||||
|
|
||||||
## Componentes
|
D5.5.1 conserva íntegramente D5.5 y corrige únicamente el contrato de pruebas de staging. D5.5 consolida la preparación de visitas desde oficina antes del trabajo de campo. La visita queda anclada explícitamente a Área y Organización operadora, y el sistema genera un checklist auditable con antecedentes, respuestas vencidas, controles vencidos y próximos controles.
|
||||||
|
|
||||||
- `api-v3/`: API NestJS/TypeORM y contratos de dominio.
|
## Alcance D5.5
|
||||||
- `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
|
- selección web Área → Organización operadora vigente;
|
||||||
|
- fecha y equipo inspector dentro del plan;
|
||||||
|
- checklist automático versionado y append-only;
|
||||||
|
- respuestas de empresa vencidas y controles de verificación vencidos;
|
||||||
|
- próximos controles dentro de 30 días de la fecha planificada;
|
||||||
|
- antecedentes históricos del mismo contexto;
|
||||||
|
- incorporación automática de registros accionables;
|
||||||
|
- alta manual de registros preventivos del mismo Área/Operadora;
|
||||||
|
- exclusiones sólo mediante motivo auditable;
|
||||||
|
- reincorporación sin borrar la exclusión histórica;
|
||||||
|
- visitas de verificación integradas al mismo contrato de planificación;
|
||||||
|
- cambio de contexto o fecha invalida el checklist hasta regeneración explícita;
|
||||||
|
- inicio de visita exclusivamente desde APK mediante la política móvil ya existente.
|
||||||
|
|
||||||
- [Corte de presentación F6.1](docs/PRESENTACION_F6_1.md)
|
## Migración
|
||||||
- [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
|
`1789063200000-phase-d5-5-web-planning-checklist.ts`
|
||||||
|
`PhaseD55WebPlanningChecklist1789063200000`
|
||||||
|
|
||||||
- Inventario físico: **Departamento → Área → Yacimiento → Instalación → Subinstalación**.
|
## Despliegue
|
||||||
- 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.
|
El despliegue debe partir exactamente de API/WEB **0.19.4-1** y ejecutar `scripts/deploy-phase-d5-5.sh`. Antes de modificar producción, el script compila API y web en staging y exige **252 tests** aprobados.
|
||||||
|
|||||||
@@ -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.
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
# Checklist final Android 0.19.2
|
|
||||||
|
|
||||||
La candidata sólo se promueve si el mismo SHA cumple:
|
|
||||||
|
|
||||||
- iniciar Inspección;
|
|
||||||
- crear/abrir Acta sin pedir urgencia ni Inventario;
|
|
||||||
- entrar a **Agregar Hallazgo** y recién allí 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;
|
|
||||||
- al cerrar el contenido, exigir Urgente/No urgente, persistir esa decisión 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 mostrar **Inventario de campo** como acción paralela de la Inspección;
|
|
||||||
- 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.
|
|
||||||
@@ -1,127 +0,0 @@
|
|||||||
# DH Inspección Android · release final de campo 0.19.2
|
|
||||||
|
|
||||||
## Candidata vigente
|
|
||||||
|
|
||||||
- Fase funcional: **Flujo final de campo · Inspección → Acta → Hallazgos → Firma**.
|
|
||||||
- `versionName`: **0.19.2**.
|
|
||||||
- `versionCode`: **30**.
|
|
||||||
- Application ID release: `com.korexlabs.dhinspeccion`.
|
|
||||||
- Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
|
|
||||||
- API: `https://dhv2.korexlabs.com/api/v3/`.
|
|
||||||
- Servidor compatible de esta candidata: **API 0.29.0-2 / WEB 0.23.0-2**.
|
|
||||||
|
|
||||||
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.2 fija como recorrido principal de campo:
|
|
||||||
|
|
||||||
1. **Iniciar Inspección**. Al iniciarla se habilita el circuito de **Actas y Hallazgos**; Inventario no es una acción independiente de la Inspección.
|
|
||||||
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. La urgencia todavía no se define.
|
|
||||||
3. **Agregar Hallazgos**. Recién desde esta acción se selecciona la Instalación/Subinstalación afectada.
|
|
||||||
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 elige **Urgente / No urgente** y luego se usa **Cerrar Acta y dejar pendiente de firma**. La urgencia queda fijada con el cierre; 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. La urgencia se decide en ese cierre, nunca al crear el borrador. 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.
|
|
||||||
|
|
||||||
## Revisión 0.19.1
|
|
||||||
|
|
||||||
- Renovación de sesión coordinada entre los cuatro clientes API; no cierra sesión por pérdida de red, HTTP 429/500 o cancelación.
|
|
||||||
- Una respuesta tardía no puede restaurar una sesión cerrada ni usar la de otro inspector.
|
|
||||||
- Guardia de escrituras contra doble toque y conteo correcto de operaciones pendientes.
|
|
||||||
- Búsquedas descartan respuestas antiguas. Cambio de inspección limpia el Acta anterior.
|
|
||||||
- Mensajes visibles de permisos/GPS en evidencia y respeto de barras de sistema/teclado.
|
|
||||||
- Diez nuevas pruebas de comportamiento sobre sesión y concurrencia.
|
|
||||||
|
|
||||||
### Alcance real
|
|
||||||
|
|
||||||
Esta candidata requiere conexión. No implementa trabajo offline ni cola persistente de sincronización; un fallo de red no equivale a guardado. Tras un timeout de escritura debe verificarse el registro antes de repetir. No se presenta el artefacto debug como una release productiva. La firma histórica y el smoke en tablet siguen siendo requisitos para distribuir la release final.
|
|
||||||
|
|
||||||
### Segunda pasada funcional
|
|
||||||
|
|
||||||
- Coordenadas normalizadas al contrato API (6 decimales, precisión 3).
|
|
||||||
- Yacimiento seleccionable para Hallazgos y como padre explícito de nuevas Instalaciones. Se elimina el fallback que podía presentar un tipo Yacimiento como alta de Instalación.
|
|
||||||
- Formulario Datos técnicos sobre el elemento seleccionado: carga y guarda las definiciones/valores por familia mediante los endpoints existentes del Dashboard; valida obligatorios, números, Sí/No, fechas y opciones. Es un paso separado del alta estructural y GPS/foto.
|
|
||||||
- Se agregan siete pruebas para coordenadas y valores técnicos.
|
|
||||||
|
|
||||||
|
|
||||||
## Revisión 0.19.2 · flujo conceptual corregido
|
|
||||||
|
|
||||||
- Se elimina **Inventario de campo** como acción independiente de la pantalla de Inspección.
|
|
||||||
- El alta o selección de Inventario existe únicamente dentro de **Agregar Hallazgo**.
|
|
||||||
- El borrador de Acta nace vacío, sin Inventario y sin urgencia predeterminada.
|
|
||||||
- La urgencia se exige al cerrar el Acta y se persiste en la misma operación que la vuelve inmutable.
|
|
||||||
- `inspection_acts.urgency` puede quedar pendiente durante el borrador; el bloqueo exige la decisión y calcula el vencimiento desde allí.
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
# DH Android 0.19.1 · revisión de candidata
|
|
||||||
|
|
||||||
## Idea funcional verificada contra código y API
|
|
||||||
|
|
||||||
La app es la herramienta del inspector en campo. Oficina administra territorio, operadoras, clasificaciones, campos y catálogo; la APK consulta esas fuentes. Una Inspección contiene varias Actas, con una sola en elaboración simultánea. El Hallazgo pertenece al Acta y al elemento seleccionado. Cerrar contenido lo deja inmutable y pendiente de firma. Firma del inspector y manifestación/firma o negativa de empresa permiten sellar el Acta. La Inspección exige todas sus Actas activas selladas.
|
|
||||||
|
|
||||||
Yacimiento, Instalación y Subinstalación son destinos de Hallazgos. Una Instalación nueva debe crearse dentro de un Yacimiento y una Subinstalación dentro de una Instalación compatible. El inventario nacido en campo necesita GPS y foto antes del Hallazgo.
|
|
||||||
|
|
||||||
## Hallazgos corregidos
|
|
||||||
|
|
||||||
| Problema observado | Corrección |
|
|
||||||
| --- | --- |
|
|
||||||
| Cuatro clientes renovaban por separado la misma sesión | Coordinador compartido; protege rotación, logout y cambio de usuario |
|
|
||||||
| Cortes de red durante refresh borraban la sesión | Sólo una respuesta 401 de la sesión vigente la invalida |
|
|
||||||
| Operaciones solapadas liberaban ocupado antes de terminar | Conteo de pendientes y rechazo del segundo guardado |
|
|
||||||
| Respuestas de búsquedas antiguas sobrescribían resultados recientes | Generación de búsqueda y verificación del ID de inspección |
|
|
||||||
| Un Acta anterior podía persistir al cambiar de inspección | Limpieza de estado de Acta al abrir otra inspección |
|
|
||||||
| Coordenadas crudas excedían decimales admitidos | Normalización 6 decimales para coordenadas y 3 para precisión |
|
|
||||||
| Inventario móvil ocultaba Yacimientos | Selección para Hallazgos y alta de Instalación dentro de Yacimiento |
|
|
||||||
| Alta de Instalación podía adoptar otro tipo por fallback | Eliminado; pide elegir el Yacimiento padre correcto |
|
|
||||||
| Datos técnicos por familia no estaban editables | Formulario conectado a technical-values; mismos campos de oficina |
|
|
||||||
| Fallos de GPS/permisos en evidencia sin mensaje | Error visible y accionable |
|
|
||||||
| Barras del sistema/teclado podían tapar controles | Insets de sistema y teclado en la raíz |
|
|
||||||
|
|
||||||
## Evidencia automática
|
|
||||||
|
|
||||||
25 pruebas Android: 8 contratos existentes y 17 pruebas nuevas de comportamiento (sesión 7, concurrencia 3, GPS 3, campos técnicos 4). Lint debug/release y compilación debug/release en workflow Android. CI general comprueba API, WEB, scripts y migraciones; la auditoría de dependencias se ejecuta separadamente. Consultar las ejecuciones del SHA de la entrega, no sólo un resultado anterior.
|
|
||||||
|
|
||||||
## Límites de esta candidata
|
|
||||||
|
|
||||||
- Requiere conexión. No existe cola persistente offline ni resolución de conflictos sin señal.
|
|
||||||
- Un timeout de escritura puede ocurrir después de guardar en servidor. Revisar el registro antes de repetir; no se afirma idempotencia general de todas las escrituras.
|
|
||||||
- Los datos técnicos por familia se completan en un paso separado tras seleccionar/crear el elemento. GPS/foto continúa siendo la barrera de Hallazgos del servidor.
|
|
||||||
- No se ejecutó aceptación en tablet física: quedan por comprobar cámara, GPS, biometría, rotación/recreación de actividad, firmas y actualización sobre la APK instalada.
|
|
||||||
- La release compila sin firma. Se requiere la clave histórica y su certificado de referencia para distribuir una actualización productiva. No crear otra clave como sustituto.
|
|
||||||
- La candidata debug usa com.korexlabs.dhinspeccion.debug y no reemplaza la app productiva. La compatibilidad con una debug anterior depende también de su certificado; no desinstalar una app con información pendiente sin revisar antes.
|
|
||||||
|
|
||||||
## Recorrido de aceptación en tablet
|
|
||||||
|
|
||||||
1. Ingresar con inspector y cargar inspecciones asignadas.
|
|
||||||
2. Iniciar una inspección, crear Acta, seleccionar Yacimiento/Instalación/Subinstalación.
|
|
||||||
3. Crear Instalación bajo Yacimiento y Subinstalación compatible; probar GPS permitido/denegado y foto tomada/cancelada.
|
|
||||||
4. Completar campos técnicos requeridos, incluyendo No booleano, decimal con coma, fecha y opción de lista; volver a abrir para comprobar persistencia.
|
|
||||||
5. Crear Hallazgo catalogado y OTROS, adjuntar evidencia.
|
|
||||||
6. Cerrar contenido, comprobar inmutabilidad y estado Pendiente de firma.
|
|
||||||
7. Registrar firmas o negativa de empresa; sellar Acta.
|
|
||||||
8. Crear otra Acta, comprobar que una pendiente impide cerrar la Inspección; completar y cerrar.
|
|
||||||
9. Cortar conexión y recuperarla: errores visibles, sin pérdida de sesión por red ni falso aviso de guardado.
|
|
||||||
10. Verificar en Dashboard los mismos registros y documentos.
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id("com.android.application")
|
|
||||||
id("org.jetbrains.kotlin.android")
|
|
||||||
id("org.jetbrains.kotlin.plugin.compose")
|
|
||||||
}
|
|
||||||
|
|
||||||
android {
|
|
||||||
namespace = "com.korexlabs.dhinspeccion"
|
|
||||||
compileSdk = 36
|
|
||||||
|
|
||||||
defaultConfig {
|
|
||||||
applicationId = "com.korexlabs.dhinspeccion"
|
|
||||||
minSdk = 26
|
|
||||||
targetSdk = 36
|
|
||||||
versionCode = 30
|
|
||||||
versionName = "0.19.2"
|
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
|
||||||
vectorDrawables.useSupportLibrary = true
|
|
||||||
buildConfigField("String", "API_BASE_URL", "\"https://dhv2.korexlabs.com/api/v3/\"")
|
|
||||||
}
|
|
||||||
|
|
||||||
buildTypes {
|
|
||||||
debug {
|
|
||||||
applicationIdSuffix = ".debug"
|
|
||||||
versionNameSuffix = "-debug"
|
|
||||||
}
|
|
||||||
release {
|
|
||||||
isMinifyEnabled = false
|
|
||||||
proguardFiles(
|
|
||||||
getDefaultProguardFile("proguard-android-optimize.txt"),
|
|
||||||
"proguard-rules.pro",
|
|
||||||
)
|
|
||||||
// La firma de release NO se redefine aquí. Se conservará la clave histórica.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buildFeatures {
|
|
||||||
compose = true
|
|
||||||
buildConfig = true
|
|
||||||
}
|
|
||||||
|
|
||||||
compileOptions {
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
|
||||||
targetCompatibility = JavaVersion.VERSION_17
|
|
||||||
}
|
|
||||||
kotlinOptions.jvmTarget = "17"
|
|
||||||
|
|
||||||
packaging.resources.excludes += "/META-INF/{AL2.0,LGPL2.1}"
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
val composeBom = platform("androidx.compose:compose-bom:2025.08.01")
|
|
||||||
implementation(composeBom)
|
|
||||||
androidTestImplementation(composeBom)
|
|
||||||
|
|
||||||
implementation("androidx.core:core-ktx:1.17.0")
|
|
||||||
implementation("androidx.activity:activity-compose:1.10.1")
|
|
||||||
implementation("androidx.fragment:fragment-ktx:1.8.9")
|
|
||||||
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2")
|
|
||||||
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2")
|
|
||||||
implementation("androidx.compose.material3:material3")
|
|
||||||
implementation("androidx.compose.material:material-icons-extended")
|
|
||||||
implementation("androidx.compose.ui:ui")
|
|
||||||
implementation("androidx.compose.ui:ui-tooling-preview")
|
|
||||||
implementation("androidx.biometric:biometric:1.1.0")
|
|
||||||
debugImplementation("androidx.compose.ui:ui-tooling")
|
|
||||||
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
|
|
||||||
implementation("com.squareup.retrofit2:retrofit:2.11.0")
|
|
||||||
implementation("com.squareup.retrofit2:converter-moshi:2.11.0")
|
|
||||||
implementation("com.squareup.moshi:moshi-kotlin:1.15.2")
|
|
||||||
implementation("com.squareup.okhttp3:okhttp:4.12.0")
|
|
||||||
implementation("com.google.android.gms:play-services-location:21.3.0")
|
|
||||||
implementation("androidx.exifinterface:exifinterface:1.4.1")
|
|
||||||
|
|
||||||
testImplementation("junit:junit:4.13.2")
|
|
||||||
androidTestImplementation("androidx.test.ext:junit:1.2.1")
|
|
||||||
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
|
|
||||||
}
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
# DH Inspección V2. Las reglas se ampliarán cuando se habilite minificación de release.
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<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:usesCleartextTraffic="false">
|
|
||||||
<activity
|
|
||||||
android:name=".MainActivity"
|
|
||||||
android:exported="true">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN" />
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
|
||||||
</intent-filter>
|
|
||||||
</activity>
|
|
||||||
|
|
||||||
<provider
|
|
||||||
android:name="androidx.core.content.FileProvider"
|
|
||||||
android:authorities="${applicationId}.files"
|
|
||||||
android:exported="false"
|
|
||||||
android:grantUriPermissions="true">
|
|
||||||
<meta-data
|
|
||||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
|
||||||
android:resource="@xml/file_paths" />
|
|
||||||
</provider>
|
|
||||||
</application>
|
|
||||||
</manifest>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import androidx.activity.compose.setContent
|
|
||||||
import androidx.activity.enableEdgeToEdge
|
|
||||||
import androidx.fragment.app.FragmentActivity
|
|
||||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
|
||||||
import com.korexlabs.dhinspeccion.ui.DhRoot
|
|
||||||
|
|
||||||
class MainActivity : FragmentActivity() {
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
enableEdgeToEdge()
|
|
||||||
setContent {
|
|
||||||
val model: MainViewModel = viewModel()
|
|
||||||
DhRoot(model, this@MainActivity)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,658 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion
|
|
||||||
|
|
||||||
import android.app.Application
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.lifecycle.AndroidViewModel
|
|
||||||
import androidx.lifecycle.viewModelScope
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldCoordinates
|
|
||||||
import com.korexlabs.dhinspeccion.data.CreateFieldFindingRequest
|
|
||||||
import com.korexlabs.dhinspeccion.data.CreateFieldInventoryRequest
|
|
||||||
import com.korexlabs.dhinspeccion.data.DhRepository
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldAssetDetail
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldFindingEvidence
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldFindingItem
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldFindingOptionsResponse
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldFindingsRepository
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldInventoryItem
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldType
|
|
||||||
import com.korexlabs.dhinspeccion.data.MobileActClosure
|
|
||||||
import com.korexlabs.dhinspeccion.data.MobileActDetail
|
|
||||||
import com.korexlabs.dhinspeccion.data.MobileActSummary
|
|
||||||
import com.korexlabs.dhinspeccion.data.MobileActsRepository
|
|
||||||
import com.korexlabs.dhinspeccion.data.MobileResponsibleRequest
|
|
||||||
import com.korexlabs.dhinspeccion.data.StoredSession
|
|
||||||
import com.korexlabs.dhinspeccion.data.VisitDetail
|
|
||||||
import com.korexlabs.dhinspeccion.data.VisitSummary
|
|
||||||
import kotlinx.coroutines.CancellationException
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import java.io.File
|
|
||||||
import java.time.Instant
|
|
||||||
|
|
||||||
class MainViewModel(application: Application) : AndroidViewModel(application) {
|
|
||||||
private val operations = OperationTracker()
|
|
||||||
private var inventorySearchGeneration = 0
|
|
||||||
private val repository = DhRepository(application)
|
|
||||||
private val findingsRepository = FieldFindingsRepository(application)
|
|
||||||
private val actsRepository = MobileActsRepository(application)
|
|
||||||
|
|
||||||
var session: StoredSession? by mutableStateOf(repository.currentSession())
|
|
||||||
private set
|
|
||||||
var busy by mutableStateOf(false)
|
|
||||||
private set
|
|
||||||
var error: String? by mutableStateOf(null)
|
|
||||||
private set
|
|
||||||
var notice: String? by mutableStateOf(null)
|
|
||||||
private set
|
|
||||||
|
|
||||||
var visits: List<VisitSummary> by mutableStateOf(emptyList())
|
|
||||||
private set
|
|
||||||
var visit: VisitDetail? by mutableStateOf(null)
|
|
||||||
private set
|
|
||||||
|
|
||||||
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)
|
|
||||||
private set
|
|
||||||
|
|
||||||
var acts: List<MobileActSummary> by mutableStateOf(emptyList())
|
|
||||||
private set
|
|
||||||
var selectedAct: MobileActDetail? by mutableStateOf(null)
|
|
||||||
private set
|
|
||||||
var actClosure: MobileActClosure? by mutableStateOf(null)
|
|
||||||
private set
|
|
||||||
|
|
||||||
var fieldFindingOptions: FieldFindingOptionsResponse? by mutableStateOf(null)
|
|
||||||
private set
|
|
||||||
var lastCreatedFinding: FieldFindingItem? by mutableStateOf(null)
|
|
||||||
private set
|
|
||||||
var fieldFindingEvidence: Map<String, List<FieldFindingEvidence>> by mutableStateOf(emptyMap())
|
|
||||||
private set
|
|
||||||
|
|
||||||
init {
|
|
||||||
if (session != null) loadVisits()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun clearMessages() {
|
|
||||||
error = null
|
|
||||||
notice = null
|
|
||||||
}
|
|
||||||
|
|
||||||
fun login(identifier: String, password: String) {
|
|
||||||
if (identifier.isBlank() || password.isBlank()) {
|
|
||||||
error = "Ingresá usuario y contraseña."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
session = repository.login(identifier, password)
|
|
||||||
notice = "Sesión iniciada."
|
|
||||||
loadVisitsInternal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun logout() {
|
|
||||||
viewModelScope.launch {
|
|
||||||
runCatching { repository.logout() }
|
|
||||||
session = null
|
|
||||||
visits = emptyList()
|
|
||||||
visit = null
|
|
||||||
inventory = emptyList()
|
|
||||||
inventoryParentId = null
|
|
||||||
fieldTypes = emptyList()
|
|
||||||
selectedFieldAsset = null
|
|
||||||
clearActState()
|
|
||||||
clearFindingState()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun loadVisits() = launchBusy { loadVisitsInternal() }
|
|
||||||
|
|
||||||
private suspend fun loadVisitsInternal() {
|
|
||||||
visits = repository.visits().data
|
|
||||||
}
|
|
||||||
|
|
||||||
fun openVisit(id: String) = launchBusy {
|
|
||||||
val loadedVisit = repository.visit(id)
|
|
||||||
clearActState()
|
|
||||||
visit = loadedVisit
|
|
||||||
inventory = emptyList()
|
|
||||||
inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
|
|
||||||
fieldTypes = emptyList()
|
|
||||||
selectedFieldAsset = null
|
|
||||||
clearFindingState()
|
|
||||||
loadActsInternal(id, selectDraft = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun closeVisitView() {
|
|
||||||
if (busy) return
|
|
||||||
inventorySearchGeneration += 1
|
|
||||||
visit = null
|
|
||||||
inventory = emptyList()
|
|
||||||
inventoryParentId = null
|
|
||||||
fieldTypes = emptyList()
|
|
||||||
selectedFieldAsset = null
|
|
||||||
clearActState()
|
|
||||||
clearFindingState()
|
|
||||||
loadVisits()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun startVisit() {
|
|
||||||
val id = visit?.id ?: return
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
visit = repository.startVisit(id)
|
|
||||||
inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
|
|
||||||
notice = "Inspección iniciada."
|
|
||||||
loadActsInternal(id, selectDraft = true)
|
|
||||||
loadVisitsInternal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun reloadActs() {
|
|
||||||
val visitId = visit?.id ?: return
|
|
||||||
launchBusy { loadActsInternal(visitId, selectDraft = selectedAct == null) }
|
|
||||||
}
|
|
||||||
|
|
||||||
fun selectAct(actId: String) {
|
|
||||||
launchBusy {
|
|
||||||
selectedAct = actsRepository.get(actId)
|
|
||||||
actClosure = actsRepository.closure(actId)
|
|
||||||
clearFindingState()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun createAct() {
|
|
||||||
val currentVisit = visit ?: return
|
|
||||||
if (currentVisit.status != "IN_PROGRESS") {
|
|
||||||
error = "La Inspección debe estar en curso para crear un Acta."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (acts.any { it.status == "DRAFT" }) {
|
|
||||||
error = "Ya existe un Acta en elaboración. Cerrala o cancelala antes de crear la siguiente."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
val created = actsRepository.create(currentVisit.id, currentVisit.code)
|
|
||||||
selectedAct = created
|
|
||||||
actClosure = actsRepository.closure(created.id)
|
|
||||||
loadActsInternal(currentVisit.id, selectDraft = false)
|
|
||||||
notice = "${created.code} creada. La urgencia se define recién al cerrar el Acta; los Hallazgos se agregan desde su propio flujo."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun searchInventory(search: String, parentId: String? = null) {
|
|
||||||
val currentVisit = visit ?: return
|
|
||||||
val generation = ++inventorySearchGeneration
|
|
||||||
launchBusy {
|
|
||||||
val result = repository.fieldInventory(currentVisit.id, search, parentId).data
|
|
||||||
if (generation == inventorySearchGeneration && visit?.id == currentVisit.id) inventory = result
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun loadFieldTypes(parentId: String? = null) {
|
|
||||||
val currentVisit = visit ?: return
|
|
||||||
launchBusy {
|
|
||||||
val effectiveParentId = parentId ?: currentVisit.scopeAsset?.id ?: currentVisit.operationalArea?.id
|
|
||||||
inventorySearchGeneration += 1
|
|
||||||
inventoryParentId = effectiveParentId
|
|
||||||
fieldTypes = repository.fieldTypes(currentVisit.id, parentId).data
|
|
||||||
inventory = repository.fieldInventory(currentVisit.id, null, effectiveParentId).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(mutation = true) {
|
|
||||||
selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
|
|
||||||
notice = "Inventario agregado a la Inspección."
|
|
||||||
reloadCurrentInventory(visitId)
|
|
||||||
val draft = selectedDraftAct()
|
|
||||||
if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
|
|
||||||
selectedAct = actsRepository.ensureAsset(draft.id, item.id)
|
|
||||||
loadActsInternal(visitId, selectDraft = false)
|
|
||||||
loadFindingOptionsInternal(visitId, item.id, draft.id)
|
|
||||||
} else if (selectedFieldAsset?.capture?.readyForFinding == true) {
|
|
||||||
notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun createFieldAsset(
|
|
||||||
type: FieldType,
|
|
||||||
parentId: String?,
|
|
||||||
familyId: String?,
|
|
||||||
name: String,
|
|
||||||
commonName: String?,
|
|
||||||
attributes: Map<String, Any?>,
|
|
||||||
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."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (type.familyRequired && familyId == null) {
|
|
||||||
error = "Elegí una clasificación técnica o la opción Otro / no catalogado."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
val request = CreateFieldInventoryRequest(
|
|
||||||
typeId = type.id,
|
|
||||||
parentId = parentId,
|
|
||||||
familyId = familyId,
|
|
||||||
name = name.trim(),
|
|
||||||
commonName = commonName?.trim()?.takeIf { it.isNotBlank() },
|
|
||||||
description = description?.trim()?.takeIf { it.isNotBlank() },
|
|
||||||
attributes = attributes,
|
|
||||||
deviceLatitude = FieldCoordinates.latitude(latitude),
|
|
||||||
deviceLongitude = FieldCoordinates.longitude(longitude),
|
|
||||||
deviceAccuracyM = accuracyM?.let(FieldCoordinates::accuracy),
|
|
||||||
deviceCapturedAt = Instant.now().toString(),
|
|
||||||
)
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun mergeCreatedFieldAsset(canonicalAssetId: String, reason: String) {
|
|
||||||
val visitId = visit?.id ?: return
|
|
||||||
val source = selectedFieldAsset?.asset ?: return
|
|
||||||
if (canonicalAssetId.isBlank()) {
|
|
||||||
error = "Elegí el registro existente que se conservará."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (reason.trim().length < 8) {
|
|
||||||
error = "Explicá brevemente por qué se trata de un duplicado."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
val result = repository.mergeFieldAsset(
|
|
||||||
visitId = visitId,
|
|
||||||
assetId = source.id,
|
|
||||||
canonicalAssetId = canonicalAssetId,
|
|
||||||
reason = reason,
|
|
||||||
)
|
|
||||||
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)
|
|
||||||
val draft = selectedDraftAct()
|
|
||||||
if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
|
|
||||||
selectedAct = actsRepository.ensureAsset(draft.id, result.canonical.id)
|
|
||||||
loadActsInternal(visitId, selectDraft = false)
|
|
||||||
loadFindingOptionsInternal(visitId, result.canonical.id, draft.id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun uploadFieldPhoto(
|
|
||||||
file: File,
|
|
||||||
latitude: Double,
|
|
||||||
longitude: Double,
|
|
||||||
accuracyM: Double?,
|
|
||||||
) {
|
|
||||||
val visitId = visit?.id ?: return
|
|
||||||
val asset = selectedFieldAsset?.asset ?: return
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
val response = repository.uploadFieldPhoto(
|
|
||||||
visitId = visitId,
|
|
||||||
assetId = asset.id,
|
|
||||||
file = file,
|
|
||||||
latitude = latitude,
|
|
||||||
longitude = longitude,
|
|
||||||
accuracyM = accuracyM,
|
|
||||||
)
|
|
||||||
selectedFieldAsset = selectedFieldAsset?.copy(capture = response.capture)
|
|
||||||
notice = if (response.capture.readyForFinding) {
|
|
||||||
"Captura completa: GPS y fotografía registrados."
|
|
||||||
} else {
|
|
||||||
"Fotografía registrada."
|
|
||||||
}
|
|
||||||
reloadCurrentInventory(visitId)
|
|
||||||
val draft = selectedDraftAct()
|
|
||||||
if (response.capture.readyForFinding && draft != null) {
|
|
||||||
selectedAct = actsRepository.ensureAsset(draft.id, asset.id)
|
|
||||||
loadActsInternal(visitId, selectDraft = false)
|
|
||||||
loadFindingOptionsInternal(visitId, asset.id, draft.id)
|
|
||||||
} else if (response.capture.readyForFinding) {
|
|
||||||
notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun openFindingForSelected() {
|
|
||||||
val visitId = visit?.id ?: return
|
|
||||||
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."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
selectedAct = actsRepository.ensureAsset(draft.id, assetId)
|
|
||||||
loadActsInternal(visitId, selectDraft = false)
|
|
||||||
loadFindingOptionsInternal(visitId, assetId, draft.id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun createFieldFinding(
|
|
||||||
catalogItemId: String?,
|
|
||||||
customTitle: String?,
|
|
||||||
customLegalBasis: String?,
|
|
||||||
description: String,
|
|
||||||
severity: Int?,
|
|
||||||
correctionDueOn: String?,
|
|
||||||
) {
|
|
||||||
val visitId = visit?.id ?: return
|
|
||||||
val assetId = selectedFieldAsset?.asset?.id ?: return
|
|
||||||
val actId = selectedDraftAct()?.id
|
|
||||||
if (actId == null) {
|
|
||||||
error = "No hay un Acta en elaboración seleccionada."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (description.isBlank()) {
|
|
||||||
error = "Describí el Hallazgo antes de guardarlo."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (catalogItemId == null && customTitle.isNullOrBlank()) {
|
|
||||||
error = "Para OTROS, indicá un título para el Hallazgo."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (severity != null && severity !in 1..10) {
|
|
||||||
error = "La gravedad debe estar entre 1 y 10."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
selectedAct = actsRepository.ensureAsset(actId, assetId)
|
|
||||||
val response = findingsRepository.create(
|
|
||||||
visitId,
|
|
||||||
assetId,
|
|
||||||
CreateFieldFindingRequest(
|
|
||||||
actId = actId,
|
|
||||||
catalogItemId = catalogItemId,
|
|
||||||
customTitle = customTitle?.trim()?.takeIf { it.isNotBlank() },
|
|
||||||
customLegalBasis = customLegalBasis?.trim()?.takeIf { it.isNotBlank() },
|
|
||||||
description = description.trim(),
|
|
||||||
severity = severity,
|
|
||||||
correctionDueOn = correctionDueOn?.trim()?.takeIf { it.isNotBlank() },
|
|
||||||
),
|
|
||||||
)
|
|
||||||
lastCreatedFinding = response.finding
|
|
||||||
notice = "Hallazgo ${response.finding.code} registrado en ${response.act.code}. Podés agregar evidencia fotográfica."
|
|
||||||
loadFindingOptionsInternal(visitId, assetId, actId, keepLastCreated = true)
|
|
||||||
loadActsInternal(visitId, selectDraft = false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun uploadFindingPhoto(
|
|
||||||
findingId: String,
|
|
||||||
file: File,
|
|
||||||
latitude: Double,
|
|
||||||
longitude: Double,
|
|
||||||
accuracyM: Double?,
|
|
||||||
title: String? = null,
|
|
||||||
description: String? = null,
|
|
||||||
) {
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
findingsRepository.uploadObservationPhoto(
|
|
||||||
findingId = findingId,
|
|
||||||
file = file,
|
|
||||||
latitude = latitude,
|
|
||||||
longitude = longitude,
|
|
||||||
accuracyM = accuracyM,
|
|
||||||
title = title,
|
|
||||||
description = description,
|
|
||||||
)
|
|
||||||
loadEvidenceInternal(findingId)
|
|
||||||
notice = "Evidencia fotográfica registrada con GPS."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun reloadFindingEvidence(findingId: String) {
|
|
||||||
launchBusy { loadEvidenceInternal(findingId) }
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setCompanyResponsiblePresent(
|
|
||||||
fullName: String,
|
|
||||||
documentType: String,
|
|
||||||
documentNumber: String,
|
|
||||||
position: String,
|
|
||||||
email: String?,
|
|
||||||
phone: String?,
|
|
||||||
) {
|
|
||||||
val actId = selectedAct?.id ?: return
|
|
||||||
if (fullName.isBlank() || documentNumber.isBlank() || position.isBlank()) {
|
|
||||||
error = "Completá nombre, documento y cargo del responsable de la empresa."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
actClosure = actsRepository.setResponsible(
|
|
||||||
actId,
|
|
||||||
MobileResponsibleRequest(
|
|
||||||
attendanceStatus = "PRESENT",
|
|
||||||
fullName = fullName.trim(),
|
|
||||||
documentType = documentType,
|
|
||||||
documentNumber = documentNumber.trim(),
|
|
||||||
position = position.trim(),
|
|
||||||
email = email?.trim()?.takeIf { it.isNotBlank() },
|
|
||||||
phone = phone?.trim()?.takeIf { it.isNotBlank() },
|
|
||||||
),
|
|
||||||
)
|
|
||||||
notice = "Responsable de empresa registrado para el Acta."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setCompanyResponsibleAbsent(reason: String) {
|
|
||||||
val actId = selectedAct?.id ?: return
|
|
||||||
if (reason.trim().length < 10) {
|
|
||||||
error = "Indicá un motivo de ausencia de al menos 10 caracteres."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
actClosure = actsRepository.setResponsible(
|
|
||||||
actId,
|
|
||||||
MobileResponsibleRequest(
|
|
||||||
attendanceStatus = "ABSENT",
|
|
||||||
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."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun prepareSelectedAct(urgency: String) {
|
|
||||||
val actId = selectedAct?.id ?: return
|
|
||||||
if (urgency !in setOf("URGENT", "NON_URGENT")) {
|
|
||||||
error = "Definí la urgencia antes de cerrar el Acta."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
actClosure = actsRepository.lock(actId, urgency)
|
|
||||||
refreshSelectedActInternal(actId)
|
|
||||||
val urgencyLabel = if (urgency == "URGENT") "urgente" else "no urgente"
|
|
||||||
notice = "Acta cerrada como $urgencyLabel y pendiente de firma. Su contenido quedó inmutable."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun reopenSelectedAct() {
|
|
||||||
error = "Un Acta pendiente de firma es inmutable y no puede volver a edición."
|
|
||||||
}
|
|
||||||
|
|
||||||
fun signSelectedActAsInspector(
|
|
||||||
png: File,
|
|
||||||
latitude: Double?,
|
|
||||||
longitude: Double?,
|
|
||||||
accuracyM: Double?,
|
|
||||||
) {
|
|
||||||
val actId = selectedAct?.id ?: return
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
actClosure = actsRepository.signInspector(actId, png, latitude, longitude, accuracyM)
|
|
||||||
notice = "Firma del inspector incorporada al Acta."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun signSelectedActAsCompany(
|
|
||||||
png: File,
|
|
||||||
latitude: Double?,
|
|
||||||
longitude: Double?,
|
|
||||||
accuracyM: Double?,
|
|
||||||
manifestation: String,
|
|
||||||
statement: String?,
|
|
||||||
) {
|
|
||||||
val actId = selectedAct?.id ?: return
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
actClosure = actsRepository.signCompany(
|
|
||||||
actId, png, latitude, longitude, accuracyM, manifestation, statement,
|
|
||||||
)
|
|
||||||
notice = if (manifestation == "DISSENT") {
|
|
||||||
"Firma de empresa registrada con disidencia."
|
|
||||||
} else {
|
|
||||||
"Firma de empresa registrada."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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(mutation = true) {
|
|
||||||
actClosure = actsRepository.companyOutcome(actId, status, reason)
|
|
||||||
notice = "Negativa a firmar asentada."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun closeSelectedAct() {
|
|
||||||
val currentVisit = visit ?: return
|
|
||||||
val actId = selectedAct?.id ?: return
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
actClosure = actsRepository.seal(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."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun closeInspection() {
|
|
||||||
val visitId = visit?.id ?: return
|
|
||||||
launchBusy(mutation = true) {
|
|
||||||
visit = actsRepository.closeVisit(visitId)
|
|
||||||
loadVisitsInternal()
|
|
||||||
notice = "Inspección cerrada. Todas sus Actas quedaron firmadas y disponibles para el circuito de oficina."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun clearFindingFlow() {
|
|
||||||
fieldFindingOptions = null
|
|
||||||
lastCreatedFinding = null
|
|
||||||
fieldFindingEvidence = emptyMap()
|
|
||||||
error = null
|
|
||||||
}
|
|
||||||
|
|
||||||
fun clearSelectedFieldAsset() {
|
|
||||||
selectedFieldAsset = null
|
|
||||||
clearFindingState()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun selectedDraftAct(): MobileActDetail? =
|
|
||||||
selectedAct?.takeIf { it.status == "DRAFT" }
|
|
||||||
?: acts.firstOrNull { it.status == "DRAFT" }?.let { summary ->
|
|
||||||
selectedAct?.takeIf { it.id == summary.id && it.status == "DRAFT" }
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun loadActsInternal(visitId: String, selectDraft: Boolean) {
|
|
||||||
acts = actsRepository.list(visitId).data
|
|
||||||
val currentId = selectedAct?.id
|
|
||||||
val current = currentId?.let { id -> acts.firstOrNull { it.id == id } }
|
|
||||||
val target = when {
|
|
||||||
current != null -> current.id
|
|
||||||
selectDraft -> acts.firstOrNull { it.status == "DRAFT" }?.id
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
if (target != null) {
|
|
||||||
selectedAct = actsRepository.get(target)
|
|
||||||
actClosure = actsRepository.closure(target)
|
|
||||||
} else if (current == null) {
|
|
||||||
selectedAct = null
|
|
||||||
actClosure = null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun refreshSelectedActInternal(actId: String) {
|
|
||||||
selectedAct = actsRepository.get(actId)
|
|
||||||
actClosure = actsRepository.closure(actId)
|
|
||||||
visit?.id?.let { loadActsInternal(it, selectDraft = false) }
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun loadFindingOptionsInternal(
|
|
||||||
visitId: String,
|
|
||||||
assetId: String,
|
|
||||||
actId: String,
|
|
||||||
keepLastCreated: Boolean = false,
|
|
||||||
) {
|
|
||||||
val options = findingsRepository.options(visitId, assetId, actId)
|
|
||||||
fieldFindingOptions = options
|
|
||||||
if (!keepLastCreated) lastCreatedFinding = null
|
|
||||||
val loaded = linkedMapOf<String, List<FieldFindingEvidence>>()
|
|
||||||
for (finding in options.findings) {
|
|
||||||
loaded[finding.id] = findingsRepository.evidence(finding.id).data
|
|
||||||
}
|
|
||||||
fieldFindingEvidence = loaded
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun loadEvidenceInternal(findingId: String) {
|
|
||||||
fieldFindingEvidence = fieldFindingEvidence + (
|
|
||||||
findingId to findingsRepository.evidence(findingId).data
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun clearActState() {
|
|
||||||
acts = emptyList()
|
|
||||||
selectedAct = null
|
|
||||||
actClosure = null
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun clearFindingState() {
|
|
||||||
fieldFindingOptions = null
|
|
||||||
lastCreatedFinding = null
|
|
||||||
fieldFindingEvidence = emptyMap()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun launchBusy(mutation: Boolean = false, block: suspend () -> Unit) {
|
|
||||||
if (!operations.begin(mutation)) return
|
|
||||||
busy = operations.busy
|
|
||||||
viewModelScope.launch {
|
|
||||||
error = null
|
|
||||||
try {
|
|
||||||
block()
|
|
||||||
} catch (cancelled: CancellationException) {
|
|
||||||
throw cancelled
|
|
||||||
} catch (throwable: Throwable) {
|
|
||||||
error = DhRepository.humanError(throwable)
|
|
||||||
if (repository.currentSession() == null) session = null
|
|
||||||
} finally {
|
|
||||||
operations.end()
|
|
||||||
busy = operations.busy
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion
|
|
||||||
|
|
||||||
/** Main-thread gate: reads may overlap; a second write is never queued by a double tap. */
|
|
||||||
internal class OperationTracker {
|
|
||||||
private var pending = 0
|
|
||||||
val busy: Boolean get() = pending > 0
|
|
||||||
fun begin(mutation: Boolean): Boolean {
|
|
||||||
if (mutation && busy) return false
|
|
||||||
pending += 1
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
fun end() {
|
|
||||||
check(pending > 0)
|
|
||||||
pending -= 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,572 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.data
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.security.keystore.KeyGenParameterSpec
|
|
||||||
import android.security.keystore.KeyProperties
|
|
||||||
import android.util.Base64
|
|
||||||
import com.korexlabs.dhinspeccion.BuildConfig
|
|
||||||
import com.squareup.moshi.Moshi
|
|
||||||
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
|
|
||||||
import okhttp3.MediaType.Companion.toMediaType
|
|
||||||
import okhttp3.MultipartBody
|
|
||||||
import okhttp3.OkHttpClient
|
|
||||||
import okhttp3.RequestBody.Companion.asRequestBody
|
|
||||||
import okhttp3.RequestBody.Companion.toRequestBody
|
|
||||||
import org.json.JSONObject
|
|
||||||
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.Multipart
|
|
||||||
import retrofit2.http.POST
|
|
||||||
import retrofit2.http.Part
|
|
||||||
import retrofit2.http.Path
|
|
||||||
import retrofit2.http.Query
|
|
||||||
import java.io.File
|
|
||||||
import java.security.KeyStore
|
|
||||||
import java.time.Instant
|
|
||||||
import java.util.UUID
|
|
||||||
import javax.crypto.Cipher
|
|
||||||
import javax.crypto.KeyGenerator
|
|
||||||
import javax.crypto.SecretKey
|
|
||||||
import javax.crypto.spec.GCMParameterSpec
|
|
||||||
|
|
||||||
// ---------- Auth ----------
|
|
||||||
|
|
||||||
data class LoginRequest(
|
|
||||||
val identifier: String,
|
|
||||||
val password: String,
|
|
||||||
val deviceLabel: String = "DH Android",
|
|
||||||
)
|
|
||||||
|
|
||||||
data class RefreshRequest(val refreshToken: String)
|
|
||||||
|
|
||||||
data class MobileUser(
|
|
||||||
val id: String,
|
|
||||||
val username: String,
|
|
||||||
val firstName: String? = null,
|
|
||||||
val lastName: String? = null,
|
|
||||||
val email: String? = null,
|
|
||||||
val mustChangePassword: Boolean = false,
|
|
||||||
val roles: List<String> = emptyList(),
|
|
||||||
val permissions: List<String> = emptyList(),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileSessionResponse(
|
|
||||||
val user: MobileUser,
|
|
||||||
val accessToken: String,
|
|
||||||
val refreshToken: String,
|
|
||||||
val accessExpiresInSeconds: Long,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class StoredSession(
|
|
||||||
val userId: String,
|
|
||||||
val username: String,
|
|
||||||
val displayName: String,
|
|
||||||
val accessToken: String,
|
|
||||||
val refreshToken: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
// ---------- Inspections ----------
|
|
||||||
|
|
||||||
data class AssetSummary(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val name: String,
|
|
||||||
val typeName: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class PersonSummary(
|
|
||||||
val id: String,
|
|
||||||
val username: String? = null,
|
|
||||||
val firstName: String? = null,
|
|
||||||
val lastName: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class VisitSummary(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val objective: String? = null,
|
|
||||||
val status: String,
|
|
||||||
val scopeAsset: AssetSummary? = null,
|
|
||||||
val operationalArea: AssetSummary? = null,
|
|
||||||
val operatorCompany: AssetSummary? = null,
|
|
||||||
val leadInspector: PersonSummary? = null,
|
|
||||||
val plannedStartAt: String? = null,
|
|
||||||
val actualStartedAt: String? = null,
|
|
||||||
val actualClosedAt: String? = null,
|
|
||||||
val instructions: String? = null,
|
|
||||||
val checklistGeneration: Int = 0,
|
|
||||||
val assetCount: Int = 0,
|
|
||||||
val memberCount: Int = 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class VisitMeta(
|
|
||||||
val page: Int,
|
|
||||||
val pageSize: Int,
|
|
||||||
val total: Int,
|
|
||||||
val totalPages: Int,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class VisitListResponse(val data: List<VisitSummary>, val meta: VisitMeta)
|
|
||||||
|
|
||||||
data class PlannedAsset(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val name: String,
|
|
||||||
val typeName: String? = null,
|
|
||||||
val included: Boolean = true,
|
|
||||||
val planningSource: String? = null,
|
|
||||||
val exclusionReason: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class ChecklistItem(
|
|
||||||
val id: String,
|
|
||||||
val findingId: String? = null,
|
|
||||||
val findingCode: String? = null,
|
|
||||||
val findingTitle: String? = null,
|
|
||||||
val findingStatus: String? = null,
|
|
||||||
val severity: Int? = null,
|
|
||||||
val itemKind: String? = null,
|
|
||||||
val referenceOn: String? = null,
|
|
||||||
val asset: AssetSummary? = null,
|
|
||||||
val assetIncluded: Boolean = true,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class ChecklistSummary(
|
|
||||||
val generation: Int = 0,
|
|
||||||
val stale: Boolean = false,
|
|
||||||
val antecedents: Int = 0,
|
|
||||||
val companyOverdue: Int = 0,
|
|
||||||
val verificationOverdue: Int = 0,
|
|
||||||
val upcomingControls: Int = 0,
|
|
||||||
val actionableAssets: Int = 0,
|
|
||||||
val excludedAssets: Int = 0,
|
|
||||||
val items: List<ChecklistItem> = emptyList(),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class VisitDetail(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val objective: String? = null,
|
|
||||||
val status: String,
|
|
||||||
val scopeAsset: AssetSummary? = null,
|
|
||||||
val operationalArea: AssetSummary? = null,
|
|
||||||
val operatorCompany: AssetSummary? = null,
|
|
||||||
val leadInspector: PersonSummary? = null,
|
|
||||||
val plannedStartAt: String? = null,
|
|
||||||
val actualStartedAt: String? = null,
|
|
||||||
val actualClosedAt: String? = null,
|
|
||||||
val instructions: String? = null,
|
|
||||||
val assets: List<AssetSummary> = emptyList(),
|
|
||||||
val planningAssets: List<PlannedAsset> = emptyList(),
|
|
||||||
val team: List<PersonSummary> = emptyList(),
|
|
||||||
val checklist: ChecklistSummary = ChecklistSummary(),
|
|
||||||
)
|
|
||||||
|
|
||||||
// ---------- Field inventory ----------
|
|
||||||
|
|
||||||
data class FieldContext(
|
|
||||||
val visitId: String? = null,
|
|
||||||
val visitCode: String? = null,
|
|
||||||
val areaId: String? = null,
|
|
||||||
val areaCode: String? = null,
|
|
||||||
val areaName: String? = null,
|
|
||||||
val companyId: String? = null,
|
|
||||||
val companyCode: String? = null,
|
|
||||||
val companyName: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldInventoryItem(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val name: String,
|
|
||||||
val commonName: String? = null,
|
|
||||||
val informationStatus: String? = null,
|
|
||||||
val dataOrigin: String? = null,
|
|
||||||
val type: AssetSummary? = null,
|
|
||||||
val parent: AssetSummary? = null,
|
|
||||||
val selectedInInspection: Boolean = false,
|
|
||||||
val captureRequired: Boolean = false,
|
|
||||||
val hasGeometry: Boolean = false,
|
|
||||||
val fieldPhotoCount: Int = 0,
|
|
||||||
val readyForFinding: Boolean = true,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldInventoryListResponse(
|
|
||||||
val context: FieldContext,
|
|
||||||
val data: List<FieldInventoryItem>,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldAttributeDefinition(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val name: String,
|
|
||||||
val dataType: String,
|
|
||||||
val isRequired: Boolean = false,
|
|
||||||
val unit: String? = null,
|
|
||||||
val options: Any? = null,
|
|
||||||
val sortOrder: Int = 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldInventoryFamily(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val name: String,
|
|
||||||
val level: String,
|
|
||||||
val informationLabels: List<String> = emptyList(),
|
|
||||||
val sourceReference: String? = null,
|
|
||||||
val isOther: Boolean = false,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldType(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val name: String,
|
|
||||||
val description: String? = null,
|
|
||||||
val structuralKind: String? = null,
|
|
||||||
val families: List<FieldInventoryFamily> = emptyList(),
|
|
||||||
val familyRequired: Boolean = false,
|
|
||||||
val attributes: List<FieldAttributeDefinition> = emptyList(),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldTypeResponse(
|
|
||||||
val context: FieldContext,
|
|
||||||
val parent: AssetSummary,
|
|
||||||
val data: List<FieldType>,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class CaptureStatus(
|
|
||||||
val captureRequired: Boolean = false,
|
|
||||||
val hasGeometry: Boolean = false,
|
|
||||||
val creationGpsCaptured: Boolean = false,
|
|
||||||
val fieldPhotoCount: Int = 0,
|
|
||||||
val readyForFinding: Boolean = true,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldAssetDetail(
|
|
||||||
val context: FieldContext? = null,
|
|
||||||
val asset: FieldInventoryItem,
|
|
||||||
val selectedInInspection: Boolean = true,
|
|
||||||
val capture: CaptureStatus = CaptureStatus(),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class CreateFieldInventoryRequest(
|
|
||||||
val typeId: String,
|
|
||||||
val parentId: String? = null,
|
|
||||||
val familyId: String? = null,
|
|
||||||
val code: String? = null,
|
|
||||||
val name: String,
|
|
||||||
val commonName: String? = null,
|
|
||||||
val description: String? = null,
|
|
||||||
val discoveryNotes: String? = null,
|
|
||||||
val attributes: Map<String, Any?>,
|
|
||||||
val deviceLatitude: Double,
|
|
||||||
val deviceLongitude: Double,
|
|
||||||
val deviceAccuracyM: Double? = null,
|
|
||||||
val deviceCapturedAt: String,
|
|
||||||
val deviceLabel: String = "DH Android",
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldPhotoResponse(
|
|
||||||
val capture: CaptureStatus,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MergeFieldInventoryRequest(
|
|
||||||
val canonicalAssetId: String,
|
|
||||||
val reason: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldInventoryMergeResult(
|
|
||||||
val source: AssetSummary,
|
|
||||||
val canonical: AssetSummary,
|
|
||||||
val sourceVersionNumber: Int,
|
|
||||||
val reparentedChildIds: List<String> = emptyList(),
|
|
||||||
val historyPolicy: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
interface DhApi {
|
|
||||||
@POST("auth/mobile/login")
|
|
||||||
suspend fun login(@Body request: LoginRequest): MobileSessionResponse
|
|
||||||
|
|
||||||
@POST("auth/mobile/refresh")
|
|
||||||
suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
|
|
||||||
|
|
||||||
@POST("auth/mobile/logout")
|
|
||||||
suspend fun logout(@Header("Authorization") authorization: String): Map<String, Any?>
|
|
||||||
|
|
||||||
@GET("inspection-visits")
|
|
||||||
suspend fun visits(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Query("inspectorId") inspectorId: String,
|
|
||||||
@Query("pageSize") pageSize: Int = 100,
|
|
||||||
): VisitListResponse
|
|
||||||
|
|
||||||
@GET("inspection-visits/{id}")
|
|
||||||
suspend fun visit(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("id") id: String,
|
|
||||||
): VisitDetail
|
|
||||||
|
|
||||||
@POST("inspection-visits/{id}/start")
|
|
||||||
suspend fun startVisit(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("id") id: String,
|
|
||||||
): VisitDetail
|
|
||||||
|
|
||||||
@GET("inspection-visits/{visitId}/field-inventory")
|
|
||||||
suspend fun fieldInventory(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Query("search") search: String? = null,
|
|
||||||
@Query("parentId") parentId: String? = null,
|
|
||||||
@Query("limit") limit: Int = 80,
|
|
||||||
): FieldInventoryListResponse
|
|
||||||
|
|
||||||
@GET("inspection-visits/{visitId}/field-inventory/types")
|
|
||||||
suspend fun fieldTypes(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Query("parentId") parentId: String? = null,
|
|
||||||
): FieldTypeResponse
|
|
||||||
|
|
||||||
@POST("inspection-visits/{visitId}/field-inventory/{assetId}/select")
|
|
||||||
suspend fun selectFieldAsset(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Path("assetId") assetId: String,
|
|
||||||
): FieldAssetDetail
|
|
||||||
|
|
||||||
@POST("inspection-visits/{visitId}/field-inventory")
|
|
||||||
suspend fun createFieldAsset(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Body request: CreateFieldInventoryRequest,
|
|
||||||
): FieldAssetDetail
|
|
||||||
|
|
||||||
@POST("inspection-visits/{visitId}/field-inventory/{assetId}/merge")
|
|
||||||
suspend fun mergeFieldAsset(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Path("assetId") assetId: String,
|
|
||||||
@Body request: MergeFieldInventoryRequest,
|
|
||||||
): FieldInventoryMergeResult
|
|
||||||
|
|
||||||
@Multipart
|
|
||||||
@POST("inspection-visits/{visitId}/field-inventory/{assetId}/photos")
|
|
||||||
suspend fun uploadFieldPhoto(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Path("assetId") assetId: String,
|
|
||||||
@Part file: MultipartBody.Part,
|
|
||||||
@Part("deviceLatitude") latitude: okhttp3.RequestBody,
|
|
||||||
@Part("deviceLongitude") longitude: okhttp3.RequestBody,
|
|
||||||
@Part("deviceAccuracyM") accuracy: okhttp3.RequestBody?,
|
|
||||||
@Part("deviceCapturedAt") capturedAt: okhttp3.RequestBody,
|
|
||||||
@Part("deviceLabel") deviceLabel: okhttp3.RequestBody,
|
|
||||||
@Part("exifLatitude") exifLatitude: okhttp3.RequestBody?,
|
|
||||||
@Part("exifLongitude") exifLongitude: okhttp3.RequestBody?,
|
|
||||||
@Part("exifCapturedAt") exifCapturedAt: okhttp3.RequestBody?,
|
|
||||||
): FieldPhotoResponse
|
|
||||||
}
|
|
||||||
|
|
||||||
class SecureSessionStore(context: Context) {
|
|
||||||
private val prefs = context.getSharedPreferences("dh_v2_mobile_session", Context.MODE_PRIVATE)
|
|
||||||
private val alias = "dh_v2_mobile_session_key"
|
|
||||||
|
|
||||||
fun load(): StoredSession? {
|
|
||||||
val encoded = prefs.getString("payload", null) ?: return null
|
|
||||||
return runCatching {
|
|
||||||
val parts = encoded.split('.', limit = 2)
|
|
||||||
require(parts.size == 2)
|
|
||||||
val iv = Base64.decode(parts[0], Base64.NO_WRAP)
|
|
||||||
val encrypted = Base64.decode(parts[1], Base64.NO_WRAP)
|
|
||||||
val cipher = Cipher.getInstance("AES/GCM/NoPadding")
|
|
||||||
cipher.init(Cipher.DECRYPT_MODE, key(), GCMParameterSpec(128, iv))
|
|
||||||
val json = JSONObject(String(cipher.doFinal(encrypted), Charsets.UTF_8))
|
|
||||||
StoredSession(
|
|
||||||
userId = json.getString("userId"),
|
|
||||||
username = json.getString("username"),
|
|
||||||
displayName = json.optString("displayName", json.getString("username")),
|
|
||||||
accessToken = json.getString("accessToken"),
|
|
||||||
refreshToken = json.getString("refreshToken"),
|
|
||||||
)
|
|
||||||
}.getOrElse {
|
|
||||||
clear()
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun save(response: MobileSessionResponse): StoredSession {
|
|
||||||
val displayName = listOfNotNull(response.user.firstName, response.user.lastName)
|
|
||||||
.joinToString(" ").trim().ifBlank { response.user.username }
|
|
||||||
val stored = StoredSession(
|
|
||||||
userId = response.user.id,
|
|
||||||
username = response.user.username,
|
|
||||||
displayName = displayName,
|
|
||||||
accessToken = response.accessToken,
|
|
||||||
refreshToken = response.refreshToken,
|
|
||||||
)
|
|
||||||
val json = JSONObject()
|
|
||||||
.put("userId", stored.userId)
|
|
||||||
.put("username", stored.username)
|
|
||||||
.put("displayName", stored.displayName)
|
|
||||||
.put("accessToken", stored.accessToken)
|
|
||||||
.put("refreshToken", stored.refreshToken)
|
|
||||||
.toString()
|
|
||||||
val cipher = Cipher.getInstance("AES/GCM/NoPadding")
|
|
||||||
cipher.init(Cipher.ENCRYPT_MODE, key())
|
|
||||||
val encrypted = cipher.doFinal(json.toByteArray(Charsets.UTF_8))
|
|
||||||
val payload = Base64.encodeToString(cipher.iv, Base64.NO_WRAP) + "." +
|
|
||||||
Base64.encodeToString(encrypted, Base64.NO_WRAP)
|
|
||||||
prefs.edit().putString("payload", payload).apply()
|
|
||||||
return stored
|
|
||||||
}
|
|
||||||
|
|
||||||
fun clear() {
|
|
||||||
prefs.edit().clear().apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun key(): SecretKey {
|
|
||||||
val keyStore = KeyStore.getInstance("AndroidKeyStore").apply { load(null) }
|
|
||||||
(keyStore.getKey(alias, null) as? SecretKey)?.let { return it }
|
|
||||||
val generator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore")
|
|
||||||
generator.init(
|
|
||||||
KeyGenParameterSpec.Builder(
|
|
||||||
alias,
|
|
||||||
KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT,
|
|
||||||
)
|
|
||||||
.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
|
|
||||||
.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
|
|
||||||
.setRandomizedEncryptionRequired(true)
|
|
||||||
.build(),
|
|
||||||
)
|
|
||||||
return generator.generateKey()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class DhRepository(context: Context) {
|
|
||||||
private val store = SecureSessionStore(context.applicationContext)
|
|
||||||
private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
|
|
||||||
private val api: DhApi = Retrofit.Builder()
|
|
||||||
.baseUrl(BuildConfig.API_BASE_URL)
|
|
||||||
.client(OkHttpClient.Builder().build())
|
|
||||||
.addConverterFactory(MoshiConverterFactory.create(moshi))
|
|
||||||
.build()
|
|
||||||
.create(DhApi::class.java)
|
|
||||||
|
|
||||||
fun currentSession(): StoredSession? = store.load()
|
|
||||||
|
|
||||||
suspend fun login(identifier: String, password: String): StoredSession =
|
|
||||||
store.save(api.login(LoginRequest(identifier.trim(), password)))
|
|
||||||
|
|
||||||
suspend fun logout() {
|
|
||||||
val session = store.load()
|
|
||||||
if (session != null) runCatching { api.logout("Bearer ${session.accessToken}") }
|
|
||||||
store.clear()
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun visits(): VisitListResponse = authorized { session ->
|
|
||||||
api.visits("Bearer ${session.accessToken}", session.userId)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun visit(id: String): VisitDetail = authorized { session ->
|
|
||||||
api.visit("Bearer ${session.accessToken}", id)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun startVisit(id: String): VisitDetail = authorized { session ->
|
|
||||||
api.startVisit("Bearer ${session.accessToken}", id)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun fieldInventory(visitId: String, search: String?, parentId: String? = null) = authorized { session ->
|
|
||||||
api.fieldInventory("Bearer ${session.accessToken}", visitId, search?.takeIf { it.isNotBlank() }, parentId)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun fieldTypes(visitId: String, parentId: String?) = authorized { session ->
|
|
||||||
api.fieldTypes("Bearer ${session.accessToken}", visitId, parentId)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun selectFieldAsset(visitId: String, assetId: String) = authorized { session ->
|
|
||||||
api.selectFieldAsset("Bearer ${session.accessToken}", visitId, assetId)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun createFieldAsset(visitId: String, request: CreateFieldInventoryRequest) = authorized { session ->
|
|
||||||
api.createFieldAsset("Bearer ${session.accessToken}", visitId, request)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun mergeFieldAsset(
|
|
||||||
visitId: String,
|
|
||||||
assetId: String,
|
|
||||||
canonicalAssetId: String,
|
|
||||||
reason: String,
|
|
||||||
): FieldInventoryMergeResult = authorized { session ->
|
|
||||||
api.mergeFieldAsset(
|
|
||||||
"Bearer ${session.accessToken}",
|
|
||||||
visitId,
|
|
||||||
assetId,
|
|
||||||
MergeFieldInventoryRequest(canonicalAssetId, reason.trim()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun uploadFieldPhoto(
|
|
||||||
visitId: String,
|
|
||||||
assetId: String,
|
|
||||||
file: File,
|
|
||||||
latitude: Double,
|
|
||||||
longitude: Double,
|
|
||||||
accuracyM: Double?,
|
|
||||||
capturedAt: String = Instant.now().toString(),
|
|
||||||
): FieldPhotoResponse = authorized { session ->
|
|
||||||
val text = "text/plain".toMediaType()
|
|
||||||
val body = file.asRequestBody("image/jpeg".toMediaType())
|
|
||||||
val part = MultipartBody.Part.createFormData("file", file.name, body)
|
|
||||||
api.uploadFieldPhoto(
|
|
||||||
authorization = "Bearer ${session.accessToken}",
|
|
||||||
visitId = visitId,
|
|
||||||
assetId = assetId,
|
|
||||||
file = part,
|
|
||||||
latitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
|
|
||||||
longitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
|
|
||||||
accuracy = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text),
|
|
||||||
capturedAt = capturedAt.toRequestBody(text),
|
|
||||||
deviceLabel = "DH Android".toRequestBody(text),
|
|
||||||
exifLatitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
|
|
||||||
exifLongitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
|
|
||||||
exifCapturedAt = capturedAt.toRequestBody(text),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
return block(session)
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun refresh(previous: StoredSession): StoredSession =
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
|
||||||
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
fun humanError(error: Throwable): String {
|
|
||||||
if (error is java.io.IOException) {
|
|
||||||
return "No se pudo conectar. Revisá la señal. Si estabas guardando, comprobá el registro antes de reintentar."
|
|
||||||
}
|
|
||||||
if (error is HttpException) {
|
|
||||||
val body = runCatching { error.response()?.errorBody()?.string() }.getOrNull()
|
|
||||||
val message = runCatching { JSONObject(body.orEmpty()).optString("message") }.getOrNull()
|
|
||||||
if (!message.isNullOrBlank()) return message
|
|
||||||
return "Error HTTP ${error.code()}"
|
|
||||||
}
|
|
||||||
return error.message ?: "Ocurrió un error inesperado"
|
|
||||||
}
|
|
||||||
|
|
||||||
fun newOperationId(): String = UUID.randomUUID().toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.data
|
|
||||||
|
|
||||||
import java.math.BigDecimal
|
|
||||||
import java.math.RoundingMode
|
|
||||||
|
|
||||||
internal object FieldCoordinates {
|
|
||||||
private fun normalized(value: Double, scale: Int, min: Double, max: Double): Double {
|
|
||||||
require(value.isFinite() && value in min..max) { "La ubicación GPS recibida no es válida." }
|
|
||||||
return BigDecimal.valueOf(value).setScale(scale, RoundingMode.HALF_UP).toDouble()
|
|
||||||
}
|
|
||||||
fun latitude(value: Double) = normalized(value, 6, -90.0, 90.0)
|
|
||||||
fun longitude(value: Double) = normalized(value, 6, -180.0, 180.0)
|
|
||||||
fun accuracy(value: Double) = normalized(value, 3, 0.0, 100000.0)
|
|
||||||
}
|
|
||||||
@@ -1,248 +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 okhttp3.MediaType.Companion.toMediaType
|
|
||||||
import okhttp3.MultipartBody
|
|
||||||
import okhttp3.OkHttpClient
|
|
||||||
import okhttp3.RequestBody
|
|
||||||
import okhttp3.RequestBody.Companion.asRequestBody
|
|
||||||
import okhttp3.RequestBody.Companion.toRequestBody
|
|
||||||
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.Multipart
|
|
||||||
import retrofit2.http.POST
|
|
||||||
import retrofit2.http.Part
|
|
||||||
import retrofit2.http.Path
|
|
||||||
import retrofit2.http.Query
|
|
||||||
import java.io.File
|
|
||||||
import java.time.Instant
|
|
||||||
|
|
||||||
data class FieldFindingAct(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val status: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldFindingCatalogItem(
|
|
||||||
val id: String,
|
|
||||||
val categoryId: String,
|
|
||||||
val code: String,
|
|
||||||
val sourceNumber: Int,
|
|
||||||
val title: String,
|
|
||||||
val legalBasis: String? = null,
|
|
||||||
val glossary: String? = null,
|
|
||||||
val suggestedSeverity: Int? = null,
|
|
||||||
val revision: Int = 1,
|
|
||||||
val categoryName: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldFindingOther(
|
|
||||||
val enabled: Boolean = true,
|
|
||||||
val code: String = "OTHER",
|
|
||||||
val label: String = "OTROS",
|
|
||||||
val help: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldFindingCatalog(
|
|
||||||
val typeConfigured: Boolean = false,
|
|
||||||
val configurationReason: String? = null,
|
|
||||||
val items: List<FieldFindingCatalogItem> = emptyList(),
|
|
||||||
val other: FieldFindingOther = FieldFindingOther(),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldFindingItem(
|
|
||||||
val id: String,
|
|
||||||
val actId: String,
|
|
||||||
val assetId: String,
|
|
||||||
val catalogItemId: String? = null,
|
|
||||||
val findingNumber: Int,
|
|
||||||
val code: String,
|
|
||||||
val status: String,
|
|
||||||
val title: String,
|
|
||||||
val description: String,
|
|
||||||
val severity: Int? = null,
|
|
||||||
val suggestedSeverity: Int? = null,
|
|
||||||
val correctionDueOn: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldFindingEvidence(
|
|
||||||
val id: String,
|
|
||||||
val findingId: String,
|
|
||||||
val kind: String,
|
|
||||||
val purpose: String,
|
|
||||||
val originalName: String,
|
|
||||||
val mimeType: String,
|
|
||||||
val sizeBytes: Long,
|
|
||||||
val sha256: String,
|
|
||||||
val title: String? = null,
|
|
||||||
val description: String? = null,
|
|
||||||
val capturedAt: String? = null,
|
|
||||||
val latitude: Double? = null,
|
|
||||||
val longitude: Double? = null,
|
|
||||||
val accuracyM: Double? = null,
|
|
||||||
val deviceLabel: String? = null,
|
|
||||||
val source: String,
|
|
||||||
val createdAt: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldFindingEvidenceListResponse(
|
|
||||||
val data: List<FieldFindingEvidence> = emptyList(),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldFindingOptionsResponse(
|
|
||||||
val act: FieldFindingAct,
|
|
||||||
val capture: CaptureStatus = CaptureStatus(),
|
|
||||||
val assetIncludedInAct: Boolean = true,
|
|
||||||
val catalog: FieldFindingCatalog,
|
|
||||||
val findings: List<FieldFindingItem> = emptyList(),
|
|
||||||
val canAddAnother: Boolean = true,
|
|
||||||
val actSelectionMode: String = "EXPLICIT",
|
|
||||||
)
|
|
||||||
|
|
||||||
data class CreateFieldFindingRequest(
|
|
||||||
val actId: String,
|
|
||||||
val catalogItemId: String? = null,
|
|
||||||
val customTitle: String? = null,
|
|
||||||
val customLegalBasis: String? = null,
|
|
||||||
val description: String,
|
|
||||||
val severity: Int? = null,
|
|
||||||
val correctionDueOn: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class FieldFindingCreateResponse(
|
|
||||||
val act: FieldFindingAct,
|
|
||||||
val capture: CaptureStatus = CaptureStatus(),
|
|
||||||
val finding: FieldFindingItem,
|
|
||||||
val canAddAnother: Boolean = true,
|
|
||||||
val actSelectionMode: String = "EXPLICIT",
|
|
||||||
)
|
|
||||||
|
|
||||||
private interface FieldFindingsApi {
|
|
||||||
@GET("inspection-visits/{visitId}/field-findings/{assetId}/options")
|
|
||||||
suspend fun options(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Path("assetId") assetId: String,
|
|
||||||
@Query("actId") actId: String,
|
|
||||||
): FieldFindingOptionsResponse
|
|
||||||
|
|
||||||
@POST("inspection-visits/{visitId}/field-findings/{assetId}")
|
|
||||||
suspend fun create(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Path("assetId") assetId: String,
|
|
||||||
@Body request: CreateFieldFindingRequest,
|
|
||||||
): FieldFindingCreateResponse
|
|
||||||
|
|
||||||
@GET("inspection-findings/{findingId}/evidence")
|
|
||||||
suspend fun evidence(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("findingId") findingId: String,
|
|
||||||
): FieldFindingEvidenceListResponse
|
|
||||||
|
|
||||||
@Multipart
|
|
||||||
@POST("inspection-findings/{findingId}/evidence")
|
|
||||||
suspend fun uploadEvidence(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("findingId") findingId: String,
|
|
||||||
@Part file: MultipartBody.Part,
|
|
||||||
@Part("kind") kind: RequestBody,
|
|
||||||
@Part("purpose") purpose: RequestBody,
|
|
||||||
@Part("title") title: RequestBody?,
|
|
||||||
@Part("description") description: RequestBody?,
|
|
||||||
@Part("capturedAt") capturedAt: RequestBody,
|
|
||||||
@Part("latitude") latitude: RequestBody,
|
|
||||||
@Part("longitude") longitude: RequestBody,
|
|
||||||
@Part("accuracyM") accuracyM: RequestBody?,
|
|
||||||
@Part("deviceLabel") deviceLabel: RequestBody,
|
|
||||||
): FieldFindingEvidence
|
|
||||||
|
|
||||||
@POST("auth/mobile/refresh")
|
|
||||||
suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cliente de campo para Hallazgos y sus evidencias append-only.
|
|
||||||
* F3.2 exige que la APK identifique explícitamente el Acta activa.
|
|
||||||
*/
|
|
||||||
class FieldFindingsRepository(context: Context) {
|
|
||||||
private val store = SecureSessionStore(context.applicationContext)
|
|
||||||
private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
|
|
||||||
private val api: FieldFindingsApi = Retrofit.Builder()
|
|
||||||
.baseUrl(BuildConfig.API_BASE_URL)
|
|
||||||
.client(OkHttpClient.Builder().build())
|
|
||||||
.addConverterFactory(MoshiConverterFactory.create(moshi))
|
|
||||||
.build()
|
|
||||||
.create(FieldFindingsApi::class.java)
|
|
||||||
|
|
||||||
suspend fun options(visitId: String, assetId: String, actId: String): FieldFindingOptionsResponse =
|
|
||||||
authorized { session ->
|
|
||||||
api.options("Bearer ${session.accessToken}", visitId, assetId, actId)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun create(
|
|
||||||
visitId: String,
|
|
||||||
assetId: String,
|
|
||||||
request: CreateFieldFindingRequest,
|
|
||||||
): FieldFindingCreateResponse = authorized { session ->
|
|
||||||
api.create("Bearer ${session.accessToken}", visitId, assetId, request)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun evidence(findingId: String): FieldFindingEvidenceListResponse = authorized { session ->
|
|
||||||
api.evidence("Bearer ${session.accessToken}", findingId)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun uploadObservationPhoto(
|
|
||||||
findingId: String,
|
|
||||||
file: File,
|
|
||||||
latitude: Double,
|
|
||||||
longitude: Double,
|
|
||||||
accuracyM: Double?,
|
|
||||||
title: String? = null,
|
|
||||||
description: String? = null,
|
|
||||||
capturedAt: String = Instant.now().toString(),
|
|
||||||
): FieldFindingEvidence = authorized { session ->
|
|
||||||
val text = "text/plain".toMediaType()
|
|
||||||
val part = MultipartBody.Part.createFormData(
|
|
||||||
"file",
|
|
||||||
file.name,
|
|
||||||
file.asRequestBody("image/jpeg".toMediaType()),
|
|
||||||
)
|
|
||||||
api.uploadEvidence(
|
|
||||||
authorization = "Bearer ${session.accessToken}",
|
|
||||||
findingId = findingId,
|
|
||||||
file = part,
|
|
||||||
kind = "PHOTO".toRequestBody(text),
|
|
||||||
purpose = "OBSERVATION".toRequestBody(text),
|
|
||||||
title = title?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
|
|
||||||
description = description?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
|
|
||||||
capturedAt = capturedAt.toRequestBody(text),
|
|
||||||
latitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
|
|
||||||
longitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
|
|
||||||
accuracyM = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text),
|
|
||||||
deviceLabel = "DH Android".toRequestBody(text),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
return block(session)
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun refresh(previous: StoredSession): StoredSession =
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,462 +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 okhttp3.MediaType.Companion.toMediaType
|
|
||||||
import okhttp3.MultipartBody
|
|
||||||
import okhttp3.OkHttpClient
|
|
||||||
import okhttp3.RequestBody
|
|
||||||
import okhttp3.RequestBody.Companion.asRequestBody
|
|
||||||
import okhttp3.RequestBody.Companion.toRequestBody
|
|
||||||
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.Multipart
|
|
||||||
import retrofit2.http.PATCH
|
|
||||||
import retrofit2.http.POST
|
|
||||||
import retrofit2.http.PUT
|
|
||||||
import retrofit2.http.Part
|
|
||||||
import retrofit2.http.Path
|
|
||||||
import retrofit2.http.Query
|
|
||||||
import java.io.File
|
|
||||||
import java.time.Instant
|
|
||||||
|
|
||||||
data class MobileActSummary(
|
|
||||||
val id: String,
|
|
||||||
val visitId: String,
|
|
||||||
val code: String,
|
|
||||||
val status: String,
|
|
||||||
val occurredAt: String,
|
|
||||||
val title: String,
|
|
||||||
val summary: String,
|
|
||||||
val observations: String? = null,
|
|
||||||
val urgency: String? = null,
|
|
||||||
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,
|
|
||||||
val assetCount: Int = 0,
|
|
||||||
val findingCount: Int = 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileActDetail(
|
|
||||||
val id: String,
|
|
||||||
val visitId: String,
|
|
||||||
val code: String,
|
|
||||||
val status: String,
|
|
||||||
val occurredAt: String,
|
|
||||||
val title: String,
|
|
||||||
val summary: String,
|
|
||||||
val observations: String? = null,
|
|
||||||
val urgency: String? = null,
|
|
||||||
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,
|
|
||||||
val assetCount: Int = 0,
|
|
||||||
val findingCount: Int = 0,
|
|
||||||
val assets: List<AssetSummary> = emptyList(),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileActListMeta(
|
|
||||||
val page: Int = 1,
|
|
||||||
val pageSize: Int = 100,
|
|
||||||
val total: Int = 0,
|
|
||||||
val totalPages: Int = 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileActListResponse(
|
|
||||||
val data: List<MobileActSummary> = emptyList(),
|
|
||||||
val meta: MobileActListMeta = MobileActListMeta(),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class CreateMobileActRequest(
|
|
||||||
val occurredAt: String,
|
|
||||||
val title: String,
|
|
||||||
val summary: String,
|
|
||||||
val observations: String? = null,
|
|
||||||
val assetIds: List<String>,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class PrepareMobileActRequest(
|
|
||||||
val urgency: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class UpdateMobileActRequest(
|
|
||||||
val assetIds: List<String>,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileResponsibleRequest(
|
|
||||||
val attendanceStatus: String,
|
|
||||||
val fullName: String? = null,
|
|
||||||
val documentType: String? = null,
|
|
||||||
val documentNumber: String? = null,
|
|
||||||
val position: String? = null,
|
|
||||||
val email: String? = null,
|
|
||||||
val phone: String? = null,
|
|
||||||
val absenceReason: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileResponsible(
|
|
||||||
val actId: String,
|
|
||||||
val attendanceStatus: String,
|
|
||||||
val fullName: String? = null,
|
|
||||||
val documentType: String? = null,
|
|
||||||
val documentNumber: String? = null,
|
|
||||||
val position: String? = null,
|
|
||||||
val email: String? = null,
|
|
||||||
val phone: String? = null,
|
|
||||||
val absenceReason: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileActClosureHeader(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val status: String,
|
|
||||||
val visitId: String,
|
|
||||||
val urgency: String? = null,
|
|
||||||
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,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileVisitClosureHeader(
|
|
||||||
val id: String,
|
|
||||||
val code: String,
|
|
||||||
val status: String,
|
|
||||||
val actualClosedAt: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileSignature(
|
|
||||||
val id: String,
|
|
||||||
val signerType: String,
|
|
||||||
val signerUserId: String? = null,
|
|
||||||
val signerName: String,
|
|
||||||
val status: String,
|
|
||||||
val reason: String? = null,
|
|
||||||
val companyManifestation: String? = null,
|
|
||||||
val companyStatement: String? = null,
|
|
||||||
val signedAt: String? = null,
|
|
||||||
val imageSha256: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileClosureRecord(
|
|
||||||
val schemaVersion: String,
|
|
||||||
val preparedSha256: String,
|
|
||||||
val preparedAt: String,
|
|
||||||
val finalSha256: String? = null,
|
|
||||||
val deviceClosedAt: String? = null,
|
|
||||||
val serverClosedAt: String? = null,
|
|
||||||
val uploadMode: String? = null,
|
|
||||||
val isCurrent: Boolean = true,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileClosureConsents(
|
|
||||||
val version: String = "",
|
|
||||||
val inspector: String = "",
|
|
||||||
val company: String = "",
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileActClosure(
|
|
||||||
val act: MobileActClosureHeader,
|
|
||||||
val visit: MobileVisitClosureHeader,
|
|
||||||
val responsible: MobileResponsible? = null,
|
|
||||||
val closure: MobileClosureRecord? = null,
|
|
||||||
val signatures: List<MobileSignature> = emptyList(),
|
|
||||||
val consents: MobileClosureConsents = MobileClosureConsents(),
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileCompanyOutcomeRequest(
|
|
||||||
val status: String,
|
|
||||||
val reason: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileSealActRequest(
|
|
||||||
val clientClosedAt: String = Instant.now().toString(),
|
|
||||||
val uploadMode: String = "ONLINE",
|
|
||||||
)
|
|
||||||
|
|
||||||
data class MobileCloseVisitRequest(
|
|
||||||
val clientClosedAt: String = Instant.now().toString(),
|
|
||||||
)
|
|
||||||
|
|
||||||
private interface MobileActsApi {
|
|
||||||
@GET("inspection-visits/{visitId}/acts/mobile")
|
|
||||||
suspend fun listActs(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Query("pageSize") pageSize: Int = 100,
|
|
||||||
): MobileActListResponse
|
|
||||||
|
|
||||||
@GET("inspection-acts/{actId}")
|
|
||||||
suspend fun act(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("actId") actId: String,
|
|
||||||
): MobileActDetail
|
|
||||||
|
|
||||||
@POST("inspection-visits/{visitId}/acts")
|
|
||||||
suspend fun createAct(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Body request: CreateMobileActRequest,
|
|
||||||
): MobileActDetail
|
|
||||||
|
|
||||||
@PATCH("inspection-acts/{actId}")
|
|
||||||
suspend fun updateAct(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("actId") actId: String,
|
|
||||||
@Body request: UpdateMobileActRequest,
|
|
||||||
): MobileActDetail
|
|
||||||
|
|
||||||
@GET("inspection-acts/{actId}/closure")
|
|
||||||
suspend fun closure(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("actId") actId: String,
|
|
||||||
): MobileActClosure
|
|
||||||
|
|
||||||
@PUT("inspection-acts/{actId}/responsible")
|
|
||||||
suspend fun responsible(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("actId") actId: String,
|
|
||||||
@Body request: MobileResponsibleRequest,
|
|
||||||
): MobileActClosure
|
|
||||||
|
|
||||||
@POST("inspection-acts/{actId}/lock")
|
|
||||||
suspend fun lock(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("actId") actId: String,
|
|
||||||
@Body request: PrepareMobileActRequest,
|
|
||||||
): MobileActClosure
|
|
||||||
|
|
||||||
@Multipart
|
|
||||||
@POST("inspection-acts/{actId}/signatures/inspector")
|
|
||||||
suspend fun signInspector(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("actId") actId: String,
|
|
||||||
@Part file: MultipartBody.Part,
|
|
||||||
@Part("consentAccepted") consentAccepted: RequestBody,
|
|
||||||
@Part("clientSignedAt") clientSignedAt: RequestBody,
|
|
||||||
@Part("latitude") latitude: RequestBody?,
|
|
||||||
@Part("longitude") longitude: RequestBody?,
|
|
||||||
@Part("accuracyM") accuracyM: RequestBody?,
|
|
||||||
@Part("deviceLabel") deviceLabel: RequestBody,
|
|
||||||
): MobileActClosure
|
|
||||||
|
|
||||||
@Multipart
|
|
||||||
@POST("inspection-acts/{actId}/signatures/company")
|
|
||||||
suspend fun signCompany(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("actId") actId: String,
|
|
||||||
@Part file: MultipartBody.Part,
|
|
||||||
@Part("consentAccepted") consentAccepted: RequestBody,
|
|
||||||
@Part("clientSignedAt") clientSignedAt: RequestBody,
|
|
||||||
@Part("latitude") latitude: RequestBody?,
|
|
||||||
@Part("longitude") longitude: RequestBody?,
|
|
||||||
@Part("accuracyM") accuracyM: RequestBody?,
|
|
||||||
@Part("deviceLabel") deviceLabel: RequestBody,
|
|
||||||
@Part("manifestation") manifestation: RequestBody?,
|
|
||||||
@Part("statement") statement: RequestBody?,
|
|
||||||
): MobileActClosure
|
|
||||||
|
|
||||||
@POST("inspection-acts/{actId}/company-outcome")
|
|
||||||
suspend fun companyOutcome(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("actId") actId: String,
|
|
||||||
@Body request: MobileCompanyOutcomeRequest,
|
|
||||||
): MobileActClosure
|
|
||||||
|
|
||||||
@POST("inspection-acts/{actId}/seal")
|
|
||||||
suspend fun sealAct(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("actId") actId: String,
|
|
||||||
@Body request: MobileSealActRequest,
|
|
||||||
): MobileActClosure
|
|
||||||
|
|
||||||
@POST("inspection-visits/{visitId}/close")
|
|
||||||
suspend fun closeVisit(
|
|
||||||
@Header("Authorization") authorization: String,
|
|
||||||
@Path("visitId") visitId: String,
|
|
||||||
@Body request: MobileCloseVisitRequest,
|
|
||||||
): VisitDetail
|
|
||||||
|
|
||||||
@POST("auth/mobile/refresh")
|
|
||||||
suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
|
|
||||||
}
|
|
||||||
|
|
||||||
class MobileActsRepository(context: Context) {
|
|
||||||
private val store = SecureSessionStore(context.applicationContext)
|
|
||||||
private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
|
|
||||||
private val api: MobileActsApi = Retrofit.Builder()
|
|
||||||
.baseUrl(BuildConfig.API_BASE_URL)
|
|
||||||
.client(OkHttpClient.Builder().build())
|
|
||||||
.addConverterFactory(MoshiConverterFactory.create(moshi))
|
|
||||||
.build()
|
|
||||||
.create(MobileActsApi::class.java)
|
|
||||||
|
|
||||||
suspend fun list(visitId: String): MobileActListResponse = authorized { session ->
|
|
||||||
api.listActs("Bearer ${session.accessToken}", visitId)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun get(actId: String): MobileActDetail = authorized { session ->
|
|
||||||
api.act("Bearer ${session.accessToken}", actId)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun create(
|
|
||||||
visitId: String,
|
|
||||||
visitCode: String,
|
|
||||||
): MobileActDetail = authorized { session ->
|
|
||||||
api.createAct(
|
|
||||||
"Bearer ${session.accessToken}",
|
|
||||||
visitId,
|
|
||||||
CreateMobileActRequest(
|
|
||||||
occurredAt = Instant.now().toString(),
|
|
||||||
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 = emptyList(),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun ensureAsset(actId: String, assetId: String): MobileActDetail {
|
|
||||||
val detail = get(actId)
|
|
||||||
if (detail.assets.any { it.id == assetId }) return detail
|
|
||||||
val ids = (detail.assets.map { it.id } + assetId).distinct()
|
|
||||||
return authorized { session ->
|
|
||||||
api.updateAct("Bearer ${session.accessToken}", actId, UpdateMobileActRequest(ids))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun closure(actId: String): MobileActClosure = authorized { session ->
|
|
||||||
api.closure("Bearer ${session.accessToken}", actId)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun setResponsible(actId: String, request: MobileResponsibleRequest): MobileActClosure = authorized { session ->
|
|
||||||
api.responsible("Bearer ${session.accessToken}", actId, request)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun lock(actId: String, urgency: String): MobileActClosure = authorized { session ->
|
|
||||||
api.lock("Bearer ${session.accessToken}", actId, PrepareMobileActRequest(urgency))
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun signInspector(
|
|
||||||
actId: String,
|
|
||||||
png: File,
|
|
||||||
latitude: Double?,
|
|
||||||
longitude: Double?,
|
|
||||||
accuracyM: Double?,
|
|
||||||
): MobileActClosure = signature(actId, png, latitude, longitude, accuracyM, company = false)
|
|
||||||
|
|
||||||
suspend fun signCompany(
|
|
||||||
actId: String,
|
|
||||||
png: File,
|
|
||||||
latitude: Double?,
|
|
||||||
longitude: Double?,
|
|
||||||
accuracyM: Double?,
|
|
||||||
manifestation: String = "CONFORMITY",
|
|
||||||
statement: String? = null,
|
|
||||||
): MobileActClosure = signature(
|
|
||||||
actId = actId,
|
|
||||||
png = png,
|
|
||||||
latitude = latitude,
|
|
||||||
longitude = longitude,
|
|
||||||
accuracyM = accuracyM,
|
|
||||||
company = true,
|
|
||||||
manifestation = manifestation,
|
|
||||||
statement = statement,
|
|
||||||
)
|
|
||||||
|
|
||||||
suspend fun companyOutcome(actId: String, status: String, reason: String): MobileActClosure = authorized { session ->
|
|
||||||
api.companyOutcome(
|
|
||||||
"Bearer ${session.accessToken}",
|
|
||||||
actId,
|
|
||||||
MobileCompanyOutcomeRequest(status, reason.trim()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun seal(actId: String): MobileActClosure = authorized { session ->
|
|
||||||
api.sealAct("Bearer ${session.accessToken}", actId, MobileSealActRequest())
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun closeVisit(visitId: String): VisitDetail = authorized { session ->
|
|
||||||
api.closeVisit("Bearer ${session.accessToken}", visitId, MobileCloseVisitRequest())
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun signature(
|
|
||||||
actId: String,
|
|
||||||
png: File,
|
|
||||||
latitude: Double?,
|
|
||||||
longitude: Double?,
|
|
||||||
accuracyM: Double?,
|
|
||||||
company: Boolean,
|
|
||||||
manifestation: String? = null,
|
|
||||||
statement: String? = null,
|
|
||||||
): MobileActClosure = authorized { session ->
|
|
||||||
val text = "text/plain".toMediaType()
|
|
||||||
val file = MultipartBody.Part.createFormData(
|
|
||||||
"file",
|
|
||||||
png.name,
|
|
||||||
png.asRequestBody("image/png".toMediaType()),
|
|
||||||
)
|
|
||||||
val consent = "true".toRequestBody(text)
|
|
||||||
val signedAt = Instant.now().toString().toRequestBody(text)
|
|
||||||
val device = "DH Android".toRequestBody(text)
|
|
||||||
val lat = latitude?.let(FieldCoordinates::latitude)?.toString()?.toRequestBody(text)
|
|
||||||
val lon = longitude?.let(FieldCoordinates::longitude)?.toString()?.toRequestBody(text)
|
|
||||||
val accuracy = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text)
|
|
||||||
if (company) {
|
|
||||||
api.signCompany(
|
|
||||||
"Bearer ${session.accessToken}", actId, file, consent, signedAt,
|
|
||||||
lat, lon, accuracy, device,
|
|
||||||
manifestation?.toRequestBody(text),
|
|
||||||
statement?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
api.signInspector(
|
|
||||||
"Bearer ${session.accessToken}", actId, file, consent, signedAt,
|
|
||||||
lat, lon, accuracy, device,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
return block(session)
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun refresh(previous: StoredSession): StoredSession =
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,93 +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 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 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)
|
|
||||||
return block(session)
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun refresh(previous: StoredSession): StoredSession =
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
|
||||||
|
|
||||||
}
|
|
||||||
-32
@@ -1,32 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.data
|
|
||||||
|
|
||||||
import kotlinx.coroutines.sync.Mutex
|
|
||||||
import kotlinx.coroutines.sync.withLock
|
|
||||||
import retrofit2.HttpException
|
|
||||||
|
|
||||||
/** One refresh lock for every API client sharing the encrypted session. */
|
|
||||||
internal object MobileSessionCoordinator {
|
|
||||||
private val mutex = Mutex()
|
|
||||||
|
|
||||||
suspend fun refresh(
|
|
||||||
previous: StoredSession,
|
|
||||||
load: () -> StoredSession?,
|
|
||||||
save: (MobileSessionResponse) -> StoredSession,
|
|
||||||
clear: () -> Unit,
|
|
||||||
request: suspend (RefreshRequest) -> MobileSessionResponse,
|
|
||||||
): StoredSession = mutex.withLock {
|
|
||||||
val latest = load() ?: throw IllegalStateException("Sesión no iniciada")
|
|
||||||
check(latest.userId == previous.userId) { "La sesión cambió. Volvé a abrir la operación." }
|
|
||||||
if (latest.refreshToken != previous.refreshToken) return@withLock latest
|
|
||||||
val response = try {
|
|
||||||
request(RefreshRequest(previous.refreshToken))
|
|
||||||
} catch (error: HttpException) {
|
|
||||||
// Network failures and server outages must not discard the saved login.
|
|
||||||
if (error.code() == 401 && load()?.refreshToken == previous.refreshToken) clear()
|
|
||||||
throw error
|
|
||||||
}
|
|
||||||
// A logout or another login during the request must never be undone.
|
|
||||||
check(load()?.refreshToken == previous.refreshToken) { "La sesión cambió. Volvé a ingresar." }
|
|
||||||
save(response)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,64 +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 retrofit2.HttpException
|
|
||||||
import retrofit2.Retrofit
|
|
||||||
import retrofit2.converter.moshi.MoshiConverterFactory
|
|
||||||
import retrofit2.http.*
|
|
||||||
import java.time.LocalDate
|
|
||||||
import java.time.OffsetDateTime
|
|
||||||
|
|
||||||
internal data class TechnicalDefinition(
|
|
||||||
val id: String, val code: String, val name: String, val dataType: String,
|
|
||||||
val isRequired: Boolean = false, val isActive: Boolean = true,
|
|
||||||
val unit: String? = null, val options: List<String>? = null,
|
|
||||||
)
|
|
||||||
internal data class TechnicalValues(
|
|
||||||
val assetId: String, val family: FieldInventoryFamily,
|
|
||||||
val definitions: List<TechnicalDefinition>, val values: Map<String, Any?>,
|
|
||||||
)
|
|
||||||
internal data class TechnicalValuesRequest(val values: Map<String, Any?>)
|
|
||||||
private interface TechnicalApi {
|
|
||||||
@GET("assets/{id}/technical-values")
|
|
||||||
suspend fun get(@Header("Authorization") auth: String, @Path("id") id: String): TechnicalValues
|
|
||||||
@PUT("assets/{id}/technical-values")
|
|
||||||
suspend fun put(@Header("Authorization") auth: String, @Path("id") id: String, @Body body: TechnicalValuesRequest): TechnicalValues
|
|
||||||
@POST("auth/mobile/refresh")
|
|
||||||
suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
|
|
||||||
}
|
|
||||||
internal class TechnicalRepository(context: Context) {
|
|
||||||
private val store = SecureSessionStore(context.applicationContext)
|
|
||||||
private val api = Retrofit.Builder().baseUrl(BuildConfig.API_BASE_URL)
|
|
||||||
.addConverterFactory(MoshiConverterFactory.create(Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()))
|
|
||||||
.build().create(TechnicalApi::class.java)
|
|
||||||
suspend fun get(id: String) = authorized { api.get("Bearer ${it.accessToken}", id) }
|
|
||||||
suspend fun save(id: String, values: Map<String, Any?>) = authorized {
|
|
||||||
api.put("Bearer ${it.accessToken}", id, TechnicalValuesRequest(values))
|
|
||||||
}
|
|
||||||
private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
|
|
||||||
val previous = store.load() ?: error("Sesión no iniciada")
|
|
||||||
try { return block(previous) }
|
|
||||||
catch (error: HttpException) { if (error.code() != 401) throw error }
|
|
||||||
val current = MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
|
|
||||||
return block(current)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Keeps IDs and typed JSON values identical to the Dashboard contract. */
|
|
||||||
internal fun technicalInputValue(definition: TechnicalDefinition, text: String): Any? {
|
|
||||||
val value = text.trim()
|
|
||||||
require(value.isNotBlank() || !definition.isRequired) { "Completá ${definition.name}." }
|
|
||||||
if (value.isBlank()) return null
|
|
||||||
fun invalid(): Nothing = throw IllegalArgumentException("Revisá el valor de ${definition.name}.")
|
|
||||||
return when (definition.dataType) {
|
|
||||||
"NUMBER" -> value.replace(',', '.').toDoubleOrNull()?.takeIf { it.isFinite() } ?: invalid()
|
|
||||||
"BOOLEAN" -> when (value) { "true" -> true; "false" -> false; else -> invalid() }
|
|
||||||
"DATE" -> runCatching { LocalDate.parse(value).toString() }.getOrElse { invalid() }
|
|
||||||
"DATETIME" -> runCatching { OffsetDateTime.parse(value).toInstant().toString() }.getOrElse { invalid() }
|
|
||||||
"SELECT" -> value.takeIf { it in definition.options.orEmpty() } ?: invalid()
|
|
||||||
else -> value.takeIf { it.length <= 4000 } ?: invalid()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,583 +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.LazyRow
|
|
||||||
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.CircularProgressIndicator
|
|
||||||
import androidx.compose.material3.HorizontalDivider
|
|
||||||
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.mutableStateMapOf
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.runtime.saveable.rememberSaveable
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
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.text.input.PasswordVisualTransformation
|
|
||||||
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 com.korexlabs.dhinspeccion.data.VisitSummary
|
|
||||||
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 GeoSnapshot(
|
|
||||||
val latitude: Double,
|
|
||||||
val longitude: Double,
|
|
||||||
val accuracyM: Double?,
|
|
||||||
)
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DhApp(model: MainViewModel) {
|
|
||||||
MaterialTheme {
|
|
||||||
Surface(modifier = Modifier.fillMaxSize()) {
|
|
||||||
when {
|
|
||||||
model.session == null -> LoginScreen(model)
|
|
||||||
model.visit == null -> VisitsScreen(model)
|
|
||||||
else -> VisitRouter(model)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun MessageStrip(model: MainViewModel) {
|
|
||||||
val error = model.error
|
|
||||||
val notice = model.notice
|
|
||||||
if (error != null || notice != null) {
|
|
||||||
Card(
|
|
||||||
modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp),
|
|
||||||
colors = CardDefaults.cardColors(
|
|
||||||
containerColor = if (error != null) MaterialTheme.colorScheme.errorContainer
|
|
||||||
else MaterialTheme.colorScheme.secondaryContainer,
|
|
||||||
),
|
|
||||||
onClick = { model.clearMessages() },
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = error ?: notice.orEmpty(),
|
|
||||||
modifier = Modifier.padding(12.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun LoginScreen(model: MainViewModel) {
|
|
||||||
var identifier by rememberSaveable { mutableStateOf("") }
|
|
||||||
var password by rememberSaveable { mutableStateOf("") }
|
|
||||||
|
|
||||||
Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
|
|
||||||
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")
|
|
||||||
MessageStrip(model)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = identifier,
|
|
||||||
onValueChange = { identifier = it },
|
|
||||||
label = { Text("Usuario o email") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = password,
|
|
||||||
onValueChange = { password = it },
|
|
||||||
label = { Text("Contraseña") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
visualTransformation = PasswordVisualTransformation(),
|
|
||||||
)
|
|
||||||
Button(
|
|
||||||
onClick = { model.login(identifier, password) },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
enabled = !model.busy,
|
|
||||||
) {
|
|
||||||
if (model.busy) CircularProgressIndicator(modifier = Modifier.width(20.dp).height(20.dp))
|
|
||||||
else Text("Ingresar")
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
"El acceso móvil está reservado a usuarios con rol Inspector.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun VisitsScreen(model: MainViewModel) {
|
|
||||||
val session = model.session ?: return
|
|
||||||
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) { Text("Actualizar") }
|
|
||||||
Spacer(Modifier.width(8.dp))
|
|
||||||
OutlinedButton(onClick = { model.logout() }) { Text("Salir") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Column(Modifier.padding(horizontal = 16.dp)) { MessageStrip(model) }
|
|
||||||
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.")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
LazyColumn(
|
|
||||||
Modifier.fillMaxSize().padding(horizontal = 16.dp),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(10.dp),
|
|
||||||
) {
|
|
||||||
items(model.visits, key = { it.id }) { visit ->
|
|
||||||
VisitCard(visit) { model.openVisit(visit.id) }
|
|
||||||
}
|
|
||||||
item { Spacer(Modifier.height(24.dp)) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun VisitCard(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(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: ${shortDate(it)}", style = MaterialTheme.typography.bodySmall) }
|
|
||||||
Text("Inventario: ${visit.assetCount} · Equipo inspector: ${visit.memberCount}", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun VisitRouter(model: MainViewModel) {
|
|
||||||
var inventoryMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
|
|
||||||
if (inventoryMode) {
|
|
||||||
FieldInventoryScreen(model) { inventoryMode = false }
|
|
||||||
} else {
|
|
||||||
VisitScreen(model) { inventoryMode = true }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun VisitScreen(model: MainViewModel, onInventory: () -> 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(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.instructions?.takeIf { it.isNotBlank() }?.let {
|
|
||||||
Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(12.dp)) { Text("Instrucciones", fontWeight = FontWeight.Bold); Text(it) } }
|
|
||||||
}
|
|
||||||
MessageStrip(model)
|
|
||||||
|
|
||||||
if (visit.status == "PLANNED") {
|
|
||||||
Button(onClick = { model.startVisit() }, enabled = !model.busy, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Text("Iniciar inspección")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (visit.status == "PLANNED" || visit.status == "IN_PROGRESS") {
|
|
||||||
OutlinedButton(onClick = onInventory, modifier = Modifier.fillMaxWidth()) { Text("Inventario de campo") }
|
|
||||||
}
|
|
||||||
|
|
||||||
ChecklistCard(visit)
|
|
||||||
|
|
||||||
Text("Inventario planificado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
if (visit.planningAssets.isEmpty()) 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 ChecklistCard(visit: VisitDetail) {
|
|
||||||
val checklist = visit.checklist
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
|
||||||
Text("Checklist de antecedentes", 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)
|
|
||||||
checklist.items.take(10).forEach { item ->
|
|
||||||
HorizontalDivider()
|
|
||||||
Text(item.findingTitle ?: item.findingCode ?: "Hallazgo", fontWeight = FontWeight.SemiBold)
|
|
||||||
Text("${item.asset?.name.orEmpty()} · Gravedad ${item.severity ?: "s/d"}", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
|
|
||||||
val context = LocalContext.current
|
|
||||||
val scope = rememberCoroutineScope()
|
|
||||||
val visit = model.visit ?: return
|
|
||||||
var search by rememberSaveable { mutableStateOf("") }
|
|
||||||
var showCreate by rememberSaveable { mutableStateOf(false) }
|
|
||||||
var parentId by rememberSaveable { mutableStateOf<String?>(null) }
|
|
||||||
var parentLabel by rememberSaveable { mutableStateOf("Área de la inspección") }
|
|
||||||
var name by rememberSaveable { mutableStateOf("") }
|
|
||||||
var commonName by rememberSaveable { mutableStateOf("") }
|
|
||||||
var selectedTypeId by rememberSaveable { mutableStateOf<String?>(null) }
|
|
||||||
val attributeValues = remember { mutableStateMapOf<String, String>() }
|
|
||||||
|
|
||||||
LaunchedEffect(visit.id) {
|
|
||||||
model.searchInventory("")
|
|
||||||
model.loadFieldTypes(null)
|
|
||||||
}
|
|
||||||
LaunchedEffect(model.fieldTypes) {
|
|
||||||
if (model.fieldTypes.none { it.id == selectedTypeId }) {
|
|
||||||
selectedTypeId = model.fieldTypes.firstOrNull()?.id
|
|
||||||
attributeValues.clear()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val selectedType = model.fieldTypes.firstOrNull { it.id == selectedTypeId }
|
|
||||||
|
|
||||||
val createWithLocation: () -> Unit = {
|
|
||||||
val type = selectedType
|
|
||||||
if (type != null) {
|
|
||||||
scope.launch {
|
|
||||||
runCatching { currentGeo(context) }
|
|
||||||
.onSuccess { geo ->
|
|
||||||
val values = buildAttributes(type, attributeValues)
|
|
||||||
model.createFieldAsset(type, parentId, name, commonName, values, geo.latitude, geo.longitude, geo.accuracyM)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val locationPermissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
|
|
||||||
val allowed = result[Manifest.permission.ACCESS_FINE_LOCATION] == true || result[Manifest.permission.ACCESS_COARSE_LOCATION] == true
|
|
||||||
if (allowed) createWithLocation()
|
|
||||||
}
|
|
||||||
|
|
||||||
var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
|
|
||||||
var pendingPhotoGeo by remember { mutableStateOf<GeoSnapshot?>(null) }
|
|
||||||
val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
|
|
||||||
val file = pendingPhotoFile
|
|
||||||
val geo = pendingPhotoGeo
|
|
||||||
if (success && file != null && geo != null) {
|
|
||||||
runCatching { writeExif(file, geo) }
|
|
||||||
model.uploadFieldPhoto(file, geo.latitude, geo.longitude, geo.accuracyM)
|
|
||||||
}
|
|
||||||
pendingPhotoFile = null
|
|
||||||
pendingPhotoGeo = null
|
|
||||||
}
|
|
||||||
val beginPhoto: () -> Unit = {
|
|
||||||
scope.launch {
|
|
||||||
runCatching { currentGeo(context) }.onSuccess { geo ->
|
|
||||||
val (file, uri) = newPhoto(context)
|
|
||||||
pendingPhotoFile = file
|
|
||||||
pendingPhotoGeo = geo
|
|
||||||
takePicture.launch(uri)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val photoPermissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
|
|
||||||
val camera = result[Manifest.permission.CAMERA] == true || hasPermission(context, Manifest.permission.CAMERA)
|
|
||||||
val location = result[Manifest.permission.ACCESS_FINE_LOCATION] == true || result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || hasLocation(context)
|
|
||||||
if (camera && location) beginPhoto()
|
|
||||||
}
|
|
||||||
|
|
||||||
Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
|
|
||||||
Row(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), horizontalArrangement = Arrangement.SpaceBetween) {
|
|
||||||
OutlinedButton(onClick = onBack) { Text("Volver") }
|
|
||||||
Text("Inventario de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
|
|
||||||
}
|
|
||||||
Column(Modifier.padding(horizontal = 16.dp)) { MessageStrip(model) }
|
|
||||||
|
|
||||||
val selectedCapture = model.selectedFieldAsset
|
|
||||||
if (selectedCapture != null) {
|
|
||||||
CaptureCard(
|
|
||||||
detailName = selectedCapture.asset.name,
|
|
||||||
captureRequired = selectedCapture.capture.captureRequired,
|
|
||||||
gps = selectedCapture.capture.creationGpsCaptured,
|
|
||||||
photos = selectedCapture.capture.fieldPhotoCount,
|
|
||||||
ready = selectedCapture.capture.readyForFinding,
|
|
||||||
onPhoto = {
|
|
||||||
val permissions = arrayOf(Manifest.permission.CAMERA, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
|
|
||||||
if (hasPermission(context, Manifest.permission.CAMERA) && hasLocation(context)) beginPhoto()
|
|
||||||
else photoPermissionLauncher.launch(permissions)
|
|
||||||
},
|
|
||||||
onClose = { model.clearSelectedFieldAsset() },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Row(Modifier.fillMaxWidth().padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
OutlinedTextField(
|
|
||||||
value = search,
|
|
||||||
onValueChange = { search = it },
|
|
||||||
label = { Text("Buscar por nombre, código o atributo") },
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
Spacer(Modifier.width(8.dp))
|
|
||||||
Button(onClick = { model.searchInventory(search) }, enabled = !model.busy) { Text("Buscar") }
|
|
||||||
}
|
|
||||||
if (visit.status == "IN_PROGRESS") {
|
|
||||||
Row(Modifier.fillMaxWidth().padding(16.dp), horizontalArrangement = Arrangement.SpaceBetween) {
|
|
||||||
Text("Alta en campo", fontWeight = FontWeight.Bold)
|
|
||||||
OutlinedButton(onClick = {
|
|
||||||
showCreate = !showCreate
|
|
||||||
if (showCreate) model.loadFieldTypes(parentId)
|
|
||||||
}) { Text(if (showCreate) "Ocultar" else "Crear nuevo") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (showCreate && visit.status == "IN_PROGRESS") {
|
|
||||||
Column(
|
|
||||||
Modifier.fillMaxWidth().padding(horizontal = 16.dp).verticalScroll(rememberScrollState()).weight(1f, fill = false),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(10.dp),
|
|
||||||
) {
|
|
||||||
Text("Padre: $parentLabel", style = MaterialTheme.typography.bodySmall)
|
|
||||||
if (parentId != null) {
|
|
||||||
OutlinedButton(onClick = {
|
|
||||||
parentId = null
|
|
||||||
parentLabel = "Área de la inspección"
|
|
||||||
model.loadFieldTypes(null)
|
|
||||||
}) { Text("Volver al Área") }
|
|
||||||
}
|
|
||||||
if (model.fieldTypes.isEmpty()) Text("No hay tipos habilitados debajo de este padre.")
|
|
||||||
LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
items(model.fieldTypes, key = { it.id }) { type ->
|
|
||||||
AssistChip(
|
|
||||||
onClick = { selectedTypeId = type.id; attributeValues.clear() },
|
|
||||||
label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutlinedTextField(name, { name = it }, label = { Text("Nombre o código identificable *") }, modifier = Modifier.fillMaxWidth())
|
|
||||||
OutlinedTextField(commonName, { commonName = it }, label = { Text("Nombre común") }, 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 requiredReady = selectedType?.attributes?.filter { it.isRequired }?.all { attributeValues[it.code].orEmpty().isNotBlank() } ?: false
|
|
||||||
Button(
|
|
||||||
onClick = {
|
|
||||||
if (hasLocation(context)) createWithLocation()
|
|
||||||
else locationPermissionLauncher.launch(arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION))
|
|
||||||
},
|
|
||||||
enabled = selectedType != null && name.isNotBlank() && requiredReady && !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Capturar GPS y crear") }
|
|
||||||
HorizontalDivider()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Text("Resultados", 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, key = { it.id }) { item ->
|
|
||||||
InventoryCard(
|
|
||||||
item = item,
|
|
||||||
canModify = visit.status == "IN_PROGRESS",
|
|
||||||
onSelect = { model.selectExisting(item) },
|
|
||||||
onUseParent = {
|
|
||||||
parentId = item.id
|
|
||||||
parentLabel = "${item.name} (${item.code})"
|
|
||||||
showCreate = true
|
|
||||||
selectedTypeId = null
|
|
||||||
model.loadFieldTypes(item.id)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
item { Spacer(Modifier.height(30.dp)) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun CaptureCard(
|
|
||||||
detailName: String,
|
|
||||||
captureRequired: Boolean,
|
|
||||||
gps: Boolean,
|
|
||||||
photos: Int,
|
|
||||||
ready: Boolean,
|
|
||||||
onPhoto: () -> Unit,
|
|
||||||
onClose: () -> Unit,
|
|
||||||
) {
|
|
||||||
Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
|
||||||
Text(detailName, fontWeight = FontWeight.Bold)
|
|
||||||
OutlinedButton(onClick = onClose) { Text("Cerrar") }
|
|
||||||
}
|
|
||||||
Text("GPS de alta: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
|
|
||||||
if (captureRequired && !ready) {
|
|
||||||
Text("El Hallazgo permanece bloqueado hasta completar GPS + foto.", color = MaterialTheme.colorScheme.error)
|
|
||||||
Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto obligatoria") }
|
|
||||||
} else if (ready) {
|
|
||||||
Text("Captura completa · habilitado para Hallazgos", color = MaterialTheme.colorScheme.primary)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun InventoryCard(item: FieldInventoryItem, canModify: Boolean, onSelect: () -> Unit, onUseParent: () -> Unit) {
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
|
||||||
Text(item.name, fontWeight = FontWeight.SemiBold)
|
|
||||||
Text("${item.code} · ${item.type?.name.orEmpty()}", style = MaterialTheme.typography.bodySmall)
|
|
||||||
item.commonName?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
|
|
||||||
Text(
|
|
||||||
if (item.readyForFinding) "Listo" else "Captura incompleta: GPS/foto pendiente",
|
|
||||||
color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
if (canModify) {
|
|
||||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
OutlinedButton(onClick = onSelect) { Text(if (item.selectedInInspection) "Abrir" else "Seleccionar") }
|
|
||||||
OutlinedButton(onClick = onUseParent) { Text("Crear hijo") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun buildAttributes(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 coerceAttribute(definition, raw)
|
|
||||||
}.toMap()
|
|
||||||
|
|
||||||
private fun coerceAttribute(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 hasPermission(context: Context, permission: String): Boolean =
|
|
||||||
ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
|
|
||||||
|
|
||||||
private fun hasLocation(context: Context): Boolean =
|
|
||||||
hasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) || hasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
|
|
||||||
|
|
||||||
private suspend fun currentGeo(context: Context): GeoSnapshot = suspendCancellableCoroutine { continuation ->
|
|
||||||
if (!hasLocation(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(GeoSnapshot(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 newPhoto(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_${System.currentTimeMillis()}_", ".jpg", directory)
|
|
||||||
val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
|
|
||||||
return file to uri
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun writeExif(file: File, geo: GeoSnapshot) {
|
|
||||||
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 shortDate(value: String): String = value.replace('T', ' ').take(16)
|
|
||||||
@@ -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,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -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)
|
|
||||||
@@ -1,786 +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.LazyRow
|
|
||||||
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 F3GeoSnapshot(
|
|
||||||
val latitude: Double,
|
|
||||||
val longitude: Double,
|
|
||||||
val accuracyM: Double?,
|
|
||||||
)
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun F3VisitRoot(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 -> F3FieldInventoryScreen(model, onBack = {
|
|
||||||
inventoryMode = false
|
|
||||||
actsMode = true
|
|
||||||
})
|
|
||||||
else -> F3VisitOverview(
|
|
||||||
model = model,
|
|
||||||
onInventory = { inventoryMode = true },
|
|
||||||
onActs = { actsMode = true },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun F3VisitOverview(
|
|
||||||
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(statusLabel(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: ${f3ShortDate(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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
F3MessageStrip(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, pasás directamente a las Actas de esta inspección.")
|
|
||||||
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") {
|
|
||||||
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("Inventario / Hallazgos")
|
|
||||||
}
|
|
||||||
} else if (visit.status == "CLOSED") {
|
|
||||||
OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Text("Ver Actas · ${model.acts.size}")
|
|
||||||
}
|
|
||||||
} else if (visit.status == "PLANNED") {
|
|
||||||
Text(
|
|
||||||
"Primero iniciá la inspección para habilitar Actas, Hallazgos y altas de campo.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
F3ChecklistCard(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 F3ChecklistCard(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 F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
|
|
||||||
val context = LocalContext.current
|
|
||||||
val scope = rememberCoroutineScope()
|
|
||||||
val visit = model.visit ?: return
|
|
||||||
|
|
||||||
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 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) }
|
|
||||||
val attributeValues = remember { mutableStateMapOf<String, String>() }
|
|
||||||
|
|
||||||
var mergeSearch by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
var mergeCandidateId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
|
|
||||||
var mergeReason by rememberSaveable(visit.id) { mutableStateOf("") }
|
|
||||||
|
|
||||||
LaunchedEffect(visit.id) {
|
|
||||||
model.searchInventory("")
|
|
||||||
model.loadFieldTypes(null)
|
|
||||||
}
|
|
||||||
LaunchedEffect(model.fieldTypes) {
|
|
||||||
if (model.fieldTypes.none { it.id == selectedTypeId }) {
|
|
||||||
selectedTypeId = model.fieldTypes.firstOrNull()?.id
|
|
||||||
selectedFamilyId = null
|
|
||||||
attributeValues.clear()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val selectedType = model.fieldTypes.firstOrNull { it.id == selectedTypeId }
|
|
||||||
val selectedFamily = selectedType?.families?.firstOrNull { it.id == selectedFamilyId }
|
|
||||||
|
|
||||||
fun resetCreateForm() {
|
|
||||||
name = ""
|
|
||||||
commonName = ""
|
|
||||||
selectedFamilyId = null
|
|
||||||
attributeValues.clear()
|
|
||||||
}
|
|
||||||
|
|
||||||
val createWithLocation: () -> Unit = {
|
|
||||||
val type = selectedType
|
|
||||||
if (type != null) {
|
|
||||||
scope.launch {
|
|
||||||
runCatching { currentF3Geo(context) }
|
|
||||||
.onSuccess { geo ->
|
|
||||||
model.createFieldAsset(
|
|
||||||
type = type,
|
|
||||||
parentId = parentId,
|
|
||||||
familyId = selectedFamilyId,
|
|
||||||
name = name,
|
|
||||||
commonName = commonName,
|
|
||||||
attributes = buildF3Attributes(type, attributeValues),
|
|
||||||
latitude = geo.latitude,
|
|
||||||
longitude = geo.longitude,
|
|
||||||
accuracyM = geo.accuracyM,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val locationPermissionLauncher = rememberLauncherForActivityResult(
|
|
||||||
ActivityResultContracts.RequestMultiplePermissions(),
|
|
||||||
) { result ->
|
|
||||||
val allowed = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
|
|
||||||
result[Manifest.permission.ACCESS_COARSE_LOCATION] == true
|
|
||||||
if (allowed) createWithLocation()
|
|
||||||
}
|
|
||||||
|
|
||||||
var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
|
|
||||||
var pendingPhotoGeo by remember { mutableStateOf<F3GeoSnapshot?>(null) }
|
|
||||||
val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
|
|
||||||
val file = pendingPhotoFile
|
|
||||||
val geo = pendingPhotoGeo
|
|
||||||
if (success && file != null && geo != null) {
|
|
||||||
runCatching { writeF3Exif(file, geo) }
|
|
||||||
model.uploadFieldPhoto(file, geo.latitude, geo.longitude, geo.accuracyM)
|
|
||||||
}
|
|
||||||
pendingPhotoFile = null
|
|
||||||
pendingPhotoGeo = null
|
|
||||||
}
|
|
||||||
val beginPhoto: () -> Unit = {
|
|
||||||
scope.launch {
|
|
||||||
runCatching { currentF3Geo(context) }.onSuccess { geo ->
|
|
||||||
val (file, uri) = newF3Photo(context)
|
|
||||||
pendingPhotoFile = file
|
|
||||||
pendingPhotoGeo = geo
|
|
||||||
takePicture.launch(uri)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val photoPermissionLauncher = rememberLauncherForActivityResult(
|
|
||||||
ActivityResultContracts.RequestMultiplePermissions(),
|
|
||||||
) { result ->
|
|
||||||
val camera = result[Manifest.permission.CAMERA] == true || f3HasPermission(context, Manifest.permission.CAMERA)
|
|
||||||
val location = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
|
|
||||||
result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || f3HasLocation(context)
|
|
||||||
if (camera && location) beginPhoto()
|
|
||||||
}
|
|
||||||
|
|
||||||
val selectedCapture = model.selectedFieldAsset
|
|
||||||
val mergeSource = selectedCapture?.takeIf {
|
|
||||||
it.capture.captureRequired &&
|
|
||||||
it.asset.type?.let { type -> f3TypeCode(type) in setOf("instalacion", "subinstalacion") } == true
|
|
||||||
}
|
|
||||||
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 = onBack) { Text("Acta") }
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Column(Modifier.padding(horizontal = 16.dp)) { F3MessageStrip(model) }
|
|
||||||
|
|
||||||
if (selectedCapture != null) {
|
|
||||||
F3CaptureCard(
|
|
||||||
detailName = selectedCapture.asset.name,
|
|
||||||
captureRequired = selectedCapture.capture.captureRequired,
|
|
||||||
gps = selectedCapture.capture.creationGpsCaptured,
|
|
||||||
photos = selectedCapture.capture.fieldPhotoCount,
|
|
||||||
ready = selectedCapture.capture.readyForFinding,
|
|
||||||
onPhoto = {
|
|
||||||
val permissions = arrayOf(
|
|
||||||
Manifest.permission.CAMERA,
|
|
||||||
Manifest.permission.ACCESS_FINE_LOCATION,
|
|
||||||
Manifest.permission.ACCESS_COARSE_LOCATION,
|
|
||||||
)
|
|
||||||
if (f3HasPermission(context, Manifest.permission.CAMERA) && f3HasLocation(context)) beginPhoto()
|
|
||||||
else photoPermissionLauncher.launch(permissions)
|
|
||||||
},
|
|
||||||
onClose = { model.clearSelectedFieldAsset() },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mergeSource != null) {
|
|
||||||
Card(
|
|
||||||
Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp),
|
|
||||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer),
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
Text("¿Lo acabás de crear y ya existía?", fontWeight = FontWeight.Bold)
|
|
||||||
Text(
|
|
||||||
"Podés fusionar esta alta de campo con el registro existente. La ficha nueva no se borra: queda como alias histórico con fecha, inspector e inspección.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
OutlinedTextField(
|
|
||||||
value = mergeSearch,
|
|
||||||
onValueChange = { mergeSearch = it },
|
|
||||||
label = { Text("Buscar posible duplicado") },
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
Spacer(Modifier.width(8.dp))
|
|
||||||
OutlinedButton(onClick = {
|
|
||||||
mergeCandidateId = null
|
|
||||||
model.searchInventory(mergeSearch, mergeSource.asset.parent?.id)
|
|
||||||
}) { Text("Buscar") }
|
|
||||||
}
|
|
||||||
if (mergeCandidates.isEmpty()) {
|
|
||||||
Text("No hay coincidencias compatibles en esta búsqueda.", style = MaterialTheme.typography.bodySmall)
|
|
||||||
} else {
|
|
||||||
mergeCandidates.take(8).forEach { candidate ->
|
|
||||||
AssistChip(
|
|
||||||
onClick = { mergeCandidateId = candidate.id },
|
|
||||||
label = {
|
|
||||||
Text(
|
|
||||||
if (mergeCandidateId == candidate.id) "✓ ${candidate.code} · ${candidate.name}"
|
|
||||||
else "${candidate.code} · ${candidate.name}",
|
|
||||||
)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutlinedTextField(
|
|
||||||
value = mergeReason,
|
|
||||||
onValueChange = { mergeReason = it },
|
|
||||||
label = { Text("Motivo de la fusión") },
|
|
||||||
minLines = 2,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
)
|
|
||||||
Button(
|
|
||||||
onClick = {
|
|
||||||
val target = mergeCandidateId ?: return@Button
|
|
||||||
model.mergeCreatedFieldAsset(target, mergeReason)
|
|
||||||
},
|
|
||||||
enabled = mergeCandidateId != null && mergeReason.trim().length >= 8 && !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Fusionar y conservar el registro existente") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Text(
|
|
||||||
"Instalaciones y subinstalaciones",
|
|
||||||
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 ->
|
|
||||||
F3InventoryCard(
|
|
||||||
item = item,
|
|
||||||
onInspect = { model.selectExisting(item) },
|
|
||||||
onUseParent = {
|
|
||||||
parentId = item.id
|
|
||||||
parentLabel = "${item.name} (${item.code})"
|
|
||||||
showCreate = true
|
|
||||||
selectedTypeId = null
|
|
||||||
resetCreateForm()
|
|
||||||
model.loadFieldTypes(item.id)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
item { Spacer(Modifier.height(30.dp)) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun F3CaptureCard(
|
|
||||||
detailName: String,
|
|
||||||
captureRequired: Boolean,
|
|
||||||
gps: Boolean,
|
|
||||||
photos: Int,
|
|
||||||
ready: Boolean,
|
|
||||||
onPhoto: () -> Unit,
|
|
||||||
onClose: () -> Unit,
|
|
||||||
) {
|
|
||||||
Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp)) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
|
||||||
Text(detailName, fontWeight = FontWeight.Bold)
|
|
||||||
OutlinedButton(onClick = onClose) { Text("Cerrar") }
|
|
||||||
}
|
|
||||||
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)
|
|
||||||
Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto obligatoria") }
|
|
||||||
} else {
|
|
||||||
Text("Captura completa · listo para el Hallazgo", color = MaterialTheme.colorScheme.primary)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Text("Registro existente seleccionado.", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun F3InventoryCard(
|
|
||||||
item: FieldInventoryItem,
|
|
||||||
onInspect: () -> Unit,
|
|
||||||
onUseParent: () -> Unit,
|
|
||||||
) {
|
|
||||||
val typeCode = item.type?.let(::f3TypeCode).orEmpty()
|
|
||||||
val canHaveFinding = typeCode in setOf("instalacion", "subinstalacion")
|
|
||||||
val canHaveChild = typeCode == "instalacion"
|
|
||||||
val childLabel = "+ Agregar subinstalación"
|
|
||||||
|
|
||||||
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(structureLabel(typeCode), style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
Text(item.code, style = MaterialTheme.typography.bodySmall)
|
|
||||||
item.commonName?.takeIf { it.isNotBlank() }?.let {
|
|
||||||
Text(it, style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
if (canHaveFinding) {
|
|
||||||
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) "Seleccionar para Hallazgo" else "Usar para Hallazgo")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (canHaveChild) {
|
|
||||||
OutlinedButton(onClick = onUseParent, modifier = Modifier.fillMaxWidth()) { Text(childLabel) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun F3MessageStrip(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 f3TypeCode(summary: com.korexlabs.dhinspeccion.data.AssetSummary): String =
|
|
||||||
(summary.typeName ?: summary.name).trim().lowercase()
|
|
||||||
.replace('ó', 'o').replace('í', 'i').replace('á', 'a').replace('é', 'e').replace('ú', 'u')
|
|
||||||
|
|
||||||
private fun structureLabel(typeCode: String): String = when (typeCode) {
|
|
||||||
"area" -> "Área"
|
|
||||||
"yacimiento" -> "Yacimiento"
|
|
||||||
"instalacion" -> "Instalación"
|
|
||||||
"subinstalacion" -> "Subinstalación"
|
|
||||||
else -> typeCode.ifBlank { "Inventario" }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun statusLabel(status: String): String = when (status) {
|
|
||||||
"PLANNED" -> "Planificada"
|
|
||||||
"IN_PROGRESS" -> "En curso"
|
|
||||||
"CLOSED" -> "Cerrada"
|
|
||||||
"CANCELLED" -> "Cancelada"
|
|
||||||
else -> status
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun buildF3Attributes(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 coerceF3Attribute(definition, raw)
|
|
||||||
}.toMap()
|
|
||||||
|
|
||||||
private fun coerceF3Attribute(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 f3HasPermission(context: Context, permission: String): Boolean =
|
|
||||||
ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
|
|
||||||
|
|
||||||
private fun f3HasLocation(context: Context): Boolean =
|
|
||||||
f3HasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ||
|
|
||||||
f3HasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
|
|
||||||
|
|
||||||
private suspend fun currentF3Geo(context: Context): F3GeoSnapshot = suspendCancellableCoroutine { continuation ->
|
|
||||||
if (!f3HasLocation(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(F3GeoSnapshot(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 newF3Photo(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_F3_${System.currentTimeMillis()}_", ".jpg", directory)
|
|
||||||
val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
|
|
||||||
return file to uri
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun writeF3Exif(file: File, geo: F3GeoSnapshot) {
|
|
||||||
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 f3ShortDate(value: String): String = value.replace('T', ' ').take(16)
|
|
||||||
@@ -1,429 +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.clickable
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.rememberScrollState
|
|
||||||
import androidx.compose.foundation.text.KeyboardOptions
|
|
||||||
import androidx.compose.foundation.verticalScroll
|
|
||||||
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.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.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 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 FindingGeoSnapshot(
|
|
||||||
val latitude: Double,
|
|
||||||
val longitude: Double,
|
|
||||||
val accuracyM: Double?,
|
|
||||||
)
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun FieldFindingScreen(model: MainViewModel) {
|
|
||||||
val options = model.fieldFindingOptions ?: return
|
|
||||||
val asset = model.selectedFieldAsset?.asset ?: return
|
|
||||||
val context = LocalContext.current
|
|
||||||
val scope = rememberCoroutineScope()
|
|
||||||
var search by rememberSaveable(asset.id) { mutableStateOf("") }
|
|
||||||
var selectedCatalogId by rememberSaveable(asset.id) { mutableStateOf<String?>(null) }
|
|
||||||
var other by rememberSaveable(asset.id) { mutableStateOf(false) }
|
|
||||||
var customTitle by rememberSaveable(asset.id) { mutableStateOf("") }
|
|
||||||
var customLegalBasis by rememberSaveable(asset.id) { mutableStateOf("") }
|
|
||||||
var description by rememberSaveable(asset.id) { mutableStateOf("") }
|
|
||||||
var severityText by rememberSaveable(asset.id) { mutableStateOf("") }
|
|
||||||
var correctionDueOn by rememberSaveable(asset.id) { mutableStateOf("") }
|
|
||||||
|
|
||||||
var localError by rememberSaveable { mutableStateOf<String?>(null) }
|
|
||||||
var requestedFindingId by remember { mutableStateOf<String?>(null) }
|
|
||||||
var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
|
|
||||||
var pendingPhotoGeo by remember { mutableStateOf<FindingGeoSnapshot?>(null) }
|
|
||||||
var pendingPhotoFindingId by remember { mutableStateOf<String?>(null) }
|
|
||||||
|
|
||||||
val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
|
|
||||||
val file = pendingPhotoFile
|
|
||||||
val geo = pendingPhotoGeo
|
|
||||||
val findingId = pendingPhotoFindingId
|
|
||||||
if (success && file != null && geo != null && findingId != null) {
|
|
||||||
runCatching { writeFindingExif(file, geo) }
|
|
||||||
model.uploadFindingPhoto(
|
|
||||||
findingId = findingId,
|
|
||||||
file = file,
|
|
||||||
latitude = geo.latitude,
|
|
||||||
longitude = geo.longitude,
|
|
||||||
accuracyM = geo.accuracyM,
|
|
||||||
title = "Evidencia fotográfica de campo",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
pendingPhotoFile = null
|
|
||||||
pendingPhotoGeo = null
|
|
||||||
pendingPhotoFindingId = null
|
|
||||||
}
|
|
||||||
|
|
||||||
fun beginPhoto(findingId: String) {
|
|
||||||
scope.launch {
|
|
||||||
runCatching { currentFindingGeo(context) }
|
|
||||||
.onSuccess { geo ->
|
|
||||||
val (file, uri) = newFindingPhoto(context)
|
|
||||||
pendingPhotoFile = file
|
|
||||||
pendingPhotoGeo = geo
|
|
||||||
pendingPhotoFindingId = findingId
|
|
||||||
takePicture.launch(uri)
|
|
||||||
}
|
|
||||||
.onFailure { localError = it.message ?: "No se pudo capturar la ubicación GPS." }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val photoPermissionLauncher = rememberLauncherForActivityResult(
|
|
||||||
ActivityResultContracts.RequestMultiplePermissions(),
|
|
||||||
) { result ->
|
|
||||||
val camera = result[Manifest.permission.CAMERA] == true || findingHasPermission(context, Manifest.permission.CAMERA)
|
|
||||||
val location = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
|
|
||||||
result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || findingHasLocation(context)
|
|
||||||
val findingId = requestedFindingId
|
|
||||||
requestedFindingId = null
|
|
||||||
if (camera && location && findingId != null) beginPhoto(findingId)
|
|
||||||
else localError = "Permití cámara y ubicación para adjuntar una foto con GPS."
|
|
||||||
}
|
|
||||||
|
|
||||||
fun requestPhoto(findingId: String) {
|
|
||||||
requestedFindingId = findingId
|
|
||||||
if (findingHasPermission(context, Manifest.permission.CAMERA) && findingHasLocation(context)) {
|
|
||||||
requestedFindingId = null
|
|
||||||
beginPhoto(findingId)
|
|
||||||
} else {
|
|
||||||
photoPermissionLauncher.launch(
|
|
||||||
arrayOf(
|
|
||||||
Manifest.permission.CAMERA,
|
|
||||||
Manifest.permission.ACCESS_FINE_LOCATION,
|
|
||||||
Manifest.permission.ACCESS_COARSE_LOCATION,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val selected = options.catalog.items.firstOrNull { it.id == selectedCatalogId }
|
|
||||||
val filtered = options.catalog.items.filter {
|
|
||||||
search.isBlank() ||
|
|
||||||
it.title.contains(search, ignoreCase = true) ||
|
|
||||||
it.code.contains(search, ignoreCase = true) ||
|
|
||||||
it.categoryName.orEmpty().contains(search, ignoreCase = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
LaunchedEffect(selectedCatalogId, other) {
|
|
||||||
if (!other && selected != null && severityText.isBlank() && selected.suggestedSeverity != null) {
|
|
||||||
severityText = selected.suggestedSeverity.toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
LaunchedEffect(model.lastCreatedFinding?.id) {
|
|
||||||
if (model.lastCreatedFinding != null) {
|
|
||||||
selectedCatalogId = null
|
|
||||||
other = false
|
|
||||||
customTitle = ""
|
|
||||||
customLegalBasis = ""
|
|
||||||
description = ""
|
|
||||||
severityText = ""
|
|
||||||
correctionDueOn = ""
|
|
||||||
search = ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.verticalScroll(rememberScrollState())
|
|
||||||
.padding(top = 30.dp, start = 16.dp, end = 16.dp, bottom = 36.dp),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(12.dp),
|
|
||||||
) {
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
|
||||||
OutlinedButton(onClick = { model.clearFindingFlow() }, enabled = !model.busy) {
|
|
||||||
Text("Volver")
|
|
||||||
}
|
|
||||||
Text("Hallazgo de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
|
|
||||||
}
|
|
||||||
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
|
||||||
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"}",
|
|
||||||
color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
localError?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
|
||||||
model.error?.let {
|
|
||||||
Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer)) {
|
|
||||||
Text(it, Modifier.padding(12.dp))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
model.notice?.let {
|
|
||||||
Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer)) {
|
|
||||||
Text(it, Modifier.padding(12.dp))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.findings.isNotEmpty()) {
|
|
||||||
Text("Hallazgos registrados en este Inventario", fontWeight = FontWeight.Bold)
|
|
||||||
options.findings.forEach { finding ->
|
|
||||||
val evidence = model.fieldFindingEvidence[finding.id].orEmpty()
|
|
||||||
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(
|
|
||||||
"Evidencias: ${evidence.size} · Fotos: ${evidence.count { it.kind == "PHOTO" }}",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
evidence.take(3).forEach { item ->
|
|
||||||
Text(
|
|
||||||
"• ${item.title ?: item.originalName}${item.capturedAt?.let { " · ${shortFindingDate(it)}" }.orEmpty()}",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Button(
|
|
||||||
onClick = { requestPhoto(finding.id) },
|
|
||||||
enabled = !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) {
|
|
||||||
Text("Tomar foto con GPS")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
HorizontalDivider()
|
|
||||||
}
|
|
||||||
|
|
||||||
Text("1. Elegí el tipo de Hallazgo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
if (!options.catalog.typeConfigured) {
|
|
||||||
Text(
|
|
||||||
options.catalog.configurationReason
|
|
||||||
?: "Este tipo de Inventario todavía no tiene un catálogo contextual configurado. Podés usar OTROS.",
|
|
||||||
color = MaterialTheme.colorScheme.secondary,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
OutlinedTextField(
|
|
||||||
value = search,
|
|
||||||
onValueChange = { search = it },
|
|
||||||
label = { Text("Buscar en catálogo") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
|
|
||||||
filtered.forEach { item ->
|
|
||||||
val chosen = !other && selectedCatalogId == item.id
|
|
||||||
Card(
|
|
||||||
modifier = Modifier.fillMaxWidth().clickable {
|
|
||||||
selectedCatalogId = item.id
|
|
||||||
other = false
|
|
||||||
severityText = item.suggestedSeverity?.toString().orEmpty()
|
|
||||||
},
|
|
||||||
colors = if (chosen) {
|
|
||||||
CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer)
|
|
||||||
} else {
|
|
||||||
CardDefaults.cardColors()
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) {
|
|
||||||
Text(if (chosen) "✓ ${item.title}" else item.title, fontWeight = FontWeight.SemiBold)
|
|
||||||
Text(
|
|
||||||
listOfNotNull(item.categoryName, item.code, item.suggestedSeverity?.let { "Gravedad sugerida $it" })
|
|
||||||
.joinToString(" · "),
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
other = true
|
|
||||||
selectedCatalogId = null
|
|
||||||
severityText = ""
|
|
||||||
},
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) {
|
|
||||||
Text(if (other) "✓ OTROS · Hallazgo no catalogado" else "OTROS · No está en el catálogo")
|
|
||||||
}
|
|
||||||
if (other) {
|
|
||||||
options.catalog.other.help?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
|
|
||||||
OutlinedTextField(
|
|
||||||
value = customTitle,
|
|
||||||
onValueChange = { customTitle = it },
|
|
||||||
label = { Text("Título del nuevo Hallazgo *") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = customLegalBasis,
|
|
||||||
onValueChange = { customLegalBasis = it },
|
|
||||||
label = { Text("Base legal / normativa (opcional)") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Text("2. Describí lo observado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
selected?.let {
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
|
||||||
Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) {
|
|
||||||
Text(it.title, fontWeight = FontWeight.SemiBold)
|
|
||||||
it.legalBasis?.takeIf(String::isNotBlank)?.let { basis -> Text(basis, style = MaterialTheme.typography.bodySmall) }
|
|
||||||
it.glossary?.takeIf(String::isNotBlank)?.let { glossary -> Text(glossary, style = MaterialTheme.typography.bodySmall) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutlinedTextField(
|
|
||||||
value = description,
|
|
||||||
onValueChange = { description = it },
|
|
||||||
label = { Text("Descripción del Hallazgo *") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
minLines = 3,
|
|
||||||
)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = severityText,
|
|
||||||
onValueChange = { value -> severityText = value.filter(Char::isDigit).take(2) },
|
|
||||||
label = { Text("Gravedad 1 a 10") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = correctionDueOn,
|
|
||||||
onValueChange = { correctionDueOn = it },
|
|
||||||
label = { Text("Fecha de corrección AAAA-MM-DD (opcional)") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
|
|
||||||
val severity = severityText.toIntOrNull()
|
|
||||||
val choiceReady = selectedCatalogId != null || (other && customTitle.isNotBlank())
|
|
||||||
Button(
|
|
||||||
onClick = {
|
|
||||||
model.createFieldFinding(
|
|
||||||
catalogItemId = if (other) null else selectedCatalogId,
|
|
||||||
customTitle = if (other) customTitle else null,
|
|
||||||
customLegalBasis = if (other) customLegalBasis else null,
|
|
||||||
description = description,
|
|
||||||
severity = severity,
|
|
||||||
correctionDueOn = correctionDueOn,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
enabled = choiceReady && description.isNotBlank() && (severity == null || severity in 1..10) && !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) {
|
|
||||||
Text(if (model.busy) "Guardando…" else "Guardar Hallazgo")
|
|
||||||
}
|
|
||||||
|
|
||||||
model.lastCreatedFinding?.let { finding ->
|
|
||||||
Card(
|
|
||||||
Modifier.fillMaxWidth(),
|
|
||||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
|
|
||||||
) {
|
|
||||||
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
|
||||||
Text("Hallazgo registrado", fontWeight = FontWeight.Bold)
|
|
||||||
Text("${finding.code} · ${finding.title}")
|
|
||||||
Button(
|
|
||||||
onClick = { requestPhoto(finding.id) },
|
|
||||||
enabled = !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) {
|
|
||||||
Text("Tomar foto con GPS")
|
|
||||||
}
|
|
||||||
Text("También podés registrar otro Hallazgo sobre el mismo Inventario.", style = MaterialTheme.typography.bodySmall)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun findingHasPermission(context: Context, permission: String): Boolean =
|
|
||||||
ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
|
|
||||||
|
|
||||||
private fun findingHasLocation(context: Context): Boolean =
|
|
||||||
findingHasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ||
|
|
||||||
findingHasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
|
|
||||||
|
|
||||||
private suspend fun currentFindingGeo(context: Context): FindingGeoSnapshot = suspendCancellableCoroutine { continuation ->
|
|
||||||
if (!findingHasLocation(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(FindingGeoSnapshot(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 newFindingPhoto(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_HALLAZGO_${System.currentTimeMillis()}_", ".jpg", directory)
|
|
||||||
val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
|
|
||||||
return file to uri
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun writeFindingExif(file: File, geo: FindingGeoSnapshot) {
|
|
||||||
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 shortFindingDate(value: String): String = value.replace('T', ' ').take(16)
|
|
||||||
-30
@@ -1,30 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.ui
|
|
||||||
|
|
||||||
import com.korexlabs.dhinspeccion.MainViewModel
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldType
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Compatibilidad transitoria con la pantalla F2.x que queda compilada pero ya no
|
|
||||||
* será la ruta activa en F3.1. El flujo nuevo siempre envía familyId cuando el
|
|
||||||
* nivel estructural lo requiere.
|
|
||||||
*/
|
|
||||||
fun MainViewModel.createFieldAsset(
|
|
||||||
type: FieldType,
|
|
||||||
parentId: String?,
|
|
||||||
name: String,
|
|
||||||
commonName: String?,
|
|
||||||
attributes: Map<String, Any?>,
|
|
||||||
latitude: Double,
|
|
||||||
longitude: Double,
|
|
||||||
accuracyM: Double?,
|
|
||||||
) = createFieldAsset(
|
|
||||||
type = type,
|
|
||||||
parentId = parentId,
|
|
||||||
familyId = null,
|
|
||||||
name = name,
|
|
||||||
commonName = commonName,
|
|
||||||
attributes = attributes,
|
|
||||||
latitude = latitude,
|
|
||||||
longitude = longitude,
|
|
||||||
accuracyM = accuracyM,
|
|
||||||
)
|
|
||||||
@@ -1,229 +0,0 @@
|
|||||||
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.foundation.layout.safeDrawingPadding
|
|
||||||
import androidx.compose.foundation.layout.imePadding
|
|
||||||
import androidx.compose.foundation.rememberScrollState
|
|
||||||
import androidx.compose.foundation.verticalScroll
|
|
||||||
import androidx.compose.material.icons.Icons
|
|
||||||
import androidx.compose.material.icons.filled.Visibility
|
|
||||||
import androidx.compose.material.icons.filled.VisibilityOff
|
|
||||||
import androidx.compose.material3.Button
|
|
||||||
import androidx.compose.material3.Icon
|
|
||||||
import androidx.compose.material3.IconButton
|
|
||||||
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.remember
|
|
||||||
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
|
|
||||||
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"
|
|
||||||
|
|
||||||
private fun biometricAvailable(context: Context): Boolean =
|
|
||||||
BiometricManager.from(context).canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG) ==
|
|
||||||
BiometricManager.BIOMETRIC_SUCCESS
|
|
||||||
|
|
||||||
private fun biometricEnabled(context: Context): Boolean =
|
|
||||||
context.getSharedPreferences(BIOMETRIC_PREFS, Context.MODE_PRIVATE)
|
|
||||||
.getBoolean(BIOMETRIC_ENABLED, false)
|
|
||||||
|
|
||||||
private fun setBiometricEnabled(context: Context, enabled: Boolean) {
|
|
||||||
context.getSharedPreferences(BIOMETRIC_PREFS, Context.MODE_PRIVATE)
|
|
||||||
.edit().putBoolean(BIOMETRIC_ENABLED, enabled).apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
|
|
||||||
val context = LocalContext.current
|
|
||||||
val capable = remember { biometricAvailable(context) }
|
|
||||||
var unlocked by rememberSaveable { mutableStateOf(false) }
|
|
||||||
var passwordLoginInFlight by rememberSaveable { mutableStateOf(false) }
|
|
||||||
var enabled by remember { mutableStateOf(biometricEnabled(context)) }
|
|
||||||
|
|
||||||
LaunchedEffect(model.session) {
|
|
||||||
if (model.session != null && passwordLoginInFlight) {
|
|
||||||
if (capable) {
|
|
||||||
setBiometricEnabled(context, true)
|
|
||||||
enabled = true
|
|
||||||
}
|
|
||||||
unlocked = true
|
|
||||||
passwordLoginInFlight = false
|
|
||||||
}
|
|
||||||
if (model.session == null) unlocked = false
|
|
||||||
}
|
|
||||||
|
|
||||||
DhTheme {
|
|
||||||
Surface(Modifier.fillMaxSize().safeDrawingPadding().imePadding()) {
|
|
||||||
when {
|
|
||||||
model.session == null -> EnhancedLoginScreen(model) {
|
|
||||||
passwordLoginInFlight = true
|
|
||||||
}
|
|
||||||
enabled && capable && !unlocked -> BiometricUnlockScreen(
|
|
||||||
activity = activity,
|
|
||||||
displayName = model.session?.displayName.orEmpty(),
|
|
||||||
onAuthenticated = { unlocked = true },
|
|
||||||
onUsePassword = {
|
|
||||||
setBiometricEnabled(context, false)
|
|
||||||
enabled = false
|
|
||||||
model.logout()
|
|
||||||
},
|
|
||||||
)
|
|
||||||
model.fieldFindingOptions != null -> FieldFindingScreen(model)
|
|
||||||
model.visit != null -> ModernVisitRoot(model)
|
|
||||||
else -> MobileHomeScreen(model)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Unit) {
|
|
||||||
var identifier by rememberSaveable { mutableStateOf("") }
|
|
||||||
var password by remember { mutableStateOf("") }
|
|
||||||
var passwordVisible by rememberSaveable { mutableStateOf(false) }
|
|
||||||
|
|
||||||
Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).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,
|
|
||||||
)
|
|
||||||
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) }
|
|
||||||
model.notice?.let { Text(it, color = MaterialTheme.colorScheme.primary) }
|
|
||||||
OutlinedTextField(
|
|
||||||
value = identifier,
|
|
||||||
onValueChange = { identifier = it },
|
|
||||||
label = { Text("Usuario o correo electrónico") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = password,
|
|
||||||
onValueChange = { password = it },
|
|
||||||
label = { Text("Contraseña") },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
singleLine = true,
|
|
||||||
visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
|
|
||||||
trailingIcon = {
|
|
||||||
IconButton(onClick = { passwordVisible = !passwordVisible }) {
|
|
||||||
Icon(
|
|
||||||
imageVector = if (passwordVisible) Icons.Filled.VisibilityOff else Icons.Filled.Visibility,
|
|
||||||
contentDescription = if (passwordVisible) "Ocultar contraseña" else "Mostrar contraseña",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)
|
|
||||||
Button(
|
|
||||||
onClick = {
|
|
||||||
onPasswordLogin()
|
|
||||||
model.login(identifier, password)
|
|
||||||
},
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
enabled = !model.busy,
|
|
||||||
) { Text(if (model.busy) "Ingresando…" else "Ingresar") }
|
|
||||||
Text(
|
|
||||||
"Después del primer ingreso correcto, si la tablet tiene una huella fuerte configurada, se habilita el acceso biométrico. La contraseña no se almacena.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun BiometricUnlockScreen(
|
|
||||||
activity: FragmentActivity,
|
|
||||||
displayName: String,
|
|
||||||
onAuthenticated: () -> Unit,
|
|
||||||
onUsePassword: () -> Unit,
|
|
||||||
) {
|
|
||||||
var error by rememberSaveable { mutableStateOf<String?>(null) }
|
|
||||||
|
|
||||||
fun authenticate() {
|
|
||||||
val executor = ContextCompat.getMainExecutor(activity)
|
|
||||||
val prompt = BiometricPrompt(
|
|
||||||
activity,
|
|
||||||
executor,
|
|
||||||
object : BiometricPrompt.AuthenticationCallback() {
|
|
||||||
override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
|
|
||||||
super.onAuthenticationSucceeded(result)
|
|
||||||
error = null
|
|
||||||
onAuthenticated()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
|
|
||||||
super.onAuthenticationError(errorCode, errString)
|
|
||||||
error = errString.toString()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAuthenticationFailed() {
|
|
||||||
super.onAuthenticationFailed()
|
|
||||||
error = "Huella no reconocida."
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)
|
|
||||||
val info = BiometricPrompt.PromptInfo.Builder()
|
|
||||||
.setTitle("Ingresar a DH Inspección")
|
|
||||||
.setSubtitle(if (displayName.isBlank()) "Validá tu identidad" else "Hola, $displayName")
|
|
||||||
.setNegativeButtonText("Usar contraseña")
|
|
||||||
.setAllowedAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG)
|
|
||||||
.build()
|
|
||||||
prompt.authenticate(info)
|
|
||||||
}
|
|
||||||
|
|
||||||
LaunchedEffect(Unit) { authenticate() }
|
|
||||||
|
|
||||||
Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).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(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) }
|
|
||||||
Button(onClick = { authenticate() }, modifier = Modifier.fillMaxWidth()) { Text("Usar huella") }
|
|
||||||
OutlinedButton(onClick = onUsePassword, modifier = Modifier.fillMaxWidth()) { Text("Ingresar con contraseña") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,457 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.ui
|
|
||||||
|
|
||||||
import android.Manifest
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.pm.PackageManager
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.rememberScrollState
|
|
||||||
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.mutableStateOf
|
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
import androidx.compose.runtime.saveable.rememberSaveable
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
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 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 ActSignatureGeo(
|
|
||||||
val latitude: Double,
|
|
||||||
val longitude: Double,
|
|
||||||
val accuracyM: Double?,
|
|
||||||
)
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MobileActsScreen(
|
|
||||||
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 closingUrgency by rememberSaveable(selected?.id) { mutableStateOf("") }
|
|
||||||
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 { currentActSignatureGeo(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(top = 28.dp, start = 16.dp, end = 16.dp, bottom = 36.dp),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(12.dp),
|
|
||||||
) {
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
|
||||||
OutlinedButton(onClick = onBack, enabled = !model.busy) { Text("Volver") }
|
|
||||||
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.")
|
|
||||||
}
|
|
||||||
model.acts.forEach { act ->
|
|
||||||
val active = selected?.id == act.id
|
|
||||||
val urgency = when (act.urgency) {
|
|
||||||
"URGENT" -> "URGENTE"
|
|
||||||
"NON_URGENT" -> "No urgente"
|
|
||||||
else -> "Urgencia pendiente"
|
|
||||||
}
|
|
||||||
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"}",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val hasDraftAct = model.acts.any { it.status == "DRAFT" }
|
|
||||||
if (visit.status == "IN_PROGRESS" && !hasDraftAct) {
|
|
||||||
Card(
|
|
||||||
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" }) {
|
|
||||||
Text(
|
|
||||||
"Podés abrir una nueva Acta aunque otra esté BLOQUEADA esperando firmas. Sólo se permite un borrador a la vez.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
"La urgencia se define al cerrar el Acta, después de completar los Hallazgos.",
|
|
||||||
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() },
|
|
||||||
enabled = !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Crear nueva Acta") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selected != null) {
|
|
||||||
HorizontalDivider()
|
|
||||||
Card(Modifier.fillMaxWidth()) {
|
|
||||||
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(
|
|
||||||
when (selected.urgency) {
|
|
||||||
"URGENT" -> "Urgencia: Urgente"
|
|
||||||
"NON_URGENT" -> "Urgencia: No urgente"
|
|
||||||
else -> "Urgencia: se define al cerrar el Acta"
|
|
||||||
},
|
|
||||||
)
|
|
||||||
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) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
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") })
|
|
||||||
}
|
|
||||||
if (attendance == "PRESENT") {
|
|
||||||
OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombre y apellido *") }, modifier = Modifier.fillMaxWidth())
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
|
|
||||||
listOf("DNI", "CUIL", "PASSPORT", "OTHER").forEach { kind ->
|
|
||||||
AssistChip(onClick = { documentType = kind }, label = { Text(if (documentType == kind) "✓ $kind" else kind) })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutlinedTextField(documentNumber, { documentNumber = it }, label = { Text("Documento *") }, modifier = Modifier.fillMaxWidth())
|
|
||||||
OutlinedTextField(position, { position = it }, label = { Text("Cargo *") }, modifier = Modifier.fillMaxWidth())
|
|
||||||
OutlinedTextField(email, { email = it }, label = { Text("Email") }, modifier = Modifier.fillMaxWidth())
|
|
||||||
OutlinedTextField(phone, { phone = it }, label = { Text("Teléfono") }, modifier = Modifier.fillMaxWidth())
|
|
||||||
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") }
|
|
||||||
}
|
|
||||||
|
|
||||||
HorizontalDivider()
|
|
||||||
Text("Finalizar contenido", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
|
||||||
Text("Al cerrar el Acta, el contenido y los Hallazgos quedan inmutables. Definí ahora la urgencia según lo constatado.")
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
AssistChip(
|
|
||||||
onClick = { closingUrgency = "NON_URGENT" },
|
|
||||||
label = { Text(if (closingUrgency == "NON_URGENT") "✓ No urgente" else "No urgente") },
|
|
||||||
)
|
|
||||||
AssistChip(
|
|
||||||
onClick = { closingUrgency = "URGENT" },
|
|
||||||
label = { Text(if (closingUrgency == "URGENT") "✓ Urgente" else "Urgente") },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Button(
|
|
||||||
onClick = { model.prepareSelectedAct(closingUrgency) },
|
|
||||||
enabled = !model.busy && closure?.responsible != null && closingUrgency.isNotBlank(),
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Finalizar y BLOQUEAR Acta") }
|
|
||||||
}
|
|
||||||
|
|
||||||
"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"
|
|
||||||
|
|
||||||
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) }
|
|
||||||
|
|
||||||
HorizontalDivider()
|
|
||||||
Text("Firma del inspector", fontWeight = FontWeight.Bold)
|
|
||||||
if (inspectorSigned) {
|
|
||||||
Text("✓ Firma del inspector registrada", color = MaterialTheme.colorScheme.primary)
|
|
||||||
} 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 -> 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,
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
AssistChip(onClick = { manifestation = "CONFORMITY" }, label = { Text(if (manifestation == "CONFORMITY") "✓ Conforme" else "Conforme") })
|
|
||||||
AssistChip(onClick = { manifestation = "DISSENT" }, label = { Text(if (manifestation == "DISSENT") "✓ En disidencia" else "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 la persona presente se niega a firmar, asentá el motivo en lugar de dibujar una firma.", 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") }
|
|
||||||
}
|
|
||||||
|
|
||||||
HorizontalDivider()
|
|
||||||
if (inspectorSigned && companyResolved) {
|
|
||||||
Button(
|
|
||||||
onClick = { model.closeSelectedAct() },
|
|
||||||
enabled = !model.busy,
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("SELLAR Acta definitivamente") }
|
|
||||||
} else {
|
|
||||||
Text(
|
|
||||||
"Esta Acta bloquea el cierre de la Inspección hasta tener firma de inspector y firma o negativa válida de la empresa.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
"SEALED" -> {
|
|
||||||
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.")
|
|
||||||
closure?.closure?.finalSha256?.let { Text("SHA-256: $it", style = MaterialTheme.typography.bodySmall) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
"CANCELLED" -> Text("Esta Acta fue cancelada y permanece sólo como antecedente.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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 }}")
|
|
||||||
}
|
|
||||||
Button(
|
|
||||||
onClick = { model.closeInspection() },
|
|
||||||
enabled = !model.busy && activeActs.isNotEmpty() && pendingActs.isEmpty(),
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text("Cerrar Inspección y salir de la empresa") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun F32ActMessage(model: MainViewModel) {
|
|
||||||
val text = model.error ?: model.notice ?: return
|
|
||||||
Card(
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
colors = CardDefaults.cardColors(
|
|
||||||
containerColor = if (model.error != null) MaterialTheme.colorScheme.errorContainer
|
|
||||||
else MaterialTheme.colorScheme.secondaryContainer,
|
|
||||||
),
|
|
||||||
onClick = { model.clearMessages() },
|
|
||||||
) {
|
|
||||||
Text(text, Modifier.padding(12.dp))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun actStatusLabel(status: String): String = when (status) {
|
|
||||||
"DRAFT" -> "Borrador"
|
|
||||||
"LOCKED" -> "BLOQUEADA"
|
|
||||||
"SEALED" -> "SELLADA"
|
|
||||||
"CANCELLED" -> "Cancelada"
|
|
||||||
else -> status
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun hasActLocation(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 currentActSignatureGeo(context: Context): ActSignatureGeo = suspendCancellableCoroutine { continuation ->
|
|
||||||
if (!hasActLocation(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(ActSignatureGeo(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() }
|
|
||||||
}
|
|
||||||
@@ -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,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-565
@@ -1,565 +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 closingUrgency by rememberSaveable(selected?.id) { mutableStateOf("") }
|
|
||||||
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)} · ${when (act.urgency) { "URGENT" -> "Urgente"; "NON_URGENT" -> "No urgente"; else -> "Urgencia pendiente" }}",
|
|
||||||
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(
|
|
||||||
"La urgencia se define recién al cerrar el Acta, cuando ya se conoce el resultado de la inspección.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
)
|
|
||||||
Button(
|
|
||||||
onClick = { model.createAct() },
|
|
||||||
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(
|
|
||||||
when (selected.urgency) {
|
|
||||||
"URGENT" -> "Urgencia · Urgente"
|
|
||||||
"NON_URGENT" -> "Urgencia · No urgente"
|
|
||||||
else -> "Urgencia · Se define al cerrar el Acta"
|
|
||||||
},
|
|
||||||
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. En este momento definí la urgencia según lo constatado en campo.",
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
)
|
|
||||||
Text("Urgencia del Acta", fontWeight = FontWeight.SemiBold)
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
FilterChip(
|
|
||||||
selected = closingUrgency == "NON_URGENT",
|
|
||||||
onClick = { closingUrgency = "NON_URGENT" },
|
|
||||||
label = { Text("No urgente") },
|
|
||||||
)
|
|
||||||
FilterChip(
|
|
||||||
selected = closingUrgency == "URGENT",
|
|
||||||
onClick = { closingUrgency = "URGENT" },
|
|
||||||
label = { Text("Urgente") },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
when (closingUrgency) {
|
|
||||||
"URGENT" -> "El plazo urgente se computará desde el Acta según la política vigente."
|
|
||||||
"NON_URGENT" -> "El plazo no urgente comenzará con la oficialización GEDO."
|
|
||||||
else -> "Elegí una opción para habilitar el cierre."
|
|
||||||
},
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
)
|
|
||||||
Button(
|
|
||||||
onClick = { model.prepareSelectedAct(closingUrgency) },
|
|
||||||
enabled = !model.busy && closure?.responsible != null && closingUrgency.isNotBlank(),
|
|
||||||
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() }
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,137 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.ui
|
|
||||||
|
|
||||||
import android.graphics.Bitmap
|
|
||||||
import android.graphics.Canvas as AndroidCanvas
|
|
||||||
import android.graphics.Color as AndroidColor
|
|
||||||
import android.graphics.Paint
|
|
||||||
import androidx.compose.foundation.Canvas
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.gestures.detectDragGestures
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.height
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.material3.Button
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.mutableStateListOf
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.geometry.Offset
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.graphics.StrokeCap
|
|
||||||
import androidx.compose.ui.input.pointer.pointerInput
|
|
||||||
import androidx.compose.ui.layout.onSizeChanged
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.compose.ui.unit.IntSize
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import java.io.File
|
|
||||||
import java.io.FileOutputStream
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun SignaturePad(
|
|
||||||
label: String,
|
|
||||||
enabled: Boolean = true,
|
|
||||||
onCaptured: (File) -> Unit,
|
|
||||||
) {
|
|
||||||
val context = LocalContext.current
|
|
||||||
val strokes = remember { mutableStateListOf<List<Offset>>() }
|
|
||||||
var currentStroke by remember { mutableStateOf<List<Offset>>(emptyList()) }
|
|
||||||
var canvasSize by remember { mutableStateOf(IntSize.Zero) }
|
|
||||||
|
|
||||||
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.",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
Canvas(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.height(190.dp)
|
|
||||||
.background(Color.White)
|
|
||||||
.onSizeChanged { canvasSize = it }
|
|
||||||
.pointerInput(enabled) {
|
|
||||||
if (!enabled) return@pointerInput
|
|
||||||
detectDragGestures(
|
|
||||||
onDragStart = { position -> currentStroke = listOf(position) },
|
|
||||||
onDrag = { change, _ ->
|
|
||||||
change.consume()
|
|
||||||
currentStroke = currentStroke + change.position
|
|
||||||
},
|
|
||||||
onDragEnd = {
|
|
||||||
if (currentStroke.size > 1) strokes.add(currentStroke)
|
|
||||||
currentStroke = emptyList()
|
|
||||||
},
|
|
||||||
onDragCancel = { currentStroke = emptyList() },
|
|
||||||
)
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
val all = strokes + listOf(currentStroke)
|
|
||||||
all.forEach { stroke ->
|
|
||||||
stroke.zipWithNext().forEach { (start, end) ->
|
|
||||||
drawLine(
|
|
||||||
color = Color.Black,
|
|
||||||
start = start,
|
|
||||||
end = end,
|
|
||||||
strokeWidth = 4.dp.toPx(),
|
|
||||||
cap = StrokeCap.Round,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = { strokes.clear(); currentStroke = emptyList() },
|
|
||||||
enabled = enabled && (strokes.isNotEmpty() || currentStroke.isNotEmpty()),
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
) { Text("Limpiar") }
|
|
||||||
Button(
|
|
||||||
onClick = {
|
|
||||||
val width = canvasSize.width.coerceAtLeast(1)
|
|
||||||
val height = canvasSize.height.coerceAtLeast(1)
|
|
||||||
val targetWidth = 1000
|
|
||||||
val targetHeight = 400
|
|
||||||
val scaleX = targetWidth.toFloat() / width.toFloat()
|
|
||||||
val scaleY = targetHeight.toFloat() / height.toFloat()
|
|
||||||
val bitmap = Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.ARGB_8888)
|
|
||||||
val native = AndroidCanvas(bitmap)
|
|
||||||
native.drawColor(AndroidColor.WHITE)
|
|
||||||
val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
|
|
||||||
color = AndroidColor.BLACK
|
|
||||||
strokeWidth = 7f
|
|
||||||
strokeCap = Paint.Cap.ROUND
|
|
||||||
strokeJoin = Paint.Join.ROUND
|
|
||||||
style = Paint.Style.STROKE
|
|
||||||
}
|
|
||||||
strokes.forEach { stroke ->
|
|
||||||
stroke.zipWithNext().forEach { (start, end) ->
|
|
||||||
native.drawLine(
|
|
||||||
start.x * scaleX,
|
|
||||||
start.y * scaleY,
|
|
||||||
end.x * scaleX,
|
|
||||||
end.y * scaleY,
|
|
||||||
paint,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val file = File.createTempFile("DH_FIRMA_", ".png", context.cacheDir)
|
|
||||||
FileOutputStream(file).use { stream ->
|
|
||||||
check(bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream))
|
|
||||||
}
|
|
||||||
bitmap.recycle()
|
|
||||||
onCaptured(file)
|
|
||||||
},
|
|
||||||
enabled = enabled && strokes.isNotEmpty(),
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
) { Text("Usar firma") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion.ui
|
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.*
|
|
||||||
import androidx.compose.foundation.rememberScrollState
|
|
||||||
import androidx.compose.foundation.verticalScroll
|
|
||||||
import androidx.compose.material3.*
|
|
||||||
import androidx.compose.runtime.*
|
|
||||||
import androidx.compose.runtime.saveable.rememberSaveable
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import com.korexlabs.dhinspeccion.data.*
|
|
||||||
import kotlinx.coroutines.CancellationException
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
internal fun TechnicalFieldsButton(assetId: String, enabled: Boolean) {
|
|
||||||
val context = LocalContext.current
|
|
||||||
val repository = remember { TechnicalRepository(context) }
|
|
||||||
val scope = rememberCoroutineScope()
|
|
||||||
var open by rememberSaveable(assetId) { mutableStateOf(false) }
|
|
||||||
var busy by remember(assetId) { mutableStateOf(false) }
|
|
||||||
var snapshot by remember(assetId) { mutableStateOf<TechnicalValues?>(null) }
|
|
||||||
var error by remember(assetId) { mutableStateOf<String?>(null) }
|
|
||||||
var saved by remember(assetId) { mutableStateOf(false) }
|
|
||||||
val values = remember(assetId) { mutableStateMapOf<String, String>() }
|
|
||||||
|
|
||||||
OutlinedButton(onClick = { open = true }, enabled = enabled,
|
|
||||||
modifier = Modifier.fillMaxWidth().padding(horizontal = 18.dp)) {
|
|
||||||
Text(if (saved) "Datos técnicos guardados · Revisar" else "Completar datos técnicos")
|
|
||||||
}
|
|
||||||
if (!open) return
|
|
||||||
LaunchedEffect(assetId, open) {
|
|
||||||
busy = true; error = null; snapshot = null
|
|
||||||
try {
|
|
||||||
val loaded = repository.get(assetId)
|
|
||||||
snapshot = loaded
|
|
||||||
values.clear()
|
|
||||||
loaded.values.forEach { (id, value) -> values[id] = value?.toString().orEmpty() }
|
|
||||||
} catch (cancelled: CancellationException) { throw cancelled }
|
|
||||||
catch (failure: Exception) { error = DhRepository.humanError(failure) }
|
|
||||||
finally { busy = false }
|
|
||||||
}
|
|
||||||
AlertDialog(
|
|
||||||
onDismissRequest = { if (!busy) open = false },
|
|
||||||
title = { Text(snapshot?.family?.name ?: "Datos técnicos") },
|
|
||||||
text = {
|
|
||||||
Column(Modifier.fillMaxWidth().heightIn(max = 460.dp).verticalScroll(rememberScrollState()),
|
|
||||||
verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
|
||||||
Text("Son los mismos campos de la clasificación administrada en oficina. Los marcados con * son obligatorios.")
|
|
||||||
if (busy) LinearProgressIndicator(Modifier.fillMaxWidth())
|
|
||||||
error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
|
||||||
snapshot?.definitions?.filter { it.isActive }?.forEach { definition ->
|
|
||||||
val label = definition.name + (if (definition.isRequired) " *" else "") + (definition.unit?.let { " ($it)" } ?: "")
|
|
||||||
val current = values[definition.id].orEmpty()
|
|
||||||
if (definition.dataType in setOf("BOOLEAN", "SELECT")) {
|
|
||||||
Text(label)
|
|
||||||
val options = if (definition.dataType == "BOOLEAN") listOf("true", "false") else definition.options.orEmpty()
|
|
||||||
options.forEach { option ->
|
|
||||||
FilterChip(selected = current == option, enabled = !busy,
|
|
||||||
onClick = { values[definition.id] = option },
|
|
||||||
label = { Text(if (definition.dataType == "BOOLEAN") if (option == "true") "Sí" else "No" else option) })
|
|
||||||
}
|
|
||||||
if (!definition.isRequired) TextButton(enabled = !busy, onClick = { values[definition.id] = "" }) { Text("Sin dato") }
|
|
||||||
} else {
|
|
||||||
OutlinedTextField(value = current, onValueChange = { values[definition.id] = it },
|
|
||||||
label = { Text(label) }, enabled = !busy, modifier = Modifier.fillMaxWidth(),
|
|
||||||
supportingText = {
|
|
||||||
when (definition.dataType) {
|
|
||||||
"DATE" -> Text("AAAA-MM-DD")
|
|
||||||
"DATETIME" -> Text("AAAA-MM-DDTHH:MM:SS-03:00")
|
|
||||||
else -> Unit
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (snapshot?.definitions?.none { it.isActive } == true) Text("Esta clasificación no tiene campos técnicos activos.")
|
|
||||||
}
|
|
||||||
},
|
|
||||||
confirmButton = {
|
|
||||||
TextButton(enabled = !busy && snapshot != null, onClick = {
|
|
||||||
val current = snapshot ?: return@TextButton
|
|
||||||
busy = true; error = null
|
|
||||||
scope.launch {
|
|
||||||
try {
|
|
||||||
val payload = current.definitions.filter { it.isActive }.mapNotNull { definition ->
|
|
||||||
technicalInputValue(definition, values[definition.id].orEmpty())?.let { definition.id to it }
|
|
||||||
}.toMap()
|
|
||||||
snapshot = repository.save(assetId, payload)
|
|
||||||
saved = true; open = false
|
|
||||||
} catch (cancelled: CancellationException) { throw cancelled }
|
|
||||||
catch (failure: Exception) { error = DhRepository.humanError(failure) }
|
|
||||||
finally { busy = false }
|
|
||||||
}
|
|
||||||
}) { Text("Guardar datos") }
|
|
||||||
},
|
|
||||||
dismissButton = { TextButton(enabled = !busy, onClick = { open = false }) { Text("Cerrar") } },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -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() }
|
|
||||||
}
|
|
||||||
@@ -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>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<string name="app_name">DH Inspección</string>
|
|
||||||
</resources>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<style name="Theme.DHInspeccion" parent="android:style/Theme.Material.Light.NoActionBar">
|
|
||||||
<item name="android:fontFamily">sans</item>
|
|
||||||
<item name="android:windowActionModeOverlay">true</item>
|
|
||||||
<item name="android:colorAccent">#1B5E20</item>
|
|
||||||
<item name="android:navigationBarColor">#FFFFFF</item>
|
|
||||||
<item name="android:statusBarColor">#FFFFFF</item>
|
|
||||||
<item name="android:windowLightStatusBar">true</item>
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<paths xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<external-files-path name="inspection_photos" path="Pictures/" />
|
|
||||||
</paths>
|
|
||||||
-26
@@ -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"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion
|
|
||||||
import com.korexlabs.dhinspeccion.data.FieldCoordinates
|
|
||||||
import org.junit.Assert.*
|
|
||||||
import org.junit.Test
|
|
||||||
class FieldCoordinatesTest {
|
|
||||||
@Test fun realGpsIsRoundedToApiPrecision() {
|
|
||||||
assertEquals(-32.889459, FieldCoordinates.latitude(-32.889458762), 0.0)
|
|
||||||
assertEquals(-68.845839, FieldCoordinates.longitude(-68.845838912), 0.0)
|
|
||||||
assertEquals(4.123, FieldCoordinates.accuracy(4.123456789), 0.0)
|
|
||||||
}
|
|
||||||
@Test fun boundsAndZeroRemainValid() {
|
|
||||||
assertEquals(90.0, FieldCoordinates.latitude(90.0), 0.0)
|
|
||||||
assertEquals(-180.0, FieldCoordinates.longitude(-180.0), 0.0)
|
|
||||||
assertEquals(0.0, FieldCoordinates.accuracy(0.0), 0.0)
|
|
||||||
}
|
|
||||||
@Test fun invalidCoordinatesAreRejected() {
|
|
||||||
for (value in listOf(Double.NaN, Double.POSITIVE_INFINITY, 90.1, -90.1)) {
|
|
||||||
try { FieldCoordinates.latitude(value); fail("Invalid latitude accepted") }
|
|
||||||
catch (_: IllegalArgumentException) { }
|
|
||||||
}
|
|
||||||
try { FieldCoordinates.accuracy(-1.0); fail("Negative accuracy accepted") }
|
|
||||||
catch (_: IllegalArgumentException) { }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-57
@@ -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(\"yacimiento\", \"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\")"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-105
@@ -1,105 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion
|
|
||||||
|
|
||||||
import com.korexlabs.dhinspeccion.data.*
|
|
||||||
import java.io.IOException
|
|
||||||
import kotlinx.coroutines.*
|
|
||||||
import okhttp3.ResponseBody.Companion.toResponseBody
|
|
||||||
import org.junit.Assert.*
|
|
||||||
import org.junit.Test
|
|
||||||
import retrofit2.HttpException
|
|
||||||
import retrofit2.Response
|
|
||||||
|
|
||||||
class MobileSessionCoordinatorTest {
|
|
||||||
private fun old() = StoredSession("u1", "inspector", "Inspector", "a1", "r1")
|
|
||||||
private fun response() = MobileSessionResponse(MobileUser("u1", "inspector"), "a2", "r2", 900)
|
|
||||||
private fun http(code: Int) = HttpException(Response.error<Unit>(code, "error".toResponseBody()))
|
|
||||||
|
|
||||||
private class Store(var value: StoredSession?) {
|
|
||||||
var clears = 0
|
|
||||||
fun load() = value
|
|
||||||
fun clear() { clears++; value = null }
|
|
||||||
fun save(r: MobileSessionResponse): StoredSession =
|
|
||||||
StoredSession(r.user.id, r.user.username, r.user.username, r.accessToken, r.refreshToken).also { value = it }
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test fun concurrentClientsRotateTheTokenOnlyOnce() = runBlocking {
|
|
||||||
val previous = old(); val store = Store(previous); var calls = 0
|
|
||||||
val results = coroutineScope {
|
|
||||||
(1..4).map {
|
|
||||||
async {
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
|
|
||||||
calls++; delay(20); response()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}.awaitAll()
|
|
||||||
}
|
|
||||||
assertEquals(1, calls)
|
|
||||||
assertTrue(results.all { it.refreshToken == "r2" })
|
|
||||||
assertEquals(0, store.clears)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test fun networkAndServerFailuresKeepSessionForRetry() = runBlocking {
|
|
||||||
for (failure in listOf(IOException("offline"), http(500), http(429))) {
|
|
||||||
val previous = old(); val store = Store(previous)
|
|
||||||
try {
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) { throw failure }
|
|
||||||
fail("Expected request failure")
|
|
||||||
} catch (caught: Exception) { assertSame(failure, caught) }
|
|
||||||
assertEquals(previous, store.value)
|
|
||||||
assertEquals(0, store.clears)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test fun invalidRefreshClearsOnlyTheExpiredSession() = runBlocking {
|
|
||||||
val previous = old(); val store = Store(previous)
|
|
||||||
try {
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) { throw http(401) }
|
|
||||||
fail("Expected unauthorized")
|
|
||||||
} catch (caught: HttpException) { assertEquals(401, caught.code()) }
|
|
||||||
assertNull(store.value)
|
|
||||||
assertEquals(1, store.clears)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test fun cancelledRefreshKeepsSession() = runBlocking {
|
|
||||||
val previous = old(); val store = Store(previous)
|
|
||||||
try {
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) { throw CancellationException("cancel") }
|
|
||||||
fail("Expected cancellation")
|
|
||||||
} catch (_: CancellationException) { }
|
|
||||||
assertEquals(previous, store.value)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test fun logoutDuringRefreshCannotBeUndone() = runBlocking {
|
|
||||||
val previous = old(); val store = Store(previous)
|
|
||||||
try {
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
|
|
||||||
store.clear(); response()
|
|
||||||
}
|
|
||||||
fail("Must reject a refresh after logout")
|
|
||||||
} catch (_: IllegalStateException) { }
|
|
||||||
assertNull(store.value)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test fun staleRequestCannotUseAnotherInspectorsSession() = runBlocking {
|
|
||||||
val previous = old(); val store = Store(previous.copy(userId = "u2", refreshToken = "other"))
|
|
||||||
try {
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
|
|
||||||
fail("No refresh allowed for another inspector"); response()
|
|
||||||
}
|
|
||||||
fail("Must reject account switch")
|
|
||||||
} catch (_: IllegalStateException) { }
|
|
||||||
assertEquals("u2", store.value?.userId)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test fun lateUnauthorizedDoesNotClearANewLogin() = runBlocking {
|
|
||||||
val previous = old(); val store = Store(previous)
|
|
||||||
try {
|
|
||||||
MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
|
|
||||||
store.value = previous.copy(refreshToken = "new-login")
|
|
||||||
throw http(401)
|
|
||||||
}
|
|
||||||
} catch (_: HttpException) { }
|
|
||||||
assertEquals("new-login", store.value?.refreshToken)
|
|
||||||
assertEquals(0, store.clears)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion
|
|
||||||
|
|
||||||
import org.junit.Assert.*
|
|
||||||
import org.junit.Test
|
|
||||||
|
|
||||||
class OperationTrackerTest {
|
|
||||||
@Test fun doubleTapCannotQueueASecondWrite() {
|
|
||||||
val tracker = OperationTracker()
|
|
||||||
assertTrue(tracker.begin(mutation = true))
|
|
||||||
assertFalse(tracker.begin(mutation = true))
|
|
||||||
tracker.end()
|
|
||||||
assertFalse(tracker.busy)
|
|
||||||
assertTrue(tracker.begin(mutation = true))
|
|
||||||
}
|
|
||||||
@Test fun BusyRemainsUntilEveryReadCompletes() {
|
|
||||||
val tracker = OperationTracker()
|
|
||||||
assertTrue(tracker.begin(false)); assertTrue(tracker.begin(false))
|
|
||||||
tracker.end(); assertTrue(tracker.busy)
|
|
||||||
assertFalse(tracker.begin(true))
|
|
||||||
tracker.end(); assertFalse(tracker.busy)
|
|
||||||
}
|
|
||||||
@Test fun readDuringWriteDoesNotReleaseItsGuardEarly() {
|
|
||||||
val tracker = OperationTracker()
|
|
||||||
assertTrue(tracker.begin(true)); assertTrue(tracker.begin(false))
|
|
||||||
tracker.end(); assertFalse(tracker.begin(true))
|
|
||||||
tracker.end(); assertTrue(tracker.begin(true))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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(30, BuildConfig.VERSION_CODE)
|
|
||||||
assertEquals("0.19.2-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://"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package com.korexlabs.dhinspeccion
|
|
||||||
import com.korexlabs.dhinspeccion.data.*
|
|
||||||
import org.junit.Assert.*
|
|
||||||
import org.junit.Test
|
|
||||||
class TechnicalValuesTest {
|
|
||||||
private fun field(type: String, required: Boolean = false) = TechnicalDefinition("id", "code", "Campo", type, required, options = listOf("A", "B"))
|
|
||||||
@Test fun decimalCommaAndBooleanFalseKeepTheirTypes() {
|
|
||||||
assertEquals(12.5, technicalInputValue(field("NUMBER"), "12,5"))
|
|
||||||
assertEquals(false, technicalInputValue(field("BOOLEAN", true), "false"))
|
|
||||||
assertEquals(0.0, technicalInputValue(field("NUMBER", true), "0"))
|
|
||||||
}
|
|
||||||
@Test fun optionalBlankIsOmittedButRequiredBlankFails() {
|
|
||||||
assertNull(technicalInputValue(field("TEXT"), " "))
|
|
||||||
try { technicalInputValue(field("TEXT", true), ""); fail("Required missing") }
|
|
||||||
catch (_: IllegalArgumentException) { }
|
|
||||||
}
|
|
||||||
@Test fun invalidNumbersDatesAndOptionsFailBeforeSave() {
|
|
||||||
for ((type, value) in listOf("NUMBER" to "NaN", "DATE" to "2026-02-30", "SELECT" to "C", "BOOLEAN" to "quizás")) {
|
|
||||||
try { technicalInputValue(field(type), value); fail("Invalid value accepted") }
|
|
||||||
catch (_: IllegalArgumentException) { }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@Test fun validDatesAndSelectRemainCanonical() {
|
|
||||||
assertEquals("2026-09-14", technicalInputValue(field("DATE"), "2026-09-14"))
|
|
||||||
assertEquals("A", technicalInputValue(field("SELECT"), "A"))
|
|
||||||
assertEquals("2026-09-14T13:00:00Z", technicalInputValue(field("DATETIME"), "2026-09-14T10:00:00-03:00"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id("com.android.application") version "8.13.2" apply false
|
|
||||||
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
|
|
||||||
id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false
|
|
||||||
}
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
org.gradle.jvmargs=-Xmx3g -Dfile.encoding=UTF-8
|
|
||||||
android.useAndroidX=true
|
|
||||||
kotlin.code.style=official
|
|
||||||
android.nonTransitiveRClass=true
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
pluginManagement {
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
gradlePluginPortal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencyResolutionManagement {
|
|
||||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rootProject.name = "DHInspeccion"
|
|
||||||
include(":app")
|
|
||||||
Generated
+8
-8
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "dhv2-api",
|
"name": "dhv2-api",
|
||||||
"version": "0.29.0-2",
|
"version": "0.20.0-2",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "dhv2-api",
|
"name": "dhv2-api",
|
||||||
"version": "0.29.0-2",
|
"version": "0.20.0-2",
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nestjs/common": "^11.0.0",
|
"@nestjs/common": "^11.0.0",
|
||||||
@@ -4166,9 +4166,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/multer": {
|
"node_modules/multer": {
|
||||||
"version": "2.3.0",
|
"version": "2.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/multer/-/multer-2.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/multer/-/multer-2.2.0.tgz",
|
||||||
"integrity": "sha512-cjNbm3sttszgZeGfJR124D+jFEfkXCVAsoPBmFn9X7UxmDSFHWqE2CoEj0vrmSpuAFnqWR1Szcm9QTsiHr60Xw==",
|
"integrity": "sha512-6rdyFg2kLrMh9Jee7/BMPuV9lEAd7lLW2YUpF9/YxR7njyoUwwQ0ZPh3TaIY50Sw6vlyD2HW3wGOkTS4P79xrQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"append-field": "^1.0.0",
|
"append-field": "^1.0.0",
|
||||||
@@ -4666,9 +4666,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/qs": {
|
"node_modules/qs": {
|
||||||
"version": "6.16.0",
|
"version": "6.15.3",
|
||||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.16.0.tgz",
|
"resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
|
||||||
"integrity": "sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==",
|
"integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"es-define-property": "^1.0.1",
|
"es-define-property": "^1.0.1",
|
||||||
|
|||||||
+1
-5
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "dhv2-api",
|
"name": "dhv2-api",
|
||||||
"version": "0.29.0-2",
|
"version": "0.20.0-2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -42,9 +42,5 @@
|
|||||||
"ts-node": "^10.9.2",
|
"ts-node": "^10.9.2",
|
||||||
"tsx": "^4.20.6",
|
"tsx": "^4.20.6",
|
||||||
"typescript": "^5.9.0"
|
"typescript": "^5.9.0"
|
||||||
},
|
|
||||||
"overrides": {
|
|
||||||
"multer": "2.3.0",
|
|
||||||
"qs": "6.16.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,12 @@
|
|||||||
|
|
||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
import { AuditModule } from '../audit/audit.module';
|
import { AuditModule } from '../audit/audit.module';
|
||||||
import {
|
import { ActAdministrationController, ActAdministrationQueueController, ActCompanyResponseContentController } from './act-administration.controller';
|
||||||
ActAdministrationController,
|
|
||||||
ActAdministrationQueueController,
|
|
||||||
ActCompanyResponseContentController,
|
|
||||||
} from './act-administration.controller';
|
|
||||||
import { ActAdministrationService } from './act-administration.service';
|
import { ActAdministrationService } from './act-administration.service';
|
||||||
import { FieldBriefingController } from './field-briefing.controller';
|
|
||||||
import { FieldBriefingService } from './field-briefing.service';
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [AuditModule],
|
imports: [AuditModule],
|
||||||
controllers: [
|
controllers: [ActAdministrationQueueController, ActAdministrationController, ActCompanyResponseContentController],
|
||||||
ActAdministrationQueueController,
|
providers: [ActAdministrationService],
|
||||||
ActAdministrationController,
|
|
||||||
ActCompanyResponseContentController,
|
|
||||||
FieldBriefingController,
|
|
||||||
],
|
|
||||||
providers: [ActAdministrationService, FieldBriefingService],
|
|
||||||
})
|
})
|
||||||
export class ActAdministrationModule {}
|
export class ActAdministrationModule {}
|
||||||
|
|||||||
@@ -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
|
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
|
FROM inspection_findings f WHERE f.act_id = ia.id
|
||||||
) fc ON true
|
) fc ON true
|
||||||
WHERE ia.status IN ('SEALED', 'CLOSED', 'RECTIFIED')
|
WHERE ia.status IN ('CLOSED', 'RECTIFIED')
|
||||||
), classified AS (
|
), classified AS (
|
||||||
SELECT *, CASE
|
SELECT *, CASE
|
||||||
WHEN "findingCount" > 0 AND "openFindingCount" = 0 THEN 'REGULARIZED'
|
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 rows = await this.dataSource.query(`SELECT id, code, status FROM inspection_acts WHERE id = $1`, [actId]);
|
||||||
const act = rows[0];
|
const act = rows[0];
|
||||||
if (!act) throw new NotFoundException({ code: 'ACT_NOT_FOUND', message: 'Acta inexistente.' });
|
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;
|
return act;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
import { Controller, Get, Param, ParseUUIDPipe } from '@nestjs/common';
|
|
||||||
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
|
|
||||||
import { FieldBriefingService } from './field-briefing.service';
|
|
||||||
|
|
||||||
@Controller('inspection-visits/:visitId/field-briefing')
|
|
||||||
export class FieldBriefingController {
|
|
||||||
constructor(private readonly briefing: FieldBriefingService) {}
|
|
||||||
|
|
||||||
@Get()
|
|
||||||
@RequirePermissions('inspections.read')
|
|
||||||
get(@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string) {
|
|
||||||
return this.briefing.forVisit(visitId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,258 +0,0 @@
|
|||||||
import { Injectable, NotFoundException } from '@nestjs/common';
|
|
||||||
import { DataSource } from 'typeorm';
|
|
||||||
|
|
||||||
export type FieldBriefingActState =
|
|
||||||
| 'ACT_RESPONSE_OVERDUE'
|
|
||||||
| 'ACT_RESPONSE_DUE_SOON'
|
|
||||||
| 'WAITING_RESPONSE'
|
|
||||||
| 'COMPANY_COMMITMENT_OVERDUE'
|
|
||||||
| 'VERIFICATION_PENDING'
|
|
||||||
| 'RESPONSE_RECEIVED';
|
|
||||||
|
|
||||||
export interface FieldBriefingFinding {
|
|
||||||
id: string;
|
|
||||||
code: string;
|
|
||||||
title: string;
|
|
||||||
status: string;
|
|
||||||
severity: number | null;
|
|
||||||
nextControlOn: string | null;
|
|
||||||
asset: {
|
|
||||||
id: string;
|
|
||||||
code: string;
|
|
||||||
name: string;
|
|
||||||
typeName: string;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface FieldBriefingAct {
|
|
||||||
actId: string;
|
|
||||||
actCode: string;
|
|
||||||
occurredAt: Date;
|
|
||||||
adminState: FieldBriefingActState;
|
|
||||||
responseDueOn: string | null;
|
|
||||||
responseReceivedOn: string | null;
|
|
||||||
committedCorrectionOn: string | null;
|
|
||||||
latestResponseId: string | null;
|
|
||||||
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) {}
|
|
||||||
|
|
||||||
async forVisit(visitId: string) {
|
|
||||||
const [visit] = (await this.dataSource.query(`
|
|
||||||
SELECT
|
|
||||||
visit.id,
|
|
||||||
visit.code,
|
|
||||||
visit.status,
|
|
||||||
visit.planned_start_at AS "plannedStartAt",
|
|
||||||
visit.operational_area_id AS "areaId",
|
|
||||||
visit.operator_company_id AS "companyId",
|
|
||||||
area.code AS "areaCode",
|
|
||||||
area.name AS "areaName",
|
|
||||||
company.code AS "companyCode",
|
|
||||||
COALESCE(profile.legal_name, company.name) AS "companyName"
|
|
||||||
FROM inspection_visits visit
|
|
||||||
LEFT JOIN assets area ON area.id = visit.operational_area_id
|
|
||||||
LEFT JOIN assets company ON company.id = visit.operator_company_id
|
|
||||||
LEFT JOIN organization_profiles profile ON profile.asset_id = company.id
|
|
||||||
WHERE visit.id = $1
|
|
||||||
`, [visitId])) as Array<Record<string, unknown>>;
|
|
||||||
|
|
||||||
if (!visit) {
|
|
||||||
throw new NotFoundException({
|
|
||||||
code: 'INSPECTION_VISIT_NOT_FOUND',
|
|
||||||
message: 'Inspección no encontrada',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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 rows = (await this.dataSource.query(`
|
|
||||||
WITH prior_acts AS (
|
|
||||||
SELECT
|
|
||||||
act.id AS act_id,
|
|
||||||
act.code AS act_code,
|
|
||||||
act.occurred_at,
|
|
||||||
deadline.response_due_on,
|
|
||||||
response.id AS latest_response_id,
|
|
||||||
response.received_on AS response_received_on,
|
|
||||||
response.committed_correction_on,
|
|
||||||
finding.id AS finding_id,
|
|
||||||
finding.code AS finding_code,
|
|
||||||
finding.title AS finding_title,
|
|
||||||
finding.status AS finding_status,
|
|
||||||
finding.severity,
|
|
||||||
finding.next_control_on,
|
|
||||||
asset.id AS asset_id,
|
|
||||||
asset.code AS asset_code,
|
|
||||||
asset.name AS asset_name,
|
|
||||||
asset_type.name AS asset_type_name,
|
|
||||||
CASE
|
|
||||||
WHEN response.id IS NULL
|
|
||||||
AND deadline.response_due_on IS NOT NULL
|
|
||||||
AND deadline.response_due_on < $4::date
|
|
||||||
THEN 'ACT_RESPONSE_OVERDUE'
|
|
||||||
WHEN response.id IS NULL
|
|
||||||
AND deadline.response_due_on IS NOT NULL
|
|
||||||
AND deadline.response_due_on BETWEEN $4::date AND ($4::date + 3)
|
|
||||||
THEN 'ACT_RESPONSE_DUE_SOON'
|
|
||||||
WHEN response.id IS NOT NULL
|
|
||||||
AND response.committed_correction_on IS NOT NULL
|
|
||||||
AND response.committed_correction_on < $4::date
|
|
||||||
THEN 'COMPANY_COMMITMENT_OVERDUE'
|
|
||||||
WHEN response.id IS NOT NULL
|
|
||||||
AND finding.next_control_on IS NULL
|
|
||||||
THEN 'VERIFICATION_PENDING'
|
|
||||||
WHEN response.id IS NOT NULL
|
|
||||||
THEN 'RESPONSE_RECEIVED'
|
|
||||||
ELSE 'WAITING_RESPONSE'
|
|
||||||
END AS admin_state
|
|
||||||
FROM inspection_acts act
|
|
||||||
INNER JOIN inspection_visits source_visit ON source_visit.id = act.visit_id
|
|
||||||
INNER JOIN inspection_findings finding ON finding.act_id = act.id
|
|
||||||
AND finding.status = 'OPEN'
|
|
||||||
INNER JOIN assets asset ON asset.id = finding.asset_id
|
|
||||||
INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
|
|
||||||
LEFT JOIN LATERAL (
|
|
||||||
SELECT event.response_due_on
|
|
||||||
FROM inspection_act_deadline_events event
|
|
||||||
WHERE event.act_id = act.id
|
|
||||||
ORDER BY event.created_at DESC, event.id DESC
|
|
||||||
LIMIT 1
|
|
||||||
) deadline ON true
|
|
||||||
LEFT JOIN LATERAL (
|
|
||||||
SELECT company_response.id, company_response.received_on, company_response.committed_correction_on
|
|
||||||
FROM inspection_act_company_responses company_response
|
|
||||||
WHERE company_response.act_id = act.id
|
|
||||||
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')
|
|
||||||
AND source_visit.id <> $1
|
|
||||||
AND source_visit.operational_area_id = $2::uuid
|
|
||||||
AND source_visit.operator_company_id = $3::uuid
|
|
||||||
)
|
|
||||||
SELECT *
|
|
||||||
FROM prior_acts
|
|
||||||
WHERE admin_state IN (
|
|
||||||
'ACT_RESPONSE_OVERDUE',
|
|
||||||
'ACT_RESPONSE_DUE_SOON',
|
|
||||||
'COMPANY_COMMITMENT_OVERDUE',
|
|
||||||
'VERIFICATION_PENDING',
|
|
||||||
'RESPONSE_RECEIVED'
|
|
||||||
)
|
|
||||||
OR next_control_on IS NOT NULL
|
|
||||||
ORDER BY
|
|
||||||
CASE admin_state
|
|
||||||
WHEN 'ACT_RESPONSE_OVERDUE' THEN 1
|
|
||||||
WHEN 'COMPANY_COMMITMENT_OVERDUE' THEN 2
|
|
||||||
WHEN 'VERIFICATION_PENDING' THEN 3
|
|
||||||
WHEN 'ACT_RESPONSE_DUE_SOON' THEN 4
|
|
||||||
ELSE 5
|
|
||||||
END,
|
|
||||||
response_due_on NULLS LAST,
|
|
||||||
occurred_at,
|
|
||||||
act_code,
|
|
||||||
finding_code
|
|
||||||
`, [visitId, visit.areaId, visit.companyId, plannedOn])) as Array<{
|
|
||||||
act_id: string;
|
|
||||||
act_code: string;
|
|
||||||
occurred_at: Date;
|
|
||||||
response_due_on: string | null;
|
|
||||||
latest_response_id: string | null;
|
|
||||||
response_received_on: string | null;
|
|
||||||
committed_correction_on: string | null;
|
|
||||||
finding_id: string;
|
|
||||||
finding_code: string;
|
|
||||||
finding_title: string;
|
|
||||||
finding_status: string;
|
|
||||||
severity: number | null;
|
|
||||||
next_control_on: string | null;
|
|
||||||
asset_id: string;
|
|
||||||
asset_code: string;
|
|
||||||
asset_name: string;
|
|
||||||
asset_type_name: string;
|
|
||||||
admin_state: FieldBriefingActState;
|
|
||||||
}>;
|
|
||||||
|
|
||||||
const byAct = new Map<string, FieldBriefingAct>();
|
|
||||||
for (const row of rows) {
|
|
||||||
let act = byAct.get(row.act_id);
|
|
||||||
if (!act) {
|
|
||||||
act = {
|
|
||||||
actId: row.act_id,
|
|
||||||
actCode: row.act_code,
|
|
||||||
occurredAt: row.occurred_at,
|
|
||||||
adminState: row.admin_state,
|
|
||||||
responseDueOn: row.response_due_on,
|
|
||||||
responseReceivedOn: row.response_received_on,
|
|
||||||
committedCorrectionOn: row.committed_correction_on,
|
|
||||||
latestResponseId: row.latest_response_id,
|
|
||||||
findings: [],
|
|
||||||
};
|
|
||||||
byAct.set(row.act_id, act);
|
|
||||||
}
|
|
||||||
act.findings.push({
|
|
||||||
id: row.finding_id,
|
|
||||||
code: row.finding_code,
|
|
||||||
title: row.finding_title,
|
|
||||||
status: row.finding_status,
|
|
||||||
severity: row.severity,
|
|
||||||
nextControlOn: row.next_control_on,
|
|
||||||
asset: {
|
|
||||||
id: row.asset_id,
|
|
||||||
code: row.asset_code,
|
|
||||||
name: row.asset_name,
|
|
||||||
typeName: row.asset_type_name,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const acts = [...byAct.values()];
|
|
||||||
const assetIds = new Set<string>();
|
|
||||||
let findingCount = 0;
|
|
||||||
for (const act of acts) {
|
|
||||||
findingCount += act.findings.length;
|
|
||||||
for (const finding of act.findings) assetIds.add(finding.asset.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
inspection: {
|
|
||||||
id: visit.id,
|
|
||||||
code: visit.code,
|
|
||||||
status: visit.status,
|
|
||||||
plannedStartAt: visit.plannedStartAt,
|
|
||||||
area: visit.areaId ? { id: visit.areaId, code: visit.areaCode, name: visit.areaName } : null,
|
|
||||||
operatorCompany: visit.companyId ? { id: visit.companyId, code: visit.companyCode, name: visit.companyName } : null,
|
|
||||||
},
|
|
||||||
plannedOn,
|
|
||||||
summary: {
|
|
||||||
acts: acts.length,
|
|
||||||
findings: findingCount,
|
|
||||||
inventoryItems: assetIds.size,
|
|
||||||
responseOverdue: acts.filter((item) => item.adminState === 'ACT_RESPONSE_OVERDUE').length,
|
|
||||||
commitmentOverdue: acts.filter((item) => item.adminState === 'COMPANY_COMMITMENT_OVERDUE').length,
|
|
||||||
verificationPending: acts.filter((item) => item.adminState === 'VERIFICATION_PENDING').length,
|
|
||||||
},
|
|
||||||
acts,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -12,9 +12,6 @@ import {
|
|||||||
MinLength,
|
MinLength,
|
||||||
} from 'class-validator';
|
} from 'class-validator';
|
||||||
|
|
||||||
const optionalText = ({ value }: { value: unknown }) =>
|
|
||||||
typeof value === 'string' && value.trim() ? value.trim() : null;
|
|
||||||
|
|
||||||
export class CreateUserDto {
|
export class CreateUserDto {
|
||||||
@Transform(({ value }) =>
|
@Transform(({ value }) =>
|
||||||
typeof value === 'string' ? value.trim().toLowerCase() : value,
|
typeof value === 'string' ? value.trim().toLowerCase() : value,
|
||||||
@@ -26,38 +23,13 @@ export class CreateUserDto {
|
|||||||
username!: string;
|
username!: string;
|
||||||
|
|
||||||
@Transform(({ value }) =>
|
@Transform(({ value }) =>
|
||||||
typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null,
|
typeof value === 'string' ? value.trim().toLowerCase() : value,
|
||||||
)
|
)
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsEmail()
|
@IsEmail()
|
||||||
@MaxLength(320)
|
@MaxLength(320)
|
||||||
email?: string | null;
|
email?: string | null;
|
||||||
|
|
||||||
@Transform(({ value }) =>
|
|
||||||
typeof value === 'string' && value.trim() ? value.replace(/\D/g, '') : null,
|
|
||||||
)
|
|
||||||
@IsOptional()
|
|
||||||
@Matches(/^\d{7,11}$/)
|
|
||||||
dni?: string | null;
|
|
||||||
|
|
||||||
@Transform(optionalText)
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(40)
|
|
||||||
phone?: string | null;
|
|
||||||
|
|
||||||
@Transform(optionalText)
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(160)
|
|
||||||
jobTitle?: string | null;
|
|
||||||
|
|
||||||
@Transform(optionalText)
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(80)
|
|
||||||
employeeNumber?: string | null;
|
|
||||||
|
|
||||||
@IsString()
|
@IsString()
|
||||||
@MinLength(12)
|
@MinLength(12)
|
||||||
@MaxLength(128)
|
@MaxLength(128)
|
||||||
|
|||||||
@@ -8,9 +8,6 @@ import {
|
|||||||
MinLength,
|
MinLength,
|
||||||
} from 'class-validator';
|
} from 'class-validator';
|
||||||
|
|
||||||
const optionalText = ({ value }: { value: unknown }) =>
|
|
||||||
typeof value === 'string' && value.trim() ? value.trim() : null;
|
|
||||||
|
|
||||||
export class UpdateUserDto {
|
export class UpdateUserDto {
|
||||||
@Transform(({ value }) =>
|
@Transform(({ value }) =>
|
||||||
typeof value === 'string' ? value.trim().toLowerCase() : value,
|
typeof value === 'string' ? value.trim().toLowerCase() : value,
|
||||||
@@ -23,38 +20,13 @@ export class UpdateUserDto {
|
|||||||
username?: string;
|
username?: string;
|
||||||
|
|
||||||
@Transform(({ value }) =>
|
@Transform(({ value }) =>
|
||||||
typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null,
|
typeof value === 'string' ? value.trim().toLowerCase() : value,
|
||||||
)
|
)
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsEmail()
|
@IsEmail()
|
||||||
@MaxLength(320)
|
@MaxLength(320)
|
||||||
email?: string | null;
|
email?: string | null;
|
||||||
|
|
||||||
@Transform(({ value }) =>
|
|
||||||
typeof value === 'string' && value.trim() ? value.replace(/\D/g, '') : null,
|
|
||||||
)
|
|
||||||
@IsOptional()
|
|
||||||
@Matches(/^\d{7,11}$/)
|
|
||||||
dni?: string | null;
|
|
||||||
|
|
||||||
@Transform(optionalText)
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(40)
|
|
||||||
phone?: string | null;
|
|
||||||
|
|
||||||
@Transform(optionalText)
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(160)
|
|
||||||
jobTitle?: string | null;
|
|
||||||
|
|
||||||
@Transform(optionalText)
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(80)
|
|
||||||
employeeNumber?: string | null;
|
|
||||||
|
|
||||||
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
|
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
|
|||||||
@@ -41,10 +41,6 @@ export interface AdministrativeUserView {
|
|||||||
id: string;
|
id: string;
|
||||||
username: string;
|
username: string;
|
||||||
email: string | null;
|
email: string | null;
|
||||||
dni: string | null;
|
|
||||||
phone: string | null;
|
|
||||||
jobTitle: string | null;
|
|
||||||
employeeNumber: string | null;
|
|
||||||
firstName: string;
|
firstName: string;
|
||||||
lastName: string;
|
lastName: string;
|
||||||
status: UserStatus;
|
status: UserStatus;
|
||||||
@@ -76,13 +72,6 @@ function roleSelectionInvalid(): BadRequestException {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function inspectorEmailRequired(): BadRequestException {
|
|
||||||
return new BadRequestException({
|
|
||||||
code: 'INSPECTOR_EMAIL_REQUIRED',
|
|
||||||
message: 'Los usuarios con rol Inspector deben tener un email válido para recibir la documentación de sus inspecciones',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class UsersService {
|
export class UsersService {
|
||||||
constructor(
|
constructor(
|
||||||
@@ -107,10 +96,6 @@ export class UsersService {
|
|||||||
OR user_account.email ILIKE $${parameters.length}
|
OR user_account.email ILIKE $${parameters.length}
|
||||||
OR user_account.first_name ILIKE $${parameters.length}
|
OR user_account.first_name ILIKE $${parameters.length}
|
||||||
OR user_account.last_name ILIKE $${parameters.length}
|
OR user_account.last_name ILIKE $${parameters.length}
|
||||||
OR user_account.dni ILIKE $${parameters.length}
|
|
||||||
OR user_account.phone ILIKE $${parameters.length}
|
|
||||||
OR user_account.job_title ILIKE $${parameters.length}
|
|
||||||
OR user_account.employee_number ILIKE $${parameters.length}
|
|
||||||
)
|
)
|
||||||
`);
|
`);
|
||||||
}
|
}
|
||||||
@@ -130,10 +115,6 @@ export class UsersService {
|
|||||||
user_account.id,
|
user_account.id,
|
||||||
user_account.username,
|
user_account.username,
|
||||||
user_account.email,
|
user_account.email,
|
||||||
user_account.dni,
|
|
||||||
user_account.phone,
|
|
||||||
user_account.job_title AS "jobTitle",
|
|
||||||
user_account.employee_number AS "employeeNumber",
|
|
||||||
user_account.first_name AS "firstName",
|
user_account.first_name AS "firstName",
|
||||||
user_account.last_name AS "lastName",
|
user_account.last_name AS "lastName",
|
||||||
user_account.status,
|
user_account.status,
|
||||||
@@ -195,14 +176,9 @@ export class UsersService {
|
|||||||
try {
|
try {
|
||||||
return await this.dataSource.transaction(async (manager) => {
|
return await this.dataSource.transaction(async (manager) => {
|
||||||
const roles = await this.resolveRoles(manager, dto.roleIds);
|
const roles = await this.resolveRoles(manager, dto.roleIds);
|
||||||
this.assertInspectorHasEmail(roles, dto.email ?? null);
|
|
||||||
const user = manager.getRepository(User).create({
|
const user = manager.getRepository(User).create({
|
||||||
username: dto.username.trim().toLowerCase(),
|
username: dto.username.trim().toLowerCase(),
|
||||||
email: dto.email?.trim().toLowerCase() || null,
|
email: dto.email?.trim().toLowerCase() || null,
|
||||||
dni: dto.dni ?? null,
|
|
||||||
phone: dto.phone ?? null,
|
|
||||||
jobTitle: dto.jobTitle ?? null,
|
|
||||||
employeeNumber: dto.employeeNumber ?? null,
|
|
||||||
passwordHash,
|
passwordHash,
|
||||||
firstName: dto.firstName.trim(),
|
firstName: dto.firstName.trim(),
|
||||||
lastName: dto.lastName.trim(),
|
lastName: dto.lastName.trim(),
|
||||||
@@ -251,10 +227,6 @@ export class UsersService {
|
|||||||
if (
|
if (
|
||||||
dto.username === undefined &&
|
dto.username === undefined &&
|
||||||
dto.email === undefined &&
|
dto.email === undefined &&
|
||||||
dto.dni === undefined &&
|
|
||||||
dto.phone === undefined &&
|
|
||||||
dto.jobTitle === undefined &&
|
|
||||||
dto.employeeNumber === undefined &&
|
|
||||||
dto.firstName === undefined &&
|
dto.firstName === undefined &&
|
||||||
dto.lastName === undefined
|
dto.lastName === undefined
|
||||||
) {
|
) {
|
||||||
@@ -268,9 +240,6 @@ export class UsersService {
|
|||||||
return await this.dataSource.transaction(async (manager) => {
|
return await this.dataSource.transaction(async (manager) => {
|
||||||
const user = await this.lockUser(manager, id);
|
const user = await this.lockUser(manager, id);
|
||||||
const before = await this.loadUserView(manager, id);
|
const before = await this.loadUserView(manager, id);
|
||||||
if (dto.email !== undefined && !dto.email && before.roles.some((role) => role.code === 'inspector')) {
|
|
||||||
throw inspectorEmailRequired();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dto.username !== undefined) {
|
if (dto.username !== undefined) {
|
||||||
user.username = dto.username.trim().toLowerCase();
|
user.username = dto.username.trim().toLowerCase();
|
||||||
@@ -278,10 +247,6 @@ export class UsersService {
|
|||||||
if (dto.email !== undefined) {
|
if (dto.email !== undefined) {
|
||||||
user.email = dto.email?.trim().toLowerCase() || null;
|
user.email = dto.email?.trim().toLowerCase() || null;
|
||||||
}
|
}
|
||||||
if (dto.dni !== undefined) user.dni = dto.dni ?? null;
|
|
||||||
if (dto.phone !== undefined) user.phone = dto.phone ?? null;
|
|
||||||
if (dto.jobTitle !== undefined) user.jobTitle = dto.jobTitle ?? null;
|
|
||||||
if (dto.employeeNumber !== undefined) user.employeeNumber = dto.employeeNumber ?? null;
|
|
||||||
if (dto.firstName !== undefined) user.firstName = dto.firstName.trim();
|
if (dto.firstName !== undefined) user.firstName = dto.firstName.trim();
|
||||||
if (dto.lastName !== undefined) user.lastName = dto.lastName.trim();
|
if (dto.lastName !== undefined) user.lastName = dto.lastName.trim();
|
||||||
user.updatedBy = principal.userId;
|
user.updatedBy = principal.userId;
|
||||||
@@ -414,7 +379,6 @@ export class UsersService {
|
|||||||
await this.lockUser(manager, id);
|
await this.lockUser(manager, id);
|
||||||
const roles = await this.resolveRoles(manager, dto.roleIds);
|
const roles = await this.resolveRoles(manager, dto.roleIds);
|
||||||
const before = await this.loadUserView(manager, id);
|
const before = await this.loadUserView(manager, id);
|
||||||
this.assertInspectorHasEmail(roles, before.email);
|
|
||||||
const beforeIds = before.roles.map((role) => role.id).sort();
|
const beforeIds = before.roles.map((role) => role.id).sort();
|
||||||
const afterIds = roles.map((role) => role.id).sort();
|
const afterIds = roles.map((role) => role.id).sort();
|
||||||
if (beforeIds.join(',') === afterIds.join(',')) return before;
|
if (beforeIds.join(',') === afterIds.join(',')) return before;
|
||||||
@@ -453,12 +417,6 @@ export class UsersService {
|
|||||||
return roles;
|
return roles;
|
||||||
}
|
}
|
||||||
|
|
||||||
private assertInspectorHasEmail(roles: Role[], email: string | null | undefined): void {
|
|
||||||
if (roles.some((role) => role.code === 'inspector') && !email?.trim()) {
|
|
||||||
throw inspectorEmailRequired();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async insertUserRoles(
|
private async insertUserRoles(
|
||||||
manager: EntityManager,
|
manager: EntityManager,
|
||||||
userId: string,
|
userId: string,
|
||||||
@@ -497,10 +455,6 @@ export class UsersService {
|
|||||||
user_account.id,
|
user_account.id,
|
||||||
user_account.username,
|
user_account.username,
|
||||||
user_account.email,
|
user_account.email,
|
||||||
user_account.dni,
|
|
||||||
user_account.phone,
|
|
||||||
user_account.job_title AS "jobTitle",
|
|
||||||
user_account.employee_number AS "employeeNumber",
|
|
||||||
user_account.first_name AS "firstName",
|
user_account.first_name AS "firstName",
|
||||||
user_account.last_name AS "lastName",
|
user_account.last_name AS "lastName",
|
||||||
user_account.status,
|
user_account.status,
|
||||||
@@ -537,7 +491,7 @@ export class UsersService {
|
|||||||
private userConflict(): ConflictException {
|
private userConflict(): ConflictException {
|
||||||
return new ConflictException({
|
return new ConflictException({
|
||||||
code: 'USER_ALREADY_EXISTS',
|
code: 'USER_ALREADY_EXISTS',
|
||||||
message: 'El usuario, email o DNI ya está registrado',
|
message: 'El usuario o email ya está registrado',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ import { HealthController } from './health.controller';
|
|||||||
import { HealthService } from './health.service';
|
import { HealthService } from './health.service';
|
||||||
import { DashboardModule } from './dashboard/dashboard.module';
|
import { DashboardModule } from './dashboard/dashboard.module';
|
||||||
import { AssetMasterModule } from './asset-master/asset-master.module';
|
import { AssetMasterModule } from './asset-master/asset-master.module';
|
||||||
|
import { SurveyPlanningModule } from './survey-planning/survey-planning.module';
|
||||||
|
import { SurveyExecutionModule } from './survey-execution/survey-execution.module';
|
||||||
import { InspectionVisitsModule } from './inspection-visits/inspection-visits.module';
|
import { InspectionVisitsModule } from './inspection-visits/inspection-visits.module';
|
||||||
import { InspectionActsModule } from './inspection-acts/inspection-acts.module';
|
import { InspectionActsModule } from './inspection-acts/inspection-acts.module';
|
||||||
import { InspectionFindingsModule } from './inspection-findings/inspection-findings.module';
|
import { InspectionFindingsModule } from './inspection-findings/inspection-findings.module';
|
||||||
@@ -67,6 +69,8 @@ function required(config: ConfigService, key: string): string {
|
|||||||
AdministrationModule,
|
AdministrationModule,
|
||||||
DashboardModule,
|
DashboardModule,
|
||||||
AssetMasterModule,
|
AssetMasterModule,
|
||||||
|
SurveyPlanningModule,
|
||||||
|
SurveyExecutionModule,
|
||||||
InspectionVisitsModule,
|
InspectionVisitsModule,
|
||||||
InspectionActsModule,
|
InspectionActsModule,
|
||||||
InspectionFindingsModule,
|
InspectionFindingsModule,
|
||||||
|
|||||||
@@ -1,407 +0,0 @@
|
|||||||
import { Injectable, Logger, NotFoundException } from '@nestjs/common';
|
|
||||||
import { DataSource } from 'typeorm';
|
|
||||||
|
|
||||||
type DossierRecord = Record<string, any>;
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class ActivityDossierService {
|
|
||||||
private readonly logger = new Logger(ActivityDossierService.name);
|
|
||||||
|
|
||||||
constructor(private readonly dataSource: DataSource) {}
|
|
||||||
|
|
||||||
async dossier(id: string): Promise<Record<string, unknown>> {
|
|
||||||
const assetRows = (await this.dataSource.query(
|
|
||||||
`SELECT id, code, name, common_name AS "commonName", created_at AS "createdAt"
|
|
||||||
FROM assets
|
|
||||||
WHERE id = $1`,
|
|
||||||
[id],
|
|
||||||
)) as Array<{ id: string; code: string; name: string; commonName: string | null; createdAt: Date }>;
|
|
||||||
const asset = assetRows[0];
|
|
||||||
if (!asset) {
|
|
||||||
throw new NotFoundException({
|
|
||||||
code: 'ASSET_NOT_FOUND',
|
|
||||||
message: 'Activo no encontrado',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const failedFacets: string[] = [];
|
|
||||||
const safeQuery = async (facet: string, sql: string): Promise<DossierRecord[]> => {
|
|
||||||
try {
|
|
||||||
return (await this.dataSource.query(sql, [id])) as DossierRecord[];
|
|
||||||
} catch (error) {
|
|
||||||
failedFacets.push(facet);
|
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
|
||||||
this.logger.error(`No se pudo cargar la faceta ${facet} del expediente ${id}: ${message}`);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const [
|
|
||||||
visits,
|
|
||||||
acts,
|
|
||||||
findings,
|
|
||||||
evidence,
|
|
||||||
communications,
|
|
||||||
verificationResults,
|
|
||||||
documents,
|
|
||||||
inspectionReports,
|
|
||||||
media,
|
|
||||||
versions,
|
|
||||||
] = await Promise.all([
|
|
||||||
safeQuery('visits', `
|
|
||||||
SELECT visit.id, visit.code, visit.status,
|
|
||||||
visit.planned_start_at AS "plannedStartAt",
|
|
||||||
visit.actual_started_at AS "actualStartedAt",
|
|
||||||
visit.actual_closed_at AS "actualClosedAt",
|
|
||||||
visit.created_at AS "createdAt"
|
|
||||||
FROM inspection_visits visit
|
|
||||||
WHERE visit.scope_asset_id = $1
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_visit_assets visit_asset
|
|
||||||
WHERE visit_asset.visit_id = visit.id
|
|
||||||
AND visit_asset.asset_id = $1
|
|
||||||
AND visit_asset.included = true
|
|
||||||
)
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_acts act
|
|
||||||
JOIN inspection_act_assets act_asset
|
|
||||||
ON act_asset.act_id = act.id AND act_asset.included = true
|
|
||||||
WHERE act.visit_id = visit.id
|
|
||||||
AND act_asset.asset_id = $1
|
|
||||||
)
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_acts act
|
|
||||||
JOIN inspection_findings finding ON finding.act_id = act.id
|
|
||||||
WHERE act.visit_id = visit.id
|
|
||||||
AND finding.asset_id = $1
|
|
||||||
)
|
|
||||||
ORDER BY COALESCE(visit.actual_started_at, visit.planned_start_at, visit.created_at) DESC
|
|
||||||
LIMIT 200
|
|
||||||
`),
|
|
||||||
safeQuery('acts', `
|
|
||||||
SELECT 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"
|
|
||||||
FROM inspection_acts act
|
|
||||||
JOIN inspection_visits visit ON visit.id = act.visit_id
|
|
||||||
WHERE EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_act_assets act_asset
|
|
||||||
WHERE act_asset.act_id = act.id
|
|
||||||
AND act_asset.asset_id = $1
|
|
||||||
AND act_asset.included = true
|
|
||||||
)
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_findings finding
|
|
||||||
WHERE finding.act_id = act.id
|
|
||||||
AND finding.asset_id = $1
|
|
||||||
)
|
|
||||||
ORDER BY act.occurred_at DESC
|
|
||||||
LIMIT 200
|
|
||||||
`),
|
|
||||||
safeQuery('findings', `
|
|
||||||
SELECT finding.id, finding.act_id AS "actId", finding.code, finding.status,
|
|
||||||
finding.title, finding.description,
|
|
||||||
finding.correction_due_on AS "correctionDueOn",
|
|
||||||
finding.company_response_received_on AS "companyResponseReceivedOn",
|
|
||||||
finding.next_control_on AS "nextControlOn",
|
|
||||||
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"
|
|
||||||
FROM inspection_findings finding
|
|
||||||
JOIN inspection_acts act ON act.id = finding.act_id
|
|
||||||
JOIN inspection_visits visit ON visit.id = act.visit_id
|
|
||||||
WHERE finding.asset_id = $1
|
|
||||||
ORDER BY finding.created_at DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('evidence', `
|
|
||||||
SELECT evidence.id, evidence.finding_id AS "findingId", evidence.communication_id AS "communicationId",
|
|
||||||
evidence.kind, evidence.purpose, evidence.original_name AS "originalName",
|
|
||||||
evidence.title, evidence.description, evidence.captured_at AS "capturedAt",
|
|
||||||
evidence.created_at AS "createdAt", finding.code AS "findingCode",
|
|
||||||
finding.title AS "findingTitle"
|
|
||||||
FROM inspection_finding_evidence evidence
|
|
||||||
JOIN inspection_findings finding ON finding.id = evidence.finding_id
|
|
||||||
WHERE finding.asset_id = $1
|
|
||||||
ORDER BY COALESCE(evidence.captured_at, evidence.created_at) DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('communications', `
|
|
||||||
SELECT communication.id, communication.finding_id AS "findingId",
|
|
||||||
communication.direction, communication.channel, communication.type,
|
|
||||||
communication.occurred_at AS "occurredAt", communication.subject,
|
|
||||||
communication.details, communication.contact_name AS "contactName",
|
|
||||||
communication.created_at AS "createdAt", finding.code AS "findingCode",
|
|
||||||
finding.title AS "findingTitle"
|
|
||||||
FROM inspection_finding_communications communication
|
|
||||||
JOIN inspection_findings finding ON finding.id = communication.finding_id
|
|
||||||
WHERE finding.asset_id = $1
|
|
||||||
ORDER BY communication.occurred_at DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('verificationResults', `
|
|
||||||
SELECT verification_link.id,
|
|
||||||
verification_link.finding_id AS "findingId",
|
|
||||||
verification_link.visit_id AS "visitId",
|
|
||||||
verification_link.target_control_on AS "targetControlOn",
|
|
||||||
verification_link.outcome,
|
|
||||||
verification_link.result_notes AS "resultNotes",
|
|
||||||
verification_link.verified_at AS "verifiedAt",
|
|
||||||
verification_link.result_recorded_at AS "resultRecordedAt",
|
|
||||||
verification_link.rescheduled_control_on AS "rescheduledControlOn",
|
|
||||||
finding.code AS "findingCode", finding.title AS "findingTitle",
|
|
||||||
visit.code AS "visitCode", visit.status AS "visitStatus",
|
|
||||||
(SELECT COUNT(*)::integer
|
|
||||||
FROM inspection_finding_evidence verification_evidence
|
|
||||||
WHERE verification_evidence.finding_id = finding.id
|
|
||||||
AND verification_evidence.verification_visit_id = visit.id
|
|
||||||
AND verification_evidence.purpose = 'VERIFICATION') AS "evidenceCount"
|
|
||||||
FROM inspection_finding_verification_visits verification_link
|
|
||||||
JOIN inspection_findings finding ON finding.id = verification_link.finding_id
|
|
||||||
JOIN inspection_visits visit ON visit.id = verification_link.visit_id
|
|
||||||
WHERE finding.asset_id = $1 AND verification_link.outcome IS NOT NULL
|
|
||||||
ORDER BY verification_link.verified_at DESC NULLS LAST, verification_link.result_recorded_at DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('documents', `
|
|
||||||
SELECT document.id, document.document_type AS "documentType",
|
|
||||||
document.document_number AS "documentNumber", document.title,
|
|
||||||
document.issuer, document.document_date AS "documentDate",
|
|
||||||
document.external_reference AS "externalReference",
|
|
||||||
link.relation_type AS "relationType", link.notes,
|
|
||||||
link.created_at AS "linkedAt"
|
|
||||||
FROM asset_source_documents link
|
|
||||||
JOIN source_documents document ON document.id = link.document_id
|
|
||||||
WHERE link.asset_id = $1
|
|
||||||
ORDER BY COALESCE(document.document_date::timestamptz, link.created_at) DESC
|
|
||||||
LIMIT 300
|
|
||||||
`),
|
|
||||||
safeQuery('inspectionReports', `
|
|
||||||
SELECT report.id, report.code, report.status,
|
|
||||||
report.pdf_status AS "pdfStatus", report.title,
|
|
||||||
report.generated_at AS "generatedAt", report.frozen_sha256 AS "frozenSha256",
|
|
||||||
act.id AS "actId", act.code AS "actCode",
|
|
||||||
visit.id AS "visitId", visit.code AS "visitCode"
|
|
||||||
FROM inspection_reports report
|
|
||||||
JOIN inspection_acts act ON act.id = report.act_id
|
|
||||||
JOIN inspection_visits visit ON visit.id = report.visit_id
|
|
||||||
WHERE visit.scope_asset_id = $1
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_act_assets act_asset
|
|
||||||
WHERE act_asset.act_id = act.id
|
|
||||||
AND act_asset.asset_id = $1
|
|
||||||
AND act_asset.included = true
|
|
||||||
)
|
|
||||||
OR EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM inspection_findings finding
|
|
||||||
WHERE finding.act_id = act.id
|
|
||||||
AND finding.asset_id = $1
|
|
||||||
)
|
|
||||||
ORDER BY report.generated_at DESC
|
|
||||||
LIMIT 200
|
|
||||||
`),
|
|
||||||
safeQuery('media', `
|
|
||||||
SELECT media.id, media.kind, media.original_name AS "originalName",
|
|
||||||
media.title, media.description, media.captured_at AS "capturedAt",
|
|
||||||
media.created_at AS "createdAt", media.source
|
|
||||||
FROM asset_media media
|
|
||||||
WHERE media.asset_id = $1 AND media.deleted_at IS NULL
|
|
||||||
ORDER BY COALESCE(media.captured_at, media.created_at) DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
safeQuery('versions', `
|
|
||||||
SELECT version.id, version.version_number AS "versionNumber",
|
|
||||||
version.change_type AS "changeType", version.changed_fields AS "changedFields",
|
|
||||||
version.occurred_at AS "occurredAt", version.actor_username AS "actorUsername",
|
|
||||||
version.source
|
|
||||||
FROM asset_versions version
|
|
||||||
WHERE version.asset_id = $1
|
|
||||||
ORDER BY version.occurred_at DESC
|
|
||||||
LIMIT 500
|
|
||||||
`),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const timeline: DossierRecord[] = [];
|
|
||||||
const push = (event: DossierRecord) => timeline.push(event);
|
|
||||||
|
|
||||||
versions.forEach((version) => push({
|
|
||||||
id: `version:${String(version.id)}`,
|
|
||||||
kind: 'INVENTORY_CHANGE',
|
|
||||||
occurredAt: version.occurredAt,
|
|
||||||
title: version.changeType === 'CREATED' || version.changeType === 'BASELINE'
|
|
||||||
? 'Registro incorporado al inventario'
|
|
||||||
: 'Inventario actualizado',
|
|
||||||
description: Array.isArray(version.changedFields) && version.changedFields.length > 0
|
|
||||||
? `Campos: ${(version.changedFields as string[]).join(', ')}`
|
|
||||||
: null,
|
|
||||||
meta: {
|
|
||||||
versionNumber: version.versionNumber,
|
|
||||||
changeType: version.changeType,
|
|
||||||
actorUsername: version.actorUsername,
|
|
||||||
source: version.source,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
visits.forEach((visit) => push({
|
|
||||||
id: `visit:${String(visit.id)}`,
|
|
||||||
kind: 'INSPECTION',
|
|
||||||
occurredAt: visit.actualStartedAt ?? visit.plannedStartAt ?? visit.createdAt,
|
|
||||||
title: `Inspección ${String(visit.code)}`,
|
|
||||||
description: null,
|
|
||||||
href: `/inspecciones/${String(visit.id)}`,
|
|
||||||
meta: { status: visit.status },
|
|
||||||
}));
|
|
||||||
acts.forEach((act) => push({
|
|
||||||
id: `act:${String(act.id)}`,
|
|
||||||
kind: 'ACT',
|
|
||||||
occurredAt: act.occurredAt,
|
|
||||||
title: `Acta ${String(act.code)}`,
|
|
||||||
description: act.title,
|
|
||||||
href: `/inspecciones/actas/${String(act.id)}`,
|
|
||||||
meta: { status: act.status, visitCode: act.visitCode },
|
|
||||||
}));
|
|
||||||
findings.forEach((finding) => {
|
|
||||||
push({
|
|
||||||
id: `finding:${String(finding.id)}`,
|
|
||||||
kind: 'FINDING',
|
|
||||||
occurredAt: finding.createdAt,
|
|
||||||
title: `Hallazgo ${String(finding.code)}`,
|
|
||||||
description: finding.title,
|
|
||||||
href: `/hallazgos/${String(finding.id)}`,
|
|
||||||
meta: { status: finding.status, actCode: finding.actCode },
|
|
||||||
});
|
|
||||||
if (finding.closedAt) {
|
|
||||||
push({
|
|
||||||
id: `finding-close:${String(finding.id)}`,
|
|
||||||
kind: 'FINDING_CLOSED',
|
|
||||||
occurredAt: finding.closedAt,
|
|
||||||
title: `Hallazgo ${String(finding.code)} cerrado`,
|
|
||||||
description: finding.closureNotes,
|
|
||||||
href: `/hallazgos/${String(finding.id)}`,
|
|
||||||
meta: { status: finding.status },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
verificationResults.forEach((verification) => push({
|
|
||||||
id: `verification:${String(verification.id)}`,
|
|
||||||
kind: 'VERIFICATION',
|
|
||||||
occurredAt: verification.verifiedAt ?? verification.resultRecordedAt,
|
|
||||||
title: verification.outcome === 'RESOLVED'
|
|
||||||
? `Verificación conforme · ${String(verification.findingCode)}`
|
|
||||||
: verification.outcome === 'NOT_RESOLVED'
|
|
||||||
? `Verificación no conforme · ${String(verification.findingCode)}`
|
|
||||||
: `Verificación reprogramada · ${String(verification.findingCode)}`,
|
|
||||||
description: verification.resultNotes,
|
|
||||||
href: `/hallazgos/${String(verification.findingId)}`,
|
|
||||||
meta: {
|
|
||||||
outcome: verification.outcome,
|
|
||||||
visitCode: verification.visitCode,
|
|
||||||
targetControlOn: verification.targetControlOn,
|
|
||||||
rescheduledControlOn: verification.rescheduledControlOn,
|
|
||||||
evidenceCount: verification.evidenceCount,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
communications.forEach((communication) => push({
|
|
||||||
id: `communication:${String(communication.id)}`,
|
|
||||||
kind: 'COMMUNICATION',
|
|
||||||
occurredAt: communication.occurredAt,
|
|
||||||
title: communication.type === 'COMPANY_RESPONSE'
|
|
||||||
? 'Respuesta de la empresa'
|
|
||||||
: String(communication.subject),
|
|
||||||
description: communication.details,
|
|
||||||
href: `/hallazgos/${String(communication.findingId)}`,
|
|
||||||
meta: {
|
|
||||||
findingCode: communication.findingCode,
|
|
||||||
direction: communication.direction,
|
|
||||||
channel: communication.channel,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
evidence.forEach((item) => push({
|
|
||||||
id: `evidence:${String(item.id)}`,
|
|
||||||
kind: item.kind === 'PHOTO' ? 'PHOTO' : 'DOCUMENT',
|
|
||||||
occurredAt: item.capturedAt ?? item.createdAt,
|
|
||||||
title: item.kind === 'PHOTO' ? 'Fotografía / evidencia' : 'Documento incorporado',
|
|
||||||
description: item.title ?? item.originalName,
|
|
||||||
href: `/hallazgos/${String(item.findingId)}`,
|
|
||||||
meta: { findingCode: item.findingCode, purpose: item.purpose },
|
|
||||||
}));
|
|
||||||
inspectionReports.forEach((report) => push({
|
|
||||||
id: `inspection-report:${String(report.id)}`,
|
|
||||||
kind: 'REPORT',
|
|
||||||
occurredAt: report.generatedAt,
|
|
||||||
title: `Informe ${String(report.code)}`,
|
|
||||||
description: report.title,
|
|
||||||
href: `/informes/${String(report.id)}`,
|
|
||||||
meta: { status: report.status, pdfStatus: report.pdfStatus, actCode: report.actCode },
|
|
||||||
}));
|
|
||||||
documents.forEach((document) => push({
|
|
||||||
id: `source-document:${String(document.id)}`,
|
|
||||||
kind: document.documentType === 'TECHNICAL_REPORT' ? 'REPORT' : 'SOURCE_DOCUMENT',
|
|
||||||
occurredAt: document.documentDate ?? document.linkedAt,
|
|
||||||
title: String(document.title),
|
|
||||||
description: document.documentNumber
|
|
||||||
? `Documento ${String(document.documentNumber)}`
|
|
||||||
: 'Documento vinculado al inventario',
|
|
||||||
meta: { documentType: document.documentType, relationType: document.relationType },
|
|
||||||
}));
|
|
||||||
media.forEach((item) => push({
|
|
||||||
id: `asset-media:${String(item.id)}`,
|
|
||||||
kind: item.kind === 'PHOTO' ? 'PHOTO' : 'DOCUMENT',
|
|
||||||
occurredAt: item.capturedAt ?? item.createdAt,
|
|
||||||
title: item.kind === 'PHOTO' ? 'Fotografía del inventario' : 'Archivo del inventario',
|
|
||||||
description: item.title ?? item.originalName,
|
|
||||||
meta: { source: item.source },
|
|
||||||
}));
|
|
||||||
|
|
||||||
timeline.sort(
|
|
||||||
(a, b) => new Date(String(b.occurredAt ?? 0)).getTime() - new Date(String(a.occurredAt ?? 0)).getTime(),
|
|
||||||
);
|
|
||||||
|
|
||||||
const openFindings = findings.filter((finding) => finding.status === 'OPEN').length;
|
|
||||||
const closedFindings = findings.filter((finding) => finding.status === 'CLOSED').length;
|
|
||||||
const reports = documents.filter((document) => document.documentType === 'TECHNICAL_REPORT');
|
|
||||||
|
|
||||||
return {
|
|
||||||
asset: {
|
|
||||||
id: asset.id,
|
|
||||||
code: asset.code,
|
|
||||||
name: asset.name,
|
|
||||||
commonName: asset.commonName,
|
|
||||||
},
|
|
||||||
counters: {
|
|
||||||
inspections: visits.length,
|
|
||||||
acts: acts.length,
|
|
||||||
findings: findings.length,
|
|
||||||
verifications: verificationResults.length,
|
|
||||||
openFindings,
|
|
||||||
closedFindings,
|
|
||||||
evidence: evidence.length,
|
|
||||||
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,
|
|
||||||
},
|
|
||||||
visits,
|
|
||||||
acts,
|
|
||||||
findings,
|
|
||||||
evidence,
|
|
||||||
communications,
|
|
||||||
verificationResults,
|
|
||||||
documents,
|
|
||||||
inspectionReports,
|
|
||||||
reports,
|
|
||||||
media,
|
|
||||||
versions,
|
|
||||||
timeline: timeline.slice(0, 500),
|
|
||||||
warnings: failedFacets,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -41,14 +41,14 @@ export interface AssetVersionDetail extends AssetVersionSummary {
|
|||||||
function assetNotFound(): NotFoundException {
|
function assetNotFound(): NotFoundException {
|
||||||
return new NotFoundException({
|
return new NotFoundException({
|
||||||
code: 'ASSET_NOT_FOUND',
|
code: 'ASSET_NOT_FOUND',
|
||||||
message: 'Inventario no encontrado',
|
message: 'Activo no encontrado',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function versionNotFound(): NotFoundException {
|
function versionNotFound(): NotFoundException {
|
||||||
return new NotFoundException({
|
return new NotFoundException({
|
||||||
code: 'ASSET_VERSION_NOT_FOUND',
|
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);
|
const versionNumber = Number(versionRow.current_version);
|
||||||
if (!Number.isInteger(versionNumber) || versionNumber < 1) {
|
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);
|
const snapshot = await this.loadCurrentSnapshot(manager, assetId);
|
||||||
@@ -101,8 +101,17 @@ export class AssetHistoryService {
|
|||||||
asset_id, version_number, change_type, changed_fields, snapshot,
|
asset_id, version_number, change_type, changed_fields, snapshot,
|
||||||
actor_user_id, actor_username, source, request_id
|
actor_user_id, actor_username, source, request_id
|
||||||
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
|
) 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;
|
return versionNumber;
|
||||||
}
|
}
|
||||||
@@ -114,21 +123,38 @@ export class AssetHistoryService {
|
|||||||
parameters.push(value);
|
parameters.push(value);
|
||||||
return `$${parameters.length}`;
|
return `$${parameters.length}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
if (query.search?.trim()) {
|
if (query.search?.trim()) {
|
||||||
const search = add(`%${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.from) conditions.push(`version.occurred_at >= ${add(new Date(query.from))}`);
|
||||||
if (query.to) conditions.push(`version.occurred_at <= ${add(new Date(query.to))}`);
|
if (query.to) conditions.push(`version.occurred_at <= ${add(new Date(query.to))}`);
|
||||||
|
|
||||||
return this.listWithConditions(query.page, query.pageSize, conditions, parameters);
|
return this.listWithConditions(query.page, query.pageSize, conditions, parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
async listForAsset(assetId: string, query: AssetVersionPageQueryDto) {
|
async listForAsset(assetId: string, query: AssetVersionPageQueryDto) {
|
||||||
await this.requireAsset(assetId);
|
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> {
|
async getVersion(assetId: string, versionNumber: number): Promise<AssetVersionDetail> {
|
||||||
@@ -144,9 +170,17 @@ export class AssetHistoryService {
|
|||||||
return row;
|
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 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 total = Number(countRow?.total ?? 0);
|
||||||
const paginated = [...parameters, pageSize, (page - 1) * pageSize];
|
const paginated = [...parameters, pageSize, (page - 1) * pageSize];
|
||||||
const limit = `$${parameters.length + 1}`;
|
const limit = `$${parameters.length + 1}`;
|
||||||
@@ -160,29 +194,51 @@ export class AssetHistoryService {
|
|||||||
LIMIT ${limit} OFFSET ${offset}`,
|
LIMIT ${limit} OFFSET ${offset}`,
|
||||||
paginated,
|
paginated,
|
||||||
)) as AssetVersionSummary[];
|
)) 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 {
|
private selectSummary(): string {
|
||||||
return `SELECT
|
return `SELECT
|
||||||
version.id, version.asset_id AS "assetId",
|
version.id,
|
||||||
version.snapshot->>'code' AS "assetCode", version.snapshot->>'name' AS "assetName",
|
version.asset_id AS "assetId",
|
||||||
version.snapshot #>> '{type,id}' AS "typeId", version.snapshot #>> '{type,name}' AS "typeName",
|
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->>'informationStatus' AS "informationStatus",
|
||||||
version.snapshot->>'operationalStatus' AS "operationalStatus",
|
version.snapshot->>'operationalStatus' AS "operationalStatus",
|
||||||
version.version_number AS "versionNumber", version.change_type AS "changeType",
|
version.version_number AS "versionNumber",
|
||||||
version.changed_fields AS "changedFields", version.occurred_at AS "occurredAt",
|
version.change_type AS "changeType",
|
||||||
version.actor_user_id AS "actorUserId", version.actor_username AS "actorUsername",
|
version.changed_fields AS "changedFields",
|
||||||
version.source, version.request_id AS "requestId",
|
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"`;
|
(version.version_number = current_asset.current_version) AS "isCurrent"`;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async requireAsset(assetId: string): Promise<void> {
|
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();
|
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(
|
const [row] = (await manager.query(
|
||||||
`SELECT JSONB_BUILD_OBJECT(
|
`SELECT JSONB_BUILD_OBJECT(
|
||||||
'id', asset.id,
|
'id', asset.id,
|
||||||
@@ -190,49 +246,82 @@ export class AssetHistoryService {
|
|||||||
'name', asset.name,
|
'name', asset.name,
|
||||||
'commonName', asset.common_name,
|
'commonName', asset.common_name,
|
||||||
'description', asset.description,
|
'description', asset.description,
|
||||||
'type', JSONB_BUILD_OBJECT('id', asset_type.id,'code', asset_type.code,'name', asset_type.name,'operationalRole', asset_type.operational_role),
|
'type', JSONB_BUILD_OBJECT(
|
||||||
'parent', CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id', parent.id,'code', parent.code,'name', parent.name) END,
|
'id', asset_type.id,
|
||||||
'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,
|
'code', asset_type.code,
|
||||||
'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,
|
'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,
|
'informationStatus', asset.information_status,
|
||||||
'operationalStatus', asset.operational_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((
|
'attributes', COALESCE((
|
||||||
SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
|
SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
|
||||||
'definitionId', definition.id,'code', definition.code,'name', definition.name,
|
'definitionId', definition.id,
|
||||||
'dataType', definition.data_type,'isRequired', definition.is_required,
|
'code', definition.code,
|
||||||
'unit', definition.unit,'options', definition.options,'sortOrder', definition.sort_order,'value', value.value
|
'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)
|
) ORDER BY definition.sort_order, definition.name)
|
||||||
FROM asset_attribute_definitions definition
|
FROM asset_attribute_definitions definition
|
||||||
LEFT JOIN asset_attribute_values value ON value.definition_id = definition.id AND value.asset_id = asset.id
|
LEFT JOIN asset_attribute_values value
|
||||||
WHERE definition.asset_type_id = asset.asset_type_id AND definition.is_active = true
|
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),
|
), '[]'::jsonb),
|
||||||
'geometry', CASE WHEN geometry.asset_id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
|
'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,
|
'assetId', geometry.asset_id,
|
||||||
'source', geometry.source,'accuracyM', geometry.accuracy_m::double precision,'capturedAt', geometry.captured_at,
|
'geometry', ST_AsGeoJSON(geometry.geometry)::jsonb,
|
||||||
'deviceLabel', geometry.device_label,'createdAt', geometry.created_at,'updatedAt', geometry.updated_at,'updatedBy', geometry.updated_by
|
'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,
|
) END,
|
||||||
'media', COALESCE((
|
'media', COALESCE((
|
||||||
SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
|
SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
|
||||||
'id', media.id,'kind', media.kind,'originalName', media.original_name,'mimeType', media.mime_type,
|
'id', media.id,
|
||||||
'sizeBytes', media.size_bytes,'sha256', media.sha256,'title', media.title,'description', media.description,
|
'kind', media.kind,
|
||||||
'capturedAt', media.captured_at,'latitude', media.latitude,'longitude', media.longitude,'accuracyM', media.accuracy_m,
|
'originalName', media.original_name,
|
||||||
'source', media.source,'uploadedBy', media.uploaded_by,'createdAt', media.created_at,'updatedAt', media.updated_at
|
'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)
|
) 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),
|
), '[]'::jsonb),
|
||||||
'organizationProfile', (SELECT TO_JSONB(profile) - 'created_at' - 'updated_at' FROM organization_profiles profile WHERE profile.asset_id=asset.id),
|
'organizationProfile', (SELECT TO_JSONB(profile) - 'created_at' - 'updated_at' FROM organization_profiles profile WHERE profile.asset_id=asset.id),
|
||||||
'organizationMemberships', COALESCE((
|
'organizationMemberships', COALESCE((
|
||||||
@@ -248,8 +337,22 @@ export class AssetHistoryService {
|
|||||||
'legalRights', COALESCE((
|
'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
|
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),
|
),'[]'::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),
|
'provenance', JSONB_BUILD_OBJECT(
|
||||||
'createdAt', asset.created_at,'updatedAt', asset.updated_at,'createdBy', asset.created_by,'updatedBy', asset.updated_by,'currentVersion', asset.current_version
|
'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
|
) AS snapshot
|
||||||
FROM assets asset
|
FROM assets asset
|
||||||
INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
|
INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
|
||||||
|
|||||||
@@ -22,32 +22,12 @@ import { AssetOperationalRelationsService } from './asset-operational-relations.
|
|||||||
import { AssetRegistryController } from './asset-registry.controller';
|
import { AssetRegistryController } from './asset-registry.controller';
|
||||||
import { AssetRegistryService } from './asset-registry.service';
|
import { AssetRegistryService } from './asset-registry.service';
|
||||||
import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.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 { ActivityDossierService } from './activity-dossier.service';
|
|
||||||
import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
|
|
||||||
import { InventoryBrowserController } from './inventory-browser.controller';
|
|
||||||
import { InventoryBrowserService } from './inventory-browser.service';
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [AuditModule],
|
imports: [AuditModule],
|
||||||
controllers: [
|
controllers: [
|
||||||
AssetTypesController,
|
AssetTypesController,
|
||||||
AssetsController,
|
AssetsController,
|
||||||
InventoryStructureController,
|
|
||||||
InventoryFamilyCatalogController,
|
|
||||||
InventoryTechnicalValuesController,
|
|
||||||
InventoryBrowserController,
|
|
||||||
InventoryMergeController,
|
|
||||||
FieldInventoryMergeController,
|
|
||||||
AssetGeometriesController,
|
AssetGeometriesController,
|
||||||
MapAssetsController,
|
MapAssetsController,
|
||||||
AssetHistoryController,
|
AssetHistoryController,
|
||||||
@@ -60,15 +40,6 @@ import { InventoryBrowserService } from './inventory-browser.service';
|
|||||||
providers: [
|
providers: [
|
||||||
AssetTypesService,
|
AssetTypesService,
|
||||||
AssetsService,
|
AssetsService,
|
||||||
InventoryStructureService,
|
|
||||||
SimpleInventoryStructureService,
|
|
||||||
InventoryFamilyCatalogService,
|
|
||||||
InventoryTechnicalValuesService,
|
|
||||||
InventoryFunctionService,
|
|
||||||
InventoryBrowserService,
|
|
||||||
InventoryMergeService,
|
|
||||||
ActivityDossierService,
|
|
||||||
MergedInventoryDossierService,
|
|
||||||
AssetGeometriesService,
|
AssetGeometriesService,
|
||||||
AssetHistoryService,
|
AssetHistoryService,
|
||||||
AssetMediaService,
|
AssetMediaService,
|
||||||
@@ -78,14 +49,6 @@ import { InventoryBrowserService } from './inventory-browser.service';
|
|||||||
AssetRegistryService,
|
AssetRegistryService,
|
||||||
FieldDiscoveryInspectionLinkService,
|
FieldDiscoveryInspectionLinkService,
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [AssetHistoryService],
|
||||||
AssetHistoryService,
|
|
||||||
AssetsService,
|
|
||||||
InventoryMergeService,
|
|
||||||
MergedInventoryDossierService,
|
|
||||||
AssetGeometriesService,
|
|
||||||
AssetMediaService,
|
|
||||||
FieldDiscoveryInspectionLinkService,
|
|
||||||
],
|
|
||||||
})
|
})
|
||||||
export class AssetMasterModule {}
|
export class AssetMasterModule {}
|
||||||
|
|||||||
@@ -79,15 +79,23 @@ export class AssetOperationalRelationsService {
|
|||||||
async listCompaniesForArea(areaId: string): Promise<{ data: OperationalAssetSummary[] }> {
|
async listCompaniesForArea(areaId: string): Promise<{ data: OperationalAssetSummary[] }> {
|
||||||
await this.requireAssetRole(this.dataSource.manager, areaId, AssetTypeOperationalRole.AREA);
|
await this.requireAssetRole(this.dataSource.manager, areaId, AssetTypeOperationalRole.AREA);
|
||||||
const data = (await this.dataSource.query(`
|
const data = (await this.dataSource.query(`
|
||||||
SELECT DISTINCT company.id, company.code, company.name,
|
SELECT DISTINCT company.id, company.code, company.name, company.common_name AS "commonName", company_type.name AS "typeName"
|
||||||
company.common_name AS "commonName", company_type.name AS "typeName"
|
FROM (
|
||||||
|
SELECT relation.company_id
|
||||||
FROM area_company_relations relation
|
FROM area_company_relations relation
|
||||||
INNER JOIN assets company ON company.id = relation.company_id
|
|
||||||
INNER JOIN asset_types company_type ON company_type.id = company.asset_type_id
|
|
||||||
WHERE relation.area_id = $1
|
WHERE relation.area_id = $1
|
||||||
AND relation.relation_role = 'OPERATOR'
|
AND relation.relation_role = 'OPERATOR'
|
||||||
AND relation.valid_until IS NULL
|
AND relation.valid_until IS NULL
|
||||||
AND company.information_status <> 'INACTIVE'
|
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 company.information_status <> 'INACTIVE'
|
||||||
ORDER BY company.name, company.code
|
ORDER BY company.name, company.code
|
||||||
`, [areaId])) as OperationalAssetSummary[];
|
`, [areaId])) as OperationalAssetSummary[];
|
||||||
return { data };
|
return { data };
|
||||||
@@ -96,15 +104,23 @@ export class AssetOperationalRelationsService {
|
|||||||
async listAreasForCompany(companyId: string): Promise<{ data: OperationalAssetSummary[] }> {
|
async listAreasForCompany(companyId: string): Promise<{ data: OperationalAssetSummary[] }> {
|
||||||
await this.requireAssetRole(this.dataSource.manager, companyId, AssetTypeOperationalRole.COMPANY);
|
await this.requireAssetRole(this.dataSource.manager, companyId, AssetTypeOperationalRole.COMPANY);
|
||||||
const data = (await this.dataSource.query(`
|
const data = (await this.dataSource.query(`
|
||||||
SELECT DISTINCT area.id, area.code, area.name,
|
SELECT DISTINCT area.id, area.code, area.name, area.common_name AS "commonName", area_type.name AS "typeName"
|
||||||
area.common_name AS "commonName", area_type.name AS "typeName"
|
FROM (
|
||||||
|
SELECT relation.area_id
|
||||||
FROM area_company_relations relation
|
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
|
|
||||||
WHERE relation.company_id = $1
|
WHERE relation.company_id = $1
|
||||||
AND relation.relation_role = 'OPERATOR'
|
AND relation.relation_role = 'OPERATOR'
|
||||||
AND relation.valid_until IS NULL
|
AND relation.valid_until IS NULL
|
||||||
AND area.information_status <> 'INACTIVE'
|
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 area.information_status <> 'INACTIVE'
|
||||||
ORDER BY area.name, area.code
|
ORDER BY area.name, area.code
|
||||||
`, [companyId])) as OperationalAssetSummary[];
|
`, [companyId])) as OperationalAssetSummary[];
|
||||||
return { data };
|
return { data };
|
||||||
@@ -141,16 +157,12 @@ export class AssetOperationalRelationsService {
|
|||||||
const [document] = await manager.query('SELECT 1 FROM source_documents WHERE id=$1', [dto.sourceDocumentId]);
|
const [document] = await manager.query('SELECT 1 FROM source_documents WHERE id=$1', [dto.sourceDocumentId]);
|
||||||
if (!document) throw new BadRequestException({ code: 'SOURCE_DOCUMENT_NOT_FOUND', message: 'El documento fuente no existe' });
|
if (!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(`
|
const [row] = (await manager.query(`
|
||||||
INSERT INTO area_company_relations (
|
INSERT INTO area_company_relations (
|
||||||
area_id, company_id, relation_role, participation_percent, legal_instrument, source_document_id, start_reason, created_by
|
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)
|
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
|
||||||
RETURNING id
|
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 }>;
|
`, [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);
|
const created = await this.loadRelation(manager, row.id);
|
||||||
await this.audit.record({
|
await this.audit.record({
|
||||||
...administrationAuditContext(principal, request),
|
...administrationAuditContext(principal, request),
|
||||||
@@ -158,9 +170,6 @@ export class AssetOperationalRelationsService {
|
|||||||
entityType: 'area_company_relation',
|
entityType: 'area_company_relation',
|
||||||
entityId: row.id,
|
entityId: row.id,
|
||||||
afterData: this.auditView(created),
|
afterData: this.auditView(created),
|
||||||
metadata: dto.relationRole === AreaOrganizationRole.OPERATOR
|
|
||||||
? { inventoryHierarchyChanged:false, multipleAreaOperatorsAllowed:true }
|
|
||||||
: undefined,
|
|
||||||
}, manager);
|
}, manager);
|
||||||
return created;
|
return created;
|
||||||
});
|
});
|
||||||
@@ -189,8 +198,12 @@ export class AssetOperationalRelationsService {
|
|||||||
message: 'La relación ya se encuentra finalizada',
|
message: 'La relación ya se encuentra finalizada',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
if (before.assignedAssetCount > 0) {
|
||||||
// Ending an operator relation never moves, rewrites or blocks existing Inventory.
|
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(`
|
await manager.query(`
|
||||||
UPDATE area_company_relations
|
UPDATE area_company_relations
|
||||||
SET valid_until = CURRENT_TIMESTAMP,
|
SET valid_until = CURRENT_TIMESTAMP,
|
||||||
@@ -207,11 +220,6 @@ export class AssetOperationalRelationsService {
|
|||||||
entityId: id,
|
entityId: id,
|
||||||
beforeData: this.auditView(before),
|
beforeData: this.auditView(before),
|
||||||
afterData: this.auditView(updated),
|
afterData: this.auditView(updated),
|
||||||
metadata: {
|
|
||||||
inventoryHierarchyChanged:false,
|
|
||||||
operatorSnapshotPreserved:true,
|
|
||||||
retainedCompatibilitySnapshotCount: before.assignedAssetCount,
|
|
||||||
},
|
|
||||||
}, manager);
|
}, manager);
|
||||||
return updated;
|
return updated;
|
||||||
});
|
});
|
||||||
@@ -322,8 +330,7 @@ export class AssetOperationalRelationsService {
|
|||||||
(relation.valid_until IS NULL) AS active,
|
(relation.valid_until IS NULL) AS active,
|
||||||
CASE WHEN relation.relation_role = 'OPERATOR' THEN (SELECT COUNT(*)::integer FROM assets asset
|
CASE WHEN relation.relation_role = 'OPERATOR' THEN (SELECT COUNT(*)::integer FROM assets asset
|
||||||
WHERE asset.operational_area_id = relation.area_id
|
WHERE asset.operational_area_id = relation.area_id
|
||||||
AND asset.operator_company_id = relation.company_id
|
AND asset.operator_company_id = relation.company_id) ELSE 0 END AS "assignedAssetCount"
|
||||||
AND asset.is_inventory_instance=true) ELSE 0 END AS "assignedAssetCount"
|
|
||||||
FROM area_company_relations relation
|
FROM area_company_relations relation
|
||||||
INNER JOIN assets area ON area.id = relation.area_id
|
INNER JOIN assets area ON area.id = relation.area_id
|
||||||
INNER JOIN asset_types area_type ON area_type.id = area.asset_type_id
|
INNER JOIN asset_types area_type ON area_type.id = area.asset_type_id
|
||||||
|
|||||||
@@ -137,41 +137,21 @@ export class AssetTemporalService {
|
|||||||
if (!row) throw temporalAssetNotFound();
|
if (!row) throw temporalAssetNotFound();
|
||||||
const asOf = new Date(query.at);
|
const asOf = new Date(query.at);
|
||||||
row.asOf = asOf;
|
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(`
|
const [context] = (await this.dataSource.query(`
|
||||||
SELECT
|
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 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 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(
|
CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name) END AS "operatorCompany"
|
||||||
'id',operator_company.id,'code',operator_company.code,'name',operator_company.name
|
|
||||||
) END AS "operatorCompany"
|
|
||||||
FROM asset_context_history history
|
FROM asset_context_history history
|
||||||
LEFT JOIN assets parent ON parent.id=history.parent_id
|
LEFT JOIN assets parent ON parent.id=history.parent_id
|
||||||
LEFT JOIN assets area ON area.id=history.operational_area_id
|
LEFT JOIN assets area ON area.id=history.operational_area_id
|
||||||
LEFT JOIN LATERAL (
|
LEFT JOIN assets company ON company.id=history.operator_company_id
|
||||||
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
|
|
||||||
WHERE history.asset_id=$1
|
WHERE history.asset_id=$1
|
||||||
AND history.valid_from <= $2
|
AND history.valid_from <= $2
|
||||||
AND (history.valid_until IS NULL OR history.valid_until > $2)
|
AND (history.valid_until IS NULL OR history.valid_until > $2)
|
||||||
ORDER BY history.valid_from DESC
|
ORDER BY history.valid_from DESC
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
`, [assetId, asOf])) as Array<{
|
`, [assetId, asOf])) as Array<{ parent: Record<string, unknown> | null; operationalArea: Record<string, unknown> | null; operatorCompany: Record<string, unknown> | null }>;
|
||||||
parent: Record<string, unknown> | null;
|
|
||||||
operationalArea: Record<string, unknown> | null;
|
|
||||||
operatorCompany: Record<string, unknown> | null;
|
|
||||||
}>;
|
|
||||||
if (context && row.snapshot) {
|
if (context && row.snapshot) {
|
||||||
row.snapshot = {
|
row.snapshot = {
|
||||||
...row.snapshot,
|
...row.snapshot,
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import type {
|
|||||||
RequestWithContext,
|
RequestWithContext,
|
||||||
} from '../common/http/request-context';
|
} from '../common/http/request-context';
|
||||||
import { AssetsService } from './assets.service';
|
import { AssetsService } from './assets.service';
|
||||||
import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
|
|
||||||
import { ChangeAssetStatusDto } from './dto/change-asset-status.dto';
|
import { ChangeAssetStatusDto } from './dto/change-asset-status.dto';
|
||||||
import { ChangeAssetOperationalStatusDto } from './dto/change-asset-operational-status.dto';
|
import { ChangeAssetOperationalStatusDto } from './dto/change-asset-operational-status.dto';
|
||||||
import { CreateAssetDto } from './dto/create-asset.dto';
|
import { CreateAssetDto } from './dto/create-asset.dto';
|
||||||
@@ -32,10 +31,7 @@ import { ChangeAssetContextDto } from './dto/change-asset-context.dto';
|
|||||||
|
|
||||||
@Controller('assets')
|
@Controller('assets')
|
||||||
export class AssetsController {
|
export class AssetsController {
|
||||||
constructor(
|
constructor(private readonly assets: AssetsService) {}
|
||||||
private readonly assets: AssetsService,
|
|
||||||
private readonly mergedDossier: MergedInventoryDossierService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
@Get()
|
@Get()
|
||||||
@RequirePermissions('assets.read')
|
@RequirePermissions('assets.read')
|
||||||
@@ -135,8 +131,8 @@ export class AssetsController {
|
|||||||
'inspection_evidence.read',
|
'inspection_evidence.read',
|
||||||
'inspection_communications.read',
|
'inspection_communications.read',
|
||||||
)
|
)
|
||||||
dossier(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string): Promise<unknown> {
|
dossier(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
|
||||||
return this.mergedDossier.dossier(id);
|
return this.assets.dossier(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get(':id/context-history')
|
@Get(':id/context-history')
|
||||||
|
|||||||
@@ -298,7 +298,7 @@ export class AssetsService {
|
|||||||
|
|
||||||
const [visits, acts, findings, evidence, communications, verificationResults, documents, inspectionReports, media, versions] = await Promise.all([
|
const [visits, acts, findings, evidence, communications, verificationResults, documents, inspectionReports, media, versions] = await Promise.all([
|
||||||
this.dataSource.query(
|
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.planned_start_at AS "plannedStartAt",
|
||||||
visit.actual_started_at AS "actualStartedAt",
|
visit.actual_started_at AS "actualStartedAt",
|
||||||
visit.actual_closed_at AS "actualClosedAt",
|
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,
|
`SELECT DISTINCT act.id, act.visit_id AS "visitId", act.code, act.status,
|
||||||
act.occurred_at AS "occurredAt", act.title, act.summary,
|
act.occurred_at AS "occurredAt", act.title, act.summary,
|
||||||
act.closed_at AS "closedAt", act.current_version AS "currentVersion",
|
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
|
FROM inspection_acts act
|
||||||
JOIN inspection_visits visit ON visit.id = act.visit_id
|
JOIN inspection_visits visit ON visit.id = act.visit_id
|
||||||
LEFT JOIN inspection_act_assets act_asset
|
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.closed_at AS "closedAt", finding.closure_notes AS "closureNotes",
|
||||||
finding.created_at AS "createdAt", finding.updated_at AS "updatedAt",
|
finding.created_at AS "createdAt", finding.updated_at AS "updatedAt",
|
||||||
act.code AS "actCode", act.occurred_at AS "actOccurredAt",
|
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
|
FROM inspection_findings finding
|
||||||
JOIN inspection_acts act ON act.id = finding.act_id
|
JOIN inspection_acts act ON act.id = finding.act_id
|
||||||
JOIN inspection_visits visit ON visit.id = act.visit_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.result_recorded_at AS "resultRecordedAt",
|
||||||
verification_link.rescheduled_control_on AS "rescheduledControlOn",
|
verification_link.rescheduled_control_on AS "rescheduledControlOn",
|
||||||
finding.code AS "findingCode", finding.title AS "findingTitle",
|
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
|
(SELECT COUNT(*)::integer
|
||||||
FROM inspection_finding_evidence verification_evidence
|
FROM inspection_finding_evidence verification_evidence
|
||||||
WHERE verification_evidence.finding_id = finding.id
|
WHERE verification_evidence.finding_id = finding.id
|
||||||
@@ -484,7 +484,7 @@ export class AssetsService {
|
|||||||
kind: 'INSPECTION',
|
kind: 'INSPECTION',
|
||||||
occurredAt: visit.actualStartedAt ?? visit.plannedStartAt ?? visit.createdAt,
|
occurredAt: visit.actualStartedAt ?? visit.plannedStartAt ?? visit.createdAt,
|
||||||
title: `Inspección ${String(visit.code)}`,
|
title: `Inspección ${String(visit.code)}`,
|
||||||
description: null,
|
description: visit.title,
|
||||||
href: `/inspecciones/${String(visit.id)}`,
|
href: `/inspecciones/${String(visit.id)}`,
|
||||||
meta: { status: visit.status },
|
meta: { status: visit.status },
|
||||||
}));
|
}));
|
||||||
@@ -867,7 +867,7 @@ export class AssetsService {
|
|||||||
private fieldDiscoverySelect(): string {
|
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",
|
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',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,
|
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 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"
|
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"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Transform, Type } from 'class-transformer';
|
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 {
|
export class ChangeAssetContextDto {
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@@ -10,13 +10,8 @@ export class ChangeAssetContextDto {
|
|||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
operationalAreaId?: string | null;
|
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()
|
@IsOptional()
|
||||||
@IsEmpty({ message: 'La Operadora se administra en la relación temporal del Área, no en el Inventario' })
|
@IsUUID('4')
|
||||||
operatorCompanyId?: string | null;
|
operatorCompanyId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
|
|||||||
@@ -42,10 +42,6 @@ export class CreateAssetDto {
|
|||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID('4')
|
|
||||||
inventoryFamilyId?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
operationalAreaId?: string | null;
|
operationalAreaId?: string | null;
|
||||||
@@ -54,10 +50,6 @@ export class CreateAssetDto {
|
|||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
operatorCompanyId?: string | null;
|
operatorCompanyId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID('4')
|
|
||||||
concessionTypeId?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@Transform(({ value }) =>
|
@Transform(({ value }) =>
|
||||||
typeof value === 'string' && value.trim() ? value.trim() : null,
|
typeof value === 'string' && value.trim() ? value.trim() : null,
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
import { Transform } from 'class-transformer';
|
|
||||||
import {
|
|
||||||
IsIn,
|
|
||||||
IsOptional,
|
|
||||||
IsString,
|
|
||||||
IsUUID,
|
|
||||||
Matches,
|
|
||||||
MaxLength,
|
|
||||||
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',
|
|
||||||
'SUBINSTALACION',
|
|
||||||
] as const;
|
|
||||||
export type InventoryStructureKind = typeof INVENTORY_STRUCTURE_KINDS[number];
|
|
||||||
|
|
||||||
export class CreateInventoryStructureDto {
|
|
||||||
@IsIn(INVENTORY_STRUCTURE_KINDS)
|
|
||||||
kind!: InventoryStructureKind;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim().toUpperCase() : null)
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(120)
|
|
||||||
@Matches(/^[A-Z0-9][A-Z0-9._/-]*$/)
|
|
||||||
code?: string | null;
|
|
||||||
|
|
||||||
@Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
|
|
||||||
@IsString()
|
|
||||||
@MinLength(1)
|
|
||||||
@MaxLength(200)
|
|
||||||
name!: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(200)
|
|
||||||
commonName?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID('4')
|
|
||||||
parentId?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@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()
|
|
||||||
@MaxLength(4000)
|
|
||||||
description?: string | null;
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
import { Transform, Type } from 'class-transformer';
|
|
||||||
import {
|
|
||||||
IsBoolean,
|
|
||||||
IsEnum,
|
|
||||||
IsInt,
|
|
||||||
IsOptional,
|
|
||||||
IsString,
|
|
||||||
IsUUID,
|
|
||||||
Max,
|
|
||||||
MaxLength,
|
|
||||||
Min,
|
|
||||||
} from 'class-validator';
|
|
||||||
import { AssetInformationStatus, AssetOperationalStatus } from '../../database/entities';
|
|
||||||
|
|
||||||
export class InventoryBrowserQueryDto {
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(200)
|
|
||||||
search?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID('4')
|
|
||||||
typeId?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsEnum(AssetInformationStatus)
|
|
||||||
status?: AssetInformationStatus;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsEnum(AssetOperationalStatus)
|
|
||||||
operationalStatus?: AssetOperationalStatus;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID('4')
|
|
||||||
operationalAreaId?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID('4')
|
|
||||||
operatorCompanyId?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
|
|
||||||
@IsBoolean()
|
|
||||||
needsValidation?: boolean;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
|
|
||||||
@IsBoolean()
|
|
||||||
hasGeometry?: boolean;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsInt()
|
|
||||||
@Min(1)
|
|
||||||
page = 1;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsInt()
|
|
||||||
@Min(1)
|
|
||||||
@Max(100)
|
|
||||||
pageSize = 25;
|
|
||||||
}
|
|
||||||
@@ -1,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;
|
|
||||||
}
|
|
||||||
@@ -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;
|
|
||||||
}
|
|
||||||
@@ -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;
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Transform } from 'class-transformer';
|
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';
|
import { AssetInformationStatus, AssetOperationalStatus } from '../../database/entities';
|
||||||
|
|
||||||
export class ListAssetTreeQueryDto {
|
export class ListAssetTreeQueryDto {
|
||||||
@@ -24,12 +24,8 @@ export class ListAssetTreeQueryDto {
|
|||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
operationalAreaId?: string;
|
operationalAreaId?: string;
|
||||||
|
|
||||||
/**
|
|
||||||
* Retenido sólo para compatibilidad tipada. El árbol operativo no puede
|
|
||||||
* filtrar por el snapshot histórico de Empresa del Inventario.
|
|
||||||
*/
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsEmpty({ message: 'Filtrá la Operadora mediante la relación temporal del Área, no mediante el snapshot del Inventario' })
|
@IsUUID('4')
|
||||||
operatorCompanyId?: string;
|
operatorCompanyId?: string;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@@ -41,9 +37,4 @@ export class ListAssetTreeQueryDto {
|
|||||||
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
|
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
|
||||||
@IsBoolean()
|
@IsBoolean()
|
||||||
hasGeometry?: boolean;
|
hasGeometry?: boolean;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
|
|
||||||
@IsBoolean()
|
|
||||||
inventoryOnly?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { Transform, Type } from 'class-transformer';
|
import { Transform, Type } from 'class-transformer';
|
||||||
import {
|
import {
|
||||||
IsBoolean,
|
IsBoolean,
|
||||||
IsEmpty,
|
|
||||||
IsEnum,
|
IsEnum,
|
||||||
IsInt,
|
IsInt,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
@@ -40,6 +39,7 @@ export class ListAssetsQueryDto {
|
|||||||
@IsEnum(AssetInformationStatus)
|
@IsEnum(AssetInformationStatus)
|
||||||
status?: AssetInformationStatus;
|
status?: AssetInformationStatus;
|
||||||
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsEnum(AssetOperationalStatus)
|
@IsEnum(AssetOperationalStatus)
|
||||||
operationalStatus?: AssetOperationalStatus;
|
operationalStatus?: AssetOperationalStatus;
|
||||||
@@ -54,11 +54,6 @@ export class ListAssetsQueryDto {
|
|||||||
@IsBoolean()
|
@IsBoolean()
|
||||||
hasGeometry?: boolean;
|
hasGeometry?: boolean;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
|
|
||||||
@IsBoolean()
|
|
||||||
inventoryOnly?: boolean;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
parentId?: string;
|
parentId?: string;
|
||||||
@@ -67,12 +62,7 @@ export class ListAssetsQueryDto {
|
|||||||
@IsUUID('4')
|
@IsUUID('4')
|
||||||
operationalAreaId?: string;
|
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()
|
@IsOptional()
|
||||||
@IsEmpty({ message: 'Filtrá la Operadora mediante la relación temporal del Área, no mediante el snapshot del Inventario' })
|
@IsUUID('4')
|
||||||
operatorCompanyId?: string;
|
operatorCompanyId?: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
import { Transform } from 'class-transformer';
|
|
||||||
import { IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
|
|
||||||
|
|
||||||
export class MergeInventoryAssetDto {
|
|
||||||
@IsUUID('4')
|
|
||||||
canonicalAssetId!: string;
|
|
||||||
|
|
||||||
@Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
|
|
||||||
@IsString()
|
|
||||||
@MinLength(8)
|
|
||||||
@MaxLength(2000)
|
|
||||||
reason!: string;
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import { Transform } from 'class-transformer';
|
import { Transform } from 'class-transformer';
|
||||||
import {
|
import {
|
||||||
IsEmpty,
|
|
||||||
IsObject,
|
IsObject,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
IsString,
|
IsString,
|
||||||
@@ -49,13 +48,9 @@ export class UpdateAssetDto {
|
|||||||
operationalAreaId?: string | null;
|
operationalAreaId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
@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;
|
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()
|
@IsOptional()
|
||||||
@Transform(({ value }) =>
|
@Transform(({ value }) =>
|
||||||
typeof value === 'string' && value.trim() ? value.trim() : null,
|
typeof value === 'string' && value.trim() ? value.trim() : null,
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
import { IsObject } from 'class-validator';
|
|
||||||
|
|
||||||
export class UpdateInventoryTechnicalValuesDto {
|
|
||||||
@IsObject()
|
|
||||||
values!: Record<string, unknown>;
|
|
||||||
}
|
|
||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
import {
|
|
||||||
Body,
|
|
||||||
Controller,
|
|
||||||
Get,
|
|
||||||
Param,
|
|
||||||
ParseUUIDPipe,
|
|
||||||
Patch,
|
|
||||||
Post,
|
|
||||||
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 {
|
|
||||||
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) {
|
|
||||||
return this.families.findings(familyId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,445 +0,0 @@
|
|||||||
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;
|
|
||||||
};
|
|
||||||
|
|
||||||
@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 };
|
|
||||||
}
|
|
||||||
|
|
||||||
async findings(familyId: string) {
|
|
||||||
const family = await this.family(familyId, false);
|
|
||||||
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",
|
|
||||||
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 };
|
|
||||||
}
|
|
||||||
|
|
||||||
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');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
import {
|
|
||||||
Body,
|
|
||||||
Controller,
|
|
||||||
Get,
|
|
||||||
Param,
|
|
||||||
ParseUUIDPipe,
|
|
||||||
Patch,
|
|
||||||
Post,
|
|
||||||
Query,
|
|
||||||
Req,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
|
|
||||||
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
|
|
||||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
|
||||||
import {
|
|
||||||
ChangeInventoryFunctionDto,
|
|
||||||
CreateInventoryFunctionDto,
|
|
||||||
UpdateInventoryFunctionDto,
|
|
||||||
} from './dto/inventory-function.dto';
|
|
||||||
import { InventoryFunctionService } from './inventory-function.service';
|
|
||||||
|
|
||||||
@Controller()
|
|
||||||
export class InventoryFunctionController {
|
|
||||||
constructor(private readonly functions: InventoryFunctionService) {}
|
|
||||||
|
|
||||||
@Get('inventory-functions')
|
|
||||||
@RequirePermissions('assets.read')
|
|
||||||
list(@Query('includeInactive') includeInactive?: string) {
|
|
||||||
return this.functions.list(includeInactive === 'true');
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('inventory-functions')
|
|
||||||
@RequirePermissions('asset_types.manage')
|
|
||||||
create(
|
|
||||||
@Body() dto: CreateInventoryFunctionDto,
|
|
||||||
@CurrentAuth() principal: AuthPrincipal,
|
|
||||||
@Req() request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
return this.functions.create(dto, principal, request);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Patch('inventory-functions/:id')
|
|
||||||
@RequirePermissions('asset_types.manage')
|
|
||||||
update(
|
|
||||||
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
|
|
||||||
@Body() dto: UpdateInventoryFunctionDto,
|
|
||||||
@CurrentAuth() principal: AuthPrincipal,
|
|
||||||
@Req() request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
return this.functions.update(id, dto, principal, request);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('assets/:id/function-history')
|
|
||||||
@RequirePermissions('assets.read_history')
|
|
||||||
history(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
|
|
||||||
return this.functions.getForAsset(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('assets/:id/function')
|
|
||||||
@RequirePermissions('assets.update')
|
|
||||||
change(
|
|
||||||
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
|
|
||||||
@Body() dto: ChangeInventoryFunctionDto,
|
|
||||||
@CurrentAuth() principal: AuthPrincipal,
|
|
||||||
@Req() request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
return this.functions.changeForAsset(id, dto, principal, request);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,186 +0,0 @@
|
|||||||
import {
|
|
||||||
BadRequestException,
|
|
||||||
ConflictException,
|
|
||||||
Injectable,
|
|
||||||
NotFoundException,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { DataSource, EntityManager } from 'typeorm';
|
|
||||||
import { administrationAuditContext } from '../administration/common/administration-audit';
|
|
||||||
import { AuditService } from '../audit/audit.service';
|
|
||||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
|
||||||
import { AssetVersionChangeType, AuditAction } from '../database/entities';
|
|
||||||
import type {
|
|
||||||
ChangeInventoryFunctionDto,
|
|
||||||
CreateInventoryFunctionDto,
|
|
||||||
UpdateInventoryFunctionDto,
|
|
||||||
} from './dto/inventory-function.dto';
|
|
||||||
import { AssetHistoryService } from './asset-history.service';
|
|
||||||
|
|
||||||
export interface InventoryFunctionRow {
|
|
||||||
id: string; code: string; name: string; description: string | null;
|
|
||||||
isActive: boolean; sortOrder: number; createdAt: Date; updatedAt: Date;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface FunctionAssignmentRow {
|
|
||||||
id: string; assetId: string; functionId: string; functionCode: string; functionName: string;
|
|
||||||
validFrom: Date; validUntil: Date | null; reason: string | null;
|
|
||||||
changedBy: string | null; changedByUsername: string | null; createdAt: Date;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface FunctionEligibleAsset {
|
|
||||||
id: string; code: string; name: string; typeCode: string; typeName: string;
|
|
||||||
familyCode: string | null; familyName: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalized(value: string | null): string {
|
|
||||||
return (value ?? '').normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase().replace(/[^a-z0-9]+/g, ' ').trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class InventoryFunctionService {
|
|
||||||
constructor(
|
|
||||||
private readonly dataSource: DataSource,
|
|
||||||
private readonly audit: AuditService,
|
|
||||||
private readonly history: AssetHistoryService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
async list(includeInactive = false): Promise<{ data: InventoryFunctionRow[] }> {
|
|
||||||
const data = await this.dataSource.query(`
|
|
||||||
SELECT id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",
|
|
||||||
created_at AS "createdAt",updated_at AS "updatedAt"
|
|
||||||
FROM inventory_functions
|
|
||||||
${includeInactive ? '' : 'WHERE is_active=true'}
|
|
||||||
ORDER BY sort_order,name,code
|
|
||||||
`) as InventoryFunctionRow[];
|
|
||||||
return { data };
|
|
||||||
}
|
|
||||||
|
|
||||||
async create(dto: CreateInventoryFunctionDto, principal: AuthPrincipal, request: RequestWithContext): Promise<InventoryFunctionRow> {
|
|
||||||
return this.dataSource.transaction(async (manager) => {
|
|
||||||
const [duplicate] = await manager.query('SELECT 1 FROM inventory_functions WHERE lower(code)=lower($1) LIMIT 1', [dto.code]) as unknown[];
|
|
||||||
if (duplicate) throw new ConflictException({ code: 'INVENTORY_FUNCTION_CODE_EXISTS', message: 'Ya existe una función con ese código' });
|
|
||||||
const [created] = await manager.query(`
|
|
||||||
INSERT INTO inventory_functions(code,name,description,is_active,sort_order,created_by,updated_by)
|
|
||||||
VALUES($1,$2,$3,true,$4,$5,$5)
|
|
||||||
RETURNING id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",
|
|
||||||
created_at AS "createdAt",updated_at AS "updatedAt"
|
|
||||||
`, [dto.code, dto.name, dto.description ?? null, dto.sortOrder ?? 0, principal.userId]) as InventoryFunctionRow[];
|
|
||||||
await this.audit.record({ ...administrationAuditContext(principal, request), action: AuditAction.INVENTORY_FUNCTION_CREATED,
|
|
||||||
entityType: 'inventory_function', entityId: created.id, afterData: created as unknown as Record<string, unknown> }, manager);
|
|
||||||
return created;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async update(id: string, dto: UpdateInventoryFunctionDto, principal: AuthPrincipal, request: RequestWithContext): Promise<InventoryFunctionRow> {
|
|
||||||
if (Object.keys(dto).length === 0) throw new BadRequestException({ code: 'NO_CHANGES', message: 'No se recibieron cambios' });
|
|
||||||
return this.dataSource.transaction(async (manager) => {
|
|
||||||
const before = await this.requireFunction(manager, id, false);
|
|
||||||
const [updated] = await manager.query(`
|
|
||||||
UPDATE inventory_functions SET
|
|
||||||
name=COALESCE($2,name), description=CASE WHEN $3::boolean THEN $4 ELSE description END,
|
|
||||||
is_active=COALESCE($5,is_active), sort_order=COALESCE($6,sort_order),
|
|
||||||
updated_by=$7,updated_at=CURRENT_TIMESTAMP
|
|
||||||
WHERE id=$1
|
|
||||||
RETURNING id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",
|
|
||||||
created_at AS "createdAt",updated_at AS "updatedAt"
|
|
||||||
`, [id, dto.name ?? null, dto.description !== undefined, dto.description ?? null, dto.isActive ?? null, dto.sortOrder ?? null, principal.userId]) as InventoryFunctionRow[];
|
|
||||||
await this.audit.record({ ...administrationAuditContext(principal, request), action: AuditAction.INVENTORY_FUNCTION_UPDATED,
|
|
||||||
entityType: 'inventory_function', entityId: id, beforeData: before as unknown as Record<string, unknown>,
|
|
||||||
afterData: updated as unknown as Record<string, unknown> }, manager);
|
|
||||||
return updated;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async getForAsset(assetId: string) {
|
|
||||||
return this.dataSource.transaction((manager) => this.getForAssetWithManager(manager, assetId));
|
|
||||||
}
|
|
||||||
|
|
||||||
async changeForAsset(assetId: string, dto: ChangeInventoryFunctionDto, principal: AuthPrincipal, request: RequestWithContext) {
|
|
||||||
return this.dataSource.transaction(async (manager) => {
|
|
||||||
const asset = await this.requireEligibleAsset(manager, assetId, true);
|
|
||||||
const nextFunction = await this.requireFunction(manager, dto.functionId, true);
|
|
||||||
const effectiveAt = dto.effectiveAt ? new Date(dto.effectiveAt) : new Date();
|
|
||||||
if (!Number.isFinite(effectiveAt.getTime())) throw new BadRequestException({ code: 'INVENTORY_FUNCTION_EFFECTIVE_DATE_INVALID', message: 'La fecha efectiva del cambio de función no es válida' });
|
|
||||||
if (effectiveAt.getTime() > Date.now() + 60_000) throw new BadRequestException({ code: 'INVENTORY_FUNCTION_FUTURE_DATE_NOT_ALLOWED', message: 'El cambio de función no puede registrarse con fecha futura' });
|
|
||||||
|
|
||||||
const current = await this.currentAssignment(manager, assetId, true);
|
|
||||||
if (current?.functionId === nextFunction.id) return this.getForAssetWithManager(manager, assetId);
|
|
||||||
if (current && effectiveAt.getTime() <= new Date(current.validFrom).getTime()) {
|
|
||||||
throw new ConflictException({ code: 'INVENTORY_FUNCTION_EFFECTIVE_DATE_OVERLAP', message: 'La fecha efectiva debe ser posterior al inicio de la función vigente' });
|
|
||||||
}
|
|
||||||
if (current) await manager.query(`UPDATE inventory_function_assignments SET valid_until=$2 WHERE id=$1 AND valid_until IS NULL`, [current.id, effectiveAt]);
|
|
||||||
await manager.query(`INSERT INTO inventory_function_assignments(asset_id,function_id,valid_from,change_reason,changed_by) VALUES($1,$2,$3,$4,$5)`,
|
|
||||||
[assetId, nextFunction.id, effectiveAt, dto.reason ?? null, principal.userId]);
|
|
||||||
await manager.query(`UPDATE assets SET updated_by=$2,updated_at=CURRENT_TIMESTAMP WHERE id=$1`, [assetId, principal.userId]);
|
|
||||||
|
|
||||||
const versionNumber = await this.history.capture(manager, assetId, AssetVersionChangeType.FUNCTION_CHANGED, principal, request);
|
|
||||||
const after = await this.getForAssetWithManager(manager, assetId);
|
|
||||||
await this.audit.record({
|
|
||||||
...administrationAuditContext(principal, request), action: AuditAction.ASSET_FUNCTION_CHANGED,
|
|
||||||
entityType: 'asset', entityId: assetId,
|
|
||||||
beforeData: current ? { functionId: current.functionId, functionCode: current.functionCode, functionName: current.functionName, validFrom: current.validFrom } : { functionId: null },
|
|
||||||
afterData: { functionId: nextFunction.id, functionCode: nextFunction.code, functionName: nextFunction.name, effectiveAt, reason: dto.reason ?? null, versionNumber },
|
|
||||||
metadata: { inventoryCode: asset.code, inventoryName: asset.name, temporal: true, historySource: 'inventory_function_assignments', assetVersionChangeType: AssetVersionChangeType.FUNCTION_CHANGED },
|
|
||||||
}, manager);
|
|
||||||
return after;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private async getForAssetWithManager(manager: EntityManager, assetId: string) {
|
|
||||||
const asset = await this.requireEligibleAsset(manager, assetId, false);
|
|
||||||
const currentFunction = await this.currentAssignment(manager, assetId, false);
|
|
||||||
const history = await manager.query(`
|
|
||||||
SELECT assignment.id,assignment.asset_id AS "assetId",assignment.function_id AS "functionId",
|
|
||||||
fn.code AS "functionCode",fn.name AS "functionName",
|
|
||||||
assignment.valid_from AS "validFrom",assignment.valid_until AS "validUntil",
|
|
||||||
assignment.change_reason AS reason,assignment.changed_by AS "changedBy",
|
|
||||||
actor.username AS "changedByUsername",assignment.created_at AS "createdAt"
|
|
||||||
FROM inventory_function_assignments assignment
|
|
||||||
JOIN inventory_functions fn ON fn.id=assignment.function_id
|
|
||||||
LEFT JOIN users actor ON actor.id=assignment.changed_by
|
|
||||||
WHERE assignment.asset_id=$1
|
|
||||||
ORDER BY assignment.valid_from DESC,assignment.created_at DESC
|
|
||||||
`, [assetId]) as FunctionAssignmentRow[];
|
|
||||||
return { asset: { id: asset.id, code: asset.code, name: asset.name, typeCode: asset.typeCode, typeName: asset.typeName, familyCode: asset.familyCode, familyName: asset.familyName }, currentFunction, history };
|
|
||||||
}
|
|
||||||
|
|
||||||
private async currentAssignment(manager: EntityManager, assetId: string, lock: boolean): Promise<FunctionAssignmentRow | null> {
|
|
||||||
const [row] = await manager.query(`
|
|
||||||
SELECT assignment.id,assignment.asset_id AS "assetId",assignment.function_id AS "functionId",
|
|
||||||
fn.code AS "functionCode",fn.name AS "functionName",
|
|
||||||
assignment.valid_from AS "validFrom",assignment.valid_until AS "validUntil",
|
|
||||||
assignment.change_reason AS reason,assignment.changed_by AS "changedBy",
|
|
||||||
actor.username AS "changedByUsername",assignment.created_at AS "createdAt"
|
|
||||||
FROM inventory_function_assignments assignment
|
|
||||||
JOIN inventory_functions fn ON fn.id=assignment.function_id
|
|
||||||
LEFT JOIN users actor ON actor.id=assignment.changed_by
|
|
||||||
WHERE assignment.asset_id=$1 AND assignment.valid_until IS NULL
|
|
||||||
${lock ? 'FOR UPDATE OF assignment' : ''}
|
|
||||||
`, [assetId]) as FunctionAssignmentRow[];
|
|
||||||
return row ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async requireFunction(manager: EntityManager, id: string, active: boolean): Promise<InventoryFunctionRow> {
|
|
||||||
const [row] = await manager.query(`
|
|
||||||
SELECT id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",created_at AS "createdAt",updated_at AS "updatedAt"
|
|
||||||
FROM inventory_functions WHERE id=$1 ${active ? 'AND is_active=true' : ''}
|
|
||||||
`, [id]) as InventoryFunctionRow[];
|
|
||||||
if (!row) throw new NotFoundException({ code: 'INVENTORY_FUNCTION_NOT_FOUND', message: active ? 'La función seleccionada no existe o está inactiva' : 'Función no encontrada' });
|
|
||||||
return row;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async requireEligibleAsset(manager: EntityManager, assetId: string, lock: boolean): Promise<FunctionEligibleAsset> {
|
|
||||||
const [asset] = await manager.query(`
|
|
||||||
SELECT asset.id,asset.code,asset.name,asset_type.code AS "typeCode",asset_type.name AS "typeName",
|
|
||||||
family.code AS "familyCode",family.name AS "familyName"
|
|
||||||
FROM assets asset JOIN asset_types asset_type ON asset_type.id=asset.asset_type_id
|
|
||||||
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
|
|
||||||
WHERE asset.id=$1 ${lock ? 'FOR UPDATE OF asset' : ''}
|
|
||||||
`, [assetId]) as FunctionEligibleAsset[];
|
|
||||||
if (!asset) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Inventario no encontrado' });
|
|
||||||
const values = [asset.typeCode, asset.typeName, asset.familyCode, asset.familyName].map(normalized);
|
|
||||||
const eligible = values.some((value) => value === 'estacion' || value === 'subestacion' || value.includes('estacion ') || value.includes('subestacion ') || value.endsWith(' estacion') || value.endsWith(' subestacion'));
|
|
||||||
if (!eligible) throw new ConflictException({ code: 'INVENTORY_FUNCTION_CHANGE_NOT_ALLOWED', message: 'El cambio de función sólo está habilitado para Inventarios de Estación o Subestación' });
|
|
||||||
return asset;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
import {
|
|
||||||
Body,
|
|
||||||
Controller,
|
|
||||||
Get,
|
|
||||||
Param,
|
|
||||||
ParseUUIDPipe,
|
|
||||||
Post,
|
|
||||||
Req,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
|
|
||||||
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
|
|
||||||
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
|
|
||||||
import { MergeInventoryAssetDto } from './dto/merge-inventory-asset.dto';
|
|
||||||
import { InventoryMergeService } from './inventory-merge.service';
|
|
||||||
|
|
||||||
@Controller('assets')
|
|
||||||
export class InventoryMergeController {
|
|
||||||
constructor(private readonly merges: InventoryMergeService) {}
|
|
||||||
|
|
||||||
@Get(':id/merge-status')
|
|
||||||
@RequirePermissions('assets.read')
|
|
||||||
status(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
|
|
||||||
return this.merges.status(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post(':id/merge')
|
|
||||||
@RequirePermissions('assets.update')
|
|
||||||
merge(
|
|
||||||
@Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
|
|
||||||
@Body() dto: MergeInventoryAssetDto,
|
|
||||||
@CurrentAuth() principal: AuthPrincipal,
|
|
||||||
@Req() request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
return this.merges.merge(id, dto, principal, request);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Controller('inspection-visits/:visitId/field-inventory')
|
|
||||||
export class FieldInventoryMergeController {
|
|
||||||
constructor(private readonly merges: InventoryMergeService) {}
|
|
||||||
|
|
||||||
@Post(':assetId/merge')
|
|
||||||
@RequirePermissions('assets.create', 'inspections.execute')
|
|
||||||
mergeFieldDiscovery(
|
|
||||||
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
|
|
||||||
@Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
|
|
||||||
@Body() dto: MergeInventoryAssetDto,
|
|
||||||
@CurrentAuth() principal: AuthPrincipal,
|
|
||||||
@Req() request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
return this.merges.mergeFromVisit(visitId, assetId, dto, principal, request);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,522 +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 { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
|
|
||||||
import type { MergeInventoryAssetDto } from './dto/merge-inventory-asset.dto';
|
|
||||||
import { AssetHistoryService } from './asset-history.service';
|
|
||||||
|
|
||||||
type MergeableAssetRow = {
|
|
||||||
id: string;
|
|
||||||
code: string;
|
|
||||||
name: string;
|
|
||||||
typeCode: string;
|
|
||||||
parentId: string | null;
|
|
||||||
operationalAreaId: string | null;
|
|
||||||
operatorCompanyId: string | null;
|
|
||||||
inventoryFamilyId: string | null;
|
|
||||||
informationStatus: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type MergeRow = {
|
|
||||||
id: string;
|
|
||||||
sourceAssetId: string;
|
|
||||||
canonicalAssetId: string;
|
|
||||||
reason: string;
|
|
||||||
mergedAt: Date;
|
|
||||||
mergedBy: string | null;
|
|
||||||
source: string;
|
|
||||||
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()
|
|
||||||
export class InventoryMergeService {
|
|
||||||
constructor(
|
|
||||||
private readonly dataSource: DataSource,
|
|
||||||
private readonly audit: AuditService,
|
|
||||||
private readonly history: AssetHistoryService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
async status(assetId: string) {
|
|
||||||
const requested = await this.loadAsset(this.dataSource.manager, assetId, false);
|
|
||||||
const canonicalId = await this.resolveCanonicalId(this.dataSource.manager, assetId);
|
|
||||||
const canonical = canonicalId === assetId
|
|
||||||
? requested
|
|
||||||
: await this.loadAsset(this.dataSource.manager, canonicalId, false);
|
|
||||||
const chain = await this.mergeChain(assetId);
|
|
||||||
const aliases = await this.aliasesFor(canonicalId);
|
|
||||||
return {
|
|
||||||
requested,
|
|
||||||
isMerged: canonicalId !== assetId,
|
|
||||||
canonical,
|
|
||||||
chain,
|
|
||||||
aliases,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async merge(
|
|
||||||
sourceAssetId: string,
|
|
||||||
dto: MergeInventoryAssetDto,
|
|
||||||
principal: AuthPrincipal,
|
|
||||||
request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
return this.dataSource.transaction((manager) =>
|
|
||||||
this.mergeInTransaction(manager, sourceAssetId, dto, principal, request),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async mergeFromVisit(
|
|
||||||
visitId: string,
|
|
||||||
sourceAssetId: string,
|
|
||||||
dto: MergeInventoryAssetDto,
|
|
||||||
principal: AuthPrincipal,
|
|
||||||
request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
assertMobileInspector(principal);
|
|
||||||
const [gate] = (await this.dataSource.query(`
|
|
||||||
SELECT
|
|
||||||
visit.status,
|
|
||||||
EXISTS (
|
|
||||||
SELECT 1 FROM inspection_visit_members member
|
|
||||||
WHERE member.visit_id=visit.id
|
|
||||||
AND member.user_id=$3::uuid
|
|
||||||
AND member.included=true
|
|
||||||
) OR visit.lead_inspector_user_id=$3::uuid AS assigned,
|
|
||||||
EXISTS (
|
|
||||||
SELECT 1 FROM asset_field_discoveries discovery
|
|
||||||
WHERE discovery.visit_id=visit.id
|
|
||||||
AND discovery.asset_id=$2::uuid
|
|
||||||
) AS "createdInVisit"
|
|
||||||
FROM inspection_visits visit
|
|
||||||
WHERE visit.id=$1::uuid
|
|
||||||
`, [visitId, sourceAssetId, principal.userId])) as Array<{
|
|
||||||
status: string;
|
|
||||||
assigned: boolean;
|
|
||||||
createdInVisit: boolean;
|
|
||||||
}>;
|
|
||||||
if (!gate) throw new NotFoundException({ code: 'INSPECTION_VISIT_NOT_FOUND', message: 'Inspección no encontrada' });
|
|
||||||
if (gate.status !== 'IN_PROGRESS') throw new ConflictException({
|
|
||||||
code: 'FIELD_MERGE_VISIT_NOT_IN_PROGRESS',
|
|
||||||
message: 'Sólo se puede conciliar Inventario mientras la inspección está en curso',
|
|
||||||
});
|
|
||||||
if (!gate.assigned) throw new ConflictException({
|
|
||||||
code: 'FIELD_MERGE_INSPECTOR_NOT_ASSIGNED',
|
|
||||||
message: 'El inspector no está asignado a esta inspección',
|
|
||||||
});
|
|
||||||
if (!gate.createdInVisit) throw new ConflictException({
|
|
||||||
code: 'FIELD_MERGE_SOURCE_MUST_BE_DISCOVERY',
|
|
||||||
message: 'Desde la APK sólo se puede fusionar un alta nacida en esta inspección',
|
|
||||||
});
|
|
||||||
return this.merge(sourceAssetId, dto, principal, request);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async mergeInTransaction(
|
|
||||||
manager: EntityManager,
|
|
||||||
sourceAssetId: string,
|
|
||||||
dto: MergeInventoryAssetDto,
|
|
||||||
principal: AuthPrincipal,
|
|
||||||
request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
const existing = await this.currentMerge(manager, sourceAssetId);
|
|
||||||
if (existing) throw new ConflictException({
|
|
||||||
code: 'INVENTORY_ALREADY_MERGED',
|
|
||||||
message: 'Este registro ya fue fusionado',
|
|
||||||
canonicalAssetId: existing.canonicalAssetId,
|
|
||||||
});
|
|
||||||
|
|
||||||
const canonicalAssetId = await this.resolveCanonicalId(manager, dto.canonicalAssetId);
|
|
||||||
if (canonicalAssetId === sourceAssetId) throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_MERGE_CYCLE',
|
|
||||||
message: 'La fusión generaría un ciclo entre registros',
|
|
||||||
});
|
|
||||||
|
|
||||||
const ids = [sourceAssetId, canonicalAssetId].sort();
|
|
||||||
const locked = (await manager.query(`
|
|
||||||
SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
|
|
||||||
asset.parent_id AS "parentId",
|
|
||||||
asset.operational_area_id AS "operationalAreaId",
|
|
||||||
asset.operator_company_id AS "operatorCompanyId",
|
|
||||||
asset.inventory_family_id AS "inventoryFamilyId",
|
|
||||||
asset.information_status AS "informationStatus"
|
|
||||||
FROM assets asset
|
|
||||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
|
||||||
WHERE asset.id=ANY($1::uuid[])
|
|
||||||
ORDER BY asset.id
|
|
||||||
FOR UPDATE OF asset
|
|
||||||
`, [ids])) as MergeableAssetRow[];
|
|
||||||
const source = locked.find((row) => row.id === sourceAssetId);
|
|
||||||
const canonical = locked.find((row) => row.id === canonicalAssetId);
|
|
||||||
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;
|
|
||||||
const targetParentCanonical = canonical.parentId
|
|
||||||
? await this.resolveCanonicalId(manager, canonical.parentId)
|
|
||||||
: null;
|
|
||||||
if (sourceParentCanonical !== targetParentCanonical) throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_MERGE_PARENT_MISMATCH',
|
|
||||||
message: 'Los duplicados deben pertenecer al mismo padre estructural (considerando fusiones previas)',
|
|
||||||
});
|
|
||||||
|
|
||||||
if (source.typeCode.toLowerCase() === 'instalacion') {
|
|
||||||
const invalidChildren = await manager.query(`
|
|
||||||
SELECT child.id,child.code,child.name
|
|
||||||
FROM assets child
|
|
||||||
WHERE child.parent_id=$1::uuid
|
|
||||||
AND child.information_status<>'INACTIVE'
|
|
||||||
AND (
|
|
||||||
child.inventory_family_id IS NULL
|
|
||||||
OR $2::uuid IS NULL
|
|
||||||
OR NOT EXISTS (
|
|
||||||
SELECT 1 FROM inventory_family_parent_rules rule
|
|
||||||
WHERE rule.child_family_id=child.inventory_family_id
|
|
||||||
AND rule.parent_family_id=$2::uuid
|
|
||||||
)
|
|
||||||
)
|
|
||||||
ORDER BY child.name,child.code
|
|
||||||
LIMIT 20
|
|
||||||
`, [source.id, canonical.inventoryFamilyId]) as Array<{ id: string; code: string; name: string }>;
|
|
||||||
if (invalidChildren.length > 0) throw new ConflictException({
|
|
||||||
code: 'INVENTORY_MERGE_CHILD_FAMILY_CONFLICT',
|
|
||||||
message: 'Hay Subinstalaciones que no son compatibles con la familia de la Instalación canónica',
|
|
||||||
data: invalidChildren,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
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),
|
|
||||||
]);
|
|
||||||
const sourceLabel = principal.transport === 'bearer' ? 'ANDROID' : 'WEB';
|
|
||||||
const [mergeRecord] = (await manager.query(`
|
|
||||||
INSERT INTO asset_merges (
|
|
||||||
source_asset_id,canonical_asset_id,reason,merged_by,source,request_id,
|
|
||||||
source_snapshot,canonical_snapshot
|
|
||||||
) VALUES ($1::uuid,$2::uuid,$3::text,$4::uuid,$5::varchar,$6::varchar,$7::jsonb,$8::jsonb)
|
|
||||||
RETURNING id,source_asset_id AS "sourceAssetId",canonical_asset_id AS "canonicalAssetId",
|
|
||||||
reason,merged_at AS "mergedAt",merged_by AS "mergedBy",source,request_id AS "requestId"
|
|
||||||
`, [
|
|
||||||
source.id,
|
|
||||||
canonical.id,
|
|
||||||
dto.reason,
|
|
||||||
principal.userId,
|
|
||||||
sourceLabel,
|
|
||||||
request.requestId,
|
|
||||||
sourceSnapshot,
|
|
||||||
canonicalSnapshot,
|
|
||||||
])) as MergeRow[];
|
|
||||||
|
|
||||||
const children = (await manager.query(`
|
|
||||||
SELECT id FROM assets
|
|
||||||
WHERE parent_id=$1::uuid AND information_status<>'INACTIVE'
|
|
||||||
ORDER BY id FOR UPDATE
|
|
||||||
`, [source.id])) as Array<{ id: string }>;
|
|
||||||
const reparentedChildIds: string[] = [];
|
|
||||||
for (const child of children) {
|
|
||||||
await manager.query(`
|
|
||||||
UPDATE asset_context_history
|
|
||||||
SET valid_until=CURRENT_TIMESTAMP,
|
|
||||||
end_reason=$2::text,
|
|
||||||
ended_by=$3::uuid,
|
|
||||||
ended_at=CURRENT_TIMESTAMP
|
|
||||||
WHERE asset_id=$1::uuid AND valid_until IS NULL
|
|
||||||
`, [child.id, `Reparentado por fusión cronológica ${source.code} → ${canonical.code}`, principal.userId]);
|
|
||||||
await manager.query(`
|
|
||||||
UPDATE assets
|
|
||||||
SET parent_id=$2::uuid,updated_by=$3::uuid,updated_at=CURRENT_TIMESTAMP
|
|
||||||
WHERE id=$1::uuid
|
|
||||||
`, [child.id, canonical.id, principal.userId]);
|
|
||||||
const versionNumber = await this.history.capture(
|
|
||||||
manager,
|
|
||||||
child.id,
|
|
||||||
AssetVersionChangeType.UPDATED,
|
|
||||||
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
|
|
||||||
)
|
|
||||||
SELECT id,parent_id,operational_area_id,operator_company_id,CURRENT_TIMESTAMP,
|
|
||||||
$2::text,$3::integer,$4::varchar,$5::varchar,$6::uuid
|
|
||||||
FROM assets WHERE id=$1::uuid
|
|
||||||
`, [
|
|
||||||
child.id,
|
|
||||||
`Reparentado por fusión cronológica ${source.code} → ${canonical.code}`,
|
|
||||||
versionNumber,
|
|
||||||
sourceLabel,
|
|
||||||
request.requestId,
|
|
||||||
principal.userId,
|
|
||||||
]);
|
|
||||||
reparentedChildIds.push(child.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
await manager.query(`
|
|
||||||
UPDATE assets
|
|
||||||
SET information_status='INACTIVE',updated_by=$2::uuid,updated_at=CURRENT_TIMESTAMP
|
|
||||||
WHERE id=$1::uuid
|
|
||||||
`, [source.id, principal.userId]);
|
|
||||||
const sourceVersionNumber = await this.history.capture(
|
|
||||||
manager,
|
|
||||||
source.id,
|
|
||||||
AssetVersionChangeType.STATUS_CHANGED,
|
|
||||||
principal,
|
|
||||||
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 },
|
|
||||||
canonical: { id: canonical.id, code: canonical.code, name: canonical.name },
|
|
||||||
sourceVersionNumber,
|
|
||||||
reparentedChildIds,
|
|
||||||
historyPolicy: 'HISTORICAL_REFERENCES_PRESERVED',
|
|
||||||
documentaryInvariantsVerified: true,
|
|
||||||
};
|
|
||||||
await this.audit.record({
|
|
||||||
...administrationAuditContext(principal, request),
|
|
||||||
action: AuditAction.ASSET_UPDATED,
|
|
||||||
entityType: 'asset_merge',
|
|
||||||
entityId: mergeRecord.id,
|
|
||||||
beforeData: sourceSnapshot,
|
|
||||||
afterData: canonicalSnapshot,
|
|
||||||
metadata: {
|
|
||||||
operation: 'CHRONOLOGICAL_MERGE',
|
|
||||||
sourceAssetId: source.id,
|
|
||||||
canonicalAssetId: canonical.id,
|
|
||||||
physicalAreaId: sourceAreaId,
|
|
||||||
reason: dto.reason,
|
|
||||||
sourceVersionNumber,
|
|
||||||
reparentedChildIds,
|
|
||||||
historicalReferencesRewritten: false,
|
|
||||||
documentaryInvariantsVerified: true,
|
|
||||||
},
|
|
||||||
}, manager);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private validatePair(source: MergeableAssetRow, canonical: MergeableAssetRow): void {
|
|
||||||
const sourceType = source.typeCode.toLowerCase();
|
|
||||||
const targetType = canonical.typeCode.toLowerCase();
|
|
||||||
if (!MERGEABLE_TYPES.has(sourceType) || sourceType !== targetType) throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_MERGE_TYPE_INVALID',
|
|
||||||
message: 'Sólo se pueden fusionar Instalaciones entre sí o Subinstalaciones entre sí',
|
|
||||||
});
|
|
||||||
if (source.informationStatus === 'INACTIVE') throw new ConflictException({
|
|
||||||
code: 'INVENTORY_MERGE_SOURCE_INACTIVE',
|
|
||||||
message: 'El registro de origen ya está inactivo',
|
|
||||||
});
|
|
||||||
if (canonical.informationStatus === 'INACTIVE') throw new ConflictException({
|
|
||||||
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[];
|
|
||||||
}
|
|
||||||
|
|
||||||
private async loadAsset(manager: EntityManager, id: string, lock: boolean): Promise<MergeableAssetRow> {
|
|
||||||
const lockSql = lock ? 'FOR UPDATE OF asset' : '';
|
|
||||||
const rows = (await manager.query(`
|
|
||||||
SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
|
|
||||||
asset.parent_id AS "parentId",
|
|
||||||
asset.operational_area_id AS "operationalAreaId",
|
|
||||||
asset.operator_company_id AS "operatorCompanyId",
|
|
||||||
asset.inventory_family_id AS "inventoryFamilyId",
|
|
||||||
asset.information_status AS "informationStatus"
|
|
||||||
FROM assets asset JOIN asset_types type ON type.id=asset.asset_type_id
|
|
||||||
WHERE asset.id=$1::uuid ${lockSql}
|
|
||||||
`, [id])) as MergeableAssetRow[];
|
|
||||||
if (!rows[0]) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
|
|
||||||
return rows[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
private async currentMerge(manager: EntityManager, sourceAssetId: string): Promise<MergeRow | null> {
|
|
||||||
const rows = (await manager.query(`
|
|
||||||
SELECT id,source_asset_id AS "sourceAssetId",canonical_asset_id AS "canonicalAssetId",
|
|
||||||
reason,merged_at AS "mergedAt",merged_by AS "mergedBy",source,request_id AS "requestId"
|
|
||||||
FROM asset_merges WHERE source_asset_id=$1::uuid
|
|
||||||
`, [sourceAssetId])) as MergeRow[];
|
|
||||||
return rows[0] ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async resolveCanonicalId(manager: EntityManager, assetId: string): Promise<string> {
|
|
||||||
const rows = (await manager.query(`
|
|
||||||
WITH RECURSIVE chain AS (
|
|
||||||
SELECT source_asset_id,canonical_asset_id,1 AS depth
|
|
||||||
FROM asset_merges WHERE source_asset_id=$1::uuid
|
|
||||||
UNION ALL
|
|
||||||
SELECT merge_record.source_asset_id,merge_record.canonical_asset_id,chain.depth+1
|
|
||||||
FROM asset_merges merge_record
|
|
||||||
JOIN chain ON merge_record.source_asset_id=chain.canonical_asset_id
|
|
||||||
WHERE chain.depth<32
|
|
||||||
)
|
|
||||||
SELECT canonical_asset_id AS id FROM chain ORDER BY depth DESC LIMIT 1
|
|
||||||
`, [assetId])) as Array<{ id: string }>;
|
|
||||||
return rows[0]?.id ?? assetId;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async mergeChain(assetId: string): Promise<MergeRow[]> {
|
|
||||||
return (await this.dataSource.query(`
|
|
||||||
WITH RECURSIVE chain AS (
|
|
||||||
SELECT id,source_asset_id,canonical_asset_id,reason,merged_at,merged_by,source,request_id,1 AS depth
|
|
||||||
FROM asset_merges WHERE source_asset_id=$1::uuid
|
|
||||||
UNION ALL
|
|
||||||
SELECT merge_record.id,merge_record.source_asset_id,merge_record.canonical_asset_id,
|
|
||||||
merge_record.reason,merge_record.merged_at,merge_record.merged_by,merge_record.source,merge_record.request_id,
|
|
||||||
chain.depth+1
|
|
||||||
FROM asset_merges merge_record
|
|
||||||
JOIN chain ON merge_record.source_asset_id=chain.canonical_asset_id
|
|
||||||
WHERE chain.depth<32
|
|
||||||
)
|
|
||||||
SELECT id,source_asset_id AS "sourceAssetId",canonical_asset_id AS "canonicalAssetId",
|
|
||||||
reason,merged_at AS "mergedAt",merged_by AS "mergedBy",source,request_id AS "requestId"
|
|
||||||
FROM chain ORDER BY depth
|
|
||||||
`, [assetId])) as MergeRow[];
|
|
||||||
}
|
|
||||||
|
|
||||||
private async aliasesFor(canonicalAssetId: string) {
|
|
||||||
return this.dataSource.query(`
|
|
||||||
WITH RECURSIVE aliases AS (
|
|
||||||
SELECT source_asset_id,canonical_asset_id,reason,merged_at,1 AS depth
|
|
||||||
FROM asset_merges WHERE canonical_asset_id=$1::uuid
|
|
||||||
UNION ALL
|
|
||||||
SELECT merge_record.source_asset_id,merge_record.canonical_asset_id,
|
|
||||||
merge_record.reason,merge_record.merged_at,aliases.depth+1
|
|
||||||
FROM asset_merges merge_record
|
|
||||||
JOIN aliases ON merge_record.canonical_asset_id=aliases.source_asset_id
|
|
||||||
WHERE aliases.depth<32
|
|
||||||
)
|
|
||||||
SELECT alias.source_asset_id AS id,asset.code,asset.name,alias.reason,
|
|
||||||
alias.merged_at AS "mergedAt",alias.depth
|
|
||||||
FROM aliases alias
|
|
||||||
JOIN assets asset ON asset.id=alias.source_asset_id
|
|
||||||
ORDER BY alias.merged_at,alias.depth
|
|
||||||
`, [canonicalAssetId]);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async snapshot(manager: EntityManager, assetId: string): Promise<Record<string, unknown>> {
|
|
||||||
const rows = (await manager.query(`
|
|
||||||
SELECT TO_JSONB(asset) || JSONB_BUILD_OBJECT(
|
|
||||||
'typeCode',type.code,
|
|
||||||
'typeName',type.name,
|
|
||||||
'inventoryFamily',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 snapshot
|
|
||||||
FROM assets asset
|
|
||||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
|
||||||
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
|
|
||||||
WHERE asset.id=$1::uuid
|
|
||||||
`, [assetId])) as Array<{ snapshot: Record<string, unknown> }>;
|
|
||||||
if (!rows[0]) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
|
|
||||||
return rows[0].snapshot;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
import { Body, Controller, Get, Param, 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 { 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,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
@Get()
|
|
||||||
@RequirePermissions('assets.read')
|
|
||||||
options() {
|
|
||||||
return this.inventoryStructure.options();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('parents/:kind')
|
|
||||||
@RequirePermissions('assets.read')
|
|
||||||
parents(
|
|
||||||
@Param('kind') kind: string,
|
|
||||||
@Query('search') search?: string,
|
|
||||||
) {
|
|
||||||
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(
|
|
||||||
@Body() dto: CreateInventoryStructureDto,
|
|
||||||
@CurrentAuth() principal: AuthPrincipal,
|
|
||||||
@Req() request: RequestWithContext,
|
|
||||||
) {
|
|
||||||
return this.inventoryStructure.create(dto, principal, request);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,577 +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 SimpleOptionRow = { id: string; code: string; name: string };
|
|
||||||
type FamilyParent = { id: string; code: string; name: string };
|
|
||||||
type FamilyRow = {
|
|
||||||
id: string;
|
|
||||||
code: string;
|
|
||||||
name: string;
|
|
||||||
level: 'INSTALLATION' | 'SUBINSTALLATION';
|
|
||||||
legacyTypeCode: string | null;
|
|
||||||
informationLabels: string[];
|
|
||||||
parentFamilyIds: string[];
|
|
||||||
parentFamilies: FamilyParent[];
|
|
||||||
};
|
|
||||||
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;
|
|
||||||
};
|
|
||||||
|
|
||||||
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',
|
|
||||||
};
|
|
||||||
const FAMILY_LEVEL_BY_KIND: Partial<Record<InventoryStructureKind, FamilyRow['level']>> = {
|
|
||||||
INSTALACION: 'INSTALLATION',
|
|
||||||
SUBINSTALACION: 'SUBINSTALLATION',
|
|
||||||
};
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class InventoryStructureService {
|
|
||||||
constructor(
|
|
||||||
private readonly dataSource: DataSource,
|
|
||||||
private readonly audit: AuditService,
|
|
||||||
private readonly history: AssetHistoryService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
async options() {
|
|
||||||
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
|
|
||||||
`)) 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) {
|
|
||||||
throw new ConflictException({
|
|
||||||
code: 'INVENTORY_STRUCTURE_TYPES_INCOMPLETE',
|
|
||||||
message: 'La configuración maestra de Empresa e Inventario todavía no está completa',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
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"
|
|
||||||
FROM inventory_families family
|
|
||||||
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 },
|
|
||||||
],
|
|
||||||
companies,
|
|
||||||
concessionTypes,
|
|
||||||
installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
|
|
||||||
subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async parents(kindValue: string, search?: string) {
|
|
||||||
const kind = kindValue.toUpperCase() as InventoryStructureKind;
|
|
||||||
if (!(kind in PARENT_TYPE_BY_KIND) || kind === 'DEPARTAMENTO' || kind === 'EMPRESA') {
|
|
||||||
throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_STRUCTURE_PARENT_KIND_INVALID',
|
|
||||||
message: 'El nivel indicado no requiere un registro padre',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
const expectedType = PARENT_TYPE_BY_KIND[kind];
|
|
||||||
const parameters: unknown[] = [expectedType];
|
|
||||||
let searchSql = '';
|
|
||||||
if (search?.trim()) {
|
|
||||||
parameters.push(`%${search.trim()}%`);
|
|
||||||
searchSql = `AND (asset.code ILIKE $2 OR asset.name ILIKE $2 OR COALESCE(asset.common_name,'') ILIKE $2)`;
|
|
||||||
}
|
|
||||||
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 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
|
|
||||||
) END AS "inventoryFamily",
|
|
||||||
CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
|
|
||||||
'id',parent.id,'code',parent.code,'name',parent.name
|
|
||||||
) END AS parent
|
|
||||||
FROM assets asset
|
|
||||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
|
||||||
LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
|
|
||||||
LEFT JOIN assets parent ON parent.id=asset.parent_id
|
|
||||||
WHERE lower(type.code)=lower($1::text)
|
|
||||||
AND asset.information_status<>'INACTIVE'
|
|
||||||
${searchSql}
|
|
||||||
ORDER BY asset.name,asset.code
|
|
||||||
LIMIT 100
|
|
||||||
`, parameters);
|
|
||||||
return { data: rows };
|
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
|
||||||
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 inserted = (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,$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
|
|
||||||
) RETURNING id
|
|
||||||
`, [
|
|
||||||
type.id,
|
|
||||||
parent?.id ?? null,
|
|
||||||
operationalAreaId,
|
|
||||||
operatorCompanyId,
|
|
||||||
concessionTypeId,
|
|
||||||
family?.id ?? null,
|
|
||||||
generatedCode,
|
|
||||||
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,
|
|
||||||
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',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
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 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,
|
|
||||||
]);
|
|
||||||
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 unknown as Record<string, unknown>,
|
|
||||||
metadata: {
|
|
||||||
versionNumber,inventoryStructureKind: dto.kind,
|
|
||||||
inventoryFamilyId: family?.id ?? null,inventoryFamilyCode: family?.code ?? null,
|
|
||||||
operatorCompanyId,
|
|
||||||
concessionTypeId,
|
|
||||||
},
|
|
||||||
}, 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'
|
|
||||||
? 'Una Empresa es un maestro independiente y no puede tener padre'
|
|
||||||
: 'Un Departamento es un 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}`,
|
|
||||||
});
|
|
||||||
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"
|
|
||||||
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
|
|
||||||
`, [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',
|
|
||||||
});
|
|
||||||
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,
|
|
||||||
familyId: string | null,
|
|
||||||
parent: ParentRow | null,
|
|
||||||
): Promise<FamilyRow | null> {
|
|
||||||
const expectedLevel = FAMILY_LEVEL_BY_KIND[kind];
|
|
||||||
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',
|
|
||||||
});
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (!familyId) throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_STRUCTURE_FAMILY_REQUIRED',
|
|
||||||
message: `Elegí la clasificación 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"
|
|
||||||
FROM inventory_families family
|
|
||||||
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.level !== expectedLevel) throw new BadRequestException({
|
|
||||||
code: 'INVENTORY_FAMILY_LEVEL_INVALID',
|
|
||||||
message: 'La clasificación 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({
|
|
||||||
code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID',
|
|
||||||
message: 'Ese tipo de Subinstalación no es compatible con la clasificación 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';
|
|
||||||
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 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
|
|
||||||
) 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 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]);
|
|
||||||
return rows[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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}`});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,217 +0,0 @@
|
|||||||
import { Injectable } from '@nestjs/common';
|
|
||||||
import { ActivityDossierService } from './activity-dossier.service';
|
|
||||||
import { AssetsService } from './assets.service';
|
|
||||||
import { InventoryFunctionService } from './inventory-function.service';
|
|
||||||
import { InventoryMergeService } from './inventory-merge.service';
|
|
||||||
|
|
||||||
type LooseRecord = Record<string, any>;
|
|
||||||
|
|
||||||
const MERGEABLE_DOSSIER_TYPES = new Set(['instalacion', 'subinstalacion']);
|
|
||||||
|
|
||||||
function dedupeById<T extends LooseRecord>(items: T[]): T[] {
|
|
||||||
const seen = new Set<string>();
|
|
||||||
const result: T[] = [];
|
|
||||||
for (const item of items) {
|
|
||||||
const id = String(item.id ?? '');
|
|
||||||
if (!id || seen.has(id)) continue;
|
|
||||||
seen.add(id);
|
|
||||||
result.push(item);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
function sortDesc(items: LooseRecord[], fieldCandidates: string[]): LooseRecord[] {
|
|
||||||
return [...items].sort((a, b) => {
|
|
||||||
const first = fieldCandidates.map((field) => b[field]).find(Boolean) ?? 0;
|
|
||||||
const second = fieldCandidates.map((field) => a[field]).find(Boolean) ?? 0;
|
|
||||||
return new Date(String(first)).getTime() - new Date(String(second)).getTime();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class MergedInventoryDossierService {
|
|
||||||
constructor(
|
|
||||||
private readonly assets: AssetsService,
|
|
||||||
private readonly activity: ActivityDossierService,
|
|
||||||
private readonly merges: InventoryMergeService,
|
|
||||||
private readonly functions: InventoryFunctionService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
async dossier(requestedAssetId: string): Promise<Record<string, unknown>> {
|
|
||||||
const requestedAsset = await this.assets.getById(requestedAssetId);
|
|
||||||
const requestedTypeCode = requestedAsset.type.code.trim().toLowerCase();
|
|
||||||
|
|
||||||
// La conciliación/fusión existe sólo para Instalaciones y Subinstalaciones.
|
|
||||||
// Los registros territoriales (Departamento, Área, Yacimiento) deben poder
|
|
||||||
// abrir su Actividad sin depender del subsistema de merge.
|
|
||||||
if (!MERGEABLE_DOSSIER_TYPES.has(requestedTypeCode)) {
|
|
||||||
return await this.activity.dossier(requestedAssetId);
|
|
||||||
}
|
|
||||||
|
|
||||||
const mergeStatus = await this.merges.status(requestedAssetId) as LooseRecord;
|
|
||||||
const canonical = mergeStatus.canonical as LooseRecord;
|
|
||||||
const requested = mergeStatus.requested as LooseRecord;
|
|
||||||
const aliases = (mergeStatus.aliases ?? []) as LooseRecord[];
|
|
||||||
const inventoryIds = [canonical.id, ...aliases.map((alias) => alias.id)]
|
|
||||||
.filter(Boolean)
|
|
||||||
.map(String)
|
|
||||||
.filter((value, index, all) => all.indexOf(value) === index);
|
|
||||||
|
|
||||||
const dossiers = await Promise.all(inventoryIds.map(async (assetId) => {
|
|
||||||
const dossier = await this.activity.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 };
|
|
||||||
}));
|
|
||||||
|
|
||||||
const enrich = (entry: LooseRecord, identity: LooseRecord): LooseRecord => ({
|
|
||||||
...entry,
|
|
||||||
historicalInventory: {
|
|
||||||
id: identity.id,
|
|
||||||
code: identity.code,
|
|
||||||
name: identity.name,
|
|
||||||
commonName: identity.commonName ?? null,
|
|
||||||
isCanonical: identity.id === canonical.id,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const collect = (key: string): LooseRecord[] => dedupeById(
|
|
||||||
dossiers.flatMap(({ identity, dossier }) =>
|
|
||||||
((dossier[key] ?? []) as LooseRecord[]).map((entry) => enrich(entry, identity)),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
const visits = sortDesc(collect('visits'), ['actualStartedAt', 'plannedStartAt', 'createdAt']);
|
|
||||||
const acts = sortDesc(collect('acts'), ['occurredAt', 'createdAt']);
|
|
||||||
const findings = sortDesc(collect('findings'), ['createdAt', 'updatedAt']);
|
|
||||||
const evidence = sortDesc(collect('evidence'), ['capturedAt', 'createdAt']);
|
|
||||||
const communications = sortDesc(collect('communications'), ['occurredAt', 'createdAt']);
|
|
||||||
const verificationResults = sortDesc(collect('verificationResults'), ['verifiedAt', 'resultRecordedAt']);
|
|
||||||
const documents = sortDesc(collect('documents'), ['documentDate', 'linkedAt']);
|
|
||||||
const inspectionReports = sortDesc(collect('inspectionReports'), ['generatedAt']);
|
|
||||||
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,
|
|
||||||
meta: {
|
|
||||||
...(event.meta ?? {}),
|
|
||||||
historicalInventory: {
|
|
||||||
id: identity.id,
|
|
||||||
code: identity.code,
|
|
||||||
name: identity.name,
|
|
||||||
isCanonical: identity.id === canonical.id,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
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)}`,
|
|
||||||
kind: 'MERGE',
|
|
||||||
occurredAt: alias.mergedAt,
|
|
||||||
title: `Inventario fusionado · ${String(alias.code)}`,
|
|
||||||
description: alias.reason,
|
|
||||||
meta: {
|
|
||||||
sourceAssetId: alias.id,
|
|
||||||
sourceCode: alias.code,
|
|
||||||
sourceName: alias.name,
|
|
||||||
canonicalAssetId: canonical.id,
|
|
||||||
canonicalCode: canonical.code,
|
|
||||||
canonicalName: canonical.name,
|
|
||||||
historyPreserved: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
timeline.sort((a, b) => new Date(String(b.occurredAt ?? 0)).getTime() - new Date(String(a.occurredAt ?? 0)).getTime());
|
|
||||||
|
|
||||||
const reports = documents.filter((document) => document.documentType === 'TECHNICAL_REPORT');
|
|
||||||
const openFindings = findings.filter((finding) => finding.status === 'OPEN').length;
|
|
||||||
const closedFindings = findings.filter((finding) => finding.status === 'CLOSED').length;
|
|
||||||
const warnings = dossiers.flatMap(({ assetId, dossier }) =>
|
|
||||||
((dossier.warnings ?? []) as string[]).map((facet) => `${assetId}:${facet}`),
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
asset: {
|
|
||||||
id: canonical.id,
|
|
||||||
code: canonical.code,
|
|
||||||
name: canonical.name,
|
|
||||||
commonName: dossiers.find((item) => item.assetId === canonical.id)?.identity?.commonName ?? null,
|
|
||||||
currentFunction,
|
|
||||||
},
|
|
||||||
requestedAsset: {
|
|
||||||
id: requested.id,
|
|
||||||
code: requested.code,
|
|
||||||
name: requested.name,
|
|
||||||
},
|
|
||||||
merge: {
|
|
||||||
requestedWasMerged: requested.id !== canonical.id,
|
|
||||||
canonicalAssetId: canonical.id,
|
|
||||||
aliases,
|
|
||||||
chain: mergeStatus.chain ?? [],
|
|
||||||
aggregatedInventoryIds: inventoryIds,
|
|
||||||
historyPolicy: 'CHRONOLOGICAL_AGGREGATION_WITH_ORIGINAL_IDENTITY',
|
|
||||||
},
|
|
||||||
counters: {
|
|
||||||
inspections: visits.length,
|
|
||||||
acts: acts.length,
|
|
||||||
findings: findings.length,
|
|
||||||
verifications: verificationResults.length,
|
|
||||||
openFindings,
|
|
||||||
closedFindings,
|
|
||||||
evidence: evidence.length,
|
|
||||||
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,
|
|
||||||
evidence,
|
|
||||||
communications,
|
|
||||||
verificationResults,
|
|
||||||
documents,
|
|
||||||
inspectionReports,
|
|
||||||
reports,
|
|
||||||
media,
|
|
||||||
versions,
|
|
||||||
timeline: timeline.slice(0, 1000),
|
|
||||||
warnings,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,8 +5,6 @@ import { AuthorizationModule } from '../authorization/authorization.module';
|
|||||||
import { PhaseADataModule } from '../core-data/phase-a-data.module';
|
import { PhaseADataModule } from '../core-data/phase-a-data.module';
|
||||||
import { AuthController } from './auth.controller';
|
import { AuthController } from './auth.controller';
|
||||||
import { AuthService } from './auth.service';
|
import { AuthService } from './auth.service';
|
||||||
import { MobileAuthController } from './mobile-auth.controller';
|
|
||||||
import { MobileAuthService } from './mobile-auth.service';
|
|
||||||
import { AccessTokenGuard } from './guards/access-token.guard';
|
import { AccessTokenGuard } from './guards/access-token.guard';
|
||||||
import { CsrfGuard } from './guards/csrf.guard';
|
import { CsrfGuard } from './guards/csrf.guard';
|
||||||
import { AuthConfigService } from '../common/config/auth-config.service';
|
import { AuthConfigService } from '../common/config/auth-config.service';
|
||||||
@@ -20,7 +18,6 @@ const providers = [
|
|||||||
PasswordService,
|
PasswordService,
|
||||||
TokenService,
|
TokenService,
|
||||||
AuthService,
|
AuthService,
|
||||||
MobileAuthService,
|
|
||||||
AccessTokenGuard,
|
AccessTokenGuard,
|
||||||
CsrfGuard,
|
CsrfGuard,
|
||||||
];
|
];
|
||||||
@@ -32,7 +29,7 @@ const providers = [
|
|||||||
AuditModule,
|
AuditModule,
|
||||||
AuthorizationModule,
|
AuthorizationModule,
|
||||||
],
|
],
|
||||||
controllers: [AuthController, MobileAuthController],
|
controllers: [AuthController],
|
||||||
providers,
|
providers,
|
||||||
exports: [
|
exports: [
|
||||||
AuthConfigService,
|
AuthConfigService,
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user