- directory refactor (#32)

* - directory refactor

* - readme.md update

* Update readme.md

Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>

* Update readme.md

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* Update readme.md

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* Update readme.md

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* Update readme.md

Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

.env.example

@@ -1,4 +1,4 @@
-APP_NAME=Laravel
+APP_NAME="Toby HR applicaiton"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true

app/Architecture/ExceptionHandler.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Toby\Exceptions;
+namespace Toby\Architecture;
 
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Foundation\Exceptions\Handler;
 
-class Handler extends ExceptionHandler
+class ExceptionHandler extends Handler
 {
     protected $dontFlash = [
         "current_password",

app/Architecture/Providers/AppServiceProvider.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Toby\Providers;
+namespace Toby\Architecture\Providers;
 
 use Illuminate\Support\Carbon;
 use Illuminate\Support\ServiceProvider;
-use Toby\Models\Holiday;
-use Toby\Models\VacationLimit;
-use Toby\Scopes\SelectedYearPeriodScope;
+use Toby\Eloquent\Models\Holiday;
+use Toby\Eloquent\Models\VacationLimit;
+use Toby\Eloquent\Scopes\SelectedYearPeriodScope;
 
 class AppServiceProvider extends ServiceProvider
 {

app/Architecture/Providers/AuthServiceProvider.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Providers;
+namespace Toby\Architecture\Providers;
 
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 

app/Architecture/Providers/EventServiceProvider.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Providers;
+namespace Toby\Architecture\Providers;
 
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 

app/Architecture/Providers/ObserverServiceProvider.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Toby\Providers;
+namespace Toby\Architecture\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Toby\Models\User;
-use Toby\Models\YearPeriod;
-use Toby\Observers\UserObserver;
-use Toby\Observers\YearPeriodObserver;
+use Toby\Eloquent\Models\User;
+use Toby\Eloquent\Models\YearPeriod;
+use Toby\Eloquent\Observers\UserObserver;
+use Toby\Eloquent\Observers\YearPeriodObserver;
 
 class ObserverServiceProvider extends ServiceProvider
 {

app/Architecture/Providers/RouteServiceProvider.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Providers;
+namespace Toby\Architecture\Providers;
 
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;

app/Architecture/Providers/TelescopeServiceProvider.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Providers;
+namespace Toby\Architecture\Providers;
 
 use Illuminate\Support\ServiceProvider;
 use Laravel\Telescope\TelescopeApplicationServiceProvider;

app/Domain/EmploymentForm.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Enums;
+namespace Toby\Domain;
 
 enum EmploymentForm: string
 {

app/Domain/PolishHolidaysRetriever.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Toby\Helpers;
+namespace Toby\Domain;
 
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\YearPeriod;
 use Yasumi\Holiday;
 use Yasumi\Yasumi;
 

app/Eloquent/Helpers/UserAvatarGenerator.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Toby\Helpers;
+namespace Toby\Eloquent\Helpers;
 
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use LasseRafn\InitialAvatarGenerator\InitialAvatar;
 use SVG\SVG;
-use Toby\Models\User;
+use Toby\Eloquent\Models\User;
 
 class UserAvatarGenerator
 {

app/Eloquent/Helpers/YearPeriodRetriever.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Toby\Helpers;
+namespace Toby\Eloquent\Helpers;
 
 use Illuminate\Contracts\Session\Session;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\YearPeriod;
 
 class YearPeriodRetriever
 {

app/Eloquent/Models/Holiday.php

@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Toby\Models;
+namespace Toby\Eloquent\Models;
 
+use Database\Factories\HolidayFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -29,4 +30,9 @@ class Holiday extends Model
     {
         return $this->belongsTo(YearPeriod::class);
     }
+
+    protected static function newFactory(): HolidayFactory
+    {
+        return HolidayFactory::new();
+    }
 }

app/Eloquent/Models/User.php

@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Toby\Models;
+namespace Toby\Eloquent\Models;
 
+use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -12,7 +13,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
-use Toby\Enums\EmploymentForm;
+use Toby\Domain\EmploymentForm;
 
 /**
  * @property int $id
@@ -69,4 +70,9 @@ class User extends Authenticatable
     {
         return "{$this->first_name} {$this->last_name}";
     }
+
+    protected static function newFactory(): UserFactory
+    {
+        return UserFactory::new();
+    }
 }

app/Eloquent/Models/VacationLimit.php

@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Toby\Models;
+namespace Toby\Eloquent\Models;
 
+use Database\Factories\VacationLimitFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -42,4 +43,9 @@ class VacationLimit extends Model
 
         return $query->orderBy($userQuery);
     }
+
+    protected static function newFactory(): VacationLimitFactory
+    {
+        return VacationLimitFactory::new();
+    }
 }

app/Eloquent/Models/YearPeriod.php

@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Toby\Models;
+namespace Toby\Eloquent\Models;
 
+use Database\Factories\YearPeriodFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -44,4 +45,9 @@ class YearPeriod extends Model
     {
         return $this->hasMany(Holiday::class);
     }
+
+    protected static function newFactory(): YearPeriodFactory
+    {
+        return YearPeriodFactory::new();
+    }
 }

app/Eloquent/Observers/UserObserver.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Toby\Observers;
+namespace Toby\Eloquent\Observers;
 
 use Illuminate\Support\Facades\Storage;
-use Toby\Helpers\UserAvatarGenerator;
-use Toby\Helpers\YearPeriodRetriever;
-use Toby\Models\User;
+use Toby\Eloquent\Helpers\UserAvatarGenerator;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\User;
 
 class UserObserver
 {

app/Eloquent/Observers/YearPeriodObserver.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Toby\Observers;
+namespace Toby\Eloquent\Observers;
 
-use Toby\Helpers\PolishHolidaysRetriever;
-use Toby\Helpers\UserAvatarGenerator;
-use Toby\Models\User;
-use Toby\Models\YearPeriod;
+use Toby\Domain\PolishHolidaysRetriever;
+use Toby\Eloquent\Helpers\UserAvatarGenerator;
+use Toby\Eloquent\Models\User;
+use Toby\Eloquent\Models\YearPeriod;
 
 class YearPeriodObserver
 {

app/Eloquent/Scopes/SelectedYearPeriodScope.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Toby\Scopes;
+namespace Toby\Eloquent\Scopes;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
-use Toby\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
 
 class SelectedYearPeriodScope implements Scope
 {

app/Infrastructure/Console/Commands/CreateUserCommand.php

@@ -2,15 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Toby\Console\Commands;
+namespace Toby\Infrastructure\Console\Commands;
 
 use Illuminate\Console\Command;
-use Toby\Models\User;
+use Toby\Eloquent\Models\User;
 
 class CreateUserCommand extends Command
 {
-    protected $signature = "user:create
-                            {email : an email for the user}";
+    protected $signature = "user:create {email : an email for the user}";
     protected $description = "Creates a user";
 
     public function handle(): void

app/Infrastructure/Console/Kernel.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Console;
+namespace Toby\Infrastructure\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

app/Infrastructure/Http/Controllers/Controller.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Controllers;
+namespace Toby\Infrastructure\Http\Controllers;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;

app/Infrastructure/Http/Controllers/GoogleController.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Controllers;
+namespace Toby\Infrastructure\Http\Controllers;
 
 use Illuminate\Contracts\Auth\Factory as AuthFactory;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Laravel\Socialite\SocialiteManager;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Toby\Models\User;
+use Toby\Eloquent\Models\User;
 
 class GoogleController extends Controller
 {

app/Infrastructure/Http/Controllers/HolidayController.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Controllers;
+namespace Toby\Infrastructure\Http\Controllers;
 
 use Illuminate\Http\RedirectResponse;
 use Inertia\Response;
-use Toby\Http\Requests\HolidayRequest;
-use Toby\Http\Resources\HolidayFormDataResource;
-use Toby\Http\Resources\HolidayResource;
-use Toby\Models\Holiday;
+use Toby\Eloquent\Models\Holiday;
+use Toby\Infrastructure\Http\Requests\HolidayRequest;
+use Toby\Infrastructure\Http\Resources\HolidayFormDataResource;
+use Toby\Infrastructure\Http\Resources\HolidayResource;
 
 class HolidayController extends Controller
 {

app/Infrastructure/Http/Controllers/LogoutController.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Controllers;
+namespace Toby\Infrastructure\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;

app/Infrastructure/Http/Controllers/SelectYearPeriodController.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Controllers;
+namespace Toby\Infrastructure\Http\Controllers;
 
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Toby\Helpers\YearPeriodRetriever;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\YearPeriod;
 
 class SelectYearPeriodController extends Controller
 {

app/Infrastructure/Http/Controllers/UserController.php

@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Controllers;
+namespace Toby\Infrastructure\Http\Controllers;
 
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Response;
-use Toby\Enums\EmploymentForm;
-use Toby\Http\Requests\UserRequest;
-use Toby\Http\Resources\UserFormDataResource;
-use Toby\Http\Resources\UserResource;
-use Toby\Models\User;
+use Toby\Domain\EmploymentForm;
+use Toby\Eloquent\Models\User;
+use Toby\Infrastructure\Http\Requests\UserRequest;
+use Toby\Infrastructure\Http\Resources\UserFormDataResource;
+use Toby\Infrastructure\Http\Resources\UserResource;
 
 class UserController extends Controller
 {

app/Infrastructure/Http/Controllers/VacationLimitController.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Controllers;
+namespace Toby\Infrastructure\Http\Controllers;
 
 use Illuminate\Http\RedirectResponse;
 use Inertia\Response;
-use Toby\Http\Requests\VacationLimitRequest;
-use Toby\Http\Resources\VacationLimitResource;
-use Toby\Models\VacationLimit;
+use Toby\Eloquent\Models\VacationLimit;
+use Toby\Infrastructure\Http\Requests\VacationLimitRequest;
+use Toby\Infrastructure\Http\Resources\VacationLimitResource;
 
 class VacationLimitController extends Controller
 {

app/Infrastructure/Http/Kernel.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http;
+namespace Toby\Infrastructure\Http;
 
 use Fruitcake\Cors\HandleCors;
 use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
@@ -23,11 +23,11 @@ use Illuminate\Routing\Middleware\ValidateSignature;
 use Illuminate\Session\Middleware\AuthenticateSession;
 use Illuminate\Session\Middleware\StartSession;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
-use Toby\Http\Middleware\Authenticate;
-use Toby\Http\Middleware\HandleInertiaRequests;
-use Toby\Http\Middleware\RedirectIfAuthenticated;
-use Toby\Http\Middleware\TrimStrings;
-use Toby\Http\Middleware\TrustProxies;
+use Toby\Infrastructure\Http\Middleware\Authenticate;
+use Toby\Infrastructure\Http\Middleware\HandleInertiaRequests;
+use Toby\Infrastructure\Http\Middleware\RedirectIfAuthenticated;
+use Toby\Infrastructure\Http\Middleware\TrimStrings;
+use Toby\Infrastructure\Http\Middleware\TrustProxies;
 
 class Kernel extends HttpKernel
 {

app/Infrastructure/Http/Middleware/Authenticate.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Middleware;
+namespace Toby\Infrastructure\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
 

app/Infrastructure/Http/Middleware/HandleInertiaRequests.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Middleware;
+namespace Toby\Infrastructure\Http\Middleware;
 
 use Illuminate\Http\Request;
 use Inertia\Middleware;
-use Toby\Helpers\YearPeriodRetriever;
-use Toby\Http\Resources\UserResource;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Infrastructure\Http\Resources\UserResource;
 
 class HandleInertiaRequests extends Middleware
 {

app/Infrastructure/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Middleware;
+namespace Toby\Infrastructure\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;

app/Infrastructure/Http/Middleware/TrimStrings.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Middleware;
+namespace Toby\Infrastructure\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
 

app/Infrastructure/Http/Middleware/TrustProxies.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Middleware;
+namespace Toby\Infrastructure\Http\Middleware;
 
 use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Symfony\Component\HttpFoundation\Request;

app/Infrastructure/Http/Requests/HolidayRequest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Requests;
+namespace Toby\Infrastructure\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rule;
-use Toby\Models\YearPeriod;
-use Toby\Rules\YearPeriodExists;
+use Toby\Eloquent\Models\YearPeriod;
+use Toby\Infrastructure\Http\Rules\YearPeriodExists;
 
 class HolidayRequest extends FormRequest
 {

app/Infrastructure/Http/Requests/UserRequest.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Requests;
+namespace Toby\Infrastructure\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Enum;
-use Toby\Enums\EmploymentForm;
+use Toby\Domain\EmploymentForm;
 
 class UserRequest extends FormRequest
 {

app/Infrastructure/Http/Requests/VacationLimitRequest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Requests;
+namespace Toby\Infrastructure\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Collection;
-use Toby\Models\VacationLimit;
+use Toby\Eloquent\Models\VacationLimit;
 
 class VacationLimitRequest extends FormRequest
 {

app/Infrastructure/Http/Resources/HolidayFormDataResource.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Resources;
+namespace Toby\Infrastructure\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Infrastructure/Http/Resources/HolidayResource.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Resources;
+namespace Toby\Infrastructure\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Infrastructure/Http/Resources/UserFormDataResource.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Resources;
+namespace Toby\Infrastructure\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Infrastructure/Http/Resources/UserResource.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Resources;
+namespace Toby\Infrastructure\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Infrastructure/Http/Resources/VacationLimitResource.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Http\Resources;
+namespace Toby\Infrastructure\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Infrastructure/Http/Rules/YearPeriodExists.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Toby\Rules;
+namespace Toby\Infrastructure\Http\Rules;
 
 use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Support\Carbon;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\YearPeriod;
 
 class YearPeriodExists implements Rule
 {

app/Infrastructure/Jobs/CheckYearPeriod.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Toby\Jobs;
+namespace Toby\Infrastructure\Jobs;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Support\Carbon;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\YearPeriod;
 
 class CheckYearPeriod implements ShouldQueue
 {

artisan

@@ -1,52 +1,20 @@
 #!/usr/bin/env php
 <?php
 
-define('LARAVEL_START', microtime(true));
+use Illuminate\Contracts\Console\Kernel;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Output\ConsoleOutput;
 
-/*
-|--------------------------------------------------------------------------
-| Register The Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any of our classes manually. It's great to relax.
-|
-*/
+define("LARAVEL_START", microtime(true));
 
-require __DIR__.'/vendor/autoload.php';
+require __DIR__ . "/vendor/autoload.php";
 
-$app = require_once __DIR__.'/bootstrap/app.php';
+$app = require_once __DIR__ . "/bootstrap/app.php";
+/** @var Kernel $kernel */
+$kernel = $app->make(Kernel::class);
 
-/*
-|--------------------------------------------------------------------------
-| Run The Artisan Application
-|--------------------------------------------------------------------------
-|
-| When we run the console application, the current CLI command will be
-| executed in this console and the response sent back to a terminal
-| or another output device for the developers. Here goes nothing!
-|
-*/
-
-$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
-
-$status = $kernel->handle(
-    $input = new Symfony\Component\Console\Input\ArgvInput,
-    new Symfony\Component\Console\Output\ConsoleOutput
-);
-
-/*
-|--------------------------------------------------------------------------
-| Shutdown The Application
-|--------------------------------------------------------------------------
-|
-| Once Artisan has finished running, we will fire off the shutdown events
-| so that any final work may be done by the application before we shut
-| down the process. This is the last thing to happen to the request.
-|
-*/
+$input = new ArgvInput();
+$status = $kernel->handle($input, new ConsoleOutput());
 
 $kernel->terminate($input, $status);
 

bootstrap/app.php

@@ -6,15 +6,15 @@ use Illuminate\Contracts\Console\Kernel as ConsoleKernelContract;
 use Illuminate\Contracts\Debug\ExceptionHandler as HandlerContract;
 use Illuminate\Contracts\Http\Kernel as HttpKernelContract;
 use Illuminate\Foundation\Application;
-use Toby\Console\Kernel as ConsoleKernel;
-use Toby\Exceptions\Handler;
-use Toby\Http\Kernel as HttpKernel;
+use Toby\Architecture\ExceptionHandler;
+use Toby\Infrastructure\Console\Kernel as ConsoleKernel;
+use Toby\Infrastructure\Http\Kernel as HttpKernel;
 
 $basePath = $_ENV["APP_BASE_PATH"] ?? dirname(__DIR__);
 $application = new Application($basePath);
 
 $application->singleton(HttpKernelContract::class, HttpKernel::class);
 $application->singleton(ConsoleKernelContract::class, ConsoleKernel::class);
-$application->singleton(HandlerContract::class, Handler::class);
+$application->singleton(HandlerContract::class, ExceptionHandler::class);
 
 return $application;

config/app.php

@@ -37,11 +37,11 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
-        Toby\Providers\AppServiceProvider::class,
-        Toby\Providers\AuthServiceProvider::class,
-        Toby\Providers\EventServiceProvider::class,
-        Toby\Providers\RouteServiceProvider::class,
-        Toby\Providers\TelescopeServiceProvider::class,
-        Toby\Providers\ObserverServiceProvider::class,
+        Toby\Architecture\Providers\AppServiceProvider::class,
+        Toby\Architecture\Providers\AuthServiceProvider::class,
+        Toby\Architecture\Providers\EventServiceProvider::class,
+        Toby\Architecture\Providers\RouteServiceProvider::class,
+        Toby\Architecture\Providers\TelescopeServiceProvider::class,
+        Toby\Architecture\Providers\ObserverServiceProvider::class,
     ],
 ];

config/auth.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Toby\Models\User;
+use Toby\Eloquent\Models\User;
 
 return [
     "defaults" => [

database/factories/HolidayFactory.php

@@ -5,10 +5,13 @@ declare(strict_types=1);
 namespace Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\Holiday;
+use Toby\Eloquent\Models\YearPeriod;
 
 class HolidayFactory extends Factory
 {
+    protected $model = Holiday::class;
+
     public function definition(): array
     {
         return [

database/factories/UserFactory.php

@@ -7,10 +7,13 @@ namespace Database\Factories;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
-use Toby\Enums\EmploymentForm;
+use Toby\Domain\EmploymentForm;
+use Toby\Eloquent\Models\User;
 
 class UserFactory extends Factory
 {
+    protected $model = User::class;
+
     public function definition(): array
     {
         return [

database/factories/VacationLimitFactory.php

@@ -5,11 +5,14 @@ declare(strict_types=1);
 namespace Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Toby\Models\User;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\User;
+use Toby\Eloquent\Models\VacationLimit;
+use Toby\Eloquent\Models\YearPeriod;
 
 class VacationLimitFactory extends Factory
 {
+    protected $model = VacationLimit::class;
+
     public function definition(): array
     {
         $hasVacation = $this->faker->boolean(75);

database/factories/YearPeriodFactory.php

@@ -5,9 +5,12 @@ declare(strict_types=1);
 namespace Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Toby\Eloquent\Models\YearPeriod;
 
 class YearPeriodFactory extends Factory
 {
+    protected $model = YearPeriod::class;
+
     public function definition(): array
     {
         return [

database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php

@@ -1,27 +0,0 @@
-<?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::create("personal_access_tokens", function (Blueprint $table): void {
-            $table->id();
-            $table->morphs("tokenable");
-            $table->string("name");
-            $table->string("token", 64)->unique();
-            $table->text("abilities")->nullable();
-            $table->timestamp("last_used_at")->nullable();
-            $table->timestamps();
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::dropIfExists("personal_access_tokens");
-    }
-};

database/migrations/2022_01_19_140630_create_vacation_limits_table.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Toby\Models\User;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\User;
+use Toby\Eloquent\Models\YearPeriod;
 
 return new class() extends Migration {
     public function up(): void

database/migrations/2022_01_20_140544_create_holidays_table.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\YearPeriod;
 
 return new class() extends Migration {
     public function up(): void

database/seeders/DatabaseSeeder.php

@@ -7,11 +7,11 @@ namespace Database\Seeders;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
-use Toby\Helpers\PolishHolidaysRetriever;
-use Toby\Helpers\UserAvatarGenerator;
-use Toby\Models\User;
-use Toby\Models\VacationLimit;
-use Toby\Models\YearPeriod;
+use Toby\Domain\PolishHolidaysRetriever;
+use Toby\Eloquent\Helpers\UserAvatarGenerator;
+use Toby\Eloquent\Models\User;
+use Toby\Eloquent\Models\VacationLimit;
+use Toby\Eloquent\Models\YearPeriod;
 
 class DatabaseSeeder extends Seeder
 {

docker-compose.yml

@@ -43,7 +43,7 @@ services:
       - MYSQL_USER=${DOCKER_DEV_DB_USERNAME}
       - MYSQL_PASSWORD=${DOCKER_DEV_DB_PASSWORD}
     ports:
-      - ${DOCKER_DB_EXTERNAL_PORT:-3306}:3306
+      - ${DOCKER_DEV_DB_EXTERNAL_PORT:-3306}:3306
     volumes:
       - toby-mysql-data:/var/lib/mysql
     networks:

package-lock.json

@@ -1,5 +1,5 @@
 {
-    "name": "toby",
+    "name": "application",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {

readme.md

@@ -4,7 +4,15 @@
 
 > HR software you love to hate
 
+## Architecture
+Directory structure little differs from a standard Laravel tree. We decided to refactor main `app` directory to better suit our needs. All classes are grouped in four major categories:
+* `app/Architecture` for all framework-related stuff like service providers, exception handler and more;
+* `app/Domain` for all framework-agnostic services related to the business logic of the application;
+* `app/Eloquent` for all database/ORM-related classes like models, observers and scopes;
+* `app/Infrastructure` for entry points to the application: CLI, HTTP and async ones.
+
 ## Local setup
+- run `sh setup` or:
 
 > `dcr` is an alias to `docker-compose run --rm -u "$(id -u):$(id -g)"`
 
@@ -95,4 +103,4 @@ Docker container:
 
 ```
 docker-compose run --rm -e XDEBUG_MODE=off php php artisan test
-```
+```

routes/web.php

@@ -3,12 +3,12 @@
 declare(strict_types=1);
 
 use Illuminate\Support\Facades\Route;
-use Toby\Http\Controllers\GoogleController;
-use Toby\Http\Controllers\HolidayController;
-use Toby\Http\Controllers\LogoutController;
-use Toby\Http\Controllers\SelectYearPeriodController;
-use Toby\Http\Controllers\UserController;
-use Toby\Http\Controllers\VacationLimitController;
+use Toby\Infrastructure\Http\Controllers\GoogleController;
+use Toby\Infrastructure\Http\Controllers\HolidayController;
+use Toby\Infrastructure\Http\Controllers\LogoutController;
+use Toby\Infrastructure\Http\Controllers\SelectYearPeriodController;
+use Toby\Infrastructure\Http\Controllers\UserController;
+use Toby\Infrastructure\Http\Controllers\VacationLimitController;
 
 Route::middleware("auth")->group(function (): void {
     Route::get("/", fn() => inertia("Dashboard"))->name("dashboard");

setup

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ ! -f ".env" ]; then
+   cp .env.example .env
+fi
+
+docker-compose build --no-cache --pull
+docker-compose up -d
+docker-compose run --rm -u "$(id -u):$(id -g)" php composer install
+docker-compose run --rm -u "$(id -u):$(id -g)" php php artisan key:generate
+docker-compose run --rm -u "$(id -u):$(id -g)" php php artisan migrate --seed
+docker-compose run --rm -u "$(id -u):$(id -g)" node npm install
+docker-compose run --rm -u "$(id -u):$(id -g)" node npm run dev

tests/Browser/AuthenticationTest.php

@@ -8,7 +8,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Laravel\Dusk\Browser;
 use Tests\Browser\Pages\HomePage;
 use Tests\DuskTestCase;
-use Toby\Models\User;
+use Toby\Eloquent\Models\User;
 
 class AuthenticationTest extends DuskTestCase
 {

tests/Feature/AuthenticationTest.php

@@ -6,7 +6,7 @@ namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Tests\FeatureTestCase;
-use Toby\Models\User;
+use Toby\Eloquent\Models\User;
 
 class AuthenticationTest extends FeatureTestCase
 {

tests/Feature/HolidayTest.php

@@ -8,9 +8,9 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Support\Carbon;
 use Inertia\Testing\AssertableInertia as Assert;
 use Tests\FeatureTestCase;
-use Toby\Models\Holiday;
-use Toby\Models\User;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\Holiday;
+use Toby\Eloquent\Models\User;
+use Toby\Eloquent\Models\YearPeriod;
 
 class HolidayTest extends FeatureTestCase
 {

tests/Feature/InertiaTest.php

@@ -7,7 +7,7 @@ namespace Tests\Feature;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Inertia\Testing\AssertableInertia as Assert;
 use Tests\FeatureTestCase;
-use Toby\Models\User;
+use Toby\Eloquent\Models\User;
 
 class InertiaTest extends FeatureTestCase
 {

tests/Feature/SelectYearPeriodTest.php

@@ -7,8 +7,8 @@ namespace Tests\Feature;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Support\Carbon;
 use Tests\FeatureTestCase;
-use Toby\Helpers\YearPeriodRetriever;
-use Toby\Models\User;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\User;
 
 class SelectYearPeriodTest extends FeatureTestCase
 {

tests/Feature/UserTest.php

@@ -8,8 +8,8 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Support\Carbon;
 use Inertia\Testing\AssertableInertia as Assert;
 use Tests\FeatureTestCase;
-use Toby\Enums\EmploymentForm;
-use Toby\Models\User;
+use Toby\Domain\EmploymentForm;
+use Toby\Eloquent\Models\User;
 
 class UserTest extends FeatureTestCase
 {

tests/Feature/VacationLimitTest.php

@@ -7,8 +7,8 @@ namespace Tests\Feature;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Inertia\Testing\AssertableInertia as Assert;
 use Tests\FeatureTestCase;
-use Toby\Models\User;
-use Toby\Models\VacationLimit;
+use Toby\Eloquent\Models\User;
+use Toby\Eloquent\Models\VacationLimit;
 
 class VacationLimitTest extends FeatureTestCase
 {

tests/Traits/InteractsWithYearPeriods.php

@@ -6,8 +6,8 @@ namespace Tests\Traits;
 
 use Illuminate\Foundation\Testing\Concerns\InteractsWithSession;
 use Illuminate\Support\Carbon;
-use Toby\Helpers\YearPeriodRetriever;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\YearPeriod;
 
 trait InteractsWithYearPeriods
 {

tests/Unit/AvatarTest.php

@@ -8,7 +8,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
 use Tests\Traits\InteractsWithYearPeriods;
-use Toby\Models\User;
+use Toby\Eloquent\Models\User;
 
 class AvatarTest extends TestCase
 {

tests/Unit/CheckYearPeriodTest.php

@@ -8,7 +8,7 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
 use Tests\Traits\InteractsWithYearPeriods;
-use Toby\Jobs\CheckYearPeriod;
+use Toby\Infrastructure\Jobs\CheckYearPeriod;
 
 class CheckYearPeriodTest extends TestCase
 {

tests/Unit/VacationLimitTest.php

@@ -7,8 +7,8 @@ namespace Tests\Unit;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Tests\TestCase;
 use Tests\Traits\InteractsWithYearPeriods;
-use Toby\Models\User;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Models\User;
+use Toby\Eloquent\Models\YearPeriod;
 
 class VacationLimitTest extends TestCase
 {

tests/Unit/YearPeriodRetrieverTest.php

@@ -9,8 +9,8 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
 use Tests\Traits\InteractsWithYearPeriods;
-use Toby\Helpers\YearPeriodRetriever;
-use Toby\Models\YearPeriod;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\YearPeriod;
 
 class YearPeriodRetrieverTest extends TestCase
 {