Skip to content

Commit

Permalink
Merge pull request #265 from EyeSeeTea/fix/414-relationships-query
Browse files Browse the repository at this point in the history
  • Loading branch information
SferaDev authored Feb 16, 2022
2 parents 90c4eaf + 1fc0ba9 commit eb939b6
Showing 1 changed file with 20 additions and 8 deletions.
28 changes: 20 additions & 8 deletions src/data/Dhis2RelationshipTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -253,17 +253,29 @@ async function getConstraintForTypeTei(
fields: "trackedEntityInstance",
} as const;

const { trackedEntityInstances: firstPage, pager } = await api.trackedEntityInstances.get(query).getData();
const pages = _.range(2, pager.pageCount + 1);
const results = await promiseMap(_.chunk(query.ou, 250), async ouChunk => {
const filterQuery =
query.ouMode === "SELECTED" || query.ouMode === "CHILDREN" || query.ouMode === "DESCENDANTS"
? { ...query, ou: ouChunk }
: query;

const { trackedEntityInstances: firstPage, pager } = await api.trackedEntityInstances
.get(filterQuery)
.getData();

const pages = _.range(2, pager.pageCount + 1);
const otherPages = await promiseMap(pages, async page => {
const { trackedEntityInstances } = await api.trackedEntityInstances.get({ ...filterQuery, page }).getData();
return trackedEntityInstances;
});

const otherPages = await promiseMap(pages, async page => {
const { trackedEntityInstances } = await api.trackedEntityInstances.get({ ...query, page }).getData();
return trackedEntityInstances;
return [...firstPage, ..._.flatten(otherPages)];
});

const trackedEntityInstances = [...firstPage, ..._.flatten(otherPages)].map(
({ trackedEntityInstance, ...rest }) => ({ ...rest, id: trackedEntityInstance })
);
const trackedEntityInstances = _.flatten(results).map(({ trackedEntityInstance, ...rest }) => ({
...rest,
id: trackedEntityInstance,
}));

const teis = _.sortBy(trackedEntityInstances, tei => tei.id.toLowerCase());
const name = trackedEntityTypesById[constraint.trackedEntityType.id]?.name ?? "Unknown";
Expand Down

0 comments on commit eb939b6

Please sign in to comment.