Merge branch 'dev' into feature/github-integration

rsmithlal · web-flow · commit 96f0560fa776 · 2025-03-01T13:49:27.000-03:30
diff --git a/app/models/better_together/author.rb b/app/models/better_together/author.rb
diff --git a/app/models/better_together/authorable.rb b/app/models/better_together/authorable.rb
diff --git a/app/models/better_together/authorship.rb b/app/models/better_together/authorship.rb
@@ -3,7 +3,11 @@
 module BetterTogether
   # Connects an author (eg: person) to an authorable (eg: post)
   class Authorship < ApplicationRecord
-    belongs_to :author
-    belongs_to :authorable
+    include Positioned
+
+    belongs_to :author,
+               class_name: 'BetterTogether::Person'
+    belongs_to :authorable,
+               polymorphic: true
   end
 end
diff --git a/app/models/better_together/page.rb b/app/models/better_together/page.rb
@@ -3,7 +3,7 @@
 module BetterTogether
   # An informational document used to display custom content to the user
   class Page < ApplicationRecord
-    include AuthorableConcern
+    include Authorable
     include Categorizable
     include Identifier
     include Protected
diff --git a/app/models/better_together/person.rb b/app/models/better_together/person.rb
@@ -9,7 +9,7 @@ def self.primary_community_delegation_attrs
       []
     end
 
-    include AuthorConcern
+    include Author
     include Contactable
     include FriendlySlug
     include Identifier
diff --git a/app/models/better_together/post.rb b/app/models/better_together/post.rb
@@ -8,7 +8,7 @@ class Post < ApplicationRecord
       public: 'public'
     }.freeze
 
-    include AuthorableConcern
+    include Authorable
     include FriendlySlug
     include Categorizable
     include Identifier
diff --git a/app/models/concerns/better_together/author.rb b/app/models/concerns/better_together/author.rb
@@ -2,12 +2,14 @@
 
 module BetterTogether
   # When included, designates a class as Author
-  module AuthorConcern
+  module Author
     extend ActiveSupport::Concern
 
     included do
       has_many :authorships,
-               as: :authorable
+               as: :author
+      has_many :authorables,
+               through: :authorships
     end
   end
 end
diff --git a/app/models/concerns/better_together/authorable.rb b/app/models/concerns/better_together/authorable.rb
@@ -2,7 +2,7 @@
 
 module BetterTogether
   # When included, designates a class as Authorable
-  module AuthorableConcern
+  module Authorable
     extend ActiveSupport::Concern
 
     included do
diff --git a/db/migrate/20200520035111_create_better_together_authors.rb b/db/migrate/20200520035111_create_better_together_authors.rb
diff --git a/db/migrate/20200520035112_create_better_together_authorables.rb b/db/migrate/20200520035112_create_better_together_authorables.rb
diff --git a/db/migrate/20200520035246_create_better_together_authorships.rb b/db/migrate/20200520035246_create_better_together_authorships.rb
@@ -7,24 +7,16 @@ def change # rubocop:todo Metrics/MethodLength
       t.bt_position
       t.bt_references :authorable,
                       null: false,
+                      polymorphic: true,
                       index: {
                         name: 'by_authorship_authorable'
                       }
       t.bt_references :author,
                       null: false,
+                      target_table: 'better_together_people',
                       index: {
                         name: 'by_authorship_author'
                       }
     end
-
-    add_foreign_key :better_together_authorships,
-                    :better_together_authors,
-                    column: :author_id,
-                    name: "authorships_on_author_id"
-
-    add_foreign_key :better_together_authorships,
-                    :better_together_authorables,
-                    column: :authorable_id,
-                    name: "authorships_on_authorable_id"
   end
 end
diff --git a/future_spec/concerns/better_together/author_spec.rb b/future_spec/concerns/better_together/author_spec.rb
@@ -4,9 +4,9 @@
 
 # Athor concern spec
 module BetterTogether
-  describe AuthorConcern, type: :model do
+  describe Author, type: :model do
     class TestClass < ApplicationRecord # rubocop:todo Lint/ConstantDefinitionInBlock
-      include AuthorConcern
+      include Author
     end
 
     before(:all) do
diff --git a/future_spec/concerns/better_together/authorable_spec.rb b/future_spec/concerns/better_together/authorable_spec.rb
@@ -4,9 +4,9 @@
 
 # Authorable conern specs
 module BetterTogether
-  describe AuthorableConcern, type: :model do
+  describe Authorable, type: :model do
     class TestClass < ApplicationRecord # rubocop:todo Lint/ConstantDefinitionInBlock
-      include AuthorableConcern
+      include Authorable
     end
 
     before(:all) do
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
@@ -100,15 +100,6 @@
     t.index ["target_locale"], name: "index_better_together_ai_log_translations_on_target_locale"
   end
 
-  create_table "better_together_authorables", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.integer "lock_version", default: 0, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string "authorable_type", null: false
-    t.uuid "authorable_id", null: false
-    t.index ["authorable_type", "authorable_id"], name: "by_authorable", unique: true
-  end
-
   create_table "better_together_authors", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.integer "lock_version", default: 0, null: false
     t.datetime "created_at", null: false
@@ -123,10 +114,11 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "position", null: false
+    t.string "authorable_type", null: false
     t.uuid "authorable_id", null: false
     t.uuid "author_id", null: false
     t.index ["author_id"], name: "by_authorship_author"
-    t.index ["authorable_id"], name: "by_authorship_authorable"
+    t.index ["authorable_type", "authorable_id"], name: "by_authorship_authorable"
   end
 
   create_table "better_together_categories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -934,10 +926,7 @@
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "better_together_addresses", "better_together_contact_details", column: "contact_detail_id"
   add_foreign_key "better_together_ai_log_translations", "better_together_people", column: "initiator_id"
-  add_foreign_key "better_together_authorships", "better_together_authorables", column: "authorable_id"
-  add_foreign_key "better_together_authorships", "better_together_authorables", column: "authorable_id", name: "authorships_on_authorable_id"
-  add_foreign_key "better_together_authorships", "better_together_authors", column: "author_id"
-  add_foreign_key "better_together_authorships", "better_together_authors", column: "author_id", name: "authorships_on_author_id"
+  add_foreign_key "better_together_authorships", "better_together_people", column: "author_id"
   add_foreign_key "better_together_categorizations", "better_together_categories", column: "category_id"
   add_foreign_key "better_together_communities", "better_together_people", column: "creator_id"
   add_foreign_key "better_together_content_blocks", "better_together_people", column: "creator_id"
diff --git a/spec/support/shared_examples/an_author_model.rb b/spec/support/shared_examples/an_author_model.rb
@@ -3,7 +3,7 @@
 RSpec.shared_examples 'an author model' do
   it 'has identity in its ancestor tree' do
     expect(described_class.ancestors).to include(
-      BetterTogether::AuthorConcern
+      BetterTogether::Author
     )
   end
 
diff --git a/spec/support/shared_examples/an_authorable_model.rb b/spec/support/shared_examples/an_authorable_model.rb
@@ -3,7 +3,7 @@
 RSpec.shared_examples 'an authorable model' do
   it 'has identity in its ancestor tree' do
     expect(described_class.ancestors).to include(
-      BetterTogether::AuthorableConcern
+      BetterTogether::Authorable
     )
   end
 
