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

Merge branch 'main' into #134-fill-users-data-for-resume

Browse Source 
# Conflicts:
#	.eslintrc.js
#	composer.lock
#	package-lock.json
#	package.json
This commit is contained in:
Adrian Hopek
2022-05-11 09:03:20 +02:00
parent 3864b5394c 88b1543071
commit dd1aa0d0f8
99 changed files with 3268 additions and 1529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
database/factories/ProfileFactory.php
View File

@@ -23,6 +23,7 @@ class ProfileFactory extends Factory
"employment_form" => $this->faker->randomElement(EmploymentForm::cases()),
"position" => $this->faker->jobTitle(),
"employment_date" => Carbon::createFromInterface($this->faker->dateTimeBetween("2020-10-27"))->toDateString(),
"birthday" => Carbon::createFromInterface($this->faker->dateTimeBetween("1970-01-01", "1998-01-01"))->toDateString(),
];
}
}

25
database/migrations/2022_04_21_101027_add_slack_id_and_birthday_columns_in_profiles_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("profiles", function (Blueprint $table): void {
$table->string("slack_id")->nullable();
$table->date("birthday")->nullable();
});
}
public function down(): void
{
Schema::table("profiles", function (Blueprint $table): void {
$table->dropColumn("slack_id");
$table->dropColumn("birthday");
});
}
};

5
database/seeders/DatabaseSeeder.php
View File

@@ -7,7 +7,7 @@ namespace Database\Seeders;
use Illuminate\Database\Seeder;
use Illuminate\Support\Carbon;
use Toby\Domain\PolishHolidaysRetriever;
use Toby\Domain\VacationDaysCalculator;
use Toby\Domain\WorkDaysCalculator;
use Toby\Eloquent\Models\Key;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\VacationLimit;
@@ -70,8 +70,7 @@ class DatabaseSeeder extends Seeder
"year_period_id" => $yearPeriods->random()->id,
])
->afterCreating(function (VacationRequest $vacationRequest): void {
$days = app(VacationDaysCalculator::class)->calculateDays(
$vacationRequest->yearPeriod,
$days = app(WorkDaysCalculator::class)->calculateDays(
$vacationRequest->from,
$vacationRequest->to,
);

11
database/seeders/DemoSeeder.php
View File

@@ -18,7 +18,7 @@ use Toby\Domain\States\VacationRequest\Created;
use Toby\Domain\States\VacationRequest\Rejected;
use Toby\Domain\States\VacationRequest\WaitingForAdministrative;
use Toby\Domain\States\VacationRequest\WaitingForTechnical;
use Toby\Domain\VacationDaysCalculator;
use Toby\Domain\WorkDaysCalculator;
use Toby\Eloquent\Models\Key;
use Toby\Eloquent\Models\Resume;
use Toby\Eloquent\Models\Technology;
@@ -166,8 +166,7 @@ class DemoSeeder extends Seeder
->for($user, "creator")
->for($currentYearPeriod)
->afterCreating(function (VacationRequest $vacationRequest): void {
$days = app(VacationDaysCalculator::class)->calculateDays(
$vacationRequest->yearPeriod,
$days = app(WorkDaysCalculator::class)->calculateDays(
$vacationRequest->from,
$vacationRequest->to,
);
@@ -236,8 +235,7 @@ class DemoSeeder extends Seeder
->for($user, "creator")
->for($currentYearPeriod)
->afterCreating(function (VacationRequest $vacationRequest): void {
$days = app(VacationDaysCalculator::class)->calculateDays(
$vacationRequest->yearPeriod,
$days = app(WorkDaysCalculator::class)->calculateDays(
$vacationRequest->from,
$vacationRequest->to,
);
@@ -293,8 +291,7 @@ class DemoSeeder extends Seeder
->for($user, "creator")
->for($currentYearPeriod)
->afterCreating(function (VacationRequest $vacationRequest): void {
$days = app(VacationDaysCalculator::class)->calculateDays(
$vacationRequest->yearPeriod,
$days = app(WorkDaysCalculator::class)->calculateDays(
$vacationRequest->from,
$vacationRequest->to,
);