MultiUsers: adjust unique indexes and validations (#932)

mockdeep · web-flow · commit eb6b99315faa · 2023-02-23T23:15:29.000-08:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -54,6 +54,7 @@ Bundler/GemVersion: { Enabled: false }
 Layout/SingleLineBlockChain: { Enabled: false }
 Lint/ConstantResolution: { Enabled: false }
 Rails/BulkChangeTable: { Enabled: false }
+Rails/RedundantPresenceValidationOnBelongsTo: { Enabled: false }
 RSpec/AlignLeftLetBrace: { Enabled: false }
 RSpec/AlignRightLetBrace: { Enabled: false }
 RSpec/StubbedMock: { Enabled: false }
diff --git a/app/models/feed.rb b/app/models/feed.rb
@@ -7,7 +7,8 @@ class Feed < ApplicationRecord
   belongs_to :group
   belongs_to :user
 
-  validates_uniqueness_of :url
+  validates :url, presence: true, uniqueness: { scope: :user_id }
+  validates :user_id, presence: true
 
   enum status: { green: 0, yellow: 1, red: 2 }
 
diff --git a/app/models/group.rb b/app/models/group.rb
@@ -6,6 +6,9 @@ class Group < ApplicationRecord
   belongs_to :user
   has_many :feeds
 
+  validates :name, presence: true, uniqueness: { scope: :user_id }
+  validates :user_id, presence: true
+
   def as_fever_json
     { id:, title: name }
   end
diff --git a/db/migrate/20230224042638_update_unique_indexes.rb b/db/migrate/20230224042638_update_unique_indexes.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class UpdateUniqueIndexes < ActiveRecord::Migration[7.0]
+  def change
+    remove_index :feeds, :url
+    add_index :feeds, [:url, :user_id], unique: true
+    add_index :groups, [:name, :user_id], unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
