Update SCI-HF data queries

PEM-Humboldt · Jan 18, 2024 · 10e1582 · 10e1582
1 parent 3d754fb
commit 10e1582
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 34 deletions.
diff --git a/services/forest/src/persistence/SCIHF.js b/services/forest/src/persistence/SCIHF.js
@@ -17,7 +17,7 @@ module.exports = (db, { geoIntegrity }, logger) => ({
       .select('hf_pers', 'sci_cat', 'binary_protected')
       .sum('area_ha as area')
       .groupBy('binary_protected', 'sci_cat', 'hf_pers')
-      .orderBy('binary_protected', 'sci_cat', 'hf_pers')
+      .orderBy(['binary_protected', 'sci_cat', 'hf_pers'])
       .catch((e) => {
         logger.error(e.stack || e.Error || e.message || e);
         throw new RestifyErrors.InternalServerError('Error getting data');
@@ -39,7 +39,7 @@ module.exports = (db, { geoIntegrity }, logger) => ({
       .select('hf_pers', 'sci_cat', 'binary_protected')
       .sum('area_ha as area')
       .groupBy('binary_protected', 'sci_cat', 'hf_pers')
-      .orderBy('binary_protected', 'sci_cat', 'hf_pers')
+      .orderBy(['binary_protected', 'sci_cat', 'hf_pers'])
       .catch((e) => {
         logger.error(e.stack || e.Error || e.message || e);
         throw new RestifyErrors.InternalServerError('Error getting data');
@@ -61,7 +61,7 @@ module.exports = (db, { geoIntegrity }, logger) => ({
       .select('hf_pers', 'sci_cat', 'binary_protected')
       .sum('area_ha as area')
       .groupBy('binary_protected', 'sci_cat', 'hf_pers')
-      .orderBy('binary_protected', 'sci_cat', 'hf_pers')
+      .orderBy(['binary_protected', 'sci_cat', 'hf_pers'])
       .catch((e) => {
         logger.error(e.stack || e.Error || e.message || e);
         throw new RestifyErrors.InternalServerError('Error getting data');
@@ -83,7 +83,7 @@ module.exports = (db, { geoIntegrity }, logger) => ({
       .select('hf_pers', 'sci_cat', 'binary_protected')
       .sum('area_ha as area')
       .groupBy('binary_protected', 'sci_cat', 'hf_pers')
-      .orderBy('binary_protected', 'sci_cat', 'hf_pers')
+      .orderBy(['binary_protected', 'sci_cat', 'hf_pers'])
       .catch((e) => {
         logger.error(e.stack || e.Error || e.message || e);
         throw new RestifyErrors.InternalServerError('Error getting data');

diff --git a/yarn.lock b/yarn.lock
@@ -1140,7 +1140,7 @@ __metadata:
     knex: ~3.1.0
     node-fetch: ~2.6.7
     nodemon: ~2.0.16
-    pg: ~8.7.3
+    pg: ~8.11.3
     restify: ~10.0.0
     restify-cors-middleware: ~1.1.1
     restify-errors: ~8.0.2
@@ -1740,7 +1740,7 @@ __metadata:
     config: ~3.3.7
     knex: ~3.1.0
     nodemon: ~2.0.16
-    pg: ~8.7.3
+    pg: ~8.11.3
     restify: ~10.0.0
     restify-cors-middleware: ~1.1.1
     restify-errors: ~8.0.2
@@ -2032,7 +2032,7 @@ __metadata:
     knex: ~3.1.0
     node-fetch: ~2.6.7
     nodemon: ~2.0.16
-    pg: ~8.7.3
+    pg: ~8.11.3
     restify: ~10.0.0
     restify-cors-middleware: ~1.1.1
     restify-errors: ~8.0.2
@@ -2112,7 +2112,7 @@ __metadata:
     knex: ~3.1.0
     node-fetch: ~2.6.7
     nodemon: ~2.0.16
-    pg: ~8.7.3
+    pg: ~8.11.3
     restify: ~10.0.0
     restify-cors-middleware: ~1.1.1
     restify-errors: ~8.0.2
@@ -3137,7 +3137,7 @@ __metadata:
     knex: ~3.1.0
     node-fetch: ~2.6.7
     nodemon: ~2.0.16
-    pg: ~8.7.3
+    pg: ~8.11.3
     restify: ~10.0.0
     restify-cors-middleware: ~1.1.1
     restify-errors: ~8.0.2
@@ -5476,17 +5476,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-connection-string@npm:2.6.2":
-  version: 2.6.2
-  resolution: "pg-connection-string@npm:2.6.2"
-  checksum: 22265882c3b6f2320785378d0760b051294a684989163d5a1cde4009e64e84448d7bf67d9a7b9e7f69440c3ee9e2212f9aa10dd17ad6773f6143c6020cebbcb5
+"pg-cloudflare@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "pg-cloudflare@npm:1.1.1"
+  checksum: 32aac06b5dc4588bbf78801b6267781bc7e13be672009df949d08e9627ba9fdc26924916665d4de99d47f9b0495301930547488dad889d826856976c7b3f3731
   languageName: node
   linkType: hard
 
-"pg-connection-string@npm:^2.5.0":
-  version: 2.5.0
-  resolution: "pg-connection-string@npm:2.5.0"
-  checksum: a6f3a068f7c9416a5b33a326811caf0dfaaee045c225b7c628b4c9b4e9a2b25bdd12a21e4c48940e1000ea223a4e608ca122d2ff3dd08c8b1db0fc9f5705133a
+"pg-connection-string@npm:2.6.2, pg-connection-string@npm:^2.6.2":
+  version: 2.6.2
+  resolution: "pg-connection-string@npm:2.6.2"
+  checksum: 22265882c3b6f2320785378d0760b051294a684989163d5a1cde4009e64e84448d7bf67d9a7b9e7f69440c3ee9e2212f9aa10dd17ad6773f6143c6020cebbcb5
   languageName: node
   linkType: hard
 
@@ -5497,19 +5497,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-pool@npm:^3.5.1":
-  version: 3.5.1
-  resolution: "pg-pool@npm:3.5.1"
+"pg-pool@npm:^3.6.1":
+  version: 3.6.1
+  resolution: "pg-pool@npm:3.6.1"
   peerDependencies:
     pg: ">=8.0"
-  checksum: 42833c25f18fee41a1b2d955978f1403e93164762a7e57d3a870429103d302f1899b393ab021bb8144272037eb3f13bdb9f16a4c4afaa3efd3d2c3689738038f
+  checksum: 8a6513e6f74a794708c9dd16d2ccda0debadc56435ec2582de2b2e35b01315550c5dab8a0a9a2a16f4adce45523228f5739940fb7687ec7e9c300f284eb08fd1
   languageName: node
   linkType: hard
 
-"pg-protocol@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "pg-protocol@npm:1.5.0"
-  checksum: b839d12cafe942ef9cbc5b13c174eb2356804fb4fe8ead8279f46a36be90722d19a91409955beb8a3d5301639c44854e49749de4aef02dc361fee3e2a61fb1e4
+"pg-protocol@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "pg-protocol@npm:1.6.0"
+  checksum: e12662d2de2011e0c3a03f6a09f435beb1025acdc860f181f18a600a5495dc38a69d753bbde1ace279c8c442536af9c1a7c11e1d0fe3fad3aa1348b28d9d2683
   languageName: node
   linkType: hard
 
@@ -5526,23 +5526,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg@npm:~8.7.3":
-  version: 8.7.3
-  resolution: "pg@npm:8.7.3"
+"pg@npm:~8.11.3":
+  version: 8.11.3
+  resolution: "pg@npm:8.11.3"
   dependencies:
     buffer-writer: 2.0.0
     packet-reader: 1.0.0
-    pg-connection-string: ^2.5.0
-    pg-pool: ^3.5.1
-    pg-protocol: ^1.5.0
+    pg-cloudflare: ^1.1.1
+    pg-connection-string: ^2.6.2
+    pg-pool: ^3.6.1
+    pg-protocol: ^1.6.0
     pg-types: ^2.1.0
     pgpass: 1.x
   peerDependencies:
-    pg-native: ">=2.0.0"
+    pg-native: ">=3.0.1"
+  dependenciesMeta:
+    pg-cloudflare:
+      optional: true
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: d0e7040967779b9ccea16897f099510bcaf6bc86f77a6d8fa7e293c24d8bd2fd2ec46d99d6d1adc9be4cc8f254aa909361346b693088c1ba4501414f7afb2fe3
+  checksum: 8af9468b8969fa0d73a6b349216c8cbc953d938fcae5594f2d24043060e9226a072c8085fc4230172b5576fcab4c39c8563c655f271dc2a9209b6ad5370cafe5
   languageName: node
   linkType: hard
 
@@ -7469,7 +7473,7 @@ resolve@^1.9.0:
     knex: ~3.1.0
     multer: ~1.4.5-lts.1
     nodemon: ~2.0.16
-    pg: ~8.7.3
+    pg: ~8.11.3
     restify: ~10.0.0
     restify-cors-middleware: ~1.1.1
     restify-errors: ~8.0.2