Merge pull request #54 from EyeSeeTea/fix/datastore-cache

remove datastore cache
EyeSeeTea · Jun 3, 2024 · 14b0a92 · 14b0a92
2 parents af5e09a + 14f92ad
commit 14b0a92
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/src/data/common/Dhis2DataElement.ts b/src/data/common/Dhis2DataElement.ts
@@ -8,8 +8,8 @@ import { Dhis2DataStoreDataForm } from "./Dhis2DataStoreDataForm";
 export class Dhis2DataElement {
     constructor(private api: D2Api) {}
 
-    async get(ids: Id[]): Promise<Record<Id, DataElement>> {
-        const config = await Dhis2DataStoreDataForm.build(this.api);
+    async get(ids: Id[], dataSetCode: string): Promise<Record<Id, DataElement>> {
+        const config = await Dhis2DataStoreDataForm.build(this.api, dataSetCode);
         const idGroups = _(ids).uniq().chunk(100).value();
 
         const resList = await promiseMap(idGroups, idsGroup =>

diff --git a/src/data/common/Dhis2DataFormRepository.ts b/src/data/common/Dhis2DataFormRepository.ts
@@ -81,7 +81,7 @@ export class Dhis2DataFormRepository implements DataFormRepository {
             .map(dataElement => ({ id: dataElement.id, code: dataElement.code }))
             .value();
 
-        const dataElements = await new Dhis2DataElement(this.api).get(dataElementIds);
+        const dataElements = await new Dhis2DataElement(this.api).get(dataElementIds, dataSet.code);
 
         const dataElementsRulesConfig = this.buildRulesFromConfig(dataElements, configDataForm, allDataElements);
         return dataSet.sections.map((section): Section => {

diff --git a/src/data/common/Dhis2DataStoreDataForm.ts b/src/data/common/Dhis2DataStoreDataForm.ts
@@ -314,10 +314,16 @@ export class Dhis2DataStoreDataForm {
     }
 
     static async build(api: D2Api, dataSetCode?: string): Promise<Dhis2DataStoreDataForm> {
-        if (cachedStore) return cachedStore;
-
         const dataStore = api.dataStore(Namespaces.D2_AUTOGEN_FORMS);
-        if (!dataSetCode) throw Error(`Unable to load configuration: dataSetCode not defined`);
+        if (!dataSetCode) {
+            console.warn(`Unable to load configuration: dataSetCode not defined`);
+            return new Dhis2DataStoreDataForm({
+                optionSets: [],
+                constants: [],
+                custom: defaultDataStoreConfig,
+                subNationals: [],
+            });
+        }
         const storeValue = await dataStore.get<object>(dataSetCode).getData();
         if (!storeValue)
             return new Dhis2DataStoreDataForm({
@@ -350,8 +356,7 @@ export class Dhis2DataStoreDataForm {
             },
         });
 
-        cachedStore = new Dhis2DataStoreDataForm(config);
-        return cachedStore;
+        return new Dhis2DataStoreDataForm(config);
     }
 
     private static async getOptionSets(api: D2Api, storeConfig: DataFormStoreConfig["custom"]): Promise<OptionSet[]> {
@@ -651,8 +656,6 @@ interface Constant {
     displayDescription: string;
 }
 
-let cachedStore: Dhis2DataStoreDataForm | undefined;
-
 function sectionConfig<T extends Record<string, Codec<any>>>(properties: T) {
     return optional(record(string, Codec.interface(properties)));
 }

diff --git a/src/data/common/Dhis2DataValueRepository.ts b/src/data/common/Dhis2DataValueRepository.ts
@@ -27,7 +27,17 @@ export class Dhis2DataValueRepository implements DataValueRepository {
             })
             .getData();
 
-        const dataElements = await this.getDataElements(dataValues);
+        const dataSetResponse = await this.api.models.dataSets
+            .get({
+                fields: { id: true, code: true },
+                filter: { id: { eq: options.dataSetId } },
+            })
+            .getData();
+
+        const dataSetCode = dataSetResponse.objects[0]?.code;
+        if (!dataSetCode) throw new Error(`Data set not found: ${options.dataSetId}`);
+
+        const dataElements = await this.getDataElements(dataValues, dataSetCode);
 
         const dataValuesFiles = await this.getFileResourcesMapping(dataElements, dataValues);
 
@@ -161,9 +171,9 @@ export class Dhis2DataValueRepository implements DataValueRepository {
         );
     }
 
-    private async getDataElements(dataValues: DataValueSetsDataValue[]) {
+    private async getDataElements(dataValues: DataValueSetsDataValue[], dataSetCode: string) {
         const dataElementIds = dataValues.map(dv => dv.dataElement);
-        return new Dhis2DataElement(this.api).get(dataElementIds);
+        return new Dhis2DataElement(this.api).get(dataElementIds, dataSetCode);
     }
 
     async save(dataValue: DataValue): Promise<DataValue> {