Merge pull request #2693 from MushroomObserver/nimmo-observation-and-…

…location-scopes Slight reorganization of Sequence and Observation Query params, remove one duplicate
MushroomObserver · Feb 2, 2025 · f7b18aa · f7b18aa
2 parents fb36863 + 3d88da6
commit f7b18aa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/app/classes/query/params/observations.rb b/app/classes/query/params/observations.rb
@@ -33,7 +33,6 @@ def observations_parameter_declarations
       user_where: :string,
       is_collection_location: :boolean,
       with_public_lat_lng: :boolean,
-      by_user: User,
       with_notes: :boolean,
       notes_has: :string,
       with_notes_fields: [:string],

diff --git a/app/classes/query/sequences.rb b/app/classes/query/sequences.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Query::Sequences < Query::Base
+  include Query::Params::Locations
   include Query::Params::Names
   include Query::Params::Observations
   include Query::Initializers::Names
@@ -13,47 +14,44 @@ def model
   def parameter_declarations
     super.merge(sequence_parameter_declarations).
       merge(observation_parameter_declarations).
-      merge(names_parameter_declarations)
+      merge(names_parameter_declarations).
+      merge(bounding_box_parameter_declarations)
   end
 
   def sequence_parameter_declarations
     {
       created_at: [:time],
       updated_at: [:time],
-      observations: [Observation],
+      ids: [Sequence],
       users: [User],
+      observations: [Observation],
       locus: [:string],
       archive: [:string],
       accession: [:string],
       locus_has: :string,
       accession_has: :string,
       notes_has: :string,
-      pattern: :string,
-      ids: [Sequence]
+      pattern: :string
     }
   end
 
   def observation_parameter_declarations
     {
       obs_date: [:date],
       observers: [User],
-      locations: [Location],
-      herbaria: [Herbarium],
-      herbarium_records: [HerbariumRecord],
-      projects: [Project],
-      species_lists: [SpeciesList],
+      with_name: :boolean,
       confidence: [:float],
-      north: :float,
-      south: :float,
-      east: :float,
-      west: :float,
+      locations: [Location],
       is_collection_location: :boolean,
       with_images: :boolean,
-      with_name: :boolean,
       with_specimen: :boolean,
       with_obs_notes: :boolean,
+      obs_notes_has: :string,
       with_notes_fields: [:string],
-      obs_notes_has: :string
+      herbaria: [Herbarium],
+      herbarium_records: [HerbariumRecord],
+      projects: [Project],
+      species_lists: [SpeciesList]
     }
   end