From 6dc2c2ba73b41d84d4d24660a4eeecb88b0a50bb Mon Sep 17 00:00:00 2001 From: Jeffrey Hardy Date: Wed, 4 Sep 2024 14:03:19 -0400 Subject: [PATCH] Tidy model 'dependent: destroy' options --- app/models/account.rb | 2 +- app/models/category.rb | 4 ++-- app/models/splat.rb | 7 ++++--- app/models/user.rb | 2 -- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/models/account.rb b/app/models/account.rb index e93681acd..325beea79 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -1,3 +1,3 @@ class Account < ApplicationRecord - has_many :users + has_many :users, dependent: :destroy end diff --git a/app/models/category.rb b/app/models/category.rb index 4034bd7be..5a61d0d49 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,4 +1,4 @@ class Category < ApplicationRecord - has_many :categorizations - has_many :splats, through: :categorizations, dependent: :destroy + has_many :categorizations, dependent: :destroy + has_many :splats, through: :categorizations end diff --git a/app/models/splat.rb b/app/models/splat.rb index c721475f8..22a30ca9c 100644 --- a/app/models/splat.rb +++ b/app/models/splat.rb @@ -1,13 +1,14 @@ class Splat < ApplicationRecord + belongs_to :creator, class_name: "User", default: -> { Current.user } + + has_many :comments, dependent: :destroy has_many :boosts, dependent: :destroy + has_many :categorizations has_many :categories, through: :categorizations, dependent: :destroy - has_many :comments, dependent: :destroy has_one_attached :image, dependent: :purge_later - belongs_to :creator, class_name: "User", default: -> { Current.user } - enum :color, %w[ #AF2E1B #CC6324 #3B4B59 #BFA07A #ED8008 #ED3F1C #BF1B1B #736B1E #D07B53 #736356 #AD1D1D #BF7C2A #C09C6F #698F9C #7C956B #5D618F #3B3633 #67695E diff --git a/app/models/user.rb b/app/models/user.rb index a5379c86f..98f699bec 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -4,8 +4,6 @@ class User < ApplicationRecord has_many :sessions, dependent: :destroy has_secure_password validations: false - has_many :splats, dependent: :destroy - normalizes :email_address, with: ->(value) { value.strip.downcase } def initials