From 2fb2daa3ffd5325c545c9073a793c54cc6906825 Mon Sep 17 00:00:00 2001
From: miteruzo <miteruzo@naver.com>
Date: Thu, 15 May 2025 03:01:22 +0900
Subject: [PATCH] =?UTF-8?q?#2=20=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/models/tag.rb                      | 18 +++++++++---------
 backend/app/models/user.rb                     | 12 ++++--------
 backend/app/models/{user_ips.rb => user_ip.rb} |  0
 3 files changed, 13 insertions(+), 17 deletions(-)
 rename backend/app/models/{user_ips.rb => user_ip.rb} (100%)

diff --git a/backend/app/models/tag.rb b/backend/app/models/tag.rb
index adc6021..5ed4968 100644
--- a/backend/app/models/tag.rb
+++ b/backend/app/models/tag.rb
@@ -4,16 +4,16 @@ class Tag < ApplicationRecord
   has_many :tag_aliases, dependent: :destroy
   has_many :wiki_pages, dependent: :nullify
 
-  validates :name, presence: true, length: { maximum: 255 }
-  validates :category, presence: true, inclusion: { in: categories.keys }
+  enum :category, { deerjikist:  'deerjikist',
+                    meme:        'meme',
+                    character:   'character',
+                    general:     'general',
+                    material:    'material',
+                    nico:        'nico',
+                    meta:        'meta' }
 
-  enum category: { deerjikist:  'deerjikist',
-                   meme:        'meme',
-                   character:   'character',
-                   general:     'general',
-                   material:    'material',
-                   nico:        'nico',
-                   meta:        'meta' }
+  validates :name, presence: true, length: { maximum: 255 }
+  validates :category, presence: true, inclusion: { in: Tag.categories.keys }
 
   scope :nico_tags, -> { where category: :nico }
 end
diff --git a/backend/app/models/user.rb b/backend/app/models/user.rb
index efe4295..38f4f82 100644
--- a/backend/app/models/user.rb
+++ b/backend/app/models/user.rb
@@ -1,11 +1,11 @@
 class User < ApplicationRecord
+  enum :role, { guest: 'guest', member: 'member', admin: 'admin' }
+
   validates :name, length: { maximum: 255 }
   validates :inheritance_code, presence: true, length: { maximum: 64 }
   validates :role, presence: true, inclusion: { in: roles.keys }
   validates :banned, inclusion: { in: [true, false] }
 
-  enum role: { guest: 'guest', member: 'member', admin: 'admin' }
-
   has_many :posts
   has_many :settings
   has_many :ip_addresses
@@ -13,12 +13,8 @@ class User < ApplicationRecord
   has_many :ip_addresses, through: :user_ips
   has_many :user_post_views, dependent: :destroy
   has_many :viewed_posts, through: :user_post_views, source: :post
-  has_many :created_wiki_pages, { class_name: 'WikiPage',
-                                  foreign_key: 'created_user_id',
-                                  dependent: :nullify }
-  has_many :updated_wiki_pages, { class_name: 'WikiPage',
-                                  foreign_key: 'updated_user_id',
-                                  dependent: :nullify }
+  has_many :created_wiki_pages, class_name: 'WikiPage', foreign_key: 'created_user_id', dependent: :nullify
+  has_many :updated_wiki_pages, class_name: 'WikiPage', foreign_key: 'updated_user_id', dependent: :nullify
 
   def viewed? post
     user_post_views.exists? post_id: post.id, viewed: true
diff --git a/backend/app/models/user_ips.rb b/backend/app/models/user_ip.rb
similarity index 100%
rename from backend/app/models/user_ips.rb
rename to backend/app/models/user_ip.rb