First push before 🥚
This commit is contained in:
parent
0b3c0f6d5a
commit
344c1a9885
11 changed files with 36 additions and 158 deletions
|
@ -91,12 +91,10 @@ $factory->define(Pterodactyl\Models\Node::class, function (Faker\Generator $fake
|
|||
$factory->define(Pterodactyl\Models\Service::class, function (Faker\Generator $faker) {
|
||||
return [
|
||||
'id' => $faker->unique()->randomNumber(),
|
||||
'author' => $faker->unique()->uuid,
|
||||
'uuid' => $faker->unique()->uuid,
|
||||
'author' => 'testauthor@example.com',
|
||||
'name' => $faker->word,
|
||||
'description' => null,
|
||||
'folder' => strtolower($faker->unique()->word),
|
||||
'startup' => 'java -jar test.jar',
|
||||
'index_file' => 'indexjs',
|
||||
];
|
||||
});
|
||||
|
||||
|
@ -108,7 +106,6 @@ $factory->define(Pterodactyl\Models\ServiceOption::class, function (Faker\Genera
|
|||
'name' => $faker->name,
|
||||
'description' => implode(' ', $faker->sentences(3)),
|
||||
'startup' => 'java -jar test.jar',
|
||||
'tag' => 'test@testfactory.com:' . $faker->unique()->randomNumber(8),
|
||||
];
|
||||
});
|
||||
|
||||
|
|
|
@ -42,12 +42,16 @@ class RemoveDaemonSecretFromSubusersTable extends Migration
|
|||
public function down()
|
||||
{
|
||||
Schema::table('subusers', function (Blueprint $table) {
|
||||
$table->char('daemonSecret', 36)->after('server_id')->unique();
|
||||
$table->char('daemonSecret', 36)->after('server_id');
|
||||
});
|
||||
|
||||
$subusers = DB::table('subusers')->get();
|
||||
$subusers->each(function ($subuser) {
|
||||
DB::table('daemon_keys')->where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->delete();
|
||||
});
|
||||
|
||||
Schema::table('subusers', function (Blueprint $table) {
|
||||
$table->unique('daemonSecret');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -20,6 +20,8 @@ class ChangeServicesToUseAMoreUniqueIdentifier extends Migration
|
|||
$table->string('author')->change();
|
||||
$table->char('uuid', 36)->after('id');
|
||||
$table->dropColumn('folder');
|
||||
$table->dropColumn('startup');
|
||||
$table->dropColumn('index_file');
|
||||
});
|
||||
|
||||
DB::table('services')->get(['id', 'author', 'uuid'])->each(function ($service) {
|
||||
|
@ -42,6 +44,8 @@ class ChangeServicesToUseAMoreUniqueIdentifier extends Migration
|
|||
Schema::table('services', function (Blueprint $table) {
|
||||
$table->dropColumn('uuid');
|
||||
$table->string('folder')->nullable();
|
||||
$table->text('startup')->nullable();
|
||||
$table->text('index_file');
|
||||
$table->string('author', 36)->change();
|
||||
|
||||
$table->unique('name');
|
||||
|
|
|
@ -15,19 +15,16 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
|
|||
{
|
||||
Schema::table('service_options', function (Blueprint $table) {
|
||||
$table->char('uuid', 36)->after('id');
|
||||
|
||||
$table->index(['service_id', 'tag']);
|
||||
$table->dropColumn('tag');
|
||||
});
|
||||
|
||||
DB::transaction(function () {
|
||||
DB::table('service_options')->select([
|
||||
'service_options.id',
|
||||
'service_options.uuid',
|
||||
'service_options.tag',
|
||||
'services.author AS service_author',
|
||||
])->join('services', 'services.id', '=', 'service_options.service_id')->get()->each(function ($option) {
|
||||
DB::table('service_options')->where('id', $option->id)->update([
|
||||
'tag' => $option->service_author . ':' . $option->tag,
|
||||
'uuid' => Uuid::uuid4()->toString(),
|
||||
]);
|
||||
});
|
||||
|
@ -45,13 +42,13 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
|
|||
{
|
||||
Schema::table('service_options', function (Blueprint $table) {
|
||||
$table->dropColumn('uuid');
|
||||
$table->dropIndex(['service_id', 'tag']);
|
||||
$table->string('tag');
|
||||
});
|
||||
|
||||
DB::transaction(function () {
|
||||
DB::table('service_options')->select(['id', 'tag'])->get()->each(function ($option) {
|
||||
DB::table('service_options')->where('id', $option->id)->update([
|
||||
'tag' => array_get(explode(':', $option->tag), 1),
|
||||
'tag' => str_random(10),
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue