Non-follows allowed in lists

This commit is contained in:
mgabdev 2020-04-30 12:34:13 -04:00
parent 50dad82aae
commit dbe5461df2
3 changed files with 8 additions and 3 deletions

View File

@ -12,7 +12,7 @@
class ListAccount < ApplicationRecord class ListAccount < ApplicationRecord
belongs_to :list belongs_to :list
belongs_to :account belongs_to :account
belongs_to :follow belongs_to :follow, optional: true
validates :account_id, uniqueness: { scope: :list_id } validates :account_id, uniqueness: { scope: :list_id }
@ -21,6 +21,6 @@ class ListAccount < ApplicationRecord
private private
def set_follow def set_follow
self.follow = Follow.find_by(account_id: list.account_id, target_account_id: account.id) self.follow = Follow.find_by!(account_id: list.account_id, target_account_id: account.id) unless list.account_id == account.id
end end
end end

View File

@ -0,0 +1,5 @@
class ChangeListAccountFollowNullable < ActiveRecord::Migration[5.2]
def change
change_column_null :list_accounts, :follow_id, true
end
end

View File

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2020_04_20_223346) do ActiveRecord::Schema.define(version: 2020_04_30_154012) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"