DRY up some ORCID handling code

Author: fbacall

app/models/concerns/has_orcid.rb

@@ -0,0 +1,18 @@
+module HasOrcid
+  extend ActiveSupport::Concern
+
+  included do
+    auto_strip_attributes :orcid
+    before_validation :normalize_orcid
+  end
+
+  def orcid_url
+    return nil if orcid.blank?
+    "#{OrcidValidator::ORCID_PREFIX}#{orcid}"
+  end
+
+  def normalize_orcid
+    return if orcid.blank?
+    self.orcid = orcid.strip.sub(OrcidValidator::ORCID_DOMAIN_REGEX, '')
+  end
+end

app/models/person.rb

@@ -1,4 +1,6 @@
 class Person < ApplicationRecord
+  include HasOrcid
+
   belongs_to :profile, optional: true
   has_many :person_links, dependent: :destroy
 
@@ -23,16 +25,11 @@ def name_presence
 
   # Automatically link to a Profile if one exists with a matching ORCID
   def link_to_profile_by_orcid
-    return if orcid.blank?
-    return if profile_id.present? # Already linked
-
-    # Normalize the ORCID for matching - Profile stores it as a full URL
-    normalized_orcid = orcid.strip
-    if normalized_orcid =~ OrcidValidator::ORCID_ID_REGEX
-      normalized_orcid = "#{OrcidValidator::ORCID_PREFIX}#{normalized_orcid}"
+    if orcid.blank?
+      self.profile = nil
+    else
+      matching_profile = Profile.find_by(orcid: orcid)
+      self.profile = matching_profile if matching_profile.present?
     end
-
-    matching_profile = Profile.find_by(orcid: normalized_orcid)
-    self.profile = matching_profile if matching_profile.present?
   end
 end

app/models/profile.rb

@@ -1,7 +1,9 @@
 require 'uri'
 
 class Profile < ApplicationRecord
-  auto_strip_attributes :firstname, :surname, :website, :orcid, squish: false
+  include HasOrcid
+
+  auto_strip_attributes :firstname, :surname, :website, squish: false
   belongs_to :user, inverse_of: :profile
 
   before_validation :normalize_orcid
@@ -25,11 +27,6 @@ def full_name
     "#{firstname} #{surname}".strip
   end
 
-  def orcid_url
-    return nil if orcid.blank?
-    "#{OrcidValidator::ORCID_PREFIX}#{orcid}"
-  end
-
   def merge(*others)
     Profile.transaction do
       attrs = attributes
@@ -66,11 +63,6 @@ def authenticate_orcid(orcid)
 
   private
 
-  def normalize_orcid
-    return if orcid.blank?
-    self.orcid = orcid.strip.sub(OrcidValidator::ORCID_DOMAIN_REGEX, '')
-  end
-
   def check_public
     public ? self.type = 'Trainer' : self.type = 'Profile'
   end

lib/bioschemas/generator.rb

@@ -166,5 +166,15 @@ def self.provider(resource)
 
       p.any? ? p : nil
     end
+
+    def self.people(people)
+      people.map do |person|
+        person_hash = { '@type' => 'Person', 'name' => person.display_name }
+        person_hash['givenName'] = person.given_name if person.given_name.present?
+        person_hash['familyName'] = person.family_name if person.family_name.present?
+        person_hash['@id'] = person.orcid_url if person.orcid.present?
+        person_hash
+      end
+    end
   end
 end

lib/bioschemas/learning_resource_generator.rb

@@ -15,24 +15,8 @@ def self.bioschemas_profile
     property :version, :version
     property :description, :description
     property :keywords, :keywords
-    property :author, -> (material) {
-      material.authors.map { |a|
-        author_hash = { "@type" => "Person", "name" => a.display_name }
-        author_hash["givenName"] = a.given_name if a.given_name.present?
-        author_hash["familyName"] = a.family_name if a.family_name.present?
-        author_hash["@id"] = "https://orcid.org/#{a.orcid}" if a.orcid.present?
-        author_hash
-      }
-    }
-    property :contributor, -> (material) {
-      material.contributors.map { |c|
-        contributor_hash = { "@type" => "Person", "name" => c.display_name }
-        contributor_hash["givenName"] = c.given_name if c.given_name.present?
-        contributor_hash["familyName"] = c.family_name if c.family_name.present?
-        contributor_hash["@id"] = "https://orcid.org/#{c.orcid}" if c.orcid.present?
-        contributor_hash
-      }
-    }
+    property :author, -> (material) { people(material.authors) }
+    property :contributor, -> (material) { people(material.contributors) }
     property :provider, -> (material) { provider(material) }
     property :audience, -> (material) {
       material.target_audience.map { |audience| { '@type' => 'Audience', 'audienceType' => audience } }