Merge branch 'main' into inatnls-wrapper

.github/workflows/CICD-dev.yml

@@ -38,6 +38,32 @@ jobs:
         push: true
         tags: ${{ secrets.DOCKERHUB_USERNAME }}/inaturalistapi:${{ github.ref_name }}
 
+  refresh-dev-staging-deployment:
+    name: Refresh Dev Staging Deployment
+    needs: build-and-push-dev-docker-image
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Refresh Dev inaturalistapi
+      uses: actions/github-script@v6
+      with:
+        github-token: ${{secrets.STAGING_DEPLOYMENT_PERSONAL_ACCESS_TOKEN}}
+        script: |-
+          await github.rest.actions.createWorkflowDispatch({
+              owner: "inaturalist",
+              repo: "staging-deployment",
+              workflow_id: "CD-workflow-dispatch.yml",
+              ref: "main",
+              inputs: {
+                "service-type": "api",
+                "service-version": "${{ github.ref_name }}"
+              },
+          }).catch(error => error).then(response => {
+            core.debug(response);
+            if (response.status !== 204) {
+              core.setFailed(`create workflow_dispatch received status code ${response.status}`);
+            }
+          });
+
   notify-slack:
     name: Notify Slack
     needs: build-and-push-dev-docker-image

.github/workflows/CICD-main.yml

@@ -39,6 +39,32 @@ jobs:
           ${{ secrets.DOCKERHUB_USERNAME }}/inaturalistapi:${{ github.sha }}
           ${{ secrets.DOCKERHUB_USERNAME }}/inaturalistapi:latest
 
+  refresh-main-staging-deployment:
+    name: Refresh Main Staging Deployment
+    needs: build-and-push-main-docker-image
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Refresh Main inaturalistapi
+      uses: actions/github-script@v6
+      with:
+        github-token: ${{secrets.STAGING_DEPLOYMENT_PERSONAL_ACCESS_TOKEN}}
+        script: |-
+          await github.rest.actions.createWorkflowDispatch({
+              owner: "inaturalist",
+              repo: "staging-deployment",
+              workflow_id: "CD-workflow-dispatch.yml",
+              ref: "main",
+              inputs: {
+                "service-type": "api",
+                "service-version": "latest"
+              },
+          }).catch(error => error).then(response => {
+            core.debug(response);
+            if (response.status !== 204) {
+              core.setFailed(`create workflow_dispatch received status code ${response.status}`);
+            }
+          });
+
   notify-slack:
     name: Notify Slack
     needs: build-and-push-main-docker-image

lib/api_util.js

@@ -35,7 +35,8 @@ const apiUtil = class apiUtil {
       ["not_in_project", "not_in_project", Project.findAllByIDElastic],
       ["members_of_project", "members_of_project", Project.findAllByIDElastic],
       ["ident_user_id", "ident_users", User.findAllByLoginOrID],
-      ["without_ident_user_id", "without_ident_users", User.findAllByLoginOrID]
+      ["without_ident_user_id", "without_ident_users", User.findAllByLoginOrID],
+      ["annotation_user_id", "annotation_users", User.findAllByLoginOrID]
     ];
     _.each( arrayInstancesToLookup, lookupMapping => {
       const [paramKey, objectKey, lookupMethod] = lookupMapping;

lib/models/observation_query_builder.js

@@ -959,6 +959,23 @@ ObservationQueryBuilder.reqToElasticQueryComponents = async req => {
     inverseFilters.push( nestedQuery );
   }
 
+  if ( req.inat.annotation_users ) {
+    const annotationUserIDs = _.map( req.inat.annotation_users, "id" );
+    const nestedQuery = {
+      nested: {
+        path: "annotations",
+        query: {
+          bool: {
+            filter: [
+              esClient.termFilter( "annotations.user_id", annotationUserIDs )
+            ]
+          }
+        }
+      }
+    };
+    searchFilters.push( nestedQuery );
+  }
+
   if (
     req.userSession
     // Don't filter out obs by blocking users if the viewer is just viewing a

lib/views/_observation_search_params_v1.yml.ejs

@@ -52,6 +52,7 @@
         - $ref: "#/parameters/without_term_id"
         - $ref: "#/parameters/without_term_value_id"
         - $ref: "#/parameters/term_id_or_unknown"
+        - $ref: "#/parameters/annotation_user_id"
         # other
         - $ref: "#/parameters/acc_above"
         - $ref: "#/parameters/acc_below"

lib/views/swagger_v1.yml.ejs

@@ -2314,6 +2314,14 @@ parameters:
       Must be combined with the `term_value_id` or the `without_term_value_id` parameter.
       Must have an annotation using this controlled term ID and associated term value IDs
       or be missing this annotation.
+  annotation_user_id:
+    name: annotation_user_id
+    type: array
+    items:
+      type: string
+    in: query
+    description: |
+      Must have an annotation created by this user
   ofv_datatype:
     name: ofv_datatype
     type: array

openapi/paths/v2/observation_sounds/{uuid}.js

@@ -9,7 +9,7 @@ module.exports = sendWrapper => {
   }
 
   PUT.apiDoc = {
-    tags: ["ObservationPhotos"],
+    tags: ["ObservationSounds"],
     summary: "Update an observation sound",
     security: [{
       userJwtRequired: []

openapi/schema/request/observation_photos_create.js

@@ -8,6 +8,7 @@ module.exports = Joi.object( )
         .description( "UUID for the existing observation" ),
       photo_id: Joi.number( ).integer( )
         .description( "Sequential ID for the existing photo" ),
+      position: Joi.number( ).integer( ),
       uuid: Joi.string( ).guid( { version: "uuidv4" } )
         .description(
           "New UUID for the photo, helps prevent duplication in poor network conditions"

openapi/schema/request/observation_photos_create_multipart.js

@@ -8,5 +8,6 @@ module.exports = Joi.object( ).keys( {
     .description(
       "New UUID for the photo, helps prevent duplication in poor network conditions"
     ),
+  "observation_photo[position]": Joi.number( ).integer( ),
   file: Joi.binary( ).required( )
 } ).unknown( true );

openapi/schema/request/observations_search.js

@@ -123,6 +123,7 @@ module.exports = Joi.object( ).keys( {
   term_value_id: Joi.array( ).items( Joi.number( ).integer( ) ),
   without_term_value_id: Joi.array( ).items( Joi.number( ).integer( ) ),
   term_id_or_unknown: Joi.array( ).items( Joi.number( ).integer( ) ),
+  annotation_user_id: Joi.array( ).items( Joi.string( ) ),
   acc_above: Joi.number( ).integer( ),
   acc_below: Joi.number( ).integer( ),
   acc_below_or_unknown: Joi.number( ).integer( ),

openapi/schema/response/user.js

@@ -13,6 +13,7 @@ module.exports = Joi.object( ).keys( {
   icon_url: Joi.string( ).valid( null ),
   identifications_count: Joi.number( ).integer( ),
   journal_posts_count: Joi.number( ).integer( ),
+  annotated_observations_count: Joi.number( ).integer( ),
   last_active: Joi.date( ).iso( ),
   login: Joi.string( ),
   monthly_supporter: Joi.boolean( ).valid( null ),

test/controllers/v1/observations_controller.js

@@ -741,6 +741,12 @@ describe( "ObservationsController", ( ) => {
       expect( q.filters ).to.eql( [{ terms: { id: experimentObsIDs } }] );
     } );
 
+    it( "filters by annotation user ID", async ( ) => {
+      const q = await Q( { inat: { annotation_users: [{ id: 1, login: "userlogin" }] } } );
+      expect( q.filters[0].nested.query.bool.filter[0]
+        .terms["annotations.user_id"][0] ).to.eql( 1 );
+    } );
+
     //
     // Sorting
     //

test/integration/v2/observation_photos.js

@@ -12,7 +12,7 @@ describe( "ObservationPhotos", ( ) => {
     id: 1234,
     uuid: "b9576748-095f-43e4-ae25-0bb86ec74c47",
     observation_id: "c1386ffd-1a87-40f7-b646-b9f716595567",
-    position: 0
+    position: 1
   };
 
   describe( "create", ( ) => {
@@ -26,14 +26,19 @@ describe( "ObservationPhotos", ( ) => {
         request( this.app ).post( "/v2/observation_photos" )
           .set( "Authorization", token )
           .set( "Content-Type", "multipart/form-data" )
-          .field( "fields", "id,uuid" )
+          .field( "fields", "id,uuid,position" )
           .field( "observation_photo[observation_id]", obsPhoto.observation_id )
+          .field( "observation_photo[position]", 1 )
           .attach( "file", "test/fixtures/cuthona_abronia-tagged.jpg" )
           .expect( 200 )
           .expect( res => {
+            // NOTE: these properties are just what was stubbed with `const obsPhoto` above, so
+            // this just tests that the endpoint was hit without error and returned what we
+            // instructed it to return
             const resObj = res.body.results[0];
             expect( resObj.uuid ).to.eq( obsPhoto.uuid );
             expect( resObj.id ).to.eq( obsPhoto.id );
+            expect( resObj.position ).to.eq( obsPhoto.position );
           } )
           .expect( "Content-Type", /json/ )
           .expect( 200, done );
@@ -50,7 +55,8 @@ describe( "ObservationPhotos", ( ) => {
             observation_photo: {
               observation_id: obsPhoto.observation_id,
               photo_id: 123,
-              uuid: obsPhoto.uuid
+              uuid: obsPhoto.uuid,
+              position: 2
             }
           } )
           .expect( 200, done );