add conservation status ID in taxon response inaturalist/inaturalist#…

…3994; fix bug with common ancestor in some cv responses
inaturalist · Feb 26, 2024 · 41fcf0b · 41fcf0b
1 parent 32c4c20
commit 41fcf0b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/lib/controllers/v1/computervision_controller.js b/lib/controllers/v1/computervision_controller.js
@@ -464,6 +464,7 @@ const ComputervisionController = class ComputervisionController {
     commonAncestor.taxon = new Taxon( taxon );
     const localeOpts = util.localeOpts( req );
     commonAncestor.taxon.prepareForResponse( localeOpts, { localeOpts } );
+    await TaxaController.assignPlaces( [commonAncestor.taxon] );
     response.common_ancestor = commonAncestor;
     return response;
   }

diff --git a/lib/controllers/v1/taxa_controller.js b/lib/controllers/v1/taxa_controller.js
@@ -1486,6 +1486,7 @@ TaxaController.iconic = async req => (
 
 module.exports = {
   assignAncestors: TaxaController.assignAncestors,
+  assignPlaces: TaxaController.assignPlaces,
   autocomplete: TaxaController.autocomplete,
   replaceInactiveTaxa: TaxaController.replaceInactiveTaxa,
   search: TaxaController.search,

diff --git a/lib/models/taxon.js b/lib/models/taxon.js
@@ -296,6 +296,7 @@ const Taxon = class Taxon extends Model {
     const ids = _.compact( _.uniq( _.flatMapDeep( taxa, t => [t.ancestor_ids, t.id] ) ) );
     if ( _.isEmpty( ids ) ) { return; }
     const query = squel.select( )
+      .field( "cs.id" )
       .field( "cs.taxon_id" )
       .field( "t.name", "taxon_name" )
       .field( "t.rank", "taxon_rank" )

diff --git a/openapi/schema/response/conservation_status.js b/openapi/schema/response/conservation_status.js
@@ -2,6 +2,7 @@ const Joi = require( "joi" );
 const place = require( "./place" );
 
 module.exports = Joi.object( ).keys( {
+  id: Joi.number( ).integer( ).required( ),
   authority: Joi.string( ),
   description: Joi.string( ).valid( null ),
   geoprivacy: Joi.string( ).valid( null ),