iqvoc 4.14.5 → 4.15.0

data/app/helpers/concepts_helper.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: false
 
 # Copyright 2011-2013 innoQ Deutschland GmbH
 #
@@ -120,7 +120,7 @@ module ConceptsHelper
         render(association_class.partial_name(concept), further_options.merge(concept: concept, klass: association_class))
       end
     end
-    html = render partial: '/partials/match/panel', locals: { body: matches_html, klass: Match::SKOS::Base }
+    html = render partial: '/partials/match/panel', locals: { body: matches_html, klass: Match::Skos::Base }
     if String.new(html).squish.present?
       ((hash[association_classes.first.view_section(concept)] ||= {})[association_classes.first.view_section_sort_key(concept)] ||= '') << html.html_safe
     end

data/app/helpers/navigation_helper.rb

@@ -83,9 +83,9 @@ module NavigationHelper
 
   def nav_item(item)
     active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
-    css = 'nav-item'
-    css << ' active' if active
-    content_tag :li, class: css do
+    css = ['nav-item']
+    css << 'active' if active
+    content_tag :li, class: css.join(' ') do
       nav_link(item)
     end
   end
@@ -93,12 +93,12 @@ module NavigationHelper
   def nav_link(item, opts = {})
     active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
 
-    css = opts[:class] || 'nav-link'
-    css << ' active' if active
-    css << ' dropdown-toggle' if opts[:has_children]
+    css = [ opts[:class] || 'nav-link' ]
+    css << 'active' if active
+    css << 'dropdown-toggle' if opts[:has_children]
 
     link_opts = {
-      class: css
+      class: css.join(' ')
     }
 
     dropdown_opts = {

data/app/helpers/rdf_helper.rb

@@ -90,6 +90,8 @@ module RdfHelper
     end
 
     document << collection.build_rdf_subject do |c|
+      c.Schema::expires(collection.expired_at.to_s) if collection.expired_at
+      c.Owl::deprecated(true) if collection.expired?
 
       collection.labelings.each do |labeling|
         labeling.build_rdf(document, c)

data/app/jobs/export_job.rb

@@ -7,18 +7,15 @@ class ExportJob < Struct.new(:export, :filename, :type, :base_uri)
   end
 
   def perform
-    strio = StringIO.new
-
-    exporter = SkosExporter.new(filename, type, base_uri, Logger.new(strio))
+    exporter = SkosExporter.new(filename, type, base_uri, EntityLogger.new(export))
     exporter.run
-    @messages = strio.string
   end
 
-  def success(job)
-    export.finish!(@messages)
+  def success(_job)
+    export.finish!
   end
 
-  def error(job, exception)
+  def error(_job, exception)
     export.fail!(exception)
   end
 end

data/app/models/collection/base.rb

@@ -20,12 +20,6 @@ class Collection::Base < Concept::Base
     include mod
   end
 
-  has_many Note::SKOS::Definition.name.to_relation_name,
-           class_name: 'Note::SKOS::Definition',
-           as: :owner,
-           dependent: :destroy,
-           inverse_of: :owner
-
   has_many :members,
       class_name: 'Collection::Member::Base',
       foreign_key: 'collection_id',
@@ -43,12 +37,12 @@ class Collection::Base < Concept::Base
       source: 'collection'
 
   has_many :concepts,
-           -> { where("concepts.type = ?", Iqvoc::Concept.base_class) },
+           -> { where("concepts.type = ?", Iqvoc::Concept.base_class.name) },
            through: :members,
            source: :target
 
   has_many :subcollections,
-           -> { where("concepts.type = ?", Iqvoc::Collection.base_class) },
+           -> { where("concepts.type = ?", Iqvoc::Collection.base_class.name) },
            through: :members,
            source: :target
 
@@ -96,6 +90,10 @@ class Collection::Base < Concept::Base
     'collection_dashboard_path'
   end
 
+  def self.inline_partial_name
+    'partials/collection/inline_base'
+  end
+
   def self.edit_link_partial_name
     'partials/collection/edit_link_base'
   end

data/app/models/collection/member/skos/base.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Collection::Member::SKOS::Base < Collection::Member::Base
+class Collection::Member::Skos::Base < Collection::Member::Base
   self.rdf_namespace = 'skos'
   self.rdf_predicate = 'member'
 
@@ -24,7 +24,7 @@ class Collection::Member::SKOS::Base < Collection::Member::Base
 
     member_instance = rdf_subject.members.detect{ |rel| rel.target == rdf_object }
     if member_instance.nil?
-      predicate_class = RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
+      predicate_class = RdfApi::PREDICATE_DICTIONARY[rdf_predicate] || self
       member_instance = predicate_class.new(target: rdf_object)
       rdf_subject.members << member_instance
     end

data/app/models/collection/skos/base.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Collection::SKOS::Base < Collection::Base
+class Collection::Skos::Base < Collection::Base
   self.rdf_namespace = 'skos'
   self.rdf_class = 'Collection'
 

data/app/models/collection/skos/unordered.rb

@@ -14,5 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Collection::SKOS::Unordered < Collection::SKOS::Base
+class Collection::Skos::Unordered < Collection::Skos::Base
 end

data/app/models/collection/unordered.rb

@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Collection::Unordered < Collection::SKOS::Base
+class Collection::Unordered < Collection::Skos::Base
   def initialize(*args)
-    ActiveSupport::Deprecation.warn('Collection::Unordered is deprecated. Use Collection::SKOS::Unordered instead.')
+    ActiveSupport::Deprecation.warn('Collection::Unordered is deprecated. Use Collection::Skos::Unordered instead.')
     super
   end
 end

data/app/models/concept/base.rb

@@ -33,6 +33,7 @@ class Concept::Base < ApplicationRecord
   include Concept::Validations
   include FirstLevelObjectValidations
   include FirstLevelObjectScopes
+  include Expirable
 
   # ********** Hooks
 
@@ -46,7 +47,7 @@ class Concept::Base < ApplicationRecord
     # Handle save or destruction of inline relations (relations or labelings)
     # for use with widgets etc.
 
-    # Inline assigned SKOS::Labels
+    # Inline assigned Skos::Labels
     # @labelings_by_text # => {'relation_name' => {'lang' => 'label1, label2, ...'}}
     (@labelings_by_text ||= {}).each do |relation_name, lang_values|
       relation_name = relation_name.to_s
@@ -368,15 +369,6 @@ class Concept::Base < ApplicationRecord
 
   # ********** Scopes
 
-  def self.expired(time = Time.now)
-    where(arel_table[:expired_at].lteq(time))
-  end
-
-  def self.not_expired(time = Time.now)
-    col = arel_table[:expired_at]
-    where((col.eq(nil)).or(col.gt(time)))
-  end
-
   def self.tops
     where(top_term: true)
   end

data/app/models/concept/relation/base.rb

@@ -22,7 +22,7 @@ class Concept::Relation::Base < ApplicationRecord
   # So use Concept::Base ONLY in methods or procs.
   #
   # The reason for this lies in the fact that Concept::Base calls the
-  # Concept::Relation::SKOS::Broader::Base.narrower_class method to create all
+  # Concept::Relation::Skos::Broader::Base.narrower_class method to create all
   # concept_relation relations. This means Concept::Base triggers Rails to load
   # the Concept::Relation::* classes. If this would trigger Rails to load
   # Concept::Base we would have a loop == a problem.

data/app/models/concept/relation/skos/base.rb

@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Concept::Relation::SKOS::Base < Concept::Relation::Base
+class Concept::Relation::Skos::Base < Concept::Relation::Base
   self.rdf_namespace = 'skos'
 
   def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
     raise "#{self.name}#build_from_rdf: Subject (#{rdf_subject}) must be a Concept." unless rdf_subject.is_a? Concept::Base
     raise "#{self.name}#build_from_rdf: Object (#{rdf_object}) must be a Concept."   unless rdf_object.is_a? Concept::Base
 
-    relation_class = RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
+    relation_class = RdfApi::PREDICATE_DICTIONARY[rdf_predicate] || self
 
     relation_instance = rdf_subject.send(self.name.to_relation_name).select{ |rel| rel.target == rdf_object }
     if relation_instance.empty?

data/app/models/concept/relation/skos/broader/base.rb

@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Concept::Relation::SKOS::Broader::Base < Concept::Relation::SKOS::Base
+class Concept::Relation::Skos::Broader::Base < Concept::Relation::Skos::Base
   self.rdf_predicate = 'broader'
 
   def self.narrower_class
-    Concept::Relation::SKOS::Narrower::Base
+    Concept::Relation::Skos::Narrower::Base
   end
 
   def self.reverse_relation_class

data/app/models/concept/relation/skos/broader/mono.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Concept::Relation::SKOS::Broader::Mono < Concept::Relation::SKOS::Broader::Base
+class Concept::Relation::Skos::Broader::Mono < Concept::Relation::Skos::Broader::Base
   def self.partial_name(obj)
     'partials/concept/relation/skos/broader/mono'
   end

data/app/models/concept/relation/skos/broader/poly.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Concept::Relation::SKOS::Broader::Poly < Concept::Relation::SKOS::Broader::Base
+class Concept::Relation::Skos::Broader::Poly < Concept::Relation::Skos::Broader::Base
   def self.partial_name(obj)
     'partials/concept/relation/skos/broader/poly'
   end

data/app/models/concept/relation/skos/narrower/base.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Concept::Relation::SKOS::Narrower::Base < Concept::Relation::SKOS::Base
+class Concept::Relation::Skos::Narrower::Base < Concept::Relation::Skos::Base
   self.rdf_predicate = 'narrower'
 
   def self.reverse_relation_class

data/app/models/concept/relation/skos/related.rb

@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Concept::Relation::SKOS::Related < Concept::Relation::SKOS::Base
+class Concept::Relation::Skos::Related < Concept::Relation::Skos::Base
   self.rdf_predicate = 'related'
 end

data/app/models/concept/skos/base.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Concept::SKOS::Base < Concept::Base
+class Concept::Skos::Base < Concept::Base
   self.rdf_namespace = 'skos'
   self.rdf_class = 'Concept'
 

data/app/models/concept/skos/scheme.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Concept::SKOS::Scheme < Concept::Base
+class Concept::Skos::Scheme < Concept::Base
   private_class_method :new
 
   after_update :redeclare_top_concepts
@@ -87,7 +87,7 @@ class Concept::SKOS::Scheme < Concept::Base
 
   def mono_hierarchy?
     Iqvoc::Concept.broader_relation_class.new.kind_of?(
-      Concept::Relation::SKOS::Broader::Mono
+      Concept::Relation::Skos::Broader::Mono
     )
   end
 

data/app/models/concept/validations.rb

@@ -12,6 +12,7 @@ module Concept
       validate :valid_rank_for_ranked_relations
       validate :unique_pref_labels
       validate :exclusive_pref_and_alt_labels_per_concept
+      validate :exclusive_hidden_labels_per_concept
       validate :unique_alt_labels
       validate :exclusive_broader_and_narrower_concepts
       validate :no_self_reference_concept_relation
@@ -101,6 +102,19 @@ module Concept
       end
     end
 
+    def exclusive_hidden_labels_per_concept
+      if self.validatable_for_publishing?
+        relevant_labels = self.labelings.reject { |lbl| lbl.is_a?(Iqvoc::Concept.hidden_labeling_class) }.collect(&:target)
+
+        self.hidden_labels.each do |hidden_label|
+          if relevant_labels.include? hidden_label
+            errors.add :base, I18n.t('txt.models.concept.hidden_label_defined_in_other_labels', label: hidden_label.value)
+          end
+        end
+
+      end
+    end
+
     def unique_alt_labels
       if validatable_for_publishing?
         alt_labels = alt_labelings.collect { |l| l.target }

data/app/models/concerns/expirable.rb

@@ -0,0 +1,14 @@
+module Expirable
+  extend ActiveSupport::Concern
+
+  included do
+    def self.expired(time = Time.now)
+      where(arel_table[:expired_at].lteq(time))
+    end
+
+    def self.not_expired(time = Time.now)
+      col = arel_table[:expired_at]
+      where((col.eq(nil)).or(col.gt(time)))
+    end
+  end
+end

data/app/models/export.rb

@@ -1,32 +1,44 @@
 class Export < ApplicationRecord
   belongs_to :user
 
-  enum file_type: [:ttl, :nt, :xml]
+  enum :file_type, [:ttl, :nt, :xml]
 
   validates_presence_of :default_namespace
 
-  before_destroy :delete_dump_file
+  before_destroy do
+    self.delete_dump_file
+    self.jobs.destroy_all
+  end
 
-  def finish!(messages)
-    self.output = messages
+  def finish!
     self.success = true
     self.finished_at = Time.now
-    save!
+    self.save!
   end
 
   def fail!(exception)
-    self.output = exception.to_s + "\n\n" + exception.backtrace.join("\n")
+    self.output += exception.to_s + "\n\n" + exception.backtrace.join("\n")
     self.finished_at = Time.now
-    save!
+    self.save!
   end
 
   def build_filename
-    File.join(Iqvoc.export_path, "#{token}.#{file_type}")
+    File.join(Iqvoc.export_path, "#{self.token}.#{self.file_type}")
+  end
+
+  def jobs
+    Rails.logger.debug "Deleting jobs for export #{self.id} (#{self.to_global_id})"
+    Delayed::Backend::ActiveRecord::Job.where(delayed_global_reference_id: self.to_global_id.to_s)
   end
 
   private
 
   def delete_dump_file
-    File.delete(build_filename) if File.exist?(build_filename)
+    if File.exist?(self.build_filename)
+      Rails.logger.debug "Deleting export file #{self.build_filename}"
+      File.delete(self.build_filename)
+    else
+      Rails.logger.debug "Export file #{self.build_filename} does not exist, cannot delete."
+    end
   end
 end

data/app/models/label/base.rb

@@ -46,6 +46,24 @@ class Label::Base < ApplicationRecord
            through: :alt_labelings,
            source: :owner
 
+  has_many :collection_pref_labelings,
+           foreign_key: 'target_id',
+           class_name: Iqvoc::Collection.pref_labeling_class_name,
+           inverse_of: :target
+
+  has_many :pref_labeled_collections,
+           through: :collection_pref_labelings,
+           source: :owner
+
+  has_many :collection_alt_labelings,
+           foreign_key: 'target_id',
+           class_name: Iqvoc::Collection.alt_labeling_class_name,
+           inverse_of: :target
+
+  has_many :alt_labeled_collections,
+           through: :collection_alt_labelings,
+           source: :owner
+
   # ********* Scopes
 
   def self.by_language(lang_code)
@@ -82,7 +100,7 @@ class Label::Base < ApplicationRecord
   end
 
   def self.by_query_value(query)
-    where(["#{table_name}.value ILIKE ?", query.mb_chars.downcase.to_s])
+    where(["#{table_name}.value ILIKE ?", query.to_s.downcase])
   end
 
   # Attention: This means that even label classes without version controll will also

data/app/models/label/skos/base.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Label::SKOS::Base < Label::Base
+class Label::Skos::Base < Label::Base
   after_initialize :publish
 
   validates :value, presence: { message: I18n.t('txt.models.label.value_error') }

data/app/models/labeling/base.rb

@@ -48,6 +48,18 @@ class Labeling::Base < ApplicationRecord
     includes(:owner).merge(Iqvoc::Concept.base_class.not_expired)
   end
 
+  def self.collection_published
+    includes(:owner).merge(Collection::Base.published)
+  end
+
+  def self.collection_expired
+    includes(:owner).merge(Iqvoc::Collection.base_class.expired)
+  end
+
+  def self.collection_not_expired
+    includes(:owner).merge(Iqvoc::Collection.base_class.not_expired)
+  end
+
   def self.label_published
     includes(:target).merge(Label::Base.published)
   end

data/app/models/labeling/skos/alt_label.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Labeling::SKOS::AltLabel < Labeling::SKOS::Base
+class Labeling::Skos::AltLabel < Labeling::Skos::Base
   self.rdf_predicate = 'altLabel'
 
   def self.view_section_sort_key(obj)

data/app/models/labeling/skos/base.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Labeling::SKOS::Base < Labeling::Base
+class Labeling::Skos::Base < Labeling::Base
   self.rdf_namespace = 'skos'
 
   # ********** Associations
@@ -63,7 +63,7 @@ class Labeling::SKOS::Base < Labeling::Base
         scope = scope.where("#{Collection::Member::Base.table_name}.collection_id" => collection.id)
         scope = scope.references(:collection_members)
       else
-        raise "Collection with Origin #{params[:collection_origin]} not found!"
+        Rails.logger.warn "Collection with Origin #{params[:collection_origin]} not found!"
       end
     end
     scope = scope.includes(:owner)
@@ -136,7 +136,7 @@ class Labeling::SKOS::Base < Labeling::Base
       raise "#{self.name}#build_from_rdf: Subject (#{rdf_subject}) must be a Concept."
     end
 
-    unless rdf_object =~ RDFAPI::LITERAL_REGEXP
+    unless rdf_object =~ RdfApi::LITERAL_REGEXP
       raise InvalidStringLiteralError, "#{self.name}#build_from_rdf: Object (#{rdf_object}) must be a string literal"
     end
 
@@ -147,7 +147,7 @@ class Labeling::SKOS::Base < Labeling::Base
       $1
     end
 
-    predicate_class = RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
+    predicate_class = RdfApi::PREDICATE_DICTIONARY[rdf_predicate] || self
     predicate_class.new(target: self.label_class.new(value: value, language: lang)).tap do |labeling|
       rdf_subject.send(predicate_class.name.to_relation_name) << labeling
     end

data/app/models/labeling/skos/hidden_label.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Labeling::SKOS::HiddenLabel < Labeling::SKOS::Base
+class Labeling::Skos::HiddenLabel < Labeling::Skos::Base
   self.rdf_predicate = 'hiddenLabel'
 
   def self.view_section_sort_key(obj)

data/app/models/labeling/skos/pref_label.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Labeling::SKOS::PrefLabel < Labeling::SKOS::Base
+class Labeling::Skos::PrefLabel < Labeling::Skos::Base
   self.rdf_predicate = 'prefLabel'
 
   # if `singular` is true, only a single occurrence is allowed per instance

data/app/models/match/skos/base.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Match::SKOS::Base < Match::Base
+class Match::Skos::Base < Match::Base
   self.rdf_namespace = 'skos'
 
   def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
@@ -22,14 +22,14 @@ class Match::SKOS::Base < Match::Base
     raise "#{self.class}#build_from_rdf: Object (#{rdf_object}) must be a URI" unless rdf_object =~ /^<(.+)>$/ # XXX: this assumes nt-format, right?
     uri = $1
 
-    match_class = RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
+    match_class = RdfApi::PREDICATE_DICTIONARY[rdf_predicate] || self
     match_class.new(value: uri).tap do |match|
       rdf_subject.send(self.name.to_relation_name) << match
     end
   end
 
   def build_rdf(document, subject)
-    raise "Match::SKOS::Base#build_rdf: Class #{self.name} needs to define self.rdf_namespace and self.rdf_predicate." unless self.rdf_namespace && self.rdf_predicate
+    raise "Match::Skos::Base#build_rdf: Class #{self.name} needs to define self.rdf_namespace and self.rdf_predicate." unless self.rdf_namespace && self.rdf_predicate
 
     if (IqRdf::Namespace.find_namespace_class(self.rdf_namespace.camelcase))
       subject.send(self.rdf_namespace.camelcase).send(self.rdf_predicate, URI.parse(value))

data/app/models/match/skos/broad_match.rb

@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Match::SKOS::BroadMatch < Match::SKOS::MappingRelation
+class Match::Skos::BroadMatch < Match::Skos::MappingRelation
   def self.reverse_match_class_name
-    'Match::SKOS::NarrowMatch'
+    'Match::Skos::NarrowMatch'
   end
 
   self.rdf_predicate = 'broadMatch'

data/app/models/match/skos/close_match.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Match::SKOS::CloseMatch < Match::SKOS::MappingRelation
+class Match::Skos::CloseMatch < Match::Skos::MappingRelation
   def self.reverse_match_class_name
     self.to_s
   end

data/app/models/match/skos/exact_match.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Match::SKOS::ExactMatch < Match::SKOS::MappingRelation
+class Match::Skos::ExactMatch < Match::Skos::MappingRelation
   def self.reverse_match_class_name
     self.to_s
   end

data/app/models/match/skos/mapping_relation.rb

@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Match::SKOS::MappingRelation < Match::SKOS::Base
+class Match::Skos::MappingRelation < Match::Skos::Base
   self.rdf_predicate = 'mappingRelation'
 end

data/app/models/match/skos/narrow_match.rb

@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Match::SKOS::NarrowMatch < Match::SKOS::MappingRelation
+class Match::Skos::NarrowMatch < Match::Skos::MappingRelation
   def self.reverse_match_class_name
-    'Match::SKOS::BroadMatch'
+    'Match::Skos::BroadMatch'
   end
 
   self.rdf_predicate = 'narrowMatch'

data/app/models/match/skos/related_match.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Match::SKOS::RelatedMatch < Match::SKOS::MappingRelation
+class Match::Skos::RelatedMatch < Match::Skos::MappingRelation
   def self.reverse_match_class_name
     self.to_s
   end

data/app/models/note/base.rb

@@ -73,7 +73,7 @@ class Note::Base < ApplicationRecord
   end
 
   def self.by_query_value(query)
-    where(["#{table_name}.value ILIKE ?", query.mb_chars.downcase.to_s])
+    where(["#{table_name}.value ILIKE ?", query.to_s.downcase])
   end
 
   def self.by_owner_type(klass)
@@ -168,7 +168,7 @@ class Note::Base < ApplicationRecord
         scope = scope.where("#{Collection::Member::Base.table_name}.collection_id" => collection.id)
         scope = scope.references(:collection_members)
       else
-        raise "Collection with Origin #{params[:collection_origin]} not found!"
+        Rails.logger.warn "Collection with Origin #{params[:collection_origin]} not found!"
       end
     end