From acc17bf29166c04cbedb8aa3108055d63c262dc3 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sat, 5 Sep 2026 20:20:16 -0300 Subject: [PATCH 001/144] =?UTF-8?q?F2.2:=20agregar=20DTO=20de=20refresh=20?= =?UTF-8?q?m=C3=B3vil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/auth/dto/mobile-refresh.dto.ts | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 api-v3/src/auth/dto/mobile-refresh.dto.ts diff --git a/api-v3/src/auth/dto/mobile-refresh.dto.ts b/api-v3/src/auth/dto/mobile-refresh.dto.ts new file mode 100644 index 0000000..a3794e7 --- /dev/null +++ b/api-v3/src/auth/dto/mobile-refresh.dto.ts @@ -0,0 +1,8 @@ +import { IsString, MaxLength, MinLength } from 'class-validator'; + +export class MobileRefreshDto { + @IsString() + @MinLength(32) + @MaxLength(256) + refreshToken!: string; +} From f6807643735a7df52566c9de0a23c1e7f83f2598 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sat, 5 Sep 2026 20:20:40 -0300 Subject: [PATCH 002/144] =?UTF-8?q?F2.2:=20implementar=20autenticaci=C3=B3?= =?UTF-8?q?n=20Bearer=20Android?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/auth/mobile-auth.service.ts | 386 +++++++++++++++++++++++++ 1 file changed, 386 insertions(+) create mode 100644 api-v3/src/auth/mobile-auth.service.ts diff --git a/api-v3/src/auth/mobile-auth.service.ts b/api-v3/src/auth/mobile-auth.service.ts new file mode 100644 index 0000000..7f97689 --- /dev/null +++ b/api-v3/src/auth/mobile-auth.service.ts @@ -0,0 +1,386 @@ +import { isIP } from 'node:net'; +import { + ForbiddenException, + Injectable, + UnauthorizedException, +} from '@nestjs/common'; +import { DataSource } from 'typeorm'; +import { AuditService } from '../audit/audit.service'; +import type { + AuthPrincipal, + RequestWithContext, +} from '../common/http/request-context'; +import { AuthSessionsRepository } from '../core-data/repositories/auth-sessions.repository'; +import { RolesRepository } from '../core-data/repositories/roles.repository'; +import { UsersRepository } from '../core-data/repositories/users.repository'; +import { + AuditAction, + AuditSource, + AuthSession, + User, + UserStatus, +} from '../database/entities'; +import type { LoginDto } from './dto/login.dto'; +import { PasswordService } from './services/password.service'; +import { + IssuedRefreshToken, + TokenService, +} from './services/token.service'; + +interface RequestMetadata { + ip: string | null; + userAgent: string | null; +} + +interface SuccessfulAuthentication { + user: User; + accessToken: string; + refreshToken: IssuedRefreshToken; +} + +type LoginOutcome = SuccessfulAuthentication | null; +type RefreshOutcome = + | ({ kind: 'ok' } & SuccessfulAuthentication) + | { kind: 'reuse' } + | { kind: 'invalid' }; + +function invalidCredentials(): UnauthorizedException { + return new UnauthorizedException({ + code: 'INVALID_CREDENTIALS', + message: 'Credenciales inválidas', + }); +} + +function invalidSession(): UnauthorizedException { + return new UnauthorizedException({ + code: 'INVALID_SESSION', + message: 'Sesión móvil inválida o vencida', + }); +} + +function inspectorRequired(): ForbiddenException { + return new ForbiddenException({ + code: 'INSPECTION_INSPECTOR_ROLE_REQUIRED', + message: 'Sólo un usuario con rol inspector puede ingresar a la aplicación móvil', + }); +} + +function requestMetadata(request: RequestWithContext): RequestMetadata { + const candidateIp = request.ip || request.socket.remoteAddress || ''; + const ip = isIP(candidateIp) ? candidateIp : null; + const rawUserAgent = request.header('user-agent')?.trim(); + return { + ip, + userAgent: rawUserAgent ? rawUserAgent.slice(0, 2048) : null, + }; +} + +@Injectable() +export class MobileAuthService { + constructor( + private readonly dataSource: DataSource, + private readonly users: UsersRepository, + private readonly sessions: AuthSessionsRepository, + private readonly roles: RolesRepository, + private readonly passwords: PasswordService, + private readonly tokens: TokenService, + private readonly audit: AuditService, + ) {} + + async login(dto: LoginDto, request: RequestWithContext) { + const identifier = dto.identifier.trim().toLowerCase(); + const candidate = await this.users.findForAuthentication(identifier); + const metadata = requestMetadata(request); + + if (!candidate) { + await this.passwords.verifyUnknown(dto.password); + await this.audit.record({ + action: AuditAction.AUTH_LOGIN_FAILED, + requestId: request.requestId, + source: AuditSource.ANDROID, + ...metadata, + metadata: { identifier, reason: 'UNKNOWN_IDENTIFIER' }, + }); + throw invalidCredentials(); + } + + const outcome = await this.dataSource.transaction( + async (manager) => { + const user = await manager + .getRepository(User) + .createQueryBuilder('user') + .addSelect('user.passwordHash') + .where('user.id = :id', { id: candidate.id }) + .setLock('pessimistic_write') + .getOne(); + if (!user) return null; + + const now = new Date(); + const passwordMatches = await this.passwords.verify( + user.passwordHash, + dto.password, + ); + const locked = Boolean(user.lockedUntil && user.lockedUntil > now); + const active = user.status === UserStatus.ACTIVE; + + if (!passwordMatches || locked || !active) { + if (!passwordMatches && active && !locked) { + await manager.query( + ` + UPDATE users + SET + failed_login_attempts = failed_login_attempts + 1, + locked_until = CASE + WHEN failed_login_attempts + 1 >= $2 + THEN CURRENT_TIMESTAMP + ($3 * INTERVAL '1 second') + ELSE locked_until + END, + updated_at = CURRENT_TIMESTAMP + WHERE id = $1 + `, + [ + user.id, + this.tokens.maxLoginAttempts, + this.tokens.lockoutSeconds, + ], + ); + } + + await this.audit.record( + { + actorUserId: user.id, + actorUsername: user.username, + action: AuditAction.AUTH_LOGIN_FAILED, + entityType: 'user', + entityId: user.id, + requestId: request.requestId, + source: AuditSource.ANDROID, + ...metadata, + metadata: { + reason: !active + ? 'INACTIVE_USER' + : locked + ? 'LOCKED_USER' + : 'INVALID_PASSWORD', + }, + }, + manager, + ); + return null; + } + + if (this.passwords.needsRehash(user.passwordHash)) { + user.passwordHash = await this.passwords.hash(dto.password); + } + user.failedLoginAttempts = 0; + user.lockedUntil = null; + user.lastLoginAt = now; + await manager.getRepository(User).save(user); + + const refreshToken = this.tokens.issueRefreshToken(); + const session = manager.getRepository(AuthSession).create({ + id: refreshToken.sessionId, + userId: user.id, + refreshTokenHash: refreshToken.tokenHash, + expiresAt: this.tokens.refreshExpiresAt(now), + lastUsedAt: now, + revokedAt: null, + replacedBySessionId: null, + ip: metadata.ip, + userAgent: metadata.userAgent, + deviceLabel: dto.deviceLabel?.trim() || 'DH Android', + }); + await manager.getRepository(AuthSession).save(session); + + const accessToken = await this.tokens.issueAccessToken({ + userId: user.id, + sessionId: session.id, + username: user.username, + }); + + await this.audit.record( + { + actorUserId: user.id, + actorUsername: user.username, + action: AuditAction.AUTH_LOGIN_SUCCESS, + entityType: 'auth_session', + entityId: session.id, + requestId: request.requestId, + source: AuditSource.ANDROID, + ...metadata, + metadata: { deviceLabel: session.deviceLabel }, + }, + manager, + ); + + return { user, accessToken, refreshToken }; + }, + ); + + if (!outcome) throw invalidCredentials(); + return this.complete(outcome); + } + + async refresh(rawToken: string, request: RequestWithContext) { + const parsed = this.tokens.parseRefreshToken(rawToken); + if (!parsed) throw invalidSession(); + + const metadata = requestMetadata(request); + const outcome = await this.dataSource.transaction( + async (manager) => { + const session = await manager + .getRepository(AuthSession) + .createQueryBuilder('session') + .addSelect('session.refreshTokenHash') + .where('session.id = :id', { id: parsed.sessionId }) + .setLock('pessimistic_write') + .getOne(); + + if ( + !session || + !this.tokens.verifyRefreshToken(rawToken, session.refreshTokenHash) + ) { + return { kind: 'invalid' }; + } + + const user = await manager.getRepository(User).findOne({ + where: { id: session.userId }, + }); + + if (session.revokedAt) { + await this.sessions.revokeSessionFamily(session.id, manager); + await this.audit.record( + { + actorUserId: user?.id ?? null, + actorUsername: user?.username ?? null, + action: AuditAction.AUTH_REFRESH_REUSE_DETECTED, + entityType: 'auth_session', + entityId: session.id, + requestId: request.requestId, + source: AuditSource.ANDROID, + ...metadata, + }, + manager, + ); + return { kind: 'reuse' }; + } + + const now = new Date(); + if (!user || user.status !== UserStatus.ACTIVE || session.expiresAt <= now) { + session.revokedAt = now; + session.lastUsedAt = now; + await manager.getRepository(AuthSession).save(session); + if (user?.status === UserStatus.INACTIVE) { + await this.sessions.revokeUserSessions(user.id, undefined, manager); + } + return { kind: 'invalid' }; + } + + const refreshToken = this.tokens.issueRefreshToken(); + const replacement = manager.getRepository(AuthSession).create({ + id: refreshToken.sessionId, + userId: user.id, + refreshTokenHash: refreshToken.tokenHash, + expiresAt: this.tokens.refreshExpiresAt(now), + lastUsedAt: now, + revokedAt: null, + replacedBySessionId: null, + ip: metadata.ip, + userAgent: metadata.userAgent, + deviceLabel: session.deviceLabel, + }); + await manager.getRepository(AuthSession).save(replacement); + + session.revokedAt = now; + session.lastUsedAt = now; + session.replacedBySessionId = replacement.id; + await manager.getRepository(AuthSession).save(session); + + const accessToken = await this.tokens.issueAccessToken({ + userId: user.id, + sessionId: replacement.id, + username: user.username, + }); + + await this.audit.record( + { + actorUserId: user.id, + actorUsername: user.username, + action: AuditAction.AUTH_REFRESH, + entityType: 'auth_session', + entityId: replacement.id, + requestId: request.requestId, + source: AuditSource.ANDROID, + ...metadata, + metadata: { replacedSessionId: session.id }, + }, + manager, + ); + + return { kind: 'ok', user, accessToken, refreshToken }; + }, + ); + + if (outcome.kind !== 'ok') throw invalidSession(); + return this.complete(outcome); + } + + async logout( + principal: AuthPrincipal, + request: RequestWithContext, + ) { + const metadata = requestMetadata(request); + await this.dataSource.transaction(async (manager) => { + await this.sessions.revokeSession( + principal.sessionId, + principal.userId, + manager, + ); + await this.audit.record( + { + actorUserId: principal.userId, + actorUsername: principal.username, + action: AuditAction.AUTH_LOGOUT, + entityType: 'auth_session', + entityId: principal.sessionId, + requestId: request.requestId, + source: AuditSource.ANDROID, + ...metadata, + }, + manager, + ); + }); + return { status: 'ok' }; + } + + private async complete(authentication: SuccessfulAuthentication) { + const [roleCodes, permissionCodes] = await Promise.all([ + this.roles.findRoleCodesForUser(authentication.user.id), + this.roles.findPermissionCodesForUser(authentication.user.id), + ]); + + if (!roleCodes.includes('inspector')) { + await this.sessions.revokeSession( + authentication.refreshToken.sessionId, + authentication.user.id, + ); + throw inspectorRequired(); + } + + return { + user: { + id: authentication.user.id, + username: authentication.user.username, + firstName: authentication.user.firstName, + lastName: authentication.user.lastName, + email: authentication.user.email, + mustChangePassword: authentication.user.mustChangePassword, + roles: roleCodes, + permissions: permissionCodes, + }, + accessToken: authentication.accessToken, + refreshToken: authentication.refreshToken.token, + accessExpiresInSeconds: this.tokens.accessTokenTtlSeconds, + }; + } +} From d895812235bfbf9aea73b792304766f24d38328b Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sat, 5 Sep 2026 20:20:47 -0300 Subject: [PATCH 003/144] =?UTF-8?q?F2.2:=20exponer=20endpoints=20de=20aute?= =?UTF-8?q?nticaci=C3=B3n=20Android?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/auth/mobile-auth.controller.ts | 56 +++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 api-v3/src/auth/mobile-auth.controller.ts diff --git a/api-v3/src/auth/mobile-auth.controller.ts b/api-v3/src/auth/mobile-auth.controller.ts new file mode 100644 index 0000000..05cad07 --- /dev/null +++ b/api-v3/src/auth/mobile-auth.controller.ts @@ -0,0 +1,56 @@ +import { + Body, + Controller, + HttpCode, + Post, + Req, +} from '@nestjs/common'; +import { Throttle } from '@nestjs/throttler'; +import type { + AuthPrincipal, + RequestWithContext, +} from '../common/http/request-context'; +import { CurrentAuth } from './decorators/current-auth.decorator'; +import { Public } from './decorators/public.decorator'; +import { SkipCsrf } from './decorators/skip-csrf.decorator'; +import { LoginDto } from './dto/login.dto'; +import { MobileRefreshDto } from './dto/mobile-refresh.dto'; +import { MobileAuthService } from './mobile-auth.service'; + +@Controller('auth/mobile') +export class MobileAuthController { + constructor(private readonly mobileAuth: MobileAuthService) {} + + @Post('login') + @HttpCode(200) + @Public() + @SkipCsrf() + @Throttle({ default: { limit: 5, ttl: 60_000, blockDuration: 60_000 } }) + login( + @Body() dto: LoginDto, + @Req() request: RequestWithContext, + ) { + return this.mobileAuth.login(dto, request); + } + + @Post('refresh') + @HttpCode(200) + @Public() + @SkipCsrf() + @Throttle({ default: { limit: 20, ttl: 60_000 } }) + refresh( + @Body() dto: MobileRefreshDto, + @Req() request: RequestWithContext, + ) { + return this.mobileAuth.refresh(dto.refreshToken, request); + } + + @Post('logout') + @HttpCode(200) + logout( + @CurrentAuth() principal: AuthPrincipal, + @Req() request: RequestWithContext, + ) { + return this.mobileAuth.logout(principal, request); + } +} From 4fb1c502c8fec63155260b6fe95a0a1b8e35a4b0 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sat, 5 Sep 2026 20:20:56 -0300 Subject: [PATCH 004/144] =?UTF-8?q?F2.2:=20registrar=20autenticaci=C3=B3n?= =?UTF-8?q?=20m=C3=B3vil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/auth/auth.module.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/api-v3/src/auth/auth.module.ts b/api-v3/src/auth/auth.module.ts index 5875058..fa83cfa 100644 --- a/api-v3/src/auth/auth.module.ts +++ b/api-v3/src/auth/auth.module.ts @@ -5,6 +5,8 @@ import { AuthorizationModule } from '../authorization/authorization.module'; import { PhaseADataModule } from '../core-data/phase-a-data.module'; import { AuthController } from './auth.controller'; 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 { CsrfGuard } from './guards/csrf.guard'; import { AuthConfigService } from '../common/config/auth-config.service'; @@ -18,6 +20,7 @@ const providers = [ PasswordService, TokenService, AuthService, + MobileAuthService, AccessTokenGuard, CsrfGuard, ]; @@ -29,7 +32,7 @@ const providers = [ AuditModule, AuthorizationModule, ], - controllers: [AuthController], + controllers: [AuthController, MobileAuthController], providers, exports: [ AuthConfigService, From 4c01cf6ffe1991f08276fc173fa58710aec062d4 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sat, 5 Sep 2026 22:27:29 -0300 Subject: [PATCH 005/144] fix: alinear health con API 0.21.0-2 --- api-v3/src/version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-v3/src/version.ts b/api-v3/src/version.ts index e897d8a..ed2e40d 100644 --- a/api-v3/src/version.ts +++ b/api-v3/src/version.ts @@ -1,2 +1,2 @@ -export const API_VERSION = '0.21.0-1'; +export const API_VERSION = '0.21.0-2'; export const API_PHASE = 'F2.1'; From 3d101e239ca6aa61518c20325de725f42373ce35 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:36:04 -0300 Subject: [PATCH 006/144] android: iniciar proyecto nativo F2.2 --- android-app/settings.gradle.kts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 android-app/settings.gradle.kts diff --git a/android-app/settings.gradle.kts b/android-app/settings.gradle.kts new file mode 100644 index 0000000..a818258 --- /dev/null +++ b/android-app/settings.gradle.kts @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "DHInspeccion" +include(":app") From 5b708e433f8b232aa9a7fa92b9e7c36ee6241759 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:36:13 -0300 Subject: [PATCH 007/144] android: configurar AGP y Kotlin --- android-app/build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 android-app/build.gradle.kts diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts new file mode 100644 index 0000000..553a5c0 --- /dev/null +++ b/android-app/build.gradle.kts @@ -0,0 +1,5 @@ +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 +} From db3d87727ebfe692bb154fbe39ee3199e613fd44 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:36:18 -0300 Subject: [PATCH 008/144] android: fijar propiedades de build --- android-app/gradle.properties | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 android-app/gradle.properties diff --git a/android-app/gradle.properties b/android-app/gradle.properties new file mode 100644 index 0000000..19a3495 --- /dev/null +++ b/android-app/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx3g -Dfile.encoding=UTF-8 +android.useAndroidX=true +kotlin.code.style=official +android.nonTransitiveRClass=true From 0d181b37a0961eea56445555bb684c3081be92c6 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:36:32 -0300 Subject: [PATCH 009/144] =?UTF-8?q?android:=20configurar=20aplicaci=C3=B3n?= =?UTF-8?q?=20DH=20Inspecci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android-app/app/build.gradle.kts | 77 ++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 android-app/app/build.gradle.kts diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts new file mode 100644 index 0000000..7e8df72 --- /dev/null +++ b/android-app/app/build.gradle.kts @@ -0,0 +1,77 @@ +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 = 14 + versionName = "0.10.0" + + 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.lifecycle:lifecycle-runtime-ktx:2.9.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2") + implementation("androidx.compose.material3:material3") + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-tooling-preview") + 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") +} From b3d6ae1326f198a8dd408a874e3eb86b1f201f41 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:36:40 -0300 Subject: [PATCH 010/144] android: agregar reglas base --- android-app/app/proguard-rules.pro | 1 + 1 file changed, 1 insertion(+) create mode 100644 android-app/app/proguard-rules.pro diff --git a/android-app/app/proguard-rules.pro b/android-app/app/proguard-rules.pro new file mode 100644 index 0000000..fa46682 --- /dev/null +++ b/android-app/app/proguard-rules.pro @@ -0,0 +1 @@ +# DH Inspección V2. Las reglas se ampliarán cuando se habilite minificación de release. From 692e6119cccad58c3a745cc7e62dfd3065bab0ef Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:36:48 -0300 Subject: [PATCH 011/144] android: declarar permisos y FileProvider --- android-app/app/src/main/AndroidManifest.xml | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 android-app/app/src/main/AndroidManifest.xml diff --git a/android-app/app/src/main/AndroidManifest.xml b/android-app/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..73bfee0 --- /dev/null +++ b/android-app/app/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + From 2a7bf54ce14d1bc12aa35b589f04bf03e025fbaa Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:36:54 -0300 Subject: [PATCH 012/144] android: configurar almacenamiento de fotos --- android-app/app/src/main/res/xml/file_paths.xml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 android-app/app/src/main/res/xml/file_paths.xml diff --git a/android-app/app/src/main/res/xml/file_paths.xml b/android-app/app/src/main/res/xml/file_paths.xml new file mode 100644 index 0000000..d039e94 --- /dev/null +++ b/android-app/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,4 @@ + + + + From 0b2c7f0216e6cde8d01ddbe319f2cf18c1ecd65b Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:37:01 -0300 Subject: [PATCH 013/144] android: agregar recursos de texto --- android-app/app/src/main/res/values/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 android-app/app/src/main/res/values/strings.xml diff --git a/android-app/app/src/main/res/values/strings.xml b/android-app/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..7f533ee --- /dev/null +++ b/android-app/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + DH Inspección + From ad79fb589dd8b4de8bff0cff65bff6ab7332b224 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:37:08 -0300 Subject: [PATCH 014/144] android: agregar tema base --- android-app/app/src/main/res/values/styles.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 android-app/app/src/main/res/values/styles.xml diff --git a/android-app/app/src/main/res/values/styles.xml b/android-app/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..f128c62 --- /dev/null +++ b/android-app/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + From 216a813f50b2a017d2cd807aadf8b36687d37bbb Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:38:21 -0300 Subject: [PATCH 015/144] =?UTF-8?q?android:=20implementar=20contrato=20API?= =?UTF-8?q?=20y=20sesi=C3=B3n=20cifrada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../korexlabs/dhinspeccion/data/DhMobile.kt | 531 ++++++++++++++++++ 1 file changed, 531 insertions(+) create mode 100644 android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt new file mode 100644 index 0000000..882b729 --- /dev/null +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt @@ -0,0 +1,531 @@ +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 kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock +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 = emptyList(), + val permissions: List = 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 title: String? = null, + val objective: String? = null, + val status: String, + val scopeAsset: AssetSummary? = null, + val operationalArea: AssetSummary? = null, + val operatorCompany: AssetSummary? = null, + val leadInspector: PersonSummary? = null, + 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, 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 = emptyList(), +) + +data class VisitDetail( + val id: String, + val code: String, + val title: String? = null, + val objective: String? = null, + val status: String, + 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 = emptyList(), + val planningAssets: List = emptyList(), + val team: List = 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, +) + +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 FieldType( + val id: String, + val code: String, + val name: String, + val description: String? = null, + val attributes: List = emptyList(), +) + +data class FieldTypeResponse( + val context: FieldContext, + val parent: AssetSummary, + val data: List, +) + +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 code: String? = null, + val name: String, + val commonName: String? = null, + val description: String? = null, + val discoveryNotes: String? = null, + val attributes: Map, + val deviceLatitude: Double, + val deviceLongitude: Double, + val deviceAccuracyM: Double? = null, + val deviceCapturedAt: String, + val deviceLabel: String = "DH Android", +) + +data class FieldPhotoResponse( + val capture: CaptureStatus, +) + +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 + + @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 + + @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 refreshMutex = Mutex() + 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 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 = latitude.toString().toRequestBody(text), + longitude = longitude.toString().toRequestBody(text), + accuracy = accuracyM?.toString()?.toRequestBody(text), + capturedAt = capturedAt.toRequestBody(text), + deviceLabel = "DH Android".toRequestBody(text), + exifLatitude = latitude.toString().toRequestBody(text), + exifLongitude = longitude.toString().toRequestBody(text), + exifCapturedAt = capturedAt.toRequestBody(text), + ) + } + + private suspend fun authorized(block: suspend (StoredSession) -> T): T { + var session = store.load() ?: throw IllegalStateException("Sesión no iniciada") + try { + return block(session) + } catch (error: HttpException) { + if (error.code() != 401) throw error + } + session = refresh(session.refreshToken) + return block(session) + } + + private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock { + val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada") + if (latest.refreshToken != previousRefreshToken) return@withLock latest + try { + store.save(api.refresh(RefreshRequest(previousRefreshToken))) + } catch (error: Throwable) { + store.clear() + throw error + } + } + + companion object { + fun humanError(error: Throwable): String { + 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() + } +} From 199129847e19f359387e968723d9c5ab80af0ddd Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:38:52 -0300 Subject: [PATCH 016/144] android: agregar estado y operaciones de campo --- .../korexlabs/dhinspeccion/MainViewModel.kt | 209 ++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100644 android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt new file mode 100644 index 0000000..b65f958 --- /dev/null +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt @@ -0,0 +1,209 @@ +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.CreateFieldInventoryRequest +import com.korexlabs.dhinspeccion.data.DhRepository +import com.korexlabs.dhinspeccion.data.FieldAssetDetail +import com.korexlabs.dhinspeccion.data.FieldInventoryItem +import com.korexlabs.dhinspeccion.data.FieldType +import com.korexlabs.dhinspeccion.data.StoredSession +import com.korexlabs.dhinspeccion.data.VisitDetail +import com.korexlabs.dhinspeccion.data.VisitSummary +import kotlinx.coroutines.launch +import java.io.File +import java.time.Instant + +class MainViewModel(application: Application) : AndroidViewModel(application) { + private val repository = DhRepository(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 by mutableStateOf(emptyList()) + private set + var visit: VisitDetail? by mutableStateOf(null) + private set + + var inventory: List by mutableStateOf(emptyList()) + private set + var fieldTypes: List by mutableStateOf(emptyList()) + private set + var selectedFieldAsset: FieldAssetDetail? by mutableStateOf(null) + 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 { + 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() + fieldTypes = emptyList() + selectedFieldAsset = null + } + } + + fun loadVisits() = launchBusy { loadVisitsInternal() } + + private suspend fun loadVisitsInternal() { + visits = repository.visits().data + } + + fun openVisit(id: String) = launchBusy { + visit = repository.visit(id) + inventory = emptyList() + fieldTypes = emptyList() + selectedFieldAsset = null + } + + fun closeVisitView() { + visit = null + inventory = emptyList() + fieldTypes = emptyList() + selectedFieldAsset = null + loadVisits() + } + + fun startVisit() { + val id = visit?.id ?: return + launchBusy { + visit = repository.startVisit(id) + notice = "Inspección iniciada." + loadVisitsInternal() + } + } + + fun searchInventory(search: String, parentId: String? = null) { + val id = visit?.id ?: return + launchBusy { + inventory = repository.fieldInventory(id, search, parentId).data + } + } + + fun loadFieldTypes(parentId: String? = null) { + val id = visit?.id ?: return + launchBusy { + fieldTypes = repository.fieldTypes(id, parentId).data + } + } + + fun selectExisting(item: FieldInventoryItem) { + val visitId = visit?.id ?: return + launchBusy { + selectedFieldAsset = repository.selectFieldAsset(visitId, item.id) + notice = "Inventario agregado a la inspección." + inventory = repository.fieldInventory(visitId, null, null).data + } + } + + fun createFieldAsset( + type: FieldType, + parentId: String?, + name: String, + commonName: String?, + attributes: Map, + latitude: Double, + longitude: Double, + accuracyM: Double?, + ) { + val visitId = visit?.id ?: return + if (visit?.status != "IN_PROGRESS") { + error = "La inspección debe estar en curso para dar de alta Inventario." + return + } + launchBusy { + val request = CreateFieldInventoryRequest( + typeId = type.id, + parentId = parentId, + name = name.trim(), + commonName = commonName?.trim()?.takeIf { it.isNotBlank() }, + attributes = attributes, + deviceLatitude = latitude, + deviceLongitude = longitude, + deviceAccuracyM = accuracyM, + deviceCapturedAt = Instant.now().toString(), + ) + selectedFieldAsset = repository.createFieldAsset(visitId, request) + notice = "Inventario creado con GPS. Falta la fotografía obligatoria." + inventory = repository.fieldInventory(visitId, null, null).data + } + } + + fun uploadFieldPhoto( + file: File, + latitude: Double, + longitude: Double, + accuracyM: Double?, + ) { + val visitId = visit?.id ?: return + val asset = selectedFieldAsset?.asset ?: return + launchBusy { + 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." + } + inventory = repository.fieldInventory(visitId, null, null).data + } + } + + fun clearSelectedFieldAsset() { + selectedFieldAsset = null + } + + private fun launchBusy(block: suspend () -> Unit) { + viewModelScope.launch { + busy = true + error = null + try { + block() + } catch (throwable: Throwable) { + error = DhRepository.humanError(throwable) + if (repository.currentSession() == null) session = null + } finally { + busy = false + } + } + } +} From 00ac09f358562562274a019b169dbff9eafd9ff7 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:39:22 -0300 Subject: [PATCH 017/144] android: agregar actividad principal Compose --- .../korexlabs/dhinspeccion/MainActivity.kt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainActivity.kt diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainActivity.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainActivity.kt new file mode 100644 index 0000000..f5459ea --- /dev/null +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainActivity.kt @@ -0,0 +1,19 @@ +package com.korexlabs.dhinspeccion + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.lifecycle.viewmodel.compose.viewModel +import com.korexlabs.dhinspeccion.ui.DhApp + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + val model: MainViewModel = viewModel() + DhApp(model) + } + } +} From 118e41c9387a6ebc65918a5d346906a34b70a443 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:41:07 -0300 Subject: [PATCH 018/144] android: implementar flujo inspector y alta de Inventario --- .../com/korexlabs/dhinspeccion/ui/DhApp.kt | 579 ++++++++++++++++++ 1 file changed, 579 insertions(+) create mode 100644 android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt new file mode 100644 index 0000000..4148db2 --- /dev/null +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt @@ -0,0 +1,579 @@ +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.CancellationTokenSource +import com.google.android.gms.location.LocationServices +import com.google.android.gms.location.Priority +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(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(null) } + val attributeValues = remember { mutableStateMapOf() } + + 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(null) } + var pendingPhotoGeo by remember { mutableStateOf(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): Map = + 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) + client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token) + .addOnSuccessListener { location -> + if (!continuation.isActive) return@addOnSuccessListener + if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual.")) + else continuation.resume(GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble())) + } + .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) } + continuation.invokeOnCancellation { source.cancel() } +} + +private fun newPhoto(context: Context): Pair { + 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) From 205b97f16bab449555e56621c9a589172ed90e58 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:41:48 -0300 Subject: [PATCH 019/144] ci: compilar APK Android F2.2 --- .github/workflows/android.yml | 59 +++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 0000000..888cfa4 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,59 @@ +name: Android APK + +on: + push: + branches: + - feature/f2-2-android-v2 + paths: + - 'android-app/**' + - '.github/workflows/android.yml' + pull_request: + paths: + - 'android-app/**' + - 'api-v3/src/auth/**' + - '.github/workflows/android.yml' + workflow_dispatch: + +permissions: + contents: read + +jobs: + build-debug-apk: + runs-on: ubuntu-latest + timeout-minutes: 30 + 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@v4 + with: + gradle-version: '8.13' + + - name: Assemble debug + working-directory: android-app + run: gradle --no-daemon :app:assembleDebug + + - name: Unit tests + working-directory: android-app + run: gradle --no-daemon :app:testDebugUnitTest + + - name: Upload APK + uses: actions/upload-artifact@v4 + with: + name: DH-Inspeccion-F2.2-0.10.0-debug + path: android-app/app/build/outputs/apk/debug/app-debug.apk + if-no-files-found: error + retention-days: 14 From cd42e55b7b3be68981a626963a798d26b6a3ae9a Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:42:32 -0300 Subject: [PATCH 020/144] ci: validar backend y web en rama F2.2 --- .github/workflows/f2-2-ci.yml | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .github/workflows/f2-2-ci.yml diff --git a/.github/workflows/f2-2-ci.yml b/.github/workflows/f2-2-ci.yml new file mode 100644 index 0000000..80594a1 --- /dev/null +++ b/.github/workflows/f2-2-ci.yml @@ -0,0 +1,52 @@ +name: F2.2 Integration CI + +on: + push: + branches: + - feature/f2-2-android-v2 + 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 + + 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 From 0103422473a5986becf0254c2a998b0a6b2d6660 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:49:16 -0300 Subject: [PATCH 021/144] =?UTF-8?q?android:=20corregir=20token=20de=20canc?= =?UTF-8?q?elaci=C3=B3n=20GPS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt index 4148db2..424be1e 100644 --- a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/DhApp.kt @@ -53,9 +53,9 @@ 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.CancellationTokenSource 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 From f8da455241230195a73e1882dfeff2186b5ee9bc Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:55:32 -0300 Subject: [PATCH 022/144] F2.2: versionar API 0.22.0-1 --- api-v3/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api-v3/package.json b/api-v3/package.json index 4331a26..15d283c 100644 --- a/api-v3/package.json +++ b/api-v3/package.json @@ -1,6 +1,6 @@ { "name": "dhv2-api", - "version": "0.21.0-2", + "version": "0.22.0-1", "private": true, "license": "UNLICENSED", "scripts": { @@ -43,4 +43,4 @@ "tsx": "^4.20.6", "typescript": "^5.9.0" } -} +} \ No newline at end of file From 30a06f17f3241ada3e57cf09030112fc58a26b7c Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 16:55:38 -0300 Subject: [PATCH 023/144] F2.2: identificar health de API --- api-v3/src/version.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api-v3/src/version.ts b/api-v3/src/version.ts index ed2e40d..09dee3d 100644 --- a/api-v3/src/version.ts +++ b/api-v3/src/version.ts @@ -1,2 +1,2 @@ -export const API_VERSION = '0.21.0-2'; -export const API_PHASE = 'F2.1'; +export const API_VERSION = '0.22.0-1'; +export const API_PHASE = 'F2.2'; From 7673afcc4fb89ef328e0912918b52ecff1cff246 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:24:49 -0300 Subject: [PATCH 024/144] =?UTF-8?q?android:=20agregar=20biometr=C3=ADa=20y?= =?UTF-8?q?=20visibilidad=20de=20contrase=C3=B1a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android-app/app/build.gradle.kts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts index 7e8df72..66b1d39 100644 --- a/android-app/app/build.gradle.kts +++ b/android-app/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "com.korexlabs.dhinspeccion" minSdk = 26 targetSdk = 36 - versionCode = 14 - versionName = "0.10.0" + versionCode = 15 + versionName = "0.10.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -56,11 +56,14 @@ dependencies { 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") From f9cc5610983df6faccce9a6a9af9a770e0e4149f Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:25:13 -0300 Subject: [PATCH 025/144] =?UTF-8?q?android:=20agregar=20ojo=20y=20desbloqu?= =?UTF-8?q?eo=20biom=C3=A9trico?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../korexlabs/dhinspeccion/ui/LoginGate.kt | 202 ++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt new file mode 100644 index 0000000..2d5a9ec --- /dev/null +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt @@ -0,0 +1,202 @@ +package com.korexlabs.dhinspeccion.ui + +import android.content.Context +import androidx.biometric.BiometricManager +import androidx.biometric.BiometricPrompt +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.padding +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.platform.LocalContext +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 + +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 + } + + MaterialTheme { + Surface(Modifier.fillMaxSize()) { + 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() + }, + ) + else -> DhApp(model) + } + } + } +} + +@Composable +private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Unit) { + var identifier by rememberSaveable { mutableStateOf("") } + var password by rememberSaveable { mutableStateOf("") } + var passwordVisible by rememberSaveable { mutableStateOf(false) } + + 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") + 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 email") }, + 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(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().padding(24.dp), contentAlignment = Alignment.Center) { + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp), horizontalAlignment = Alignment.CenterHorizontally) { + 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") } + } + } +} From e5b7d72951a1fb1ee3d525a57f068aff9bf9b7aa Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:25:21 -0300 Subject: [PATCH 026/144] =?UTF-8?q?android:=20usar=20puerta=20de=20acceso?= =?UTF-8?q?=20biom=C3=A9trica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/korexlabs/dhinspeccion/MainActivity.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainActivity.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainActivity.kt index f5459ea..339e193 100644 --- a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainActivity.kt +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainActivity.kt @@ -1,19 +1,19 @@ package com.korexlabs.dhinspeccion import android.os.Bundle -import androidx.activity.ComponentActivity 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.DhApp +import com.korexlabs.dhinspeccion.ui.DhRoot -class MainActivity : ComponentActivity() { +class MainActivity : FragmentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) enableEdgeToEdge() setContent { val model: MainViewModel = viewModel() - DhApp(model) + DhRoot(model, this@MainActivity) } } } From 83efd2cac2c445874387b1da299bf02dea770ab7 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:28:05 -0300 Subject: [PATCH 027/144] F2.2.1: versionar fuente normalizada de planillas --- .../src/reference-data/f2-2-1-excel-source.ts | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 api-v3/src/reference-data/f2-2-1-excel-source.ts diff --git a/api-v3/src/reference-data/f2-2-1-excel-source.ts b/api-v3/src/reference-data/f2-2-1-excel-source.ts new file mode 100644 index 0000000..04db580 --- /dev/null +++ b/api-v3/src/reference-data/f2-2-1-excel-source.ts @@ -0,0 +1,33 @@ +import { gunzipSync } from 'node:zlib'; + +/** + * Snapshot normalizado y comprimido de: + * - Tablas de yacimiento(1).xlsx / cr26e_tabla1 + * - APLICACION APP(1).xlsx / Hoja1 + Hoja2 + * + * Se conserva como payload de migración para que producción no dependa de leer + * archivos XLSX en runtime. La migración guarda además sourceName/sourceReference. + */ +const PAYLOAD_BASE64 = `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`; + +export interface TerritorySourceRow { + field: string; + area: string; + department: string; + concessionType: string; + operator: string; +} + +export interface AppSourceData { + territory: TerritorySourceRow[]; + types: Array<{ code: string; name: string }>; + parentPairs: Array<{ child: string; parent: string }>; + attributes: Array<{ type: string; labels: string[] }>; + directFindings: Array<{ type: string; titles: string[] }>; + idemRefs: Array<{ type: string; refs: string[] }>; + groups: Array<{ name: string; items: Array<{ number: number; title: string }> }>; +} + +export function loadF221ExcelSource(): AppSourceData { + return JSON.parse(gunzipSync(Buffer.from(PAYLOAD_BASE64, 'base64')).toString('utf8')) as AppSourceData; +} From 3db62aad774fecbf15c2a6e90adf86a44388861f Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:29:46 -0300 Subject: [PATCH 028/144] =?UTF-8?q?F2.2.1:=20importar=20maestros=20y=20cat?= =?UTF-8?q?=C3=A1logo=20desde=20planillas=20oficiales?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...00000-phase-f2-2-1-reference-excel-data.ts | 414 ++++++++++++++++++ 1 file changed, 414 insertions(+) create mode 100644 api-v3/src/database/migrations/1789754400000-phase-f2-2-1-reference-excel-data.ts diff --git a/api-v3/src/database/migrations/1789754400000-phase-f2-2-1-reference-excel-data.ts b/api-v3/src/database/migrations/1789754400000-phase-f2-2-1-reference-excel-data.ts new file mode 100644 index 0000000..456a87a --- /dev/null +++ b/api-v3/src/database/migrations/1789754400000-phase-f2-2-1-reference-excel-data.ts @@ -0,0 +1,414 @@ +import { createHash } from 'node:crypto'; +import { MigrationInterface, QueryRunner } from 'typeorm'; +import { loadF221ExcelSource } from '../../reference-data/f2-2-1-excel-source'; + +function slug(value: string, max = 70): string { + const normalized = value + .normalize('NFD') + .replace(/[\u0300-\u036f]/g, '') + .toLowerCase() + .replace(/[^a-z0-9]+/g, '_') + .replace(/^_+|_+$/g, ''); + return (normalized || 'item').slice(0, max); +} + +function stableCode(prefix: string, ...parts: string[]): string { + const hash = createHash('sha1').update(parts.join('|')).digest('hex').slice(0, 8).toUpperCase(); + const readable = slug(parts[0] ?? 'item', 72).toUpperCase(); + return `${prefix}-${readable}-${hash}`.slice(0, 120); +} + +function legalRightType(value: string): string { + const normalized = slug(value); + if (normalized.includes('explot')) return 'EXPLOITATION_CONCESSION'; + if (normalized.includes('explor')) return 'EXPLORATION_PERMIT'; + if (normalized.includes('transport')) return 'TRANSPORT_CONCESSION'; + return 'OTHER'; +} + +const groupTargets: Record = { + tanques: ['tanque'], + separadores: ['separador'], + bomba_zona_de_bombas: ['bomba'], + calderas: ['caldera'], + drenaje: ['drenaje'], + antorcha: ['antorcha'], + colectores: ['colector'], + sist_electrico_iluminacion: ['sistema_electrico_iluminacion'], + defensa_contra_incendios: ['defensa_contra_incendios'], + cargadero_y_descargadero_de_camiones: ['cargadero_descargadero'], + filtros: ['filtro'], + eq_flotacion: ['equipo_flotacion'], + baterias_y_plantas: ['bateria', 'planta'], + fwko_tratadores_calentadores: ['fwo', 'fwko', 'calentador', 'tratador_termico'], + bombeo_mecanico: ['bombeo_mecanico'], + bombeo_electreosumergible: ['bombeo_electreosumergible'], + bombeo_cavidad_progresiva_pcp: ['bombeo_cavidad_progresiva_pcp'], + pozos_surgentes_prod_gas: ['pozos_surgentes_prod_gas'], + pozos_inyectores_agua: ['pozos_inyectores_agua'], +}; + +const referenceAliases: Record = { + tanque: 'tanque', + tanques: 'tanque', + separador: 'separador', + separadores: 'separador', + bombas: 'bomba', + bomba: 'bomba', + fwo: 'fwo', + fwko: 'fwko', + calentador: 'calentador', + piletas: 'drenaje', + pileta: 'drenaje', + cargadero_descargadero: 'cargadero_descargadero', + generador: 'generador', +}; + +export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterface { + name = 'PhaseF221ReferenceExcelData1789754400000'; + + public async up(queryRunner: QueryRunner): Promise { + const source = loadF221ExcelSource(); + + await queryRunner.query(` + INSERT INTO source_documents (document_type,document_number,title,issuer,notes) + SELECT 'SPREADSHEET','DH-F221-TERRITORIO','Tablas de yacimiento(1).xlsx','Dirección de Hidrocarburos', + 'Fuente F2.2.1: maestro territorial y operativo. Hoja normalizada cr26e_tabla1.' + WHERE NOT EXISTS ( + SELECT 1 FROM source_documents WHERE document_number='DH-F221-TERRITORIO' AND issuer='Dirección de Hidrocarburos' + ) + `); + await queryRunner.query(` + INSERT INTO source_documents (document_type,document_number,title,issuer,notes) + SELECT 'SPREADSHEET','DH-F221-APP','APLICACION APP(1).xlsx','Dirección de Hidrocarburos', + 'Fuente F2.2.1: matriz de jerarquía, información y catálogo contextual de hallazgos. Hojas Hoja1 y Hoja2.' + WHERE NOT EXISTS ( + SELECT 1 FROM source_documents WHERE document_number='DH-F221-APP' AND issuer='Dirección de Hidrocarburos' + ) + `); + + const territoryDocumentRows = (await queryRunner.query( + `SELECT id FROM source_documents WHERE document_number='DH-F221-TERRITORIO' AND issuer='Dirección de Hidrocarburos' LIMIT 1`, + )) as Array<{ id: string }>; + const appDocumentRows = (await queryRunner.query( + `SELECT id FROM source_documents WHERE document_number='DH-F221-APP' AND issuer='Dirección de Hidrocarburos' LIMIT 1`, + )) as Array<{ id: string }>; + const territoryDocumentId = territoryDocumentRows[0]?.id; + const appDocumentId = appDocumentRows[0]?.id; + if (!territoryDocumentId || !appDocumentId) throw new Error('F2.2.1 source documents could not be resolved'); + + await queryRunner.query(`UPDATE asset_types SET can_be_root=true WHERE operational_role IN ('AREA','COMPANY')`); + await queryRunner.query(` + INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role) + SELECT 'yacimiento','Yacimiento','Yacimiento físico/operativo perteneciente a un Área. Su operadora se determina por contexto histórico.',false,true,'GENERIC' + WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='yacimiento') + `); + await queryRunner.query(` + INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id) + SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent + WHERE lower(child.code)='yacimiento' AND parent.operational_role='AREA' + ON CONFLICT DO NOTHING + `); + + await queryRunner.query(` + INSERT INTO asset_attribute_definitions (asset_type_id,code,name,data_type,is_required,is_active,sort_order) + SELECT type.id,definition.code,definition.name,'TEXT',false,true,definition.sort_order + FROM asset_types type + CROSS JOIN (VALUES + ('departamento_fuente','Departamento informado por la fuente',10), + ('tipo_concesion_fuente','Tipo de concesión informado por la fuente',20) + ) definition(code,name,sort_order) + WHERE lower(type.code)='yacimiento' + ON CONFLICT DO NOTHING + `); + await queryRunner.query(` + INSERT INTO asset_attribute_definitions (asset_type_id,code,name,data_type,is_required,is_active,sort_order) + SELECT type.id,'tipo_concesion_fuente','Tipo de concesión informado por la fuente','TEXT',false,true,40 + FROM asset_types type WHERE type.operational_role='AREA' + ON CONFLICT DO NOTHING + `); + + const areaCache = new Map(); + const companyCache = new Map(); + const seenRights = new Set(); + + for (const row of source.territory) { + const areaKey = row.area.trim().toLocaleLowerCase('es'); + let areaId = areaCache.get(areaKey); + if (!areaId) { + const areaCode = stableCode('AREA', row.area); + await queryRunner.query( + `INSERT INTO assets ( + asset_type_id,parent_id,code,name,description,information_status,operational_status, + data_origin,source_name,source_reference,source_notes,current_version + ) + SELECT type.id,NULL,$1,$2,$3,'VALIDATED','IN_SERVICE','IMPORT',$4,$5,$6,0 + FROM asset_types type + WHERE type.operational_role='AREA' + AND NOT EXISTS (SELECT 1 FROM assets WHERE lower(code)=lower($1)) + LIMIT 1`, + [areaCode, row.area, `Área importada desde Tablas de yacimiento. Departamento: ${row.department}.`, 'Tablas de yacimiento(1).xlsx', `cr26e_tabla1|AREA|${row.area}`, `Departamento=${row.department}; TipoConcesion=${row.concessionType}`], + ); + const rows = (await queryRunner.query(`SELECT id FROM assets WHERE lower(code)=lower($1) LIMIT 1`, [areaCode])) as Array<{ id: string }>; + areaId = rows[0]?.id; + if (!areaId) throw new Error(`Could not resolve area ${row.area}`); + areaCache.set(areaKey, areaId); + await queryRunner.query( + `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes) + VALUES ($1,$2,'SOURCE','Importación F2.2.1 · cr26e_tabla1') ON CONFLICT DO NOTHING`, + [areaId, territoryDocumentId], + ); + for (const [definitionCode, value] of [['departamento', row.department], ['tipo_concesion_fuente', row.concessionType]] as const) { + await queryRunner.query( + `INSERT INTO asset_attribute_values (asset_id,definition_id,value) + SELECT $1,definition.id,to_jsonb($3::text) + FROM asset_attribute_definitions definition + JOIN asset_types type ON type.id=definition.asset_type_id + WHERE type.operational_role='AREA' AND lower(definition.code)=lower($2) + ON CONFLICT (asset_id,definition_id) DO UPDATE SET value=EXCLUDED.value,updated_at=CURRENT_TIMESTAMP`, + [areaId, definitionCode, value], + ); + } + } + + let companyId: string | null = null; + const noOperator = slug(row.operator) === 'sin_empresa_operadora'; + if (!noOperator) { + const companyKey = row.operator.trim().toLocaleLowerCase('es'); + companyId = companyCache.get(companyKey) ?? null; + if (!companyId) { + const companyCode = stableCode('ORG', row.operator); + await queryRunner.query( + `INSERT INTO assets ( + asset_type_id,parent_id,code,name,description,information_status,operational_status, + data_origin,source_name,source_reference,source_notes,current_version + ) + SELECT type.id,NULL,$1,$2,'Organización operadora importada desde Tablas de yacimiento.','VALIDATED','IN_SERVICE','IMPORT',$3,$4,'Empresa/Operadora informada por la fuente',0 + FROM asset_types type + WHERE type.operational_role='COMPANY' + AND NOT EXISTS (SELECT 1 FROM assets WHERE lower(code)=lower($1)) + LIMIT 1`, + [companyCode, row.operator, 'Tablas de yacimiento(1).xlsx', `cr26e_tabla1|OPERADORA|${row.operator}`], + ); + const rows = (await queryRunner.query(`SELECT id FROM assets WHERE lower(code)=lower($1) LIMIT 1`, [companyCode])) as Array<{ id: string }>; + companyId = rows[0]?.id ?? null; + if (!companyId) throw new Error(`Could not resolve operator ${row.operator}`); + companyCache.set(companyKey, companyId); + await queryRunner.query( + `INSERT INTO organization_profiles (asset_id,organization_kind,legal_name) + SELECT $1,CASE WHEN lower($2) LIKE 'ute %' OR lower($2) LIKE 'ute(%' THEN 'UTE'::organization_kind ELSE 'COMPANY'::organization_kind END,$2 + WHERE NOT EXISTS (SELECT 1 FROM organization_profiles WHERE asset_id=$1)`, + [companyId, row.operator], + ); + await queryRunner.query( + `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes) + VALUES ($1,$2,'SOURCE','Importación F2.2.1 · cr26e_tabla1') ON CONFLICT DO NOTHING`, + [companyId, territoryDocumentId], + ); + } + await queryRunner.query( + `INSERT INTO area_company_relations (area_id,company_id,relation_role,valid_from,start_reason,source_document_id) + SELECT $1,$2,'OPERATOR',CURRENT_TIMESTAMP,'Importado desde Tablas de yacimiento(1).xlsx',$3 + WHERE NOT EXISTS ( + SELECT 1 FROM area_company_relations + WHERE area_id=$1 AND company_id=$2 AND relation_role='OPERATOR' AND valid_until IS NULL + )`, + [areaId, companyId, territoryDocumentId], + ); + } + + const fieldCode = stableCode('YAC', row.field, row.area); + await queryRunner.query( + `INSERT INTO assets ( + asset_type_id,parent_id,operational_area_id,operator_company_id,code,name,description, + information_status,operational_status,data_origin,source_name,source_reference,source_notes,current_version + ) + SELECT type.id,$1,$1,$2,$3,$4,$5,'VALIDATED','IN_SERVICE','IMPORT',$6,$7,$8,0 + FROM asset_types type + WHERE lower(type.code)='yacimiento' + AND NOT EXISTS (SELECT 1 FROM assets WHERE lower(code)=lower($3)) + LIMIT 1`, + [areaId, companyId, fieldCode, row.field, `Yacimiento del Área ${row.area}.`, 'Tablas de yacimiento(1).xlsx', `cr26e_tabla1|YACIMIENTO|${row.field}|AREA|${row.area}`, `Departamento=${row.department}; TipoConcesion=${row.concessionType}; OperadoraFuente=${row.operator}`], + ); + const fieldRows = (await queryRunner.query(`SELECT id FROM assets WHERE lower(code)=lower($1) LIMIT 1`, [fieldCode])) as Array<{ id: string }>; + const fieldId = fieldRows[0]?.id; + if (!fieldId) throw new Error(`Could not resolve field ${row.field} / ${row.area}`); + await queryRunner.query( + `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes) + VALUES ($1,$2,'SOURCE','Importación F2.2.1 · cr26e_tabla1') ON CONFLICT DO NOTHING`, + [fieldId, territoryDocumentId], + ); + for (const [definitionCode, value] of [['departamento_fuente', row.department], ['tipo_concesion_fuente', row.concessionType]] as const) { + await queryRunner.query( + `INSERT INTO asset_attribute_values (asset_id,definition_id,value) + SELECT $1,definition.id,to_jsonb($3::text) + FROM asset_attribute_definitions definition + JOIN asset_types type ON type.id=definition.asset_type_id + WHERE lower(type.code)='yacimiento' AND lower(definition.code)=lower($2) + ON CONFLICT (asset_id,definition_id) DO UPDATE SET value=EXCLUDED.value,updated_at=CURRENT_TIMESTAMP`, + [fieldId, definitionCode, value], + ); + } + + const rightKey = `${areaId}|${slug(row.concessionType)}`; + if (!seenRights.has(rightKey)) { + seenRights.add(rightKey); + await queryRunner.query( + `INSERT INTO area_legal_rights (area_id,right_type,name,status,source_document_id,notes) + SELECT $1,$2::area_legal_right_type,$3,'ACTIVE',$4,$5 + WHERE NOT EXISTS ( + SELECT 1 FROM area_legal_rights WHERE area_id=$1 AND lower(name)=lower($3) AND source_document_id=$4 + )`, + [areaId, legalRightType(row.concessionType), `Tipo informado: ${row.concessionType}`, territoryDocumentId, `Importado desde cr26e_tabla1. Departamento: ${row.department}.`], + ); + } + } + + const topLevelTypes = new Set(source.types.map((entry) => entry.code)); + for (const pair of source.parentPairs) topLevelTypes.delete(pair.child); + const allTypeDefinitions = new Map(source.types.map((entry) => [entry.code, entry.name])); + for (const targets of Object.values(groupTargets)) { + for (const target of targets) if (!allTypeDefinitions.has(target)) allTypeDefinitions.set(target, target.replaceAll('_', ' ')); + } + + for (const [typeCode, typeName] of allTypeDefinitions) { + await queryRunner.query( + `INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role) + SELECT $1,$2,'Tipo incorporado desde APLICACION APP(1).xlsx · F2.2.1',false,true,'GENERIC' + WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)=lower($1))`, + [typeCode, typeName], + ); + await queryRunner.query( + `INSERT INTO finding_catalog_asset_type_profiles (asset_type_id,reason) + SELECT id,'Aplicabilidad inicial importada desde APLICACION APP(1).xlsx' + FROM asset_types WHERE lower(code)=lower($1) + ON CONFLICT (asset_type_id) DO NOTHING`, + [typeCode], + ); + } + + for (const typeCode of topLevelTypes) { + await queryRunner.query( + `INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id) + SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent + WHERE lower(child.code)=lower($1) AND lower(parent.code)='yacimiento' + ON CONFLICT DO NOTHING`, + [typeCode], + ); + } + for (const pair of source.parentPairs) { + if (pair.child === pair.parent) continue; + await queryRunner.query( + `INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id) + SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent + WHERE lower(child.code)=lower($1) AND lower(parent.code)=lower($2) + ON CONFLICT DO NOTHING`, + [pair.child, pair.parent], + ); + } + for (const targets of Object.values(groupTargets)) { + for (const typeCode of targets) { + await queryRunner.query( + `INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id) + SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent + WHERE lower(child.code)=lower($1) AND lower(parent.code)='yacimiento' + ON CONFLICT DO NOTHING`, + [typeCode], + ); + } + } + + for (const entry of source.attributes) { + let sortOrder = 100; + for (const label of entry.labels) { + const attributeCode = slug(label, 72); + await queryRunner.query( + `INSERT INTO asset_attribute_definitions (asset_type_id,code,name,data_type,is_required,is_active,sort_order) + SELECT type.id,$2,$3,'TEXT',false,true,$4 FROM asset_types type + WHERE lower(type.code)=lower($1) + AND NOT EXISTS ( + SELECT 1 FROM asset_attribute_definitions existing + WHERE existing.asset_type_id=type.id AND lower(existing.code)=lower($2) + )`, + [entry.type, attributeCode, label, sortOrder], + ); + sortOrder += 10; + } + } + + await queryRunner.query(` + INSERT INTO finding_categories (code,name,sort_order,is_active) + SELECT 'APP26','Aplicación APP 2026',260,true + WHERE NOT EXISTS (SELECT 1 FROM finding_categories WHERE lower(code)='app26') + `); + const categoryRows = (await queryRunner.query(`SELECT id FROM finding_categories WHERE lower(code)='app26' LIMIT 1`)) as Array<{ id: string }>; + const categoryId = categoryRows[0]?.id; + if (!categoryId) throw new Error('Could not resolve APP26 finding category'); + + const titlesByType = new Map>(); + const addTitle = (typeCode: string, title: string) => { + const cleanTitle = title.trim(); + if (!cleanTitle || /^idem\b/i.test(cleanTitle)) return; + const set = titlesByType.get(typeCode) ?? new Set(); + set.add(cleanTitle); + titlesByType.set(typeCode, set); + }; + for (const entry of source.directFindings) for (const title of entry.titles) addTitle(entry.type, title); + for (const group of source.groups) { + const targets = groupTargets[slug(group.name)] ?? [slug(group.name)]; + for (const target of targets) for (const item of group.items) addTitle(target, item.title); + } + for (let pass = 0; pass < 3; pass += 1) { + for (const entry of source.idemRefs) { + for (const rawReference of entry.refs) { + const reference = referenceAliases[slug(rawReference)] ?? slug(rawReference); + for (const title of titlesByType.get(reference) ?? []) addTitle(entry.type, title); + } + } + } + + const allTitles = [...new Set([...titlesByType.values()].flatMap((set) => [...set]))].sort((a, b) => a.localeCompare(b, 'es')); + let sourceNumber = 1; + const itemIdByTitle = new Map(); + for (const title of allTitles) { + const itemCode = `APP26-${createHash('sha1').update(title).digest('hex').slice(0, 12).toUpperCase()}`; + await queryRunner.query( + `INSERT INTO finding_catalog_items (category_id,code,source_number,title,import_note,revision,is_active) + SELECT $1,$2,$3,$4,'Importado desde APLICACION APP(1).xlsx · F2.2.1',1,true + WHERE NOT EXISTS (SELECT 1 FROM finding_catalog_items WHERE lower(code)=lower($2))`, + [categoryId, itemCode, sourceNumber, title], + ); + const itemRows = (await queryRunner.query(`SELECT id FROM finding_catalog_items WHERE lower(code)=lower($1) LIMIT 1`, [itemCode])) as Array<{ id: string }>; + if (itemRows[0]?.id) itemIdByTitle.set(title, itemRows[0].id); + sourceNumber += 1; + } + + for (const [typeCode, titles] of titlesByType) { + const typeRows = (await queryRunner.query(`SELECT id FROM asset_types WHERE lower(code)=lower($1) LIMIT 1`, [typeCode])) as Array<{ id: string }>; + const assetTypeId = typeRows[0]?.id; + if (!assetTypeId) continue; + for (const title of titles) { + const catalogItemId = itemIdByTitle.get(title); + if (!catalogItemId) continue; + await queryRunner.query( + `INSERT INTO finding_catalog_item_asset_types (catalog_item_id,asset_type_id) + VALUES ($1,$2) ON CONFLICT DO NOTHING`, + [catalogItemId, assetTypeId], + ); + } + } + + await queryRunner.query( + `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes) + SELECT asset.id,$1,'MENTIONS','El tipo/hallazgo del elemento se definió con la matriz APLICACION APP(1).xlsx' + FROM assets asset JOIN asset_types type ON type.id=asset.asset_type_id + WHERE lower(type.code)='yacimiento' + ON CONFLICT DO NOTHING`, + [appDocumentId], + ); + } + + public async down(): Promise { + throw new Error('F2.2.1 contiene maestros territoriales y catálogo de referencia; no se revierte destructivamente. Restaurar backup PRE si fuera necesario.'); + } +} From 60ecfff794c70ac30bd35a198e355e3b57e504e0 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:30:03 -0300 Subject: [PATCH 029/144] =?UTF-8?q?test:=20validar=20normalizaci=C3=B3n=20?= =?UTF-8?q?de=20planillas=20F2.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/f2-2-1-reference-excel-data.test.ts | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 api-v3/test/f2-2-1-reference-excel-data.test.ts diff --git a/api-v3/test/f2-2-1-reference-excel-data.test.ts b/api-v3/test/f2-2-1-reference-excel-data.test.ts new file mode 100644 index 0000000..18db98d --- /dev/null +++ b/api-v3/test/f2-2-1-reference-excel-data.test.ts @@ -0,0 +1,49 @@ +import assert from 'node:assert/strict'; +import { test } from 'node:test'; +import { loadF221ExcelSource } from '../src/reference-data/f2-2-1-excel-source'; + +const source = loadF221ExcelSource(); + +test('F2.2.1 preserves every normalized territorial source row', () => { + assert.equal(source.territory.length, 230); + assert.equal(new Set(source.territory.map((row) => row.field)).size, 220); + assert.equal(new Set(source.territory.map((row) => `${row.field.toLowerCase()}|${row.area.toLowerCase()}`)).size, 230); +}); + +test('F2.2.1 does not collapse repeated field names across different operational contexts', () => { + const byName = new Map>(); + for (const row of source.territory) { + const key = row.field.toLowerCase(); + const contexts = byName.get(key) ?? new Set(); + contexts.add(`${row.area}|${row.operator}`); + byName.set(key, contexts); + } + assert.ok([...byName.values()].some((contexts) => contexts.size > 1)); +}); + +test('F2.2.1 keeps the APP matrix as configuration rather than physical inventory rows', () => { + assert.equal(source.types.length, 113); + assert.equal(source.parentPairs.length, 119); + assert.equal(source.attributes.length, 44); + assert.equal(source.idemRefs.length, 25); + assert.ok(source.types.some((entry) => entry.code === 'tanque')); + assert.ok(source.types.some((entry) => entry.code === 'bateria')); +}); + +test('F2.2.1 keeps IDEM as inheritance metadata, never as a catalog title', () => { + const directTitles = source.directFindings.flatMap((entry) => entry.titles); + assert.equal(directTitles.some((title) => /^idem\b/i.test(title.trim())), false); + assert.ok(source.idemRefs.some((entry) => entry.type === 'tanque')); +}); + +test('F2.2.1 imports the grouped Hallazgo catalog supplied in Hoja2', () => { + assert.equal(source.groups.length, 19); + assert.equal(source.groups.reduce((total, group) => total + group.items.length, 0), 171); + const tanks = source.groups.find((group) => group.name.trim().toUpperCase() === 'TANQUES'); + assert.ok(tanks); + assert.ok(tanks.items.some((item) => /ESTADO DEL TANQUE/i.test(item.title))); +}); + +test('F2.2.1 preserves rows explicitly reporting no operator without fabricating an organization in source data', () => { + assert.ok(source.territory.some((row) => row.operator.toLowerCase().includes('sin empresa operadora'))); +}); From f78781ed9aa4cd16d019c375994145c8cfa2c2af Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:30:25 -0300 Subject: [PATCH 030/144] F2.2.1: versionar API 0.22.1-1 --- api-v3/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-v3/package.json b/api-v3/package.json index 15d283c..38bbea3 100644 --- a/api-v3/package.json +++ b/api-v3/package.json @@ -1,6 +1,6 @@ { "name": "dhv2-api", - "version": "0.22.0-1", + "version": "0.22.1-1", "private": true, "license": "UNLICENSED", "scripts": { From 6ed0ce473132b7702772bb6077d97f40cfadf41d Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:30:31 -0300 Subject: [PATCH 031/144] F2.2.1: identificar health de API --- api-v3/src/version.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api-v3/src/version.ts b/api-v3/src/version.ts index 09dee3d..54ffb44 100644 --- a/api-v3/src/version.ts +++ b/api-v3/src/version.ts @@ -1,2 +1,2 @@ -export const API_VERSION = '0.22.0-1'; -export const API_PHASE = 'F2.2'; +export const API_VERSION = '0.22.1-1'; +export const API_PHASE = 'F2.2.1'; From 5f5c790301e3528cc4b5d3466b94607f57ad6b85 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:30:50 -0300 Subject: [PATCH 032/144] ci: validar Android F2.2.1 --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 888cfa4..cf423e0 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -3,7 +3,7 @@ name: Android APK on: push: branches: - - feature/f2-2-android-v2 + - 'feature/f2-2*' paths: - 'android-app/**' - '.github/workflows/android.yml' @@ -53,7 +53,7 @@ jobs: - name: Upload APK uses: actions/upload-artifact@v4 with: - name: DH-Inspeccion-F2.2-0.10.0-debug + name: DH-Inspeccion-F2.2.1-0.10.1-debug path: android-app/app/build/outputs/apk/debug/app-debug.apk if-no-files-found: error retention-days: 14 From 012703336a8d865e43f9fdcd625be43136d5dce1 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:31:00 -0300 Subject: [PATCH 033/144] =?UTF-8?q?ci:=20validar=20integraci=C3=B3n=20F2.2?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/f2-2-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/f2-2-ci.yml b/.github/workflows/f2-2-ci.yml index 80594a1..232b97c 100644 --- a/.github/workflows/f2-2-ci.yml +++ b/.github/workflows/f2-2-ci.yml @@ -3,7 +3,7 @@ name: F2.2 Integration CI on: push: branches: - - feature/f2-2-android-v2 + - 'feature/f2-2*' paths: - 'api-v3/**' - 'web-v2/**' From e09930d411bc8123460aa8334dfa62d7b4250d48 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 21:32:19 -0300 Subject: [PATCH 034/144] F2.2.1: crear baseline temporal del maestro importado --- ...000000-phase-f2-2-1-reference-baselines.ts | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 api-v3/src/database/migrations/1789758000000-phase-f2-2-1-reference-baselines.ts diff --git a/api-v3/src/database/migrations/1789758000000-phase-f2-2-1-reference-baselines.ts b/api-v3/src/database/migrations/1789758000000-phase-f2-2-1-reference-baselines.ts new file mode 100644 index 0000000..68d8a89 --- /dev/null +++ b/api-v3/src/database/migrations/1789758000000-phase-f2-2-1-reference-baselines.ts @@ -0,0 +1,57 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class PhaseF221ReferenceBaselines1789758000000 implements MigrationInterface { + name = 'PhaseF221ReferenceBaselines1789758000000'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO asset_versions ( + asset_id,version_number,change_type,changed_fields,snapshot,source + ) + SELECT + asset.id, + 1, + 'BASELINE', + ARRAY['assetTypeId','parentId','operationalAreaId','operatorCompanyId','code','name','informationStatus','operationalStatus','dataOrigin','sourceName','sourceReference'], + jsonb_build_object( + 'id',asset.id, + 'assetTypeId',asset.asset_type_id, + 'parentId',asset.parent_id, + 'operationalAreaId',asset.operational_area_id, + 'operatorCompanyId',asset.operator_company_id, + 'code',asset.code, + 'name',asset.name, + 'commonName',asset.common_name, + 'description',asset.description, + 'informationStatus',asset.information_status, + 'operationalStatus',asset.operational_status, + 'dataOrigin',asset.data_origin, + 'sourceName',asset.source_name, + 'sourceReference',asset.source_reference, + 'sourceNotes',asset.source_notes + ), + 'SYSTEM' + FROM assets asset + WHERE asset.data_origin='IMPORT' + AND asset.source_name='Tablas de yacimiento(1).xlsx' + AND NOT EXISTS ( + SELECT 1 FROM asset_versions version + WHERE version.asset_id=asset.id AND version.version_number=1 + ) + `); + await queryRunner.query(` + UPDATE assets asset + SET current_version=GREATEST(asset.current_version,1),updated_at=CURRENT_TIMESTAMP + WHERE asset.data_origin='IMPORT' + AND asset.source_name='Tablas de yacimiento(1).xlsx' + AND EXISTS ( + SELECT 1 FROM asset_versions version + WHERE version.asset_id=asset.id AND version.version_number=1 + ) + `); + } + + public async down(): Promise { + throw new Error('F2.2.1 no elimina baselines históricos del maestro importado. Restaurar backup PRE si fuera necesario.'); + } +} From cf3327a4da512030d14fe002c1e009bb1d19a9f6 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 22:41:03 -0300 Subject: [PATCH 035/144] =?UTF-8?q?fix:=20endurecer=20migraci=C3=B3n=20F2.?= =?UTF-8?q?2.1=20contra=20PostgreSQL=20real?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...00000-phase-f2-2-1-reference-excel-data.ts | 471 +++++++++++++----- 1 file changed, 336 insertions(+), 135 deletions(-) diff --git a/api-v3/src/database/migrations/1789754400000-phase-f2-2-1-reference-excel-data.ts b/api-v3/src/database/migrations/1789754400000-phase-f2-2-1-reference-excel-data.ts index 456a87a..2362bc1 100644 --- a/api-v3/src/database/migrations/1789754400000-phase-f2-2-1-reference-excel-data.ts +++ b/api-v3/src/database/migrations/1789754400000-phase-f2-2-1-reference-excel-data.ts @@ -64,6 +64,25 @@ const referenceAliases: Record = { generador: 'generador', }; +type IdRow = { id: string }; +type CountRow = { total: string }; + +async function assetIdByCode(queryRunner: QueryRunner, code: string): Promise { + const rows = (await queryRunner.query( + `SELECT id FROM assets WHERE lower(code)=lower($1::text) LIMIT 1`, + [code], + )) as IdRow[]; + return rows[0]?.id ?? null; +} + +async function assetTypeIdByCode(queryRunner: QueryRunner, code: string): Promise { + const rows = (await queryRunner.query( + `SELECT id FROM asset_types WHERE lower(code)=lower($1::text) LIMIT 1`, + [code], + )) as IdRow[]; + return rows[0]?.id ?? null; +} + export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterface { name = 'PhaseF221ReferenceExcelData1789754400000'; @@ -75,7 +94,8 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf SELECT 'SPREADSHEET','DH-F221-TERRITORIO','Tablas de yacimiento(1).xlsx','Dirección de Hidrocarburos', 'Fuente F2.2.1: maestro territorial y operativo. Hoja normalizada cr26e_tabla1.' WHERE NOT EXISTS ( - SELECT 1 FROM source_documents WHERE document_number='DH-F221-TERRITORIO' AND issuer='Dirección de Hidrocarburos' + SELECT 1 FROM source_documents + WHERE document_number='DH-F221-TERRITORIO' AND issuer='Dirección de Hidrocarburos' ) `); await queryRunner.query(` @@ -83,35 +103,45 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf SELECT 'SPREADSHEET','DH-F221-APP','APLICACION APP(1).xlsx','Dirección de Hidrocarburos', 'Fuente F2.2.1: matriz de jerarquía, información y catálogo contextual de hallazgos. Hojas Hoja1 y Hoja2.' WHERE NOT EXISTS ( - SELECT 1 FROM source_documents WHERE document_number='DH-F221-APP' AND issuer='Dirección de Hidrocarburos' + SELECT 1 FROM source_documents + WHERE document_number='DH-F221-APP' AND issuer='Dirección de Hidrocarburos' ) `); - const territoryDocumentRows = (await queryRunner.query( - `SELECT id FROM source_documents WHERE document_number='DH-F221-TERRITORIO' AND issuer='Dirección de Hidrocarburos' LIMIT 1`, - )) as Array<{ id: string }>; - const appDocumentRows = (await queryRunner.query( - `SELECT id FROM source_documents WHERE document_number='DH-F221-APP' AND issuer='Dirección de Hidrocarburos' LIMIT 1`, - )) as Array<{ id: string }>; - const territoryDocumentId = territoryDocumentRows[0]?.id; - const appDocumentId = appDocumentRows[0]?.id; - if (!territoryDocumentId || !appDocumentId) throw new Error('F2.2.1 source documents could not be resolved'); + const territoryDocuments = (await queryRunner.query( + `SELECT id FROM source_documents + WHERE document_number='DH-F221-TERRITORIO' AND issuer='Dirección de Hidrocarburos' LIMIT 1`, + )) as IdRow[]; + const appDocuments = (await queryRunner.query( + `SELECT id FROM source_documents + WHERE document_number='DH-F221-APP' AND issuer='Dirección de Hidrocarburos' LIMIT 1`, + )) as IdRow[]; + const territoryDocumentId = territoryDocuments[0]?.id; + const appDocumentId = appDocuments[0]?.id; + if (!territoryDocumentId || !appDocumentId) { + throw new Error('F2.2.1 source documents could not be resolved'); + } - await queryRunner.query(`UPDATE asset_types SET can_be_root=true WHERE operational_role IN ('AREA','COMPANY')`); + await queryRunner.query( + `UPDATE asset_types SET can_be_root=true WHERE operational_role IN ('AREA','COMPANY')`, + ); await queryRunner.query(` INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role) - SELECT 'yacimiento','Yacimiento','Yacimiento físico/operativo perteneciente a un Área. Su operadora se determina por contexto histórico.',false,true,'GENERIC' + SELECT 'yacimiento','Yacimiento', + 'Yacimiento físico/operativo perteneciente a un Área. Su operadora se determina por contexto histórico.', + false,true,'GENERIC' WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='yacimiento') `); await queryRunner.query(` INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id) - SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent + SELECT child.id,parent.id + FROM asset_types child CROSS JOIN asset_types parent WHERE lower(child.code)='yacimiento' AND parent.operational_role='AREA' ON CONFLICT DO NOTHING `); - await queryRunner.query(` - INSERT INTO asset_attribute_definitions (asset_type_id,code,name,data_type,is_required,is_active,sort_order) + INSERT INTO asset_attribute_definitions + (asset_type_id,code,name,data_type,is_required,is_active,sort_order) SELECT type.id,definition.code,definition.name,'TEXT',false,true,definition.sort_order FROM asset_types type CROSS JOIN (VALUES @@ -122,9 +152,12 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf ON CONFLICT DO NOTHING `); await queryRunner.query(` - INSERT INTO asset_attribute_definitions (asset_type_id,code,name,data_type,is_required,is_active,sort_order) - SELECT type.id,'tipo_concesion_fuente','Tipo de concesión informado por la fuente','TEXT',false,true,40 - FROM asset_types type WHERE type.operational_role='AREA' + INSERT INTO asset_attribute_definitions + (asset_type_id,code,name,data_type,is_required,is_active,sort_order) + SELECT type.id,'tipo_concesion_fuente','Tipo de concesión informado por la fuente', + 'TEXT',false,true,40 + FROM asset_types type + WHERE type.operational_role='AREA' ON CONFLICT DO NOTHING `); @@ -134,154 +167,236 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf for (const row of source.territory) { const areaKey = row.area.trim().toLocaleLowerCase('es'); - let areaId = areaCache.get(areaKey); + let areaId = areaCache.get(areaKey) ?? null; if (!areaId) { const areaCode = stableCode('AREA', row.area); - await queryRunner.query( - `INSERT INTO assets ( - asset_type_id,parent_id,code,name,description,information_status,operational_status, - data_origin,source_name,source_reference,source_notes,current_version - ) - SELECT type.id,NULL,$1,$2,$3,'VALIDATED','IN_SERVICE','IMPORT',$4,$5,$6,0 - FROM asset_types type - WHERE type.operational_role='AREA' - AND NOT EXISTS (SELECT 1 FROM assets WHERE lower(code)=lower($1)) - LIMIT 1`, - [areaCode, row.area, `Área importada desde Tablas de yacimiento. Departamento: ${row.department}.`, 'Tablas de yacimiento(1).xlsx', `cr26e_tabla1|AREA|${row.area}`, `Departamento=${row.department}; TipoConcesion=${row.concessionType}`], - ); - const rows = (await queryRunner.query(`SELECT id FROM assets WHERE lower(code)=lower($1) LIMIT 1`, [areaCode])) as Array<{ id: string }>; - areaId = rows[0]?.id; + areaId = await assetIdByCode(queryRunner, areaCode); + if (!areaId) { + const inserted = (await queryRunner.query( + `INSERT INTO assets ( + asset_type_id,parent_id,code,name,description,information_status,operational_status, + data_origin,source_name,source_reference,source_notes,current_version + ) + SELECT type.id,NULL,$1::varchar,$2::varchar,$3::text, + 'VALIDATED','IN_SERVICE','IMPORT',$4::varchar,$5::varchar,$6::text,0 + FROM asset_types type + WHERE type.operational_role='AREA' + LIMIT 1 + RETURNING id`, + [ + areaCode, + row.area, + `Área importada desde Tablas de yacimiento. Departamento: ${row.department}.`, + 'Tablas de yacimiento(1).xlsx', + `cr26e_tabla1|AREA|${row.area}`, + `Departamento=${row.department}; TipoConcesion=${row.concessionType}`, + ], + )) as IdRow[]; + areaId = inserted[0]?.id ?? null; + } if (!areaId) throw new Error(`Could not resolve area ${row.area}`); areaCache.set(areaKey, areaId); + await queryRunner.query( `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes) - VALUES ($1,$2,'SOURCE','Importación F2.2.1 · cr26e_tabla1') ON CONFLICT DO NOTHING`, + VALUES ($1::uuid,$2::uuid,'SOURCE','Importación F2.2.1 · cr26e_tabla1') + ON CONFLICT DO NOTHING`, [areaId, territoryDocumentId], ); - for (const [definitionCode, value] of [['departamento', row.department], ['tipo_concesion_fuente', row.concessionType]] as const) { - await queryRunner.query( - `INSERT INTO asset_attribute_values (asset_id,definition_id,value) - SELECT $1,definition.id,to_jsonb($3::text) - FROM asset_attribute_definitions definition - JOIN asset_types type ON type.id=definition.asset_type_id - WHERE type.operational_role='AREA' AND lower(definition.code)=lower($2) - ON CONFLICT (asset_id,definition_id) DO UPDATE SET value=EXCLUDED.value,updated_at=CURRENT_TIMESTAMP`, - [areaId, definitionCode, value], - ); - } } - let companyId: string | null = null; + for (const [definitionCode, value] of [ + ['departamento', row.department], + ['tipo_concesion_fuente', row.concessionType], + ] as const) { + await queryRunner.query( + `INSERT INTO asset_attribute_values (asset_id,definition_id,value) + SELECT $1::uuid,definition.id,to_jsonb($3::text) + FROM asset_attribute_definitions definition + JOIN asset_types type ON type.id=definition.asset_type_id + WHERE type.operational_role='AREA' + AND lower(definition.code)=lower($2::text) + ON CONFLICT (asset_id,definition_id) + DO UPDATE SET value=EXCLUDED.value,updated_at=CURRENT_TIMESTAMP`, + [areaId, definitionCode, value], + ); + } + const noOperator = slug(row.operator) === 'sin_empresa_operadora'; + let companyId: string | null = null; if (!noOperator) { const companyKey = row.operator.trim().toLocaleLowerCase('es'); companyId = companyCache.get(companyKey) ?? null; if (!companyId) { const companyCode = stableCode('ORG', row.operator); - await queryRunner.query( - `INSERT INTO assets ( - asset_type_id,parent_id,code,name,description,information_status,operational_status, - data_origin,source_name,source_reference,source_notes,current_version - ) - SELECT type.id,NULL,$1,$2,'Organización operadora importada desde Tablas de yacimiento.','VALIDATED','IN_SERVICE','IMPORT',$3,$4,'Empresa/Operadora informada por la fuente',0 - FROM asset_types type - WHERE type.operational_role='COMPANY' - AND NOT EXISTS (SELECT 1 FROM assets WHERE lower(code)=lower($1)) - LIMIT 1`, - [companyCode, row.operator, 'Tablas de yacimiento(1).xlsx', `cr26e_tabla1|OPERADORA|${row.operator}`], - ); - const rows = (await queryRunner.query(`SELECT id FROM assets WHERE lower(code)=lower($1) LIMIT 1`, [companyCode])) as Array<{ id: string }>; - companyId = rows[0]?.id ?? null; + companyId = await assetIdByCode(queryRunner, companyCode); + if (!companyId) { + const inserted = (await queryRunner.query( + `INSERT INTO assets ( + asset_type_id,parent_id,code,name,description,information_status,operational_status, + data_origin,source_name,source_reference,source_notes,current_version + ) + SELECT type.id,NULL,$1::varchar,$2::varchar, + 'Organización operadora importada desde Tablas de yacimiento.', + 'VALIDATED','IN_SERVICE','IMPORT',$3::varchar,$4::varchar, + 'Empresa/Operadora informada por la fuente',0 + FROM asset_types type + WHERE type.operational_role='COMPANY' + LIMIT 1 + RETURNING id`, + [ + companyCode, + row.operator, + 'Tablas de yacimiento(1).xlsx', + `cr26e_tabla1|OPERADORA|${row.operator}`, + ], + )) as IdRow[]; + companyId = inserted[0]?.id ?? null; + } if (!companyId) throw new Error(`Could not resolve operator ${row.operator}`); companyCache.set(companyKey, companyId); + await queryRunner.query( `INSERT INTO organization_profiles (asset_id,organization_kind,legal_name) - SELECT $1,CASE WHEN lower($2) LIKE 'ute %' OR lower($2) LIKE 'ute(%' THEN 'UTE'::organization_kind ELSE 'COMPANY'::organization_kind END,$2 - WHERE NOT EXISTS (SELECT 1 FROM organization_profiles WHERE asset_id=$1)`, + SELECT $1::uuid, + CASE WHEN lower($2::text) LIKE 'ute %' OR lower($2::text) LIKE 'ute(%' + THEN 'UTE'::organization_kind ELSE 'COMPANY'::organization_kind END, + $2::varchar + WHERE NOT EXISTS (SELECT 1 FROM organization_profiles WHERE asset_id=$1::uuid)`, [companyId, row.operator], ); await queryRunner.query( `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes) - VALUES ($1,$2,'SOURCE','Importación F2.2.1 · cr26e_tabla1') ON CONFLICT DO NOTHING`, + VALUES ($1::uuid,$2::uuid,'SOURCE','Importación F2.2.1 · cr26e_tabla1') + ON CONFLICT DO NOTHING`, [companyId, territoryDocumentId], ); } + await queryRunner.query( - `INSERT INTO area_company_relations (area_id,company_id,relation_role,valid_from,start_reason,source_document_id) - SELECT $1,$2,'OPERATOR',CURRENT_TIMESTAMP,'Importado desde Tablas de yacimiento(1).xlsx',$3 + `INSERT INTO area_company_relations + (area_id,company_id,relation_role,valid_from,start_reason,source_document_id) + SELECT $1::uuid,$2::uuid,'OPERATOR',CURRENT_TIMESTAMP, + 'Importado desde Tablas de yacimiento(1).xlsx',$3::uuid WHERE NOT EXISTS ( SELECT 1 FROM area_company_relations - WHERE area_id=$1 AND company_id=$2 AND relation_role='OPERATOR' AND valid_until IS NULL + WHERE area_id=$1::uuid AND company_id=$2::uuid + AND relation_role='OPERATOR' AND valid_until IS NULL )`, [areaId, companyId, territoryDocumentId], ); } const fieldCode = stableCode('YAC', row.field, row.area); - await queryRunner.query( - `INSERT INTO assets ( - asset_type_id,parent_id,operational_area_id,operator_company_id,code,name,description, - information_status,operational_status,data_origin,source_name,source_reference,source_notes,current_version - ) - SELECT type.id,$1,$1,$2,$3,$4,$5,'VALIDATED','IN_SERVICE','IMPORT',$6,$7,$8,0 - FROM asset_types type - WHERE lower(type.code)='yacimiento' - AND NOT EXISTS (SELECT 1 FROM assets WHERE lower(code)=lower($3)) - LIMIT 1`, - [areaId, companyId, fieldCode, row.field, `Yacimiento del Área ${row.area}.`, 'Tablas de yacimiento(1).xlsx', `cr26e_tabla1|YACIMIENTO|${row.field}|AREA|${row.area}`, `Departamento=${row.department}; TipoConcesion=${row.concessionType}; OperadoraFuente=${row.operator}`], - ); - const fieldRows = (await queryRunner.query(`SELECT id FROM assets WHERE lower(code)=lower($1) LIMIT 1`, [fieldCode])) as Array<{ id: string }>; - const fieldId = fieldRows[0]?.id; + let fieldId = await assetIdByCode(queryRunner, fieldCode); + if (!fieldId) { + // The operational context is intentionally all-or-nothing. A source row + // that explicitly says "Sin Empresa Operadora" stays physically under + // its Área but receives no fabricated operator and no half context. + const operationalAreaId = companyId ? areaId : null; + const inserted = (await queryRunner.query( + `INSERT INTO assets ( + asset_type_id,parent_id,operational_area_id,operator_company_id,code,name,description, + information_status,operational_status,data_origin,source_name,source_reference, + source_notes,current_version + ) + SELECT type.id,$1::uuid,$2::uuid,$3::uuid,$4::varchar,$5::varchar,$6::text, + 'VALIDATED','IN_SERVICE','IMPORT',$7::varchar,$8::varchar,$9::text,0 + FROM asset_types type + WHERE lower(type.code)='yacimiento' + LIMIT 1 + RETURNING id`, + [ + areaId, + operationalAreaId, + companyId, + fieldCode, + row.field, + `Yacimiento del Área ${row.area}.`, + 'Tablas de yacimiento(1).xlsx', + `cr26e_tabla1|YACIMIENTO|${row.field}|AREA|${row.area}`, + `Departamento=${row.department}; TipoConcesion=${row.concessionType}; OperadoraFuente=${row.operator}`, + ], + )) as IdRow[]; + fieldId = inserted[0]?.id ?? null; + } if (!fieldId) throw new Error(`Could not resolve field ${row.field} / ${row.area}`); + await queryRunner.query( `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes) - VALUES ($1,$2,'SOURCE','Importación F2.2.1 · cr26e_tabla1') ON CONFLICT DO NOTHING`, + VALUES ($1::uuid,$2::uuid,'SOURCE','Importación F2.2.1 · cr26e_tabla1') + ON CONFLICT DO NOTHING`, [fieldId, territoryDocumentId], ); - for (const [definitionCode, value] of [['departamento_fuente', row.department], ['tipo_concesion_fuente', row.concessionType]] as const) { + for (const [definitionCode, value] of [ + ['departamento_fuente', row.department], + ['tipo_concesion_fuente', row.concessionType], + ] as const) { await queryRunner.query( `INSERT INTO asset_attribute_values (asset_id,definition_id,value) - SELECT $1,definition.id,to_jsonb($3::text) + SELECT $1::uuid,definition.id,to_jsonb($3::text) FROM asset_attribute_definitions definition JOIN asset_types type ON type.id=definition.asset_type_id - WHERE lower(type.code)='yacimiento' AND lower(definition.code)=lower($2) - ON CONFLICT (asset_id,definition_id) DO UPDATE SET value=EXCLUDED.value,updated_at=CURRENT_TIMESTAMP`, + WHERE lower(type.code)='yacimiento' + AND lower(definition.code)=lower($2::text) + ON CONFLICT (asset_id,definition_id) + DO UPDATE SET value=EXCLUDED.value,updated_at=CURRENT_TIMESTAMP`, [fieldId, definitionCode, value], ); } + const rightName = `Tipo informado: ${row.concessionType}`; const rightKey = `${areaId}|${slug(row.concessionType)}`; if (!seenRights.has(rightKey)) { seenRights.add(rightKey); - await queryRunner.query( - `INSERT INTO area_legal_rights (area_id,right_type,name,status,source_document_id,notes) - SELECT $1,$2::area_legal_right_type,$3,'ACTIVE',$4,$5 - WHERE NOT EXISTS ( - SELECT 1 FROM area_legal_rights WHERE area_id=$1 AND lower(name)=lower($3) AND source_document_id=$4 - )`, - [areaId, legalRightType(row.concessionType), `Tipo informado: ${row.concessionType}`, territoryDocumentId, `Importado desde cr26e_tabla1. Departamento: ${row.department}.`], - ); + const existing = (await queryRunner.query( + `SELECT id FROM area_legal_rights + WHERE area_id=$1::uuid AND lower(name)=lower($2::text) + AND source_document_id=$3::uuid LIMIT 1`, + [areaId, rightName, territoryDocumentId], + )) as IdRow[]; + if (!existing[0]?.id) { + await queryRunner.query( + `INSERT INTO area_legal_rights + (area_id,right_type,name,status,source_document_id,notes) + VALUES ($1::uuid,$2::area_legal_right_type,$3::varchar,'ACTIVE',$4::uuid,$5::text)`, + [ + areaId, + legalRightType(row.concessionType), + rightName, + territoryDocumentId, + `Importado desde cr26e_tabla1. Departamento: ${row.department}.`, + ], + ); + } } } const topLevelTypes = new Set(source.types.map((entry) => entry.code)); for (const pair of source.parentPairs) topLevelTypes.delete(pair.child); + const allTypeDefinitions = new Map(source.types.map((entry) => [entry.code, entry.name])); for (const targets of Object.values(groupTargets)) { - for (const target of targets) if (!allTypeDefinitions.has(target)) allTypeDefinitions.set(target, target.replaceAll('_', ' ')); + for (const target of targets) { + if (!allTypeDefinitions.has(target)) { + allTypeDefinitions.set(target, target.replaceAll('_', ' ')); + } + } } for (const [typeCode, typeName] of allTypeDefinitions) { - await queryRunner.query( - `INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role) - SELECT $1,$2,'Tipo incorporado desde APLICACION APP(1).xlsx · F2.2.1',false,true,'GENERIC' - WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)=lower($1))`, - [typeCode, typeName], - ); + if (!(await assetTypeIdByCode(queryRunner, typeCode))) { + await queryRunner.query( + `INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role) + VALUES ($1::varchar,$2::varchar, + 'Tipo incorporado desde APLICACION APP(1).xlsx · F2.2.1',false,true,'GENERIC')`, + [typeCode, typeName], + ); + } await queryRunner.query( `INSERT INTO finding_catalog_asset_type_profiles (asset_type_id,reason) SELECT id,'Aplicabilidad inicial importada desde APLICACION APP(1).xlsx' - FROM asset_types WHERE lower(code)=lower($1) + FROM asset_types WHERE lower(code)=lower($1::text) ON CONFLICT (asset_type_id) DO NOTHING`, [typeCode], ); @@ -291,7 +406,7 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf await queryRunner.query( `INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id) SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent - WHERE lower(child.code)=lower($1) AND lower(parent.code)='yacimiento' + WHERE lower(child.code)=lower($1::text) AND lower(parent.code)='yacimiento' ON CONFLICT DO NOTHING`, [typeCode], ); @@ -301,7 +416,7 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf await queryRunner.query( `INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id) SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent - WHERE lower(child.code)=lower($1) AND lower(parent.code)=lower($2) + WHERE lower(child.code)=lower($1::text) AND lower(parent.code)=lower($2::text) ON CONFLICT DO NOTHING`, [pair.child, pair.parent], ); @@ -311,7 +426,7 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf await queryRunner.query( `INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id) SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent - WHERE lower(child.code)=lower($1) AND lower(parent.code)='yacimiento' + WHERE lower(child.code)=lower($1::text) AND lower(parent.code)='yacimiento' ON CONFLICT DO NOTHING`, [typeCode], ); @@ -322,16 +437,21 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf let sortOrder = 100; for (const label of entry.labels) { const attributeCode = slug(label, 72); - await queryRunner.query( - `INSERT INTO asset_attribute_definitions (asset_type_id,code,name,data_type,is_required,is_active,sort_order) - SELECT type.id,$2,$3,'TEXT',false,true,$4 FROM asset_types type - WHERE lower(type.code)=lower($1) - AND NOT EXISTS ( - SELECT 1 FROM asset_attribute_definitions existing - WHERE existing.asset_type_id=type.id AND lower(existing.code)=lower($2) - )`, - [entry.type, attributeCode, label, sortOrder], - ); + const typeId = await assetTypeIdByCode(queryRunner, entry.type); + if (!typeId) continue; + const existing = (await queryRunner.query( + `SELECT id FROM asset_attribute_definitions + WHERE asset_type_id=$1::uuid AND lower(code)=lower($2::text) LIMIT 1`, + [typeId, attributeCode], + )) as IdRow[]; + if (!existing[0]?.id) { + await queryRunner.query( + `INSERT INTO asset_attribute_definitions + (asset_type_id,code,name,data_type,is_required,is_active,sort_order) + VALUES ($1::uuid,$2::varchar,$3::varchar,'TEXT',false,true,$4::integer)`, + [typeId, attributeCode, label, sortOrder], + ); + } sortOrder += 10; } } @@ -341,22 +461,29 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf SELECT 'APP26','Aplicación APP 2026',260,true WHERE NOT EXISTS (SELECT 1 FROM finding_categories WHERE lower(code)='app26') `); - const categoryRows = (await queryRunner.query(`SELECT id FROM finding_categories WHERE lower(code)='app26' LIMIT 1`)) as Array<{ id: string }>; + const categoryRows = (await queryRunner.query( + `SELECT id FROM finding_categories WHERE lower(code)='app26' LIMIT 1`, + )) as IdRow[]; const categoryId = categoryRows[0]?.id; if (!categoryId) throw new Error('Could not resolve APP26 finding category'); const titlesByType = new Map>(); - const addTitle = (typeCode: string, title: string) => { + const addTitle = (typeCode: string, title: string): void => { const cleanTitle = title.trim(); if (!cleanTitle || /^idem\b/i.test(cleanTitle)) return; const set = titlesByType.get(typeCode) ?? new Set(); set.add(cleanTitle); titlesByType.set(typeCode, set); }; - for (const entry of source.directFindings) for (const title of entry.titles) addTitle(entry.type, title); + + for (const entry of source.directFindings) { + for (const title of entry.titles) addTitle(entry.type, title); + } for (const group of source.groups) { const targets = groupTargets[slug(group.name)] ?? [slug(group.name)]; - for (const target of targets) for (const item of group.items) addTitle(target, item.title); + for (const target of targets) { + for (const item of group.items) addTitle(target, item.title); + } } for (let pass = 0; pass < 3; pass += 1) { for (const entry of source.idemRefs) { @@ -367,32 +494,64 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf } } - const allTitles = [...new Set([...titlesByType.values()].flatMap((set) => [...set]))].sort((a, b) => a.localeCompare(b, 'es')); - let sourceNumber = 1; + const allTitles = [ + ...new Set([...titlesByType.values()].flatMap((titles) => [...titles])), + ].sort((a, b) => a.localeCompare(b, 'es')); + const itemIdByTitle = new Map(); + let sourceNumber = 1; for (const title of allTitles) { const itemCode = `APP26-${createHash('sha1').update(title).digest('hex').slice(0, 12).toUpperCase()}`; - await queryRunner.query( - `INSERT INTO finding_catalog_items (category_id,code,source_number,title,import_note,revision,is_active) - SELECT $1,$2,$3,$4,'Importado desde APLICACION APP(1).xlsx · F2.2.1',1,true - WHERE NOT EXISTS (SELECT 1 FROM finding_catalog_items WHERE lower(code)=lower($2))`, - [categoryId, itemCode, sourceNumber, title], - ); - const itemRows = (await queryRunner.query(`SELECT id FROM finding_catalog_items WHERE lower(code)=lower($1) LIMIT 1`, [itemCode])) as Array<{ id: string }>; - if (itemRows[0]?.id) itemIdByTitle.set(title, itemRows[0].id); + let itemRows = (await queryRunner.query( + `SELECT id FROM finding_catalog_items WHERE lower(code)=lower($1::text) LIMIT 1`, + [itemCode], + )) as IdRow[]; + if (!itemRows[0]?.id) { + itemRows = (await queryRunner.query( + `INSERT INTO finding_catalog_items + (category_id,code,source_number,title,import_note,revision,is_active) + VALUES ($1::uuid,$2::varchar,$3::integer,$4::varchar, + 'Importado desde APLICACION APP(1).xlsx · F2.2.1',1,true) + RETURNING id`, + [categoryId, itemCode, sourceNumber, title], + )) as IdRow[]; + } + const itemId = itemRows[0]?.id; + if (itemId) { + itemIdByTitle.set(title, itemId); + await queryRunner.query( + `INSERT INTO finding_catalog_item_versions + (item_id,revision,snapshot,actor_username) + SELECT item.id,item.revision, + jsonb_build_object( + 'id',item.id,'categoryId',category.id,'categoryCode',category.code, + 'categoryName',category.name,'code',item.code,'sourceNumber',item.source_number, + 'title',item.title,'legalBasis',item.legal_basis,'glossary',item.glossary, + 'importNote',item.import_note,'revision',item.revision,'isActive',item.is_active + ), + 'migration:F2.2.1' + FROM finding_catalog_items item + JOIN finding_categories category ON category.id=item.category_id + WHERE item.id=$1::uuid + AND NOT EXISTS ( + SELECT 1 FROM finding_catalog_item_versions version + WHERE version.item_id=item.id AND version.revision=item.revision + )`, + [itemId], + ); + } sourceNumber += 1; } for (const [typeCode, titles] of titlesByType) { - const typeRows = (await queryRunner.query(`SELECT id FROM asset_types WHERE lower(code)=lower($1) LIMIT 1`, [typeCode])) as Array<{ id: string }>; - const assetTypeId = typeRows[0]?.id; + const assetTypeId = await assetTypeIdByCode(queryRunner, typeCode); if (!assetTypeId) continue; for (const title of titles) { const catalogItemId = itemIdByTitle.get(title); if (!catalogItemId) continue; await queryRunner.query( `INSERT INTO finding_catalog_item_asset_types (catalog_item_id,asset_type_id) - VALUES ($1,$2) ON CONFLICT DO NOTHING`, + VALUES ($1::uuid,$2::uuid) ON CONFLICT DO NOTHING`, [catalogItemId, assetTypeId], ); } @@ -400,15 +559,57 @@ export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterf await queryRunner.query( `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes) - SELECT asset.id,$1,'MENTIONS','El tipo/hallazgo del elemento se definió con la matriz APLICACION APP(1).xlsx' - FROM assets asset JOIN asset_types type ON type.id=asset.asset_type_id + SELECT asset.id,$1::uuid,'MENTIONS', + 'El tipo/hallazgo del elemento se definió con la matriz APLICACION APP(1).xlsx' + FROM assets asset + JOIN asset_types type ON type.id=asset.asset_type_id WHERE lower(type.code)='yacimiento' ON CONFLICT DO NOTHING`, [appDocumentId], ); + + const importedYacimientos = (await queryRunner.query( + `SELECT count(*)::text AS total + FROM assets asset JOIN asset_types type ON type.id=asset.asset_type_id + WHERE asset.data_origin='IMPORT' + AND asset.source_name='Tablas de yacimiento(1).xlsx' + AND lower(type.code)='yacimiento'`, + )) as CountRow[]; + if (Number(importedYacimientos[0]?.total ?? 0) !== source.territory.length) { + throw new Error( + `F2.2.1 verification failed: expected ${source.territory.length} imported yacimientos, found ${importedYacimientos[0]?.total ?? '0'}`, + ); + } + + const importedCatalog = (await queryRunner.query( + `SELECT count(*)::text AS total + FROM finding_catalog_items item + JOIN finding_categories category ON category.id=item.category_id + WHERE lower(category.code)='app26'`, + )) as CountRow[]; + if (Number(importedCatalog[0]?.total ?? 0) !== allTitles.length) { + throw new Error( + `F2.2.1 verification failed: expected ${allTitles.length} APP26 findings, found ${importedCatalog[0]?.total ?? '0'}`, + ); + } + + const halfContexts = (await queryRunner.query( + `SELECT count(*)::text AS total FROM assets + WHERE (operational_area_id IS NULL) <> (operator_company_id IS NULL)`, + )) as CountRow[]; + if (Number(halfContexts[0]?.total ?? 0) !== 0) { + throw new Error('F2.2.1 verification failed: an imported asset has an incomplete operational context'); + } + + // eslint-disable-next-line no-console + console.log( + `[F2.2.1] imported territory=${source.territory.length}; yacimientos=${importedYacimientos[0]?.total}; catalog=${importedCatalog[0]?.total}; halfContexts=0`, + ); } public async down(): Promise { - throw new Error('F2.2.1 contiene maestros territoriales y catálogo de referencia; no se revierte destructivamente. Restaurar backup PRE si fuera necesario.'); + throw new Error( + 'F2.2.1 contiene maestros territoriales y catálogo de referencia; no se revierte destructivamente. Restaurar backup PRE si fuera necesario.', + ); } } From ba4752a700f72a3726204808f541b5b60c5b0430 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 22:41:40 -0300 Subject: [PATCH 036/144] ci: ejecutar migraciones F2.2.1 sobre PostgreSQL real --- .github/workflows/f2-2-ci.yml | 84 +++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/.github/workflows/f2-2-ci.yml b/.github/workflows/f2-2-ci.yml index 232b97c..ad122c1 100644 --- a/.github/workflows/f2-2-ci.yml +++ b/.github/workflows/f2-2-ci.yml @@ -34,6 +34,90 @@ jobs: - 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; + + -- ResetProductionOperationalData was an intentionally late, one-time + -- production operation with an older timestamp. On a clean CI database + -- it must be considered already executed; otherwise it would run before + -- structural migrations that existed in production when the reset ran. + 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') + ON CONFLICT DO NOTHING; + 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 From 5c0b8ed78678584a0dd22b748d0bcb928b995320 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 22:43:02 -0300 Subject: [PATCH 037/144] ci: corregir sintaxis del smoke de migraciones --- .github/workflows/f2-2-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/f2-2-ci.yml b/.github/workflows/f2-2-ci.yml index ad122c1..6194f8d 100644 --- a/.github/workflows/f2-2-ci.yml +++ b/.github/workflows/f2-2-ci.yml @@ -91,25 +91,25 @@ jobs: GRANT CONNECT ON DATABASE dhv2_ci TO dhv2_app; GRANT USAGE ON SCHEMA public TO dhv2_app; - -- ResetProductionOperationalData was an intentionally late, one-time - -- production operation with an older timestamp. On a clean CI database - -- it must be considered already executed; otherwise it would run before - -- structural migrations that existed in production when the reset ran. + -- 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') - ON CONFLICT DO NOTHING; + 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 + 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 From 7b5050e08ea15b891abdcfd452b757396fef0e3e Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 22:44:30 -0300 Subject: [PATCH 038/144] =?UTF-8?q?fix:=20garantizar=20tipos=20base=20?= =?UTF-8?q?=C3=81rea=20y=20Organizaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...000-phase-f2-2-1-base-operational-types.ts | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 api-v3/src/database/migrations/1789754300000-phase-f2-2-1-base-operational-types.ts diff --git a/api-v3/src/database/migrations/1789754300000-phase-f2-2-1-base-operational-types.ts b/api-v3/src/database/migrations/1789754300000-phase-f2-2-1-base-operational-types.ts new file mode 100644 index 0000000..be0a8e6 --- /dev/null +++ b/api-v3/src/database/migrations/1789754300000-phase-f2-2-1-base-operational-types.ts @@ -0,0 +1,50 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class PhaseF221BaseOperationalTypes1789754300000 implements MigrationInterface { + name = 'PhaseF221BaseOperationalTypes1789754300000'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + UPDATE asset_types + SET operational_role='AREA', can_be_root=true, is_active=true, updated_at=CURRENT_TIMESTAMP + WHERE lower(code)='area' + `); + await queryRunner.query(` + INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role) + SELECT 'area','Área', + 'Área hidrocarburífera administrada como ancla territorial.', + true,true,'AREA' + WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE operational_role='AREA') + AND NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='area') + `); + + await queryRunner.query(` + UPDATE asset_types + SET operational_role='COMPANY', can_be_root=true, is_active=true, updated_at=CURRENT_TIMESTAMP + WHERE lower(code) IN ('empresa','organizacion') + `); + await queryRunner.query(` + INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role) + SELECT 'empresa','Organización', + 'Entidad jurídica u organización administrada. Su rol operativo se registra mediante relaciones históricas.', + true,true,'COMPANY' + WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE operational_role='COMPANY') + AND NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='empresa') + `); + + const rows = (await queryRunner.query(` + SELECT + count(*) FILTER (WHERE operational_role='AREA')::text AS areas, + count(*) FILTER (WHERE operational_role='COMPANY')::text AS companies + FROM asset_types + `)) as Array<{ areas: string; companies: string }>; + + if (Number(rows[0]?.areas ?? 0) < 1 || Number(rows[0]?.companies ?? 0) < 1) { + throw new Error('F2.2.1 could not guarantee AREA and COMPANY asset types'); + } + } + + public async down(): Promise { + throw new Error('F2.2.1 base operational types are structural and are not removed automatically'); + } +} From 29c1abf90745e56a9d255de0399b2c7c79a903d8 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Sun, 6 Sep 2026 22:48:01 -0300 Subject: [PATCH 039/144] =?UTF-8?q?fix:=20preservar=20etiquetas=20t=C3=A9c?= =?UTF-8?q?nicas=20extensas=20del=20Excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0000-phase-f2-2-1-long-reference-labels.ts | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 api-v3/src/database/migrations/1789754350000-phase-f2-2-1-long-reference-labels.ts diff --git a/api-v3/src/database/migrations/1789754350000-phase-f2-2-1-long-reference-labels.ts b/api-v3/src/database/migrations/1789754350000-phase-f2-2-1-long-reference-labels.ts new file mode 100644 index 0000000..f995300 --- /dev/null +++ b/api-v3/src/database/migrations/1789754350000-phase-f2-2-1-long-reference-labels.ts @@ -0,0 +1,28 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class PhaseF221LongReferenceLabels1789754350000 implements MigrationInterface { + name = 'PhaseF221LongReferenceLabels1789754350000'; + + public async up(queryRunner: QueryRunner): Promise { + // La matriz APLICACION APP contiene denominaciones técnicas descriptivas que + // legítimamente superan el límite histórico de 160 caracteres. No se recorta + // información de la fuente: ampliamos sólo columnas descriptivas. + await queryRunner.query(`ALTER TABLE asset_types ALTER COLUMN name TYPE varchar(500)`); + await queryRunner.query(`ALTER TABLE asset_attribute_definitions ALTER COLUMN name TYPE varchar(500)`); + } + + public async down(queryRunner: QueryRunner): Promise { + const rows = (await queryRunner.query(` + SELECT + coalesce(max(length(name)),0)::integer AS max_type_name, + (SELECT coalesce(max(length(name)),0)::integer FROM asset_attribute_definitions) AS max_attribute_name + FROM asset_types + `)) as Array<{ max_type_name: number; max_attribute_name: number }>; + + if ((rows[0]?.max_type_name ?? 0) > 160 || (rows[0]?.max_attribute_name ?? 0) > 160) { + throw new Error('F2.2.1 no puede reducir etiquetas a 160 caracteres sin pérdida de información'); + } + await queryRunner.query(`ALTER TABLE asset_types ALTER COLUMN name TYPE varchar(160)`); + await queryRunner.query(`ALTER TABLE asset_attribute_definitions ALTER COLUMN name TYPE varchar(160)`); + } +} From 1c5efa88069c16d86c7f874a2c689b29b2f9b81e Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:24:54 -0300 Subject: [PATCH 040/144] F2.3: agregar DTO de hallazgo de campo --- .../dto/create-field-finding.dto.ts | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 api-v3/src/inspection-visits/dto/create-field-finding.dto.ts diff --git a/api-v3/src/inspection-visits/dto/create-field-finding.dto.ts b/api-v3/src/inspection-visits/dto/create-field-finding.dto.ts new file mode 100644 index 0000000..9d74192 --- /dev/null +++ b/api-v3/src/inspection-visits/dto/create-field-finding.dto.ts @@ -0,0 +1,58 @@ +import { Transform, Type } from 'class-transformer'; +import { + IsInt, + IsOptional, + IsString, + IsUUID, + Matches, + Max, + MaxLength, + Min, + MinLength, + ValidateIf, +} from 'class-validator'; + +const optionalText = ({ value }: { value: unknown }) => + typeof value === 'string' && value.trim() ? value.trim() : null; + +/** + * Hallazgo capturado desde la APK sobre un Inventario ya seleccionado. + * El assetId se toma de la URL para evitar inconsistencias entre pantalla y payload. + */ +export class CreateFieldFindingDto { + @IsOptional() + @Transform(optionalText) + @IsUUID('4') + catalogItemId?: string | null; + + @ValidateIf((value: CreateFieldFindingDto) => !value.catalogItemId) + @Transform(optionalText) + @IsString() + @MinLength(1) + @MaxLength(500) + customTitle?: string | null; + + @IsOptional() + @Transform(optionalText) + @IsString() + @MaxLength(12000) + customLegalBasis?: string | null; + + @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value)) + @IsString() + @MinLength(1) + @MaxLength(20000) + description!: string; + + @IsOptional() + @Type(() => Number) + @IsInt() + @Min(1) + @Max(10) + severity?: number; + + @IsOptional() + @Transform(optionalText) + @Matches(/^\d{4}-\d{2}-\d{2}$/) + correctionDueOn?: string | null; +} From dd8ea8539bd55cb2ded92ae3d42c5ef44dbd9e6c Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:25:14 -0300 Subject: [PATCH 041/144] F2.3: crear servicio de hallazgos desde Inventario --- .../field-findings.service.ts | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 api-v3/src/inspection-visits/field-findings.service.ts diff --git a/api-v3/src/inspection-visits/field-findings.service.ts b/api-v3/src/inspection-visits/field-findings.service.ts new file mode 100644 index 0000000..4f9b818 --- /dev/null +++ b/api-v3/src/inspection-visits/field-findings.service.ts @@ -0,0 +1,107 @@ +import { ConflictException, Injectable } from '@nestjs/common'; +import { DataSource } from 'typeorm'; +import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context'; +import { FindingCatalogService } from '../inspection-findings/finding-catalog.service'; +import type { CreateInspectionFindingDto } from '../inspection-findings/dto/create-inspection-finding.dto'; +import { InspectionFindingsService } from '../inspection-findings/inspection-findings.service'; +import type { CreateFieldFindingDto } from './dto/create-field-finding.dto'; +import { FieldInventoryService } from './field-inventory.service'; + +interface DraftActRow { + id: string; + code: string; + status: string; +} + +@Injectable() +export class FieldFindingsService { + constructor( + private readonly dataSource: DataSource, + private readonly fieldInventory: FieldInventoryService, + private readonly catalog: FindingCatalogService, + private readonly findings: InspectionFindingsService, + ) {} + + async options(visitId: string, assetId: string, principal: AuthPrincipal) { + const gate = await this.fieldInventory.requireReadyForFinding(visitId, assetId, principal); + const act = await this.requireDraftAct(visitId); + const [catalog, findings] = await Promise.all([ + this.catalog.listApplicableForAsset(assetId, {}), + this.findings.listForAct(act.id), + ]); + + return { + context: gate.context, + act, + capture: gate.capture, + catalog, + findings: findings.data.filter((finding) => finding.assetId === assetId), + canAddAnother: true, + }; + } + + async list(visitId: string, assetId: string, principal: AuthPrincipal) { + const gate = await this.fieldInventory.requireReadyForFinding(visitId, assetId, principal); + const act = await this.requireDraftAct(visitId); + const findings = await this.findings.listForAct(act.id); + return { + context: gate.context, + act, + capture: gate.capture, + data: findings.data.filter((finding) => finding.assetId === assetId), + }; + } + + async create( + visitId: string, + assetId: string, + dto: CreateFieldFindingDto, + principal: AuthPrincipal, + request: RequestWithContext, + ) { + const gate = await this.fieldInventory.requireReadyForFinding(visitId, assetId, principal); + const act = await this.requireDraftAct(visitId); + const payload: CreateInspectionFindingDto = { + assetId, + catalogItemId: dto.catalogItemId ?? null, + customTitle: dto.customTitle ?? null, + customLegalBasis: dto.customLegalBasis ?? null, + description: dto.description, + severity: dto.severity, + correctionDueOn: dto.correctionDueOn ?? null, + }; + const finding = await this.findings.create(act.id, payload, principal, request); + return { + context: gate.context, + act, + capture: gate.capture, + finding, + canAddAnother: true, + }; + } + + private async requireDraftAct(visitId: string): Promise { + const rows = await this.dataSource.query(` + SELECT id, code, status + FROM inspection_acts + WHERE visit_id = $1::uuid + AND status = 'DRAFT' + ORDER BY created_at DESC, id DESC + LIMIT 2 + `, [visitId]) as DraftActRow[]; + + if (rows.length === 0) { + throw new ConflictException({ + code: 'FIELD_FINDING_DRAFT_ACT_REQUIRED', + message: 'La inspección no tiene un Acta borrador abierta para registrar hallazgos', + }); + } + if (rows.length > 1) { + throw new ConflictException({ + code: 'FIELD_FINDING_MULTIPLE_DRAFT_ACTS', + message: 'La inspección tiene más de un Acta borrador. Debe resolverse antes de continuar', + }); + } + return rows[0]; + } +} From f82de44ded5e552e2a54072efc7a29b09a7026ed Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:25:28 -0300 Subject: [PATCH 042/144] F2.3: exponer hallazgos de campo por Inventario --- .../field-findings.controller.ts | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 api-v3/src/inspection-visits/field-findings.controller.ts diff --git a/api-v3/src/inspection-visits/field-findings.controller.ts b/api-v3/src/inspection-visits/field-findings.controller.ts new file mode 100644 index 0000000..02f7c3d --- /dev/null +++ b/api-v3/src/inspection-visits/field-findings.controller.ts @@ -0,0 +1,51 @@ +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 type { CreateFieldFindingDto } from './dto/create-field-finding.dto'; +import { FieldFindingsService } from './field-findings.service'; + +@Controller('inspection-visits/:visitId/field-findings') +export class FieldFindingsController { + constructor(private readonly fieldFindings: FieldFindingsService) {} + + @Get(':assetId/options') + @RequirePermissions('inspection_findings.create', 'inspections.execute') + options( + @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string, + @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string, + @CurrentAuth() principal: AuthPrincipal, + ) { + return this.fieldFindings.options(visitId, assetId, principal); + } + + @Get(':assetId') + @RequirePermissions('inspection_findings.read', 'inspections.execute') + list( + @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string, + @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string, + @CurrentAuth() principal: AuthPrincipal, + ) { + return this.fieldFindings.list(visitId, assetId, principal); + } + + @Post(':assetId') + @RequirePermissions('inspection_findings.create', 'inspections.execute') + create( + @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string, + @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string, + @Body() dto: CreateFieldFindingDto, + @CurrentAuth() principal: AuthPrincipal, + @Req() request: RequestWithContext, + ) { + return this.fieldFindings.create(visitId, assetId, dto, principal, request); + } +} From 1334611ebc328ac4d1c4f26bdbed546d5755504c Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:26:28 -0300 Subject: [PATCH 043/144] F2.3: reforzar puerta servidor para Hallazgos de campo --- .../field-findings.service.ts | 185 +++++++++++++++++- 1 file changed, 178 insertions(+), 7 deletions(-) diff --git a/api-v3/src/inspection-visits/field-findings.service.ts b/api-v3/src/inspection-visits/field-findings.service.ts index 4f9b818..a96c9ad 100644 --- a/api-v3/src/inspection-visits/field-findings.service.ts +++ b/api-v3/src/inspection-visits/field-findings.service.ts @@ -1,11 +1,11 @@ -import { ConflictException, Injectable } from '@nestjs/common'; +import { BadRequestException, ConflictException, Injectable, NotFoundException } from '@nestjs/common'; import { DataSource } from 'typeorm'; import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context'; -import { FindingCatalogService } from '../inspection-findings/finding-catalog.service'; import type { CreateInspectionFindingDto } from '../inspection-findings/dto/create-inspection-finding.dto'; +import { FindingCatalogService } from '../inspection-findings/finding-catalog.service'; import { InspectionFindingsService } from '../inspection-findings/inspection-findings.service'; +import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy'; import type { CreateFieldFindingDto } from './dto/create-field-finding.dto'; -import { FieldInventoryService } from './field-inventory.service'; interface DraftActRow { id: string; @@ -13,17 +13,31 @@ interface DraftActRow { status: string; } +interface FieldFindingGate { + context: { + inspection: { id: string; code: string; status: string }; + area: { id: string; code: string; name: string }; + operatorCompany: { id: string; code: string; name: string }; + }; + capture: { + captureRequired: boolean; + hasGeometry: boolean; + creationGpsCaptured: boolean; + fieldPhotoCount: number; + readyForFinding: boolean; + }; +} + @Injectable() export class FieldFindingsService { constructor( private readonly dataSource: DataSource, - private readonly fieldInventory: FieldInventoryService, private readonly catalog: FindingCatalogService, private readonly findings: InspectionFindingsService, ) {} async options(visitId: string, assetId: string, principal: AuthPrincipal) { - const gate = await this.fieldInventory.requireReadyForFinding(visitId, assetId, principal); + const gate = await this.requireGate(visitId, assetId, principal); const act = await this.requireDraftAct(visitId); const [catalog, findings] = await Promise.all([ this.catalog.listApplicableForAsset(assetId, {}), @@ -41,7 +55,7 @@ export class FieldFindingsService { } async list(visitId: string, assetId: string, principal: AuthPrincipal) { - const gate = await this.fieldInventory.requireReadyForFinding(visitId, assetId, principal); + const gate = await this.requireGate(visitId, assetId, principal); const act = await this.requireDraftAct(visitId); const findings = await this.findings.listForAct(act.id); return { @@ -59,7 +73,7 @@ export class FieldFindingsService { principal: AuthPrincipal, request: RequestWithContext, ) { - const gate = await this.fieldInventory.requireReadyForFinding(visitId, assetId, principal); + const gate = await this.requireGate(visitId, assetId, principal); const act = await this.requireDraftAct(visitId); const payload: CreateInspectionFindingDto = { assetId, @@ -80,6 +94,163 @@ export class FieldFindingsService { }; } + private async requireGate( + visitId: string, + assetId: string, + principal: AuthPrincipal, + ): Promise { + assertMobileInspector(principal); + const [row] = await this.dataSource.query(` + SELECT + visit.id AS "visitId", + visit.code AS "visitCode", + visit.status AS "visitStatus", + visit.operational_area_id AS "areaId", + area.code AS "areaCode", + area.name AS "areaName", + visit.operator_company_id AS "companyId", + company.code AS "companyCode", + company.name AS "companyName", + asset.id AS "assetId", + asset.operational_area_id AS "assetAreaId", + asset.operator_company_id AS "assetCompanyId", + 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 inspection_visit_assets link + WHERE link.visit_id = visit.id + AND link.asset_id = asset.id + AND link.included = true + ) AS selected, + EXISTS ( + SELECT 1 + FROM asset_field_discoveries discovery + WHERE discovery.visit_id = visit.id + AND discovery.asset_id = asset.id + ) AS "captureRequired", + EXISTS ( + SELECT 1 + FROM asset_geometries geometry + WHERE geometry.asset_id = asset.id + ) AS "hasGeometry", + EXISTS ( + SELECT 1 + FROM asset_field_capture_events event + WHERE event.visit_id = visit.id + AND event.asset_id = asset.id + AND event.event_type = 'CREATED' + ) AS "creationGpsCaptured", + ( + SELECT COUNT(*)::integer + FROM asset_field_capture_events event + WHERE event.visit_id = visit.id + AND event.asset_id = asset.id + AND event.event_type = 'PHOTO' + ) AS "fieldPhotoCount" + 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 assets asset ON asset.id = $2::uuid + AND asset.information_status <> 'INACTIVE' + WHERE visit.id = $1::uuid + `, [visitId, assetId, principal.userId]) as Array<{ + visitId: string; + visitCode: string; + visitStatus: string; + areaId: string | null; + areaCode: string | null; + areaName: string | null; + companyId: string | null; + companyCode: string | null; + companyName: string | null; + assetId: string | null; + assetAreaId: string | null; + assetCompanyId: string | null; + assigned: boolean; + selected: boolean; + captureRequired: boolean; + hasGeometry: boolean; + creationGpsCaptured: boolean; + fieldPhotoCount: number; + }>; + + if (!row) { + throw new NotFoundException({ code: 'INSPECTION_VISIT_NOT_FOUND', message: 'Inspección no encontrada' }); + } + if (row.visitStatus !== 'IN_PROGRESS') { + throw new ConflictException({ + code: 'FIELD_FINDING_VISIT_NOT_IN_PROGRESS', + message: 'Los hallazgos sólo pueden registrarse cuando la inspección está en curso', + }); + } + if (!row.assigned) { + throw new ConflictException({ + code: 'FIELD_FINDING_INSPECTOR_NOT_ASSIGNED', + message: 'El inspector no está asignado a esta inspección', + }); + } + if (!row.areaId || !row.companyId || !row.areaCode || !row.areaName || !row.companyCode || !row.companyName) { + throw new ConflictException({ + code: 'FIELD_FINDING_CONTEXT_REQUIRED', + message: 'La inspección no tiene Área y Operadora definidas', + }); + } + if (!row.assetId) { + throw new NotFoundException({ + code: 'FIELD_FINDING_INVENTORY_NOT_FOUND', + message: 'Registro de Inventario no encontrado', + }); + } + if (row.assetAreaId !== row.areaId || row.assetCompanyId !== row.companyId) { + throw new BadRequestException({ + code: 'FIELD_FINDING_INVENTORY_OUTSIDE_CONTEXT', + message: 'El Inventario no pertenece al Área y Operadora de esta inspección', + }); + } + if (!row.selected) { + throw new ConflictException({ + code: 'FIELD_FINDING_INVENTORY_NOT_SELECTED', + message: 'Seleccioná el Inventario dentro de la inspección antes de registrar un hallazgo', + }); + } + + const captureRequired = Boolean(row.captureRequired); + const hasGeometry = Boolean(row.hasGeometry); + const creationGpsCaptured = Boolean(row.creationGpsCaptured); + const fieldPhotoCount = Number(row.fieldPhotoCount ?? 0); + const readyForFinding = !captureRequired || ( + hasGeometry && creationGpsCaptured && fieldPhotoCount > 0 + ); + if (!readyForFinding) { + throw new ConflictException({ + code: 'FIELD_FINDING_CAPTURE_REQUIRED', + message: 'Antes del hallazgo, el Inventario creado en campo debe tener GPS y al menos una foto', + capture: { captureRequired, hasGeometry, creationGpsCaptured, fieldPhotoCount }, + }); + } + + return { + context: { + inspection: { id: row.visitId, code: row.visitCode, status: row.visitStatus }, + area: { id: row.areaId, code: row.areaCode, name: row.areaName }, + operatorCompany: { id: row.companyId, code: row.companyCode, name: row.companyName }, + }, + capture: { + captureRequired, + hasGeometry, + creationGpsCaptured, + fieldPhotoCount, + readyForFinding, + }, + }; + } + private async requireDraftAct(visitId: string): Promise { const rows = await this.dataSource.query(` SELECT id, code, status From 299a63790130dde4a15786b893b5832886a26d33 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:26:40 -0300 Subject: [PATCH 044/144] =?UTF-8?q?F2.3:=20exportar=20cat=C3=A1logo=20y=20?= =?UTF-8?q?servicio=20de=20Hallazgos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/inspection-findings/inspection-findings.module.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/api-v3/src/inspection-findings/inspection-findings.module.ts b/api-v3/src/inspection-findings/inspection-findings.module.ts index 2e64d20..40f5193 100644 --- a/api-v3/src/inspection-findings/inspection-findings.module.ts +++ b/api-v3/src/inspection-findings/inspection-findings.module.ts @@ -29,5 +29,6 @@ import { InspectionEvidenceService } from './inspection-evidence.service'; InspectionFindingsService, InspectionEvidenceService, ], + exports: [FindingCatalogService, InspectionFindingsService], }) export class InspectionFindingsModule {} From dd4199cd911385e6760a12bf0f7e4f09714b117f Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:26:51 -0300 Subject: [PATCH 045/144] F2.3: integrar Hallazgos de campo en visitas --- api-v3/src/inspection-visits/inspection-visits.module.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/api-v3/src/inspection-visits/inspection-visits.module.ts b/api-v3/src/inspection-visits/inspection-visits.module.ts index 17e95a8..b0a5afc 100644 --- a/api-v3/src/inspection-visits/inspection-visits.module.ts +++ b/api-v3/src/inspection-visits/inspection-visits.module.ts @@ -1,14 +1,17 @@ import { Module } from '@nestjs/common'; import { AssetMasterModule } from '../asset-master/asset-master.module'; import { AuditModule } from '../audit/audit.module'; +import { InspectionFindingsModule } from '../inspection-findings/inspection-findings.module'; +import { FieldFindingsController } from './field-findings.controller'; +import { FieldFindingsService } from './field-findings.service'; import { FieldInventoryController } from './field-inventory.controller'; import { FieldInventoryService } from './field-inventory.service'; import { InspectionVisitsController } from './inspection-visits.controller'; import { InspectionVisitsService } from './inspection-visits.service'; @Module({ - imports: [AuditModule, AssetMasterModule], - controllers: [InspectionVisitsController, FieldInventoryController], - providers: [InspectionVisitsService, FieldInventoryService], + imports: [AuditModule, AssetMasterModule, InspectionFindingsModule], + controllers: [InspectionVisitsController, FieldInventoryController, FieldFindingsController], + providers: [InspectionVisitsService, FieldInventoryService, FieldFindingsService], }) export class InspectionVisitsModule {} From e7dd2a72846611f34a1f5fda9daba4f11a3b38ed Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:29:13 -0300 Subject: [PATCH 046/144] =?UTF-8?q?F2.3=20Android:=20agregar=20contrato=20?= =?UTF-8?q?m=C3=B3vil=20de=20Hallazgos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dhinspeccion/data/FieldFindingsMobile.kt | 160 ++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt new file mode 100644 index 0000000..66099da --- /dev/null +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt @@ -0,0 +1,160 @@ +package com.korexlabs.dhinspeccion.data + +import android.content.Context +import com.korexlabs.dhinspeccion.BuildConfig +import com.squareup.moshi.Moshi +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock +import okhttp3.OkHttpClient +import retrofit2.HttpException +import retrofit2.Retrofit +import retrofit2.converter.moshi.MoshiConverterFactory +import retrofit2.http.Body +import retrofit2.http.GET +import retrofit2.http.Header +import retrofit2.http.POST +import retrofit2.http.Path + +data class 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 = 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 FieldFindingOptionsResponse( + val act: FieldFindingAct, + val capture: CaptureStatus = CaptureStatus(), + val catalog: FieldFindingCatalog, + val findings: List = emptyList(), + val canAddAnother: Boolean = true, +) + +data class CreateFieldFindingRequest( + 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, +) + +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, + ): 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 + + @POST("auth/mobile/refresh") + suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse +} + +/** + * Cliente separado para F2.3. Comparte el almacén cifrado de sesión de la APK, + * pero mantiene el contrato de Hallazgos desacoplado del cliente F2.2. + */ +class FieldFindingsRepository(context: Context) { + private val store = SecureSessionStore(context.applicationContext) + private val refreshMutex = Mutex() + 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): FieldFindingOptionsResponse = + authorized { session -> + api.options("Bearer ${session.accessToken}", visitId, assetId) + } + + suspend fun create( + visitId: String, + assetId: String, + request: CreateFieldFindingRequest, + ): FieldFindingCreateResponse = authorized { session -> + api.create("Bearer ${session.accessToken}", visitId, assetId, request) + } + + private suspend fun authorized(block: suspend (StoredSession) -> T): T { + var session = store.load() ?: throw IllegalStateException("Sesión no iniciada") + try { + return block(session) + } catch (error: HttpException) { + if (error.code() != 401) throw error + } + session = refresh(session.refreshToken) + return block(session) + } + + private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock { + val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada") + if (latest.refreshToken != previousRefreshToken) return@withLock latest + try { + store.save(api.refresh(RefreshRequest(previousRefreshToken))) + } catch (error: Throwable) { + store.clear() + throw error + } + } +} From 958a4d134db7ea5c30443bf2b90a4f2adc4cb179 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:29:52 -0300 Subject: [PATCH 047/144] F2.3 Android: integrar flujo de Hallazgos al ViewModel --- .../korexlabs/dhinspeccion/MainViewModel.kt | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt index b65f958..d210325 100644 --- a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt @@ -6,9 +6,13 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope +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.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.StoredSession @@ -20,6 +24,7 @@ import java.time.Instant class MainViewModel(application: Application) : AndroidViewModel(application) { private val repository = DhRepository(application) + private val findingsRepository = FieldFindingsRepository(application) var session: StoredSession? by mutableStateOf(repository.currentSession()) private set @@ -42,6 +47,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { var selectedFieldAsset: FieldAssetDetail? by mutableStateOf(null) private set + var fieldFindingOptions: FieldFindingOptionsResponse? by mutableStateOf(null) + private set + var lastCreatedFinding: FieldFindingItem? by mutableStateOf(null) + private set + init { if (session != null) loadVisits() } @@ -72,6 +82,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { inventory = emptyList() fieldTypes = emptyList() selectedFieldAsset = null + fieldFindingOptions = null + lastCreatedFinding = null } } @@ -86,6 +98,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { inventory = emptyList() fieldTypes = emptyList() selectedFieldAsset = null + fieldFindingOptions = null + lastCreatedFinding = null } fun closeVisitView() { @@ -93,6 +107,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { inventory = emptyList() fieldTypes = emptyList() selectedFieldAsset = null + fieldFindingOptions = null + lastCreatedFinding = null loadVisits() } @@ -125,6 +141,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { selectedFieldAsset = repository.selectFieldAsset(visitId, item.id) notice = "Inventario agregado a la inspección." inventory = repository.fieldInventory(visitId, null, null).data + if (selectedFieldAsset?.capture?.readyForFinding == true) { + loadFindingOptionsInternal(visitId, item.id) + } } } @@ -185,11 +204,74 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { "Fotografía registrada." } inventory = repository.fieldInventory(visitId, null, null).data + if (response.capture.readyForFinding) { + loadFindingOptionsInternal(visitId, asset.id) + } } } + fun openFindingForSelected() { + val visitId = visit?.id ?: return + val assetId = selectedFieldAsset?.asset?.id ?: return + launchBusy { loadFindingOptionsInternal(visitId, assetId) } + } + + 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 + 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 { + val response = findingsRepository.create( + visitId, + assetId, + CreateFieldFindingRequest( + 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." + fieldFindingOptions = findingsRepository.options(visitId, assetId) + } + } + + fun clearFindingFlow() { + fieldFindingOptions = null + lastCreatedFinding = null + error = null + } + fun clearSelectedFieldAsset() { selectedFieldAsset = null + fieldFindingOptions = null + lastCreatedFinding = null + } + + private suspend fun loadFindingOptionsInternal(visitId: String, assetId: String) { + fieldFindingOptions = findingsRepository.options(visitId, assetId) + lastCreatedFinding = null } private fun launchBusy(block: suspend () -> Unit) { From 1f5040f3c5aea96a11c13043127007bc9d10e7bd Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:30:39 -0300 Subject: [PATCH 048/144] F2.3 Android: crear pantalla de Hallazgo desde Inventario --- .../dhinspeccion/ui/FieldFindingScreen.kt | 254 ++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100644 android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt new file mode 100644 index 0000000..7744fb2 --- /dev/null +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt @@ -0,0 +1,254 @@ +package com.korexlabs.dhinspeccion.ui + +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.verticalScroll +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.material3.Button +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.ui.unit.dp +import com.korexlabs.dhinspeccion.MainViewModel + +@Composable +fun FieldFindingScreen(model: MainViewModel) { + val options = model.fieldFindingOptions ?: return + val asset = model.selectedFieldAsset?.asset ?: return + var search by rememberSaveable(asset.id) { mutableStateOf("") } + var selectedCatalogId by rememberSaveable(asset.id) { mutableStateOf(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("") } + + 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: ${if (options.capture.readyForFinding) "OK" else "pendiente"}", + color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall, + ) + } + } + + 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 ya registrados en este Inventario", fontWeight = FontWeight.Bold) + options.findings.forEach { finding -> + Card(Modifier.fillMaxWidth()) { + Column(Modifier.padding(10.dp)) { + Text("${finding.code} · ${finding.title}", fontWeight = FontWeight.SemiBold) + Text("Gravedad: ${finding.severity ?: "s/d"} · ${finding.status}", style = MaterialTheme.typography.bodySmall) + } + } + } + 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(4.dp)) { + Text("Hallazgo registrado", fontWeight = FontWeight.Bold) + Text("${finding.code} · ${finding.title}") + Text("Podés registrar otro Hallazgo sobre el mismo Inventario.", style = MaterialTheme.typography.bodySmall) + } + } + } + } +} From a49171fe319031361251de9fce00791984aaacc9 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:31:11 -0300 Subject: [PATCH 049/144] =?UTF-8?q?F2.3=20Android:=20enrutar=20Hallazgo=20?= =?UTF-8?q?despu=C3=A9s=20del=20desbloqueo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt index 2d5a9ec..80d72fc 100644 --- a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt @@ -90,6 +90,7 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) { model.logout() }, ) + model.fieldFindingOptions != null -> FieldFindingScreen(model) else -> DhApp(model) } } From acb2488025cc2c3f7753abe52899dcf0ddd51d7a Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:31:33 -0300 Subject: [PATCH 050/144] F2.3 Android: versionar APK 0.10.2 --- android-app/app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts index 66b1d39..96955f3 100644 --- a/android-app/app/build.gradle.kts +++ b/android-app/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "com.korexlabs.dhinspeccion" minSdk = 26 targetSdk = 36 - versionCode = 15 - versionName = "0.10.1" + versionCode = 16 + versionName = "0.10.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true From 3988918023a4bbc8346acdfc6cc43222fca26eb7 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:31:51 -0300 Subject: [PATCH 051/144] F2.3 CI: compilar APK 0.10.2 --- .github/workflows/android.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index cf423e0..9758619 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -4,6 +4,7 @@ on: push: branches: - 'feature/f2-2*' + - 'feature/f2-3*' paths: - 'android-app/**' - '.github/workflows/android.yml' @@ -53,7 +54,7 @@ jobs: - name: Upload APK uses: actions/upload-artifact@v4 with: - name: DH-Inspeccion-F2.2.1-0.10.1-debug + name: DH-Inspeccion-F2.3-0.10.2-debug path: android-app/app/build/outputs/apk/debug/app-debug.apk if-no-files-found: error retention-days: 14 From c5dde72b7f35f8f323a84e67c5d1ac6396b8f9e7 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:32:07 -0300 Subject: [PATCH 052/144] F2.3 CI: validar API y contrato de Hallazgos de campo --- .github/workflows/f2-3-ci.yml | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/f2-3-ci.yml diff --git a/.github/workflows/f2-3-ci.yml b/.github/workflows/f2-3-ci.yml new file mode 100644 index 0000000..d88560f --- /dev/null +++ b/.github/workflows/f2-3-ci.yml @@ -0,0 +1,38 @@ +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 + - name: Tests + run: npm test + - name: Build + run: npm run build From d765f7d65e08ec5158286685698e8d10e9d2ebf3 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:34:03 -0300 Subject: [PATCH 053/144] =?UTF-8?q?F2.3:=20preservar=20validaci=C3=B3n=20r?= =?UTF-8?q?untime=20del=20DTO=20m=C3=B3vil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/inspection-visits/field-findings.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-v3/src/inspection-visits/field-findings.controller.ts b/api-v3/src/inspection-visits/field-findings.controller.ts index 02f7c3d..8754660 100644 --- a/api-v3/src/inspection-visits/field-findings.controller.ts +++ b/api-v3/src/inspection-visits/field-findings.controller.ts @@ -10,7 +10,7 @@ import { 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 type { CreateFieldFindingDto } from './dto/create-field-finding.dto'; +import { CreateFieldFindingDto } from './dto/create-field-finding.dto'; import { FieldFindingsService } from './field-findings.service'; @Controller('inspection-visits/:visitId/field-findings') From 2143b9454f8b9e2c4ec8a8409eef1a556bee4ee0 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:35:22 -0300 Subject: [PATCH 054/144] =?UTF-8?q?F2.3=20CI:=20conservar=20diagn=C3=B3sti?= =?UTF-8?q?co=20de=20TypeScript?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/f2-3-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/f2-3-ci.yml b/.github/workflows/f2-3-ci.yml index d88560f..d6f5b83 100644 --- a/.github/workflows/f2-3-ci.yml +++ b/.github/workflows/f2-3-ci.yml @@ -31,7 +31,15 @@ jobs: - name: Install run: npm ci - name: Typecheck - run: npm run 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 - name: Build From f9fd66d9133618a55c025fa2dbca02d75c192577 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:36:30 -0300 Subject: [PATCH 055/144] =?UTF-8?q?F2.3=20CI:=20conservar=20diagn=C3=B3sti?= =?UTF-8?q?co=20de=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/f2-3-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/f2-3-ci.yml b/.github/workflows/f2-3-ci.yml index d6f5b83..099a394 100644 --- a/.github/workflows/f2-3-ci.yml +++ b/.github/workflows/f2-3-ci.yml @@ -41,6 +41,14 @@ jobs: if-no-files-found: warn retention-days: 3 - name: Tests - run: npm test + 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 From 1a89024117821cb7b0dc33d95dba9ace8a81e1d9 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:37:59 -0300 Subject: [PATCH 056/144] =?UTF-8?q?F2.3:=20estabilizar=20declaraciones=20p?= =?UTF-8?q?=C3=BAblicas=20del=20controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/inspection-visits/field-findings.controller.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api-v3/src/inspection-visits/field-findings.controller.ts b/api-v3/src/inspection-visits/field-findings.controller.ts index 8754660..c4a40c2 100644 --- a/api-v3/src/inspection-visits/field-findings.controller.ts +++ b/api-v3/src/inspection-visits/field-findings.controller.ts @@ -23,7 +23,7 @@ export class FieldFindingsController { @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string, @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string, @CurrentAuth() principal: AuthPrincipal, - ) { + ): Promise { return this.fieldFindings.options(visitId, assetId, principal); } @@ -33,7 +33,7 @@ export class FieldFindingsController { @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string, @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string, @CurrentAuth() principal: AuthPrincipal, - ) { + ): Promise { return this.fieldFindings.list(visitId, assetId, principal); } @@ -45,7 +45,7 @@ export class FieldFindingsController { @Body() dto: CreateFieldFindingDto, @CurrentAuth() principal: AuthPrincipal, @Req() request: RequestWithContext, - ) { + ): Promise { return this.fieldFindings.create(visitId, assetId, dto, principal, request); } } From 97f5fbdd9e93ebdbd66b1f03d44c8331978487b4 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:38:17 -0300 Subject: [PATCH 057/144] =?UTF-8?q?F2.3=20CI:=20conservar=20diagn=C3=B3sti?= =?UTF-8?q?co=20de=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/f2-3-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/f2-3-ci.yml b/.github/workflows/f2-3-ci.yml index 099a394..abd70fe 100644 --- a/.github/workflows/f2-3-ci.yml +++ b/.github/workflows/f2-3-ci.yml @@ -51,4 +51,12 @@ jobs: if-no-files-found: warn retention-days: 3 - name: Build - run: npm run 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 From 6895edce20e7bd5047c274da862a72b4b6b59ea6 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:39:59 -0300 Subject: [PATCH 058/144] F2.3: probar contrato de Hallazgos desde Inventario --- api-v3/test/unit/field-findings-f2-3.test.ts | 67 ++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 api-v3/test/unit/field-findings-f2-3.test.ts diff --git a/api-v3/test/unit/field-findings-f2-3.test.ts b/api-v3/test/unit/field-findings-f2-3.test.ts new file mode 100644 index 0000000..e3b061b --- /dev/null +++ b/api-v3/test/unit/field-findings-f2-3.test.ts @@ -0,0 +1,67 @@ +import 'reflect-metadata'; +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { readFileSync } from 'node:fs'; +import { plainToInstance } from 'class-transformer'; +import { validate } from 'class-validator'; +import { REQUIRED_PERMISSIONS_KEY } from '../../src/authorization/decorators/require-permissions.decorator'; +import { CreateFieldFindingDto } from '../../src/inspection-visits/dto/create-field-finding.dto'; +import { FieldFindingsController } from '../../src/inspection-visits/field-findings.controller'; + +function permissions(method: string): string[] { + const controller = FieldFindingsController.prototype; + const handler = controller[method as keyof typeof controller]; + return Reflect.getMetadata(REQUIRED_PERMISSIONS_KEY, handler) as string[]; +} + +test('F2.3 mantiene los Hallazgos de campo bajo ejecución móvil y permisos explícitos', () => { + assert.deepEqual(permissions('options'), ['inspection_findings.create', 'inspections.execute']); + assert.deepEqual(permissions('list'), ['inspection_findings.read', 'inspections.execute']); + assert.deepEqual(permissions('create'), ['inspection_findings.create', 'inspections.execute']); +}); + +test('F2.3 exige descripción y título cuando el inspector usa OTROS', async () => { + const dto = plainToInstance(CreateFieldFindingDto, { + description: '', + catalogItemId: null, + customTitle: '', + }); + const errors = await validate(dto); + const properties = new Set(errors.map((error) => error.property)); + assert.equal(properties.has('description'), true); + assert.equal(properties.has('customTitle'), true); +}); + +test('F2.3 vuelve a validar contexto, selección y GPS+foto en servidor antes del Hallazgo', () => { + const source = readFileSync('src/inspection-visits/field-findings.service.ts', 'utf8'); + assert.match(source, /assertMobileInspector\(principal\)/); + assert.match(source, /row\.visitStatus !== 'IN_PROGRESS'/); + assert.match(source, /FIELD_FINDING_INSPECTOR_NOT_ASSIGNED/); + assert.match(source, /FIELD_FINDING_INVENTORY_OUTSIDE_CONTEXT/); + assert.match(source, /FIELD_FINDING_INVENTORY_NOT_SELECTED/); + assert.match(source, /hasGeometry && creationGpsCaptured && fieldPhotoCount > 0/); + assert.match(source, /FIELD_FINDING_CAPTURE_REQUIRED/); +}); + +test('F2.3 resuelve exactamente el Acta DRAFT actual y no vuelve a la regla de un Acta por inspección', () => { + const source = readFileSync('src/inspection-visits/field-findings.service.ts', 'utf8'); + assert.match(source, /FROM inspection_acts/); + assert.match(source, /status = 'DRAFT'/); + assert.match(source, /LIMIT 2/); + assert.match(source, /FIELD_FINDING_DRAFT_ACT_REQUIRED/); + assert.match(source, /FIELD_FINDING_MULTIPLE_DRAFT_ACTS/); +}); + +test('F2.3 reutiliza catálogo contextual y creación canónica, conserva OTROS y permite varios Hallazgos', () => { + const fieldSource = readFileSync('src/inspection-visits/field-findings.service.ts', 'utf8'); + const catalogSource = readFileSync('src/inspection-findings/finding-catalog.service.ts', 'utf8'); + const findingSource = readFileSync('src/inspection-findings/inspection-findings.service.ts', 'utf8'); + + assert.match(fieldSource, /this\.catalog\.listApplicableForAsset\(assetId, \{\}\)/); + assert.match(fieldSource, /this\.findings\.create\(act\.id, payload, principal, request\)/); + assert.match(fieldSource, /canAddAnother: true/); + assert.match(catalogSource, /code: 'OTHER'/); + assert.match(catalogSource, /label: 'OTROS'/); + assert.match(findingSource, /finding_catalog_proposals/); + assert.match(findingSource, /PENDING/); +}); From 721a189b4c344bfbeecd82d790863144a1426f42 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:40:20 -0300 Subject: [PATCH 059/144] F2.3: versionar API 0.23.0-1 --- api-v3/src/version.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api-v3/src/version.ts b/api-v3/src/version.ts index 54ffb44..e4faf93 100644 --- a/api-v3/src/version.ts +++ b/api-v3/src/version.ts @@ -1,2 +1,2 @@ -export const API_VERSION = '0.22.1-1'; -export const API_PHASE = 'F2.2.1'; +export const API_VERSION = '0.23.0-1'; +export const API_PHASE = 'F2.3'; From cb69cea3a951e57c37b04bf89221ce818f2eb3f8 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:40:50 -0300 Subject: [PATCH 060/144] =?UTF-8?q?F2.3:=20alinear=20versi=C3=B3n=20de=20p?= =?UTF-8?q?aquete=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api-v3/package.json b/api-v3/package.json index 38bbea3..f777523 100644 --- a/api-v3/package.json +++ b/api-v3/package.json @@ -1,6 +1,6 @@ { "name": "dhv2-api", - "version": "0.22.1-1", + "version": "0.23.0-1", "private": true, "license": "UNLICENSED", "scripts": { @@ -43,4 +43,4 @@ "tsx": "^4.20.6", "typescript": "^5.9.0" } -} \ No newline at end of file +} From c4c6dd6c24c51da80cdfa5105b25370e4bb4424b Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:48:36 -0300 Subject: [PATCH 061/144] =?UTF-8?q?F2.4=20Android:=20agregar=20evidencias?= =?UTF-8?q?=20fotogr=C3=A1ficas=20al=20Hallazgo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dhinspeccion/data/FieldFindingsMobile.kt | 96 ++++++++++++++++++- 1 file changed, 94 insertions(+), 2 deletions(-) diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt index 66099da..8523801 100644 --- a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt @@ -6,15 +6,24 @@ import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock +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 java.io.File +import java.time.Instant data class FieldFindingAct( val id: String, @@ -64,6 +73,30 @@ data class FieldFindingItem( 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 = emptyList(), +) + data class FieldFindingOptionsResponse( val act: FieldFindingAct, val capture: CaptureStatus = CaptureStatus(), @@ -104,13 +137,36 @@ private interface FieldFindingsApi { @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 separado para F2.3. Comparte el almacén cifrado de sesión de la APK, - * pero mantiene el contrato de Hallazgos desacoplado del cliente F2.2. + * Cliente de campo para Hallazgos y sus evidencias append-only. + * Comparte el almacén cifrado de sesión y nunca persiste la contraseña. */ class FieldFindingsRepository(context: Context) { private val store = SecureSessionStore(context.applicationContext) @@ -136,6 +192,42 @@ class FieldFindingsRepository(context: Context) { 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 = latitude.toString().toRequestBody(text), + longitude = longitude.toString().toRequestBody(text), + accuracyM = accuracyM?.toString()?.toRequestBody(text), + deviceLabel = "DH Android".toRequestBody(text), + ) + } + private suspend fun authorized(block: suspend (StoredSession) -> T): T { var session = store.load() ?: throw IllegalStateException("Sesión no iniciada") try { From a2ed3cf091e6c8b5157436af98d545eceba88cbe Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:49:30 -0300 Subject: [PATCH 062/144] F2.4 Android: gestionar evidencias por Hallazgo --- .../korexlabs/dhinspeccion/MainViewModel.kt | 74 ++++++++++++++++--- 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt index d210325..c5cddd0 100644 --- a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt @@ -10,6 +10,7 @@ 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 @@ -51,6 +52,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { private set var lastCreatedFinding: FieldFindingItem? by mutableStateOf(null) private set + var fieldFindingEvidence: Map> by mutableStateOf(emptyMap()) + private set init { if (session != null) loadVisits() @@ -82,8 +85,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { inventory = emptyList() fieldTypes = emptyList() selectedFieldAsset = null - fieldFindingOptions = null - lastCreatedFinding = null + clearFindingState() } } @@ -98,8 +100,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { inventory = emptyList() fieldTypes = emptyList() selectedFieldAsset = null - fieldFindingOptions = null - lastCreatedFinding = null + clearFindingState() } fun closeVisitView() { @@ -107,8 +108,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { inventory = emptyList() fieldTypes = emptyList() selectedFieldAsset = null - fieldFindingOptions = null - lastCreatedFinding = null + clearFindingState() loadVisits() } @@ -252,26 +252,76 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { ), ) lastCreatedFinding = response.finding - notice = "Hallazgo ${response.finding.code} registrado." - fieldFindingOptions = findingsRepository.options(visitId, assetId) + notice = "Hallazgo ${response.finding.code} registrado. Podés agregar evidencia fotográfica." + loadFindingOptionsInternal(visitId, assetId, keepLastCreated = true) } } + fun uploadFindingPhoto( + findingId: String, + file: File, + latitude: Double, + longitude: Double, + accuracyM: Double?, + title: String? = null, + description: String? = null, + ) { + launchBusy { + 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 clearFindingFlow() { fieldFindingOptions = null lastCreatedFinding = null + fieldFindingEvidence = emptyMap() error = null } fun clearSelectedFieldAsset() { selectedFieldAsset = null - fieldFindingOptions = null - lastCreatedFinding = null + clearFindingState() } - private suspend fun loadFindingOptionsInternal(visitId: String, assetId: String) { - fieldFindingOptions = findingsRepository.options(visitId, assetId) + private suspend fun loadFindingOptionsInternal( + visitId: String, + assetId: String, + keepLastCreated: Boolean = false, + ) { + val options = findingsRepository.options(visitId, assetId) + fieldFindingOptions = options + if (!keepLastCreated) lastCreatedFinding = null + val loaded = linkedMapOf>() + 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 clearFindingState() { + fieldFindingOptions = null lastCreatedFinding = null + fieldFindingEvidence = emptyMap() } private fun launchBusy(block: suspend () -> Unit) { From c524d2ade62d2150d3e99ad5b2b79618cea6d644 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:50:46 -0300 Subject: [PATCH 063/144] F2.4 Android: capturar foto GPS por Hallazgo --- .../dhinspeccion/ui/FieldFindingScreen.kt | 181 +++++++++++++++++- 1 file changed, 174 insertions(+), 7 deletions(-) diff --git a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt index 7744fb2..acc6c63 100644 --- a/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt +++ b/android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt @@ -1,5 +1,12 @@ 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 @@ -8,7 +15,9 @@ 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 @@ -16,24 +25,47 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text -import androidx.compose.material3.Button 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.foundation.text.KeyboardOptions 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(null) } var other by rememberSaveable(asset.id) { mutableStateOf(false) } @@ -43,6 +75,71 @@ fun FieldFindingScreen(model: MainViewModel) { var severityText by rememberSaveable(asset.id) { mutableStateOf("") } var correctionDueOn by rememberSaveable(asset.id) { mutableStateOf("") } + var requestedFindingId by remember { mutableStateOf(null) } + var pendingPhotoFile by remember { mutableStateOf(null) } + var pendingPhotoGeo by remember { mutableStateOf(null) } + var pendingPhotoFindingId by remember { mutableStateOf(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) + } + } + } + + 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) + } + + 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() || @@ -88,7 +185,7 @@ fun FieldFindingScreen(model: MainViewModel) { Text(asset.name, fontWeight = FontWeight.Bold) Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall) Text( - "GPS + foto: ${if (options.capture.readyForFinding) "OK" else "pendiente"}", + "GPS + foto del Inventario: ${if (options.capture.readyForFinding) "OK" else "pendiente"}", color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error, style = MaterialTheme.typography.bodySmall, ) @@ -107,12 +204,30 @@ fun FieldFindingScreen(model: MainViewModel) { } if (options.findings.isNotEmpty()) { - Text("Hallazgos ya registrados en este Inventario", fontWeight = FontWeight.Bold) + 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)) { + Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { Text("${finding.code} · ${finding.title}", fontWeight = FontWeight.SemiBold) Text("Gravedad: ${finding.severity ?: "s/d"} · ${finding.status}", style = MaterialTheme.typography.bodySmall) + Text( + "Evidencias: ${evidence.size} · Fotos: ${evidence.count { it.kind == "PHOTO" }}", + style = MaterialTheme.typography.bodySmall, + ) + 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") + } } } } @@ -243,12 +358,64 @@ fun FieldFindingScreen(model: MainViewModel) { Modifier.fillMaxWidth(), colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer), ) { - Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { + Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { Text("Hallazgo registrado", fontWeight = FontWeight.Bold) Text("${finding.code} · ${finding.title}") - Text("Podés registrar otro Hallazgo sobre el mismo Inventario.", style = MaterialTheme.typography.bodySmall) + 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) + client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token) + .addOnSuccessListener { location -> + if (!continuation.isActive) return@addOnSuccessListener + if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual.")) + else continuation.resume(FindingGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble())) + } + .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) } + continuation.invokeOnCancellation { source.cancel() } +} + +private fun newFindingPhoto(context: Context): Pair { + 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) From f5f6afe7976810ff6d3fb47c2b30292294de7b74 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:51:16 -0300 Subject: [PATCH 064/144] F2.4 Android: versionar APK 0.10.3 --- android-app/app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts index 96955f3..a104bc3 100644 --- a/android-app/app/build.gradle.kts +++ b/android-app/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "com.korexlabs.dhinspeccion" minSdk = 26 targetSdk = 36 - versionCode = 16 - versionName = "0.10.2" + versionCode = 17 + versionName = "0.10.3" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true From bdaccb66d0c9daec84d5836b68aafd422bd15d6a Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 08:51:33 -0300 Subject: [PATCH 065/144] F2.4 CI: compilar APK 0.10.3 --- .github/workflows/android.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9758619..c81828d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -5,6 +5,7 @@ on: branches: - 'feature/f2-2*' - 'feature/f2-3*' + - 'feature/f2-4*' paths: - 'android-app/**' - '.github/workflows/android.yml' @@ -54,7 +55,7 @@ jobs: - name: Upload APK uses: actions/upload-artifact@v4 with: - name: DH-Inspeccion-F2.3-0.10.2-debug + name: DH-Inspeccion-F2.4-0.10.3-debug path: android-app/app/build/outputs/apk/debug/app-debug.apk if-no-files-found: error retention-days: 14 From da2598c03df21192d8837279fa1c9e155e0a27cf Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:01:57 -0300 Subject: [PATCH 066/144] =?UTF-8?q?F3.1:=20registrar=20estructura=20y=20ca?= =?UTF-8?q?t=C3=A1logo=20desde=20Excel=20revisado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reference-data/f3-1-inventory-excel.ts | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 api-v3/src/reference-data/f3-1-inventory-excel.ts diff --git a/api-v3/src/reference-data/f3-1-inventory-excel.ts b/api-v3/src/reference-data/f3-1-inventory-excel.ts new file mode 100644 index 0000000..3ebeb71 --- /dev/null +++ b/api-v3/src/reference-data/f3-1-inventory-excel.ts @@ -0,0 +1,62 @@ +import { gunzipSync } from 'node:zlib'; + +/** + * F3.1 · Inventario estructural + catálogo contextual. + * Fuente: APLICACION APP(2).xlsx entregado por DH el 07/09/2026. + * Hoja1: familias de Instalación/Subinstalación + hallazgos contextuales. + * Hoja2: 19 grupos canónicos de hallazgos. + * + * La carga está comprimida para mantener el repositorio legible. No crea Áreas + * ni Yacimientos concretos: sólo familias técnicas y catálogo. + */ +export interface F31FindingGroup { + key: string; + name: string; + sourceRow: number; + items: string[]; +} + +export interface F31InstallationFamily { + code: string; + name: string; + level: 'INSTALLATION'; + legacyTypeCode: string; + groupKeys: string[]; + directFindings: string[]; + sourceSheet: 'Hoja1'; + sourceRow: number; +} + +export interface F31SubinstallationFamily { + code: string; + name: string; + level: 'SUBINSTALLATION'; + parentCode: string; + legacyTypeCode: string; + groupKeys: string[]; + directFindings: string[]; + informationLabels: string[]; + sourceRow: number; +} + +interface F31Source { + universal: string[]; + groups: F31FindingGroup[]; + installationFamilies: F31InstallationFamily[]; + subinstallationFamilies: F31SubinstallationFamily[]; +} + +const SNAPSHOT_GZIP_BASE64 = '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'; + +function loadSource(): F31Source { + return JSON.parse( + gunzipSync(Buffer.from(SNAPSHOT_GZIP_BASE64, 'base64')).toString('utf8'), + ) as F31Source; +} + +const source = loadSource(); + +export const F31_UNIVERSAL_FINDINGS = source.universal; +export const F31_FINDING_GROUPS = source.groups; +export const F31_INSTALLATION_FAMILIES = source.installationFamilies; +export const F31_SUBINSTALLATION_FAMILIES = source.subinstallationFamilies; From f387645ff97bf675fe22dc1e4fbdafefd8f89ba2 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:06:03 -0300 Subject: [PATCH 067/144] =?UTF-8?q?F3.1:=20migrar=20Inventario=20estructur?= =?UTF-8?q?al=20y=20recargar=20cat=C3=A1logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...-phase-f3-1-inventory-structure-catalog.ts | 359 ++++++++++++++++++ 1 file changed, 359 insertions(+) create mode 100644 api-v3/src/database/migrations/1789844400000-phase-f3-1-inventory-structure-catalog.ts diff --git a/api-v3/src/database/migrations/1789844400000-phase-f3-1-inventory-structure-catalog.ts b/api-v3/src/database/migrations/1789844400000-phase-f3-1-inventory-structure-catalog.ts new file mode 100644 index 0000000..facfe1c --- /dev/null +++ b/api-v3/src/database/migrations/1789844400000-phase-f3-1-inventory-structure-catalog.ts @@ -0,0 +1,359 @@ +import { createHash } from 'node:crypto'; +import { MigrationInterface, QueryRunner } from 'typeorm'; +import { + F31_FINDING_GROUPS, + F31_INSTALLATION_FAMILIES, + F31_SUBINSTALLATION_FAMILIES, + F31_UNIVERSAL_FINDINGS, +} from '../../reference-data/f3-1-inventory-excel'; + +function quoteIdentifier(identifier: string): string { + return `"${identifier.replaceAll('"', '""')}"`; +} + +function findingKey(value: string): string { + return value + .normalize('NFD') + .replace(/[\u0300-\u036f]/g, '') + .toLowerCase() + .replace(/[^a-z0-9]+/g, ' ') + .trim() + .replace(/\s+/g, ' '); +} + +function findingCode(title: string): string { + return `APP26R2-${createHash('sha1').update(findingKey(title)).digest('hex').slice(0, 12).toUpperCase()}`; +} + +type IdRow = { id: string }; +type CountRow = { total: string }; + +export class PhaseF31InventoryStructureCatalog1789844400000 implements MigrationInterface { + name = 'PhaseF31InventoryStructureCatalog1789844400000'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + INSERT INTO source_documents (document_type,document_number,title,issuer,notes) + SELECT 'SPREADSHEET','DH-F31-APP','APLICACION APP(2).xlsx','Dirección de Hidrocarburos', + 'F3.1: revisión estructural. Hoja1 define Instalaciones/Subinstalaciones; Hoja2 define catálogo contextual.' + WHERE NOT EXISTS ( + SELECT 1 FROM source_documents + WHERE document_number='DH-F31-APP' AND issuer='Dirección de Hidrocarburos' + ) + `); + + await queryRunner.query(` + INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role) + SELECT 'subinstalacion','Subinstalación', + 'Unidad física subordinada a una Instalación. Su familia técnica determina el catálogo contextual de Hallazgos.', + false,true,'GENERIC' + WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='subinstalacion') + `); + await queryRunner.query(` + INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id) + SELECT child.id,parent.id + FROM asset_types child CROSS JOIN asset_types parent + WHERE lower(child.code)='subinstalacion' AND lower(parent.code)='instalacion' + ON CONFLICT DO NOTHING + `); + + await queryRunner.query(` + CREATE TABLE inventory_families ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + code varchar(120) NOT NULL UNIQUE, + name varchar(240) NOT NULL, + level varchar(24) NOT NULL, + legacy_type_code varchar(120), + information_labels jsonb NOT NULL DEFAULT '[]'::jsonb, + source_reference varchar(240), + is_active boolean NOT NULL DEFAULT true, + created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, + CONSTRAINT chk_inventory_families_level CHECK (level IN ('INSTALLATION','SUBINSTALLATION')), + CONSTRAINT chk_inventory_families_information_labels CHECK (jsonb_typeof(information_labels)='array') + ) + `); + await queryRunner.query(` + CREATE INDEX idx_inventory_families_level_active + ON inventory_families(level,is_active,name) + `); + await queryRunner.query(` + CREATE TABLE inventory_family_parent_rules ( + child_family_id uuid PRIMARY KEY, + parent_family_id uuid NOT NULL, + created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, + CONSTRAINT fk_inventory_family_parent_child FOREIGN KEY (child_family_id) + REFERENCES inventory_families(id) ON DELETE CASCADE, + CONSTRAINT fk_inventory_family_parent_parent FOREIGN KEY (parent_family_id) + REFERENCES inventory_families(id) ON DELETE CASCADE, + CONSTRAINT chk_inventory_family_parent_distinct CHECK (child_family_id <> parent_family_id) + ) + `); + await queryRunner.query(` + CREATE INDEX idx_inventory_family_parent_parent + ON inventory_family_parent_rules(parent_family_id,child_family_id) + `); + await queryRunner.query(` + ALTER TABLE assets ADD COLUMN inventory_family_id uuid + `); + await queryRunner.query(` + ALTER TABLE assets ADD CONSTRAINT fk_assets_inventory_family + FOREIGN KEY (inventory_family_id) REFERENCES inventory_families(id) ON DELETE RESTRICT + `); + await queryRunner.query(` + CREATE INDEX idx_assets_inventory_family ON assets(inventory_family_id) + `); + await queryRunner.query(` + CREATE TABLE finding_catalog_item_inventory_families ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + catalog_item_id uuid NOT NULL, + inventory_family_id uuid NOT NULL, + created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, + CONSTRAINT uq_finding_catalog_item_inventory_family UNIQUE (catalog_item_id,inventory_family_id), + CONSTRAINT fk_finding_catalog_family_item FOREIGN KEY (catalog_item_id) + REFERENCES finding_catalog_items(id) ON DELETE CASCADE, + CONSTRAINT fk_finding_catalog_family_family FOREIGN KEY (inventory_family_id) + REFERENCES inventory_families(id) ON DELETE CASCADE + ) + `); + await queryRunner.query(` + CREATE INDEX idx_finding_catalog_family_family + ON finding_catalog_item_inventory_families(inventory_family_id,catalog_item_id) + `); + + for (const family of F31_INSTALLATION_FAMILIES) { + await queryRunner.query(` + INSERT INTO inventory_families + (code,name,level,legacy_type_code,information_labels,source_reference,is_active) + VALUES ($1,$2,'INSTALLATION',$3,'[]'::jsonb,$4,true) + ON CONFLICT (code) DO UPDATE SET + name=EXCLUDED.name, + legacy_type_code=EXCLUDED.legacy_type_code, + source_reference=EXCLUDED.source_reference, + is_active=true, + updated_at=CURRENT_TIMESTAMP + `, [family.code, family.name, family.legacyTypeCode, `APLICACION APP(2).xlsx|Hoja1|fila:${family.sourceRow}`]); + } + for (const family of F31_SUBINSTALLATION_FAMILIES) { + await queryRunner.query(` + INSERT INTO inventory_families + (code,name,level,legacy_type_code,information_labels,source_reference,is_active) + VALUES ($1,$2,'SUBINSTALLATION',$3,$4::jsonb,$5,true) + ON CONFLICT (code) DO UPDATE SET + name=EXCLUDED.name, + legacy_type_code=EXCLUDED.legacy_type_code, + information_labels=EXCLUDED.information_labels, + source_reference=EXCLUDED.source_reference, + is_active=true, + updated_at=CURRENT_TIMESTAMP + `, [ + family.code, + family.name, + family.legacyTypeCode, + JSON.stringify(family.informationLabels), + `APLICACION APP(2).xlsx|Hoja1|fila:${family.sourceRow}`, + ]); + await queryRunner.query(` + INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id) + SELECT child.id,parent.id + FROM inventory_families child CROSS JOIN inventory_families parent + WHERE child.code=$1 AND parent.code=$2 + ON CONFLICT (child_family_id) DO UPDATE SET parent_family_id=EXCLUDED.parent_family_id + `, [family.code, family.parentCode]); + } + + await queryRunner.query(` + UPDATE finding_categories SET is_active=false, updated_at=CURRENT_TIMESTAMP + WHERE lower(code)='app26' + `); + await queryRunner.query(` + INSERT INTO finding_categories(code,name,sort_order,is_active) + SELECT 'APP26R2','Aplicación APP 2026 · revisión estructural',261,true + WHERE NOT EXISTS (SELECT 1 FROM finding_categories WHERE lower(code)='app26r2') + `); + await queryRunner.query(` + UPDATE finding_categories + SET name='Aplicación APP 2026 · revisión estructural', sort_order=261, + is_active=true, updated_at=CURRENT_TIMESTAMP + WHERE lower(code)='app26r2' + `); + const categoryRows = (await queryRunner.query( + `SELECT id FROM finding_categories WHERE lower(code)='app26r2' LIMIT 1`, + )) as IdRow[]; + const categoryId = categoryRows[0]?.id; + if (!categoryId) throw new Error('F3.1 could not resolve APP26R2 category'); + + const groupByKey = new Map(F31_FINDING_GROUPS.map((group) => [group.key, group])); + const titlesByFamily = new Map>(); + const addFamilyTitle = (familyCode: string, title: string): void => { + const clean = title.trim(); + if (!clean || /^idem\b/i.test(clean) || clean.toUpperCase()==='HALLAZGOS') return; + const key = findingKey(clean); + const map = titlesByFamily.get(familyCode) ?? new Map(); + if (!map.has(key)) map.set(key, clean); + titlesByFamily.set(familyCode, map); + }; + const seedFamily = (family: { code: string; groupKeys: string[]; directFindings: string[] }): void => { + for (const title of F31_UNIVERSAL_FINDINGS) addFamilyTitle(family.code, title); + for (const groupKey of family.groupKeys) { + const group = groupByKey.get(groupKey); + if (!group) throw new Error(`F3.1 missing finding group ${groupKey}`); + for (const title of group.items) addFamilyTitle(family.code, title); + } + for (const title of family.directFindings) addFamilyTitle(family.code, title); + }; + for (const family of F31_INSTALLATION_FAMILIES) seedFamily(family); + for (const family of F31_SUBINSTALLATION_FAMILIES) seedFamily(family); + + const allTitles = new Map(); + for (const titles of titlesByFamily.values()) { + for (const [key,title] of titles) if (!allTitles.has(key)) allTitles.set(key,title); + } + const orderedTitles = [...allTitles.entries()].sort((a,b) => a[1].localeCompare(b[1],'es')); + const itemIdByKey = new Map(); + let sourceNumber = 1; + for (const [key,title] of orderedTitles) { + const code = findingCode(title); + let rows = (await queryRunner.query( + `SELECT id FROM finding_catalog_items WHERE lower(code)=lower($1::text) LIMIT 1`, + [code], + )) as IdRow[]; + if (!rows[0]?.id) { + rows = (await queryRunner.query(` + INSERT INTO finding_catalog_items + (category_id,code,source_number,title,import_note,revision,is_active) + VALUES ($1::uuid,$2::varchar,$3::integer,$4::varchar,$5::text,1,true) + RETURNING id + `, [ + categoryId, + code, + sourceNumber, + title, + 'APLICACION APP(2).xlsx · F3.1 · catálogo estructural revisado', + ])) as IdRow[]; + } else { + await queryRunner.query(` + UPDATE finding_catalog_items SET + category_id=$2::uuid,source_number=$3::integer,title=$4::varchar, + import_note=$5::text,is_active=true,updated_at=CURRENT_TIMESTAMP + WHERE id=$1::uuid + `, [rows[0].id, categoryId, sourceNumber, title, 'APLICACION APP(2).xlsx · F3.1 · catálogo estructural revisado']); + } + const itemId = rows[0]?.id; + if (!itemId) throw new Error(`F3.1 could not create catalog item ${title}`); + itemIdByKey.set(key,itemId); + await queryRunner.query(` + INSERT INTO finding_catalog_item_versions(item_id,revision,snapshot,actor_username) + SELECT item.id,item.revision, + jsonb_build_object( + 'id',item.id,'categoryId',category.id,'categoryCode',category.code, + 'categoryName',category.name,'code',item.code,'sourceNumber',item.source_number, + 'title',item.title,'legalBasis',item.legal_basis,'glossary',item.glossary, + 'importNote',item.import_note,'revision',item.revision,'isActive',item.is_active + ),'migration:F3.1' + FROM finding_catalog_items item + JOIN finding_categories category ON category.id=item.category_id + WHERE item.id=$1::uuid + AND NOT EXISTS ( + SELECT 1 FROM finding_catalog_item_versions version + WHERE version.item_id=item.id AND version.revision=item.revision + ) + `, [itemId]); + sourceNumber += 1; + } + + await queryRunner.query(`DELETE FROM finding_catalog_item_inventory_families`); + const familyMeta = [ + ...F31_INSTALLATION_FAMILIES, + ...F31_SUBINSTALLATION_FAMILIES, + ]; + for (const family of familyMeta) { + const familyRows = (await queryRunner.query( + `SELECT id FROM inventory_families WHERE code=$1 LIMIT 1`, + [family.code], + )) as IdRow[]; + const familyId = familyRows[0]?.id; + if (!familyId) throw new Error(`F3.1 missing inventory family ${family.code}`); + const titles = titlesByFamily.get(family.code) ?? new Map(); + for (const key of titles.keys()) { + const itemId = itemIdByKey.get(key); + if (!itemId) continue; + await queryRunner.query(` + INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id) + VALUES ($1::uuid,$2::uuid) ON CONFLICT DO NOTHING + `, [itemId,familyId]); + } + + const legacyRows = (await queryRunner.query( + `SELECT id FROM asset_types WHERE lower(code)=lower($1::text) LIMIT 1`, + [family.legacyTypeCode], + )) as IdRow[]; + const legacyTypeId = legacyRows[0]?.id; + if (legacyTypeId) { + await queryRunner.query(` + INSERT INTO finding_catalog_asset_type_profiles(asset_type_id,reason) + VALUES ($1::uuid,'F3.1: compatibilidad con activos técnicos históricos usando catálogo APP26R2') + ON CONFLICT (asset_type_id) DO UPDATE SET + reason=EXCLUDED.reason,updated_at=CURRENT_TIMESTAMP + `, [legacyTypeId]); + for (const key of titles.keys()) { + const itemId = itemIdByKey.get(key); + if (!itemId) continue; + await queryRunner.query(` + INSERT INTO finding_catalog_item_asset_types(catalog_item_id,asset_type_id) + VALUES ($1::uuid,$2::uuid) ON CONFLICT DO NOTHING + `, [itemId,legacyTypeId]); + } + } + } + + await queryRunner.query(` + INSERT INTO finding_catalog_asset_type_profiles(asset_type_id,reason) + SELECT id,'F3.1: las altas estructurales usan familia técnica contextual; sin familia no se sugiere catálogo.' + FROM asset_types WHERE lower(code) IN ('instalacion','subinstalacion') + ON CONFLICT (asset_type_id) DO UPDATE SET + reason=EXCLUDED.reason,updated_at=CURRENT_TIMESTAMP + `); + + const appRole = process.env.DB_APP_USER; + if (!appRole) throw new Error('Missing required environment variable: DB_APP_USER'); + const roleRows = (await queryRunner.query('SELECT 1 FROM pg_roles WHERE rolname=$1',[appRole])) as unknown[]; + if (roleRows.length !== 1) throw new Error('Configured DB_APP_USER does not exist'); + const applicationRole = quoteIdentifier(appRole); + await queryRunner.query(`GRANT SELECT ON TABLE inventory_families TO ${applicationRole}`); + await queryRunner.query(`GRANT SELECT ON TABLE inventory_family_parent_rules TO ${applicationRole}`); + await queryRunner.query(`GRANT SELECT ON TABLE finding_catalog_item_inventory_families TO ${applicationRole}`); + + const familyCounts = (await queryRunner.query(` + SELECT + COUNT(*) FILTER (WHERE level='INSTALLATION')::text AS installations, + COUNT(*) FILTER (WHERE level='SUBINSTALLATION')::text AS subinstallations + FROM inventory_families WHERE is_active=true + `)) as Array<{ installations: string; subinstallations: string }>; + if (Number(familyCounts[0]?.installations ?? 0) !== F31_INSTALLATION_FAMILIES.length) { + throw new Error('F3.1 verification failed: installation-family count mismatch'); + } + if (Number(familyCounts[0]?.subinstallations ?? 0) !== F31_SUBINSTALLATION_FAMILIES.length) { + throw new Error('F3.1 verification failed: subinstallation-family count mismatch'); + } + const catalogCounts = (await queryRunner.query(` + SELECT COUNT(*)::text AS total + FROM finding_catalog_items item + JOIN finding_categories category ON category.id=item.category_id + WHERE lower(category.code)='app26r2' AND item.is_active=true + `)) as CountRow[]; + if (Number(catalogCounts[0]?.total ?? 0) !== orderedTitles.length) { + throw new Error('F3.1 verification failed: APP26R2 catalog count mismatch'); + } + // eslint-disable-next-line no-console + console.log( + `[F3.1] families=${F31_INSTALLATION_FAMILIES.length}+${F31_SUBINSTALLATION_FAMILIES.length}; groups=${F31_FINDING_GROUPS.length}; catalog=${orderedTitles.length}`, + ); + } + + public async down(): Promise { + throw new Error( + 'F3.1 recarga catálogo y agrega familias estructurales; no se revierte destructivamente. Restaurar backup PRE si fuera necesario.', + ); + } +} From c4796adb39c9bce0c93e33f11a07f532ccf32c0e Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:06:27 -0300 Subject: [PATCH 068/144] =?UTF-8?q?F3.1:=20asociar=20Inventario=20con=20fa?= =?UTF-8?q?milia=20t=C3=A9cnica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/database/entities/asset.entity.ts | 92 +++++++++----------- 1 file changed, 42 insertions(+), 50 deletions(-) diff --git a/api-v3/src/database/entities/asset.entity.ts b/api-v3/src/database/entities/asset.entity.ts index b607071..61046be 100644 --- a/api-v3/src/database/entities/asset.entity.ts +++ b/api-v3/src/database/entities/asset.entity.ts @@ -1,42 +1,25 @@ -import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm'; +import { + Column, + Entity, + Index, + PrimaryGeneratedColumn, +} from 'typeorm'; import { TimestampedEntity } from './timestamped.entity'; - -export enum AssetInformationStatus { - DRAFT = 'DRAFT', - PENDING_SURVEY = 'PENDING_SURVEY', - SURVEYED = 'SURVEYED', - VALIDATED = 'VALIDATED', - OBSERVED = 'OBSERVED', - OUTDATED = 'OUTDATED', - INACTIVE = 'INACTIVE', -} - -export enum AssetOperationalStatus { - UNKNOWN = 'UNKNOWN', - IN_SERVICE = 'IN_SERVICE', - TEMPORARILY_OUT_OF_SERVICE = 'TEMPORARILY_OUT_OF_SERVICE', - OUT_OF_SERVICE = 'OUT_OF_SERVICE', - DECOMMISSIONED = 'DECOMMISSIONED', - ABANDONED = 'ABANDONED', -} - -export enum AssetDataOrigin { - MANUAL = 'MANUAL', - FIELD_SURVEY = 'FIELD_SURVEY', - PROVIDED_DOCUMENT = 'PROVIDED_DOCUMENT', - IMPORT = 'IMPORT', - SYSTEM = 'SYSTEM', -} +import { + AssetDataOrigin, + AssetInformationStatus, + AssetOperationalStatus, +} from './enums'; @Entity({ name: 'assets' }) -@Index('idx_assets_type_id', ['assetTypeId']) -@Index('idx_assets_parent_id', ['parentId']) -@Index('idx_assets_operational_area_id', ['operationalAreaId']) -@Index('idx_assets_operator_company_id', ['operatorCompanyId']) -@Index('idx_assets_information_status', ['informationStatus']) +@Index('uq_assets_code', ['code'], { unique: true }) +@Index('idx_assets_parent', ['parentId']) +@Index('idx_assets_type', ['assetTypeId']) +@Index('idx_assets_status', ['informationStatus']) @Index('idx_assets_operational_status', ['operationalStatus']) -@Index('idx_assets_data_origin', ['dataOrigin']) -@Index('idx_assets_provenance_verified_at', ['provenanceVerifiedAt']) +@Index('idx_assets_operational_area', ['operationalAreaId']) +@Index('idx_assets_operator_company', ['operatorCompanyId']) +@Index('idx_assets_inventory_family', ['inventoryFamilyId']) export class Asset extends TimestampedEntity { @PrimaryGeneratedColumn('uuid') id!: string; @@ -53,13 +36,16 @@ export class Asset extends TimestampedEntity { @Column({ name: 'operator_company_id', type: 'uuid', nullable: true }) operatorCompanyId!: string | null; + @Column({ name: 'inventory_family_id', type: 'uuid', nullable: true }) + inventoryFamilyId!: string | null; + @Column({ type: 'varchar', length: 120 }) code!: string; - @Column({ type: 'varchar', length: 200 }) + @Column({ type: 'varchar', length: 240 }) name!: string; - @Column({ name: 'common_name', type: 'varchar', length: 200, nullable: true }) + @Column({ name: 'common_name', type: 'varchar', length: 240, nullable: true }) commonName!: string | null; @Column({ type: 'text', nullable: true }) @@ -67,14 +53,18 @@ export class Asset extends TimestampedEntity { @Column({ name: 'information_status', - type: 'enum', - enum: AssetInformationStatus, - enumName: 'asset_information_status', + type: 'varchar', + length: 20, default: AssetInformationStatus.DRAFT, }) informationStatus!: AssetInformationStatus; - @Column({ name: 'operational_status', type: 'enum', enum: AssetOperationalStatus, enumName: 'asset_operational_status', default: AssetOperationalStatus.UNKNOWN }) + @Column({ + name: 'operational_status', + type: 'varchar', + length: 24, + default: AssetOperationalStatus.IN_SERVICE, + }) operationalStatus!: AssetOperationalStatus; @Column({ name: 'created_by', type: 'uuid', nullable: true }) @@ -83,16 +73,18 @@ export class Asset extends TimestampedEntity { @Column({ name: 'updated_by', type: 'uuid', nullable: true }) updatedBy!: string | null; - @Column({ name: 'current_version', type: 'integer', default: 0 }) - currentVersion!: number; - - @Column({ name: 'data_origin', type: 'varchar', length: 32, default: AssetDataOrigin.MANUAL }) + @Column({ + name: 'data_origin', + type: 'varchar', + length: 20, + default: AssetDataOrigin.MANUAL, + }) dataOrigin!: AssetDataOrigin; - @Column({ name: 'source_name', type: 'varchar', length: 160, nullable: true }) + @Column({ name: 'source_name', type: 'varchar', length: 240, nullable: true }) sourceName!: string | null; - @Column({ name: 'source_reference', type: 'varchar', length: 255, nullable: true }) + @Column({ name: 'source_reference', type: 'varchar', length: 500, nullable: true }) sourceReference!: string | null; @Column({ name: 'source_observed_at', type: 'timestamptz', nullable: true }) @@ -107,9 +99,9 @@ export class Asset extends TimestampedEntity { @Column({ name: 'provenance_verified_by', type: 'uuid', nullable: true }) provenanceVerifiedBy!: string | null; - @Column({ name: 'provenance_updated_at', type: 'timestamptz', default: () => 'CURRENT_TIMESTAMP' }) - provenanceUpdatedAt!: Date; - @Column({ name: 'provenance_updated_by', type: 'uuid', nullable: true }) provenanceUpdatedBy!: string | null; + + @Column({ name: 'current_version', type: 'integer', default: 0 }) + currentVersion!: number; } From 4f1e24ef83ab34e43f7f936501057604e42d63e3 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:06:53 -0300 Subject: [PATCH 069/144] =?UTF-8?q?F3.1:=20aceptar=20familia=20t=C3=A9cnic?= =?UTF-8?q?a=20en=20altas=20de=20Inventario?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/asset-master/dto/create-asset.dto.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api-v3/src/asset-master/dto/create-asset.dto.ts b/api-v3/src/asset-master/dto/create-asset.dto.ts index a0064af..7a9506f 100644 --- a/api-v3/src/asset-master/dto/create-asset.dto.ts +++ b/api-v3/src/asset-master/dto/create-asset.dto.ts @@ -42,6 +42,10 @@ export class CreateAssetDto { @IsUUID('4') parentId?: string | null; + @IsOptional() + @IsUUID('4') + inventoryFamilyId?: string | null; + @IsOptional() @IsUUID('4') operationalAreaId?: string | null; From 14d9467c0e46cecdf4c0a57907f811e52b4d3d7d Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:07:46 -0300 Subject: [PATCH 070/144] F3.1: definir alta guiada de estructura de Inventario --- .../dto/create-inventory-structure.dto.ts | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 api-v3/src/asset-master/dto/create-inventory-structure.dto.ts diff --git a/api-v3/src/asset-master/dto/create-inventory-structure.dto.ts b/api-v3/src/asset-master/dto/create-inventory-structure.dto.ts new file mode 100644 index 0000000..5d400e3 --- /dev/null +++ b/api-v3/src/asset-master/dto/create-inventory-structure.dto.ts @@ -0,0 +1,56 @@ +import { Transform } from 'class-transformer'; +import { + IsIn, + IsOptional, + IsString, + IsUUID, + Matches, + MaxLength, + MinLength, +} from 'class-validator'; + +export const INVENTORY_STRUCTURE_KINDS = [ + '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() + @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null) + @IsString() + @MaxLength(4000) + description?: string | null; +} From 620e6f07c41234deece49af8b358cee4e9aa20e7 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:08:47 -0300 Subject: [PATCH 071/144] F3.1: crear servicio guiado de Inventario estructural --- .../inventory-structure.service.ts | 333 ++++++++++++++++++ 1 file changed, 333 insertions(+) create mode 100644 api-v3/src/asset-master/inventory-structure.service.ts diff --git a/api-v3/src/asset-master/inventory-structure.service.ts b/api-v3/src/asset-master/inventory-structure.service.ts new file mode 100644 index 0000000..e5eae78 --- /dev/null +++ b/api-v3/src/asset-master/inventory-structure.service.ts @@ -0,0 +1,333 @@ +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 FamilyRow = { + id: string; + code: string; + name: string; + level: 'INSTALLATION' | 'SUBINSTALLATION'; + legacyTypeCode: string | null; + informationLabels: string[]; + parentFamilyId: string | null; + parentFamilyCode: string | null; + parentFamilyName: string | null; +}; +type ParentRow = { + id: string; + code: string; + name: string; + typeCode: string; + operationalAreaId: string | null; + operatorCompanyId: string | null; + inventoryFamilyId: string | null; +}; + +const TYPE_CODE_BY_KIND: Record = { + AREA: 'area', + YACIMIENTO: 'yacimiento', + INSTALACION: 'instalacion', + SUBINSTALACION: 'subinstalacion', +}; +const PARENT_TYPE_BY_KIND: Record = { + AREA: null, + YACIMIENTO: 'area', + INSTALACION: 'yacimiento', + SUBINSTALACION: 'instalacion', +}; +const FAMILY_LEVEL_BY_KIND: Partial> = { + 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 ('area','yacimiento','instalacion','subinstalacion') + AND is_active=true + ORDER BY CASE lower(code) + WHEN 'area' THEN 1 WHEN 'yacimiento' THEN 2 + WHEN 'instalacion' THEN 3 WHEN 'subinstalacion' THEN 4 ELSE 9 END + `)) as StructureTypeRow[]; + if (types.length !== 4) { + throw new ConflictException({ + code: 'INVENTORY_STRUCTURE_TYPES_INCOMPLETE', + message: 'La estructura del Inventario todavía no está completamente configurada', + }); + } + const families = (await this.dataSource.query(` + SELECT family.id,family.code,family.name,family.level, + family.legacy_type_code AS "legacyTypeCode", + family.information_labels AS "informationLabels", + parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName" + FROM inventory_families family + LEFT JOIN inventory_family_parent_rules rule ON rule.child_family_id=family.id + LEFT JOIN inventory_families parent ON parent.id=rule.parent_family_id + WHERE family.is_active=true + ORDER BY family.level,family.name,family.code + `)) as FamilyRow[]; + return { + levels: [ + { kind: 'AREA', label: 'Área', type: types.find((item) => item.code.toLowerCase()==='area'), parentKind: null, requiresFamily: false }, + { kind: 'YACIMIENTO', label: 'Yacimiento', type: types.find((item) => item.code.toLowerCase()==='yacimiento'), parentKind: 'AREA', requiresFamily: false }, + { kind: 'INSTALACION', label: 'Instalación', type: types.find((item) => item.code.toLowerCase()==='instalacion'), parentKind: 'YACIMIENTO', requiresFamily: true }, + { kind: 'SUBINSTALACION', label: 'Subinstalación', type: types.find((item) => item.code.toLowerCase()==='subinstalacion'), parentKind: 'INSTALACION', requiresFamily: true }, + ], + installationFamilies: families.filter((item) => item.level==='INSTALLATION'), + subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'), + }; + } + + 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 code = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name); + const operationalAreaId = parent?.operationalAreaId ?? null; + const operatorCompanyId = parent?.operatorCompanyId ?? null; + + const inserted = (await manager.query(` + INSERT INTO assets ( + asset_type_id,parent_id,operational_area_id,operator_company_id,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::varchar,$7::varchar,$8::varchar,$9::text,$10::varchar,$11::varchar, + $12::varchar,$13::varchar,$14::varchar,$15::text,$16::uuid,$16::uuid,$16::uuid + ) RETURNING id + `, [ + type.id, + parent?.id ?? null, + operationalAreaId, + operatorCompanyId, + family?.id ?? null, + code, + dto.name, + dto.commonName ?? null, + dto.description ?? null, + AssetInformationStatus.DRAFT, + AssetOperationalStatus.IN_SERVICE, + AssetDataOrigin.MANUAL, + 'Inventario estructural F3.1', + `inventory-structure:${dto.kind.toLowerCase()}`, + family ? `Familia técnica: ${family.code} · ${family.name}` : null, + principal.userId, + ])) as Array<{ id: string }>; + const id = inserted[0]?.id; + if (!id) throw new Error('No se pudo crear el registro estructural'); + + 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, + 'Alta guiada de Inventario estructural F3.1', + versionNumber, + request.requestId, + principal.userId, + ]); + const created = await this.loadView(manager, id); + await this.audit.record({ + ...administrationAuditContext(principal, request), + action: AuditAction.ASSET_CREATED, + entityType: 'asset', + entityId: id, + afterData: created as unknown as Record, + metadata: { + versionNumber, + inventoryStructureKind: dto.kind, + inventoryFamilyId: family?.id ?? null, + inventoryFamilyCode: family?.code ?? null, + }, + }, manager); + return created; + }); + } catch (error) { + if (isUniqueViolation(error)) { + throw new ConflictException({ + code: 'ASSET_CODE_ALREADY_EXISTS', + message: 'Ya existe un registro de Inventario con ese código', + }); + } + throw error; + } + } + + private async requireStructureType(manager: EntityManager, kind: InventoryStructureKind): Promise { + const rows = (await manager.query(` + SELECT id,code,name FROM asset_types + WHERE lower(code)=lower($1::text) AND is_active=true LIMIT 1 + `, [TYPE_CODE_BY_KIND[kind]])) as StructureTypeRow[]; + if (!rows[0]) { + throw new ConflictException({ + code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED', + message: `El nivel ${kind} no está configurado`, + }); + } + return rows[0]; + } + + private async requireParent( + manager: EntityManager, + kind: InventoryStructureKind, + parentId: string | null, + ): Promise { + const expectedType = PARENT_TYPE_BY_KIND[kind]; + if (!expectedType) { + if (parentId) { + throw new BadRequestException({ + code: 'INVENTORY_AREA_MUST_BE_ROOT', + message: 'Un Área se crea como registro raíz y no puede tener padre', + }); + } + return null; + } + if (!parentId) { + throw new BadRequestException({ + code: 'INVENTORY_STRUCTURE_PARENT_REQUIRED', + message: `Para crear ${kind.toLowerCase()} primero tenés que elegir su ${expectedType}`, + }); + } + const rows = (await manager.query(` + SELECT asset.id,asset.code,asset.name,type.code AS "typeCode", + asset.operational_area_id AS "operationalAreaId", + asset.operator_company_id AS "operatorCompanyId", + asset.inventory_family_id AS "inventoryFamilyId" + FROM assets asset + JOIN asset_types type ON type.id=asset.asset_type_id + 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 Área → Yacimiento → Instalación → Subinstalación`, + }); + } + return parent; + } + + private async requireFamily( + manager: EntityManager, + kind: InventoryStructureKind, + familyId: string | null, + parent: ParentRow | null, + ): Promise { + const expectedLevel = FAMILY_LEVEL_BY_KIND[kind]; + if (!expectedLevel) { + if (familyId) throw new BadRequestException({ + code: 'INVENTORY_STRUCTURE_FAMILY_NOT_ALLOWED', + message: 'Área y Yacimiento no llevan familia técnica', + }); + return null; + } + if (!familyId) throw new BadRequestException({ + code: 'INVENTORY_STRUCTURE_FAMILY_REQUIRED', + message: `Elegí la familia técnica de la ${kind.toLowerCase()}`, + }); + const rows = (await manager.query(` + SELECT family.id,family.code,family.name,family.level, + family.legacy_type_code AS "legacyTypeCode", + family.information_labels AS "informationLabels", + parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName" + FROM inventory_families family + LEFT JOIN inventory_family_parent_rules rule ON rule.child_family_id=family.id + LEFT JOIN inventory_families parent ON parent.id=rule.parent_family_id + WHERE family.id=$1::uuid AND family.is_active=true + LIMIT 1 + `, [familyId])) as FamilyRow[]; + const family = rows[0]; + if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'La familia técnica no existe' }); + if (family.level !== expectedLevel) throw new BadRequestException({ + code: 'INVENTORY_FAMILY_LEVEL_INVALID', + message: 'La familia técnica no corresponde al nivel seleccionado', + }); + if (kind === 'SUBINSTALACION' && family.parentFamilyId !== parent?.inventoryFamilyId) { + throw new BadRequestException({ + code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID', + message: 'La Subinstalación elegida no pertenece a la familia de la Instalación seleccionada', + }); + } + return family; + } + + private generatedCode(kind: InventoryStructureKind, name: string): string { + const prefix = kind === 'YACIMIENTO' ? 'YAC' : kind === 'INSTALACION' ? 'INST' : kind === 'SUBINSTALACION' ? 'SUB' : 'AREA'; + const readable = name + .normalize('NFD') + .replace(/[\u0300-\u036f]/g, '') + .toUpperCase() + .replace(/[^A-Z0-9]+/g, '-') + .replace(/^-+|-+$/g, '') + .slice(0, 48) || 'REGISTRO'; + return `${prefix}-${readable}-${randomUUID().slice(0, 8).toUpperCase()}`.slice(0, 120); + } + + 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 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 inventory_families family ON family.id=asset.inventory_family_id + WHERE asset.id=$1::uuid + `, [id]); + return rows[0]; + } +} From 344699ac7544ac2d20657c5834cdd5c8d4e55567 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:08:59 -0300 Subject: [PATCH 072/144] F3.1: exponer alta guiada de Inventario --- .../inventory-structure.controller.ts | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 api-v3/src/asset-master/inventory-structure.controller.ts diff --git a/api-v3/src/asset-master/inventory-structure.controller.ts b/api-v3/src/asset-master/inventory-structure.controller.ts new file mode 100644 index 0000000..4f80d0b --- /dev/null +++ b/api-v3/src/asset-master/inventory-structure.controller.ts @@ -0,0 +1,27 @@ +import { Body, Controller, Get, 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 { CreateInventoryStructureDto } from './dto/create-inventory-structure.dto'; +import { InventoryStructureService } from './inventory-structure.service'; + +@Controller('inventory-structure') +export class InventoryStructureController { + constructor(private readonly inventoryStructure: InventoryStructureService) {} + + @Get() + @RequirePermissions('assets.read') + options() { + return this.inventoryStructure.options(); + } + + @Post() + @RequirePermissions('assets.create') + create( + @Body() dto: CreateInventoryStructureDto, + @CurrentAuth() principal: AuthPrincipal, + @Req() request: RequestWithContext, + ) { + return this.inventoryStructure.create(dto, principal, request); + } +} From 63528b1eff4f1ced9ab8c8044823bcc395f60265 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:09:17 -0300 Subject: [PATCH 073/144] F3.1: integrar Inventario estructural --- api-v3/src/asset-master/asset-master.module.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api-v3/src/asset-master/asset-master.module.ts b/api-v3/src/asset-master/asset-master.module.ts index ff27e02..a729496 100644 --- a/api-v3/src/asset-master/asset-master.module.ts +++ b/api-v3/src/asset-master/asset-master.module.ts @@ -22,12 +22,15 @@ import { AssetOperationalRelationsService } from './asset-operational-relations. import { AssetRegistryController } from './asset-registry.controller'; import { AssetRegistryService } from './asset-registry.service'; import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.service'; +import { InventoryStructureController } from './inventory-structure.controller'; +import { InventoryStructureService } from './inventory-structure.service'; @Module({ imports: [AuditModule], controllers: [ AssetTypesController, AssetsController, + InventoryStructureController, AssetGeometriesController, MapAssetsController, AssetHistoryController, @@ -40,6 +43,7 @@ import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/fi providers: [ AssetTypesService, AssetsService, + InventoryStructureService, AssetGeometriesService, AssetHistoryService, AssetMediaService, From 90c049a3c6b764c61b1a507098f85a888ca6da72 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:10:14 -0300 Subject: [PATCH 074/144] =?UTF-8?q?F3.1:=20sincronizar=20cat=C3=A1logo=20p?= =?UTF-8?q?or=20familia=20t=C3=A9cnica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...44500000-phase-f3-1-family-catalog-sync.ts | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 api-v3/src/database/migrations/1789844500000-phase-f3-1-family-catalog-sync.ts diff --git a/api-v3/src/database/migrations/1789844500000-phase-f3-1-family-catalog-sync.ts b/api-v3/src/database/migrations/1789844500000-phase-f3-1-family-catalog-sync.ts new file mode 100644 index 0000000..e345f6b --- /dev/null +++ b/api-v3/src/database/migrations/1789844500000-phase-f3-1-family-catalog-sync.ts @@ -0,0 +1,107 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class PhaseF31FamilyCatalogSync1789844500000 implements MigrationInterface { + name = 'PhaseF31FamilyCatalogSync1789844500000'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + CREATE OR REPLACE FUNCTION sync_asset_inventory_family_catalog() + RETURNS trigger + LANGUAGE plpgsql + AS $$ + BEGIN + DELETE FROM finding_catalog_asset_overrides + WHERE asset_id=NEW.id + AND reason LIKE 'F3.1 familia técnica:%'; + + IF NEW.inventory_family_id IS NOT NULL THEN + INSERT INTO finding_catalog_asset_overrides ( + asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by + ) + SELECT + NEW.id,mapping.catalog_item_id,true, + 'F3.1 familia técnica: catálogo contextual automático', + NEW.created_by,NEW.updated_by + FROM finding_catalog_item_inventory_families mapping + WHERE mapping.inventory_family_id=NEW.inventory_family_id + ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET + is_enabled=true, + reason='F3.1 familia técnica: catálogo contextual automático', + updated_by=NEW.updated_by, + updated_at=CURRENT_TIMESTAMP; + END IF; + RETURN NEW; + END; + $$ + `); + await queryRunner.query(` + CREATE TRIGGER trg_assets_inventory_family_catalog + AFTER INSERT OR UPDATE OF inventory_family_id ON assets + FOR EACH ROW EXECUTE FUNCTION sync_asset_inventory_family_catalog() + `); + + await queryRunner.query(` + CREATE OR REPLACE FUNCTION sync_inventory_family_mapping_assets() + RETURNS trigger + LANGUAGE plpgsql + AS $$ + BEGIN + IF TG_OP='DELETE' THEN + DELETE FROM finding_catalog_asset_overrides override_record + USING assets asset + WHERE override_record.asset_id=asset.id + AND asset.inventory_family_id=OLD.inventory_family_id + AND override_record.catalog_item_id=OLD.catalog_item_id + AND override_record.reason LIKE 'F3.1 familia técnica:%'; + RETURN OLD; + END IF; + + INSERT INTO finding_catalog_asset_overrides ( + asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by + ) + SELECT + asset.id,NEW.catalog_item_id,true, + 'F3.1 familia técnica: catálogo contextual automático', + asset.created_by,asset.updated_by + FROM assets asset + WHERE asset.inventory_family_id=NEW.inventory_family_id + ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET + is_enabled=true, + reason='F3.1 familia técnica: catálogo contextual automático', + updated_at=CURRENT_TIMESTAMP; + RETURN NEW; + END; + $$ + `); + await queryRunner.query(` + CREATE TRIGGER trg_inventory_family_mapping_assets + AFTER INSERT OR DELETE ON finding_catalog_item_inventory_families + FOR EACH ROW EXECUTE FUNCTION sync_inventory_family_mapping_assets() + `); + + await queryRunner.query(` + INSERT INTO finding_catalog_asset_overrides ( + asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by + ) + SELECT + asset.id,mapping.catalog_item_id,true, + 'F3.1 familia técnica: catálogo contextual automático', + asset.created_by,asset.updated_by + FROM assets asset + JOIN finding_catalog_item_inventory_families mapping + ON mapping.inventory_family_id=asset.inventory_family_id + WHERE asset.inventory_family_id IS NOT NULL + ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET + is_enabled=true, + reason='F3.1 familia técnica: catálogo contextual automático', + updated_at=CURRENT_TIMESTAMP + `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query('DROP TRIGGER IF EXISTS trg_inventory_family_mapping_assets ON finding_catalog_item_inventory_families'); + await queryRunner.query('DROP FUNCTION IF EXISTS sync_inventory_family_mapping_assets()'); + await queryRunner.query('DROP TRIGGER IF EXISTS trg_assets_inventory_family_catalog ON assets'); + await queryRunner.query('DROP FUNCTION IF EXISTS sync_asset_inventory_family_catalog()'); + } +} From ab3e6999266bc9601952a415a38381fd014a495b Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:13:01 -0300 Subject: [PATCH 075/144] =?UTF-8?q?F3.1:=20limitar=20cambio=20de=20Asset?= =?UTF-8?q?=20a=20familia=20t=C3=A9cnica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/database/entities/asset.entity.ts | 92 +++++++++++--------- 1 file changed, 52 insertions(+), 40 deletions(-) diff --git a/api-v3/src/database/entities/asset.entity.ts b/api-v3/src/database/entities/asset.entity.ts index 61046be..870bf9a 100644 --- a/api-v3/src/database/entities/asset.entity.ts +++ b/api-v3/src/database/entities/asset.entity.ts @@ -1,25 +1,43 @@ -import { - Column, - Entity, - Index, - PrimaryGeneratedColumn, -} from 'typeorm'; +import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm'; import { TimestampedEntity } from './timestamped.entity'; -import { - AssetDataOrigin, - AssetInformationStatus, - AssetOperationalStatus, -} from './enums'; + +export enum AssetInformationStatus { + DRAFT = 'DRAFT', + PENDING_SURVEY = 'PENDING_SURVEY', + SURVEYED = 'SURVEYED', + VALIDATED = 'VALIDATED', + OBSERVED = 'OBSERVED', + OUTDATED = 'OUTDATED', + INACTIVE = 'INACTIVE', +} + +export enum AssetOperationalStatus { + UNKNOWN = 'UNKNOWN', + IN_SERVICE = 'IN_SERVICE', + TEMPORARILY_OUT_OF_SERVICE = 'TEMPORARILY_OUT_OF_SERVICE', + OUT_OF_SERVICE = 'OUT_OF_SERVICE', + DECOMMISSIONED = 'DECOMMISSIONED', + ABANDONED = 'ABANDONED', +} + +export enum AssetDataOrigin { + MANUAL = 'MANUAL', + FIELD_SURVEY = 'FIELD_SURVEY', + PROVIDED_DOCUMENT = 'PROVIDED_DOCUMENT', + IMPORT = 'IMPORT', + SYSTEM = 'SYSTEM', +} @Entity({ name: 'assets' }) -@Index('uq_assets_code', ['code'], { unique: true }) -@Index('idx_assets_parent', ['parentId']) -@Index('idx_assets_type', ['assetTypeId']) -@Index('idx_assets_status', ['informationStatus']) +@Index('idx_assets_type_id', ['assetTypeId']) +@Index('idx_assets_parent_id', ['parentId']) +@Index('idx_assets_operational_area_id', ['operationalAreaId']) +@Index('idx_assets_operator_company_id', ['operatorCompanyId']) +@Index('idx_assets_inventory_family_id', ['inventoryFamilyId']) +@Index('idx_assets_information_status', ['informationStatus']) @Index('idx_assets_operational_status', ['operationalStatus']) -@Index('idx_assets_operational_area', ['operationalAreaId']) -@Index('idx_assets_operator_company', ['operatorCompanyId']) -@Index('idx_assets_inventory_family', ['inventoryFamilyId']) +@Index('idx_assets_data_origin', ['dataOrigin']) +@Index('idx_assets_provenance_verified_at', ['provenanceVerifiedAt']) export class Asset extends TimestampedEntity { @PrimaryGeneratedColumn('uuid') id!: string; @@ -42,10 +60,10 @@ export class Asset extends TimestampedEntity { @Column({ type: 'varchar', length: 120 }) code!: string; - @Column({ type: 'varchar', length: 240 }) + @Column({ type: 'varchar', length: 200 }) name!: string; - @Column({ name: 'common_name', type: 'varchar', length: 240, nullable: true }) + @Column({ name: 'common_name', type: 'varchar', length: 200, nullable: true }) commonName!: string | null; @Column({ type: 'text', nullable: true }) @@ -53,18 +71,14 @@ export class Asset extends TimestampedEntity { @Column({ name: 'information_status', - type: 'varchar', - length: 20, + type: 'enum', + enum: AssetInformationStatus, + enumName: 'asset_information_status', default: AssetInformationStatus.DRAFT, }) informationStatus!: AssetInformationStatus; - @Column({ - name: 'operational_status', - type: 'varchar', - length: 24, - default: AssetOperationalStatus.IN_SERVICE, - }) + @Column({ name: 'operational_status', type: 'enum', enum: AssetOperationalStatus, enumName: 'asset_operational_status', default: AssetOperationalStatus.UNKNOWN }) operationalStatus!: AssetOperationalStatus; @Column({ name: 'created_by', type: 'uuid', nullable: true }) @@ -73,18 +87,16 @@ export class Asset extends TimestampedEntity { @Column({ name: 'updated_by', type: 'uuid', nullable: true }) updatedBy!: string | null; - @Column({ - name: 'data_origin', - type: 'varchar', - length: 20, - default: AssetDataOrigin.MANUAL, - }) + @Column({ name: 'current_version', type: 'integer', default: 0 }) + currentVersion!: number; + + @Column({ name: 'data_origin', type: 'varchar', length: 32, default: AssetDataOrigin.MANUAL }) dataOrigin!: AssetDataOrigin; - @Column({ name: 'source_name', type: 'varchar', length: 240, nullable: true }) + @Column({ name: 'source_name', type: 'varchar', length: 160, nullable: true }) sourceName!: string | null; - @Column({ name: 'source_reference', type: 'varchar', length: 500, nullable: true }) + @Column({ name: 'source_reference', type: 'varchar', length: 255, nullable: true }) sourceReference!: string | null; @Column({ name: 'source_observed_at', type: 'timestamptz', nullable: true }) @@ -99,9 +111,9 @@ export class Asset extends TimestampedEntity { @Column({ name: 'provenance_verified_by', type: 'uuid', nullable: true }) provenanceVerifiedBy!: string | null; + @Column({ name: 'provenance_updated_at', type: 'timestamptz', default: () => 'CURRENT_TIMESTAMP' }) + provenanceUpdatedAt!: Date; + @Column({ name: 'provenance_updated_by', type: 'uuid', nullable: true }) provenanceUpdatedBy!: string | null; - - @Column({ name: 'current_version', type: 'integer', default: 0 }) - currentVersion!: number; -} +} \ No newline at end of file From 0f2885c562ef145ec3a6a5fc297186238706048f Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:15:47 -0300 Subject: [PATCH 076/144] =?UTF-8?q?F3.1:=20listar=20padres=20v=C3=A1lidos?= =?UTF-8?q?=20para=20alta=20guiada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory-structure.service.ts | 45 +++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/api-v3/src/asset-master/inventory-structure.service.ts b/api-v3/src/asset-master/inventory-structure.service.ts index e5eae78..dbf0121 100644 --- a/api-v3/src/asset-master/inventory-structure.service.ts +++ b/api-v3/src/asset-master/inventory-structure.service.ts @@ -105,6 +105,45 @@ export class InventoryStructureService { }; } + async parents(kindValue: string, search?: string) { + const kind = kindValue.toUpperCase() as InventoryStructureKind; + if (!(kind in PARENT_TYPE_BY_KIND) || kind === 'AREA') { + throw new BadRequestException({ + code: 'INVENTORY_STRUCTURE_PARENT_KIND_INVALID', + message: 'El nivel indicado no requiere un registro padre', + }); + } + 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 80 + `, parameters); + return { data: rows }; + } + async create( dto: CreateInventoryStructureDto, principal: AuthPrincipal, @@ -126,7 +165,7 @@ export class InventoryStructureService { 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::varchar,$7::varchar,$8::varchar,$9::text,$10::varchar,$11::varchar, + $6::varchar,$7::varchar,$8::varchar,$9::text,$10::asset_information_status,$11::asset_operational_status, $12::varchar,$13::varchar,$14::varchar,$15::text,$16::uuid,$16::uuid,$16::uuid ) RETURNING id `, [ @@ -140,7 +179,7 @@ export class InventoryStructureService { dto.commonName ?? null, dto.description ?? null, AssetInformationStatus.DRAFT, - AssetOperationalStatus.IN_SERVICE, + AssetOperationalStatus.UNKNOWN, AssetDataOrigin.MANUAL, 'Inventario estructural F3.1', `inventory-structure:${dto.kind.toLowerCase()}`, @@ -249,7 +288,7 @@ export class InventoryStructureService { if (parent.typeCode.toLowerCase() !== expectedType) { throw new BadRequestException({ code: 'INVENTORY_STRUCTURE_PARENT_INVALID', - message: `La jerarquía requerida es Área → Yacimiento → Instalación → Subinstalación`, + message: 'La jerarquía requerida es Área → Yacimiento → Instalación → Subinstalación', }); } return parent; From 765d48f6947e98a9f2623fda5b683de319bfbc29 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:16:07 -0300 Subject: [PATCH 077/144] =?UTF-8?q?F3.1:=20exponer=20padres=20v=C3=A1lidos?= =?UTF-8?q?=20para=20cada=20nivel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset-master/inventory-structure.controller.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/api-v3/src/asset-master/inventory-structure.controller.ts b/api-v3/src/asset-master/inventory-structure.controller.ts index 4f80d0b..41ca083 100644 --- a/api-v3/src/asset-master/inventory-structure.controller.ts +++ b/api-v3/src/asset-master/inventory-structure.controller.ts @@ -1,4 +1,4 @@ -import { Body, Controller, Get, Post, Req } from '@nestjs/common'; +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'; @@ -15,6 +15,15 @@ export class InventoryStructureController { 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() @RequirePermissions('assets.create') create( From f3af297a71c82a461a8b15f36d1ab71c7464c99b Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:17:19 -0300 Subject: [PATCH 078/144] F3.1: consultar Hallazgos asociados por familia --- .../inventory-family-catalog.service.ts | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 api-v3/src/asset-master/inventory-family-catalog.service.ts diff --git a/api-v3/src/asset-master/inventory-family-catalog.service.ts b/api-v3/src/asset-master/inventory-family-catalog.service.ts new file mode 100644 index 0000000..0c76928 --- /dev/null +++ b/api-v3/src/asset-master/inventory-family-catalog.service.ts @@ -0,0 +1,39 @@ +import { Injectable, NotFoundException } from '@nestjs/common'; +import { DataSource } from 'typeorm'; + +@Injectable() +export class InventoryFamilyCatalogService { + constructor(private readonly dataSource: DataSource) {} + + async findings(familyId: string) { + const [family] = await this.dataSource.query(` + SELECT id,code,name,level,information_labels AS "informationLabels" + FROM inventory_families + WHERE id=$1::uuid AND is_active=true + `, [familyId]) as Array<{ + id: string; + code: string; + name: string; + level: string; + informationLabels: string[]; + }>; + if (!family) { + throw new NotFoundException({ + code: 'INVENTORY_FAMILY_NOT_FOUND', + message: 'La familia técnica no existe', + }); + } + const items = await this.dataSource.query(` + SELECT item.id,item.code,item.source_number AS "sourceNumber",item.title, + item.legal_basis AS "legalBasis",item.glossary,item.suggested_severity AS "suggestedSeverity", + 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 }; + } +} From 0f94a2029886da1156c11aeffc1befb3fb64d71a Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:17:34 -0300 Subject: [PATCH 079/144] =?UTF-8?q?F3.1:=20exponer=20Hallazgos=20por=20fam?= =?UTF-8?q?ilia=20t=C3=A9cnica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory-family-catalog.controller.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 api-v3/src/asset-master/inventory-family-catalog.controller.ts diff --git a/api-v3/src/asset-master/inventory-family-catalog.controller.ts b/api-v3/src/asset-master/inventory-family-catalog.controller.ts new file mode 100644 index 0000000..d849f31 --- /dev/null +++ b/api-v3/src/asset-master/inventory-family-catalog.controller.ts @@ -0,0 +1,14 @@ +import { Controller, Get, Param, ParseUUIDPipe } from '@nestjs/common'; +import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator'; +import { InventoryFamilyCatalogService } from './inventory-family-catalog.service'; + +@Controller('inventory-families') +export class InventoryFamilyCatalogController { + constructor(private readonly families: InventoryFamilyCatalogService) {} + + @Get(':familyId/findings') + @RequirePermissions('assets.read', 'finding_catalog.read') + findings(@Param('familyId', new ParseUUIDPipe({ version: '4' })) familyId: string) { + return this.families.findings(familyId); + } +} From 5d2fec0f252670af1c498335e85644cfa4c70e3f Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:18:00 -0300 Subject: [PATCH 080/144] =?UTF-8?q?F3.1:=20integrar=20cat=C3=A1logo=20por?= =?UTF-8?q?=20familia=20t=C3=A9cnica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-v3/src/asset-master/asset-master.module.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api-v3/src/asset-master/asset-master.module.ts b/api-v3/src/asset-master/asset-master.module.ts index a729496..466c54f 100644 --- a/api-v3/src/asset-master/asset-master.module.ts +++ b/api-v3/src/asset-master/asset-master.module.ts @@ -24,6 +24,8 @@ import { AssetRegistryService } from './asset-registry.service'; import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.service'; import { InventoryStructureController } from './inventory-structure.controller'; import { InventoryStructureService } from './inventory-structure.service'; +import { InventoryFamilyCatalogController } from './inventory-family-catalog.controller'; +import { InventoryFamilyCatalogService } from './inventory-family-catalog.service'; @Module({ imports: [AuditModule], @@ -31,6 +33,7 @@ import { InventoryStructureService } from './inventory-structure.service'; AssetTypesController, AssetsController, InventoryStructureController, + InventoryFamilyCatalogController, AssetGeometriesController, MapAssetsController, AssetHistoryController, @@ -44,6 +47,7 @@ import { InventoryStructureService } from './inventory-structure.service'; AssetTypesService, AssetsService, InventoryStructureService, + InventoryFamilyCatalogService, AssetGeometriesService, AssetHistoryService, AssetMediaService, From f34d6fe521eb0141dc7e76d0a41b9302623001f9 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:18:19 -0300 Subject: [PATCH 081/144] F3.1 WEB: agregar cliente de Inventario estructural --- web-v2/src/lib/inventoryStructureApi.ts | 121 ++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 web-v2/src/lib/inventoryStructureApi.ts diff --git a/web-v2/src/lib/inventoryStructureApi.ts b/web-v2/src/lib/inventoryStructureApi.ts new file mode 100644 index 0000000..36ffcd2 --- /dev/null +++ b/web-v2/src/lib/inventoryStructureApi.ts @@ -0,0 +1,121 @@ +import { apiRequest } from './api'; + +export type InventoryStructureKind = 'AREA' | 'YACIMIENTO' | 'INSTALACION' | 'SUBINSTALACION'; + +export interface InventoryFamily { + id: string; + code: string; + name: string; + level: 'INSTALLATION' | 'SUBINSTALLATION'; + legacyTypeCode: string | null; + informationLabels: string[]; + parentFamilyId: string | null; + parentFamilyCode: string | null; + parentFamilyName: string | null; +} + +export interface InventoryStructureLevel { + kind: InventoryStructureKind; + label: string; + type: { id: string; code: string; name: string }; + parentKind: InventoryStructureKind | null; + requiresFamily: boolean; +} + +export interface InventoryStructureOptions { + levels: InventoryStructureLevel[]; + installationFamilies: InventoryFamily[]; + subinstallationFamilies: InventoryFamily[]; +} + +export interface InventoryStructureParent { + id: string; + code: string; + name: string; + commonName: string | null; + type: { id: string; code: string; name: string }; + inventoryFamily: null | { + id: string; + code: string; + name: string; + level: 'INSTALLATION' | 'SUBINSTALLATION'; + informationLabels: string[]; + }; + parent: null | { id: string; code: string; name: string }; +} + +export interface InventoryFamilyFinding { + id: string; + code: string; + sourceNumber: number; + title: string; + legalBasis: string | null; + glossary: string | null; + suggestedSeverity: number | null; + categoryId: string; + categoryCode: string; + categoryName: string; +} + +export interface InventoryFamilyFindings { + family: { + id: string; + code: string; + name: string; + level: string; + informationLabels: string[]; + }; + items: InventoryFamilyFinding[]; + count: number; +} + +export interface CreatedInventoryStructure { + id: string; + code: string; + name: string; + commonName: string | null; + description: string | null; + informationStatus: string; + operationalStatus: string; + type: { id: string; code: string; name: string }; + parent: null | { id: string; code: string; name: string }; + inventoryFamily: null | { + id: string; + code: string; + name: string; + level: string; + informationLabels: string[]; + }; +} + +export function getInventoryStructureOptions() { + return apiRequest('/inventory-structure'); +} + +export async function listInventoryStructureParents(kind: InventoryStructureKind, search = '') { + const query = new URLSearchParams(); + if (search.trim()) query.set('search', search.trim()); + const suffix = query.size ? `?${query}` : ''; + return (await apiRequest<{ data: InventoryStructureParent[] }>( + `/inventory-structure/parents/${kind}${suffix}`, + )).data; +} + +export function getInventoryFamilyFindings(familyId: string) { + return apiRequest(`/inventory-families/${familyId}/findings`); +} + +export function createInventoryStructure(input: { + kind: InventoryStructureKind; + code?: string | null; + name: string; + commonName?: string | null; + parentId?: string | null; + familyId?: string | null; + description?: string | null; +}) { + return apiRequest('/inventory-structure', { + method: 'POST', + body: JSON.stringify(input), + }); +} From d5bd5777f165270863ed0697981021c0fb57c5f0 Mon Sep 17 00:00:00 2001 From: enlineawork Date: Mon, 7 Sep 2026 10:19:40 -0300 Subject: [PATCH 082/144] F3.1 WEB: crear alta guiada de Inventario --- web-v2/src/pages/InventoryCreatePage.tsx | 269 +++++++++++++++++++++++ 1 file changed, 269 insertions(+) create mode 100644 web-v2/src/pages/InventoryCreatePage.tsx diff --git a/web-v2/src/pages/InventoryCreatePage.tsx b/web-v2/src/pages/InventoryCreatePage.tsx new file mode 100644 index 0000000..49c15ad --- /dev/null +++ b/web-v2/src/pages/InventoryCreatePage.tsx @@ -0,0 +1,269 @@ +import { useEffect, useMemo, useState } from 'react'; +import type { FormEvent } from 'react'; +import { Link, useNavigate, useSearchParams } from 'react-router'; +import { Alert, LoadingBlock, errorMessage } from '../components/Feedback'; +import { Icon } from '../components/Icon'; +import { getAsset } from '../lib/api'; +import { + createInventoryStructure, + getInventoryFamilyFindings, + getInventoryStructureOptions, + listInventoryStructureParents, +} from '../lib/inventoryStructureApi'; +import type { + InventoryFamily, + InventoryFamilyFindings, + InventoryStructureKind, + InventoryStructureOptions, + InventoryStructureParent, +} from '../lib/inventoryStructureApi'; + +const KINDS: Array<{ kind: InventoryStructureKind; label: string; help: string; step: number }> = [ + { kind: 'AREA', label: 'Área', help: 'Nivel territorial raíz.', step: 1 }, + { kind: 'YACIMIENTO', label: 'Yacimiento', help: 'Debe pertenecer a un Área.', step: 2 }, + { kind: 'INSTALACION', label: 'Instalación', help: 'Debe pertenecer a un Yacimiento.', step: 3 }, + { kind: 'SUBINSTALACION', label: 'Subinstalación', help: 'Debe pertenecer a una Instalación.', step: 4 }, +]; + +const childKindByParentType: Record = { + area: 'YACIMIENTO', + yacimiento: 'INSTALACION', + instalacion: 'SUBINSTALACION', +}; + +function kindLabel(kind: InventoryStructureKind): string { + return KINDS.find((item) => item.kind === kind)?.label ?? kind; +} + +export function InventoryCreatePage() { + const navigate = useNavigate(); + const [searchParams] = useSearchParams(); + const contextParentId = searchParams.get('parentId'); + const [options, setOptions] = useState(null); + const [kind, setKind] = useState('AREA'); + const [parents, setParents] = useState([]); + const [parentSearch, setParentSearch] = useState(''); + const [parentId, setParentId] = useState(''); + const [familyId, setFamilyId] = useState(''); + const [familyFindings, setFamilyFindings] = useState(null); + const [code, setCode] = useState(''); + const [name, setName] = useState(''); + const [commonName, setCommonName] = useState(''); + const [description, setDescription] = useState(''); + const [loading, setLoading] = useState(true); + const [saving, setSaving] = useState(false); + const [error, setError] = useState(''); + + useEffect(() => { + getInventoryStructureOptions() + .then(async (loaded) => { + setOptions(loaded); + if (contextParentId) { + const parent = await getAsset(contextParentId); + const inferred = childKindByParentType[parent.type.code.toLowerCase()]; + if (inferred) { + setKind(inferred); + setParentId(parent.id); + } + } + }) + .catch((requestError) => setError(errorMessage(requestError))) + .finally(() => setLoading(false)); + }, [contextParentId]); + + useEffect(() => { + if (kind === 'AREA') { + setParents([]); + setParentId(''); + return; + } + const timer = window.setTimeout(() => { + listInventoryStructureParents(kind, parentSearch) + .then((loaded) => { + setParents(loaded); + if (contextParentId && loaded.some((item) => item.id === contextParentId)) { + setParentId(contextParentId); + } + }) + .catch((requestError) => setError(errorMessage(requestError))); + }, 180); + return () => window.clearTimeout(timer); + }, [kind, parentSearch, contextParentId]); + + const selectedParent = parents.find((item) => item.id === parentId) ?? null; + const families = useMemo(() => { + if (!options) return [] as InventoryFamily[]; + if (kind === 'INSTALACION') return options.installationFamilies; + if (kind === 'SUBINSTALACION') { + const parentFamilyId = selectedParent?.inventoryFamily?.id; + return parentFamilyId + ? options.subinstallationFamilies.filter((item) => item.parentFamilyId === parentFamilyId) + : []; + } + return []; + }, [options, kind, selectedParent]); + const selectedFamily = families.find((item) => item.id === familyId) ?? null; + + useEffect(() => { + if (!familyId) { + setFamilyFindings(null); + return; + } + getInventoryFamilyFindings(familyId) + .then(setFamilyFindings) + .catch((requestError) => setError(errorMessage(requestError))); + }, [familyId]); + + useEffect(() => { + if (kind !== 'INSTALACION' && kind !== 'SUBINSTALACION') setFamilyId(''); + if (kind === 'SUBINSTALACION' && familyId && !families.some((item) => item.id === familyId)) setFamilyId(''); + }, [kind, familyId, families]); + + const chooseKind = (next: InventoryStructureKind) => { + setKind(next); + setParentId(''); + setParentSearch(''); + setFamilyId(''); + setFamilyFindings(null); + setError(''); + }; + + const save = async (event: FormEvent) => { + event.preventDefault(); + const requiresParent = kind !== 'AREA'; + const requiresFamily = kind === 'INSTALACION' || kind === 'SUBINSTALACION'; + if (requiresParent && !parentId) { + setError(`Seleccioná el ${kind === 'YACIMIENTO' ? 'Área' : kind === 'INSTALACION' ? 'Yacimiento' : 'Instalación'} padre.`); + return; + } + if (requiresFamily && !familyId) { + setError(`Seleccioná la familia de ${kindLabel(kind).toLowerCase()}.`); + return; + } + setSaving(true); + setError(''); + try { + const created = await createInventoryStructure({ + kind, + code: code.trim() || null, + name: name.trim(), + commonName: commonName.trim() || null, + parentId: parentId || null, + familyId: familyId || null, + description: description.trim() || null, + }); + navigate(`/inventarios/${created.id}`, { replace: true }); + } catch (requestError) { + setError(errorMessage(requestError)); + } finally { + setSaving(false); + } + }; + + if (loading) return ; + + const parentLabel = kind === 'YACIMIENTO' ? 'Área' : kind === 'INSTALACION' ? 'Yacimiento' : 'Instalación'; + const currentStep = KINDS.find((item) => item.kind === kind)?.step ?? 1; + + return
+ + +
+
+ INVENTARIO +

Agregar a la estructura

+

La estructura oficial es Área → Yacimiento → Instalación → Subinstalación. Elegí el nivel y el sistema te guía con los vínculos válidos.

+
+
+ + {error && {error}} + +
+
+

1. ¿Qué querés crear?

Sólo se pueden crear los cuatro niveles estructurales definidos para DH.

+
+ {KINDS.map((item) => )} +
+
+ +

Ruta: {KINDS.slice(0, currentStep).map((item) => item.label).join(' → ')}

+
+
+
+ +
+ {kind !== 'AREA' &&
+

2. Ubicación en la estructura

Primero elegí el {parentLabel} al que pertenece este registro.

+ + +
} + + {(kind === 'INSTALACION' || kind === 'SUBINSTALACION') &&
+

{kind === 'AREA' ? '2' : '3'}. Familia técnica

La familia no crea otro nivel. Sirve para aplicar exactamente los Hallazgos del Excel que corresponden.

+ {kind === 'SUBINSTALACION' && !selectedParent?.inventoryFamily ? La Instalación seleccionada todavía no tiene una familia técnica F3.1. Revisala antes de crear una Subinstalación. : } + + {selectedFamily &&
+ +
+ Hallazgos asociados automáticamente + {familyFindings ? `${familyFindings.count} controles del Excel para ${selectedFamily.name}` : 'Cargando catálogo asociado…'} + {familyFindings && familyFindings.items.length > 0 &&
    + {familyFindings.items.slice(0, 7).map((item) =>
  • {item.title}
    • )} + {familyFindings.items.length > 7 &&
  • + {familyFindings.items.length - 7} hallazgos más
    • } +
} +
+
} + + {selectedFamily && selectedFamily.informationLabels.length > 0 &&
+ +

Información técnica esperada: {selectedFamily.informationLabels.join(' · ')}

+
} +
} + +
+

{kind === 'AREA' ? '2' : kind === 'YACIMIENTO' ? '3' : '4'}. Identificación

Usá el nombre real de campo. El código DH puede generarse automáticamente.

+
+ + + +
+