index submission and ontologies metadata on save

lib/ontologies_linked_data/models/contact.rb

@@ -6,6 +6,11 @@ class Contact < LinkedData::Models::Base
       attribute :email, enforce: [:existence]
 
       embedded true
+
+      def embedded_doc
+        "#{self.name} #{self.email}"
+      end
+
     end
   end
 end

lib/ontologies_linked_data/models/ontology.rb

@@ -88,6 +88,8 @@ class OntologyAnalyticsError < StandardError; end
       # Cache
       cache_timeout 3600
 
+      enable_indexing(:ontology_metadata)
+
       def self.validate_acronym(inst, attr)
         inst.bring(attr) if inst.bring?(attr)
         acronym = inst.send(attr)
@@ -447,6 +449,10 @@ def unindex(commit=true)
         unindex_by_acronym(commit)
       end
 
+      def embedded_doc
+        "#{self.acronym} #{self.name} #{self.viewingRestriction}"
+      end
+
       def unindex_properties(commit=true)
         self.bring(:acronym) if self.bring?(:acronym)
         query = "submissionAcronym:#{acronym}"

lib/ontologies_linked_data/models/ontology_submission.rb

@@ -215,6 +215,7 @@ def self.embed_values_hash
       read_restriction_based_on ->(sub) { sub.ontology }
       access_control_load ontology: %i[administeredBy acl viewingRestriction]
 
+      enable_indexing(:ontology_metadata)
       def initialize(*args)
         super(*args)
         @mutex = Mutex.new
@@ -1214,7 +1215,7 @@ def process_submission(logger, options = {})
               raise Exception, "The submission #{self.ontology.acronym}/submissions/#{self.submissionId} cannot be indexed because it has not been successfully parsed" unless parsed
               status = LinkedData::Models::SubmissionStatus.find("INDEXED").first
               begin
-                index(logger, index_commit, false)
+                index_terms(logger, index_commit, false)
                 add_submission_status(status)
               rescue Exception => e
                 logger.error("#{e.class}: #{e.message}\n#{e.backtrace.join("\n\t")}")
@@ -1324,7 +1325,7 @@ def process_metrics(logger)
         self
       end
 
-      def index(logger, commit = true, optimize = true)
+      def index_terms(logger, commit = true, optimize = true)
         page = 0
         size = 1000
         count_classes = 0
@@ -1560,7 +1561,7 @@ def delete(*args)
             prev_sub = self.ontology.latest_submission()
 
             if prev_sub
-              prev_sub.index(LinkedData::Parser.logger || Logger.new($stderr))
+              prev_sub.index_terms(LinkedData::Parser.logger || Logger.new($stderr))
               prev_sub.index_properties(LinkedData::Parser.logger || Logger.new($stderr))
             end
           end

lib/ontologies_linked_data/sample_data/ontology.rb

@@ -44,7 +44,7 @@ def self.create_ontologies_and_submissions(options = {})
 
           o = LinkedData::Models::Ontology.new({
                                                  acronym: acronym_count,
-                                                 name: name || "#{acronym_count} Ontology",
+                                                 name: name ? "#{name}#{count > 0 ? count : ''}" : "#{acronym_count} Ontology",
                                                  administeredBy: [u],
                                                  summaryOnly: false,
                                                  ontologyType: ontology_type