@iapps/d2-web-sdk 1.0.0 → 1.0.1

package/src/lib/modules/tracker/utils/enrollment.util.d.ts

@@ -0,0 +1,17 @@
+import { IEnrollment } from '../models';
+export declare class EnrollmentUtil {
+    static getEnrollments(enrollmentResponse: Record<string, any>[], params: {
+        program: string;
+        trackedEntityType: string;
+    }): IEnrollment[];
+    static sortEnrollments(enrollments: IEnrollment[], sortOrder?: 'DESC' | 'ASC'): IEnrollment[];
+    static getLatestEnrollment(enrollments: IEnrollment[], skipSorting?: boolean): IEnrollment;
+    static setEnrollmentOrgUnit(enrollment: IEnrollment, orgUnit: string): IEnrollment;
+    static generate(options: {
+        date: string;
+        program: string;
+        trackedEntity: string;
+        trackedEntityType: string;
+        orgUnit: string;
+    }): IEnrollment;
+}

package/src/lib/modules/tracker/utils/enrollment.util.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnrollmentUtil = void 0;
+const d2_web_sdk_1 = require("@iapps/d2-web-sdk");
+const models_1 = require("../models");
+class EnrollmentUtil {
+    static getEnrollments(enrollmentResponse, params) {
+        const enrollments = (enrollmentResponse || []).map((enrollment) => {
+            if (params.program) {
+                enrollment['program'] = params.program;
+            }
+            if (params.trackedEntityType) {
+                enrollment['trackedEntityType'] = params.trackedEntityType;
+            }
+            return new models_1.Enrollment(enrollment);
+        });
+        return EnrollmentUtil.sortEnrollments(enrollments);
+    }
+    static sortEnrollments(enrollments, sortOrder = 'DESC') {
+        return (enrollments || []).sort((a, b) => {
+            const dateA = new Date((a === null || a === void 0 ? void 0 : a.enrollmentDate) || (a === null || a === void 0 ? void 0 : a.enrollmentAt));
+            const dateB = new Date((b === null || b === void 0 ? void 0 : b.enrollmentDate) || (b === null || b === void 0 ? void 0 : b.enrollmentAt));
+            switch (sortOrder) {
+                case 'DESC':
+                    return dateB - dateA;
+                case 'ASC':
+                default:
+                    return dateA - dateB;
+            }
+        });
+    }
+    static getLatestEnrollment(enrollments, skipSorting = true) {
+        return ((skipSorting
+            ? enrollments
+            : EnrollmentUtil.sortEnrollments(enrollments)) || [])[0];
+    }
+    static setEnrollmentOrgUnit(enrollment, orgUnit) {
+        return Object.assign(Object.assign({}, enrollment), { orgUnit, orgUnitName: '' });
+    }
+    static generate(options) {
+        const { date, program, trackedEntity, trackedEntityType, orgUnit } = options;
+        return {
+            enrolledAt: date,
+            occurredAt: date,
+            createdAtClient: date,
+            program,
+            lastUpdated: date,
+            orgUnit,
+            trackedEntity,
+            enrollment: (0, d2_web_sdk_1.generateUid)(),
+            trackedEntityType,
+            events: [],
+        };
+    }
+}
+exports.EnrollmentUtil = EnrollmentUtil;
+//# sourceMappingURL=enrollment.util.js.map

package/src/lib/modules/tracker/utils/enrollment.util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"enrollment.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/enrollment.util.ts"],"names":[],"mappings":";;;AAAA,kDAAgD;AAChD,sCAAoD;AAEpD,MAAa,cAAc;IACzB,MAAM,CAAC,cAAc,CACnB,kBAAyC,EACzC,MAAsD;QAEtD,MAAM,WAAW,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAChE,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,UAAU,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;YACzC,CAAC;YAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBAC7B,UAAU,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC;YAC7D,CAAC;YAED,OAAO,IAAI,mBAAU,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC,eAAe,CAAC,WAAkB,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,CAAC,eAAe,CACpB,WAA0B,EAC1B,YAA4B,MAAM;QAElC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE;YACjD,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,MAAI,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,YAAY,CAAA,CAAC,CAAC;YAClE,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,MAAI,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,YAAY,CAAA,CAAC,CAAC;YAElE,QAAQ,SAAS,EAAE,CAAC;gBAClB,KAAK,MAAM;oBACT,OAAO,KAAK,GAAG,KAAK,CAAC;gBACvB,KAAK,KAAK,CAAC;gBACX;oBACE,OAAO,KAAK,GAAG,KAAK,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,mBAAmB,CACxB,WAA0B,EAC1B,WAAW,GAAG,IAAI;QAElB,OAAO,CAAC,CAAC,WAAW;YAClB,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,cAAc,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,UAAuB,EACvB,OAAe;QAEf,uCACK,UAAU,KACb,OAAO,EACP,WAAW,EAAE,EAAE,IACf;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAMf;QACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAChE,OAAO,CAAC;QACV,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,IAAI;YACrB,OAAO;YACP,WAAW,EAAE,IAAI;YACjB,OAAO;YACP,aAAa;YACb,UAAU,EAAE,IAAA,wBAAW,GAAE;YACzB,iBAAiB;YACjB,MAAM,EAAE,EAAE;SACX,CAAC;IACJ,CAAC;CACF;AA/ED,wCA+EC"}

package/src/lib/modules/tracker/utils/event.util.d.ts

@@ -0,0 +1,16 @@
+import { DHIS2Event } from '../models';
+export declare class EventUtil {
+    static getEvents(eventList: Record<string, any>): DHIS2Event[];
+    static sortEvents(eventList: DHIS2Event[], sortOrder?: 'DESC' | 'ASC'): DHIS2Event[];
+    static generateEvent(params: {
+        program: string;
+        programStage: string;
+        orgUnit: string;
+        eventId?: string;
+        enrollment?: string;
+        trackedEntity?: string;
+        eventDate?: string;
+    }): DHIS2Event;
+    static getEventByStage(events: DHIS2Event[], programStage: string): DHIS2Event | undefined;
+    static getEventById(events: DHIS2Event[], eventId: string): DHIS2Event | undefined;
+}

package/src/lib/modules/tracker/utils/event.util.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventUtil = void 0;
+const d2_web_sdk_1 = require("@iapps/d2-web-sdk");
+const models_1 = require("../models");
+class EventUtil {
+    static getEvents(eventList) {
+        return eventList['map']((event) => new models_1.DHIS2Event(event));
+    }
+    static sortEvents(eventList, sortOrder = 'DESC') {
+        return (eventList || []).sort((a, b) => {
+            const dateA = new Date(a.dueDate);
+            const dateB = new Date(b.dueDate);
+            switch (sortOrder) {
+                case 'DESC':
+                    return dateB - dateA;
+                case 'ASC':
+                default:
+                    return dateA - dateB;
+            }
+        });
+    }
+    static generateEvent(params) {
+        return new models_1.DHIS2Event({
+            programStage: params === null || params === void 0 ? void 0 : params.programStage,
+            enrollment: params === null || params === void 0 ? void 0 : params.enrollment,
+            trackedEntity: params === null || params === void 0 ? void 0 : params.trackedEntity,
+            event: (params === null || params === void 0 ? void 0 : params.eventId) || (0, d2_web_sdk_1.generateUid)(),
+            orgUnit: params === null || params === void 0 ? void 0 : params.orgUnit,
+            program: params === null || params === void 0 ? void 0 : params.program,
+            status: 'ACTIVE',
+            eventDate: (params === null || params === void 0 ? void 0 : params.eventDate) || new Date().toISOString(),
+            dataValues: [],
+            dataValueEntities: {},
+        });
+    }
+    static getEventByStage(events, programStage) {
+        return (events || []).find((event) => event.programStage === programStage);
+    }
+    static getEventById(events, eventId) {
+        return (events || []).find((event) => event.event === eventId);
+    }
+}
+exports.EventUtil = EventUtil;
+//# sourceMappingURL=event.util.js.map

package/src/lib/modules/tracker/utils/event.util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"event.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/event.util.ts"],"names":[],"mappings":";;;AAAA,kDAAgD;AAChD,sCAAoD;AAEpD,MAAa,SAAS;IACpB,MAAM,CAAC,SAAS,CAAC,SAA8B;QAC7C,OAAO,SAAS,CAAC,KAAK,CAAC,CACrB,CAAC,KAA0B,EAAE,EAAE,CAAC,IAAI,mBAAU,CAAC,KAAK,CAAC,CACtD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,UAAU,CACf,SAAuB,EACvB,YAA4B,MAAM;QAElC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,OAAc,CAAC,CAAC;YAC9C,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,OAAc,CAAC,CAAC;YAE9C,QAAQ,SAAS,EAAE,CAAC;gBAClB,KAAK,MAAM;oBACT,OAAO,KAAK,GAAG,KAAK,CAAC;gBACvB,KAAK,KAAK,CAAC;gBACX;oBACE,OAAO,KAAK,GAAG,KAAK,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,MAQpB;QACC,OAAO,IAAI,mBAAU,CAAC;YACpB,YAAY,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY;YAClC,UAAU,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU;YAC9B,aAAa,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa;YACpC,KAAK,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,KAAI,IAAA,wBAAW,GAAE;YACvC,OAAO,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO;YACxB,OAAO,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO;YACxB,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,KAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACxD,UAAU,EAAE,EAAE;YACd,iBAAiB,EAAE,EAAE;SACtB,CAAQ,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,eAAe,CACpB,MAAoB,EACpB,YAAoB;QAEpB,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,YAAY,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,CAAC,YAAY,CACjB,MAAoB,EACpB,OAAe;QAEf,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC;IACjE,CAAC;CACF;AA7DD,8BA6DC"}

package/src/lib/modules/tracker/utils/index.d.ts

@@ -0,0 +1,5 @@
+export * from './attribute.util';
+export * from './tracked-entity-instance.util';
+export * from './enrollment.util';
+export * from './tracker-relationship.util';
+export * from './event.util';

package/src/lib/modules/tracker/utils/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./attribute.util"), exports);
+tslib_1.__exportStar(require("./tracked-entity-instance.util"), exports);
+tslib_1.__exportStar(require("./enrollment.util"), exports);
+tslib_1.__exportStar(require("./tracker-relationship.util"), exports);
+tslib_1.__exportStar(require("./event.util"), exports);
+//# sourceMappingURL=index.js.map

package/src/lib/modules/tracker/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,yEAA+C;AAC/C,4DAAkC;AAClC,sEAA4C;AAC5C,uDAA6B"}

package/src/lib/modules/tracker/utils/program-rule.util.d.ts

@@ -0,0 +1,4 @@
+export declare class ProgramRuleUtil {
+    static getProgramRuleActions(attributeObjects: any, programRules: any, programRuleVariables: any): void;
+    static getProgramRuleActionsOnStage(attributeObjects: any, programRules: any, programRuleVariables: any): void;
+}

package/src/lib/modules/tracker/utils/program-rule.util.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProgramRuleUtil = void 0;
+class ProgramRuleUtil {
+    static getProgramRuleActions(attributeObjects, programRules, programRuleVariables) {
+        // return new ProgramRuleEngine(
+        //   attributeObjects,
+        //   programRules,
+        //   programRuleVariables
+        // ).execute();
+    }
+    static getProgramRuleActionsOnStage(attributeObjects, programRules, programRuleVariables) {
+        // return new ProgramRuleEngine(
+        //   attributeObjects,
+        //   programRules,
+        //   programRuleVariables
+        // ).executeOnStage();
+    }
+}
+exports.ProgramRuleUtil = ProgramRuleUtil;
+//# sourceMappingURL=program-rule.util.js.map

package/src/lib/modules/tracker/utils/program-rule.util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"program-rule.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/program-rule.util.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAe;IAC1B,MAAM,CAAC,qBAAqB,CAC1B,gBAAqB,EACrB,YAAiB,EACjB,oBAAyB;QAEzB,gCAAgC;QAChC,sBAAsB;QACtB,kBAAkB;QAClB,yBAAyB;QACzB,eAAe;IACjB,CAAC;IAED,MAAM,CAAC,4BAA4B,CACjC,gBAAqB,EACrB,YAAiB,EACjB,oBAAyB;QAEzB,gCAAgC;QAChC,sBAAsB;QACtB,kBAAkB;QAClB,yBAAyB;QACzB,sBAAsB;IACxB,CAAC;CACF;AAxBD,0CAwBC"}

package/src/lib/modules/tracker/utils/tracked-entity-instance.util.d.ts

@@ -0,0 +1,14 @@
+import { ITrackedEntityInstance } from '../models';
+export declare class TrackedEntityInstanceUtil {
+    static getProgramDateQueryParams(date: string, dateType: string): string | undefined;
+    static getProgramOrgUnitQueryParams(orgUnit: string, ouMode: string): string;
+    static getPagingQueryParams(page: number, pageSize: number, paging: boolean): string;
+    static getAttributeFilterQueryParams(attribute: string, value: string, operator: 'EQ' | 'GT' | 'LT' | 'LIKE' | 'NE'): string | undefined;
+    static getFieldsQueryParams(attributeFields: string, enrollmentFields: string): string;
+    static generate(options: {
+        trackedEntity?: string;
+        trackedEntityType?: string;
+        program?: string;
+        orgUnit: string;
+    }): Partial<ITrackedEntityInstance>;
+}

package/src/lib/modules/tracker/utils/tracked-entity-instance.util.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrackedEntityInstanceUtil = void 0;
+const d2_web_sdk_1 = require("@iapps/d2-web-sdk");
+const enrollment_util_1 = require("./enrollment.util");
+class TrackedEntityInstanceUtil {
+    static getProgramDateQueryParams(date, dateType) {
+        switch (dateType) {
+            case 'START_DATE':
+                return date ? `programStartDate=${date}` : undefined;
+            case 'END_DATE':
+                return date ? `programEndDate=${date}` : undefined;
+            default:
+                return undefined;
+        }
+    }
+    static getProgramOrgUnitQueryParams(orgUnit, ouMode) {
+        return orgUnit ? `ou=${orgUnit}&ouMode=${ouMode || 'SELECTED'}` : '';
+    }
+    static getPagingQueryParams(page, pageSize, paging) {
+        if (!paging) {
+            return 'paging=false';
+        }
+        return `page=${page || 1}&pageSize=${pageSize || 50}&skipPaging=false&totalPages=true`;
+    }
+    static getAttributeFilterQueryParams(attribute, value, operator) {
+        return value ? `filter=${attribute}:${operator}:${value}` : undefined;
+    }
+    static getFieldsQueryParams(attributeFields, enrollmentFields) {
+        return `fields=attributes[${attributeFields}],relationships,enrollments[${enrollmentFields}],orgUnit,trackedEntityInstance`;
+    }
+    static generate(options) {
+        const { trackedEntityType, program, orgUnit, trackedEntity } = options;
+        const date = new Date().toISOString();
+        const trackedEntityId = trackedEntity !== null && trackedEntity !== void 0 ? trackedEntity : (0, d2_web_sdk_1.generateUid)();
+        const initialTrackedEntityInstance = {
+            orgUnit,
+            trackedEntity: trackedEntityId,
+            trackedEntityInstance: trackedEntityId,
+            trackedEntityType,
+            attributes: [],
+        };
+        if (!program) {
+            return initialTrackedEntityInstance;
+        }
+        return Object.assign(Object.assign({}, initialTrackedEntityInstance), { enrollments: [
+                enrollment_util_1.EnrollmentUtil.generate({
+                    date,
+                    program,
+                    trackedEntity: trackedEntityId,
+                    trackedEntityType: trackedEntityType,
+                    orgUnit,
+                }),
+            ] });
+    }
+}
+exports.TrackedEntityInstanceUtil = TrackedEntityInstanceUtil;
+//# sourceMappingURL=tracked-entity-instance.util.js.map

package/src/lib/modules/tracker/utils/tracked-entity-instance.util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracked-entity-instance.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/tracked-entity-instance.util.ts"],"names":[],"mappings":";;;AAAA,kDAAgD;AAEhD,uDAAmD;AAEnD,MAAa,yBAAyB;IACpC,MAAM,CAAC,yBAAyB,CAC9B,IAAY,EACZ,QAAgB;QAEhB,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,YAAY;gBACf,OAAO,IAAI,CAAC,CAAC,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACvD,KAAK,UAAU;gBACb,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACrD;gBACE,OAAO,SAAS,CAAC;QACrB,CAAC;IACH,CAAC;IAED,MAAM,CAAC,4BAA4B,CAAC,OAAe,EAAE,MAAc;QACjE,OAAO,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,WAAW,MAAM,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,IAAY,EACZ,QAAgB,EAChB,MAAe;QAEf,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,OAAO,QAAQ,IAAI,IAAI,CAAC,aACtB,QAAQ,IAAI,EACd,mCAAmC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,6BAA6B,CAClC,SAAiB,EACjB,KAAa,EACb,QAA4C;QAE5C,OAAO,KAAK,CAAC,CAAC,CAAC,UAAU,SAAS,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,oBAAoB,CACzB,eAAuB,EACvB,gBAAwB;QAExB,OAAO,qBAAqB,eAAe,+BAA+B,gBAAgB,iCAAiC,CAAC;IAC9H,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAKf;QACC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;QACvE,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,eAAe,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,IAAA,wBAAW,GAAE,CAAC;QAEvD,MAAM,4BAA4B,GAAG;YACnC,OAAO;YACP,aAAa,EAAE,eAAe;YAC9B,qBAAqB,EAAE,eAAe;YACtC,iBAAiB;YACjB,UAAU,EAAE,EAAE;SACf,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,4BAA4B,CAAC;QACtC,CAAC;QAED,uCACK,4BAA4B,KAC/B,WAAW,EAAE;gBACX,gCAAc,CAAC,QAAQ,CAAC;oBACtB,IAAI;oBACJ,OAAO;oBACP,aAAa,EAAE,eAAe;oBAC9B,iBAAiB,EAAE,iBAAwB;oBAC3C,OAAO;iBACR,CAAC;aACH,IACD;IACJ,CAAC;CACF;AAlFD,8DAkFC"}

package/src/lib/modules/tracker/utils/tracker-relationship.util.d.ts

@@ -0,0 +1,4 @@
+import { TrackerRelationship } from '../models';
+export declare class TrackerRelationshipUtil {
+    static getRelationships(relationshipResponses: Record<string, any>[], currentTrackedEntityInstance: string): TrackerRelationship[];
+}

package/src/lib/modules/tracker/utils/tracker-relationship.util.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrackerRelationshipUtil = void 0;
+const models_1 = require("../models");
+class TrackerRelationshipUtil {
+    static getRelationships(relationshipResponses, currentTrackedEntityInstance) {
+        return relationshipResponses.map((relation) => new models_1.TrackerRelationship(relation, currentTrackedEntityInstance));
+    }
+}
+exports.TrackerRelationshipUtil = TrackerRelationshipUtil;
+//# sourceMappingURL=tracker-relationship.util.js.map

package/src/lib/modules/tracker/utils/tracker-relationship.util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracker-relationship.util.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/utils/tracker-relationship.util.ts"],"names":[],"mappings":";;;AAAA,sCAAgD;AAEhD,MAAa,uBAAuB;IAClC,MAAM,CAAC,gBAAgB,CACrB,qBAA4C,EAC5C,4BAAoC;QAEpC,OAAO,qBAAqB,CAAC,GAAG,CAC9B,CAAC,QAAQ,EAAE,EAAE,CACX,IAAI,4BAAmB,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAClE,CAAC;IACJ,CAAC;CACF;AAVD,0DAUC"}

package/src/lib/shared/index.d.ts

@@ -1,3 +1,3 @@
 export * from './models';
 export * from './queries';
-export * from './decorators';
+export * from './utils';

package/src/lib/shared/index.js

@@ -6,5 +6,5 @@ const tslib_1 = require("tslib");
 // license that can be found in the LICENSE file.
 tslib_1.__exportStar(require("./models"), exports);
 tslib_1.__exportStar(require("./queries"), exports);
-tslib_1.__exportStar(require("./decorators"), exports);
+tslib_1.__exportStar(require("./utils"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/shared/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/dhis2-web-sdk/src/lib/shared/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,mDAAyB;AACzB,oDAA0B;AAC1B,uDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/dhis2-web-sdk/src/lib/shared/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,mDAAyB;AACzB,oDAA0B;AAC1B,kDAAwB"}

package/src/lib/shared/models/base.model.d.ts

@@ -4,5 +4,4 @@ export declare class IBaseSDKModel {
 export declare class BaseSDKModel<T extends IBaseSDKModel> {
     [attribute: string]: unknown;
     constructor(model: Partial<T>);
-    static getProperties(): any;
 }

package/src/lib/shared/models/base.model.js

@@ -8,15 +8,11 @@ class IBaseSDKModel {
 }
 exports.IBaseSDKModel = IBaseSDKModel;
 class BaseSDKModel {
-    // #propertyMetadata: Record<string, unknown>;
     constructor(model) {
         Object.keys(model).forEach((key) => {
             this[key] = model[key];
         });
     }
-    static getProperties() {
-        return this._propertyMetadata;
-    }
 }
 exports.BaseSDKModel = BaseSDKModel;
 //# sourceMappingURL=base.model.js.map

package/src/lib/shared/models/base.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/base.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,MAAa,aAAa;CAEzB;AAFD,sCAEC;AAED,MAAa,YAAY;IAEvB,8CAA8C;IAC9C,YAAY,KAAiB;QAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,aAAa;QAClB,OAAQ,IAAY,CAAC,iBAAiB,CAAC;IACzC,CAAC;CACF;AAZD,oCAYC"}
+{"version":3,"file":"base.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/base.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,MAAa,aAAa;CAEzB;AAFD,sCAEC;AAED,MAAa,YAAY;IAEvB,YAAY,KAAiB;QAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAPD,oCAOC"}

package/src/lib/shared/models/d2-response.model.js

@@ -21,9 +21,11 @@ class D2Response {
         return new pager_model_1.Pager(data['pager']);
     }
     getData(dataResponse, model) {
-        const data = dataResponse[model.resourceName];
-        if (!data && (0, lodash_1.isPlainObject)(dataResponse)) {
-            return new model(dataResponse);
+        const data = (0, lodash_1.isPlainObject)(dataResponse)
+            ? dataResponse[model.resourceName] || dataResponse
+            : dataResponse;
+        if ((0, lodash_1.isPlainObject)(data)) {
+            return new model(data);
         }
         return (0, lodash_1.isArray)(data)
             ? data.map((dataItem) => new model(dataItem))

package/src/lib/shared/models/d2-response.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"d2-response.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/d2-response.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,mCAAgD;AAMhD,+CAAsC;AAEtC,MAAa,UAAU;IAKrB,YAAY,QAAwB,EAAE,KAAwB;QAC5D,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QAE9C,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACpD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,aAAa,CAAC,IAA6B;QACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,mBAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,CAAC,YAAqC,EAAE,KAAwB;QACrE,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAE9C,IAAI,CAAC,IAAI,IAAI,IAAA,sBAAa,EAAC,YAAY,CAAC,EAAE,CAAC;YACzC,OAAO,IAAK,KAAa,CAAC,YAAY,CAAC,CAAC;QAC1C,CAAC;QAED,OAAO,IAAA,gBAAO,EAAC,IAAI,CAAC;YAClB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAK,KAAa,CAAC,QAAQ,CAAC,CAAC;YACtD,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;CACF;AAjCD,gCAiCC"}
+{"version":3,"file":"d2-response.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/d2-response.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,mCAAgD;AAMhD,+CAAsC;AAEtC,MAAa,UAAU;IAKrB,YAAY,QAAwB,EAAE,KAAwB;QAC5D,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QAE9C,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACpD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,aAAa,CAAC,IAA6B;QACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,mBAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,CAAC,YAAqC,EAAE,KAAwB;QACrE,MAAM,IAAI,GAAG,IAAA,sBAAa,EAAC,YAAY,CAAC;YACtC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,YAAY;YAClD,CAAC,CAAC,YAAY,CAAC;QAEjB,IAAI,IAAA,sBAAa,EAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,IAAK,KAAa,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,IAAA,gBAAO,EAAC,IAAI,CAAC;YAClB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAK,KAAa,CAAC,QAAQ,CAAC,CAAC;YACtD,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;CACF;AAnCD,gCAmCC"}

package/src/lib/shared/models/d2-web-config.model.d.ts

@@ -1,6 +1,6 @@
 import { AxiosDefaults } from 'axios';
 export declare class D2WebConfig {
-    baseUrl: string;
+    baseUrl?: string;
     locale?: string;
     httpClientConfig?: Partial<AxiosDefaults>;
     constructor(config: Partial<D2WebConfig>);

package/src/lib/shared/models/http-client.model.d.ts

@@ -4,4 +4,5 @@ export declare class D2HttpClient {
     #private;
     constructor(config: AxiosDefaults);
     get(url: string): Promise<D2HttpResponse>;
+    post(url: string, data: Record<string, unknown>): Promise<D2HttpResponse>;
 }

package/src/lib/shared/models/http-client.model.js

@@ -16,7 +16,18 @@ class D2HttpClient {
     get(url) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
-                const response = yield tslib_1.__classPrivateFieldGet(this, _D2HttpClient_axiosInstance, "f").get(`api/${url}`);
+                const response = yield tslib_1.__classPrivateFieldGet(this, _D2HttpClient_axiosInstance, "f").get(`../../../api/${url}`);
+                return new http_response_model_1.D2HttpResponse(response);
+            }
+            catch (error) {
+                return new http_response_model_1.D2HttpResponse(error);
+            }
+        });
+    }
+    post(url, data) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const response = yield tslib_1.__classPrivateFieldGet(this, _D2HttpClient_axiosInstance, "f").post(`../../../api/${url}`, data);
                 return new http_response_model_1.D2HttpResponse(response);
             }
             catch (error) {

package/src/lib/shared/models/http-client.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-client.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/http-client.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAEjD,0DAA4D;AAC5D,+DAAuD;AAEvD,MAAa,YAAY;IAGvB,YAAY,MAAqB;QAFjC,8CAA+B;QAG7B,+BAAA,IAAI,+BAAkB,eAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAA,CAAC;IAC7C,CAAC;IAEK,GAAG,CAAC,GAAW;;YACnB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,+BAAA,IAAI,mCAAe,CAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;gBAE7D,OAAO,IAAI,oCAAc,CAAC,QAA8C,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,oCAAc,CAAC,KAA2C,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;KAAA;CACF;AAhBD,oCAgBC"}
+{"version":3,"file":"http-client.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/http-client.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAEjD,0DAA4D;AAC5D,+DAAuD;AAEvD,MAAa,YAAY;IAGvB,YAAY,MAAqB;QAFjC,8CAA+B;QAG7B,+BAAA,IAAI,+BAAkB,eAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAA,CAAC;IAC7C,CAAC;IAEK,GAAG,CAAC,GAAW;;YACnB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,+BAAA,IAAI,mCAAe,CAAC,GAAG,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;gBAEtE,OAAO,IAAI,oCAAc,CAAC,QAA8C,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,oCAAc,CAAC,KAA2C,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;KAAA;IAEK,IAAI,CACR,GAAW,EACX,IAA6B;;YAE7B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,+BAAA,IAAI,mCAAe,CAAC,IAAI,CAC7C,gBAAgB,GAAG,EAAE,EACrB,IAAI,CACL,CAAC;gBAEF,OAAO,IAAI,oCAAc,CAAC,QAA8C,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,oCAAc,CAAC,KAA2C,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;KAAA;CACF;AAhCD,oCAgCC"}

package/src/lib/shared/models/http-response.model.d.ts

@@ -3,6 +3,7 @@ export declare class D2HttpResponseStatus extends BaseSDKModel<D2HttpResponseSta
     status: number;
     statusText: string;
     message?: any;
+    get isSuccess(): boolean;
 }
 export declare class D2HttpResponse {
     data?: Record<string, unknown>;

package/src/lib/shared/models/http-response.model.js

@@ -7,6 +7,9 @@ exports.D2HttpResponse = exports.D2HttpResponseStatus = void 0;
 const axios_1 = require("axios");
 const base_model_1 = require("./base.model");
 class D2HttpResponseStatus extends base_model_1.BaseSDKModel {
+    get isSuccess() {
+        return this.status >= 200 && this.status < 300;
+    }
 }
 exports.D2HttpResponseStatus = D2HttpResponseStatus;
 class D2HttpResponse {

package/src/lib/shared/models/http-response.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-response.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/http-response.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iCAAmC;AACnC,6CAA4C;AAE5C,MAAa,oBAAqB,SAAQ,yBAAkC;CAI3E;AAJD,oDAIC;AAED,MAAa,cAAc;IAIzB,YAAY,QAAiC;;QAC3C,IAAI,QAAQ,YAAY,kBAAU,EAAE,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,oBAAoB,CAAC;gBAC7C,MAAM,EAAE,QAAQ,CAAC,MAAM,KAAI,MAAA,QAAQ,CAAC,QAAQ,0CAAE,MAAM,CAAA;gBACpD,UAAU,EAAE,CAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,UAAU,KAAI,QAAQ,CAAC,OAAO;gBAC7D,OAAO,EAAE,CAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,IAAI,KAAI,QAAQ,CAAC,OAAO;aACrD,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAA4B,CAAC;YACxD,IAAI,CAAC,cAAc,GAAG,IAAI,oBAAoB,CAAC;gBAC7C,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAW;gBACpC,UAAU,EAAE,QAAQ,CAAC,YAAY,CAAW;aAC7C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAnBD,wCAmBC"}
+{"version":3,"file":"http-response.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/http-response.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iCAAmC;AACnC,6CAA4C;AAE5C,MAAa,oBAAqB,SAAQ,yBAAkC;IAK1E,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;IACjD,CAAC;CACF;AARD,oDAQC;AAED,MAAa,cAAc;IAIzB,YAAY,QAAiC;;QAC3C,IAAI,QAAQ,YAAY,kBAAU,EAAE,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,oBAAoB,CAAC;gBAC7C,MAAM,EAAE,QAAQ,CAAC,MAAM,KAAI,MAAA,QAAQ,CAAC,QAAQ,0CAAE,MAAM,CAAA;gBACpD,UAAU,EAAE,CAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,UAAU,KAAI,QAAQ,CAAC,OAAO;gBAC7D,OAAO,EAAE,CAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,IAAI,KAAI,QAAQ,CAAC,OAAO;aACrD,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAA4B,CAAC;YACxD,IAAI,CAAC,cAAc,GAAG,IAAI,oBAAoB,CAAC;gBAC7C,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAW;gBACpC,UAAU,EAAE,QAAQ,CAAC,YAAY,CAAW;aAC7C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAnBD,wCAmBC"}

package/src/lib/shared/models/index.d.ts

@@ -9,3 +9,5 @@ export * from './http-client.model';
 export * from './pager.model';
 export * from './d2-response.model';
 export * from './relationship-direction.model';
+export * from './http-response.model';
+export * from './http-client-config.model';

package/src/lib/shared/models/index.js

@@ -15,4 +15,6 @@ tslib_1.__exportStar(require("./http-client.model"), exports);
 tslib_1.__exportStar(require("./pager.model"), exports);
 tslib_1.__exportStar(require("./d2-response.model"), exports);
 tslib_1.__exportStar(require("./relationship-direction.model"), exports);
+tslib_1.__exportStar(require("./http-response.model"), exports);
+tslib_1.__exportStar(require("./http-client-config.model"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/shared/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,sEAA4C;AAC5C,+DAAqC;AACrC,kEAAwC;AACxC,wDAA8B;AAC9B,uDAA6B;AAC7B,oEAA0C;AAC1C,gEAAsC;AACtC,8DAAoC;AACpC,wDAA8B;AAC9B,8DAAoC;AACpC,yEAA+C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,sEAA4C;AAC5C,+DAAqC;AACrC,kEAAwC;AACxC,wDAA8B;AAC9B,uDAA6B;AAC7B,oEAA0C;AAC1C,gEAAsC;AACtC,8DAAoC;AACpC,wDAA8B;AAC9B,8DAAoC;AACpC,yEAA+C;AAC/C,gEAAsC;AACtC,qEAA2C"}

package/src/lib/shared/queries/base-query.d.ts

@@ -1,14 +1,24 @@
-import { BaseIdentifiable, D2HttpClient, D2Response, IBaseIdentifiable, Pager, QueryFilter, RelationshipDirection } from '../models';
+import { BaseIdentifiable, D2HttpClient, D2Response, IBaseIdentifiable, JunctionOperator, Pager, QueryFilter, QueryModel, RelationshipDirection } from '../models';
 export declare class BaseQuery<T extends BaseIdentifiable, U> {
-    #private;
     protected identifiable: IBaseIdentifiable;
     protected httpClient: D2HttpClient;
     filters: QueryFilter[];
+    id?: string;
     fields: U[];
+    resourceName: string;
+    singularResourceName: string;
+    pagination: Pager;
+    junctionOperator?: JunctionOperator;
     constructor(identifiable: IBaseIdentifiable, httpClient: D2HttpClient);
-    select(fields: U[]): BaseQuery<T, U>;
-    paginate(pagination: Pager): BaseQuery<T, U>;
-    byId(id: string): BaseQuery<T, U>;
+    select(fields: U[]): this;
+    paginate(pagination: Pager): this;
+    byId(id: string): this;
+    where(params: {
+        attribute: U;
+        value: string;
+    }): this;
     with(modelQuery: BaseQuery<any, any>, relationshipDirection?: RelationshipDirection): this;
+    query(): QueryModel<U>;
+    dhisUrl(): string;
     get(): Promise<D2Response<T>>;
 }

package/src/lib/shared/queries/base-query.js

@@ -2,7 +2,6 @@
 // Copyright 2024 UDSM DHIS2 Lab. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-var _BaseQuery_instances, _BaseQuery_id, _BaseQuery_resourceName, _BaseQuery_singularResourceName, _BaseQuery_pagination, _BaseQuery_junctionOperator, _BaseQuery_query, _BaseQuery_dhisUrl;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseQuery = void 0;
 const tslib_1 = require("tslib");
@@ -10,61 +9,68 @@ const models_1 = require("../models");
 const utils_1 = require("../utils");
 class BaseQuery {
     constructor(identifiable, httpClient) {
-        _BaseQuery_instances.add(this);
         this.identifiable = identifiable;
         this.httpClient = httpClient;
         this.filters = [];
-        _BaseQuery_id.set(this, void 0);
-        _BaseQuery_resourceName.set(this, void 0);
-        _BaseQuery_singularResourceName.set(this, void 0);
-        _BaseQuery_pagination.set(this, new models_1.Pager());
-        _BaseQuery_junctionOperator.set(this, void 0);
+        this.pagination = new models_1.Pager();
         this.fields = identifiable.fields;
-        tslib_1.__classPrivateFieldSet(this, _BaseQuery_resourceName, identifiable.resourceName, "f");
-        tslib_1.__classPrivateFieldSet(this, _BaseQuery_singularResourceName, identifiable.singularResourceName, "f");
+        this.resourceName = identifiable.resourceName;
+        this.singularResourceName = identifiable.singularResourceName;
     }
     select(fields) {
         this.fields = fields;
         return this;
     }
     paginate(pagination) {
-        tslib_1.__classPrivateFieldSet(this, _BaseQuery_pagination, pagination, "f");
+        this.pagination = pagination;
         return this;
     }
     byId(id) {
-        tslib_1.__classPrivateFieldSet(this, _BaseQuery_id, id, "f");
+        this.id = id;
         this.filters = [];
         return this;
     }
+    where(params) {
+        this.filters = [
+            ...this.filters,
+            new models_1.QueryFilter({
+                attribute: params.attribute,
+                value: params.value,
+                condition: models_1.QueryCondition.Equal,
+            }),
+        ];
+        return this;
+    }
     with(modelQuery, relationshipDirection = 'ToMany') {
         var _a;
         // TODO: This currently suport one to many, find ways to support man to one
         this.fields = [
             ...this.fields,
             `${relationshipDirection === 'ToMany'
-                ? tslib_1.__classPrivateFieldGet(modelQuery, _BaseQuery_resourceName, "f")
-                : tslib_1.__classPrivateFieldGet(modelQuery, _BaseQuery_singularResourceName, "f")}[${(_a = modelQuery.fields) === null || _a === void 0 ? void 0 : _a.join(',')}]`,
+                ? modelQuery.resourceName
+                : modelQuery.singularResourceName}[${(_a = modelQuery.fields) === null || _a === void 0 ? void 0 : _a.join(',')}]`,
         ];
         return this;
     }
+    query() {
+        return new models_1.QueryModel({
+            resourceName: this.identifiable.resourceName,
+            id: this.id,
+            fields: this.fields,
+            filters: this.filters,
+            pagination: this.pagination,
+            junctionOperator: this.junctionOperator,
+        });
+    }
+    dhisUrl() {
+        return utils_1.DhisUrlGenerator.generate(this.query());
+    }
     get() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const response = yield this.httpClient.get(tslib_1.__classPrivateFieldGet(this, _BaseQuery_instances, "m", _BaseQuery_dhisUrl).call(this));
+            const response = yield this.httpClient.get(this.dhisUrl());
             return new models_1.D2Response(response, this.identifiable);
         });
     }
 }
 exports.BaseQuery = BaseQuery;
-_BaseQuery_id = new WeakMap(), _BaseQuery_resourceName = new WeakMap(), _BaseQuery_singularResourceName = new WeakMap(), _BaseQuery_pagination = new WeakMap(), _BaseQuery_junctionOperator = new WeakMap(), _BaseQuery_instances = new WeakSet(), _BaseQuery_query = function _BaseQuery_query() {
-    return new models_1.QueryModel({
-        resourceName: this.identifiable.resourceName,
-        id: tslib_1.__classPrivateFieldGet(this, _BaseQuery_id, "f"),
-        fields: this.fields,
-        filters: this.filters,
-        pagination: tslib_1.__classPrivateFieldGet(this, _BaseQuery_pagination, "f"),
-        junctionOperator: tslib_1.__classPrivateFieldGet(this, _BaseQuery_junctionOperator, "f"),
-    });
-}, _BaseQuery_dhisUrl = function _BaseQuery_dhisUrl() {
-    return utils_1.DhisUrlGenerator.generate(tslib_1.__classPrivateFieldGet(this, _BaseQuery_instances, "m", _BaseQuery_query).call(this));
-};
 //# sourceMappingURL=base-query.js.map