From 6876fb850948840afad74de1b1b5c75fc9c5c247 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 19 Nov 2025 09:59:18 +0000
Subject: [PATCH 01/12] Add Author model and migration for authors has_many
 relationship

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 app/assets/javascripts/authors.js             | 41 +++++++++++++++
 app/controllers/materials_controller.rb       |  3 +-
 app/models/author.rb                          | 10 ++++
 app/models/material.rb                        | 18 +++++--
 app/models/material_author.rb                 |  6 +++
 app/views/common/_author_form.html.erb        | 25 +++++++++
 app/views/materials/_form.html.erb            | 22 +++++++-
 db/migrate/20251119095244_create_authors.rb   | 13 +++++
 .../20251119095245_create_material_authors.rb | 12 +++++
 ...119095246_migrate_material_authors_data.rb | 52 +++++++++++++++++++
 ...119095247_remove_authors_from_materials.rb |  5 ++
 test/fixtures/authors.yml                     | 26 ++++++++++
 test/fixtures/material_authors.yml            | 13 +++++
 test/fixtures/materials.yml                   |  3 --
 test/models/author_test.rb                    | 37 +++++++++++++
 test/models/material_test.rb                  | 52 +++++++++++--------
 16 files changed, 306 insertions(+), 32 deletions(-)
 create mode 100644 app/assets/javascripts/authors.js
 create mode 100644 app/models/author.rb
 create mode 100644 app/models/material_author.rb
 create mode 100644 app/views/common/_author_form.html.erb
 create mode 100644 db/migrate/20251119095244_create_authors.rb
 create mode 100644 db/migrate/20251119095245_create_material_authors.rb
 create mode 100644 db/migrate/20251119095246_migrate_material_authors_data.rb
 create mode 100644 db/migrate/20251119095247_remove_authors_from_materials.rb
 create mode 100644 test/fixtures/authors.yml
 create mode 100644 test/fixtures/material_authors.yml
 create mode 100644 test/models/author_test.rb

diff --git a/app/assets/javascripts/authors.js b/app/assets/javascripts/authors.js
new file mode 100644
index 000000000..1ead1611c
--- /dev/null
+++ b/app/assets/javascripts/authors.js
@@ -0,0 +1,41 @@
+var Authors = {
+    add: function (firstName, lastName, orcid) {
+        var newForm = $('#author-template').clone().html();
+
+        // Ensure the index of the new form is 1 greater than the current highest index, to prevent collisions
+        var index = 0;
+        $('#authors-list .author-form').each(function () {
+            var newIndex = parseInt($(this).data('index'));
+            if (newIndex > index) {
+                index = newIndex;
+            }
+        });
+
+        // Replace the placeholder index with the actual index
+        newForm = $(newForm.replace(/replace-me/g, index + 1));
+        newForm.appendTo('#authors-list');
+
+        if (typeof firstName !== 'undefined' && typeof lastName !== 'undefined') {
+            $('.author-first-name', newForm).val(firstName);
+            $('.author-last-name', newForm).val(lastName);
+            if (typeof orcid !== 'undefined') {
+                $('.author-orcid', newForm).val(orcid);
+            }
+        }
+
+        return false; // Stop form being submitted
+    },
+
+    // This is just cosmetic. The actual removal is done by rails,
+    //   by virtue of the hidden checkbox being checked when the label is clicked.
+    delete: function () {
+        $(this).parents('.author-form').fadeOut();
+    }
+};
+
+document.addEventListener("turbolinks:load", function() {
+
+    $('#authors')
+        .on('click', '#add-author-btn', Authors.add)
+        .on('change', '.delete-author-btn input.destroy-attribute', Authors.delete);
+});
diff --git a/app/controllers/materials_controller.rb b/app/controllers/materials_controller.rb
index 4d9a54723..ff9930bee 100644
--- a/app/controllers/materials_controller.rb
+++ b/app/controllers/materials_controller.rb
@@ -171,11 +171,12 @@ def material_params
                                      :content_provider_id, :difficulty_level, :version, :status,
                                      :date_created, :date_modified, :date_published, :other_types,
                                      :prerequisites, :syllabus, :visible, :learning_objectives, { subsets: [] },
-                                     { contributors: [] }, { authors: [] }, { target_audience: [] },
+                                     { contributors: [] }, { target_audience: [] },
                                      { collection_ids: [] }, { keywords: [] }, { resource_type: [] },
                                      { scientific_topic_names: [] }, { scientific_topic_uris: [] },
                                      { operation_names: [] }, { operation_uris: [] },
                                      { node_ids: [] }, { node_names: [] }, { fields: [] },
+                                     authors_attributes: %i[id first_name last_name orcid _destroy],
                                      external_resources_attributes: %i[id url title _destroy],
                                      external_resources: %i[url title],
                                      event_ids: [], locked_fields: [])
diff --git a/app/models/author.rb b/app/models/author.rb
new file mode 100644
index 000000000..c15d1ad29
--- /dev/null
+++ b/app/models/author.rb
@@ -0,0 +1,10 @@
+class Author < ApplicationRecord
+  has_many :material_authors, dependent: :destroy
+  has_many :materials, through: :material_authors
+
+  validates :first_name, :last_name, presence: true
+
+  def full_name
+    "#{first_name} #{last_name}".strip
+  end
+end
diff --git a/app/models/material.rb b/app/models/material.rb
index 9e1726c08..8037526eb 100644
--- a/app/models/material.rb
+++ b/app/models/material.rb
@@ -30,7 +30,9 @@ class Material < ApplicationRecord
       text :description
       text :contact
       text :doi
-      text :authors
+      text :authors do
+        authors.map(&:full_name)
+      end
       text :contributors
       text :target_audience
       text :keywords
@@ -51,7 +53,9 @@ class Material < ApplicationRecord
       end
       # other fields
       string :title
-      string :authors, multiple: true
+      string :authors, multiple: true do
+        authors.map(&:full_name)
+      end
       string :scientific_topics, multiple: true do
         scientific_topics_and_synonyms
       end
@@ -102,6 +106,10 @@ class Material < ApplicationRecord
 
   has_many :stars, as: :resource, dependent: :destroy
 
+  has_many :material_authors, dependent: :destroy
+  has_many :authors, through: :material_authors
+  accepts_nested_attributes_for :authors, allow_destroy: true, reject_if: :all_blank
+
   # Remove trailing and squeezes (:squish option) white spaces inside the string (before_validation):
   # e.g. "James     Bond  " => "James Bond"
   auto_strip_attributes :title, :description, :url, squish: false
@@ -111,10 +119,10 @@ class Material < ApplicationRecord
   validates :other_types, presence: true, if: proc { |m| m.resource_type.include?('other') }
   validates :keywords, length: { maximum: 20 }
 
-  clean_array_fields(:keywords, :fields, :contributors, :authors,
+  clean_array_fields(:keywords, :fields, :contributors,
                      :target_audience, :resource_type, :subsets)
 
-  update_suggestions(:keywords, :contributors, :authors, :target_audience,
+  update_suggestions(:keywords, :contributors, :target_audience,
                      :resource_type)
 
   def description=(desc)
@@ -212,7 +220,7 @@ def to_oai_dc
              'xsi:schemaLocation' => 'http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd') do
       xml.tag!('dc:title', title)
       xml.tag!('dc:description', description)
-      authors.each { |a| xml.tag!('dc:creator', a) }
+      authors.each { |a| xml.tag!('dc:creator', a.full_name) }
       contributors.each { |a| xml.tag!('dc:contributor', a) }
       xml.tag!('dc:publisher', content_provider.title) if content_provider
 
diff --git a/app/models/material_author.rb b/app/models/material_author.rb
new file mode 100644
index 000000000..b825001cd
--- /dev/null
+++ b/app/models/material_author.rb
@@ -0,0 +1,6 @@
+class MaterialAuthor < ApplicationRecord
+  belongs_to :material
+  belongs_to :author
+
+  validates :material, :author, presence: true
+end
diff --git a/app/views/common/_author_form.html.erb b/app/views/common/_author_form.html.erb
new file mode 100644
index 000000000..40be68c78
--- /dev/null
+++ b/app/views/common/_author_form.html.erb
@@ -0,0 +1,25 @@
+<% index ||= 'replace-me' %> <%# This is so we can render a blank version of this sub-form in the page, %>
+                             <%# which can be dynamically cloned using JavaScript to add more Authors to the main material form %>
+<% field_name_prefix = "#{form_name}[authors_attributes][#{index}]" %> <%# This format is dictated by "accepts_nested_attributes_for" %>
+
+<div class="form-inline author-form" data-index="<%= index -%>">
+  <%= hidden_field_tag("#{field_name_prefix}[id]", author.id) %>
+
+  <div class="form-group">
+    <%= text_field_tag "#{field_name_prefix}[first_name]", author.first_name, :class => 'form-control author-first-name', :placeholder => 'First Name' %>
+  </div>
+
+  <div class="form-group">
+    <%= text_field_tag "#{field_name_prefix}[last_name]", author.last_name, :class => 'form-control author-last-name', :placeholder => 'Last Name' %>
+  </div>
+
+  <div class="form-group">
+    <%= text_field_tag "#{field_name_prefix}[orcid]", author.orcid, :class => 'form-control author-orcid', :placeholder => 'ORCID (optional)' %>
+  </div>
+
+  <label class="ml-2 delete-author-btn">
+    <i class="icon icon-sm cross-icon icon-greyscale"></i>
+    <%= hidden_field_tag "#{field_name_prefix}[_destroy]", '0', :autocomplete => 'off' %>
+    <%= check_box_tag "#{field_name_prefix}[_destroy]", '1', false, :class => 'destroy-attribute', :autocomplete => 'off' %>
+  </label>
+</div>
diff --git a/app/views/materials/_form.html.erb b/app/views/materials/_form.html.erb
index b71aac73a..fa13376d5 100644
--- a/app/views/materials/_form.html.erb
+++ b/app/views/materials/_form.html.erb
@@ -68,8 +68,22 @@
               visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
 
   <!-- Field: Authors -->
-  <%= f.multi_input :authors, suggestions_url: people_autocomplete_suggestions_path, title: t('materials.hints.authors'),
-                    visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+  <div class="form-group" id="authors">
+    <%= f.label :authors %>
+    <%= f.field_lock :authors %>
+
+    <div id="authors-list">
+      <% @material.authors.each_with_index do |author, index| %>
+        <%= render partial: 'common/author_form',
+                   locals: { form_name: 'material', index: index, author: author } %>
+      <% end %>
+    </div>
+
+    <a href="#" id="add-author-btn" class="btn btn-icon">
+      <i class="icon icon-h4 plus-icon"></i>
+    </a>
+    <span class="help-inline-block help-block">Add author information</span>
+  </div>
 
   <!-- Field: Contributors -->
   <%= f.multi_input :contributors, suggestions_url: people_autocomplete_suggestions_path, title: t('materials.hints.contributors'),
@@ -195,6 +209,10 @@
              locals: { form_name: 'material', external_resource: ExternalResource.new } %>
 </div>
 
+<div id="author-template" style="display: none">
+  <%= render partial: 'common/author_form',
+             locals: { form_name: 'material', author: Author.new } %>
+</div>
 
 <script type="text/javascript">
     function removeSuggestion(suggestion) {
diff --git a/db/migrate/20251119095244_create_authors.rb b/db/migrate/20251119095244_create_authors.rb
new file mode 100644
index 000000000..c83f7cf65
--- /dev/null
+++ b/db/migrate/20251119095244_create_authors.rb
@@ -0,0 +1,13 @@
+class CreateAuthors < ActiveRecord::Migration[7.2]
+  def change
+    create_table :authors do |t|
+      t.string :first_name
+      t.string :last_name
+      t.string :orcid
+
+      t.timestamps
+    end
+
+    add_index :authors, :orcid
+  end
+end
diff --git a/db/migrate/20251119095245_create_material_authors.rb b/db/migrate/20251119095245_create_material_authors.rb
new file mode 100644
index 000000000..6b12a4200
--- /dev/null
+++ b/db/migrate/20251119095245_create_material_authors.rb
@@ -0,0 +1,12 @@
+class CreateMaterialAuthors < ActiveRecord::Migration[7.2]
+  def change
+    create_table :material_authors do |t|
+      t.references :material, null: false, foreign_key: true
+      t.references :author, null: false, foreign_key: true
+
+      t.timestamps
+    end
+
+    add_index :material_authors, [:material_id, :author_id], unique: true
+  end
+end
diff --git a/db/migrate/20251119095246_migrate_material_authors_data.rb b/db/migrate/20251119095246_migrate_material_authors_data.rb
new file mode 100644
index 000000000..833bb5439
--- /dev/null
+++ b/db/migrate/20251119095246_migrate_material_authors_data.rb
@@ -0,0 +1,52 @@
+class MigrateMaterialAuthorsData < ActiveRecord::Migration[7.2]
+  def up
+    # Migrate existing authors from array to Author model
+    Material.find_each do |material|
+      next if material.authors.blank?
+
+      material.authors.each do |author_name|
+        next if author_name.blank?
+
+        # Parse the name - assume "First Last" format
+        # Handle edge cases: single names, multiple spaces, etc.
+        parts = author_name.strip.split(/\s+/, 2)
+        
+        if parts.length == 1
+          # Single name - use as last name with empty first name
+          first_name = ''
+          last_name = parts[0]
+        else
+          first_name = parts[0]
+          last_name = parts[1] || ''
+        end
+
+        # Find or create author
+        author = Author.find_or_create_by!(
+          first_name: first_name,
+          last_name: last_name
+        )
+
+        # Create the association if it doesn't exist
+        MaterialAuthor.find_or_create_by!(
+          material_id: material.id,
+          author_id: author.id
+        )
+      end
+    end
+  end
+
+  def down
+    # Restore authors array from Author model
+    Material.find_each do |material|
+      author_names = material.authors.map(&:full_name).compact
+      # Use raw SQL to avoid validation issues
+      Material.connection.execute(
+        "UPDATE materials SET authors = ARRAY[#{author_names.map { |n| "'#{n.gsub("'", "''")}'" }.join(',')}]::varchar[] WHERE id = #{material.id}"
+      )
+    end
+
+    # Clean up the new tables
+    MaterialAuthor.delete_all
+    Author.delete_all
+  end
+end
diff --git a/db/migrate/20251119095247_remove_authors_from_materials.rb b/db/migrate/20251119095247_remove_authors_from_materials.rb
new file mode 100644
index 000000000..0304b09b1
--- /dev/null
+++ b/db/migrate/20251119095247_remove_authors_from_materials.rb
@@ -0,0 +1,5 @@
+class RemoveAuthorsFromMaterials < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :materials, :authors, :string, array: true, default: []
+  end
+end
diff --git a/test/fixtures/authors.yml b/test/fixtures/authors.yml
new file mode 100644
index 000000000..e188b132d
--- /dev/null
+++ b/test/fixtures/authors.yml
@@ -0,0 +1,26 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+horace:
+  first_name: Horace
+  last_name: Smith
+  orcid: 0000-0001-2345-6789
+
+flo:
+  first_name: Flo
+  last_name: Johnson
+  orcid: null
+
+nicolai_tesla:
+  first_name: Nicolai
+  last_name: Tesla
+  orcid: null
+
+thomas_edison:
+  first_name: Thomas
+  last_name: Edison
+  orcid: null
+
+saskia:
+  first_name: Saskia
+  last_name: Lawson-Tovey
+  orcid: null
diff --git a/test/fixtures/material_authors.yml b/test/fixtures/material_authors.yml
new file mode 100644
index 000000000..b727d96b3
--- /dev/null
+++ b/test/fixtures/material_authors.yml
@@ -0,0 +1,13 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+material_with_optionals_author1:
+  material: material_with_optionals
+  author: nicolai_tesla
+
+material_with_optionals_author2:
+  material: material_with_optionals
+  author: thomas_edison
+
+youtube_video_material_author:
+  material: youtube_video_material
+  author: saskia
diff --git a/test/fixtures/materials.yml b/test/fixtures/materials.yml
index 4d9a90b09..4ce6df5b2 100644
--- a/test/fixtures/materials.yml
+++ b/test/fixtures/materials.yml
@@ -136,7 +136,6 @@ material_with_optionals:
   date_modified: 2021-07-13
   date_published: 2021-07-14
   subsets: [ 'https://training.com/material/023/part-one', 'https://training.com/material/023/part-two' ]
-  authors: [ 'Nicolai Tesla', 'Thomas Edison' ]
   contributors: [ 'Dr Dre' ]
   prerequisites: " * None\n * Nothing at all\n"
   syllabus: '1. Overview\  2. The main part\  3. Summing up'
@@ -170,8 +169,6 @@ youtube_video_material:
   keywords:
     - REDCap
     - " sensitive data"
-  authors:
-    - Saskia Lawson-Tovey
   contributors:
     - Robert Andrews
     - Munazah Andrabi
diff --git a/test/models/author_test.rb b/test/models/author_test.rb
new file mode 100644
index 000000000..a49b7e593
--- /dev/null
+++ b/test/models/author_test.rb
@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class AuthorTest < ActiveSupport::TestCase
+  test 'should create author with first and last name' do
+    author = Author.create(first_name: 'John', last_name: 'Doe')
+    assert author.valid?
+    assert_equal 'John Doe', author.full_name
+  end
+
+  test 'should require first name' do
+    author = Author.new(last_name: 'Doe')
+    refute author.valid?
+    assert_includes author.errors[:first_name], "can't be blank"
+  end
+
+  test 'should require last name' do
+    author = Author.new(first_name: 'John')
+    refute author.valid?
+    assert_includes author.errors[:last_name], "can't be blank"
+  end
+
+  test 'should allow optional orcid' do
+    author = Author.create(first_name: 'John', last_name: 'Doe', orcid: '0000-0001-2345-6789')
+    assert author.valid?
+    assert_equal '0000-0001-2345-6789', author.orcid
+  end
+
+  test 'full_name should concatenate first and last name' do
+    author = Author.new(first_name: 'Jane', last_name: 'Smith')
+    assert_equal 'Jane Smith', author.full_name
+  end
+
+  test 'should associate with materials' do
+    author = authors(:horace)
+    assert_respond_to author, :materials
+  end
+end
diff --git a/test/models/material_test.rb b/test/models/material_test.rb
index a6cdc9ecd..2693bee67 100644
--- a/test/models/material_test.rb
+++ b/test/models/material_test.rb
@@ -9,7 +9,10 @@ class MaterialTest < ActiveSupport::TestCase
                                  description: 'short desc',
                                  url: 'http://goog.e.com',
                                  user: @user,
-                                 authors: ['horace', 'flo'],
+                                 authors_attributes: [
+                                   { first_name: 'Horace', last_name: 'Smith' },
+                                   { first_name: 'Flo', last_name: 'Johnson' }
+                                 ],
                                  doi: 'https://doi.org/10.1011/RSE.2019.55',
                                  licence: 'CC-BY-NC-SA-4.0',
                                  keywords: ['goblet'],
@@ -54,7 +57,7 @@ class MaterialTest < ActiveSupport::TestCase
 
     assert_not_nil m.authors, 'old authors is nil.'
     assert_equal 2, m.authors.size, 'old authors size not matched.'
-    assert_equal 'Thomas Edison', m.authors[1], 'old authors[1] not matched.'
+    assert_equal 'Thomas Edison', m.authors[1].full_name, 'old authors[1] not matched.'
 
     assert_not_nil m.contributors, 'old contributors is nil.'
     assert_equal 1, m.contributors.size, 'old contributors size not matched.'
@@ -76,7 +79,8 @@ class MaterialTest < ActiveSupport::TestCase
     m.date_modified = '2021-06-13'
     m.date_published = '2021-06-14'
     m.subsets = []
-    m.authors = ['Nikolai Tesla']
+    m.authors.destroy_all
+    m.authors.create!(first_name: 'Nikolai', last_name: 'Tesla')
     m.contributors = ['Prof. Stephen Hawking']
     m.prerequisites = 'Bring your enthusiasm'
     m.syllabus = "1. Overview\  2. The main part\  3. Summary"
@@ -119,7 +123,7 @@ class MaterialTest < ActiveSupport::TestCase
 
     assert_not_nil m2.authors, 'new authors is nil.'
     assert_equal 1, m2.authors.size, 'new authors size not matched.'
-    assert_equal 'Nikolai Tesla', m2.authors[0], 'new authors[0] not matched.'
+    assert_equal 'Nikolai Tesla', m2.authors[0].full_name, 'new authors[0] not matched.'
 
     assert_not_nil m2.contributors, 'new contributors is nil.'
     assert_equal 1, m2.contributors.size, 'new contributors size not matched.'
@@ -140,23 +144,29 @@ class MaterialTest < ActiveSupport::TestCase
     assert_equal 'default_user', material.user.role.name
   end
 
-  test 'should convert string value to empty array in authors' do
-    assert_not_equal @material.authors, []
-    assert @material.update(authors: 'string')
-    assert_equal [], @material.authors
-  end
-
-  test 'should convert nil to empty array in authors fields' do
-    assert_not_equal @material.authors, []
-    assert @material.update(authors: nil)
-    assert_equal [], @material.authors
-  end
-
-  test 'should remove bad values and strip authors array input' do
-    authors = ['john', 'bob', nil, [], '', 'frank ']
-    expected_authors = ['john', 'bob', 'frank']
-    assert @material.update(authors: authors)
-    assert_equal expected_authors, @material.authors
+  test 'should add authors via nested attributes' do
+    assert_equal 2, @material.authors.size
+    assert @material.update(authors_attributes: [
+      { first_name: 'John', last_name: 'Doe' },
+      { first_name: 'Jane', last_name: 'Smith', orcid: '0000-0002-1234-5678' }
+    ])
+    @material.reload
+    assert_equal 4, @material.authors.size
+    jane = @material.authors.find { |a| a.first_name == 'Jane' }
+    assert_not_nil jane
+    assert_equal 'Jane Smith', jane.full_name
+    assert_equal '0000-0002-1234-5678', jane.orcid
+  end
+
+  test 'should remove authors via nested attributes' do
+    assert_equal 2, @material.authors.size
+    author_to_remove = @material.authors.first
+    assert @material.update(authors_attributes: [
+      { id: author_to_remove.id, _destroy: '1' }
+    ])
+    @material.reload
+    assert_equal 1, @material.authors.size
+    refute @material.authors.include?(author_to_remove)
   end
 
   test 'should delete material when content provider deleted' do

From 0fe515deec987ba336e18e2f9c19d7de48356ec7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 19 Nov 2025 10:05:53 +0000
Subject: [PATCH 02/12] Update serializers, views, bioschemas and ingestors for
 new Author model

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 app/serializers/author_serializer.rb          |  3 +++
 app/serializers/material_serializer.rb        |  3 ++-
 app/views/common/_extra_metadata.html.erb     |  2 +-
 app/views/materials/show.json.jbuilder        |  4 +++-
 lib/bioschemas/learning_resource_generator.rb |  8 +++++++-
 lib/ingestors/material_csv_ingestor.rb        | 19 ++++++++++++++++++-
 lib/ingestors/zenodo_ingestor.rb              | 14 +++++++++++---
 7 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 app/serializers/author_serializer.rb

diff --git a/app/serializers/author_serializer.rb b/app/serializers/author_serializer.rb
new file mode 100644
index 000000000..a5e43647a
--- /dev/null
+++ b/app/serializers/author_serializer.rb
@@ -0,0 +1,3 @@
+class AuthorSerializer < ApplicationSerializer
+  attributes :id, :first_name, :last_name, :orcid, :full_name
+end
diff --git a/app/serializers/material_serializer.rb b/app/serializers/material_serializer.rb
index 4500fe153..239ad9435 100644
--- a/app/serializers/material_serializer.rb
+++ b/app/serializers/material_serializer.rb
@@ -5,7 +5,7 @@ class MaterialSerializer < ApplicationSerializer
 
              :doi, :licence, :version, :status,
 
-             :contact, :contributors, :authors,
+             :contact, :contributors,
 
              :difficulty_level, :target_audience, :prerequisites, :syllabus, :learning_objectives, :subsets,
 
@@ -18,4 +18,5 @@ class MaterialSerializer < ApplicationSerializer
   has_many :nodes
   has_many :collections
   has_many :events
+  has_many :authors
 end
diff --git a/app/views/common/_extra_metadata.html.erb b/app/views/common/_extra_metadata.html.erb
index d32155ece..32bb4336d 100644
--- a/app/views/common/_extra_metadata.html.erb
+++ b/app/views/common/_extra_metadata.html.erb
@@ -59,7 +59,7 @@
   <%= display_attribute(resource, :sponsors) { |values| values.join(', ') } %>
 <% end %>
 
-<%= display_attribute(resource, :authors) { |values| values.join(', ') } if resource.respond_to?(:authors) %>
+<%= display_attribute(resource, :authors) { |values| values.map(&:full_name).join(', ') } if resource.respond_to?(:authors) %>
 <%= display_attribute(resource, :contributors) { |values| values.join(', ') } if resource.respond_to?(:contributors) %>
 <%= display_attribute(resource, :remote_created_date) if resource.respond_to?(:remote_created_date) %>
 <%= display_attribute(resource, :remote_updated_date) if resource.respond_to?(:remote_updated_date) %>
diff --git a/app/views/materials/show.json.jbuilder b/app/views/materials/show.json.jbuilder
index ae6a68172..e79a3893f 100644
--- a/app/views/materials/show.json.jbuilder
+++ b/app/views/materials/show.json.jbuilder
@@ -6,7 +6,7 @@ json.extract! @material, :id, :title, :url, :description,
 
               :doi, :licence, :version, :status,
 
-              :contact, :contributors, :authors,
+              :contact, :contributors,
 
               :difficulty_level, :target_audience, :prerequisites, :syllabus, :learning_objectives, :subsets,
 
@@ -21,6 +21,8 @@ json.nodes @material.associated_nodes.collect { |x| { name: x[:name], node_id: x
 json.collections @material.collections.collect { |x| { title: x[:title], id: x[:id] } }
 json.events @material.events.collect { |x| { title: x[:title], id: x[:id] } }
 
+json.authors @material.authors.collect { |a| { id: a.id, first_name: a.first_name, last_name: a.last_name, orcid: a.orcid, full_name: a.full_name } }
+
 json.external_resources do
   @material.external_resources.each do |external_resource|
     json.partial! 'common/external_resource', external_resource: external_resource
diff --git a/lib/bioschemas/learning_resource_generator.rb b/lib/bioschemas/learning_resource_generator.rb
index 2b3b0563b..b1e4de340 100644
--- a/lib/bioschemas/learning_resource_generator.rb
+++ b/lib/bioschemas/learning_resource_generator.rb
@@ -15,7 +15,13 @@ def self.bioschemas_profile
     property :version, :version
     property :description, :description
     property :keywords, :keywords
-    property :author, -> (material) { material.authors.map { |p| person(p) } }
+    property :author, -> (material) { 
+      material.authors.map { |a| 
+        author_hash = { "@type" => "Person", "name" => a.full_name }
+        author_hash["@id"] = "https://orcid.org/#{a.orcid}" if a.orcid.present?
+        author_hash
+      } 
+    }
     property :contributor, -> (material) { material.contributors.map { |p| person(p) } }
     property :provider, -> (material) { provider(material) }
     property :audience, -> (material) {
diff --git a/lib/ingestors/material_csv_ingestor.rb b/lib/ingestors/material_csv_ingestor.rb
index d91790d98..759ae879b 100644
--- a/lib/ingestors/material_csv_ingestor.rb
+++ b/lib/ingestors/material_csv_ingestor.rb
@@ -42,7 +42,7 @@ def read(url)
           material.date_published = get_column row, 'Published'
           material.date_modified = get_column row, 'Modified'
           material.difficulty_level = process_competency row, 'Competency'
-          material.authors = process_array row, 'Authors'
+          material.authors_attributes = process_authors(process_array(row, 'Authors'))
           material.contributors = process_array row, 'Contributors'
           material.fields = process_array row, 'Fields'
           material.target_audience = process_array row, 'Audiences'
@@ -65,6 +65,23 @@ def read(url)
 
     private
 
+    def process_authors(authors_array)
+      return [] if authors_array.blank?
+      
+      authors_array.map do |author_name|
+        # Parse name into first and last name
+        name_parts = author_name.to_s.strip.split(/\s+/, 2)
+        first_name = name_parts.length > 1 ? name_parts[0] : ''
+        last_name = name_parts.length > 1 ? name_parts[1] : name_parts[0]
+        
+        {
+          first_name: first_name,
+          last_name: last_name,
+          orcid: nil
+        }
+      end
+    end
+
     def process_competency(row, header)
       row[header].nil? ? 'notspecified' : row[header]
     end
diff --git a/lib/ingestors/zenodo_ingestor.rb b/lib/ingestors/zenodo_ingestor.rb
index 449cd1733..05de3a201 100644
--- a/lib/ingestors/zenodo_ingestor.rb
+++ b/lib/ingestors/zenodo_ingestor.rb
@@ -60,7 +60,7 @@ def process_material(input)
         material = OpenStruct.new
         material.status = 'active'
         material.doi = input['doi'] unless metadata['doi'].nil?
-        material.authors = []
+        material.authors_attributes = []
         material.contributors = []
         unless metadata.nil?
           material.title = metadata['title'] unless metadata['title'].nil?
@@ -69,8 +69,16 @@ def process_material(input)
           material.licence = metadata['license']['id'] unless metadata.dig('license', 'id').nil?
           unless metadata['creators'].nil?
             metadata['creators'].each do |c|
-              entry = c['orcid'].nil? ? c['name'] : "#{c['name']} (orcid: #{c['orcid']})"
-              material.authors << entry
+              # Parse name into first and last name
+              name_parts = c['name'].to_s.strip.split(/\s+/, 2)
+              first_name = name_parts.length > 1 ? name_parts[0] : ''
+              last_name = name_parts.length > 1 ? name_parts[1] : name_parts[0]
+              
+              material.authors_attributes << {
+                first_name: first_name,
+                last_name: last_name,
+                orcid: c['orcid']
+              }
             end
           end
           unless metadata['contributors'].nil?

From 8c75f2132893450d2f801972e29b0692b1235d00 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 19 Nov 2025 10:11:22 +0000
Subject: [PATCH 03/12] Fix tests to work with new Author model

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 test/controllers/materials_controller_test.rb | 12 ++++++++++--
 test/unit/ingestors/zenodo_ingestor_test.rb   |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/controllers/materials_controller_test.rb b/test/controllers/materials_controller_test.rb
index e41945e12..1aaf8e017 100644
--- a/test/controllers/materials_controller_test.rb
+++ b/test/controllers/materials_controller_test.rb
@@ -253,7 +253,7 @@ class MaterialsControllerTest < ActionController::TestCase
           date_published: test_material.date_published,
           doi: test_material.doi,
           subsets: test_material.subsets,
-          authors: test_material.authors,
+          authors_attributes: test_material.authors.map { |a| { first_name: a.first_name, last_name: a.last_name, orcid: a.orcid } },
           contributors: test_material.contributors,
           prerequisites: test_material.prerequisites,
           syllabus: test_material.syllabus,
@@ -291,7 +291,15 @@ class MaterialsControllerTest < ActionController::TestCase
     assert_equal test_material.other_types, JSON.parse(response.body)['other_types'], 'other_types not matched'
     #assert_equal test_material.events, JSON.parse(response.body)['events'], 'events not matched'
     assert_equal test_material.target_audience, JSON.parse(response.body)['target_audience'], 'target audience not matched'
-    assert_equal test_material.authors, JSON.parse(response.body)['authors'], 'authors not matched'
+    # Authors is now an array of objects with id, first_name, last_name, orcid, full_name
+    response_authors = JSON.parse(response.body)['authors']
+    assert_equal test_material.authors.size, response_authors.size, 'authors count not matched'
+    response_authors.each_with_index do |author_json, i|
+      expected_author = test_material.authors[i]
+      assert_equal expected_author.first_name, author_json['first_name'], "author #{i} first_name not matched"
+      assert_equal expected_author.last_name, author_json['last_name'], "author #{i} last_name not matched"
+      assert_equal expected_author.full_name, author_json['full_name'], "author #{i} full_name not matched"
+    end
     assert_equal test_material.contributors, JSON.parse(response.body)['contributors'], 'contributors not matched'
     assert_equal test_material.subsets, JSON.parse(response.body)['subsets'], 'subsets not matched'
     assert_equal test_material.prerequisites, JSON.parse(response.body)['prerequisites'], 'prerequisites not matched'
diff --git a/test/unit/ingestors/zenodo_ingestor_test.rb b/test/unit/ingestors/zenodo_ingestor_test.rb
index dfd5d0305..a2e0145c6 100644
--- a/test/unit/ingestors/zenodo_ingestor_test.rb
+++ b/test/unit/ingestors/zenodo_ingestor_test.rb
@@ -48,7 +48,7 @@ class ZenodoIngestorTest < ActiveSupport::TestCase
     assert_equal 'CC-BY-4.0', material.licence, 'material licence not matched'
     assert_equal 'active', material.status, 'material status not matched'
     assert_equal 1, material.authors.size, 'material authors count not matched.'
-    assert material.authors.include?('Australian Research Data Commons')
+    assert material.authors.any? { |a| a.full_name == 'Australian Research Data Commons' }, 'author not found'
     assert_equal '10.5281/zenodo.10656276', material.doi, 'material.doi not matched.'
 
     # check material with contributors
@@ -62,7 +62,7 @@ class ZenodoIngestorTest < ActiveSupport::TestCase
 
     # check material from page 2
     material = get_zenodo_id(10052012, 'Privacy focused health data storage and access control through personal online datastores', 'Portal Provider')
-    assert material.authors.include?('Vidanage, Anushka (orcid: 0000-0002-5386-5871)'), 'material contributors[0] missing.'
+    assert material.authors.any? { |a| a.full_name == 'Vidanage, Anushka' && a.orcid == '0000-0002-5386-5871' }, 'author with ORCID not found'
   end
 
   private

From bb8831e361adb3a9b4a58dfb0eafe1805c4005f7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 2 Dec 2025 10:25:20 +0000
Subject: [PATCH 04/12] Refactor Author to generic Person model with
 polymorphic PersonLink

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 app/assets/javascripts/authors.js             | 41 -------------------
 app/assets/javascripts/people.js              | 39 ++++++++++++++++++
 app/controllers/materials_controller.rb       |  2 +-
 app/models/author.rb                          | 10 -----
 app/models/material.rb                        |  7 ++--
 app/models/material_author.rb                 |  6 ---
 app/models/person.rb                          |  9 ++++
 app/models/person_link.rb                     |  7 ++++
 app/serializers/material_serializer.rb        |  2 +-
 ...hor_serializer.rb => person_serializer.rb} |  2 +-
 app/views/common/_author_form.html.erb        | 25 -----------
 app/views/common/_person_form.html.erb        | 27 ++++++++++++
 app/views/materials/_form.html.erb            | 18 ++++----
 ...ors.rb => 20251119095244_create_people.rb} |  6 +--
 .../20251119095245_create_material_authors.rb | 12 ------
 .../20251119095245_create_person_links.rb     | 14 +++++++
 ...119095246_migrate_material_authors_data.rb | 21 +++++-----
 lib/ingestors/material_csv_ingestor.rb        | 11 +++--
 lib/ingestors/zenodo_ingestor.rb              | 13 +++---
 test/controllers/materials_controller_test.rb |  2 +-
 test/fixtures/material_authors.yml            | 13 ------
 test/fixtures/{authors.yml => people.yml}     |  0
 test/fixtures/person_links.yml                | 16 ++++++++
 test/models/author_test.rb                    | 37 -----------------
 test/models/material_test.rb                  | 24 +++++------
 test/models/person_test.rb                    | 37 +++++++++++++++++
 26 files changed, 207 insertions(+), 194 deletions(-)
 delete mode 100644 app/assets/javascripts/authors.js
 create mode 100644 app/assets/javascripts/people.js
 delete mode 100644 app/models/author.rb
 delete mode 100644 app/models/material_author.rb
 create mode 100644 app/models/person.rb
 create mode 100644 app/models/person_link.rb
 rename app/serializers/{author_serializer.rb => person_serializer.rb} (58%)
 delete mode 100644 app/views/common/_author_form.html.erb
 create mode 100644 app/views/common/_person_form.html.erb
 rename db/migrate/{20251119095244_create_authors.rb => 20251119095244_create_people.rb} (52%)
 delete mode 100644 db/migrate/20251119095245_create_material_authors.rb
 create mode 100644 db/migrate/20251119095245_create_person_links.rb
 delete mode 100644 test/fixtures/material_authors.yml
 rename test/fixtures/{authors.yml => people.yml} (100%)
 create mode 100644 test/fixtures/person_links.yml
 delete mode 100644 test/models/author_test.rb
 create mode 100644 test/models/person_test.rb

diff --git a/app/assets/javascripts/authors.js b/app/assets/javascripts/authors.js
deleted file mode 100644
index 1ead1611c..000000000
--- a/app/assets/javascripts/authors.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var Authors = {
-    add: function (firstName, lastName, orcid) {
-        var newForm = $('#author-template').clone().html();
-
-        // Ensure the index of the new form is 1 greater than the current highest index, to prevent collisions
-        var index = 0;
-        $('#authors-list .author-form').each(function () {
-            var newIndex = parseInt($(this).data('index'));
-            if (newIndex > index) {
-                index = newIndex;
-            }
-        });
-
-        // Replace the placeholder index with the actual index
-        newForm = $(newForm.replace(/replace-me/g, index + 1));
-        newForm.appendTo('#authors-list');
-
-        if (typeof firstName !== 'undefined' && typeof lastName !== 'undefined') {
-            $('.author-first-name', newForm).val(firstName);
-            $('.author-last-name', newForm).val(lastName);
-            if (typeof orcid !== 'undefined') {
-                $('.author-orcid', newForm).val(orcid);
-            }
-        }
-
-        return false; // Stop form being submitted
-    },
-
-    // This is just cosmetic. The actual removal is done by rails,
-    //   by virtue of the hidden checkbox being checked when the label is clicked.
-    delete: function () {
-        $(this).parents('.author-form').fadeOut();
-    }
-};
-
-document.addEventListener("turbolinks:load", function() {
-
-    $('#authors')
-        .on('click', '#add-author-btn', Authors.add)
-        .on('change', '.delete-author-btn input.destroy-attribute', Authors.delete);
-});
diff --git a/app/assets/javascripts/people.js b/app/assets/javascripts/people.js
new file mode 100644
index 000000000..b364a80cd
--- /dev/null
+++ b/app/assets/javascripts/people.js
@@ -0,0 +1,39 @@
+var People = {
+    add: function (role) {
+        var templateId = '#person-' + role + '-template';
+        var listId = '#person-' + role + '-list';
+        var newForm = $(templateId).clone().html();
+
+        // Ensure the index of the new form is 1 greater than the current highest index, to prevent collisions
+        var index = 0;
+        $(listId + ' .person-form').each(function () {
+            var newIndex = parseInt($(this).data('index'));
+            if (newIndex > index) {
+                index = newIndex;
+            }
+        });
+
+        // Replace the placeholder index with the actual index
+        newForm = $(newForm.replace(/replace-me/g, index + 1));
+        newForm.appendTo(listId);
+
+        return false; // Stop form being submitted
+    },
+
+    // This is just cosmetic. The actual removal is done by rails,
+    //   by virtue of the hidden checkbox being checked when the label is clicked.
+    delete: function () {
+        $(this).parents('.person-form').fadeOut();
+    }
+};
+
+document.addEventListener("turbolinks:load", function() {
+
+    $('[id^="person-"]')
+        .on('click', '[id^="add-person-"]', function() {
+            var role = $(this).data('role');
+            People.add(role);
+            return false;
+        })
+        .on('change', '.delete-person-btn input.destroy-attribute', People.delete);
+});
diff --git a/app/controllers/materials_controller.rb b/app/controllers/materials_controller.rb
index ff9930bee..ebd7976c8 100644
--- a/app/controllers/materials_controller.rb
+++ b/app/controllers/materials_controller.rb
@@ -176,7 +176,7 @@ def material_params
                                      { scientific_topic_names: [] }, { scientific_topic_uris: [] },
                                      { operation_names: [] }, { operation_uris: [] },
                                      { node_ids: [] }, { node_names: [] }, { fields: [] },
-                                     authors_attributes: %i[id first_name last_name orcid _destroy],
+                                     person_links_attributes: [:id, :role, :_destroy, person_attributes: %i[id first_name last_name orcid]],
                                      external_resources_attributes: %i[id url title _destroy],
                                      external_resources: %i[url title],
                                      event_ids: [], locked_fields: [])
diff --git a/app/models/author.rb b/app/models/author.rb
deleted file mode 100644
index c15d1ad29..000000000
--- a/app/models/author.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class Author < ApplicationRecord
-  has_many :material_authors, dependent: :destroy
-  has_many :materials, through: :material_authors
-
-  validates :first_name, :last_name, presence: true
-
-  def full_name
-    "#{first_name} #{last_name}".strip
-  end
-end
diff --git a/app/models/material.rb b/app/models/material.rb
index 8037526eb..ca2fb87fd 100644
--- a/app/models/material.rb
+++ b/app/models/material.rb
@@ -106,9 +106,10 @@ class Material < ApplicationRecord
 
   has_many :stars, as: :resource, dependent: :destroy
 
-  has_many :material_authors, dependent: :destroy
-  has_many :authors, through: :material_authors
-  accepts_nested_attributes_for :authors, allow_destroy: true, reject_if: :all_blank
+  has_many :person_links, as: :resource, dependent: :destroy
+  has_many :people, through: :person_links
+  has_many :authors, -> { where(person_links: { role: 'author' }) }, through: :person_links, source: :person
+  accepts_nested_attributes_for :person_links, allow_destroy: true, reject_if: :all_blank
 
   # Remove trailing and squeezes (:squish option) white spaces inside the string (before_validation):
   # e.g. "James     Bond  " => "James Bond"
diff --git a/app/models/material_author.rb b/app/models/material_author.rb
deleted file mode 100644
index b825001cd..000000000
--- a/app/models/material_author.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class MaterialAuthor < ApplicationRecord
-  belongs_to :material
-  belongs_to :author
-
-  validates :material, :author, presence: true
-end
diff --git a/app/models/person.rb b/app/models/person.rb
new file mode 100644
index 000000000..43d294adc
--- /dev/null
+++ b/app/models/person.rb
@@ -0,0 +1,9 @@
+class Person < ApplicationRecord
+  has_many :person_links, dependent: :destroy
+
+  validates :first_name, :last_name, presence: true
+
+  def full_name
+    "#{first_name} #{last_name}".strip
+  end
+end
diff --git a/app/models/person_link.rb b/app/models/person_link.rb
new file mode 100644
index 000000000..80494a22a
--- /dev/null
+++ b/app/models/person_link.rb
@@ -0,0 +1,7 @@
+class PersonLink < ApplicationRecord
+  belongs_to :resource, polymorphic: true
+  belongs_to :person
+  accepts_nested_attributes_for :person, reject_if: :all_blank
+
+  validates :resource, :person, :role, presence: true
+end
diff --git a/app/serializers/material_serializer.rb b/app/serializers/material_serializer.rb
index 239ad9435..29c01bd2c 100644
--- a/app/serializers/material_serializer.rb
+++ b/app/serializers/material_serializer.rb
@@ -18,5 +18,5 @@ class MaterialSerializer < ApplicationSerializer
   has_many :nodes
   has_many :collections
   has_many :events
-  has_many :authors
+  has_many :authors, serializer: PersonSerializer
 end
diff --git a/app/serializers/author_serializer.rb b/app/serializers/person_serializer.rb
similarity index 58%
rename from app/serializers/author_serializer.rb
rename to app/serializers/person_serializer.rb
index a5e43647a..8da7786ba 100644
--- a/app/serializers/author_serializer.rb
+++ b/app/serializers/person_serializer.rb
@@ -1,3 +1,3 @@
-class AuthorSerializer < ApplicationSerializer
+class PersonSerializer < ApplicationSerializer
   attributes :id, :first_name, :last_name, :orcid, :full_name
 end
diff --git a/app/views/common/_author_form.html.erb b/app/views/common/_author_form.html.erb
deleted file mode 100644
index 40be68c78..000000000
--- a/app/views/common/_author_form.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% index ||= 'replace-me' %> <%# This is so we can render a blank version of this sub-form in the page, %>
-                             <%# which can be dynamically cloned using JavaScript to add more Authors to the main material form %>
-<% field_name_prefix = "#{form_name}[authors_attributes][#{index}]" %> <%# This format is dictated by "accepts_nested_attributes_for" %>
-
-<div class="form-inline author-form" data-index="<%= index -%>">
-  <%= hidden_field_tag("#{field_name_prefix}[id]", author.id) %>
-
-  <div class="form-group">
-    <%= text_field_tag "#{field_name_prefix}[first_name]", author.first_name, :class => 'form-control author-first-name', :placeholder => 'First Name' %>
-  </div>
-
-  <div class="form-group">
-    <%= text_field_tag "#{field_name_prefix}[last_name]", author.last_name, :class => 'form-control author-last-name', :placeholder => 'Last Name' %>
-  </div>
-
-  <div class="form-group">
-    <%= text_field_tag "#{field_name_prefix}[orcid]", author.orcid, :class => 'form-control author-orcid', :placeholder => 'ORCID (optional)' %>
-  </div>
-
-  <label class="ml-2 delete-author-btn">
-    <i class="icon icon-sm cross-icon icon-greyscale"></i>
-    <%= hidden_field_tag "#{field_name_prefix}[_destroy]", '0', :autocomplete => 'off' %>
-    <%= check_box_tag "#{field_name_prefix}[_destroy]", '1', false, :class => 'destroy-attribute', :autocomplete => 'off' %>
-  </label>
-</div>
diff --git a/app/views/common/_person_form.html.erb b/app/views/common/_person_form.html.erb
new file mode 100644
index 000000000..12226aa7d
--- /dev/null
+++ b/app/views/common/_person_form.html.erb
@@ -0,0 +1,27 @@
+<% index ||= 'replace-me' %> <%# This is so we can render a blank version of this sub-form in the page, %>
+                             <%# which can be dynamically cloned using JavaScript to add more People to the main form %>
+<% field_name_prefix = "#{form_name}[person_links_attributes][#{index}]" %> <%# This format is dictated by "accepts_nested_attributes_for" %>
+
+<div class="form-inline person-form" data-index="<%= index -%>" data-role="<%= role -%>">
+  <%= hidden_field_tag("#{field_name_prefix}[id]", person_link&.id) %>
+  <%= hidden_field_tag("#{field_name_prefix}[role]", role) %>
+  <%= hidden_field_tag("#{field_name_prefix}[person_attributes][id]", person_link&.person&.id) %>
+
+  <div class="form-group">
+    <%= text_field_tag "#{field_name_prefix}[person_attributes][first_name]", person_link&.person&.first_name, :class => 'form-control person-first-name', :placeholder => 'First Name' %>
+  </div>
+
+  <div class="form-group">
+    <%= text_field_tag "#{field_name_prefix}[person_attributes][last_name]", person_link&.person&.last_name, :class => 'form-control person-last-name', :placeholder => 'Last Name' %>
+  </div>
+
+  <div class="form-group">
+    <%= text_field_tag "#{field_name_prefix}[person_attributes][orcid]", person_link&.person&.orcid, :class => 'form-control person-orcid', :placeholder => 'ORCID (optional)' %>
+  </div>
+
+  <label class="ml-2 delete-person-btn">
+    <i class="icon icon-sm cross-icon icon-greyscale"></i>
+    <%= hidden_field_tag "#{field_name_prefix}[_destroy]", '0', :autocomplete => 'off' %>
+    <%= check_box_tag "#{field_name_prefix}[_destroy]", '1', false, :class => 'destroy-attribute', :autocomplete => 'off' %>
+  </label>
+</div>
diff --git a/app/views/materials/_form.html.erb b/app/views/materials/_form.html.erb
index fa13376d5..bd162ce93 100644
--- a/app/views/materials/_form.html.erb
+++ b/app/views/materials/_form.html.erb
@@ -68,18 +68,18 @@
               visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
 
   <!-- Field: Authors -->
-  <div class="form-group" id="authors">
+  <div class="form-group" id="person-author">
     <%= f.label :authors %>
     <%= f.field_lock :authors %>
 
-    <div id="authors-list">
-      <% @material.authors.each_with_index do |author, index| %>
-        <%= render partial: 'common/author_form',
-                   locals: { form_name: 'material', index: index, author: author } %>
+    <div id="person-author-list">
+      <% @material.person_links.where(role: 'author').each_with_index do |person_link, index| %>
+        <%= render partial: 'common/person_form',
+                   locals: { form_name: 'material', index: index, person_link: person_link, role: 'author' } %>
       <% end %>
     </div>
 
-    <a href="#" id="add-author-btn" class="btn btn-icon">
+    <a href="#" id="add-person-author" data-role="author" class="btn btn-icon">
       <i class="icon icon-h4 plus-icon"></i>
     </a>
     <span class="help-inline-block help-block">Add author information</span>
@@ -209,9 +209,9 @@
              locals: { form_name: 'material', external_resource: ExternalResource.new } %>
 </div>
 
-<div id="author-template" style="display: none">
-  <%= render partial: 'common/author_form',
-             locals: { form_name: 'material', author: Author.new } %>
+<div id="person-author-template" style="display: none">
+  <%= render partial: 'common/person_form',
+             locals: { form_name: 'material', person_link: nil, role: 'author' } %>
 </div>
 
 <script type="text/javascript">
diff --git a/db/migrate/20251119095244_create_authors.rb b/db/migrate/20251119095244_create_people.rb
similarity index 52%
rename from db/migrate/20251119095244_create_authors.rb
rename to db/migrate/20251119095244_create_people.rb
index c83f7cf65..c9895ca42 100644
--- a/db/migrate/20251119095244_create_authors.rb
+++ b/db/migrate/20251119095244_create_people.rb
@@ -1,6 +1,6 @@
-class CreateAuthors < ActiveRecord::Migration[7.2]
+class CreatePeople < ActiveRecord::Migration[7.2]
   def change
-    create_table :authors do |t|
+    create_table :people do |t|
       t.string :first_name
       t.string :last_name
       t.string :orcid
@@ -8,6 +8,6 @@ def change
       t.timestamps
     end
 
-    add_index :authors, :orcid
+    add_index :people, :orcid
   end
 end
diff --git a/db/migrate/20251119095245_create_material_authors.rb b/db/migrate/20251119095245_create_material_authors.rb
deleted file mode 100644
index 6b12a4200..000000000
--- a/db/migrate/20251119095245_create_material_authors.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreateMaterialAuthors < ActiveRecord::Migration[7.2]
-  def change
-    create_table :material_authors do |t|
-      t.references :material, null: false, foreign_key: true
-      t.references :author, null: false, foreign_key: true
-
-      t.timestamps
-    end
-
-    add_index :material_authors, [:material_id, :author_id], unique: true
-  end
-end
diff --git a/db/migrate/20251119095245_create_person_links.rb b/db/migrate/20251119095245_create_person_links.rb
new file mode 100644
index 000000000..ce2b9edb2
--- /dev/null
+++ b/db/migrate/20251119095245_create_person_links.rb
@@ -0,0 +1,14 @@
+class CreatePersonLinks < ActiveRecord::Migration[7.2]
+  def change
+    create_table :person_links do |t|
+      t.references :resource, polymorphic: true, null: false
+      t.references :person, null: false, foreign_key: true
+      t.string :role, null: false
+
+      t.timestamps
+    end
+
+    add_index :person_links, [:resource_type, :resource_id, :person_id, :role],
+              unique: true, name: 'index_person_links_uniqueness'
+  end
+end
diff --git a/db/migrate/20251119095246_migrate_material_authors_data.rb b/db/migrate/20251119095246_migrate_material_authors_data.rb
index 833bb5439..ca114c606 100644
--- a/db/migrate/20251119095246_migrate_material_authors_data.rb
+++ b/db/migrate/20251119095246_migrate_material_authors_data.rb
@@ -1,6 +1,6 @@
 class MigrateMaterialAuthorsData < ActiveRecord::Migration[7.2]
   def up
-    # Migrate existing authors from array to Author model
+    # Migrate existing authors from array to Person model
     Material.find_each do |material|
       next if material.authors.blank?
 
@@ -20,25 +20,26 @@ def up
           last_name = parts[1] || ''
         end
 
-        # Find or create author
-        author = Author.find_or_create_by!(
+        # Find or create person
+        person = Person.find_or_create_by!(
           first_name: first_name,
           last_name: last_name
         )
 
         # Create the association if it doesn't exist
-        MaterialAuthor.find_or_create_by!(
-          material_id: material.id,
-          author_id: author.id
+        PersonLink.find_or_create_by!(
+          resource: material,
+          person_id: person.id,
+          role: 'author'
         )
       end
     end
   end
 
   def down
-    # Restore authors array from Author model
+    # Restore authors array from Person model
     Material.find_each do |material|
-      author_names = material.authors.map(&:full_name).compact
+      author_names = material.people.where(person_links: { role: 'author' }).map(&:full_name).compact
       # Use raw SQL to avoid validation issues
       Material.connection.execute(
         "UPDATE materials SET authors = ARRAY[#{author_names.map { |n| "'#{n.gsub("'", "''")}'" }.join(',')}]::varchar[] WHERE id = #{material.id}"
@@ -46,7 +47,7 @@ def down
     end
 
     # Clean up the new tables
-    MaterialAuthor.delete_all
-    Author.delete_all
+    PersonLink.delete_all
+    Person.delete_all
   end
 end
diff --git a/lib/ingestors/material_csv_ingestor.rb b/lib/ingestors/material_csv_ingestor.rb
index 759ae879b..5f546b2b3 100644
--- a/lib/ingestors/material_csv_ingestor.rb
+++ b/lib/ingestors/material_csv_ingestor.rb
@@ -42,7 +42,7 @@ def read(url)
           material.date_published = get_column row, 'Published'
           material.date_modified = get_column row, 'Modified'
           material.difficulty_level = process_competency row, 'Competency'
-          material.authors_attributes = process_authors(process_array(row, 'Authors'))
+          material.person_links_attributes = process_authors(process_array(row, 'Authors'))
           material.contributors = process_array row, 'Contributors'
           material.fields = process_array row, 'Fields'
           material.target_audience = process_array row, 'Audiences'
@@ -75,9 +75,12 @@ def process_authors(authors_array)
         last_name = name_parts.length > 1 ? name_parts[1] : name_parts[0]
         
         {
-          first_name: first_name,
-          last_name: last_name,
-          orcid: nil
+          role: 'author',
+          person_attributes: {
+            first_name: first_name,
+            last_name: last_name,
+            orcid: nil
+          }
         }
       end
     end
diff --git a/lib/ingestors/zenodo_ingestor.rb b/lib/ingestors/zenodo_ingestor.rb
index 05de3a201..0e498efef 100644
--- a/lib/ingestors/zenodo_ingestor.rb
+++ b/lib/ingestors/zenodo_ingestor.rb
@@ -60,7 +60,7 @@ def process_material(input)
         material = OpenStruct.new
         material.status = 'active'
         material.doi = input['doi'] unless metadata['doi'].nil?
-        material.authors_attributes = []
+        material.person_links_attributes = []
         material.contributors = []
         unless metadata.nil?
           material.title = metadata['title'] unless metadata['title'].nil?
@@ -74,10 +74,13 @@ def process_material(input)
               first_name = name_parts.length > 1 ? name_parts[0] : ''
               last_name = name_parts.length > 1 ? name_parts[1] : name_parts[0]
               
-              material.authors_attributes << {
-                first_name: first_name,
-                last_name: last_name,
-                orcid: c['orcid']
+              material.person_links_attributes << {
+                role: 'author',
+                person_attributes: {
+                  first_name: first_name,
+                  last_name: last_name,
+                  orcid: c['orcid']
+                }
               }
             end
           end
diff --git a/test/controllers/materials_controller_test.rb b/test/controllers/materials_controller_test.rb
index 1aaf8e017..470bdccbe 100644
--- a/test/controllers/materials_controller_test.rb
+++ b/test/controllers/materials_controller_test.rb
@@ -253,7 +253,7 @@ class MaterialsControllerTest < ActionController::TestCase
           date_published: test_material.date_published,
           doi: test_material.doi,
           subsets: test_material.subsets,
-          authors_attributes: test_material.authors.map { |a| { first_name: a.first_name, last_name: a.last_name, orcid: a.orcid } },
+          person_links_attributes: test_material.person_links.where(role: 'author').map { |pl| { role: 'author', person_attributes: { first_name: pl.person.first_name, last_name: pl.person.last_name, orcid: pl.person.orcid } } },
           contributors: test_material.contributors,
           prerequisites: test_material.prerequisites,
           syllabus: test_material.syllabus,
diff --git a/test/fixtures/material_authors.yml b/test/fixtures/material_authors.yml
deleted file mode 100644
index b727d96b3..000000000
--- a/test/fixtures/material_authors.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-material_with_optionals_author1:
-  material: material_with_optionals
-  author: nicolai_tesla
-
-material_with_optionals_author2:
-  material: material_with_optionals
-  author: thomas_edison
-
-youtube_video_material_author:
-  material: youtube_video_material
-  author: saskia
diff --git a/test/fixtures/authors.yml b/test/fixtures/people.yml
similarity index 100%
rename from test/fixtures/authors.yml
rename to test/fixtures/people.yml
diff --git a/test/fixtures/person_links.yml b/test/fixtures/person_links.yml
new file mode 100644
index 000000000..35a597950
--- /dev/null
+++ b/test/fixtures/person_links.yml
@@ -0,0 +1,16 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+material_with_optionals_author1:
+  resource: material_with_optionals (Material)
+  person: nicolai_tesla
+  role: author
+
+material_with_optionals_author2:
+  resource: material_with_optionals (Material)
+  person: thomas_edison
+  role: author
+
+youtube_video_material_author:
+  resource: youtube_video_material (Material)
+  person: saskia
+  role: author
diff --git a/test/models/author_test.rb b/test/models/author_test.rb
deleted file mode 100644
index a49b7e593..000000000
--- a/test/models/author_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'test_helper'
-
-class AuthorTest < ActiveSupport::TestCase
-  test 'should create author with first and last name' do
-    author = Author.create(first_name: 'John', last_name: 'Doe')
-    assert author.valid?
-    assert_equal 'John Doe', author.full_name
-  end
-
-  test 'should require first name' do
-    author = Author.new(last_name: 'Doe')
-    refute author.valid?
-    assert_includes author.errors[:first_name], "can't be blank"
-  end
-
-  test 'should require last name' do
-    author = Author.new(first_name: 'John')
-    refute author.valid?
-    assert_includes author.errors[:last_name], "can't be blank"
-  end
-
-  test 'should allow optional orcid' do
-    author = Author.create(first_name: 'John', last_name: 'Doe', orcid: '0000-0001-2345-6789')
-    assert author.valid?
-    assert_equal '0000-0001-2345-6789', author.orcid
-  end
-
-  test 'full_name should concatenate first and last name' do
-    author = Author.new(first_name: 'Jane', last_name: 'Smith')
-    assert_equal 'Jane Smith', author.full_name
-  end
-
-  test 'should associate with materials' do
-    author = authors(:horace)
-    assert_respond_to author, :materials
-  end
-end
diff --git a/test/models/material_test.rb b/test/models/material_test.rb
index 2693bee67..f92073435 100644
--- a/test/models/material_test.rb
+++ b/test/models/material_test.rb
@@ -9,9 +9,9 @@ class MaterialTest < ActiveSupport::TestCase
                                  description: 'short desc',
                                  url: 'http://goog.e.com',
                                  user: @user,
-                                 authors_attributes: [
-                                   { first_name: 'Horace', last_name: 'Smith' },
-                                   { first_name: 'Flo', last_name: 'Johnson' }
+                                 person_links_attributes: [
+                                   { role: 'author', person_attributes: { first_name: 'Horace', last_name: 'Smith' } },
+                                   { role: 'author', person_attributes: { first_name: 'Flo', last_name: 'Johnson' } }
                                  ],
                                  doi: 'https://doi.org/10.1011/RSE.2019.55',
                                  licence: 'CC-BY-NC-SA-4.0',
@@ -79,8 +79,9 @@ class MaterialTest < ActiveSupport::TestCase
     m.date_modified = '2021-06-13'
     m.date_published = '2021-06-14'
     m.subsets = []
-    m.authors.destroy_all
-    m.authors.create!(first_name: 'Nikolai', last_name: 'Tesla')
+    m.person_links.where(role: 'author').destroy_all
+    person = Person.create!(first_name: 'Nikolai', last_name: 'Tesla')
+    m.person_links.create!(person: person, role: 'author')
     m.contributors = ['Prof. Stephen Hawking']
     m.prerequisites = 'Bring your enthusiasm'
     m.syllabus = "1. Overview\  2. The main part\  3. Summary"
@@ -146,9 +147,9 @@ class MaterialTest < ActiveSupport::TestCase
 
   test 'should add authors via nested attributes' do
     assert_equal 2, @material.authors.size
-    assert @material.update(authors_attributes: [
-      { first_name: 'John', last_name: 'Doe' },
-      { first_name: 'Jane', last_name: 'Smith', orcid: '0000-0002-1234-5678' }
+    assert @material.update(person_links_attributes: [
+      { role: 'author', person_attributes: { first_name: 'John', last_name: 'Doe' } },
+      { role: 'author', person_attributes: { first_name: 'Jane', last_name: 'Smith', orcid: '0000-0002-1234-5678' } }
     ])
     @material.reload
     assert_equal 4, @material.authors.size
@@ -160,13 +161,12 @@ class MaterialTest < ActiveSupport::TestCase
 
   test 'should remove authors via nested attributes' do
     assert_equal 2, @material.authors.size
-    author_to_remove = @material.authors.first
-    assert @material.update(authors_attributes: [
-      { id: author_to_remove.id, _destroy: '1' }
+    person_link_to_remove = @material.person_links.where(role: 'author').first
+    assert @material.update(person_links_attributes: [
+      { id: person_link_to_remove.id, _destroy: '1' }
     ])
     @material.reload
     assert_equal 1, @material.authors.size
-    refute @material.authors.include?(author_to_remove)
   end
 
   test 'should delete material when content provider deleted' do
diff --git a/test/models/person_test.rb b/test/models/person_test.rb
new file mode 100644
index 000000000..39e6ed85b
--- /dev/null
+++ b/test/models/person_test.rb
@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class PersonTest < ActiveSupport::TestCase
+  test 'should create person with first and last name' do
+    person = Person.create(first_name: 'John', last_name: 'Doe')
+    assert person.valid?
+    assert_equal 'John Doe', person.full_name
+  end
+
+  test 'should require first name' do
+    person = Person.new(last_name: 'Doe')
+    refute person.valid?
+    assert_includes person.errors[:first_name], "can't be blank"
+  end
+
+  test 'should require last name' do
+    person = Person.new(first_name: 'John')
+    refute person.valid?
+    assert_includes person.errors[:last_name], "can't be blank"
+  end
+
+  test 'should allow optional orcid' do
+    person = Person.create(first_name: 'John', last_name: 'Doe', orcid: '0000-0001-2345-6789')
+    assert person.valid?
+    assert_equal '0000-0001-2345-6789', person.orcid
+  end
+
+  test 'full_name should concatenate first and last name' do
+    person = Person.new(first_name: 'Jane', last_name: 'Smith')
+    assert_equal 'Jane Smith', person.full_name
+  end
+
+  test 'should have person_links' do
+    person = people(:horace)
+    assert_respond_to person, :person_links
+  end
+end

From 936b12696f0c3125392f4d4010d7c223893b2c4b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 2 Dec 2025 11:17:24 +0000
Subject: [PATCH 05/12] Add custom authors= setter for legacy API backwards
 compatibility

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 app/models/material.rb       | 35 +++++++++++++++++++++++
 test/models/material_test.rb | 55 ++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/app/models/material.rb b/app/models/material.rb
index ca2fb87fd..ab68fbc87 100644
--- a/app/models/material.rb
+++ b/app/models/material.rb
@@ -111,6 +111,41 @@ class Material < ApplicationRecord
   has_many :authors, -> { where(person_links: { role: 'author' }) }, through: :person_links, source: :person
   accepts_nested_attributes_for :person_links, allow_destroy: true, reject_if: :all_blank
 
+  # Custom setter for authors that accepts both strings (legacy API) and Person objects
+  def authors=(value)
+    return if value.nil?
+    
+    # Convert to array if needed
+    authors_array = Array(value).reject(&:blank?)
+    
+    # Remove existing author links
+    person_links.where(role: 'author').destroy_all
+    
+    authors_array.each do |author|
+      if author.is_a?(String)
+        # Legacy format: parse string into first_name and last_name
+        parts = author.strip.split(/\s+/, 2)
+        first_name = parts.length > 1 ? parts[0] : ''
+        last_name = parts.length > 1 ? parts[1] : parts[0]
+        
+        person = Person.find_or_create_by!(first_name: first_name, last_name: last_name)
+        person_links.build(person: person, role: 'author')
+      elsif author.is_a?(Hash)
+        # Hash format from API
+        first_name = author[:first_name] || author['first_name'] || ''
+        last_name = author[:last_name] || author['last_name'] || ''
+        orcid = author[:orcid] || author['orcid']
+        
+        person = Person.find_or_create_by!(first_name: first_name, last_name: last_name)
+        person.update!(orcid: orcid) if orcid.present?
+        person_links.build(person: person, role: 'author')
+      elsif author.is_a?(Person)
+        # Person object
+        person_links.build(person: author, role: 'author')
+      end
+    end
+  end
+
   # Remove trailing and squeezes (:squish option) white spaces inside the string (before_validation):
   # e.g. "James     Bond  " => "James Bond"
   auto_strip_attributes :title, :description, :url, squish: false
diff --git a/test/models/material_test.rb b/test/models/material_test.rb
index f92073435..46ddf9cdf 100644
--- a/test/models/material_test.rb
+++ b/test/models/material_test.rb
@@ -169,6 +169,61 @@ class MaterialTest < ActiveSupport::TestCase
     assert_equal 1, @material.authors.size
   end
 
+  test 'should set authors from array of strings (legacy API support)' do
+    @material.authors = ['John Doe', 'Jane Smith']
+    @material.save!
+    @material.reload
+    
+    assert_equal 2, @material.authors.size
+    john = @material.authors.find { |a| a.last_name == 'Doe' }
+    assert_not_nil john
+    assert_equal 'John', john.first_name
+    assert_equal 'Doe', john.last_name
+    
+    jane = @material.authors.find { |a| a.last_name == 'Smith' }
+    assert_not_nil jane
+    assert_equal 'Jane', jane.first_name
+    assert_equal 'Smith', jane.last_name
+  end
+
+  test 'should set authors from array of hashes' do
+    @material.authors = [
+      { first_name: 'John', last_name: 'Doe', orcid: '0000-0001-1234-5678' },
+      { first_name: 'Jane', last_name: 'Smith' }
+    ]
+    @material.save!
+    @material.reload
+    
+    assert_equal 2, @material.authors.size
+    john = @material.authors.find { |a| a.last_name == 'Doe' }
+    assert_not_nil john
+    assert_equal '0000-0001-1234-5678', john.orcid
+  end
+
+  test 'should set authors from array of Person objects' do
+    person1 = Person.create!(first_name: 'Alice', last_name: 'Wonder')
+    person2 = Person.create!(first_name: 'Bob', last_name: 'Builder')
+    
+    @material.authors = [person1, person2]
+    @material.save!
+    @material.reload
+    
+    assert_equal 2, @material.authors.size
+    assert @material.authors.include?(person1)
+    assert @material.authors.include?(person2)
+  end
+
+  test 'should handle single name in legacy author string' do
+    @material.authors = ['Madonna', 'Prince']
+    @material.save!
+    @material.reload
+    
+    assert_equal 2, @material.authors.size
+    madonna = @material.authors.find { |a| a.last_name == 'Madonna' }
+    assert_not_nil madonna
+    assert_equal '', madonna.first_name
+  end
+
   test 'should delete material when content provider deleted' do
     material = @material
     content_provider = @material.content_provider

From 2c8dd2038661ed35cad45e06078c21b36b839e60 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 19:10:36 +0000
Subject: [PATCH 06/12] Add HasPeople concern, apply to contributors like
 authors

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 app/models/concerns/has_people.rb             | 60 +++++++++++++
 app/models/material.rb                        | 57 +++----------
 app/serializers/material_serializer.rb        |  3 +-
 app/views/common/_extra_metadata.html.erb     |  2 +-
 app/views/materials/_form.html.erb            | 23 ++++-
 app/views/materials/show.json.jbuilder        |  3 +-
 ...119095246_migrate_material_authors_data.rb | 84 +++++++++++--------
 ...119095247_remove_authors_from_materials.rb |  1 +
 lib/bioschemas/learning_resource_generator.rb |  8 +-
 test/controllers/materials_controller_test.rb | 13 ++-
 test/fixtures/materials.yml                   |  4 -
 test/fixtures/people.yml                      | 15 ++++
 test/fixtures/person_links.yml                | 15 ++++
 test/models/material_test.rb                  | 55 ++++++++++--
 14 files changed, 245 insertions(+), 98 deletions(-)
 create mode 100644 app/models/concerns/has_people.rb

diff --git a/app/models/concerns/has_people.rb b/app/models/concerns/has_people.rb
new file mode 100644
index 000000000..f9236b18c
--- /dev/null
+++ b/app/models/concerns/has_people.rb
@@ -0,0 +1,60 @@
+module HasPeople
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :person_links, as: :resource, dependent: :destroy
+    has_many :people, through: :person_links
+    accepts_nested_attributes_for :person_links, allow_destroy: true, reject_if: :all_blank
+  end
+
+  class_methods do
+    # Define a person role association (e.g., :authors, :contributors)
+    # This creates the association and a custom setter that accepts strings, hashes, or Person objects
+    def has_person_role(role_name, role_key: role_name.to_s.singularize)
+      # Define the association
+      has_many role_name, -> { where(person_links: { role: role_key }) }, through: :person_links, source: :person
+
+      # Define custom setter that accepts strings (legacy), hashes, or Person objects
+      define_method("#{role_name}=") do |value|
+        set_people_for_role(value, role_key)
+      end
+    end
+  end
+
+  private
+
+  # Set people for a specific role, accepting various input formats
+  def set_people_for_role(value, role)
+    return if value.nil?
+
+    # Convert to array if needed
+    people_array = Array(value).reject(&:blank?)
+
+    # Remove existing links for this role
+    person_links.where(role: role).destroy_all
+
+    people_array.each do |person_data|
+      if person_data.is_a?(String)
+        # Legacy format: parse string into first_name and last_name
+        parts = person_data.strip.split(/\s+/, 2)
+        first_name = parts.length > 1 ? parts[0] : ''
+        last_name = parts.length > 1 ? parts[1] : parts[0]
+
+        person = Person.find_or_create_by!(first_name: first_name, last_name: last_name)
+        person_links.build(person: person, role: role)
+      elsif person_data.is_a?(Hash)
+        # Hash format from API
+        first_name = person_data[:first_name] || person_data['first_name'] || ''
+        last_name = person_data[:last_name] || person_data['last_name'] || ''
+        orcid = person_data[:orcid] || person_data['orcid']
+
+        person = Person.find_or_create_by!(first_name: first_name, last_name: last_name)
+        person.update!(orcid: orcid) if orcid.present?
+        person_links.build(person: person, role: role)
+      elsif person_data.is_a?(Person)
+        # Person object
+        person_links.build(person: person_data, role: role)
+      end
+    end
+  end
+end
diff --git a/app/models/material.rb b/app/models/material.rb
index ab68fbc87..c77e7320f 100644
--- a/app/models/material.rb
+++ b/app/models/material.rb
@@ -21,6 +21,7 @@ class Material < ApplicationRecord
   include HasDifficultyLevel
   include HasEdamTerms
   include InSpace
+  include HasPeople
 
   if TeSS::Config.solr_enabled
     # :nocov:
@@ -33,7 +34,9 @@ class Material < ApplicationRecord
       text :authors do
         authors.map(&:full_name)
       end
-      text :contributors
+      text :contributors do
+        contributors.map(&:full_name)
+      end
       text :target_audience
       text :keywords
       text :resource_type
@@ -66,7 +69,9 @@ class Material < ApplicationRecord
       string :keywords, multiple: true
       string :fields, multiple: true
       string :resource_type, multiple: true
-      string :contributors, multiple: true
+      string :contributors, multiple: true do
+        contributors.map(&:full_name)
+      end
       string :content_provider do
         content_provider.try(:title)
       end
@@ -106,45 +111,9 @@ class Material < ApplicationRecord
 
   has_many :stars, as: :resource, dependent: :destroy
 
-  has_many :person_links, as: :resource, dependent: :destroy
-  has_many :people, through: :person_links
-  has_many :authors, -> { where(person_links: { role: 'author' }) }, through: :person_links, source: :person
-  accepts_nested_attributes_for :person_links, allow_destroy: true, reject_if: :all_blank
-
-  # Custom setter for authors that accepts both strings (legacy API) and Person objects
-  def authors=(value)
-    return if value.nil?
-    
-    # Convert to array if needed
-    authors_array = Array(value).reject(&:blank?)
-    
-    # Remove existing author links
-    person_links.where(role: 'author').destroy_all
-    
-    authors_array.each do |author|
-      if author.is_a?(String)
-        # Legacy format: parse string into first_name and last_name
-        parts = author.strip.split(/\s+/, 2)
-        first_name = parts.length > 1 ? parts[0] : ''
-        last_name = parts.length > 1 ? parts[1] : parts[0]
-        
-        person = Person.find_or_create_by!(first_name: first_name, last_name: last_name)
-        person_links.build(person: person, role: 'author')
-      elsif author.is_a?(Hash)
-        # Hash format from API
-        first_name = author[:first_name] || author['first_name'] || ''
-        last_name = author[:last_name] || author['last_name'] || ''
-        orcid = author[:orcid] || author['orcid']
-        
-        person = Person.find_or_create_by!(first_name: first_name, last_name: last_name)
-        person.update!(orcid: orcid) if orcid.present?
-        person_links.build(person: person, role: 'author')
-      elsif author.is_a?(Person)
-        # Person object
-        person_links.build(person: author, role: 'author')
-      end
-    end
-  end
+  # Use HasPeople concern for authors and contributors
+  has_person_role :authors, role_key: 'author'
+  has_person_role :contributors, role_key: 'contributor'
 
   # Remove trailing and squeezes (:squish option) white spaces inside the string (before_validation):
   # e.g. "James     Bond  " => "James Bond"
@@ -155,10 +124,10 @@ def authors=(value)
   validates :other_types, presence: true, if: proc { |m| m.resource_type.include?('other') }
   validates :keywords, length: { maximum: 20 }
 
-  clean_array_fields(:keywords, :fields, :contributors,
+  clean_array_fields(:keywords, :fields,
                      :target_audience, :resource_type, :subsets)
 
-  update_suggestions(:keywords, :contributors, :target_audience,
+  update_suggestions(:keywords, :target_audience,
                      :resource_type)
 
   def description=(desc)
@@ -257,7 +226,7 @@ def to_oai_dc
       xml.tag!('dc:title', title)
       xml.tag!('dc:description', description)
       authors.each { |a| xml.tag!('dc:creator', a.full_name) }
-      contributors.each { |a| xml.tag!('dc:contributor', a) }
+      contributors.each { |c| xml.tag!('dc:contributor', c.full_name) }
       xml.tag!('dc:publisher', content_provider.title) if content_provider
 
       xml.tag!('dc:format', 'text/html')
diff --git a/app/serializers/material_serializer.rb b/app/serializers/material_serializer.rb
index 29c01bd2c..25b467e18 100644
--- a/app/serializers/material_serializer.rb
+++ b/app/serializers/material_serializer.rb
@@ -5,7 +5,7 @@ class MaterialSerializer < ApplicationSerializer
 
              :doi, :licence, :version, :status,
 
-             :contact, :contributors,
+             :contact,
 
              :difficulty_level, :target_audience, :prerequisites, :syllabus, :learning_objectives, :subsets,
 
@@ -19,4 +19,5 @@ class MaterialSerializer < ApplicationSerializer
   has_many :collections
   has_many :events
   has_many :authors, serializer: PersonSerializer
+  has_many :contributors, serializer: PersonSerializer
 end
diff --git a/app/views/common/_extra_metadata.html.erb b/app/views/common/_extra_metadata.html.erb
index 32bb4336d..bb2d730fa 100644
--- a/app/views/common/_extra_metadata.html.erb
+++ b/app/views/common/_extra_metadata.html.erb
@@ -60,7 +60,7 @@
 <% end %>
 
 <%= display_attribute(resource, :authors) { |values| values.map(&:full_name).join(', ') } if resource.respond_to?(:authors) %>
-<%= display_attribute(resource, :contributors) { |values| values.join(', ') } if resource.respond_to?(:contributors) %>
+<%= display_attribute(resource, :contributors) { |values| values.map(&:full_name).join(', ') } if resource.respond_to?(:contributors) %>
 <%= display_attribute(resource, :remote_created_date) if resource.respond_to?(:remote_created_date) %>
 <%= display_attribute(resource, :remote_updated_date) if resource.respond_to?(:remote_updated_date) %>
 <%= display_attribute(resource, :scientific_topics) { |values| values.map { |x| x.preferred_label }.join(', ') } %>
diff --git a/app/views/materials/_form.html.erb b/app/views/materials/_form.html.erb
index bd162ce93..0707befcf 100644
--- a/app/views/materials/_form.html.erb
+++ b/app/views/materials/_form.html.erb
@@ -86,8 +86,22 @@
   </div>
 
   <!-- Field: Contributors -->
-  <%= f.multi_input :contributors, suggestions_url: people_autocomplete_suggestions_path, title: t('materials.hints.contributors'),
-                    visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+  <div class="form-group" id="person-contributor">
+    <%= f.label :contributors %>
+    <%= f.field_lock :contributors %>
+
+    <div id="person-contributor-list">
+      <% @material.person_links.where(role: 'contributor').each_with_index do |person_link, index| %>
+        <%= render partial: 'common/person_form',
+                   locals: { form_name: 'material', index: "contributor_#{index}", person_link: person_link, role: 'contributor' } %>
+      <% end %>
+    </div>
+
+    <a href="#" id="add-person-contributor" data-role="contributor" class="btn btn-icon">
+      <i class="icon icon-h4 plus-icon"></i>
+    </a>
+    <span class="help-inline-block help-block">Add contributor information</span>
+  </div>
 
   <!-- Field: Target Audience -->
   <%= f.multi_input :target_audience, label: 'Target audiences', errors: @material.errors[:target_audience],
@@ -214,6 +228,11 @@
              locals: { form_name: 'material', person_link: nil, role: 'author' } %>
 </div>
 
+<div id="person-contributor-template" style="display: none">
+  <%= render partial: 'common/person_form',
+             locals: { form_name: 'material', person_link: nil, role: 'contributor' } %>
+</div>
+
 <script type="text/javascript">
     function removeSuggestion(suggestion) {
         s = suggestion.replace(/[^a-zA-Z]/g, '');
diff --git a/app/views/materials/show.json.jbuilder b/app/views/materials/show.json.jbuilder
index e79a3893f..159d4b419 100644
--- a/app/views/materials/show.json.jbuilder
+++ b/app/views/materials/show.json.jbuilder
@@ -6,7 +6,7 @@ json.extract! @material, :id, :title, :url, :description,
 
               :doi, :licence, :version, :status,
 
-              :contact, :contributors,
+              :contact,
 
               :difficulty_level, :target_audience, :prerequisites, :syllabus, :learning_objectives, :subsets,
 
@@ -22,6 +22,7 @@ json.collections @material.collections.collect { |x| { title: x[:title], id: x[:
 json.events @material.events.collect { |x| { title: x[:title], id: x[:id] } }
 
 json.authors @material.authors.collect { |a| { id: a.id, first_name: a.first_name, last_name: a.last_name, orcid: a.orcid, full_name: a.full_name } }
+json.contributors @material.contributors.collect { |c| { id: c.id, first_name: c.first_name, last_name: c.last_name, orcid: c.orcid, full_name: c.full_name } }
 
 json.external_resources do
   @material.external_resources.each do |external_resource|
diff --git a/db/migrate/20251119095246_migrate_material_authors_data.rb b/db/migrate/20251119095246_migrate_material_authors_data.rb
index ca114c606..899273f11 100644
--- a/db/migrate/20251119095246_migrate_material_authors_data.rb
+++ b/db/migrate/20251119095246_migrate_material_authors_data.rb
@@ -2,52 +2,70 @@ class MigrateMaterialAuthorsData < ActiveRecord::Migration[7.2]
   def up
     # Migrate existing authors from array to Person model
     Material.find_each do |material|
-      next if material.authors.blank?
-
-      material.authors.each do |author_name|
-        next if author_name.blank?
-
-        # Parse the name - assume "First Last" format
-        # Handle edge cases: single names, multiple spaces, etc.
-        parts = author_name.strip.split(/\s+/, 2)
-        
-        if parts.length == 1
-          # Single name - use as last name with empty first name
-          first_name = ''
-          last_name = parts[0]
-        else
-          first_name = parts[0]
-          last_name = parts[1] || ''
-        end
-
-        # Find or create person
-        person = Person.find_or_create_by!(
-          first_name: first_name,
-          last_name: last_name
-        )
-
-        # Create the association if it doesn't exist
-        PersonLink.find_or_create_by!(
-          resource: material,
-          person_id: person.id,
-          role: 'author'
-        )
-      end
+      # Migrate authors
+      migrate_people_role(material, 'authors', 'author') if material.respond_to?(:read_attribute) && material.read_attribute(:authors).present?
+
+      # Migrate contributors
+      migrate_people_role(material, 'contributors', 'contributor') if material.respond_to?(:read_attribute) && material.read_attribute(:contributors).present?
     end
   end
 
   def down
-    # Restore authors array from Person model
+    # Restore arrays from Person model
     Material.find_each do |material|
+      # Restore authors
       author_names = material.people.where(person_links: { role: 'author' }).map(&:full_name).compact
-      # Use raw SQL to avoid validation issues
       Material.connection.execute(
         "UPDATE materials SET authors = ARRAY[#{author_names.map { |n| "'#{n.gsub("'", "''")}'" }.join(',')}]::varchar[] WHERE id = #{material.id}"
       )
+
+      # Restore contributors
+      contributor_names = material.people.where(person_links: { role: 'contributor' }).map(&:full_name).compact
+      Material.connection.execute(
+        "UPDATE materials SET contributors = ARRAY[#{contributor_names.map { |n| "'#{n.gsub("'", "''")}'" }.join(',')}]::varchar[] WHERE id = #{material.id}"
+      )
     end
 
     # Clean up the new tables
     PersonLink.delete_all
     Person.delete_all
   end
+
+  private
+
+  def migrate_people_role(material, column_name, role)
+    # Get the raw array from database
+    people_array = material.read_attribute(column_name)
+    return if people_array.blank?
+
+    people_array.each do |person_name|
+      next if person_name.blank?
+
+      # Parse the name - assume "First Last" format
+      # Handle edge cases: single names, multiple spaces, etc.
+      parts = person_name.strip.split(/\s+/, 2)
+
+      if parts.length == 1
+        # Single name - use as last name with empty first name
+        first_name = ''
+        last_name = parts[0]
+      else
+        first_name = parts[0]
+        last_name = parts[1] || ''
+      end
+
+      # Find or create person
+      person = Person.find_or_create_by!(
+        first_name: first_name,
+        last_name: last_name
+      )
+
+      # Create the association if it doesn't exist
+      PersonLink.find_or_create_by!(
+        resource: material,
+        person_id: person.id,
+        role: role
+      )
+    end
+  end
 end
diff --git a/db/migrate/20251119095247_remove_authors_from_materials.rb b/db/migrate/20251119095247_remove_authors_from_materials.rb
index 0304b09b1..5f89acf0a 100644
--- a/db/migrate/20251119095247_remove_authors_from_materials.rb
+++ b/db/migrate/20251119095247_remove_authors_from_materials.rb
@@ -1,5 +1,6 @@
 class RemoveAuthorsFromMaterials < ActiveRecord::Migration[7.2]
   def change
     remove_column :materials, :authors, :string, array: true, default: []
+    remove_column :materials, :contributors, :string, array: true, default: []
   end
 end
diff --git a/lib/bioschemas/learning_resource_generator.rb b/lib/bioschemas/learning_resource_generator.rb
index b1e4de340..6c1499cb2 100644
--- a/lib/bioschemas/learning_resource_generator.rb
+++ b/lib/bioschemas/learning_resource_generator.rb
@@ -22,7 +22,13 @@ def self.bioschemas_profile
         author_hash
       } 
     }
-    property :contributor, -> (material) { material.contributors.map { |p| person(p) } }
+    property :contributor, -> (material) { 
+      material.contributors.map { |c| 
+        contributor_hash = { "@type" => "Person", "name" => c.full_name }
+        contributor_hash["@id"] = "https://orcid.org/#{c.orcid}" if c.orcid.present?
+        contributor_hash
+      } 
+    }
     property :provider, -> (material) { provider(material) }
     property :audience, -> (material) {
       material.target_audience.map { |audience| { '@type' => 'Audience', 'audienceType' => audience } }
diff --git a/test/controllers/materials_controller_test.rb b/test/controllers/materials_controller_test.rb
index 470bdccbe..6c21debce 100644
--- a/test/controllers/materials_controller_test.rb
+++ b/test/controllers/materials_controller_test.rb
@@ -253,8 +253,7 @@ class MaterialsControllerTest < ActionController::TestCase
           date_published: test_material.date_published,
           doi: test_material.doi,
           subsets: test_material.subsets,
-          person_links_attributes: test_material.person_links.where(role: 'author').map { |pl| { role: 'author', person_attributes: { first_name: pl.person.first_name, last_name: pl.person.last_name, orcid: pl.person.orcid } } },
-          contributors: test_material.contributors,
+          person_links_attributes: test_material.person_links.map { |pl| { role: pl.role, person_attributes: { first_name: pl.person.first_name, last_name: pl.person.last_name, orcid: pl.person.orcid } } },
           prerequisites: test_material.prerequisites,
           syllabus: test_material.syllabus,
           learning_objectives: test_material.learning_objectives
@@ -300,7 +299,15 @@ class MaterialsControllerTest < ActionController::TestCase
       assert_equal expected_author.last_name, author_json['last_name'], "author #{i} last_name not matched"
       assert_equal expected_author.full_name, author_json['full_name'], "author #{i} full_name not matched"
     end
-    assert_equal test_material.contributors, JSON.parse(response.body)['contributors'], 'contributors not matched'
+    # Contributors is now an array of objects with id, first_name, last_name, orcid, full_name
+    response_contributors = JSON.parse(response.body)['contributors']
+    assert_equal test_material.contributors.size, response_contributors.size, 'contributors count not matched'
+    response_contributors.each_with_index do |contributor_json, i|
+      expected_contributor = test_material.contributors[i]
+      assert_equal expected_contributor.first_name, contributor_json['first_name'], "contributor #{i} first_name not matched"
+      assert_equal expected_contributor.last_name, contributor_json['last_name'], "contributor #{i} last_name not matched"
+      assert_equal expected_contributor.full_name, contributor_json['full_name'], "contributor #{i} full_name not matched"
+    end
     assert_equal test_material.subsets, JSON.parse(response.body)['subsets'], 'subsets not matched'
     assert_equal test_material.prerequisites, JSON.parse(response.body)['prerequisites'], 'prerequisites not matched'
     assert_equal test_material.syllabus, JSON.parse(response.body)['syllabus'], 'syllabus not matched'
diff --git a/test/fixtures/materials.yml b/test/fixtures/materials.yml
index 4ce6df5b2..8f863a111 100644
--- a/test/fixtures/materials.yml
+++ b/test/fixtures/materials.yml
@@ -136,7 +136,6 @@ material_with_optionals:
   date_modified: 2021-07-13
   date_published: 2021-07-14
   subsets: [ 'https://training.com/material/023/part-one', 'https://training.com/material/023/part-two' ]
-  contributors: [ 'Dr Dre' ]
   prerequisites: " * None\n * Nothing at all\n"
   syllabus: '1. Overview\  2. The main part\  3. Summing up'
   learning_objectives: ' - Understand the new materials model'
@@ -169,9 +168,6 @@ youtube_video_material:
   keywords:
     - REDCap
     - " sensitive data"
-  contributors:
-    - Robert Andrews
-    - Munazah Andrabi
   resource_type:
     - Video
   learning_objectives: In this video, I will show you how to create and run data quality checks in REDCap.
diff --git a/test/fixtures/people.yml b/test/fixtures/people.yml
index e188b132d..c761d85d9 100644
--- a/test/fixtures/people.yml
+++ b/test/fixtures/people.yml
@@ -24,3 +24,18 @@ saskia:
   first_name: Saskia
   last_name: Lawson-Tovey
   orcid: null
+
+dr_dre:
+  first_name: Dr
+  last_name: Dre
+  orcid: null
+
+robert_andrews:
+  first_name: Robert
+  last_name: Andrews
+  orcid: null
+
+munazah_andrabi:
+  first_name: Munazah
+  last_name: Andrabi
+  orcid: null
diff --git a/test/fixtures/person_links.yml b/test/fixtures/person_links.yml
index 35a597950..c7024e1bd 100644
--- a/test/fixtures/person_links.yml
+++ b/test/fixtures/person_links.yml
@@ -10,7 +10,22 @@ material_with_optionals_author2:
   person: thomas_edison
   role: author
 
+material_with_optionals_contributor1:
+  resource: material_with_optionals (Material)
+  person: dr_dre
+  role: contributor
+
 youtube_video_material_author:
   resource: youtube_video_material (Material)
   person: saskia
   role: author
+
+youtube_video_material_contributor1:
+  resource: youtube_video_material (Material)
+  person: robert_andrews
+  role: contributor
+
+youtube_video_material_contributor2:
+  resource: youtube_video_material (Material)
+  person: munazah_andrabi
+  role: contributor
diff --git a/test/models/material_test.rb b/test/models/material_test.rb
index 46ddf9cdf..a487cf131 100644
--- a/test/models/material_test.rb
+++ b/test/models/material_test.rb
@@ -61,7 +61,7 @@ class MaterialTest < ActiveSupport::TestCase
 
     assert_not_nil m.contributors, 'old contributors is nil.'
     assert_equal 1, m.contributors.size, 'old contributors size not matched.'
-    assert_equal 'Dr Dre', m.contributors[0], 'old contributors[0] not matched.'
+    assert_equal 'Dr Dre', m.contributors[0].full_name, 'old contributors[0] not matched.'
 
     assert_equal " * None\n * Nothing at all\n", m.prerequisites, 'old prerequisites not matched.'
     assert_equal '1. Overview\  2. The main part\  3. Summing up', m.syllabus, 'old syllabus not matched.'
@@ -128,7 +128,7 @@ class MaterialTest < ActiveSupport::TestCase
 
     assert_not_nil m2.contributors, 'new contributors is nil.'
     assert_equal 1, m2.contributors.size, 'new contributors size not matched.'
-    assert_equal 'Prof. Stephen Hawking', m2.contributors[0], 'new contributors[0] not matched.'
+    assert_equal 'Prof. Stephen Hawking', m2.contributors[0].full_name, 'new contributors[0] not matched.'
 
     assert_equal 'Bring your enthusiasm', m2.prerequisites, 'new prerequisites not matched.'
     assert_equal "1. Overview\  2. The main part\  3. Summary", m2.syllabus, 'new syllabus not matched.'
@@ -173,13 +173,13 @@ class MaterialTest < ActiveSupport::TestCase
     @material.authors = ['John Doe', 'Jane Smith']
     @material.save!
     @material.reload
-    
+
     assert_equal 2, @material.authors.size
     john = @material.authors.find { |a| a.last_name == 'Doe' }
     assert_not_nil john
     assert_equal 'John', john.first_name
     assert_equal 'Doe', john.last_name
-    
+
     jane = @material.authors.find { |a| a.last_name == 'Smith' }
     assert_not_nil jane
     assert_equal 'Jane', jane.first_name
@@ -193,7 +193,7 @@ class MaterialTest < ActiveSupport::TestCase
     ]
     @material.save!
     @material.reload
-    
+
     assert_equal 2, @material.authors.size
     john = @material.authors.find { |a| a.last_name == 'Doe' }
     assert_not_nil john
@@ -203,11 +203,11 @@ class MaterialTest < ActiveSupport::TestCase
   test 'should set authors from array of Person objects' do
     person1 = Person.create!(first_name: 'Alice', last_name: 'Wonder')
     person2 = Person.create!(first_name: 'Bob', last_name: 'Builder')
-    
+
     @material.authors = [person1, person2]
     @material.save!
     @material.reload
-    
+
     assert_equal 2, @material.authors.size
     assert @material.authors.include?(person1)
     assert @material.authors.include?(person2)
@@ -217,13 +217,52 @@ class MaterialTest < ActiveSupport::TestCase
     @material.authors = ['Madonna', 'Prince']
     @material.save!
     @material.reload
-    
+
     assert_equal 2, @material.authors.size
     madonna = @material.authors.find { |a| a.last_name == 'Madonna' }
     assert_not_nil madonna
     assert_equal '', madonna.first_name
   end
 
+  test 'should set contributors from array of strings (legacy API support)' do
+    @material.contributors = ['John Doe', 'Jane Smith']
+    @material.save!
+    @material.reload
+
+    assert_equal 2, @material.contributors.size
+    john = @material.contributors.find { |c| c.last_name == 'Doe' }
+    assert_not_nil john
+    assert_equal 'John', john.first_name
+    assert_equal 'Doe', john.last_name
+  end
+
+  test 'should set contributors from array of hashes' do
+    @material.contributors = [
+      { first_name: 'John', last_name: 'Doe', orcid: '0000-0001-1234-5678' },
+      { first_name: 'Jane', last_name: 'Smith' }
+    ]
+    @material.save!
+    @material.reload
+
+    assert_equal 2, @material.contributors.size
+    john = @material.contributors.find { |c| c.last_name == 'Doe' }
+    assert_not_nil john
+    assert_equal '0000-0001-1234-5678', john.orcid
+  end
+
+  test 'should set contributors from array of Person objects' do
+    person1 = Person.create!(first_name: 'Alice', last_name: 'Wonder')
+    person2 = Person.create!(first_name: 'Bob', last_name: 'Builder')
+
+    @material.contributors = [person1, person2]
+    @material.save!
+    @material.reload
+
+    assert_equal 2, @material.contributors.size
+    assert @material.contributors.include?(person1)
+    assert @material.contributors.include?(person2)
+  end
+
   test 'should delete material when content provider deleted' do
     material = @material
     content_provider = @material.content_provider

From 7bb8f391f95eb452b4f410699fab945d8fca32bc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:25:32 +0000
Subject: [PATCH 07/12] Add full_name column, rename first_name/last_name to
 given_name/family_name

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 app/controllers/materials_controller.rb       |  3 +-
 app/models/concerns/has_people.rb             | 28 ++++++---
 app/models/material.rb                        | 12 ++--
 app/models/person.rb                          | 16 ++++-
 app/serializers/person_serializer.rb          |  7 ++-
 app/views/common/_extra_metadata.html.erb     |  4 +-
 app/views/common/_person_form.html.erb        |  8 ++-
 app/views/materials/show.json.jbuilder        |  4 +-
 db/migrate/20251119095244_create_people.rb    |  5 +-
 ...119095246_migrate_material_authors_data.rb | 25 ++------
 lib/bioschemas/learning_resource_generator.rb | 20 +++---
 lib/ingestors/material_csv_ingestor.rb        | 11 +---
 lib/ingestors/zenodo_ingestor.rb              | 20 +++---
 test/controllers/materials_controller_test.rb | 12 ++--
 test/fixtures/people.yml                      | 38 +++++++-----
 test/models/material_test.rb                  | 61 +++++++++----------
 test/models/person_test.rb                    | 33 +++++-----
 test/unit/ingestors/zenodo_ingestor_test.rb   | 10 +--
 18 files changed, 168 insertions(+), 149 deletions(-)

diff --git a/app/controllers/materials_controller.rb b/app/controllers/materials_controller.rb
index ebd7976c8..c6e92e2de 100644
--- a/app/controllers/materials_controller.rb
+++ b/app/controllers/materials_controller.rb
@@ -176,11 +176,12 @@ def material_params
                                      { scientific_topic_names: [] }, { scientific_topic_uris: [] },
                                      { operation_names: [] }, { operation_uris: [] },
                                      { node_ids: [] }, { node_names: [] }, { fields: [] },
-                                     person_links_attributes: [:id, :role, :_destroy, person_attributes: %i[id first_name last_name orcid]],
+                                     person_links_attributes: [:id, :role, :_destroy, person_attributes: %i[id given_name family_name full_name orcid]],
                                      external_resources_attributes: %i[id url title _destroy],
                                      external_resources: %i[url title],
                                      event_ids: [], locked_fields: [])
   end
+  end
 
   def set_learning_path_navigation
     return unless params[:lp]
diff --git a/app/models/concerns/has_people.rb b/app/models/concerns/has_people.rb
index f9236b18c..960e8f17c 100644
--- a/app/models/concerns/has_people.rb
+++ b/app/models/concerns/has_people.rb
@@ -35,20 +35,28 @@ def set_people_for_role(value, role)
 
     people_array.each do |person_data|
       if person_data.is_a?(String)
-        # Legacy format: parse string into first_name and last_name
-        parts = person_data.strip.split(/\s+/, 2)
-        first_name = parts.length > 1 ? parts[0] : ''
-        last_name = parts.length > 1 ? parts[1] : parts[0]
-
-        person = Person.find_or_create_by!(first_name: first_name, last_name: last_name)
+        # Legacy format: store as full_name directly
+        person = Person.find_or_create_by!(full_name: person_data.strip)
         person_links.build(person: person, role: role)
       elsif person_data.is_a?(Hash)
-        # Hash format from API
-        first_name = person_data[:first_name] || person_data['first_name'] || ''
-        last_name = person_data[:last_name] || person_data['last_name'] || ''
+        # Hash format from API - supports both legacy (first_name/last_name) and new (given_name/family_name) field names
+        given_name = person_data[:given_name] || person_data['given_name'] || person_data[:first_name] || person_data['first_name']
+        family_name = person_data[:family_name] || person_data['family_name'] || person_data[:last_name] || person_data['last_name']
+        full_name = person_data[:full_name] || person_data['full_name']
         orcid = person_data[:orcid] || person_data['orcid']
 
-        person = Person.find_or_create_by!(first_name: first_name, last_name: last_name)
+        # Prefer full_name if provided, otherwise use given_name and family_name
+        if full_name.present?
+          person = Person.find_or_create_by!(full_name: full_name)
+        elsif given_name.present? && family_name.present?
+          person = Person.find_or_create_by!(given_name: given_name, family_name: family_name)
+        elsif given_name.present? || family_name.present?
+          # If only one part is provided, treat it as full_name
+          person = Person.find_or_create_by!(full_name: "#{given_name}#{family_name}".strip)
+        else
+          next # Skip if no name data provided
+        end
+
         person.update!(orcid: orcid) if orcid.present?
         person_links.build(person: person, role: role)
       elsif person_data.is_a?(Person)
diff --git a/app/models/material.rb b/app/models/material.rb
index c77e7320f..fef1da4d1 100644
--- a/app/models/material.rb
+++ b/app/models/material.rb
@@ -32,10 +32,10 @@ class Material < ApplicationRecord
       text :contact
       text :doi
       text :authors do
-        authors.map(&:full_name)
+        authors.map(&:display_name)
       end
       text :contributors do
-        contributors.map(&:full_name)
+        contributors.map(&:display_name)
       end
       text :target_audience
       text :keywords
@@ -57,7 +57,7 @@ class Material < ApplicationRecord
       # other fields
       string :title
       string :authors, multiple: true do
-        authors.map(&:full_name)
+        authors.map(&:display_name)
       end
       string :scientific_topics, multiple: true do
         scientific_topics_and_synonyms
@@ -70,7 +70,7 @@ class Material < ApplicationRecord
       string :fields, multiple: true
       string :resource_type, multiple: true
       string :contributors, multiple: true do
-        contributors.map(&:full_name)
+        contributors.map(&:display_name)
       end
       string :content_provider do
         content_provider.try(:title)
@@ -225,8 +225,8 @@ def to_oai_dc
              'xsi:schemaLocation' => 'http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd') do
       xml.tag!('dc:title', title)
       xml.tag!('dc:description', description)
-      authors.each { |a| xml.tag!('dc:creator', a.full_name) }
-      contributors.each { |c| xml.tag!('dc:contributor', c.full_name) }
+      authors.each { |a| xml.tag!('dc:creator', a.display_name) }
+      contributors.each { |c| xml.tag!('dc:contributor', c.display_name) }
       xml.tag!('dc:publisher', content_provider.title) if content_provider
 
       xml.tag!('dc:format', 'text/html')
diff --git a/app/models/person.rb b/app/models/person.rb
index 43d294adc..a036e055e 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -1,9 +1,19 @@
 class Person < ApplicationRecord
   has_many :person_links, dependent: :destroy
 
-  validates :first_name, :last_name, presence: true
+  # Validate that at least a full_name OR both given_name and family_name are present
+  validate :name_presence
 
-  def full_name
-    "#{first_name} #{last_name}".strip
+  # Return the display name - full_name if present, otherwise construct from given_name and family_name
+  def display_name
+    full_name.presence || "#{given_name} #{family_name}".strip
+  end
+
+  private
+
+  def name_presence
+    if full_name.blank? && (given_name.blank? || family_name.blank?)
+      errors.add(:base, "Either full_name or both given_name and family_name must be present")
+    end
   end
 end
diff --git a/app/serializers/person_serializer.rb b/app/serializers/person_serializer.rb
index 8da7786ba..3d14feca4 100644
--- a/app/serializers/person_serializer.rb
+++ b/app/serializers/person_serializer.rb
@@ -1,3 +1,8 @@
 class PersonSerializer < ApplicationSerializer
-  attributes :id, :first_name, :last_name, :orcid, :full_name
+  attributes :id, :given_name, :family_name, :full_name, :orcid
+
+  # Return display_name for API responses
+  attribute :name do |person|
+    person.display_name
+  end
 end
diff --git a/app/views/common/_extra_metadata.html.erb b/app/views/common/_extra_metadata.html.erb
index bb2d730fa..231ad4d81 100644
--- a/app/views/common/_extra_metadata.html.erb
+++ b/app/views/common/_extra_metadata.html.erb
@@ -59,8 +59,8 @@
   <%= display_attribute(resource, :sponsors) { |values| values.join(', ') } %>
 <% end %>
 
-<%= display_attribute(resource, :authors) { |values| values.map(&:full_name).join(', ') } if resource.respond_to?(:authors) %>
-<%= display_attribute(resource, :contributors) { |values| values.map(&:full_name).join(', ') } if resource.respond_to?(:contributors) %>
+<%= display_attribute(resource, :authors) { |values| values.map(&:display_name).join(', ') } if resource.respond_to?(:authors) %>
+<%= display_attribute(resource, :contributors) { |values| values.map(&:display_name).join(', ') } if resource.respond_to?(:contributors) %>
 <%= display_attribute(resource, :remote_created_date) if resource.respond_to?(:remote_created_date) %>
 <%= display_attribute(resource, :remote_updated_date) if resource.respond_to?(:remote_updated_date) %>
 <%= display_attribute(resource, :scientific_topics) { |values| values.map { |x| x.preferred_label }.join(', ') } %>
diff --git a/app/views/common/_person_form.html.erb b/app/views/common/_person_form.html.erb
index 12226aa7d..f090bebec 100644
--- a/app/views/common/_person_form.html.erb
+++ b/app/views/common/_person_form.html.erb
@@ -8,11 +8,15 @@
   <%= hidden_field_tag("#{field_name_prefix}[person_attributes][id]", person_link&.person&.id) %>
 
   <div class="form-group">
-    <%= text_field_tag "#{field_name_prefix}[person_attributes][first_name]", person_link&.person&.first_name, :class => 'form-control person-first-name', :placeholder => 'First Name' %>
+    <%= text_field_tag "#{field_name_prefix}[person_attributes][full_name]", person_link&.person&.full_name, :class => 'form-control person-full-name', :placeholder => 'Full Name' %>
   </div>
 
   <div class="form-group">
-    <%= text_field_tag "#{field_name_prefix}[person_attributes][last_name]", person_link&.person&.last_name, :class => 'form-control person-last-name', :placeholder => 'Last Name' %>
+    <%= text_field_tag "#{field_name_prefix}[person_attributes][given_name]", person_link&.person&.given_name, :class => 'form-control person-given-name', :placeholder => 'Given Name (optional)' %>
+  </div>
+
+  <div class="form-group">
+    <%= text_field_tag "#{field_name_prefix}[person_attributes][family_name]", person_link&.person&.family_name, :class => 'form-control person-family-name', :placeholder => 'Family Name (optional)' %>
   </div>
 
   <div class="form-group">
diff --git a/app/views/materials/show.json.jbuilder b/app/views/materials/show.json.jbuilder
index 159d4b419..50bbdfcf8 100644
--- a/app/views/materials/show.json.jbuilder
+++ b/app/views/materials/show.json.jbuilder
@@ -21,8 +21,8 @@ json.nodes @material.associated_nodes.collect { |x| { name: x[:name], node_id: x
 json.collections @material.collections.collect { |x| { title: x[:title], id: x[:id] } }
 json.events @material.events.collect { |x| { title: x[:title], id: x[:id] } }
 
-json.authors @material.authors.collect { |a| { id: a.id, first_name: a.first_name, last_name: a.last_name, orcid: a.orcid, full_name: a.full_name } }
-json.contributors @material.contributors.collect { |c| { id: c.id, first_name: c.first_name, last_name: c.last_name, orcid: c.orcid, full_name: c.full_name } }
+json.authors @material.authors.collect { |a| { id: a.id, given_name: a.given_name, family_name: a.family_name, full_name: a.full_name, name: a.display_name, orcid: a.orcid } }
+json.contributors @material.contributors.collect { |c| { id: c.id, given_name: c.given_name, family_name: c.family_name, full_name: c.full_name, name: c.display_name, orcid: c.orcid } }
 
 json.external_resources do
   @material.external_resources.each do |external_resource|
diff --git a/db/migrate/20251119095244_create_people.rb b/db/migrate/20251119095244_create_people.rb
index c9895ca42..80716714c 100644
--- a/db/migrate/20251119095244_create_people.rb
+++ b/db/migrate/20251119095244_create_people.rb
@@ -1,8 +1,9 @@
 class CreatePeople < ActiveRecord::Migration[7.2]
   def change
     create_table :people do |t|
-      t.string :first_name
-      t.string :last_name
+      t.string :given_name
+      t.string :family_name
+      t.string :full_name
       t.string :orcid
 
       t.timestamps
diff --git a/db/migrate/20251119095246_migrate_material_authors_data.rb b/db/migrate/20251119095246_migrate_material_authors_data.rb
index 899273f11..14a783fce 100644
--- a/db/migrate/20251119095246_migrate_material_authors_data.rb
+++ b/db/migrate/20251119095246_migrate_material_authors_data.rb
@@ -14,13 +14,13 @@ def down
     # Restore arrays from Person model
     Material.find_each do |material|
       # Restore authors
-      author_names = material.people.where(person_links: { role: 'author' }).map(&:full_name).compact
+      author_names = material.people.where(person_links: { role: 'author' }).map(&:display_name).compact
       Material.connection.execute(
         "UPDATE materials SET authors = ARRAY[#{author_names.map { |n| "'#{n.gsub("'", "''")}'" }.join(',')}]::varchar[] WHERE id = #{material.id}"
       )
 
       # Restore contributors
-      contributor_names = material.people.where(person_links: { role: 'contributor' }).map(&:full_name).compact
+      contributor_names = material.people.where(person_links: { role: 'contributor' }).map(&:display_name).compact
       Material.connection.execute(
         "UPDATE materials SET contributors = ARRAY[#{contributor_names.map { |n| "'#{n.gsub("'", "''")}'" }.join(',')}]::varchar[] WHERE id = #{material.id}"
       )
@@ -41,24 +41,9 @@ def migrate_people_role(material, column_name, role)
     people_array.each do |person_name|
       next if person_name.blank?
 
-      # Parse the name - assume "First Last" format
-      # Handle edge cases: single names, multiple spaces, etc.
-      parts = person_name.strip.split(/\s+/, 2)
-
-      if parts.length == 1
-        # Single name - use as last name with empty first name
-        first_name = ''
-        last_name = parts[0]
-      else
-        first_name = parts[0]
-        last_name = parts[1] || ''
-      end
-
-      # Find or create person
-      person = Person.find_or_create_by!(
-        first_name: first_name,
-        last_name: last_name
-      )
+      # Store the full name directly without trying to parse it
+      # This avoids errors with names that don't follow "First Last" format
+      person = Person.find_or_create_by!(full_name: person_name.strip)
 
       # Create the association if it doesn't exist
       PersonLink.find_or_create_by!(
diff --git a/lib/bioschemas/learning_resource_generator.rb b/lib/bioschemas/learning_resource_generator.rb
index 6c1499cb2..e0b28df7b 100644
--- a/lib/bioschemas/learning_resource_generator.rb
+++ b/lib/bioschemas/learning_resource_generator.rb
@@ -15,19 +15,23 @@ 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.full_name }
+    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.full_name }
+    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 :provider, -> (material) { provider(material) }
     property :audience, -> (material) {
diff --git a/lib/ingestors/material_csv_ingestor.rb b/lib/ingestors/material_csv_ingestor.rb
index 5f546b2b3..229f810b4 100644
--- a/lib/ingestors/material_csv_ingestor.rb
+++ b/lib/ingestors/material_csv_ingestor.rb
@@ -67,18 +67,13 @@ def read(url)
 
     def process_authors(authors_array)
       return [] if authors_array.blank?
-      
+
       authors_array.map do |author_name|
-        # Parse name into first and last name
-        name_parts = author_name.to_s.strip.split(/\s+/, 2)
-        first_name = name_parts.length > 1 ? name_parts[0] : ''
-        last_name = name_parts.length > 1 ? name_parts[1] : name_parts[0]
-        
+        # Store the full name directly without trying to parse it
         {
           role: 'author',
           person_attributes: {
-            first_name: first_name,
-            last_name: last_name,
+            full_name: author_name.to_s.strip,
             orcid: nil
           }
         }
diff --git a/lib/ingestors/zenodo_ingestor.rb b/lib/ingestors/zenodo_ingestor.rb
index 0e498efef..10eed8d6a 100644
--- a/lib/ingestors/zenodo_ingestor.rb
+++ b/lib/ingestors/zenodo_ingestor.rb
@@ -61,7 +61,6 @@ def process_material(input)
         material.status = 'active'
         material.doi = input['doi'] unless metadata['doi'].nil?
         material.person_links_attributes = []
-        material.contributors = []
         unless metadata.nil?
           material.title = metadata['title'] unless metadata['title'].nil?
           material.description = process_description metadata['description']
@@ -69,16 +68,11 @@ def process_material(input)
           material.licence = metadata['license']['id'] unless metadata.dig('license', 'id').nil?
           unless metadata['creators'].nil?
             metadata['creators'].each do |c|
-              # Parse name into first and last name
-              name_parts = c['name'].to_s.strip.split(/\s+/, 2)
-              first_name = name_parts.length > 1 ? name_parts[0] : ''
-              last_name = name_parts.length > 1 ? name_parts[1] : name_parts[0]
-              
+              # Store the full name directly without trying to parse it
               material.person_links_attributes << {
                 role: 'author',
                 person_attributes: {
-                  first_name: first_name,
-                  last_name: last_name,
+                  full_name: c['name'].to_s.strip,
                   orcid: c['orcid']
                 }
               }
@@ -86,8 +80,14 @@ def process_material(input)
           end
           unless metadata['contributors'].nil?
             metadata['contributors'].each do |c|
-              entry = c['type'].nil? ? c['name'] : "#{c['name']} (type: #{c['type']})"
-              material.contributors << entry
+              # Store the full name directly without trying to parse it
+              material.person_links_attributes << {
+                role: 'contributor',
+                person_attributes: {
+                  full_name: c['name'].to_s.strip,
+                  orcid: c['orcid']
+                }
+              }
             end
           end
 
diff --git a/test/controllers/materials_controller_test.rb b/test/controllers/materials_controller_test.rb
index 6c21debce..4fa91eb11 100644
--- a/test/controllers/materials_controller_test.rb
+++ b/test/controllers/materials_controller_test.rb
@@ -253,7 +253,7 @@ class MaterialsControllerTest < ActionController::TestCase
           date_published: test_material.date_published,
           doi: test_material.doi,
           subsets: test_material.subsets,
-          person_links_attributes: test_material.person_links.map { |pl| { role: pl.role, person_attributes: { first_name: pl.person.first_name, last_name: pl.person.last_name, orcid: pl.person.orcid } } },
+          person_links_attributes: test_material.person_links.map { |pl| { role: pl.role, person_attributes: { given_name: pl.person.given_name, family_name: pl.person.family_name, full_name: pl.person.full_name, orcid: pl.person.orcid } } },
           prerequisites: test_material.prerequisites,
           syllabus: test_material.syllabus,
           learning_objectives: test_material.learning_objectives
@@ -290,22 +290,20 @@ class MaterialsControllerTest < ActionController::TestCase
     assert_equal test_material.other_types, JSON.parse(response.body)['other_types'], 'other_types not matched'
     #assert_equal test_material.events, JSON.parse(response.body)['events'], 'events not matched'
     assert_equal test_material.target_audience, JSON.parse(response.body)['target_audience'], 'target audience not matched'
-    # Authors is now an array of objects with id, first_name, last_name, orcid, full_name
+    # Authors is now an array of objects with id, given_name, family_name, full_name, name, orcid
     response_authors = JSON.parse(response.body)['authors']
     assert_equal test_material.authors.size, response_authors.size, 'authors count not matched'
     response_authors.each_with_index do |author_json, i|
       expected_author = test_material.authors[i]
-      assert_equal expected_author.first_name, author_json['first_name'], "author #{i} first_name not matched"
-      assert_equal expected_author.last_name, author_json['last_name'], "author #{i} last_name not matched"
+      assert_equal expected_author.display_name, author_json['name'], "author #{i} name not matched"
       assert_equal expected_author.full_name, author_json['full_name'], "author #{i} full_name not matched"
     end
-    # Contributors is now an array of objects with id, first_name, last_name, orcid, full_name
+    # Contributors is now an array of objects with id, given_name, family_name, full_name, name, orcid
     response_contributors = JSON.parse(response.body)['contributors']
     assert_equal test_material.contributors.size, response_contributors.size, 'contributors count not matched'
     response_contributors.each_with_index do |contributor_json, i|
       expected_contributor = test_material.contributors[i]
-      assert_equal expected_contributor.first_name, contributor_json['first_name'], "contributor #{i} first_name not matched"
-      assert_equal expected_contributor.last_name, contributor_json['last_name'], "contributor #{i} last_name not matched"
+      assert_equal expected_contributor.display_name, contributor_json['name'], "contributor #{i} name not matched"
       assert_equal expected_contributor.full_name, contributor_json['full_name'], "contributor #{i} full_name not matched"
     end
     assert_equal test_material.subsets, JSON.parse(response.body)['subsets'], 'subsets not matched'
diff --git a/test/fixtures/people.yml b/test/fixtures/people.yml
index c761d85d9..530c38951 100644
--- a/test/fixtures/people.yml
+++ b/test/fixtures/people.yml
@@ -1,41 +1,47 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 horace:
-  first_name: Horace
-  last_name: Smith
+  full_name: Horace Smith
+  given_name: Horace
+  family_name: Smith
   orcid: 0000-0001-2345-6789
 
 flo:
-  first_name: Flo
-  last_name: Johnson
+  full_name: Flo Johnson
+  given_name: Flo
+  family_name: Johnson
   orcid: null
 
 nicolai_tesla:
-  first_name: Nicolai
-  last_name: Tesla
+  full_name: Nicolai Tesla
+  given_name: Nicolai
+  family_name: Tesla
   orcid: null
 
 thomas_edison:
-  first_name: Thomas
-  last_name: Edison
+  full_name: Thomas Edison
+  given_name: Thomas
+  family_name: Edison
   orcid: null
 
 saskia:
-  first_name: Saskia
-  last_name: Lawson-Tovey
+  full_name: Saskia Lawson-Tovey
+  given_name: Saskia
+  family_name: Lawson-Tovey
   orcid: null
 
 dr_dre:
-  first_name: Dr
-  last_name: Dre
+  full_name: Dr Dre
   orcid: null
 
 robert_andrews:
-  first_name: Robert
-  last_name: Andrews
+  full_name: Robert Andrews
+  given_name: Robert
+  family_name: Andrews
   orcid: null
 
 munazah_andrabi:
-  first_name: Munazah
-  last_name: Andrabi
+  full_name: Munazah Andrabi
+  given_name: Munazah
+  family_name: Andrabi
   orcid: null
diff --git a/test/models/material_test.rb b/test/models/material_test.rb
index a487cf131..8b3d9de80 100644
--- a/test/models/material_test.rb
+++ b/test/models/material_test.rb
@@ -10,8 +10,8 @@ class MaterialTest < ActiveSupport::TestCase
                                  url: 'http://goog.e.com',
                                  user: @user,
                                  person_links_attributes: [
-                                   { role: 'author', person_attributes: { first_name: 'Horace', last_name: 'Smith' } },
-                                   { role: 'author', person_attributes: { first_name: 'Flo', last_name: 'Johnson' } }
+                                   { role: 'author', person_attributes: { full_name: 'Horace Smith', given_name: 'Horace', family_name: 'Smith' } },
+                                   { role: 'author', person_attributes: { full_name: 'Flo Johnson', given_name: 'Flo', family_name: 'Johnson' } }
                                  ],
                                  doi: 'https://doi.org/10.1011/RSE.2019.55',
                                  licence: 'CC-BY-NC-SA-4.0',
@@ -57,11 +57,11 @@ class MaterialTest < ActiveSupport::TestCase
 
     assert_not_nil m.authors, 'old authors is nil.'
     assert_equal 2, m.authors.size, 'old authors size not matched.'
-    assert_equal 'Thomas Edison', m.authors[1].full_name, 'old authors[1] not matched.'
+    assert_equal 'Thomas Edison', m.authors[1].display_name, 'old authors[1] not matched.'
 
     assert_not_nil m.contributors, 'old contributors is nil.'
     assert_equal 1, m.contributors.size, 'old contributors size not matched.'
-    assert_equal 'Dr Dre', m.contributors[0].full_name, 'old contributors[0] not matched.'
+    assert_equal 'Dr Dre', m.contributors[0].display_name, 'old contributors[0] not matched.'
 
     assert_equal " * None\n * Nothing at all\n", m.prerequisites, 'old prerequisites not matched.'
     assert_equal '1. Overview\  2. The main part\  3. Summing up', m.syllabus, 'old syllabus not matched.'
@@ -80,7 +80,7 @@ class MaterialTest < ActiveSupport::TestCase
     m.date_published = '2021-06-14'
     m.subsets = []
     m.person_links.where(role: 'author').destroy_all
-    person = Person.create!(first_name: 'Nikolai', last_name: 'Tesla')
+    person = Person.create!(full_name: 'Nikolai Tesla', given_name: 'Nikolai', family_name: 'Tesla')
     m.person_links.create!(person: person, role: 'author')
     m.contributors = ['Prof. Stephen Hawking']
     m.prerequisites = 'Bring your enthusiasm'
@@ -124,11 +124,11 @@ class MaterialTest < ActiveSupport::TestCase
 
     assert_not_nil m2.authors, 'new authors is nil.'
     assert_equal 1, m2.authors.size, 'new authors size not matched.'
-    assert_equal 'Nikolai Tesla', m2.authors[0].full_name, 'new authors[0] not matched.'
+    assert_equal 'Nikolai Tesla', m2.authors[0].display_name, 'new authors[0] not matched.'
 
     assert_not_nil m2.contributors, 'new contributors is nil.'
     assert_equal 1, m2.contributors.size, 'new contributors size not matched.'
-    assert_equal 'Prof. Stephen Hawking', m2.contributors[0].full_name, 'new contributors[0] not matched.'
+    assert_equal 'Prof. Stephen Hawking', m2.contributors[0].display_name, 'new contributors[0] not matched.'
 
     assert_equal 'Bring your enthusiasm', m2.prerequisites, 'new prerequisites not matched.'
     assert_equal "1. Overview\  2. The main part\  3. Summary", m2.syllabus, 'new syllabus not matched.'
@@ -148,14 +148,14 @@ class MaterialTest < ActiveSupport::TestCase
   test 'should add authors via nested attributes' do
     assert_equal 2, @material.authors.size
     assert @material.update(person_links_attributes: [
-      { role: 'author', person_attributes: { first_name: 'John', last_name: 'Doe' } },
-      { role: 'author', person_attributes: { first_name: 'Jane', last_name: 'Smith', orcid: '0000-0002-1234-5678' } }
+      { role: 'author', person_attributes: { full_name: 'John Doe', given_name: 'John', family_name: 'Doe' } },
+      { role: 'author', person_attributes: { full_name: 'Jane Smith', given_name: 'Jane', family_name: 'Smith', orcid: '0000-0002-1234-5678' } }
     ])
     @material.reload
     assert_equal 4, @material.authors.size
-    jane = @material.authors.find { |a| a.first_name == 'Jane' }
+    jane = @material.authors.find { |a| a.given_name == 'Jane' }
     assert_not_nil jane
-    assert_equal 'Jane Smith', jane.full_name
+    assert_equal 'Jane Smith', jane.display_name
     assert_equal '0000-0002-1234-5678', jane.orcid
   end
 
@@ -175,34 +175,32 @@ class MaterialTest < ActiveSupport::TestCase
     @material.reload
 
     assert_equal 2, @material.authors.size
-    john = @material.authors.find { |a| a.last_name == 'Doe' }
+    john = @material.authors.find { |a| a.display_name == 'John Doe' }
     assert_not_nil john
-    assert_equal 'John', john.first_name
-    assert_equal 'Doe', john.last_name
+    assert_equal 'John Doe', john.full_name
 
-    jane = @material.authors.find { |a| a.last_name == 'Smith' }
+    jane = @material.authors.find { |a| a.display_name == 'Jane Smith' }
     assert_not_nil jane
-    assert_equal 'Jane', jane.first_name
-    assert_equal 'Smith', jane.last_name
+    assert_equal 'Jane Smith', jane.full_name
   end
 
   test 'should set authors from array of hashes' do
     @material.authors = [
-      { first_name: 'John', last_name: 'Doe', orcid: '0000-0001-1234-5678' },
-      { first_name: 'Jane', last_name: 'Smith' }
+      { given_name: 'John', family_name: 'Doe', orcid: '0000-0001-1234-5678' },
+      { full_name: 'Jane Smith' }
     ]
     @material.save!
     @material.reload
 
     assert_equal 2, @material.authors.size
-    john = @material.authors.find { |a| a.last_name == 'Doe' }
+    john = @material.authors.find { |a| a.family_name == 'Doe' }
     assert_not_nil john
     assert_equal '0000-0001-1234-5678', john.orcid
   end
 
   test 'should set authors from array of Person objects' do
-    person1 = Person.create!(first_name: 'Alice', last_name: 'Wonder')
-    person2 = Person.create!(first_name: 'Bob', last_name: 'Builder')
+    person1 = Person.create!(full_name: 'Alice Wonder', given_name: 'Alice', family_name: 'Wonder')
+    person2 = Person.create!(full_name: 'Bob Builder', given_name: 'Bob', family_name: 'Builder')
 
     @material.authors = [person1, person2]
     @material.save!
@@ -219,9 +217,9 @@ class MaterialTest < ActiveSupport::TestCase
     @material.reload
 
     assert_equal 2, @material.authors.size
-    madonna = @material.authors.find { |a| a.last_name == 'Madonna' }
+    madonna = @material.authors.find { |a| a.full_name == 'Madonna' }
     assert_not_nil madonna
-    assert_equal '', madonna.first_name
+    assert_equal 'Madonna', madonna.display_name
   end
 
   test 'should set contributors from array of strings (legacy API support)' do
@@ -230,29 +228,28 @@ class MaterialTest < ActiveSupport::TestCase
     @material.reload
 
     assert_equal 2, @material.contributors.size
-    john = @material.contributors.find { |c| c.last_name == 'Doe' }
+    john = @material.contributors.find { |c| c.display_name == 'John Doe' }
     assert_not_nil john
-    assert_equal 'John', john.first_name
-    assert_equal 'Doe', john.last_name
+    assert_equal 'John Doe', john.full_name
   end
 
   test 'should set contributors from array of hashes' do
     @material.contributors = [
-      { first_name: 'John', last_name: 'Doe', orcid: '0000-0001-1234-5678' },
-      { first_name: 'Jane', last_name: 'Smith' }
+      { given_name: 'John', family_name: 'Doe', orcid: '0000-0001-1234-5678' },
+      { full_name: 'Jane Smith' }
     ]
     @material.save!
     @material.reload
 
     assert_equal 2, @material.contributors.size
-    john = @material.contributors.find { |c| c.last_name == 'Doe' }
+    john = @material.contributors.find { |c| c.family_name == 'Doe' }
     assert_not_nil john
     assert_equal '0000-0001-1234-5678', john.orcid
   end
 
   test 'should set contributors from array of Person objects' do
-    person1 = Person.create!(first_name: 'Alice', last_name: 'Wonder')
-    person2 = Person.create!(first_name: 'Bob', last_name: 'Builder')
+    person1 = Person.create!(full_name: 'Alice Wonder', given_name: 'Alice', family_name: 'Wonder')
+    person2 = Person.create!(full_name: 'Bob Builder', given_name: 'Bob', family_name: 'Builder')
 
     @material.contributors = [person1, person2]
     @material.save!
diff --git a/test/models/person_test.rb b/test/models/person_test.rb
index 39e6ed85b..d44009ec9 100644
--- a/test/models/person_test.rb
+++ b/test/models/person_test.rb
@@ -1,33 +1,38 @@
 require 'test_helper'
 
 class PersonTest < ActiveSupport::TestCase
-  test 'should create person with first and last name' do
-    person = Person.create(first_name: 'John', last_name: 'Doe')
+  test 'should create person with full_name' do
+    person = Person.create(full_name: 'John Doe')
     assert person.valid?
-    assert_equal 'John Doe', person.full_name
+    assert_equal 'John Doe', person.display_name
   end
 
-  test 'should require first name' do
-    person = Person.new(last_name: 'Doe')
-    refute person.valid?
-    assert_includes person.errors[:first_name], "can't be blank"
+  test 'should create person with given and family name' do
+    person = Person.create(given_name: 'John', family_name: 'Doe')
+    assert person.valid?
+    assert_equal 'John Doe', person.display_name
   end
 
-  test 'should require last name' do
-    person = Person.new(first_name: 'John')
+  test 'should require either full_name or both given and family name' do
+    person = Person.new
     refute person.valid?
-    assert_includes person.errors[:last_name], "can't be blank"
+    assert_includes person.errors[:base], "Either full_name or both given_name and family_name must be present"
   end
 
   test 'should allow optional orcid' do
-    person = Person.create(first_name: 'John', last_name: 'Doe', orcid: '0000-0001-2345-6789')
+    person = Person.create(full_name: 'John Doe', orcid: '0000-0001-2345-6789')
     assert person.valid?
     assert_equal '0000-0001-2345-6789', person.orcid
   end
 
-  test 'full_name should concatenate first and last name' do
-    person = Person.new(first_name: 'Jane', last_name: 'Smith')
-    assert_equal 'Jane Smith', person.full_name
+  test 'display_name should return full_name if present' do
+    person = Person.new(full_name: 'Dr. Jane Marie Smith', given_name: 'Jane', family_name: 'Smith')
+    assert_equal 'Dr. Jane Marie Smith', person.display_name
+  end
+
+  test 'display_name should construct from given and family name if full_name is blank' do
+    person = Person.new(given_name: 'Jane', family_name: 'Smith')
+    assert_equal 'Jane Smith', person.display_name
   end
 
   test 'should have person_links' do
diff --git a/test/unit/ingestors/zenodo_ingestor_test.rb b/test/unit/ingestors/zenodo_ingestor_test.rb
index a2e0145c6..d6a0b585f 100644
--- a/test/unit/ingestors/zenodo_ingestor_test.rb
+++ b/test/unit/ingestors/zenodo_ingestor_test.rb
@@ -48,21 +48,21 @@ class ZenodoIngestorTest < ActiveSupport::TestCase
     assert_equal 'CC-BY-4.0', material.licence, 'material licence not matched'
     assert_equal 'active', material.status, 'material status not matched'
     assert_equal 1, material.authors.size, 'material authors count not matched.'
-    assert material.authors.any? { |a| a.full_name == 'Australian Research Data Commons' }, 'author not found'
+    assert material.authors.any? { |a| a.display_name == 'Australian Research Data Commons' }, 'author not found'
     assert_equal '10.5281/zenodo.10656276', material.doi, 'material.doi not matched.'
 
     # check material with contributors
     material = get_zenodo_id(10525947, 'HASS and Indigenous Research Data Commons co-design framework', 'Portal Provider')
     assert !material.description.nil?, 'material description is nil!'
-    assert !material.contributors.nil?, 'material keywords is nil'
+    assert !material.contributors.nil?, 'material contributors is nil'
     assert_equal 3, material.contributors.size, 'material contributors count not matched!'
-    assert material.contributors.include?('Burton, Nichola (type: Producer)'), 'material contributors[0] missing.'
-    assert material.contributors.include?('Fewster, Jennifer (type: ProjectLeader)'), 'material contributors[2] missing.'
+    assert material.contributors.any? { |c| c.display_name == 'Burton, Nichola' }, 'material contributors[0] missing.'
+    assert material.contributors.any? { |c| c.display_name == 'Fewster, Jennifer' }, 'material contributors[2] missing.'
     assert_equal '10.5281/zenodo.10525947', material.doi, 'material.doi not matched.'
 
     # check material from page 2
     material = get_zenodo_id(10052012, 'Privacy focused health data storage and access control through personal online datastores', 'Portal Provider')
-    assert material.authors.any? { |a| a.full_name == 'Vidanage, Anushka' && a.orcid == '0000-0002-5386-5871' }, 'author with ORCID not found'
+    assert material.authors.any? { |a| a.display_name == 'Vidanage, Anushka' && a.orcid == '0000-0002-5386-5871' }, 'author with ORCID not found'
   end
 
   private

From dc0606aa24810ea01424f5a54c6b74d63182a695 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 5 Dec 2025 11:27:43 +0000
Subject: [PATCH 08/12] Add legacy first_name/last_name to permitted params for
 API backwards compatibility

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 app/controllers/materials_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/materials_controller.rb b/app/controllers/materials_controller.rb
index c6e92e2de..e52a0bcd7 100644
--- a/app/controllers/materials_controller.rb
+++ b/app/controllers/materials_controller.rb
@@ -176,7 +176,7 @@ def material_params
                                      { scientific_topic_names: [] }, { scientific_topic_uris: [] },
                                      { operation_names: [] }, { operation_uris: [] },
                                      { node_ids: [] }, { node_names: [] }, { fields: [] },
-                                     person_links_attributes: [:id, :role, :_destroy, person_attributes: %i[id given_name family_name full_name orcid]],
+                                     person_links_attributes: [:id, :role, :_destroy, person_attributes: %i[id given_name family_name full_name first_name last_name orcid]],
                                      external_resources_attributes: %i[id url title _destroy],
                                      external_resources: %i[url title],
                                      event_ids: [], locked_fields: [])

From ebf99c20a9f4410d9fc816035286e7dcf03fa464 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 5 Dec 2025 14:25:28 +0000
Subject: [PATCH 09/12] Add optional belongs_to :profile on Person, auto-link
 by ORCID on save

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 app/models/person.rb                       | 19 ++++++++++
 app/serializers/person_serializer.rb       |  2 +-
 app/views/materials/show.json.jbuilder     |  4 +--
 db/migrate/20251119095244_create_people.rb |  1 +
 test/models/person_test.rb                 | 41 ++++++++++++++++++++++
 5 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/app/models/person.rb b/app/models/person.rb
index a036e055e..b765de3b4 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -1,9 +1,13 @@
 class Person < ApplicationRecord
+  belongs_to :profile, optional: true
   has_many :person_links, dependent: :destroy
 
   # Validate that at least a full_name OR both given_name and family_name are present
   validate :name_presence
 
+  # Automatically link to profile based on ORCID on save
+  before_save :link_to_profile_by_orcid
+
   # Return the display name - full_name if present, otherwise construct from given_name and family_name
   def display_name
     full_name.presence || "#{given_name} #{family_name}".strip
@@ -16,4 +20,19 @@ def name_presence
       errors.add(:base, "Either full_name or both given_name and family_name must be present")
     end
   end
+
+  # 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}"
+    end
+
+    matching_profile = Profile.find_by(orcid: normalized_orcid)
+    self.profile = matching_profile if matching_profile.present?
+  end
 end
diff --git a/app/serializers/person_serializer.rb b/app/serializers/person_serializer.rb
index 3d14feca4..4d797d3db 100644
--- a/app/serializers/person_serializer.rb
+++ b/app/serializers/person_serializer.rb
@@ -1,5 +1,5 @@
 class PersonSerializer < ApplicationSerializer
-  attributes :id, :given_name, :family_name, :full_name, :orcid
+  attributes :id, :given_name, :family_name, :full_name, :orcid, :profile_id
 
   # Return display_name for API responses
   attribute :name do |person|
diff --git a/app/views/materials/show.json.jbuilder b/app/views/materials/show.json.jbuilder
index 50bbdfcf8..fa652dbd1 100644
--- a/app/views/materials/show.json.jbuilder
+++ b/app/views/materials/show.json.jbuilder
@@ -21,8 +21,8 @@ json.nodes @material.associated_nodes.collect { |x| { name: x[:name], node_id: x
 json.collections @material.collections.collect { |x| { title: x[:title], id: x[:id] } }
 json.events @material.events.collect { |x| { title: x[:title], id: x[:id] } }
 
-json.authors @material.authors.collect { |a| { id: a.id, given_name: a.given_name, family_name: a.family_name, full_name: a.full_name, name: a.display_name, orcid: a.orcid } }
-json.contributors @material.contributors.collect { |c| { id: c.id, given_name: c.given_name, family_name: c.family_name, full_name: c.full_name, name: c.display_name, orcid: c.orcid } }
+json.authors @material.authors.collect { |a| { id: a.id, given_name: a.given_name, family_name: a.family_name, full_name: a.full_name, name: a.display_name, orcid: a.orcid, profile_id: a.profile_id } }
+json.contributors @material.contributors.collect { |c| { id: c.id, given_name: c.given_name, family_name: c.family_name, full_name: c.full_name, name: c.display_name, orcid: c.orcid, profile_id: c.profile_id } }
 
 json.external_resources do
   @material.external_resources.each do |external_resource|
diff --git a/db/migrate/20251119095244_create_people.rb b/db/migrate/20251119095244_create_people.rb
index 80716714c..5ccc0d2d7 100644
--- a/db/migrate/20251119095244_create_people.rb
+++ b/db/migrate/20251119095244_create_people.rb
@@ -5,6 +5,7 @@ def change
       t.string :family_name
       t.string :full_name
       t.string :orcid
+      t.references :profile, null: true, foreign_key: true
 
       t.timestamps
     end
diff --git a/test/models/person_test.rb b/test/models/person_test.rb
index d44009ec9..fcf06b3af 100644
--- a/test/models/person_test.rb
+++ b/test/models/person_test.rb
@@ -39,4 +39,45 @@ class PersonTest < ActiveSupport::TestCase
     person = people(:horace)
     assert_respond_to person, :person_links
   end
+
+  test 'should allow optional profile association' do
+    person = Person.create(full_name: 'John Doe')
+    assert person.valid?
+    assert_nil person.profile
+  end
+
+  test 'should automatically link to profile by orcid on save' do
+    profile = profiles(:trainer_one_profile)
+    # The trainer_one_profile has orcid: https://orcid.org/000-0002-1825-0097
+    person = Person.create(full_name: 'Josiah Carberry', orcid: 'https://orcid.org/000-0002-1825-0097')
+    assert person.valid?
+    assert_equal profile, person.profile
+  end
+
+  test 'should automatically link to profile using short orcid format' do
+    profile = profiles(:trainer_one_profile)
+    # The trainer_one_profile has orcid: https://orcid.org/000-0002-1825-0097
+    person = Person.create(full_name: 'Josiah Carberry', orcid: '000-0002-1825-0097')
+    assert person.valid?
+    assert_equal profile, person.profile
+  end
+
+  test 'should not link to profile if no matching orcid' do
+    person = Person.create(full_name: 'John Doe', orcid: '0000-0001-9999-9999')
+    assert person.valid?
+    assert_nil person.profile
+  end
+
+  test 'should not override existing profile link' do
+    profile1 = profiles(:trainer_one_profile)
+    profile2 = profiles(:admin_trainer_profile)
+
+    # First, manually set a profile
+    person = Person.create(full_name: 'John Doe', profile: profile2)
+    assert_equal profile2, person.profile
+
+    # Even if we update the ORCID to match profile1, it should keep profile2
+    person.update(orcid: 'https://orcid.org/000-0002-1825-0097')
+    assert_equal profile2, person.profile
+  end
 end

From 26f39f1b0c3a053da00f6514c362541b423a770d Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Fri, 5 Dec 2025 15:40:17 +0000
Subject: [PATCH 10/12] Schema

---
 db/schema.rb | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 7354d68e5..538343ff3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -363,8 +363,6 @@
     t.datetime "updated_at", null: false
     t.text "description"
     t.string "target_audience", default: [], array: true
-    t.string "authors", default: [], array: true
-    t.string "contributors", default: [], array: true
     t.string "licence", default: "notspecified"
     t.string "difficulty_level", default: "notspecified"
     t.integer "content_provider_id"
@@ -429,6 +427,30 @@
     t.index ["term_uri"], name: "index_ontology_term_links_on_term_uri"
   end
 
+  create_table "people", force: :cascade do |t|
+    t.string "given_name"
+    t.string "family_name"
+    t.string "full_name"
+    t.string "orcid"
+    t.bigint "profile_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["orcid"], name: "index_people_on_orcid"
+    t.index ["profile_id"], name: "index_people_on_profile_id"
+  end
+
+  create_table "person_links", force: :cascade do |t|
+    t.string "resource_type", null: false
+    t.bigint "resource_id", null: false
+    t.bigint "person_id", null: false
+    t.string "role", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["person_id"], name: "index_person_links_on_person_id"
+    t.index ["resource_type", "resource_id", "person_id", "role"], name: "index_person_links_uniqueness", unique: true
+    t.index ["resource_type", "resource_id"], name: "index_person_links_on_resource"
+  end
+
   create_table "profiles", force: :cascade do |t|
     t.text "firstname"
     t.text "surname"
@@ -666,6 +688,8 @@
   add_foreign_key "materials", "users"
   add_foreign_key "node_links", "nodes"
   add_foreign_key "nodes", "users"
+  add_foreign_key "people", "profiles"
+  add_foreign_key "person_links", "people"
   add_foreign_key "sources", "content_providers"
   add_foreign_key "sources", "users"
   add_foreign_key "space_roles", "spaces"

From 0892030e20dcd9465905251b5092e9c29538b798 Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Fri, 5 Dec 2025 15:42:56 +0000
Subject: [PATCH 11/12] Fix missing `end`

---
 app/controllers/materials_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/materials_controller.rb b/app/controllers/materials_controller.rb
index e52a0bcd7..de9b8d25c 100644
--- a/app/controllers/materials_controller.rb
+++ b/app/controllers/materials_controller.rb
@@ -181,7 +181,6 @@ def material_params
                                      external_resources: %i[url title],
                                      event_ids: [], locked_fields: [])
   end
-  end
 
   def set_learning_path_navigation
     return unless params[:lp]

From 8125c8b45c7ae6cb68ae4baafa0160707d8f1bd8 Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Fri, 5 Dec 2025 15:43:08 +0000
Subject: [PATCH 12/12] DRY up some ORCID handling code

---
 app/models/concerns/has_orcid.rb              | 18 +++++++++++++++++
 app/models/person.rb                          | 17 +++++++---------
 app/models/profile.rb                         | 14 +++----------
 lib/bioschemas/generator.rb                   | 10 ++++++++++
 lib/bioschemas/learning_resource_generator.rb | 20 ++-----------------
 5 files changed, 40 insertions(+), 39 deletions(-)
 create mode 100644 app/models/concerns/has_orcid.rb

diff --git a/app/models/concerns/has_orcid.rb b/app/models/concerns/has_orcid.rb
new file mode 100644
index 000000000..eabde600a
--- /dev/null
+++ b/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
diff --git a/app/models/person.rb b/app/models/person.rb
index b765de3b4..a04b88607 100644
--- a/app/models/person.rb
+++ b/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
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 9935bcca9..85ef53903 100644
--- a/app/models/profile.rb
+++ b/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
diff --git a/lib/bioschemas/generator.rb b/lib/bioschemas/generator.rb
index 7dd8cd424..ffa2ad0d9 100644
--- a/lib/bioschemas/generator.rb
+++ b/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
\ No newline at end of file
diff --git a/lib/bioschemas/learning_resource_generator.rb b/lib/bioschemas/learning_resource_generator.rb
index e0b28df7b..83e0863ae 100644
--- a/lib/bioschemas/learning_resource_generator.rb
+++ b/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 } }