From 697f3395bd7bb2626a49db49856875aff1c91a12 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Thu, 3 Mar 2022 15:16:44 +0100 Subject: [PATCH] #48 - redis stuff --- .env.example | 11 +-- config/cache.php | 5 ++ config/database.php | 49 +++++++++---- config/queue.php | 8 +++ .../VacationRequestActivityFactory.php | 6 +- database/seeders/DemoSeeder.php | 69 +++++++++++-------- docker-compose.yml | 12 ++++ docker/dev/php/Dockerfile | 7 +- 8 files changed, 115 insertions(+), 52 deletions(-) diff --git a/.env.example b/.env.example index 661c459..d783c83 100644 --- a/.env.example +++ b/.env.example @@ -9,31 +9,34 @@ LOG_LEVEL=debug DB_CONNECTION=mysql DB_HOST=toby-db-dev -DB_PORT=3306 +DB_PORT=5432 DB_DATABASE=toby DB_USERNAME=toby DB_PASSWORD=password DB_ROOT_PASSWORD=example -DOCKER_DEV_DB_EXTERNAL_PORT=3306 +DOCKER_DEV_DB_EXTERNAL_PORT=5432 DOCKER_DEV_DB_DATABASE=${DB_DATABASE} DOCKER_DEV_DB_USERNAME=${DB_USERNAME} DOCKER_DEV_DB_PASSWORD=${DB_PASSWORD} DOCKER_DEV_DB_ROOT_PASSWORD=${DB_ROOT_PASSWORD} -DOCKER_TEST_DB_EXTERNAL_PORT=3307 +DOCKER_TEST_DB_EXTERNAL_PORT=5433 DOCKER_TEST_DB_DATABASE=${DB_DATABASE} DOCKER_TEST_DB_USERNAME=${DB_USERNAME} DOCKER_TEST_DB_PASSWORD=${DB_PASSWORD} DOCKER_TEST_DB_ROOT_PASSWORD=${DB_ROOT_PASSWORD} +REDIS_PORT=6379 +REDIS_HOST=toby-redis + EXTERNAL_WEBSERVER_PORT= XDG_CONFIG_HOME=/tmp BROADCAST_DRIVER=log CACHE_DRIVER=file QUEUE_CONNECTION=sync -SESSION_DRIVER=file +SESSION_DRIVER=redis SESSION_LIFETIME=120 FILESYSTEM_DISK=local diff --git a/config/cache.php b/config/cache.php index d520005..39e2bf3 100644 --- a/config/cache.php +++ b/config/cache.php @@ -21,6 +21,11 @@ return [ "driver" => "file", "path" => storage_path("framework/cache/data"), ], + "redis" => [ + "driver" => "redis", + "connection" => "cache", + "lock_connection" => "default", + ], ], "prefix" => env("CACHE_PREFIX", Str::slug(env("APP_NAME", "laravel"), "_") . "_cache"), ]; diff --git a/config/database.php b/config/database.php index 694a7fc..0ab09ab 100644 --- a/config/database.php +++ b/config/database.php @@ -2,23 +2,46 @@ declare(strict_types=1); +use Illuminate\Support\Str; + return [ "default" => env("DB_CONNECTION", "mysql"), "connections" => [ - 'pgsql' => [ - 'driver' => 'pgsql', - 'url' => env('DATABASE_URL'), - 'host' => env('DB_HOST', '127.0.0.1'), - 'port' => env('DB_PORT', '5432'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', - 'prefix_indexes' => true, - 'search_path' => 'public', - 'sslmode' => 'prefer', + "pgsql" => [ + "driver" => "pgsql", + "url" => env("DATABASE_URL"), + "host" => env("DB_HOST", "127.0.0.1"), + "port" => env("DB_PORT", "5432"), + "database" => env("DB_DATABASE", "forge"), + "username" => env("DB_USERNAME", "forge"), + "password" => env("DB_PASSWORD", ""), + "charset" => "utf8", + "prefix" => "", + "prefix_indexes" => true, + "search_path" => "public", + "sslmode" => "prefer", ], ], "migrations" => "migrations", + "redis" => [ + "client" => env("REDIS_CLIENT", "phpredis"), + "options" => [ + "cluster" => env("REDIS_CLUSTER", "redis"), + "prefix" => env("REDIS_PREFIX", Str::slug(env("APP_NAME", "laravel"), "_") . "_database_"), + ], + "default" => [ + "url" => env("REDIS_URL"), + "host" => env("REDIS_HOST", "127.0.0.1"), + "password" => env("REDIS_PASSWORD"), + "port" => env("REDIS_PORT", "6379"), + "database" => env("REDIS_DB", "0"), + ], + "cache" => [ + "url" => env("REDIS_URL"), + "host" => env("REDIS_HOST", "127.0.0.1"), + "password" => env("REDIS_PASSWORD"), + "port" => env("REDIS_PORT", "6379"), + "database" => env("REDIS_CACHE_DB", "1"), + ], + ], ]; diff --git a/config/queue.php b/config/queue.php index 27dbd2e..326d354 100644 --- a/config/queue.php +++ b/config/queue.php @@ -8,6 +8,14 @@ return [ "sync" => [ "driver" => "sync", ], + 'redis' => [ + 'driver' => 'redis', + 'connection' => 'default', + 'queue' => env('REDIS_QUEUE', 'default'), + 'retry_after' => 90, + 'block_for' => null, + 'after_commit' => false, + ], ], "failed" => [ "driver" => env("QUEUE_FAILED_DRIVER", "database-uuids"), diff --git a/database/factories/VacationRequestActivityFactory.php b/database/factories/VacationRequestActivityFactory.php index c4b8c50..d1de4a3 100644 --- a/database/factories/VacationRequestActivityFactory.php +++ b/database/factories/VacationRequestActivityFactory.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Database\Factories; use Illuminate\Database\Eloquent\Factories\Factory; -use Toby\Domain\Enums\VacationRequestState; +use Toby\Domain\States\VacationRequest\VacationRequestState; use Toby\Eloquent\Models\VacationRequestActivity; class VacationRequestActivityFactory extends Factory @@ -15,8 +15,8 @@ class VacationRequestActivityFactory extends Factory public function definition(): array { return [ - "from" => $this->faker->randomElement(VacationRequestState::cases()), - "to" => $this->faker->randomElement(VacationRequestState::cases()), + "from" => $this->faker->randomElement(VacationRequestState::all()), + "to" => $this->faker->randomElement(VacationRequestState::all()), ]; } } diff --git a/database/seeders/DemoSeeder.php b/database/seeders/DemoSeeder.php index bd4a7ec..4bb6363 100644 --- a/database/seeders/DemoSeeder.php +++ b/database/seeders/DemoSeeder.php @@ -10,9 +10,15 @@ use Illuminate\Support\Collection; use Illuminate\Support\Str; use Toby\Domain\Enums\EmploymentForm; use Toby\Domain\Enums\Role; -use Toby\Domain\Enums\VacationRequestState; use Toby\Domain\Enums\VacationType; use Toby\Domain\PolishHolidaysRetriever; +use Toby\Domain\States\VacationRequest\AcceptedByAdministrative; +use Toby\Domain\States\VacationRequest\AcceptedByTechnical; +use Toby\Domain\States\VacationRequest\Approved; +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\Eloquent\Helpers\UserAvatarGenerator; use Toby\Eloquent\Models\User; @@ -148,7 +154,7 @@ class DemoSeeder extends Seeder /** @var VacationRequest $vacationRequestApproved */ $vacationRequestApproved = VacationRequest::factory([ "type" => VacationType::Vacation->value, - "state" => VacationRequestState::Created, + "state" => Created::class, "from" => Carbon::create($currentYearPeriod->year, 1, 31)->toDateString(), "to" => Carbon::create($currentYearPeriod->year, 2, 4)->toDateString(), "comment" => "Komentarz do wniosku urlopowego.", @@ -175,49 +181,50 @@ class DemoSeeder extends Seeder VacationRequestActivity::factory([ "from" => null, - "to" => VacationRequestState::Created, + "to" => Created::class, ])->for($vacationRequestApproved) ->for($employee1) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::Created, - "to" => VacationRequestState::WaitingForTechnical, + "from" => Created::class, + "to" => WaitingForTechnical::class, ])->for($vacationRequestApproved) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::WaitingForTechnical, - "to" => VacationRequestState::AcceptedByTechnical, + "from" => WaitingForTechnical::class, + "to" => AcceptedByTechnical::class, ])->for($vacationRequestApproved) ->for($technicalApprover) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::AcceptedByTechnical, - "to" => VacationRequestState::WaitingForAdministrative, + "from" => AcceptedByTechnical::class, + "to" => WaitingForAdministrative::class, ])->for($vacationRequestApproved) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::WaitingForAdministrative, - "to" => VacationRequestState::AcceptedByAdministrative, + "from" => WaitingForAdministrative::class, + "to" => AcceptedByAdministrative::class, ])->for($vacationRequestApproved) ->for($administrativeApprover) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::AcceptedByAdministrative, - "to" => VacationRequestState::Approved, + "from" => AcceptedByAdministrative::class, + "to" => Approved::class, ])->for($vacationRequestApproved) ->create(); - $vacationRequestApproved->changeStateTo(VacationRequestState::Approved); + $vacationRequestApproved->state = new Approved($vacationRequestApproved); + $vacationRequestApproved->save(); /** @var VacationRequest $vacationRequestWaitsForAdminApproval */ $vacationRequestWaitsForAdminApproval = VacationRequest::factory([ "type" => VacationType::Vacation->value, - "state" => VacationRequestState::Created, + "state" => Created::class, "from" => Carbon::create($currentYearPeriod->year, 2, 14)->toDateString(), "to" => Carbon::create($currentYearPeriod->year, 2, 14)->toDateString(), "comment" => "Komentarz do wniosku urlopowego.", @@ -244,36 +251,37 @@ class DemoSeeder extends Seeder VacationRequestActivity::factory([ "from" => null, - "to" => VacationRequestState::Created, + "to" => Created::class, ])->for($vacationRequestWaitsForAdminApproval) ->for($employee1) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::Created, - "to" => VacationRequestState::WaitingForTechnical, + "from" => Created::class, + "to" => WaitingForTechnical::class, ])->for($vacationRequestWaitsForAdminApproval) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::WaitingForTechnical, - "to" => VacationRequestState::AcceptedByTechnical, + "from" => WaitingForTechnical::class, + "to" => AcceptedByTechnical::class, ])->for($vacationRequestWaitsForAdminApproval) ->for($technicalApprover) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::AcceptedByTechnical, - "to" => VacationRequestState::WaitingForAdministrative, + "from" => AcceptedByTechnical::class, + "to" => WaitingForAdministrative::class, ])->for($vacationRequestWaitsForAdminApproval) ->create(); - $vacationRequestWaitsForAdminApproval->changeStateTo(VacationRequestState::WaitingForAdministrative); + $vacationRequestWaitsForAdminApproval->state = new WaitingForAdministrative($vacationRequestWaitsForAdminApproval); + $vacationRequestWaitsForAdminApproval->save(); /** @var VacationRequest $vacationRequestRejected */ $vacationRequestRejected = VacationRequest::factory([ "type" => VacationType::Vacation->value, - "state" => VacationRequestState::Created, + "state" => Created::class, "from" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(), "to" => Carbon::create($currentYearPeriod->year, 2, 7)->toDateString(), "comment" => "", @@ -300,25 +308,26 @@ class DemoSeeder extends Seeder VacationRequestActivity::factory([ "from" => null, - "to" => VacationRequestState::Created, + "to" => Created::class, ])->for($vacationRequestRejected) ->for($employee1) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::Created, - "to" => VacationRequestState::WaitingForTechnical, + "from" => Created::class, + "to" => WaitingForTechnical::class, ])->for($vacationRequestRejected) ->create(); VacationRequestActivity::factory([ - "from" => VacationRequestState::WaitingForTechnical, - "to" => VacationRequestState::Rejected, + "from" => WaitingForTechnical::class, + "to" => Rejected::class, ])->for($vacationRequestRejected) ->for($technicalApprover) ->create(); - $vacationRequestRejected->changeStateTo(VacationRequestState::Rejected); + $vacationRequestRejected->state = new Rejected($vacationRequestRejected); + $vacationRequestRejected->save(); } protected function generateAvatarsForUsers(Collection $users): void diff --git a/docker-compose.yml b/docker-compose.yml index 3c043ce..fb98185 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -64,6 +64,16 @@ services: - toby-dev restart: unless-stopped + redis: + image: redis:6 + container_name: toby-redis + ports: + - ${FORWARD_REDIS_PORT:-6379}:6379 + volumes: + - toby-redis-data:/var/lib/redis + networks: + - toby-dev + node: image: node:17.2.0-alpine3.14 container_name: toby-node @@ -99,3 +109,5 @@ networks: volumes: toby-pgsql-data: name: toby-pgsql-data + toby-redis-data: + name: toby-redis-data diff --git a/docker/dev/php/Dockerfile b/docker/dev/php/Dockerfile index 223f816..af729fd 100644 --- a/docker/dev/php/Dockerfile +++ b/docker/dev/php/Dockerfile @@ -9,7 +9,8 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ && docker-php-ext-enable xdebug \ ;fi -RUN apk --no-cache add \ +RUN pecl install redis \ + && apk --no-cache add \ postgresql-dev \ zip \ libzip-dev \ @@ -19,4 +20,6 @@ RUN apk --no-cache add \ zip \ gd \ && docker-php-ext-configure \ - zip + zip \ + && docker-php-ext-enable \ + redis