Fix: update submission yaml file for released, creationDate, uriRegex…

…Pattern (#116) * Fix error btw released and creationDate * open the uriRegexPattern property to be a string * fix archived submission notification email to show failure in subject --------- Co-authored-by: Clement Jonquet <[email protected]>
ontoportal-lirmm · Dec 6, 2023 · 1cfaf44 · 1cfaf44
1 parent 9dd8d03
commit 1cfaf44
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/config/schemes/ontology_submission.yml b/config/schemes/ontology_submission.yml
@@ -412,7 +412,7 @@ publication:
 ### Dates
 
 #Creation date
-creationDate:
+released:
   display: "dates"
   label: "Creation date"
   helpText: "Date of original (or first) creation of the resource."
@@ -466,7 +466,7 @@ curatedOn:
   metadataMappings: [ "pav:curatedOn" ]
 
 #Submission date 
-released:
+creationDate:
   display: "dates"
   label: "Submission date"
   helpText: "Date of the submission/release in the portal."

diff --git a/lib/ontologies_linked_data/models/ontology_submission.rb b/lib/ontologies_linked_data/models/ontology_submission.rb
@@ -149,7 +149,7 @@ class OntologySubmission < LinkedData::Models::Base
       attribute :translationOfWork, namespace: :schema, type: %i[uri list]
 
       # Content metadata
-      attribute :uriRegexPattern, namespace: :void, type: :uri
+      attribute :uriRegexPattern, namespace: :void
       attribute :preferredNamespaceUri, namespace: :vann, type: :uri
       attribute :preferredNamespacePrefix, namespace: :vann
       attribute :exampleIdentifier, namespace: :idot

diff --git a/lib/ontologies_linked_data/utils/notifications.rb b/lib/ontologies_linked_data/utils/notifications.rb
@@ -32,7 +32,7 @@ def self.submission_processed(submission)
         submission.bring_remaining
         ontology = submission.ontology
         ontology.bring(:name, :acronym)
-        result = submission.ready? ? 'Success' : 'Failure'
+        result = submission.ready? || submission.archived? ? 'Success' : 'Failure'
         status = LinkedData::Models::SubmissionStatus.readable_statuses(submission.submissionStatus)
 
         subject = "[#{LinkedData.settings.ui_name}] #{ontology.name} Parsing #{result}"

diff --git a/test/models/test_ontology_submission.rb b/test/models/test_ontology_submission.rb
@@ -1149,9 +1149,10 @@ def test_submission_extract_metadata
       assert_equal ["http://lexvo.org/id/iso639-3/fra", "http://lexvo.org/id/iso639-3/eng"].sort, sub.naturalLanguage.sort
       #assert_equal ["Léontine Dessaiterm", "Anne Toulet", "Benjamine Dessay", "Augustine Doap", "Vincent Emonet"].sort, sub.hasContributor.sort
       assert_equal [RDF::URI.new("http://lirmm.fr/2015/ontology/door-relation.owl"), RDF::URI.new("http://lirmm.fr/2015/ontology/dc-relation.owl"),
-                    RDF::URI.new("http://lirmm.fr/2015/ontology/dcterms-relation.owl"), RDF::URI.new("http://lirmm.fr/2015/ontology/voaf-relation.owl")].sort, sub.ontologyRelatedTo.sort
-
-
+                    RDF::URI.new("http://lirmm.fr/2015/ontology/dcterms-relation.owl"),
+                    RDF::URI.new("http://lirmm.fr/2015/ontology/voaf-relation.owl"),
+                    RDF::URI.new("http://lirmm.fr/2015/ontology/void-import.owl")
+                   ].sort, sub.ontologyRelatedTo.sort
       sub.description = "test changed value"
       sub.save
     end