Compare commits

..
Author SHA1 Message Date
admin 4fb1c502c8 F2.2: registrar autenticación móvil 2026-09-05 20:20:56 -03:00
admin d895812235 F2.2: exponer endpoints de autenticación Android 2026-09-05 20:20:47 -03:00
admin f680764373 F2.2: implementar autenticación Bearer Android 2026-09-05 20:20:40 -03:00
admin acc17bf291 F2.2: agregar DTO de refresh móvil 2026-09-05 20:20:16 -03:00
admin 1b57dcc850 maintenance: retirar diagnóstico Android temporal 2026-09-05 20:12:53 -03:00
admin 77d750992d maintenance: localizar fuente Android en VPS
Diagnóstico temporal de solo lectura para localizar fuentes/artefactos Android en el VPS y publicar el resultado en deploy-status.
2026-09-05 20:11:19 -03:00
admin b30cc1a294 maintenance: corregir diagnóstico Android de solo lectura 2026-09-05 20:07:58 -03:00
admin a7a6680cf8 maintenance: descubrir fuente Android en VPS sin modificar datos 2026-09-05 20:07:40 -03:00
admin 44570ad457 maintenance: retirar fresh-start temporal
Restaura migration:run y deploy-github estándar y elimina la herramienta fresh-start luego de la limpieza exitosa.
2026-09-05 20:04:46 -03:00
admin 8caed06362 maintenance: retirar herramienta destructiva temporal 2026-09-05 20:01:48 -03:00
admin e3db3d6cd7 maintenance: restaurar deploy estándar tras fresh-start 2026-09-05 20:01:37 -03:00
admin fb7b29cd94 maintenance: retirar hook de fresh-start 2026-09-05 20:01:08 -03:00
admin 0a11a452b5 maintenance: ejecutar fresh-start definitivo
Fresh-start único: backup integral de DB/source/media, limpieza de datos operativos y usuarios no-admin, reset de configuración editable, vaciado de archivos y verificación final.
2026-09-05 19:57:49 -03:00
admin 1d661e2e48 maintenance: respaldar y vaciar volumen de archivos en fresh-start 2026-09-05 19:54:48 -03:00
admin 2ee956665f maintenance: armar ejecución definitiva del fresh-start 2026-09-05 19:54:11 -03:00
admin 0d5db42c77 maintenance: cerrar whitelist del fresh-start
Ajusta el preview para limpiar también Departamentos importados, conservar sólo estructura sembrada y reiniciar configuración institucional editable. Reactiva FK antes de eliminar usuarios.
2026-09-05 19:50:46 -03:00
admin 21127b8cff maintenance: limpiar departamentos importados y resetear configuración editable 2026-09-05 19:47:42 -03:00
admin 50a9dc5183 maintenance: preservar configuración estructural y reforzar FK 2026-09-05 19:46:35 -03:00
admin a69df1d2d6 maintenance: preview seguro de limpieza integral
Agrega un fresh-start protegido y ejecuta únicamente el modo preview durante el paso de migraciones para inventariar la base real antes de borrar datos.
2026-09-05 19:41:46 -03:00
admin 95f34e2f08 maintenance: enlazar preview al paso de migraciones 2026-09-05 19:39:01 -03:00
admin 2f0d0d5ffc maintenance: exponer comando fresh-start 2026-09-05 19:38:08 -03:00
admin d2c79aeddc maintenance: agregar fresh-start protegido en modo preview 2026-09-05 19:37:54 -03:00
admin aef5a3d73d F2.1 · Inventario nacido en campo
Búsqueda y alta contextual de Inventario desde la APK, jerarquía dinámica, código de campo, GPS del dispositivo, fotos/EXIF y garantía de captura previa a emitir Hallazgos.
2026-09-05 18:08:49 -03:00
admin 1a51bdf820 F2.1: validar contexto de tipos de campo 2026-09-05 18:05:35 -03:00
admin 2142331fc0 F2.1: probar contrato de Inventario nacido en campo 2026-09-05 18:05:08 -03:00
admin f88dc8c2e0 F2.1: exigir GPS y foto antes de un Hallazgo 2026-09-05 18:04:20 -03:00
admin 6acbb26a82 F2.1: identificar fase de Inventario de campo 2026-09-05 18:02:50 -03:00
admin 56e5c9b59e F2.1: versionar API 0.21.0-1 2026-09-05 18:02:43 -03:00
admin 685b561821 F2.1: corregir alta contextual y captura de campo 2026-09-05 18:02:16 -03:00
admin ec600a1aff F2.1: marcar altas y selecciones de campo 2026-09-05 18:00:50 -03:00
admin 823e905aa3 F2.1: exportar servicios de Inventario para campo 2026-09-05 18:00:37 -03:00
admin 0b8e673072 F2.1: registrar Inventario de campo 2026-09-05 18:00:19 -03:00
admin 2c45eb7485 F2.1: exponer Inventario de campo a la APK 2026-09-05 18:00:01 -03:00
admin 3f6c537f05 F2.1: servicio móvil de Inventario nacido en campo 2026-09-05 17:47:03 -03:00
admin aed83e9ad7 F2.1: metadatos GPS y EXIF para foto de campo 2026-09-05 17:45:25 -03:00
admin e35ee78b08 F2.1: contrato de alta de Inventario en campo 2026-09-05 17:45:13 -03:00
admin 250540e076 F2.1: consulta móvil de Inventario por contexto 2026-09-05 17:44:58 -03:00
admin c527bc57dc F2.1: persistencia append-only para Inventario nacido en campo 2026-09-05 17:44:47 -03:00
admin 9da2f85c3c Merge pull request #9 from enlineawork/feature/f1-4-dashboard-briefing
F1.4 · Briefing contextual antes de salir
2026-09-05 17:28:39 -03:00
16 changed files with 1698 additions and 10 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "dhv2-api",
"version": "0.20.0-3",
"version": "0.21.0-1",
"private": true,
"license": "UNLICENSED",
"scripts": {
@@ -49,6 +49,12 @@ import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/fi
AssetRegistryService,
FieldDiscoveryInspectionLinkService,
],
exports: [AssetHistoryService],
exports: [
AssetHistoryService,
AssetsService,
AssetGeometriesService,
AssetMediaService,
FieldDiscoveryInspectionLinkService,
],
})
export class AssetMasterModule {}
+4 -1
View File
@@ -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,
@@ -0,0 +1,8 @@
import { IsString, MaxLength, MinLength } from 'class-validator';
export class MobileRefreshDto {
@IsString()
@MinLength(32)
@MaxLength(256)
refreshToken!: string;
}
+56
View File
@@ -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);
}
}
+386
View File
@@ -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<LoginOutcome>(
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<RefreshOutcome>(
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,
};
}
}
@@ -0,0 +1,197 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
function quoteIdentifier(identifier: string): string {
return `"${identifier.replaceAll('"', '""')}"`;
}
export class PhaseF21FieldInventory1789668000000 implements MigrationInterface {
name = 'PhaseF21FieldInventory1789668000000';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
CREATE TABLE field_inventory_code_sequences (
year integer PRIMARY KEY,
last_value integer NOT NULL DEFAULT 0,
CONSTRAINT chk_field_inventory_code_sequences_year CHECK (year BETWEEN 2000 AND 9999),
CONSTRAINT chk_field_inventory_code_sequences_value CHECK (last_value >= 0)
)
`);
await queryRunner.query(`
CREATE TABLE asset_field_capture_events (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
visit_id uuid NOT NULL,
asset_id uuid NOT NULL,
media_id uuid,
event_type varchar(24) NOT NULL,
device_latitude numeric(9, 6) NOT NULL,
device_longitude numeric(9, 6) NOT NULL,
device_accuracy_m numeric(12, 3),
device_captured_at timestamptz NOT NULL,
device_label varchar(255),
exif_latitude numeric(9, 6),
exif_longitude numeric(9, 6),
exif_captured_at timestamptz,
created_by uuid NOT NULL,
created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT fk_asset_field_capture_visit FOREIGN KEY (visit_id)
REFERENCES inspection_visits(id) ON DELETE RESTRICT,
CONSTRAINT fk_asset_field_capture_asset FOREIGN KEY (asset_id)
REFERENCES assets(id) ON DELETE RESTRICT,
CONSTRAINT fk_asset_field_capture_media FOREIGN KEY (media_id)
REFERENCES asset_media(id) ON DELETE RESTRICT,
CONSTRAINT fk_asset_field_capture_created_by FOREIGN KEY (created_by)
REFERENCES users(id) ON DELETE RESTRICT,
CONSTRAINT chk_asset_field_capture_event_type CHECK (event_type IN ('CREATED','PHOTO')),
CONSTRAINT chk_asset_field_capture_device_coordinates CHECK (
device_latitude BETWEEN -90 AND 90
AND device_longitude BETWEEN -180 AND 180
),
CONSTRAINT chk_asset_field_capture_accuracy CHECK (
device_accuracy_m IS NULL OR device_accuracy_m BETWEEN 0 AND 100000
),
CONSTRAINT chk_asset_field_capture_exif_coordinates CHECK (
(exif_latitude IS NULL AND exif_longitude IS NULL)
OR (
exif_latitude IS NOT NULL
AND exif_longitude IS NOT NULL
AND exif_latitude BETWEEN -90 AND 90
AND exif_longitude BETWEEN -180 AND 180
)
),
CONSTRAINT chk_asset_field_capture_media_event CHECK (
(event_type = 'CREATED' AND media_id IS NULL)
OR (event_type = 'PHOTO' AND media_id IS NOT NULL)
)
)
`);
await queryRunner.query(`CREATE INDEX idx_asset_field_capture_visit ON asset_field_capture_events (visit_id, created_at, id)`);
await queryRunner.query(`CREATE INDEX idx_asset_field_capture_asset ON asset_field_capture_events (asset_id, created_at, id)`);
await queryRunner.query(`CREATE UNIQUE INDEX uq_asset_field_capture_media ON asset_field_capture_events (media_id) WHERE media_id IS NOT NULL`);
await queryRunner.query(`
ALTER TABLE inspection_visit_assets
DROP CONSTRAINT chk_inspection_visit_assets_planning_source
`);
await queryRunner.query(`
ALTER TABLE inspection_visit_assets
ADD CONSTRAINT chk_inspection_visit_assets_planning_source CHECK (
planning_source IN ('LEGACY','AUTOMATIC','PREVENTIVE','VERIFICATION','FIELD')
)
`);
await queryRunner.query(`
ALTER TABLE inspection_visit_asset_events
DROP CONSTRAINT chk_inspection_visit_asset_events_type
`);
await queryRunner.query(`
ALTER TABLE inspection_visit_asset_events
ADD CONSTRAINT chk_inspection_visit_asset_events_type CHECK (
event_type IN ('LEGACY_INCLUDED','AUTO_INCLUDED','PREVENTIVE_INCLUDED','VERIFICATION_INCLUDED','FIELD_INCLUDED','EXCLUDED','REINCLUDED')
)
`);
await queryRunner.query(`
CREATE OR REPLACE FUNCTION enforce_field_inventory_capture_before_finding()
RETURNS trigger
LANGUAGE plpgsql
AS $$
DECLARE
finding_visit_id uuid;
BEGIN
SELECT act.visit_id INTO finding_visit_id
FROM inspection_acts act
WHERE act.id = NEW.act_id;
IF finding_visit_id IS NULL THEN
RETURN NEW;
END IF;
IF EXISTS (
SELECT 1
FROM asset_field_discoveries discovery
WHERE discovery.visit_id = finding_visit_id
AND discovery.asset_id = NEW.asset_id
) THEN
IF NOT EXISTS (
SELECT 1
FROM asset_field_capture_events capture
WHERE capture.visit_id = finding_visit_id
AND capture.asset_id = NEW.asset_id
AND capture.event_type = 'CREATED'
) THEN
RAISE EXCEPTION USING
ERRCODE = '23514',
MESSAGE = 'FIELD_INVENTORY_GPS_REQUIRED';
END IF;
IF NOT EXISTS (
SELECT 1
FROM asset_field_capture_events capture
WHERE capture.visit_id = finding_visit_id
AND capture.asset_id = NEW.asset_id
AND capture.event_type = 'PHOTO'
) THEN
RAISE EXCEPTION USING
ERRCODE = '23514',
MESSAGE = 'FIELD_INVENTORY_PHOTO_REQUIRED';
END IF;
END IF;
RETURN NEW;
END
$$
`);
await queryRunner.query(`
CREATE TRIGGER trg_inspection_findings_field_capture
BEFORE INSERT OR UPDATE OF act_id, asset_id ON inspection_findings
FOR EACH ROW
EXECUTE FUNCTION enforce_field_inventory_capture_before_finding()
`);
const appRole = process.env.DB_APP_USER;
if (!appRole) throw new Error('Missing required environment variable: DB_APP_USER');
const applicationRole = quoteIdentifier(appRole);
await queryRunner.query(`GRANT SELECT, INSERT, UPDATE ON TABLE field_inventory_code_sequences TO ${applicationRole}`);
await queryRunner.query(`GRANT SELECT, INSERT ON TABLE asset_field_capture_events TO ${applicationRole}`);
await queryRunner.query(`REVOKE UPDATE, DELETE ON TABLE asset_field_capture_events FROM ${applicationRole}`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
DO $$
BEGIN
IF EXISTS (SELECT 1 FROM asset_field_capture_events LIMIT 1) THEN
RAISE EXCEPTION 'F2.1 no puede revertirse: existen capturas GPS/EXIF de campo';
END IF;
IF EXISTS (SELECT 1 FROM inspection_visit_assets WHERE planning_source = 'FIELD' LIMIT 1) THEN
RAISE EXCEPTION 'F2.1 no puede revertirse: existen registros seleccionados o creados en campo';
END IF;
IF EXISTS (SELECT 1 FROM inspection_visit_asset_events WHERE event_type = 'FIELD_INCLUDED' LIMIT 1) THEN
RAISE EXCEPTION 'F2.1 no puede revertirse: existen eventos de Inventario de campo';
END IF;
END
$$
`);
await queryRunner.query(`DROP TRIGGER IF EXISTS trg_inspection_findings_field_capture ON inspection_findings`);
await queryRunner.query(`DROP FUNCTION IF EXISTS enforce_field_inventory_capture_before_finding()`);
await queryRunner.query(`ALTER TABLE inspection_visit_asset_events DROP CONSTRAINT chk_inspection_visit_asset_events_type`);
await queryRunner.query(`
ALTER TABLE inspection_visit_asset_events
ADD CONSTRAINT chk_inspection_visit_asset_events_type CHECK (
event_type IN ('LEGACY_INCLUDED','AUTO_INCLUDED','PREVENTIVE_INCLUDED','VERIFICATION_INCLUDED','EXCLUDED','REINCLUDED')
)
`);
await queryRunner.query(`ALTER TABLE inspection_visit_assets DROP CONSTRAINT chk_inspection_visit_assets_planning_source`);
await queryRunner.query(`
ALTER TABLE inspection_visit_assets
ADD CONSTRAINT chk_inspection_visit_assets_planning_source CHECK (
planning_source IN ('LEGACY','AUTOMATIC','PREVENTIVE','VERIFICATION')
)
`);
await queryRunner.query(`DROP TABLE asset_field_capture_events`);
await queryRunner.query(`DROP TABLE field_inventory_code_sequences`);
}
}
@@ -26,19 +26,60 @@ export class FieldDiscoveryInspectionLinkService {
[visitId],
)) as Array<{ id: string; status: string }>;
const [existing] = (await manager.query(
`
SELECT included, planning_source AS "planningSource"
FROM inspection_visit_assets
WHERE visit_id = $1 AND asset_id = $2
FOR UPDATE
`,
[visitId, assetId],
)) as Array<{ included: boolean; planningSource: string }>;
await manager.query(
`
INSERT INTO inspection_visit_assets (visit_id, asset_id, included, added_by)
VALUES ($1, $2, true, $3)
INSERT INTO inspection_visit_assets (
visit_id, asset_id, included, planning_source, added_by,
exclusion_reason, excluded_by, excluded_at
)
VALUES ($1, $2, true, 'FIELD', $3, NULL, NULL, NULL)
ON CONFLICT (visit_id, asset_id) DO UPDATE SET
included = true,
planning_source = CASE
WHEN inspection_visit_assets.planning_source IN ('AUTOMATIC','VERIFICATION')
THEN inspection_visit_assets.planning_source
ELSE 'FIELD'
END,
added_by = EXCLUDED.added_by,
exclusion_reason = NULL,
excluded_by = NULL,
excluded_at = NULL,
updated_at = CURRENT_TIMESTAMP
`,
[visitId, assetId, userId],
);
const eventType = existing && existing.included ? null : 'FIELD_INCLUDED';
if (eventType) {
await manager.query(
`
INSERT INTO inspection_visit_asset_events (
visit_id, asset_id, event_type, actor_user_id, metadata
)
VALUES ($1, $2, 'FIELD_INCLUDED', $3, $4::jsonb)
`,
[
visitId,
assetId,
userId,
JSON.stringify({
fieldSelection: true,
previousPlanningSource: existing?.planningSource ?? null,
}),
],
);
}
if (act) {
await manager.query(
`
@@ -0,0 +1,85 @@
import { Transform, Type } from 'class-transformer';
import {
IsISO8601,
IsNumber,
IsObject,
IsOptional,
IsString,
IsUUID,
Matches,
Max,
MaxLength,
Min,
MinLength,
} from 'class-validator';
export class CreateFieldInventoryDto {
@IsUUID('4')
typeId!: string;
@IsOptional()
@IsUUID('4')
parentId?: string;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim().toUpperCase() : undefined)
@IsString()
@MaxLength(120)
@Matches(/^[A-Z0-9][A-Z0-9._/-]*$/)
code?: string;
@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()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
@IsString()
@MaxLength(4000)
description?: string | null;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
@IsString()
@MaxLength(4000)
discoveryNotes?: string | null;
@IsObject()
attributes!: Record<string, unknown>;
@Type(() => Number)
@IsNumber({ maxDecimalPlaces: 6 })
@Min(-90)
@Max(90)
deviceLatitude!: number;
@Type(() => Number)
@IsNumber({ maxDecimalPlaces: 6 })
@Min(-180)
@Max(180)
deviceLongitude!: number;
@IsOptional()
@Type(() => Number)
@IsNumber({ maxDecimalPlaces: 3 })
@Min(0)
@Max(100000)
deviceAccuracyM?: number;
@IsISO8601({ strict: true })
deviceCapturedAt!: string;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
@IsString()
@MaxLength(255)
deviceLabel?: string | null;
}
@@ -0,0 +1,25 @@
import { Transform, Type } from 'class-transformer';
import { IsInt, IsOptional, IsString, IsUUID, Max, MaxLength, Min } from 'class-validator';
export class ListFieldInventoryQueryDto {
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : undefined)
@IsString()
@MaxLength(200)
search?: string;
@IsOptional()
@IsUUID('4')
parentId?: string;
@IsOptional()
@IsUUID('4')
typeId?: string;
@IsOptional()
@Type(() => Number)
@IsInt()
@Min(1)
@Max(100)
limit = 50;
}
@@ -0,0 +1,70 @@
import { Transform, Type } from 'class-transformer';
import {
IsISO8601,
IsNumber,
IsOptional,
IsString,
Max,
MaxLength,
Min,
} from 'class-validator';
export class UploadFieldInventoryPhotoDto {
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
@IsString()
@MaxLength(200)
title?: string | null;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
@IsString()
@MaxLength(4000)
description?: string | null;
@Type(() => Number)
@IsNumber({ maxDecimalPlaces: 6 })
@Min(-90)
@Max(90)
deviceLatitude!: number;
@Type(() => Number)
@IsNumber({ maxDecimalPlaces: 6 })
@Min(-180)
@Max(180)
deviceLongitude!: number;
@IsOptional()
@Type(() => Number)
@IsNumber({ maxDecimalPlaces: 3 })
@Min(0)
@Max(100000)
deviceAccuracyM?: number;
@IsISO8601({ strict: true })
deviceCapturedAt!: string;
@IsOptional()
@Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
@IsString()
@MaxLength(255)
deviceLabel?: string | null;
@IsOptional()
@Type(() => Number)
@IsNumber({ maxDecimalPlaces: 6 })
@Min(-90)
@Max(90)
exifLatitude?: number;
@IsOptional()
@Type(() => Number)
@IsNumber({ maxDecimalPlaces: 6 })
@Min(-180)
@Max(180)
exifLongitude?: number;
@IsOptional()
@IsISO8601({ strict: true })
exifCapturedAt?: string;
}
@@ -0,0 +1,93 @@
import {
Body,
Controller,
Get,
Param,
ParseUUIDPipe,
Post,
Query,
Req,
UploadedFile,
UseInterceptors,
} from '@nestjs/common';
import { FileInterceptor } from '@nestjs/platform-express';
import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
import { MAX_ASSET_MEDIA_BYTES, type UploadedAssetFile } from '../asset-master/asset-media-file';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import { CreateFieldInventoryDto } from './dto/create-field-inventory.dto';
import { ListFieldInventoryQueryDto } from './dto/list-field-inventory-query.dto';
import { UploadFieldInventoryPhotoDto } from './dto/upload-field-inventory-photo.dto';
import { FieldInventoryService } from './field-inventory.service';
@Controller('inspection-visits/:visitId/field-inventory')
export class FieldInventoryController {
constructor(private readonly fieldInventory: FieldInventoryService) {}
@Get()
@RequirePermissions('assets.read', 'inspections.execute')
list(
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
@Query() query: ListFieldInventoryQueryDto,
@CurrentAuth() principal: AuthPrincipal,
) {
return this.fieldInventory.list(visitId, query, principal);
}
@Get('types')
@RequirePermissions('assets.read', 'inspections.execute')
types(
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
@Query() query: ListFieldInventoryQueryDto,
@CurrentAuth() principal: AuthPrincipal,
) {
return this.fieldInventory.types(visitId, query.parentId, principal);
}
@Get(':assetId')
@RequirePermissions('assets.read', 'inspections.execute')
detail(
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
@Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
@CurrentAuth() principal: AuthPrincipal,
) {
return this.fieldInventory.detail(visitId, assetId, principal);
}
@Post(':assetId/select')
@RequirePermissions('assets.read', 'inspections.execute')
selectExisting(
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
@Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
@CurrentAuth() principal: AuthPrincipal,
) {
return this.fieldInventory.selectExisting(visitId, assetId, principal);
}
@Post()
@RequirePermissions('assets.create', 'inspections.execute')
create(
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
@Body() dto: CreateFieldInventoryDto,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.fieldInventory.create(visitId, dto, principal, request);
}
@Post(':assetId/photos')
@RequirePermissions('assets.create', 'inspections.execute')
@UseInterceptors(FileInterceptor('file', {
limits: { fileSize: MAX_ASSET_MEDIA_BYTES, files: 1 },
}))
uploadPhoto(
@Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
@Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
@Body() dto: UploadFieldInventoryPhotoDto,
@UploadedFile() file: UploadedAssetFile | undefined,
@CurrentAuth() principal: AuthPrincipal,
@Req() request: RequestWithContext,
) {
return this.fieldInventory.uploadPhoto(visitId, assetId, dto, file, principal, request);
}
}
@@ -0,0 +1,648 @@
import {
BadRequestException,
ConflictException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { DataSource } from 'typeorm';
import { AssetGeometriesService } from '../asset-master/asset-geometries.service';
import { AssetMediaService, type AssetMediaView } from '../asset-master/asset-media.service';
import { AssetsService } from '../asset-master/assets.service';
import type { UploadedAssetFile } from '../asset-master/asset-media-file';
import type { CreateFieldDiscoveryDto } from '../asset-master/dto/create-field-discovery.dto';
import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
import { AssetGeometryType, AssetMediaKind } from '../database/entities';
import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.service';
import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
import type { CreateFieldInventoryDto } from './dto/create-field-inventory.dto';
import type { ListFieldInventoryQueryDto } from './dto/list-field-inventory-query.dto';
import type { UploadFieldInventoryPhotoDto } from './dto/upload-field-inventory-photo.dto';
interface MobileVisitContext {
id: string;
code: string;
status: string;
areaId: string;
areaCode: string;
areaName: string;
companyId: string;
companyCode: string;
companyName: string;
assigned: boolean;
}
interface FieldDiscoveryCreated {
id: string;
asset: {
id: string;
code: string;
name: string;
informationStatus: string;
};
}
export interface FieldInventoryCaptureStatus {
captureRequired: boolean;
hasGeometry: boolean;
creationGpsCaptured: boolean;
fieldPhotoCount: number;
readyForFinding: boolean;
latestDeviceCapture: {
latitude: number;
longitude: number;
accuracyM: number | null;
capturedAt: Date;
deviceLabel: string | null;
} | null;
latestPhotoExif: {
latitude: number | null;
longitude: number | null;
capturedAt: Date | null;
} | null;
}
@Injectable()
export class FieldInventoryService {
constructor(
private readonly dataSource: DataSource,
private readonly assets: AssetsService,
private readonly geometries: AssetGeometriesService,
private readonly media: AssetMediaService,
private readonly links: FieldDiscoveryInspectionLinkService,
) {}
async list(
visitId: string,
query: ListFieldInventoryQueryDto,
principal: AuthPrincipal,
) {
const context = await this.requireVisitContext(visitId, principal, false);
if (query.parentId) await this.requireParentInContext(query.parentId, context);
const args: unknown[] = [context.areaId, context.companyId, visitId];
const conditions = [
'asset.operational_area_id = $1::uuid',
'asset.operator_company_id = $2::uuid',
"asset.information_status <> 'INACTIVE'",
];
if (query.search?.trim()) {
args.push(`%${query.search.trim()}%`);
const p = `$${args.length}`;
conditions.push(`(
asset.code ILIKE ${p}
OR asset.name ILIKE ${p}
OR asset.common_name ILIKE ${p}
OR EXISTS (
SELECT 1
FROM asset_attribute_values value
JOIN asset_attribute_definitions definition ON definition.id = value.definition_id
WHERE value.asset_id = asset.id
AND definition.is_active = true
AND (value.value #>> '{}') ILIKE ${p}
)
)`);
}
if (query.parentId) {
args.push(query.parentId);
conditions.push(`asset.parent_id = $${args.length}::uuid`);
}
if (query.typeId) {
args.push(query.typeId);
conditions.push(`asset.asset_type_id = $${args.length}::uuid`);
}
args.push(query.limit);
const limit = `$${args.length}`;
const data = await this.dataSource.query(`
SELECT
asset.id,
asset.code,
asset.name,
asset.common_name AS "commonName",
asset.information_status AS "informationStatus",
asset.data_origin AS "dataOrigin",
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,
EXISTS (
SELECT 1 FROM inspection_visit_assets link
WHERE link.visit_id = $3::uuid
AND link.asset_id = asset.id
AND link.included = true
) AS "selectedInInspection",
EXISTS (
SELECT 1 FROM asset_field_discoveries discovery
WHERE discovery.visit_id = $3::uuid AND discovery.asset_id = asset.id
) AS "captureRequired",
EXISTS (
SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id = asset.id
) AS "hasGeometry",
(
SELECT COUNT(*)::integer
FROM asset_field_capture_events capture
WHERE capture.visit_id = $3::uuid
AND capture.asset_id = asset.id
AND capture.event_type = 'PHOTO'
) AS "fieldPhotoCount",
(
NOT EXISTS (
SELECT 1 FROM asset_field_discoveries discovery
WHERE discovery.visit_id = $3::uuid AND discovery.asset_id = asset.id
)
OR (
EXISTS (SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id = asset.id)
AND EXISTS (
SELECT 1 FROM asset_field_capture_events capture
WHERE capture.visit_id = $3::uuid
AND capture.asset_id = asset.id
AND capture.event_type = 'CREATED'
)
AND EXISTS (
SELECT 1 FROM asset_field_capture_events capture
WHERE capture.visit_id = $3::uuid
AND capture.asset_id = asset.id
AND capture.event_type = 'PHOTO'
)
)
) AS "readyForFinding"
FROM assets asset
JOIN asset_types type ON type.id = asset.asset_type_id
LEFT JOIN assets parent ON parent.id = asset.parent_id
WHERE ${conditions.join(' AND ')}
ORDER BY asset.name, asset.code
LIMIT ${limit}
`, args);
return { context: this.publicContext(context), data };
}
async types(
visitId: string,
parentId: string | undefined,
principal: AuthPrincipal,
) {
const context = await this.requireVisitContext(visitId, principal, false);
const effectiveParentId = parentId ?? context.areaId;
const parent = await this.requireParentInContext(effectiveParentId, context);
const data = await this.dataSource.query(`
SELECT
type.id,
type.code,
type.name,
type.description,
COALESCE(
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', definition.id,
'code', definition.code,
'name', definition.name,
'dataType', definition.data_type,
'isRequired', definition.is_required,
'unit', definition.unit,
'options', definition.options,
'sortOrder', definition.sort_order
) ORDER BY definition.sort_order, definition.name
) FILTER (WHERE definition.id IS NOT NULL),
'[]'::jsonb
) AS attributes
FROM asset_type_parent_rules rule
JOIN asset_types type ON type.id = rule.child_type_id
LEFT JOIN asset_attribute_definitions definition
ON definition.asset_type_id = type.id
AND definition.is_active = true
WHERE rule.parent_type_id = $1::uuid
AND type.is_active = true
AND type.operational_role = 'GENERIC'
GROUP BY type.id, type.code, type.name, type.description
ORDER BY type.name, type.code
`, [parent.typeId]);
return {
context: this.publicContext(context),
parent: { id: parent.id, code: parent.code, name: parent.name },
data,
};
}
async detail(visitId: string, assetId: string, principal: AuthPrincipal) {
const context = await this.requireVisitContext(visitId, principal, false);
await this.requireAssetInContext(assetId, context);
return {
context: this.publicContext(context),
asset: await this.assets.getById(assetId),
selectedInInspection: await this.isSelected(visitId, assetId),
capture: await this.captureStatus(visitId, assetId),
};
}
async selectExisting(
visitId: string,
assetId: string,
principal: AuthPrincipal,
) {
const context = await this.requireVisitContext(visitId, principal, true);
await this.requireAssetInContext(assetId, context);
await this.dataSource.transaction((manager) =>
this.links.attach(manager, visitId, assetId, principal.userId),
);
return this.detail(visitId, assetId, principal);
}
async create(
visitId: string,
dto: CreateFieldInventoryDto,
principal: AuthPrincipal,
request: RequestWithContext,
) {
const context = await this.requireVisitContext(visitId, principal, true);
const parentId = dto.parentId ?? context.areaId;
await this.requireParentInContext(parentId, context);
const capturedAt = new Date(dto.deviceCapturedAt);
if (!Number.isFinite(capturedAt.getTime())) {
throw new BadRequestException({
code: 'FIELD_INVENTORY_INVALID_CAPTURE_DATE',
message: 'La fecha de captura del dispositivo no es válida',
});
}
const code = dto.code?.trim().toUpperCase() || await this.nextFieldCode(capturedAt);
const discoveryDto: CreateFieldDiscoveryDto = {
visitId,
code,
name: dto.name,
commonName: dto.commonName ?? null,
typeId: dto.typeId,
parentId,
operationalAreaId: context.areaId,
operatorCompanyId: context.companyId,
description: dto.description ?? null,
discoveryNotes: dto.discoveryNotes ?? null,
attributes: dto.attributes,
};
const discovery = await this.assets.createFieldDiscovery(
discoveryDto,
principal,
request,
) as FieldDiscoveryCreated;
const assetId = discovery.asset?.id;
if (!assetId) {
throw new Error('El alta de campo no devolvió el identificador del Inventario creado');
}
await this.geometries.upsert(assetId, {
geometry: {
type: AssetGeometryType.POINT,
coordinates: [dto.deviceLongitude, dto.deviceLatitude],
},
accuracyM: dto.deviceAccuracyM ?? null,
capturedAt: dto.deviceCapturedAt,
deviceLabel: dto.deviceLabel ?? null,
}, principal, request);
await this.dataSource.query(`
INSERT INTO asset_field_capture_events (
visit_id, asset_id, event_type,
device_latitude, device_longitude, device_accuracy_m,
device_captured_at, device_label, created_by
) VALUES ($1,$2,'CREATED',$3,$4,$5,$6,$7,$8)
`, [
visitId,
assetId,
dto.deviceLatitude,
dto.deviceLongitude,
dto.deviceAccuracyM ?? null,
capturedAt,
dto.deviceLabel ?? null,
principal.userId,
]);
return this.detail(visitId, assetId, principal);
}
async uploadPhoto(
visitId: string,
assetId: string,
dto: UploadFieldInventoryPhotoDto,
file: UploadedAssetFile | undefined,
principal: AuthPrincipal,
request: RequestWithContext,
): Promise<{ media: AssetMediaView; capture: FieldInventoryCaptureStatus }> {
const context = await this.requireVisitContext(visitId, principal, true);
await this.requireAssetInContext(assetId, context);
if (!await this.isSelected(visitId, assetId)) {
throw new ConflictException({
code: 'FIELD_INVENTORY_NOT_SELECTED',
message: 'Seleccioná el registro dentro de la inspección antes de agregar fotografías',
});
}
const exifHasLatitude = dto.exifLatitude !== undefined;
const exifHasLongitude = dto.exifLongitude !== undefined;
if (exifHasLatitude !== exifHasLongitude) {
throw new BadRequestException({
code: 'FIELD_PHOTO_EXIF_COORDINATES_INCOMPLETE',
message: 'Las coordenadas EXIF deben incluir latitud y longitud juntas',
});
}
const uploaded = await this.media.upload(assetId, {
kind: AssetMediaKind.PHOTO,
title: dto.title ?? undefined,
description: dto.description ?? undefined,
capturedAt: dto.deviceCapturedAt,
latitude: dto.deviceLatitude,
longitude: dto.deviceLongitude,
accuracyM: dto.deviceAccuracyM,
}, file, principal, request);
await this.dataSource.query(`
INSERT INTO asset_field_capture_events (
visit_id, asset_id, media_id, event_type,
device_latitude, device_longitude, device_accuracy_m,
device_captured_at, device_label,
exif_latitude, exif_longitude, exif_captured_at,
created_by
) VALUES ($1,$2,$3,'PHOTO',$4,$5,$6,$7,$8,$9,$10,$11,$12)
`, [
visitId,
assetId,
uploaded.id,
dto.deviceLatitude,
dto.deviceLongitude,
dto.deviceAccuracyM ?? null,
new Date(dto.deviceCapturedAt),
dto.deviceLabel ?? null,
dto.exifLatitude ?? null,
dto.exifLongitude ?? null,
dto.exifCapturedAt ? new Date(dto.exifCapturedAt) : null,
principal.userId,
]);
return { media: uploaded, capture: await this.captureStatus(visitId, assetId) };
}
private async requireVisitContext(
visitId: string,
principal: AuthPrincipal,
requireInProgress: boolean,
): Promise<MobileVisitContext> {
assertMobileInspector(principal);
const [context] = (await this.dataSource.query(`
SELECT
visit.id,
visit.code,
visit.status,
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",
(
visit.lead_inspector_user_id = $2::uuid
OR EXISTS (
SELECT 1
FROM inspection_visit_members member
WHERE member.visit_id = visit.id
AND member.user_id = $2::uuid
AND member.included = true
)
) AS assigned
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
WHERE visit.id = $1::uuid
`, [visitId, principal.userId])) as MobileVisitContext[];
if (!context) {
throw new NotFoundException({ code: 'INSPECTION_VISIT_NOT_FOUND', message: 'Inspección no encontrada' });
}
if (!context.areaId || !context.companyId) {
throw new ConflictException({
code: 'FIELD_INVENTORY_CONTEXT_REQUIRED',
message: 'La inspección no tiene Área y Operadora definidas',
});
}
if (!context.assigned) {
throw new ConflictException({
code: 'FIELD_INVENTORY_INSPECTOR_NOT_ASSIGNED',
message: 'El inspector no está asignado a esta inspección',
});
}
if (requireInProgress && context.status !== 'IN_PROGRESS') {
throw new ConflictException({
code: 'FIELD_INVENTORY_VISIT_NOT_IN_PROGRESS',
message: 'El Inventario sólo puede modificarse cuando la inspección está en curso',
});
}
if (!requireInProgress && !['PLANNED', 'IN_PROGRESS'].includes(context.status)) {
throw new ConflictException({
code: 'FIELD_INVENTORY_VISIT_NOT_AVAILABLE',
message: 'El Inventario de campo está disponible para inspecciones planificadas o en curso',
});
}
return context;
}
private publicContext(context: MobileVisitContext) {
return {
inspection: { id: context.id, code: context.code, status: context.status },
area: { id: context.areaId, code: context.areaCode, name: context.areaName },
operatorCompany: {
id: context.companyId,
code: context.companyCode,
name: context.companyName,
},
};
}
private async requireParentInContext(parentId: string, context: MobileVisitContext) {
const [parent] = (await this.dataSource.query(`
SELECT
asset.id,
asset.code,
asset.name,
asset.asset_type_id AS "typeId",
asset.operational_area_id AS "areaId",
asset.operator_company_id AS "companyId"
FROM assets asset
WHERE asset.id = $1::uuid
AND asset.information_status <> 'INACTIVE'
`, [parentId])) as Array<{
id: string;
code: string;
name: string;
typeId: string;
areaId: string | null;
companyId: string | null;
}>;
if (!parent) {
throw new NotFoundException({
code: 'FIELD_INVENTORY_PARENT_NOT_FOUND',
message: 'La ubicación padre no existe',
});
}
if (
parent.id !== context.areaId
&& (parent.areaId !== context.areaId || parent.companyId !== context.companyId)
) {
throw new BadRequestException({
code: 'FIELD_INVENTORY_PARENT_OUTSIDE_CONTEXT',
message: 'La ubicación padre no pertenece al Área y Operadora de la inspección',
});
}
return parent;
}
private async requireAssetInContext(assetId: string, context: MobileVisitContext) {
const [asset] = (await this.dataSource.query(`
SELECT id,
operational_area_id AS "areaId",
operator_company_id AS "companyId"
FROM assets
WHERE id = $1::uuid
AND information_status <> 'INACTIVE'
`, [assetId])) as Array<{
id: string;
areaId: string | null;
companyId: string | null;
}>;
if (!asset) {
throw new NotFoundException({
code: 'FIELD_INVENTORY_NOT_FOUND',
message: 'Registro de Inventario no encontrado',
});
}
if (asset.areaId !== context.areaId || asset.companyId !== context.companyId) {
throw new BadRequestException({
code: 'FIELD_INVENTORY_OUTSIDE_CONTEXT',
message: 'El registro no pertenece al Área y Operadora de esta inspección',
});
}
return asset;
}
private async isSelected(visitId: string, assetId: string): Promise<boolean> {
const rows = await this.dataSource.query(`
SELECT 1
FROM inspection_visit_assets
WHERE visit_id = $1::uuid
AND asset_id = $2::uuid
AND included = true
`, [visitId, assetId]) as unknown[];
return rows.length > 0;
}
private async captureStatus(
visitId: string,
assetId: string,
): Promise<FieldInventoryCaptureStatus> {
const [row] = (await this.dataSource.query(`
SELECT
EXISTS (
SELECT 1
FROM asset_field_discoveries discovery
WHERE discovery.visit_id = $1::uuid
AND discovery.asset_id = $2::uuid
) AS "captureRequired",
EXISTS (
SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id = $2::uuid
) AS "hasGeometry",
EXISTS (
SELECT 1
FROM asset_field_capture_events event
WHERE event.visit_id = $1::uuid
AND event.asset_id = $2::uuid
AND event.event_type = 'CREATED'
) AS "creationGpsCaptured",
(
SELECT COUNT(*)::integer
FROM asset_field_capture_events event
WHERE event.visit_id = $1::uuid
AND event.asset_id = $2::uuid
AND event.event_type = 'PHOTO'
) AS "fieldPhotoCount",
(
SELECT JSONB_BUILD_OBJECT(
'latitude', event.device_latitude,
'longitude', event.device_longitude,
'accuracyM', event.device_accuracy_m,
'capturedAt', event.device_captured_at,
'deviceLabel', event.device_label
)
FROM asset_field_capture_events event
WHERE event.visit_id = $1::uuid
AND event.asset_id = $2::uuid
ORDER BY event.device_captured_at DESC, event.created_at DESC, event.id DESC
LIMIT 1
) AS "latestDeviceCapture",
(
SELECT JSONB_BUILD_OBJECT(
'latitude', event.exif_latitude,
'longitude', event.exif_longitude,
'capturedAt', event.exif_captured_at
)
FROM asset_field_capture_events event
WHERE event.visit_id = $1::uuid
AND event.asset_id = $2::uuid
AND event.event_type = 'PHOTO'
ORDER BY event.device_captured_at DESC, event.created_at DESC, event.id DESC
LIMIT 1
) AS "latestPhotoExif"
`, [visitId, assetId])) as Array<{
captureRequired: boolean;
hasGeometry: boolean;
creationGpsCaptured: boolean;
fieldPhotoCount: number;
latestDeviceCapture: FieldInventoryCaptureStatus['latestDeviceCapture'];
latestPhotoExif: FieldInventoryCaptureStatus['latestPhotoExif'];
}>;
const captureRequired = Boolean(row?.captureRequired);
const hasGeometry = Boolean(row?.hasGeometry);
const creationGpsCaptured = Boolean(row?.creationGpsCaptured);
const fieldPhotoCount = Number(row?.fieldPhotoCount ?? 0);
return {
captureRequired,
hasGeometry,
creationGpsCaptured,
fieldPhotoCount,
readyForFinding: !captureRequired || (
hasGeometry && creationGpsCaptured && fieldPhotoCount > 0
),
latestDeviceCapture: row?.latestDeviceCapture ?? null,
latestPhotoExif: row?.latestPhotoExif ?? null,
};
}
private async nextFieldCode(observedAt: Date): Promise<string> {
const year = observedAt.getUTCFullYear();
if (!Number.isInteger(year) || year < 2000 || year > 9999) {
throw new BadRequestException({
code: 'FIELD_INVENTORY_INVALID_CAPTURE_DATE',
message: 'La fecha de captura no es válida para generar el código',
});
}
const [row] = (await this.dataSource.query(`
INSERT INTO field_inventory_code_sequences (year, last_value)
VALUES ($1, 1)
ON CONFLICT (year)
DO UPDATE SET last_value = field_inventory_code_sequences.last_value + 1
RETURNING last_value AS value
`, [year])) as Array<{ value: number }>;
const value = Number(row?.value ?? 0);
if (!value) throw new Error('No se pudo generar el código de Inventario de campo');
return `CAM-${year}-${String(value).padStart(6, '0')}`;
}
}
@@ -1,11 +1,14 @@
import { Module } from '@nestjs/common';
import { AssetMasterModule } from '../asset-master/asset-master.module';
import { AuditModule } from '../audit/audit.module';
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],
controllers: [InspectionVisitsController],
providers: [InspectionVisitsService],
imports: [AuditModule, AssetMasterModule],
controllers: [InspectionVisitsController, FieldInventoryController],
providers: [InspectionVisitsService, FieldInventoryService],
})
export class InspectionVisitsModule {}
+2 -2
View File
@@ -1,2 +1,2 @@
export const API_VERSION = '0.20.0-3';
export const API_PHASE = 'F1.3';
export const API_VERSION = '0.21.0-1';
export const API_PHASE = 'F2.1';
@@ -0,0 +1,67 @@
import 'reflect-metadata';
import assert from 'node:assert/strict';
import test from 'node:test';
import { readFileSync } from 'node:fs';
import { validate } from 'class-validator';
import { plainToInstance } from 'class-transformer';
import { FieldInventoryController } from '../../src/inspection-visits/field-inventory.controller';
import { CreateFieldInventoryDto } from '../../src/inspection-visits/dto/create-field-inventory.dto';
import { UploadFieldInventoryPhotoDto } from '../../src/inspection-visits/dto/upload-field-inventory-photo.dto';
import { REQUIRED_PERMISSIONS_KEY } from '../../src/authorization/decorators/require-permissions.decorator';
function permissions(method: string): string[] {
const controller = FieldInventoryController.prototype;
const handler = controller[method as keyof typeof controller];
return Reflect.getMetadata(REQUIRED_PERMISSIONS_KEY, handler) as string[];
}
test('F2.1 mantiene Inventario de campo bajo política móvil y permisos explícitos', () => {
assert.deepEqual(permissions('list'), ['assets.read', 'inspections.execute']);
assert.deepEqual(permissions('types'), ['assets.read', 'inspections.execute']);
assert.deepEqual(permissions('selectExisting'), ['assets.read', 'inspections.execute']);
assert.deepEqual(permissions('create'), ['assets.create', 'inspections.execute']);
assert.deepEqual(permissions('uploadPhoto'), ['assets.create', 'inspections.execute']);
});
test('F2.1 exige GPS del dispositivo al crear Inventario en campo', async () => {
const dto = plainToInstance(CreateFieldInventoryDto, {
typeId: '11111111-1111-4111-8111-111111111111',
name: 'Batería 28',
attributes: {},
deviceCapturedAt: '2026-09-05T17:30:00-03:00',
});
const errors = await validate(dto);
const properties = new Set(errors.map((error) => error.property));
assert.equal(properties.has('deviceLatitude'), true);
assert.equal(properties.has('deviceLongitude'), true);
});
test('F2.1 exige GPS del dispositivo en cada fotografía de campo', async () => {
const dto = plainToInstance(UploadFieldInventoryPhotoDto, {
deviceCapturedAt: '2026-09-05T17:30:00-03:00',
});
const errors = await validate(dto);
const properties = new Set(errors.map((error) => error.property));
assert.equal(properties.has('deviceLatitude'), true);
assert.equal(properties.has('deviceLongitude'), true);
});
test('F2.1 deriva Área y Operadora desde la Inspección y usa el asset anidado del alta provisional', () => {
const source = readFileSync('src/inspection-visits/field-inventory.service.ts', 'utf8');
assert.match(source, /visit\.operational_area_id AS \"areaId\"/);
assert.match(source, /visit\.operator_company_id AS \"companyId\"/);
assert.match(source, /operationalAreaId: context\.areaId/);
assert.match(source, /operatorCompanyId: context\.companyId/);
assert.match(source, /const assetId = discovery\.asset\?\.id/);
});
test('F2.1 bloquea hallazgos sobre altas de campo hasta tener GPS y foto', () => {
const migration = readFileSync(
'src/database/migrations/1789668000000-phase-f2-1-field-inventory.ts',
'utf8',
);
assert.match(migration, /enforce_field_inventory_capture_before_finding/);
assert.match(migration, /FIELD_INVENTORY_GPS_REQUIRED/);
assert.match(migration, /FIELD_INVENTORY_PHOTO_REQUIRED/);
assert.match(migration, /REVOKE UPDATE, DELETE ON TABLE asset_field_capture_events/);
});