Merge branch 'dev' into feature/github-integration

Author: rsmithlal

app/models/better_together/post.rb

@@ -3,11 +3,6 @@
 module BetterTogether
   # Represents a blog post
   class Post < ApplicationRecord
-    PRIVACY_LEVELS = {
-      private: 'private',
-      public: 'public'
-    }.freeze
-
     include Authorable
     include FriendlySlug
     include Categorizable
@@ -22,9 +17,6 @@ class Post < ApplicationRecord
 
     slugged :title
 
-    enum post_privacy: PRIVACY_LEVELS,
-         _prefix: :post_privacy
-
     validates :title,
               presence: true
 

app/models/concerns/better_together/author.rb

@@ -7,9 +7,15 @@ module Author
 
     included do
       has_many :authorships,
-               as: :author
-      has_many :authorables,
-               through: :authorships
+               foreign_key: :author_id
+      has_many :authored_pages,
+               through: :authorships,
+               source: :authorable,
+               source_type: 'BetterTogether::Page'
+      has_many :authored_posts,
+               through: :authorships,
+               source: :authorable,
+               source_type: 'BetterTogether::Post'
     end
   end
 end

app/models/concerns/better_together/authorable.rb

@@ -7,6 +7,7 @@ module Authorable
 
     included do
       has_many :authorships,
+               -> { positioned },
                as: :authorable
       has_many :authors,
                through: :authorships

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_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
-    t.datetime "updated_at", null: false
-    t.string "author_type", null: false
-    t.uuid "author_id", null: false
-    t.index ["author_type", "author_id"], name: "by_author", unique: true
-  end
-
   create_table "better_together_authorships", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.integer "lock_version", default: 0, null: false
     t.datetime "created_at", null: false