Skip to content

Mapping attributes teis v40 #1038

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

Open
anagperal wants to merge 5 commits into
base: development
Choose a base branch
from
+87 −26
Open

Mapping attributes teis v40 #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a0329b
Add mapping of attributes in enrollments too
anagperal Oct 20, 2025
6c494b6
Merge branch 'development' into fix/mapping-attributes-teis
anagperal Oct 23, 2025
7fd9dcd
Fix test in v40
anagperal Oct 23, 2025
7908f32
Map enrollment attributes and not attributes
anagperal Oct 23, 2025
d581d03
Add mapAttributes function
anagperal Oct 24, 2025
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
49 changes: 42 additions & 7 deletions src/data/transformations/__tests__/integration/teiTransformations-api.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,48 @@ function setupMockEndpoints(local: Server, remote: Server) {
instances: [],
}));

remote.get("/metadata", async () => ({
categoryOptions: [{ id: "default5" }],
categories: [{ id: "default6" }],
categoryCombos: [{ id: "default7" }],
categoryOptionCombos: [{ id: "default8" }],
dataElements: [{ id: "id2", name: "Test data element 2" }],
}));
remote.get("/metadata", async (_schema, request) => {
if (request.queryParams.filter === "id:in:[program1]") {
return {
programs: [
{
name: "Test program",
id: "program1",
programStages: [
{
programStageDataElements: [
{
dataElement: {
name: "Test data element",
id: "id1",
displayFormName: "Test data element",
},
},
],
},
],
programIndicators: [],
programType: "WITH_REGISTRATION",
programTrackedEntityAttributes: [
{
trackedEntityAttribute: {
id: "attribute1",
},
},
],
},
],
};
} else {
return {
categoryOptions: [{ id: "default5" }],
categories: [{ id: "default6" }],
categoryCombos: [{ id: "default7" }],
categoryOptionCombos: [{ id: "default8" }],
dataElements: [{ id: "id2", name: "Test data element 2" }],
};
}
});

local.get("/dataStore/metadata-synchronization/instances", async () => [
{
Expand Down
2 changes: 1 addition & 1 deletion src/domain/tracked-entity-instances/entities/Enrollment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface Enrollment {
attributes: EnrollmentAttribute[];
}

interface EnrollmentAttribute {
export interface EnrollmentAttribute {
attribute: string;
value: string;
}
62 changes: 44 additions & 18 deletions src/domain/tracked-entity-instances/mapper/teis-payload-mapper/TEIsPayloadMapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { MetadataMappingDictionary } from "../../../mapping/entities/MetadataMap
import { SynchronizationPayload } from "../../../synchronization/entities/SynchronizationPayload";
import { PayloadMapper } from "../../../synchronization/mapper/PayloadMapper";
import { cleanOrgUnitPath } from "../../../synchronization/utils";
import { Enrollment } from "../../entities/Enrollment";
import { Enrollment, EnrollmentAttribute } from "../../entities/Enrollment";
import { Relationship } from "../../entities/Relationship";
import { TEIsPackage } from "../../entities/TEIsPackage";
import { TrakedEntityAttribute } from "../../entities/TrackedEntityAttribute";
Expand All @@ -26,6 +26,22 @@ export class TEIsPayloadMapper implements PayloadMapper {
} = this.mapping;

const mappedOrgUnit = organisationUnits[tei.orgUnit]?.mappedId ?? tei.orgUnit;
const mapAttributes = <T extends TrakedEntityAttribute | EnrollmentAttribute>(attributes: T[]): T[] => {
return attributes.map(att => {
const mappedAttributeId = trackedEntityAttributesToTEI[att.attribute]?.mappedId ?? att.attribute;

const mappedValue = mapOptionValue(att.value, [
trackedEntityAttributesToTEI[att.attribute]?.mapping ?? {},
this.mapping,
]);

return {
...att,
attribute: mappedAttributeId,
value: mappedValue,
};
});
};

return {
...tei,
Expand All @@ -47,6 +63,7 @@ export class TEIsPayloadMapper implements PayloadMapper {

return {
...enrollment,
attributes: mapAttributes(enrollment.attributes),
orgUnit: cleanOrgUnitPath(mappedOrgUnit),
program: mappedProgram,
};
Expand All @@ -59,20 +76,7 @@ export class TEIsPayloadMapper implements PayloadMapper {
relationshipType: mappedRelTypeId,
};
}),
attributes: tei.attributes.map(att => {
const mappedAttributeId = trackedEntityAttributesToTEI[att.attribute]?.mappedId ?? att.attribute;

const mappedValue = mapOptionValue(att.value, [
trackedEntityAttributesToTEI[att.attribute]?.mapping ?? {},
this.mapping,
]);

return {
...att,
attribute: mappedAttributeId,
value: mappedValue,
};
}),
attributes: mapAttributes(tei.attributes),
};
});

Expand All @@ -91,7 +95,18 @@ export class TEIsPayloadMapper implements PayloadMapper {
return {
...tei,
programOwners: tei.programOwners.filter(item => !this.isDisabledProgramOwner(item)),
enrollments: tei.enrollments.filter(item => !this.isDisabledEnrollment(item)),
enrollments: tei.enrollments
.filter(item => !this.isDisabledEnrollment(item))
.map(enrollment => {
const enrollmentAttributes = enrollment.attributes.filter(
itemAttribute => !this.isDisabledTrackedEntityAttribute(itemAttribute)
);

return {
...enrollment,
attributes: enrollmentAttributes,
};
}),
relationships: tei.relationships.filter(item => !this.isDisabledRelationship(item)),
attributes: tei.attributes.filter(item => !this.isDisabledTrackedEntityAttribute(item)),
};
Expand Down Expand Up @@ -130,7 +145,18 @@ export class TEIsPayloadMapper implements PayloadMapper {
programOwners: tei.programOwners.filter(
item => !destinationEventProgramsIds.includes(item.program)
),
enrollments: tei.enrollments.filter(item => !destinationEventProgramsIds.includes(item.program)),
enrollments: tei.enrollments
.filter(item => !destinationEventProgramsIds.includes(item.program))
.map(enrollment => {
const enrollmentAttributes = enrollment.attributes.filter(attr =>
destinationTrackerProgramAttributes.includes(attr.attribute)
);

return {
...enrollment,
attributes: enrollmentAttributes,
};
}),
attributes: tei.attributes.filter(item =>
destinationTrackerProgramAttributes.includes(item.attribute)
),
Expand Down Expand Up @@ -175,7 +201,7 @@ export class TEIsPayloadMapper implements PayloadMapper {
return item.relationshipType === "DISABLED";
}

private isDisabledTrackedEntityAttribute(item: TrakedEntityAttribute): boolean {
private isDisabledTrackedEntityAttribute(item: TrakedEntityAttribute | EnrollmentAttribute): boolean {
return item.attribute === "DISABLED" || item.value === "DISABLED";
}
}