#116 - integration with slack (#129)

* wip * wip * wip * wip * fix * wip * wip * fix * fix * cs fix * #116 - fix * #116 - changed home-office icon * Apply suggestions from code review Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com> * #116 - cr fix * #116 - cs fix * #116 - cs fix * Apply suggestions from code review Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com> * #5 - bump codestyle Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl> Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com> Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-27 09:57:13 +02:00
parent d60dc75f99
commit c69866bb52
78 changed files with 1597 additions and 243 deletions
--- a/app/Infrastructure/Http/Controllers/Api/CalculateVacationDaysController.php
+++ b/app/Infrastructure/Http/Controllers/Api/CalculateVacationDaysController.php
@@ -14,8 +14,8 @@ class CalculateVacationDaysController extends Controller
 {
    public function __invoke(CalculateVacationDaysRequest $request, VacationDaysCalculator $calculator): JsonResponse
    {
-        $days = $calculator->calculateDays($request->yearPeriod(), $request->from(), $request->to());
+        $days = $calculator->calculateDays($request->from(), $request->to());

-        return new JsonResponse($days->map(fn(Carbon $day) => $day->toDateString())->all());
+        return new JsonResponse($days->map(fn(Carbon $day): string => $day->toDateString())->all());
    }
 }
--- a/app/Infrastructure/Http/Controllers/Api/GetAvailableVacationTypesController.php
+++ b/app/Infrastructure/Http/Controllers/Api/GetAvailableVacationTypesController.php
@@ -21,8 +21,8 @@ class GetAvailableVacationTypesController extends Controller
        $user = User::query()->find($request->get("user"));

        $types = VacationType::all()
-            ->filter(fn(VacationType $type) => $configRetriever->isAvailableFor($type, $user->profile->employment_form))
-            ->map(fn(VacationType $type) => [
+            ->filter(fn(VacationType $type): bool => $configRetriever->isAvailableFor($type, $user->profile->employment_form))
+            ->map(fn(VacationType $type): array => [
                "label" => $type->label(),
                "value" => $type->value,
            ])
--- a/app/Infrastructure/Http/Controllers/DashboardController.php
+++ b/app/Infrastructure/Http/Controllers/DashboardController.php
@@ -7,12 +7,11 @@ namespace Toby\Infrastructure\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Inertia\Response;
-use Toby\Domain\Enums\VacationType;
+use Toby\Domain\DailySummaryRetriever;
 use Toby\Domain\UserVacationStatsRetriever;
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
-use Toby\Eloquent\Models\Vacation;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Infrastructure\Http\Resources\HolidayResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;
@@ -25,24 +24,14 @@ class DashboardController extends Controller
        YearPeriodRetriever $yearPeriodRetriever,
        UserVacationStatsRetriever $vacationStatsRetriever,
        VacationTypeConfigRetriever $configRetriever,
+        DailySummaryRetriever $dailySummaryRetriever,
    ): Response {
        $user = $request->user();
        $now = Carbon::now();
        $yearPeriod = $yearPeriodRetriever->selected();

-        $absences = Vacation::query()
-            ->with(["user", "vacationRequest"])
-            ->whereDate("date", $now)
-            ->approved()
-            ->whereTypes(VacationType::all()->filter(fn(VacationType $type) => $configRetriever->isVacation($type)))
-            ->get();
-
-        $remoteDays = Vacation::query()
-            ->with(["user", "vacationRequest"])
-            ->whereDate("date", $now)
-            ->approved()
-            ->whereTypes(VacationType::all()->filter(fn(VacationType $type) => !$configRetriever->isVacation($type)))
-            ->get();
+        $absences = $dailySummaryRetriever->getAbsences($now);
+        $remoteDays = $dailySummaryRetriever->getRemoteDays($now);

        if ($user->can("listAll", VacationRequest::class)) {
            $vacationRequests = $yearPeriod->vacationRequests()
--- a/app/Infrastructure/Http/Controllers/KeysController.php
+++ b/app/Infrastructure/Http/Controllers/KeysController.php
@@ -8,6 +8,8 @@ use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\Request;
 use Inertia\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Toby\Domain\Notifications\KeyHasBeenGivenNotification;
+use Toby\Domain\Notifications\KeyHasBeenTakenNotification;
 use Toby\Eloquent\Models\Key;
 use Toby\Eloquent\Models\User;
 use Toby\Infrastructure\Http\Requests\GiveKeyRequest;
@@ -60,6 +62,8 @@ class KeysController extends Controller

        $key->save();

+        $key->notify(new KeyHasBeenTakenNotification($request->user(), $previousUser));
+
        return redirect()
            ->back()
            ->with("success", __("Key no :number has been taken from :user.", [
@@ -81,6 +85,8 @@ class KeysController extends Controller

        $key->save();

+        $key->notify(new KeyHasBeenGivenNotification($request->user(), $recipient));
+
        return redirect()
            ->back()
            ->with("success", __("Key no :number has been given to :user.", [
--- a/app/Infrastructure/Http/Controllers/TimesheetController.php
+++ b/app/Infrastructure/Http/Controllers/TimesheetController.php
@@ -35,8 +35,10 @@ class TimesheetController extends Controller

        $types = VacationType::all()
            ->filter(
-                fn(VacationType $type) => $configRetriever->isAvailableFor($type, EmploymentForm::EmploymentContract)
-                    && $configRetriever->isVacation($type),
+                fn(VacationType $type): bool => $configRetriever->isAvailableFor(
+                    $type,
+                    EmploymentForm::EmploymentContract,
+                ) && $configRetriever->isVacation($type),
            );

        $filename = "{$carbonMonth->translatedFormat("F Y")}.xlsx";
--- a/app/Infrastructure/Http/Controllers/VacationLimitController.php
+++ b/app/Infrastructure/Http/Controllers/VacationLimitController.php
@@ -30,7 +30,7 @@ class VacationLimitController extends Controller
            ->sortBy(fn(VacationLimit $limit): string => "{$limit->user->profile->last_name} {$limit->user->profile->first_name}")
            ->values();

-        $limitsResource = $limits->map(fn(VacationLimit $limit) => [
+        $limitsResource = $limits->map(fn(VacationLimit $limit): array => [
            "id" => $limit->id,
            "user" => new UserResource($limit->user),
            "hasVacation" => $limit->hasVacation(),
--- a/app/Infrastructure/Http/Kernel.php
+++ b/app/Infrastructure/Http/Kernel.php
@@ -40,7 +40,6 @@ class Kernel extends HttpKernel
        TrimStrings::class,
        ConvertEmptyStringsToNull::class,
    ];
-
    protected $middlewareGroups = [
        "web" => [
            EncryptCookies::class,
@@ -58,7 +57,6 @@ class Kernel extends HttpKernel
            SubstituteBindings::class,
        ],
    ];
-
    protected $routeMiddleware = [
        "auth" => Authenticate::class,
        "auth.basic" => AuthenticateWithBasicAuth::class,
--- a/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
@@ -32,7 +32,7 @@ class HandleInertiaRequests extends Middleware
    {
        $user = $request->user();

-        return fn() => [
+        return fn(): array => [
            "user" => $user ? new UserResource($user) : null,
            "can" => [
                "manageVacationLimits" => $user ? $user->can("manageVacationLimits") : false,
@@ -45,7 +45,7 @@ class HandleInertiaRequests extends Middleware

    protected function getFlashData(Request $request): Closure
    {
-        return fn() => [
+        return fn(): array => [
            "success" => $request->session()->get("success"),
            "error" => $request->session()->get("error"),
            "info" => $request->session()->get("info"),
--- a/app/Infrastructure/Http/Requests/UserRequest.php
+++ b/app/Infrastructure/Http/Requests/UserRequest.php
@@ -22,6 +22,8 @@ class UserRequest extends FormRequest
            "position" => ["required"],
            "employmentForm" => ["required", new Enum(EmploymentForm::class)],
            "employmentDate" => ["required", "date_format:Y-m-d"],
+            "birthday" => ["nullable", "date_format:Y-m-d"],
+            "slackId" => [],
        ];
    }

@@ -41,6 +43,8 @@ class UserRequest extends FormRequest
            "position" => $this->get("position"),
            "employment_form" => $this->get("employmentForm"),
            "employment_date" => $this->get("employmentDate"),
+            "birthday" => $this->get("birthday"),
+            "slack_id" => $this->get("slackId"),
        ];
    }
 }
--- a/app/Infrastructure/Http/Resources/UserFormDataResource.php
+++ b/app/Infrastructure/Http/Resources/UserFormDataResource.php
@@ -21,6 +21,8 @@ class UserFormDataResource extends JsonResource
            "position" => $this->profile->position,
            "employmentForm" => $this->profile->employment_form,
            "employmentDate" => $this->profile->employment_date->toDateString(),
+            "birthday" => $this->profile->birthday?->toDateString(),
+            "slackId" => $this->profile->slack_id,
        ];
    }
 }