Fix wildcard collecting event param matches

Add determiner_name_regexp in prep for #3026.
SpeciesFileGroup · Jun 15, 2022 · 16be82d · 16be82d
1 parent 70b45d0
commit 16be82d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ### Added
 
+
+- Add `determiner_name_regex` to collection object filter [#3026]
 - API interactive key engine endpoint `/api/v1/observation_matrices/123/key.json`
 - API depictions endpoint `api/v1/depictions/123.json?extend[]=image&extend[]=sqed_depiction&extend[]=figures` 
 - Taxon determinations stats in stats API
@@ -16,9 +18,11 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - Change column order in Observation matrices dashboard task
 
 ### Fixed
+- Wildcard matches on collecting event attributes failing
 - Select row in Observation matrices dashboard assigns incorrect ID
 - Last week citations stats in API showing values for images. [#3020]
 
+[#3026]: https://github.com/SpeciesFileGroup/taxonworks/issues/3026
 [#3020]: https://github.com/SpeciesFileGroup/taxonworks/issues/3020
 
 ## [0.26.2] - 2022-06-05

diff --git a/app/controllers/collection_objects/filter_params.rb b/app/controllers/collection_objects/filter_params.rb
@@ -27,6 +27,7 @@ def collection_object_filter_params
         :current_repository_id,
         :depictions,
         :determiner_id_or,
+        :determiner_name_regex,
         :dwc_indexed,
         :end_date,
         :exact_buffered_collecting_event,
@@ -84,7 +85,9 @@ def collection_object_filter_params
         keyword_id_or: [],
         loan_id: [],
         otu_ids: [],
-        preparation_type_id: []
+        preparation_type_id: [],
+
+        collecting_event_wildcards: [] # !! TODO, factor into CONSTANT
         #  user_id: []
         #  collecting_event: {
         #   :recent,

diff --git a/lib/queries/collecting_event/filter.rb b/lib/queries/collecting_event/filter.rb
@@ -15,7 +15,8 @@ class Filter
         class_eval { attr_accessor a.to_sym }
       end
 
-      PARAMS = %w{collector_id
+      PARAMS = %w{
+        collector_id
         collector_ids_or
         spatial_geographic_areas
         wkt
@@ -28,6 +29,7 @@ class Filter
         in_verbatim_locality
         in_labels
         geo_json
+        collecting_event_wildcards
       }
 
       # Wildcard wrapped matching any label

diff --git a/lib/queries/collection_object/filter.rb b/lib/queries/collection_object/filter.rb
@@ -204,6 +204,12 @@ class Filter < Queries::Query
       # See with_buffered_determinations
       attr_accessor :with_buffered_other_labels
 
+      # @return String
+      # A PostgreSQL valid regular expression. Note that
+      # simple strings evaluate as wildcard matches.
+      # !! Probably shouldn't expose to external API.
+      attr_accessor :determiner_name_regex
+
       # @param [Hash] args are permitted params
       def initialize(params)
         params.reject!{ |_k, v| v.blank? } # dump all entries with empty values
@@ -231,6 +237,7 @@ def initialize(params)
         @depictions = boolean_param(params, :depictions)
         @determiner_id = params[:determiner_id]
         @determiner_id_or = boolean_param(params, :determiner_id_or)
+        @determiner_name_regex = params[:determiner_name_regex]
         @dwc_indexed = boolean_param(params, :dwc_indexed)
         @exact_buffered_collecting_event = boolean_param(params, :exact_buffered_collecting_event)
         @exact_buffered_determinations = boolean_param(params, :exact_buffered_determinations)
@@ -356,6 +363,11 @@ def determiner_facet
         ::CollectionObject.joins(Arel::Nodes::InnerJoin.new(b, Arel::Nodes::On.new(b['biological_collection_object_id'].eq(tt['id']))))
       end
 
+      def determiner_name_regex_facet
+        return nil if determiner_name_regex.nil?
+        ::CollectionObject.joins(:determiners).where('people.cached ~* ?',  determiner_name_regex)
+      end
+
       def georeferences_facet
         return nil if georeferences.nil?
         if georeferences
@@ -593,6 +605,7 @@ def base_merge_clauses
         clauses += collecting_event_merge_clauses + collecting_event_and_clauses
 
         clauses += [
+          determiner_name_regex_facet,
           with_buffered_collecting_event_facet,
           with_buffered_other_labels_facet,
           with_buffered_determinations_facet,

diff --git a/spec/lib/queries/collection_object/filter_spec.rb b/spec/lib/queries/collection_object/filter_spec.rb
@@ -5,6 +5,18 @@
 
   let(:query) { Queries::CollectionObject::Filter.new({}) }
 
+
+  specify '#determiner_name_regex' do
+    s = Specimen.create!
+    a = FactoryBot.create(:valid_taxon_determination, biological_collection_object: s, determiners: [ FactoryBot.create(:valid_person, last_name: 'Smith') ] )
+
+    s1 = Specimen.create! # not this one
+    b = FactoryBot.create(:valid_taxon_determination, biological_collection_object: s1, determiners: [ FactoryBot.create(:valid_person, last_name: 'htims') ] )
+
+    query.determiner_name_regex = 'i.*h'
+    expect(query.all.pluck(:id)).to contain_exactly(s.id)
+  end
+
   context 'lib/queries/concerns/notes.rb' do
     specify '#notes present' do
       s = Specimen.create!
@@ -44,7 +56,6 @@
     end
   end
 
-
   specify '#loan_id' do
     t1 = Specimen.create!
     l = FactoryBot.create(:valid_loan)
@@ -241,9 +252,9 @@
   specify '#taxon_determinations #buffered_determinations' do
     s = FactoryBot.create(:valid_specimen, buffered_determinations: 'Foo')
     d = FactoryBot.create(:valid_taxon_determination, biological_collection_object: s)
-    
+
     a = Specimen.create!(buffered_determinations: 'Foo')  # this one
-    
+
     query.taxon_determinations = false
     query.exact_buffered_determinations = true
     query.buffered_determinations = 'Foo'