align book and case metadata classes together...

o19s · Jan 19, 2024 · bf0d9f8 · bf0d9f8
1 parent 76de302
commit bf0d9f8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/app/models/book_metadatum.rb b/app/models/book_metadatum.rb
@@ -19,7 +19,6 @@
 #  fk_rails_...  (book_id => books.id)
 #
 class BookMetadatum < ApplicationRecord
-  # self.table_name = 'case_metadata'
   belongs_to :book
   belongs_to :user
 end
diff --git a/app/models/case.rb b/app/models/case.rb
@@ -44,7 +44,8 @@ class Case < ApplicationRecord
              inverse_of: :case
 
   has_many   :metadata,
-             dependent: :destroy
+             class_name: 'CaseMetadatum',
+             dependent:  :destroy
 
   # rubocop:disable Rails/InverseOf
   has_many   :queries,  -> { order(arranged_at: :asc) },

diff --git a/app/models/metadatum.rb → app/models/case_metadatum.rb b/app/models/metadatum.rb → app/models/case_metadatum.rb
@@ -20,8 +20,7 @@
 #  case_metadata_ibfk_2  (user_id => users.id)
 #
 
-class Metadatum < ApplicationRecord
-  self.table_name = 'case_metadata'
+class CaseMetadatum < ApplicationRecord
   belongs_to :case
   belongs_to :user
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -107,8 +107,12 @@ class User < ApplicationRecord
   has_many :scores,
            dependent: :destroy
 
-  has_many :metadata,
-           dependent: :destroy
+  has_many :case_metadata,
+           class_name: 'CaseMetadatum',
+           dependent:  :destroy
+  has_many :book_metadata,
+           class_name: 'BookMetadatum',
+           dependent:  :destroy
 
   # Validations
 

diff --git a/docs/erd.png b/docs/erd.png
diff --git a/test/fixtures/book_metadata.yml b/test/fixtures/book_metadata.yml
@@ -1,21 +1,20 @@
 # == Schema Information
 #
-# Table name: case_metadata
+# Table name: book_metadata
 #
-#  id             :integer          not null, primary key
+#  id             :bigint           not null, primary key
 #  last_viewed_at :datetime
-#  case_id        :integer          not null
-#  user_id        :integer          not null
+#  book_id        :bigint           not null
+#  user_id        :integer
 #
 # Indexes
 #
-#  case_metadata_ibfk_1                 (case_id)
-#  case_metadata_user_id_case_id_index  (user_id,case_id)
+#  index_book_metadata_on_book_id              (book_id)
+#  index_book_metadata_on_user_id_and_book_id  (user_id,book_id)
 #
 # Foreign Keys
 #
-#  case_metadata_ibfk_1  (case_id => cases.id)
-#  case_metadata_ibfk_2  (user_id => users.id)
+#  fk_rails_...  (book_id => books.id)
 #
 
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html

diff --git a/test/fixtures/metadata.yml → test/fixtures/case_metadata.yml b/test/fixtures/metadata.yml → test/fixtures/case_metadata.yml