kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#85 - google calendar improvements (#86)

Browse Source 
* google calendar improvements

* fix

* change vacation request name

* #85 - google calendar improvements

* #85 - fix

* #85 - fix

* #85 - fix
This commit is contained in:
Adrian Hopek
2022-03-18 08:11:34 +01:00
committed by GitHub
parent afb1a5e9ff
commit 8c1819aa01
13 changed files with 120 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
database/factories/VacationRequestFactory.php
View File

@@ -15,7 +15,6 @@ use Toby\Eloquent\Models\YearPeriod;
class VacationRequestFactory extends Factory
{
protected $model = VacationRequest::class;
private static int $number = 1;
public function definition(): array
{
@@ -26,7 +25,6 @@ class VacationRequestFactory extends Factory
"user_id" => User::factory(),
"creator_id" => fn(array $attributes): int => $attributes["user_id"],
"year_period_id" => YearPeriod::factory(),
"name" => fn(array $attributes): string => $this->generateName($attributes),
"type" => $this->faker->randomElement(VacationType::cases()),
"state" => $this->faker->randomElement(VacationRequestStatesRetriever::all()),
"from" => $from,
@@ -34,12 +32,4 @@ class VacationRequestFactory extends Factory
"comment" => $this->faker->boolean ? $this->faker->paragraph() : null,
];
}
protected function generateName(array $attributes): string
{
$year = YearPeriod::find($attributes["year_period_id"])->year;
$number = static::$number++;
return "{$number}/{$year}";
}
}

23
database/migrations/2022_03_17_105827_remove_event_id_from_vacations_table.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class() extends Migration {
public function up(): void
{
Schema::table("vacations", function (Blueprint $table): void {
$table->dropColumn("event_id");
});
}
public function down(): void
{
Schema::table("vacations", function (Blueprint $table): void {
$table->string("event_id")->nullable();
});
}
};

25
database/migrations/2022_03_17_105927_add_event_ids_column_and_remove_name_column_in_vacation_requests_table.php Normal file
View File

@@ -0,0 +1,25 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class() extends Migration {
public function up(): void
{
Schema::table("vacation_requests", function (Blueprint $table): void {
$table->json("event_ids")->nullable();
$table->dropColumn("name");
});
}
public function down(): void
{
Schema::table("vacation_requests", function (Blueprint $table): void {
$table->dropColumn("event_ids");
$table->string("name")->nullable();
});
}
};