F6.1 hotfix · jerarquía de Inspecciones y scope Yacimiento (#37)
Corrige creación de Inspección, separa Departamento→Área→Yacimiento, elimina el UPDATE oculto de checklist en lectura, integra Preparación para campo como etapa de Inspección, limita operaciones Android al Yacimiento, preserva scope en edición, auto-incluye Inventarios accionables, valida Operadora a plannedStartAt y recompila Android 0.15.2/vc24 con el ícono exacto de presentación.
This commit is contained in:
@@ -23,6 +23,7 @@ interface MobileVisitContext {
|
||||
code: string;
|
||||
status: string;
|
||||
areaId: string;
|
||||
scopeAssetId: string;
|
||||
areaCode: string;
|
||||
areaName: string;
|
||||
companyId: string;
|
||||
@@ -80,12 +81,12 @@ export class FieldInventoryService {
|
||||
const context = await this.requireVisitContext(visitId, principal, false);
|
||||
if (query.parentId) await this.requireParentInContext(query.parentId, context);
|
||||
|
||||
// Empresa is visit context, never physical ownership. Search by Area ancestry.
|
||||
const args: unknown[] = [context.areaId, visitId];
|
||||
// Empresa is visit context, never physical ownership. Search stays inside the frozen Yacimiento scope.
|
||||
const args: unknown[] = [context.scopeAssetId, visitId];
|
||||
const conditions = [
|
||||
"asset.information_status <> 'INACTIVE'",
|
||||
`(
|
||||
asset.operational_area_id = $1::uuid
|
||||
asset.id = $1::uuid
|
||||
OR EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
|
||||
@@ -198,7 +199,7 @@ export class FieldInventoryService {
|
||||
principal: AuthPrincipal,
|
||||
) {
|
||||
const context = await this.requireVisitContext(visitId, principal, false);
|
||||
const effectiveParentId = parentId ?? context.areaId;
|
||||
const effectiveParentId = parentId ?? context.scopeAssetId;
|
||||
const parent = await this.requireParentInContext(effectiveParentId, context);
|
||||
|
||||
const data = await this.dataSource.query(`
|
||||
@@ -272,7 +273,7 @@ export class FieldInventoryService {
|
||||
request: RequestWithContext,
|
||||
) {
|
||||
const context = await this.requireVisitContext(visitId, principal, true);
|
||||
const parentId = dto.parentId ?? context.areaId;
|
||||
const parentId = dto.parentId ?? context.scopeAssetId;
|
||||
await this.requireParentInContext(parentId, context);
|
||||
|
||||
const capturedAt = new Date(dto.deviceCapturedAt);
|
||||
@@ -412,6 +413,7 @@ export class FieldInventoryService {
|
||||
visit.id,
|
||||
visit.code,
|
||||
visit.status,
|
||||
COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",
|
||||
visit.operational_area_id AS "areaId",
|
||||
area.code AS "areaCode",
|
||||
area.name AS "areaName",
|
||||
@@ -485,6 +487,7 @@ export class FieldInventoryService {
|
||||
private publicContext(context: MobileVisitContext) {
|
||||
return {
|
||||
inspection: { id: context.id, code: context.code, status: context.status },
|
||||
scopeAssetId: context.scopeAssetId,
|
||||
area: { id: context.areaId, code: context.areaCode, name: context.areaName },
|
||||
operatorCompany: {
|
||||
id: context.companyId,
|
||||
@@ -503,7 +506,6 @@ export class FieldInventoryService {
|
||||
asset.asset_type_id AS "typeId",
|
||||
(
|
||||
asset.id=$2::uuid
|
||||
OR asset.operational_area_id=$2::uuid
|
||||
OR EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
|
||||
@@ -512,16 +514,16 @@ export class FieldInventoryService {
|
||||
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
|
||||
) SELECT 1 FROM ancestors WHERE id=$2::uuid LIMIT 1
|
||||
)
|
||||
) AS "insideArea"
|
||||
) AS "insideScope"
|
||||
FROM assets asset
|
||||
WHERE asset.id = $1::uuid
|
||||
AND asset.information_status <> 'INACTIVE'
|
||||
`, [parentId, context.areaId])) as Array<{
|
||||
`, [parentId, context.scopeAssetId])) as Array<{
|
||||
id: string;
|
||||
code: string;
|
||||
name: string;
|
||||
typeId: string;
|
||||
insideArea: boolean;
|
||||
insideScope: boolean;
|
||||
}>;
|
||||
|
||||
if (!parent) {
|
||||
@@ -530,10 +532,10 @@ export class FieldInventoryService {
|
||||
message: 'La ubicación padre no existe',
|
||||
});
|
||||
}
|
||||
if (!parent.insideArea) {
|
||||
if (!parent.insideScope) {
|
||||
throw new BadRequestException({
|
||||
code: 'FIELD_INVENTORY_PARENT_OUTSIDE_CONTEXT',
|
||||
message: 'La ubicación padre no pertenece al Área de la inspección',
|
||||
message: 'La ubicación padre no pertenece al Yacimiento definido como alcance de la inspección',
|
||||
});
|
||||
}
|
||||
return parent;
|
||||
@@ -545,7 +547,7 @@ export class FieldInventoryService {
|
||||
asset.id,
|
||||
(asset.is_inventory_instance=true OR lower(type.code)='yacimiento') AS "eligibleTarget",
|
||||
(
|
||||
asset.operational_area_id=$2::uuid
|
||||
asset.id=$2::uuid
|
||||
OR EXISTS (
|
||||
WITH RECURSIVE ancestors AS (
|
||||
SELECT id,parent_id FROM assets WHERE id=asset.parent_id
|
||||
@@ -554,15 +556,15 @@ export class FieldInventoryService {
|
||||
FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
|
||||
) SELECT 1 FROM ancestors WHERE id=$2::uuid LIMIT 1
|
||||
)
|
||||
) AS "insideArea"
|
||||
) AS "insideScope"
|
||||
FROM assets asset
|
||||
JOIN asset_types type ON type.id=asset.asset_type_id
|
||||
WHERE asset.id = $1::uuid
|
||||
AND asset.information_status <> 'INACTIVE'
|
||||
`, [assetId, context.areaId])) as Array<{
|
||||
`, [assetId, context.scopeAssetId])) as Array<{
|
||||
id: string;
|
||||
eligibleTarget: boolean;
|
||||
insideArea: boolean;
|
||||
insideScope: boolean;
|
||||
}>;
|
||||
|
||||
if (!asset) {
|
||||
@@ -571,10 +573,10 @@ export class FieldInventoryService {
|
||||
message: 'Registro de Inventario no encontrado',
|
||||
});
|
||||
}
|
||||
if (!asset.insideArea) {
|
||||
if (!asset.insideScope) {
|
||||
throw new BadRequestException({
|
||||
code: 'FIELD_INVENTORY_OUTSIDE_CONTEXT',
|
||||
message: 'El registro no pertenece al Área de esta inspección',
|
||||
message: 'El registro no pertenece al Yacimiento definido como alcance de esta inspección',
|
||||
});
|
||||
}
|
||||
if (!asset.eligibleTarget) {
|
||||
|
||||
Reference in New Issue
Block a user