fix: Stringify option set codes

dev-otta · Jul 31, 2024 · 30a3b16 · 30a3b16
1 parent 36b925e
commit 30a3b16
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/src/utils/DataFetching/Sorting/useMappedTrackedEntity.ts b/src/utils/DataFetching/Sorting/useMappedTrackedEntity.ts
@@ -7,11 +7,12 @@ interface Attribute {
 }
 
 export interface MappedEntityValues {
-    [key: string]: string | undefined;
     dateOfBirth: string | undefined;
     gender: string | undefined;
     firstName: string | undefined;
     lastName: string | undefined;
+
+    [key: string]: string | undefined;
 }
 
 interface UseMappedTrackedEntityVariablesProps {
@@ -36,23 +37,24 @@ export const useMappedTrackedEntityVariables = ({
         return mappedValues;
     }
 
-    return Object.entries(variableMappings).reduce((acc, [key, attributeId]) => {
-        const attribute = trackedEntityAttributes.find((attr: Attribute) => attr.attribute === attributeId);
-        if (attribute) {
-            const value = trackedEntity.attributes.find((attr: Attribute) => attr.attribute === attributeId)?.value;
-            if (value !== undefined && value !== null) {
-                if (key === 'gender') {
-                    if (value === variableMappings.femaleOptionCode) {
-                        acc.gender = GenderCodes.CGC_Female;
-                    }
-                    if (value === variableMappings.maleOptionCode) {
-                        acc.gender = GenderCodes.CGC_Male;
+    return Object.entries(variableMappings)
+        .reduce((acc, [key, attributeId]) => {
+            const attribute = trackedEntityAttributes.find((attr: Attribute) => attr.attribute === attributeId);
+            if (attribute) {
+                const value = trackedEntity.attributes.find((attr: Attribute) => attr.attribute === attributeId)?.value;
+                if (value !== undefined && value !== null) {
+                    if (key === 'gender') {
+                        if (value === String(variableMappings.femaleOptionCode)) {
+                            acc.gender = GenderCodes.CGC_Female;
+                        }
+                        if (value === String(variableMappings.maleOptionCode)) {
+                            acc.gender = GenderCodes.CGC_Male;
+                        }
+                        return acc;
                     }
-                    return acc;
+                    acc[key] = value;
                 }
-                acc[key] = value;
             }
-        }
-        return acc;
-    }, mappedValues);
+            return acc;
+        }, mappedValues);
 };