@elevasis/core 0.22.0 → 0.23.0

package/src/platform/registry/validation.ts

@@ -11,6 +11,8 @@ import { validateModelConfig, ModelConfigError } from '../../execution/engine/ll
 import type { DeploymentSpec } from './resource-registry'
 import type { ResourceEntry } from '../../organization-model/domains/resources'
 import type { SystemEntry } from '../../organization-model/domains/systems'
+import type { OrganizationModel } from '../../organization-model/types'
+import { listAllSystems } from '../../organization-model/helpers'
 import type {
   TriggerDefinition,
   ResourceRelationships,
@@ -46,12 +48,8 @@ export type ResourceGovernanceValidationIssueType =
   | 'raw-resource-id'
 
 export interface ResourceGovernanceModel {
-  systems?: {
-    systems: SystemEntry[]
-  }
-  resources?: {
-    entries: ResourceEntry[]
-  }
+  systems?: Record<string, SystemEntry>
+  resources?: Record<string, ResourceEntry>
 }
 
 export interface ResourceGovernanceValidationIssue {
@@ -149,28 +147,32 @@ export function validateResourceGovernance(
   options: ResourceGovernanceValidationOptions = {}
 ): ResourceGovernanceValidationResult {
   const mode = getResourceValidatorMode(options.mode)
-  const omResources = organizationModel?.resources?.entries
-  const omSystems = organizationModel?.systems?.systems
+  const omResourcesMap = organizationModel?.resources
+  const omSystemsMap = organizationModel?.systems
   const issues: ResourceGovernanceValidationIssue[] = []
 
-  if (!omResources || !omSystems) {
+  if (!omResourcesMap || !omSystemsMap) {
     return { valid: true, mode, issues }
   }
 
-  const systemsById = new Map(omSystems.map((system) => [system.id, system]))
-  const activeOmResources = omResources.filter((resource) => resource.status === 'active')
+  // Use listAllSystems (DFS) so nested systems under .subsystems are included.
+  // The lookup key is the dot-joined path, which equals resource.systemPath.
+  const systemsById = new Map(
+    listAllSystems({ systems: omSystemsMap } as OrganizationModel).map(({ path, system }) => [path, system])
+  )
+  const activeOmResources = Object.values(omResourcesMap).filter((resource) => resource.status === 'active')
   const omResourcesById = new Map(activeOmResources.map((resource) => [resource.id, resource]))
   const runtimeResources = getRuntimeResources(deployment)
   const runtimeResourcesById = new Map(runtimeResources.map((resource) => [resource.resourceId, resource]))
 
   for (const resource of activeOmResources) {
-    if (!systemsById.has(resource.systemId)) {
+    if (!systemsById.has(resource.systemPath)) {
       addGovernanceIssue(
         issues,
         'missing-om-system',
         orgName,
         resource.id,
-        `[${orgName}] OM resource '${resource.id}' references missing System '${resource.systemId}'.`
+        `[${orgName}] OM resource '${resource.id}' references missing system path '${resource.systemPath}'.`
       )
     }
 
@@ -196,13 +198,13 @@ export function validateResourceGovernance(
       )
     }
 
-    if (runtimeResource.descriptor && runtimeResource.descriptor.systemId !== resource.systemId) {
+    if (runtimeResource.descriptor && runtimeResource.descriptor.systemPath !== resource.systemPath) {
       addGovernanceIssue(
         issues,
         'system-mismatch',
         orgName,
         resource.id,
-        `[${orgName}] Resource '${resource.id}' system mismatch: code descriptor has '${runtimeResource.descriptor.systemId}', OM has '${resource.systemId}'.`
+        `[${orgName}] Resource '${resource.id}' system mismatch: code descriptor has '${runtimeResource.descriptor.systemPath}', OM has '${resource.systemPath}'.`
       )
     }
   }