- 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>

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
 {