Merge pull request #5945 from beyondessential/dev

merge: update branch with latest dev
beyondessential · Oct 6, 2024 · 2dadd6e · 2dadd6e
2 parents 8bbf44b + 60ce162
commit 2dadd6e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/packages/admin-panel/src/importExport/ExportButton.jsx b/packages/admin-panel/src/importExport/ExportButton.jsx
@@ -41,7 +41,7 @@ export const ExportButton = ({ actionConfig, row }) => {
         await api.download(
           endpoint,
           { queryParameters, ...extraQueryParameters },
-          processedFileName,
+          `${processedFileName}.json`,
         );
       }}
     >

diff --git a/packages/central-server/src/apiV2/import/importEntities/updateCountryEntities.js b/packages/central-server/src/apiV2/import/importEntities/updateCountryEntities.js
@@ -92,6 +92,7 @@ export async function updateCountryEntities(
     countryCode,
     pushToDhis,
   );
+
   await transactingModels.entity.findOrCreate(
     { code: countryCode },
     {
@@ -103,6 +104,7 @@ export async function updateCountryEntities(
     },
   );
   const codes = []; // An array to hold all facility codes, allowing duplicate checking
+
   for (let i = 0; i < entityObjects.length; i++) {
     const entityObject = entityObjects[i];
     const { entity_type: entityType } = entityObject;
@@ -192,7 +194,27 @@ export async function updateCountryEntities(
         geojson.type === 'Polygon'
           ? { type: 'MultiPolygon', coordinates: [geojson.coordinates] }
           : geojson;
-      await transactingModels.entity.updateRegionCoordinates(code, translatedGeojson);
+
+      try {
+        await transactingModels.entity.updateRegionCoordinates(code, translatedGeojson);
+      } catch (error) {
+        if (error.message.includes('payload string too long')) {
+          const largeGeoEntities = entityObjects.filter(entityObject => {
+            if (!entityObject?.geojson) return false;
+            const geoJsonString = JSON.stringify(entityObject.geojson);
+            // If the geo json is too large, we will hit the max payload size limit.
+            // Hard postgres max is 8000 characters, but we need to account for other data in the query payload
+            const maxGeoJsonPayload = 5200;
+            if (geoJsonString.length > maxGeoJsonPayload) {
+              return true;
+            }
+          });
+          const text = largeGeoEntities.map(entity => entity.code).join(', ');
+          error.message = `Error updating region coordinates for entities: ${text} ${error.message}`;
+        }
+
+        throw error;
+      }
     }
   }
   return country;

diff --git a/packages/database/src/TupaiaDatabase.js b/packages/database/src/TupaiaDatabase.js
@@ -662,7 +662,8 @@ function addWhereClause(connection, baseQuery, where) {
       return querySoFar; // Ignore undefined criteria
     }
     if (value === null) {
-      return querySoFar.whereNull(key);
+      const columnKey = getColSelector(connection, key);
+      return querySoFar.whereNull(columnKey);
     }
     const {
       comparisonType = 'where',
@@ -748,5 +749,11 @@ function getColSelector(connection, inputColStr) {
     return connection.raw(inputColStr);
   }
 
+  const asGeoJsonPattern = /^ST_AsGeoJSON\((.+)\)$/;
+  if (asGeoJsonPattern.test(inputColStr)) {
+    const [, argsString] = inputColStr.match(asGeoJsonPattern);
+    return connection.raw(`ST_AsGeoJSON(${argsString})`);
+  }
+
   return inputColStr;
 }