fix UserFactory

xiaomlove · Feb 26, 2024 · 0f551d5 · 0f551d5
1 parent 86dd3ef
commit 0f551d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/app/Console/Commands/UserGenerate.php b/app/Console/Commands/UserGenerate.php
@@ -33,6 +33,7 @@ public function handle()
         $log = "num: $num";
         if (!$num) {
             $this->error("$log, no num!");
+            return Command::SUCCESS;
         }
         $size = 1000;
         $total = 0;

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -9,13 +9,8 @@
 
 class UserFactory extends Factory
 {
-    private string $defaultStyleSheet;
+    private static string $defaultStyleSheet = "";
 
-    public function __construct()
-    {
-        do_log("UserFactory __construct");
-        $this->defaultStyleSheet = get_setting("main.defstylesheet");
-    }
 
     /**
      * The name of the factory's corresponding model.
@@ -34,13 +29,16 @@ public function definition()
         $password = "123456";
         $secret = mksecret();
         $passhash = md5($secret . $password . $secret);
+        if (self::$defaultStyleSheet == "") {
+            self::$defaultStyleSheet = get_setting("main.defstylesheet");
+        }
         return [
             'username' => $this->faker->name,
             'email' => $this->faker->unique()->safeEmail,
             'secret' => mksecret(),
             'editsecret' => "",
             'passhash' => $passhash,
-            'stylesheet' => $this->defaultStyleSheet,
+            'stylesheet' => self::$defaultStyleSheet,
             'added' => now()->toDateTimeString(),
             'status' => User::STATUS_CONFIRMED,
             'class' => random_int(intval(User::CLASS_USER), intval(User::CLASS_SYSOP))