From 211ae0d875bc4c9edbf053fab7310b0f2814d421 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Sat, 25 May 2024 09:33:50 +0200
Subject: [PATCH] good job statistics
---
Gemfile | 4 ++-
Gemfile.lock | 21 ++++++++-----
db/schema.rb | 83 ++++++++++++++++++++++++++--------------------------
3 files changed, 57 insertions(+), 51 deletions(-)
diff --git a/Gemfile b/Gemfile
index 5d4b445b4..b8b8ea1ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,9 @@ gem "front_matter_parser"
gem "geocoder", "~> 1"
gem "geo_point"
gem "gitlab"
-gem "good_job", "~> 3"
+# gem "good_job", "~> 3", path: "../../noesya/good_job"
+gem "good_job", "~> 3", github: "noesya/good_job"
+# gem "good_job", "~> 3"
gem "hal_openscience", "~> 0"
# gem "hal_openscience", path: "../hal_openscience"
gem "has_scope", "~> 0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 242bc149e..07e5aec36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,18 @@ GIT
jquery-ui-rails (7.0.0)
railties (>= 3.2.16)
+GIT
+ remote: https://github.com/noesya/good_job.git
+ revision: 8007e168d82874b6052e8480e490dd8cbd5d70f3
+ specs:
+ good_job (3.29.2)
+ activejob (>= 6.0.0)
+ activerecord (>= 6.0.0)
+ concurrent-ruby (>= 1.0.2)
+ fugit (>= 1.1)
+ railties (>= 6.0.0)
+ thor (>= 0.14.1)
+
GIT
remote: https://github.com/noesya/summernote-rails.git
revision: 32fd182c929cdcacaa6e3bd3569871bd025fa669
@@ -274,13 +286,6 @@ GEM
terminal-table (>= 1.5.1)
globalid (1.2.1)
activesupport (>= 6.1)
- good_job (3.28.3)
- activejob (>= 6.0.0)
- activerecord (>= 6.0.0)
- concurrent-ruby (>= 1.0.2)
- fugit (>= 1.1)
- railties (>= 6.0.0)
- thor (>= 0.14.1)
hal_openscience (0.1.0)
json
net-http
@@ -664,7 +669,7 @@ DEPENDENCIES
geo_point
geocoder (~> 1)
gitlab
- good_job (~> 3)
+ good_job (~> 3)!
hal_openscience (~> 0)
has_scope (~> 0)
hash_dot
diff --git a/db/schema.rb b/db/schema.rb
index eb6e5534b..bb50a8ea3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -17,7 +17,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
enable_extension "plpgsql"
enable_extension "unaccent"
- create_table "action_text_rich_texts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "action_text_rich_texts", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "name", null: false
t.text "body"
t.string "record_type", null: false
@@ -27,7 +27,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
end
- create_table "active_storage_attachments", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "active_storage_attachments", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
t.uuid "record_id", null: false
@@ -37,7 +37,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
end
- create_table "active_storage_blobs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "active_storage_blobs", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "key", null: false
t.string "filename", null: false
t.string "content_type"
@@ -51,7 +51,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_active_storage_blobs_on_university_id"
end
- create_table "active_storage_variant_records", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "active_storage_variant_records", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "blob_id", null: false
t.string "variation_digest", null: false
t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
@@ -97,7 +97,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["education_school_id", "administration_location_id"], name: "index_location_school"
end
- create_table "administration_qualiopi_criterions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "administration_qualiopi_criterions", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.integer "number"
t.text "name"
t.text "description"
@@ -105,7 +105,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.datetime "updated_at", null: false
end
- create_table "administration_qualiopi_indicators", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "administration_qualiopi_indicators", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "criterion_id", null: false
t.integer "number"
t.text "name"
@@ -136,7 +136,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_communication_block_headings_on_university_id"
end
- create_table "communication_blocks", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_blocks", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "about_type"
t.uuid "about_id"
@@ -242,7 +242,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_communication_extranet_posts_on_university_id"
end
- create_table "communication_extranets", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_extranets", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "name"
t.uuid "university_id", null: false
t.string "host"
@@ -379,7 +379,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_communication_website_git_file_orphans_on_university_id"
end
- create_table "communication_website_git_files", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_website_git_files", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "previous_path"
t.string "about_type", null: false
t.uuid "about_id", null: false
@@ -414,7 +414,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_communication_website_localizations_on_university_id"
end
- create_table "communication_website_menu_items", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_website_menu_items", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "website_id", null: false
t.uuid "menu_id", null: false
@@ -434,7 +434,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["website_id"], name: "index_communication_website_menu_items_on_website_id"
end
- create_table "communication_website_menus", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_website_menus", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "communication_website_id", null: false
t.string "title"
@@ -450,7 +450,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_communication_website_menus_on_university_id"
end
- create_table "communication_website_pages", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_website_pages", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "communication_website_id", null: false
t.string "title"
@@ -487,7 +487,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_communication_website_pages_on_university_id"
end
- create_table "communication_website_permalinks", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_website_permalinks", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "website_id", null: false
t.string "about_type", null: false
@@ -553,7 +553,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "idx_on_university_id_ac2f4a0bfc"
end
- create_table "communication_website_post_categories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_website_post_categories", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "communication_website_id", null: false
t.string "name"
@@ -580,7 +580,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_communication_website_post_categories_on_university_id"
end
- create_table "communication_website_posts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_website_posts", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "communication_website_id", null: false
t.string "title"
@@ -621,7 +621,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["communication_website_showcase_tag_id", "communication_website_id"], name: "index_showcase_tag_website"
end
- create_table "communication_websites", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "communication_websites", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "name"
t.string "url"
@@ -687,19 +687,18 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.integer "attempts", default: 0, null: false
t.text "handler", null: false
t.text "last_error"
- t.datetime "run_at", precision: nil
- t.datetime "locked_at", precision: nil
- t.datetime "failed_at", precision: nil
+ t.datetime "run_at"
+ t.datetime "locked_at"
+ t.datetime "failed_at"
t.string "locked_by"
t.string "queue"
- t.datetime "created_at"
- t.datetime "updated_at"
t.string "signature"
t.text "args"
- t.index ["priority", "run_at"], name: "delayed_jobs_priority"
+ t.datetime "created_at"
+ t.datetime "updated_at"
end
- create_table "education_academic_years", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "education_academic_years", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.integer "year"
t.datetime "created_at", null: false
@@ -714,7 +713,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_person_id", "education_academic_year_id"], name: "index_person_academic_year"
end
- create_table "education_cohorts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "education_cohorts", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "program_id", null: false
t.uuid "academic_year_id", null: false
@@ -735,7 +734,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_person_id", "education_cohort_id"], name: "index_person_cohort"
end
- create_table "education_diplomas", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "education_diplomas", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "name"
t.string "short_name"
t.integer "level", default: 0
@@ -754,7 +753,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_education_diplomas_on_university_id"
end
- create_table "education_programs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "education_programs", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "name"
t.integer "capacity"
@@ -826,7 +825,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["education_program_id", "user_id"], name: "index_education_programs_users_on_program_id_and_user_id"
end
- create_table "education_schools", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "education_schools", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "name"
t.string "address"
@@ -937,7 +936,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["scheduled_at"], name: "index_good_jobs_on_scheduled_at", where: "(finished_at IS NULL)"
end
- create_table "imports", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "imports", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.integer "number_of_lines"
t.jsonb "processing_errors"
t.integer "kind"
@@ -950,7 +949,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["user_id"], name: "index_imports_on_user_id"
end
- create_table "languages", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "languages", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "name"
t.string "iso_code"
t.datetime "created_at", null: false
@@ -1000,7 +999,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_research_journal_paper_kinds_on_university_id"
end
- create_table "research_journal_papers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "research_journal_papers", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "title"
t.datetime "published_at", precision: nil
t.uuid "university_id", null: false
@@ -1042,7 +1041,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["researcher_id"], name: "index_research_journal_papers_researchers_on_researcher_id"
end
- create_table "research_journal_volumes", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "research_journal_volumes", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "research_journal_id", null: false
t.string "title"
@@ -1067,7 +1066,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_research_journal_volumes_on_university_id"
end
- create_table "research_journals", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "research_journals", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "title"
t.text "meta_description"
@@ -1080,7 +1079,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_research_journals_on_university_id"
end
- create_table "research_laboratories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "research_laboratories", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "name"
t.string "address"
@@ -1101,7 +1100,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_person_id", "research_laboratory_id"], name: "laboratory_person"
end
- create_table "research_laboratory_axes", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "research_laboratory_axes", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "research_laboratory_id", null: false
t.string "name"
@@ -1146,7 +1145,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_person_id", "research_publication_id"], name: "index_publication_person"
end
- create_table "research_theses", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "research_theses", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "research_laboratory_id", null: false
t.uuid "author_id", null: false
@@ -1164,7 +1163,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_research_theses_on_university_id"
end
- create_table "universities", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "universities", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.string "name"
t.string "identifier"
t.string "address"
@@ -1217,7 +1216,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_university_organization_categories_on_university_id"
end
- create_table "university_organizations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "university_organizations", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "name"
t.string "long_name"
@@ -1260,7 +1259,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["organization_id"], name: "index_university_organizations_categories_on_organization_id"
end
- create_table "university_people", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "university_people", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "user_id"
t.string "last_name"
@@ -1331,7 +1330,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_university_person_categories_on_university_id"
end
- create_table "university_person_experiences", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "university_person_experiences", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "person_id", null: false
t.uuid "organization_id", null: false
@@ -1345,7 +1344,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_university_person_experiences_on_university_id"
end
- create_table "university_person_involvements", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "university_person_involvements", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.uuid "person_id", null: false
t.integer "kind"
@@ -1360,7 +1359,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["university_id"], name: "index_university_person_involvements_on_university_id"
end
- create_table "university_roles", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "university_roles", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "target_type"
t.uuid "target_id"
@@ -1382,7 +1381,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_05_18_073335) do
t.index ["user_id"], name: "index_user_favorites_on_user_id"
end
- create_table "users", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ create_table "users", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "first_name"
t.string "last_name"
--
GitLab