From 05e754eba3faf71d77534f2e9a260ae6a34beadc Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 23 Sep 2019 02:17:33 -0500
Subject: [PATCH] users: change default user level to member in database.

Fixup for 9c34d5cc3. Default to member level in the database because
setting it in `customize_new_user` clobbered user levels set by factory
bot in tests, which broke the test suite.
---
 app/models/user.rb                                         | 3 +--
 db/migrate/20190923071044_change_default_level_on_users.rb | 5 +++++
 db/structure.sql                                           | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20190923071044_change_default_level_on_users.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 0aac3ed9c..6064a1f6b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -257,7 +257,7 @@ class User < ApplicationRecord
       end
 
       def anonymous
-        user = User.new(name: "Anonymous", created_at: Time.now)
+        user = User.new(name: "Anonymous", level: Levels::ANONYMOUS, created_at: Time.now)
         user.freeze.readonly!
         user
       end
@@ -318,7 +318,6 @@ class User < ApplicationRecord
     end
 
     def customize_new_user
-      self.level = User::Levels::MEMBER
       Danbooru.config.customize_new_user(self)
     end
 
diff --git a/db/migrate/20190923071044_change_default_level_on_users.rb b/db/migrate/20190923071044_change_default_level_on_users.rb
new file mode 100644
index 000000000..a1244c6ca
--- /dev/null
+++ b/db/migrate/20190923071044_change_default_level_on_users.rb
@@ -0,0 +1,5 @@
+class ChangeDefaultLevelOnUsers < ActiveRecord::Migration[6.0]
+  def change
+    change_column_default(:users, :level, from: 0, to: 20)
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 7892a2340..733f0f334 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -3086,7 +3086,7 @@ CREATE TABLE public.users (
     email character varying,
     email_verification_key character varying,
     inviter_id integer,
-    level integer DEFAULT 0 NOT NULL,
+    level integer DEFAULT 20 NOT NULL,
     base_upload_limit integer DEFAULT 10 NOT NULL,
     last_logged_in_at timestamp without time zone,
     last_forum_read_at timestamp without time zone,
@@ -7339,6 +7339,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190902224045'),
 ('20190908031103'),
 ('20190908035317'),
-('20190919175836');
+('20190919175836'),
+('20190923071044');