Skip to content

Rm reference name lookup, use IDs unless source mapping does not exist #147

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
5PK merged 5 commits into from
May 29, 2026
Merged

Rm reference name lookup, use IDs unless source mapping does not exist #147

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b08e78
Rm reference name lookup, use IDs unless source mapping does not exist
5PK May 28, 2026
2c0de05
use !! to solve issue with boolean condition
5PK May 28, 2026
6a56af1
fix logic for looking up target model reference
jules-exel May 28, 2026
35e3f94
Merge branch 'main' of github.com:agility/agility-cli into fix/model-…
5PK May 29, 2026
3746bfa
make sure to use reference model for mapping default models
5PK May 29, 2026
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
16 changes: 12 additions & 4 deletions src/lib/pushers/model-pusher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ export async function pushModels(sourceData: mgmtApi.Model[], targetData: mgmtAp
}

const sourceMapping = referenceMapper.getModelMappingByID(sourceModel.id, "source");
const targetModel =
targetData.find((targetModel) => targetModel.referenceName === sourceModel.referenceName) || null;

let targetModel: mgmtApi.Model = null;

if (sourceMapping) {
targetModel = targetData.find((targetModel) => targetModel.id === sourceMapping.targetID) || null;
}

const modelLastModifiedDate = new Date(sourceModel.lastModifiedDate);
const targetLastModifiedDate = targetModel ? new Date(targetModel.lastModifiedDate) : null;
Expand All @@ -68,17 +72,21 @@ export async function pushModels(sourceData: mgmtApi.Model[], targetData: mgmtAp

// Handle models that exist in target but have no mapping
// This ensures downstream containers can find their model mappings
const existsInTargetWithoutMapping = !sourceMapping && targetModel;
const targetModelByReference = targetData.find(
(targetModel) => targetModel.referenceName === sourceModel.referenceName,
);
const existsInTargetWithoutMapping = !sourceMapping && targetModelByReference;
if (existsInTargetWithoutMapping) {
const includesDefault = modelDefaults.includes(sourceModel.referenceName.toLowerCase());

if (includesDefault) {
// Create the mapping for existing target models (ensures containers can reference them)
referenceMapper.addMapping(sourceModel, targetModel);
referenceMapper.addMapping(sourceModel, targetModelByReference);
// Add to skip list since model already exists and is up to date
shouldSkip.push({ model: sourceModel, reason: "Skipping and adding default Agility mappings." });
continue; // Skip remaining conditions - mapping is now created, no further action needed
} else {
targetModel = targetModelByReference;
const targetMapping = targetModel.id ? referenceMapper.getModelMappingByID(targetModel.id, "target") : null;
if (targetMapping && targetMapping.sourceID !== sourceModel.id) {
logger.model.error(
Expand Down
Loading