From 90a5dfecb1ec996f8a9d342805afc74b14a5223e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Mon, 24 Jan 2022 15:53:14 +0100
Subject: [PATCH] involvement
---
app/models/university/person/involvement.rb | 30 ++++++++++++++++++-
...7_create_university_person_involvements.rb | 4 +--
db/schema.rb | 19 +++++++++++-
.../university/person/involvements.yml | 26 ++++++++++++++++
.../university/person/involvement_test.rb | 26 ++++++++++++++++
5 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/app/models/university/person/involvement.rb b/app/models/university/person/involvement.rb
index 613c636f6..ca3eab7e0 100644
--- a/app/models/university/person/involvement.rb
+++ b/app/models/university/person/involvement.rb
@@ -1,5 +1,33 @@
+# == Schema Information
+#
+# Table name: university_person_involvements
+#
+# id :uuid not null, primary key
+# description :text
+# kind :integer
+# position :integer
+# target_type :string not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# person_id :uuid not null
+# target_id :uuid not null
+# university_id :uuid not null
+#
+# Indexes
+#
+# index_university_person_involvements_on_person_id (person_id)
+# index_university_person_involvements_on_target (target_type,target_id)
+# index_university_person_involvements_on_university_id (university_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (person_id => university_people.id)
+# fk_rails_... (university_id => universities.id)
+#
class University::Person::Involvement < ApplicationRecord
belongs_to :university
belongs_to :person
- belongs_to :target
+ belongs_to :target, polymorphic: true
+
+ enum kind: { administrator: 10, researcher: 20, teacher: 30 }
end
diff --git a/db/migrate/20220124143037_create_university_person_involvements.rb b/db/migrate/20220124143037_create_university_person_involvements.rb
index 1ff42b9b6..2afa0e033 100644
--- a/db/migrate/20220124143037_create_university_person_involvements.rb
+++ b/db/migrate/20220124143037_create_university_person_involvements.rb
@@ -2,9 +2,9 @@ class CreateUniversityPersonInvolvements < ActiveRecord::Migration[6.1]
def change
create_table :university_person_involvements, id: :uuid do |t|
t.references :university, null: false, foreign_key: true, type: :uuid
- t.references :person, null: false, foreign_key: true, type: :uuid
+ t.references :person, null: false, foreign_key: { to_table: :university_people }, type: :uuid
t.integer :kind
- t.references :target, null: false, foreign_key: true, type: :uuid
+ t.references :target, null: false, polymorphic: true, type: :uuid
t.text :description
t.integer :position
diff --git a/db/schema.rb b/db/schema.rb
index c335a18cd..5a4e6758c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2022_01_24_110004) do
+ActiveRecord::Schema.define(version: 2022_01_24_143037) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
@@ -578,6 +578,21 @@ ActiveRecord::Schema.define(version: 2022_01_24_110004) do
t.index ["user_id"], name: "index_university_people_on_user_id"
end
+ create_table "university_person_involvements", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ t.uuid "university_id", null: false
+ t.uuid "person_id", null: false
+ t.integer "kind"
+ t.string "target_type", null: false
+ t.uuid "target_id", null: false
+ t.text "description"
+ t.integer "position"
+ t.datetime "created_at", precision: 6, null: false
+ t.datetime "updated_at", precision: 6, null: false
+ t.index ["person_id"], name: "index_university_person_involvements_on_person_id"
+ t.index ["target_type", "target_id"], name: "index_university_person_involvements_on_target"
+ t.index ["university_id"], name: "index_university_person_involvements_on_university_id"
+ end
+
create_table "users", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "first_name"
@@ -692,6 +707,8 @@ ActiveRecord::Schema.define(version: 2022_01_24_110004) do
add_foreign_key "research_theses", "university_people", column: "director_id"
add_foreign_key "university_people", "universities"
add_foreign_key "university_people", "users"
+ add_foreign_key "university_person_involvements", "universities"
+ add_foreign_key "university_person_involvements", "university_people", column: "person_id"
add_foreign_key "users", "languages"
add_foreign_key "users", "universities"
end
diff --git a/test/fixtures/university/person/involvements.yml b/test/fixtures/university/person/involvements.yml
index 4c3e4c945..bde5db526 100644
--- a/test/fixtures/university/person/involvements.yml
+++ b/test/fixtures/university/person/involvements.yml
@@ -1,3 +1,29 @@
+# == Schema Information
+#
+# Table name: university_person_involvements
+#
+# id :uuid not null, primary key
+# description :text
+# kind :integer
+# position :integer
+# target_type :string not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# person_id :uuid not null
+# target_id :uuid not null
+# university_id :uuid not null
+#
+# Indexes
+#
+# index_university_person_involvements_on_person_id (person_id)
+# index_university_person_involvements_on_target (target_type,target_id)
+# index_university_person_involvements_on_university_id (university_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (person_id => university_people.id)
+# fk_rails_... (university_id => universities.id)
+#
# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
diff --git a/test/models/university/person/involvement_test.rb b/test/models/university/person/involvement_test.rb
index 1e5a0b02a..eb9cc0195 100644
--- a/test/models/university/person/involvement_test.rb
+++ b/test/models/university/person/involvement_test.rb
@@ -1,3 +1,29 @@
+# == Schema Information
+#
+# Table name: university_person_involvements
+#
+# id :uuid not null, primary key
+# description :text
+# kind :integer
+# position :integer
+# target_type :string not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# person_id :uuid not null
+# target_id :uuid not null
+# university_id :uuid not null
+#
+# Indexes
+#
+# index_university_person_involvements_on_person_id (person_id)
+# index_university_person_involvements_on_target (target_type,target_id)
+# index_university_person_involvements_on_university_id (university_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (person_id => university_people.id)
+# fk_rails_... (university_id => universities.id)
+#
require "test_helper"
class University::Person::InvolvementTest < ActiveSupport::TestCase
--
GitLab