🥗🧹Journal: Make relationships of Entry Rails-able (#1648)

- #1633 I noticed I'd left the active-record relationship cables on the `Journal::Entry` loose. Getting rid of `delegate`s in favor of the `has_one :x, through: :y`
zinc-collective · Jul 13, 2023 · 7df4c96 · 7df4c96
1 parent 6f53009
commit 7df4c96
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/furniture/journal/entry.rb b/app/furniture/journal/entry.rb
@@ -27,8 +27,9 @@ class Entry < ApplicationRecord
 
     # @!attribute journal
     #   @return [Journal::Journal]
-    belongs_to :journal, class_name: "Journal::Journal", inverse_of: :entries
-    delegate :room, :space, to: :journal
+    belongs_to :journal, inverse_of: :entries
+    has_one :room, through: :journal
+    has_one :space, through: :journal
 
     def published?
       published_at.present?

diff --git a/spec/furniture/journal/entry_spec.rb b/spec/furniture/journal/entry_spec.rb
@@ -6,6 +6,9 @@
   it { is_expected.to validate_presence_of(:headline) }
   it { is_expected.to validate_presence_of(:body) }
   it { is_expected.to strip_attributes(:slug, :body, :headline) }
+  it { is_expected.to belong_to(:journal).inverse_of(:entries) }
+  it { is_expected.to have_one(:room).through(:journal) }
+  it { is_expected.to have_one(:space).through(:journal) }
 
   describe "#to_html" do
     subject(:to_html) { entry.to_html }