Skip to content

Include semi-structured-mapped property classes to mapping analytics #4333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MauricioUyaguari merged 1 commit into from
Jan 6, 2026
Merged

Include semi-structured-mapped property classes to mapping analytics #4333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...ytics-mapping-pure/src/main/resources/core_analytics_mapping/modelCoverage/analytics.pure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Class meta::analytics::mapping::modelCoverage::MappedEntityInfo
{
isRootEntity : Boolean[0..1];
classPath: String[1];
class: Class<Any>[0..1];
subClasses : String[*];
}

Expand Down Expand Up @@ -156,10 +157,13 @@ function meta::analytics::mapping::modelCoverage::analyze(
let mappedEntities = $entities->concatenate($inheritanceEntities);
if ($returnLightGraph == true,
| let mappedEntityPaths = $mappedEntities->map(m | $m.info->toOne().classPath)->removeDuplicates();
let mappedClasses = $allClasses->keyValues()->map(c | $c.first)->filter(c | $mappedEntityPaths->contains($c->elementToPath()));
let mappedClasses = $allClasses->keyValues()->map(c | $c.first)->filter(c | $mappedEntityPaths->contains($c->elementToPath()))
->concatenate($mappedEntities.info.class);
// remove class from info
let prunedMappedEntities = $mappedEntities->map(m | if($m.info->toOne().class->isEmpty(), | $m, | ^$m(info = ^MappedEntityInfo(classPath = $m.info->toOne().classPath, subClasses = $m.info->toOne().subClasses, isRootEntity = $m.info->toOne().isRootEntity))));
let classCoverageAnalysis = getClassModelCoverage($mappedClasses);
^MappingModelCoverageAnalysisResult(
mappedEntities = $mappedEntities,
mappedEntities = $prunedMappedEntities,
classes = $classCoverageAnalysis.classes,
enumerations = $classCoverageAnalysis.enumerations,
associations = $classCoverageAnalysis.associations,
Expand Down
17 changes: 15 additions & 2 deletions ...s-mapping-pure/src/main/resources/core_analytics_mapping/modelCoverage/analyticsTest.pure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,24 @@ function <<meta::pure::profiles::test.Test>> meta::analytics::mapping::modelCove
'}';
let elements = meta::legend::compileLegendGrammar($semiGrammar);
let autoMappedMapping = $elements->filter(e|$e->instanceOf(Mapping))->at(0)->cast(@Mapping);
let result = meta::analytics::mapping::modelCoverage::test::generateModelCoverageAnalytics($autoMappedMapping);
assert($result.mappedEntities->size() == 4);
let result = meta::analytics::mapping::modelCoverage::analyze($autoMappedMapping, true, false, true);
assert($result.mappedEntities->size() == 4);
assertContains($result.mappedEntities.path, 'semi_structured_generated_embedded_inheritance_model_Person_firm_autoMapped_firm');
assertContains($result.mappedEntities.path, 'semi_structured_generated_embedded_inheritance_model_Person_firm_autoMapped_firm_address');
assertContains($result.mappedEntities.path, 'semi_structured_generated_embedded_inheritance_model_Person_firm_autoMapped_firm_address_street');

assert($result.mappedEntities.info.class->size() == 0);

assertContains($result.classes.name, 'Firm');
assertContains($result.classes.name, 'Address');
assertContains($result.classes.name, 'Street');

let firmClass = $result.classes->filter(c | $c.name == 'Firm')->toOne();
assertContains($firmClass.properties.genericType.rawType->map(type | $type->elementToPath()), 'inheritance::model::Address');
let addressClass = $result.classes->filter(c | $c.name == 'Address')->toOne();
assertContains($addressClass.properties.genericType.rawType->map(type | $type->elementToPath()), 'inheritance::model::Street');
let streetClass = $result.classes->filter(c | $c.name == 'Street')->toOne();
assertContains($addressClass.properties.genericType.rawType->map(type | $type->elementToPath()), 'String');
}

###Relational
Expand Down
4 changes: 2 additions & 2 deletions ...ing-pure/src/main/resources/core_analytics_mapping/modelCoverage/mappedEntityBuilder.pure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ function <<access.private>> meta::analytics::mapping::modelCoverage::buildEntity
^MappedEntity(
path = $path,
properties = $properties->removeDuplicatesBy(x | $x.name),
info = if($config.returnMappedEntityInfo == true, | ^MappedEntityInfo(isRootEntity = $isRootEntity, classPath = $class->elementToPath()), | [])
info = if($config.returnMappedEntityInfo == true, | ^MappedEntityInfo(isRootEntity = $isRootEntity, classPath = $class->elementToPath(), class = if($path->startsWith('semi_structured'), | $class, | [])), | [])
);
}

Expand Down Expand Up @@ -354,7 +354,7 @@ function meta::analytics::mapping::modelCoverage::processAutoMappedPropertyMappi
let newVisited = $visited->concatenate([^Pair<Class<Any>, String>(first = $property.genericType.rawType->toOne()->cast(@Class<Any>), second = $entityPath)]);
let propertyType = $property.genericType.rawType->toOne()->cast(@Class<Any>);
let children = $propertyType.properties->map(p | $p->processAutoMappedPropertyMapping($entityPath + '_' , $isRootEntity, $config, $newVisited));
let currentMappedEntity = ^MappedEntity(path=$entityPath, properties = $children->map(c|$c.mappedProperties), info = if($config.returnMappedEntityInfo == true, | ^MappedEntityInfo(isRootEntity = $isRootEntity, classPath = $propertyType->elementToPath()), | []));
let currentMappedEntity = ^MappedEntity(path=$entityPath, properties = $children->map(c|$c.mappedProperties), info = if($config.returnMappedEntityInfo == true, | ^MappedEntityInfo(isRootEntity = $isRootEntity, classPath = $propertyType->elementToPath(), class = if($entityPath->startsWith('semi_structured'), | $propertyType, | [])), | []));
^AutoMappedHelperClass(mappedProperties = [$entityMappedProp], mappedEntities=[$currentMappedEntity]->concatenate($children->map(c|$c.mappedEntities)));
);
)
Expand Down
Loading