more tuning of replica queries; restore taxon_photos to CV responses

inaturalist · Apr 19, 2024 · 85e22c2 · 85e22c2
1 parent c6b5424
commit 85e22c2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/controllers/v1/computervision_controller.js b/lib/controllers/v1/computervision_controller.js
@@ -267,7 +267,7 @@ const ComputervisionController = class ComputervisionController {
     };
     const taxonOpts = {
       modifier: prepareTaxon,
-      source: { excludes: ["photos", "taxon_photos", "place_ids"] }
+      source: { excludes: ["photos", "place_ids"] }
     };
 
     // if there were taxa added to the counts to replace inactive taxa,

diff --git a/lib/controllers/v1/projects_controller.js b/lib/controllers/v1/projects_controller.js
@@ -292,7 +292,7 @@ const ProjectsController = class ProjectsController {
       )
       .where( "p.id IN ?", ids )
       .where( "pu.user_id = ?", req.userSession.user_id );
-    const { rows } = await pgClient.query( query.toString( ) );
+    const { rows } = await pgClient.replica.query( query.toString( ) );
     _.each( rows, row => {
       row.prefers_updates = ( row.prefers_updates !== "f" );
     } );

diff --git a/lib/controllers/v1/taxa_controller.js b/lib/controllers/v1/taxa_controller.js
@@ -1420,7 +1420,7 @@ TaxaController.mapLayers = async req => {
     .join( "place_geometries pg", null, "pg.place_id = lt.place_id" )
     .where( "lt.taxon_id = ?", req.params.id )
     .limit( 1 );
-  results = await pgClient.query( query.toString( ) );
+  results = await pgClient.replica.query( query.toString( ) );
   const hasListedPlaces = !_.isEmpty( results.rows );
 
   query = squel.select( ).field( "1" )

diff --git a/lib/models/taxon.js b/lib/models/taxon.js
@@ -266,7 +266,7 @@ const Taxon = class Taxon extends Model {
     const query = squel.select( ).field( "id, name " ).from( "taxa" )
       .where( "name IN ?", _.keys( iconicTaxaNames ) )
       .order( "observations_count", false );
-    const { rows } = await pgClient.query( query.toString( ) );
+    const { rows } = await pgClient.replica.query( query.toString( ) );
     _.each( rows, r => {
       if ( iconicTaxaByName[r.name.toLowerCase( )] === undefined ) {
         iconicTaxaByName[r.name.toLowerCase( )] = r;
@@ -458,7 +458,7 @@ const Taxon = class Taxon extends Model {
       .from( "taxa t" )
       .left_join( "taxon_descriptions td", null, "t.id = td.taxon_id" )
       .where( "t.id IN ?", ids );
-    const { rows } = await pgClient.query( query.toString( ) );
+    const { rows } = await pgClient.replica.query( query.toString( ) );
     const byTaxonID = { };
     _.each( rows, r => {
       byTaxonID[r.id] = byTaxonID[r.id] || [];
@@ -566,7 +566,7 @@ const Taxon = class Taxon extends Model {
     }
     const query = squel.select( ).field( "id, ancestry " ).from( "taxa" )
       .where( "id IN ?", ids );
-    const { rows } = await pgClient.query( query.toString( ) );
+    const { rows } = await pgClient.replica.query( query.toString( ) );
     const idsObject = _.keyBy( ids );
     const knownAncestors = { };
     _.each( rows, r => {