Fix compats method for both gemmy and lockfile

fastruby · Sep 12, 2024 · ae28170 · ae28170
1 parent 5e3ddd0
commit ae28170
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/app/models/concerns/has_compats.rb b/app/models/concerns/has_compats.rb
diff --git a/app/models/gemmy.rb b/app/models/gemmy.rb
@@ -1,6 +1,4 @@
 class Gemmy < ApplicationRecord
-  include HasCompats
-
   FORBIDDEN_NAMES = %w(
     new
     edit
@@ -11,6 +9,10 @@ class Gemmy < ApplicationRecord
 
   delegate :to_param, :to_s, to: :name
 
+  def compats
+    Compat.where(id: compat_ids)
+  end
+
   def dependencies
     dependencies_and_versions
       .keys

diff --git a/app/models/lockfile.rb b/app/models/lockfile.rb
@@ -1,6 +1,4 @@
 class Lockfile < ApplicationRecord
-  include HasCompats
-
   has_many :dependencies, class_name: "LockfileDependency", dependent: :destroy
   has_many :gemmies, through: :dependencies
 
@@ -11,6 +9,10 @@ class Lockfile < ApplicationRecord
   delegate :to_param, to: :slug
 
   scope :with_gemmies, ->(gemmies) { joins(:gemmies).where(gemmies: { id: gemmies }).distinct }
+
+  def compats
+    Compat.where(id: gemmies.flat_map(&:compat_ids))
+  end
 end
 
 # == Schema Information