fix observation collection inclusion based on media rules

Author: pleary

lib/models/project.js

@@ -372,10 +372,10 @@ const Project = class Project extends Model {
       if ( field === "quality_grade" && !_.includes( value, observation.quality_grade ) ) {
         return false;
       }
-      if ( field === "photos" && ( _.isEmpty( observation.photos ) || observation.photos_count === 0 ) ) {
+      if ( field === "photos" && _.isEmpty( observation.photos ) ) {
         return false;
       }
-      if ( field === "sounds" && ( _.isEmpty( observation.sounds ) || observation.sounds_count === 0 ) ) {
+      if ( field === "sounds" && _.isEmpty( observation.sounds ) ) {
         return false;
       }
       if ( field === "native" && !observation.taxon?.native ) {

test/models/project.js

@@ -436,15 +436,11 @@ describe( "Project", ( ) => {
 
     it( "photos requires photos to be present", ( ) => {
       project = buildProject( { photos: true } );
-      observation = { photos_count: 1, photos: [{ id: 1 }] };
+      observation = { photos: [{ id: 1 }] };
       expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.true;
-      observation = { photos_count: 1, photos: [] };
+      observation = { photos: [] };
       expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.false;
-      observation = { photos_count: 0, photos: [{ id: 1 }] };
-      expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.false;
-      observation = { photos_count: 0 };
-      expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.false;
-      observation = { sounds_count: 1, sounds: [{ id: 1 }] };
+      observation = { sounds: [{ id: 1 }] };
       expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.false;
 
       observation = { };
@@ -453,15 +449,11 @@ describe( "Project", ( ) => {
 
     it( "sounds requires sounds to be present", ( ) => {
       project = buildProject( { sounds: true } );
-      observation = { sounds_count: 1, sounds: [{ id: 1 }] };
+      observation = { sounds: [{ id: 1 }] };
       expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.true;
-      observation = { sounds_count: 1, sounds: [] };
-      expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.false;
-      observation = { sounds_count: 0, sounds: [{ id: 1 }] };
-      expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.false;
-      observation = { sounds_count: 0 };
+      observation = { sounds: [] };
       expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.false;
-      observation = { photos_count: 1, photos: [{ id: 1 }] };
+      observation = { photos: [{ id: 1 }] };
       expect( Project.collectionProjectRulesAllowObservation( project, observation ) ).to.be.false;
 
       observation = { };