#454 - reminder refactor (#455)

* #443 - added tests for user history * #443 - added console command for migrating data * #443 - cr fixes * #443 - fix: code review fixes * #443 - fix: fixes after code review - fixed validation and edit view * #443 - fix: fixes * #454 - refactor: refactored ohs and medical reminder * #454 - fix: fixes after review * #454 - fix: code review fix
blumilksoftware · Jul 2, 2024 · 9966342 · 9966342
1 parent 957b2dc
commit 9966342
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 68 deletions.
diff --git a/app/Console/Commands/SendNotificationAboutUpcomingAndOverdueMedicalExams.php b/app/Console/Commands/SendNotificationAboutUpcomingAndOverdueMedicalExams.php
@@ -7,6 +7,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
 use Spatie\Permission\Models\Permission;
+use Toby\Enums\UserHistoryType;
 use Toby\Models\User;
 use Toby\Notifications\UpcomingAndOverdueMedicalExamsNotification;
 
@@ -20,15 +21,20 @@ public function handle(): void
         $usersToNotify = Permission::findByName("receiveUpcomingAndOverdueMedicalExamsNotification")->users()->get();
 
         $usersUpcomingMedicalExams = User::query()
-            ->whereRelation("profile", "next_medical_exam_date", ">", Carbon::now())
-            ->whereRelation("profile", "next_medical_exam_date", "<=", Carbon::now()->addMonths(2))
-            ->orderByProfileField("next_medical_exam_date", "desc")
-            ->get();
+            ->whereRelation("histories", function ($query): void {
+                $query->where("type", UserHistoryType::MedicalExam)
+                    ->where("to", ">", Carbon::now())
+                    ->where("to", "<=", Carbon::now()->addMonths(2));
+            })->get();
 
         $usersOverdueMedicalExams = User::query()
-            ->whereRelation("profile", "next_medical_exam_date", "<=", Carbon::now())
-            ->orderByProfileField("next_medical_exam_date", "desc")
-            ->get();
+            ->whereDoesntHave("histories", function ($query): void {
+                $query->where("type", UserHistoryType::MedicalExam)
+                    ->where("to", ">", Carbon::now());
+            })->withWhereHas("histories", function ($query): void {
+                $query->where("type", UserHistoryType::MedicalExam)
+                    ->where("to", "<", Carbon::now());
+            })->get();
 
         if ($usersUpcomingMedicalExams->isEmpty() && $usersOverdueMedicalExams->isEmpty()) {
             return;

diff --git a/app/Console/Commands/SendNotificationAboutUpcomingAndOverdueOhsTraining.php b/app/Console/Commands/SendNotificationAboutUpcomingAndOverdueOhsTraining.php
@@ -7,6 +7,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Carbon;
 use Spatie\Permission\Models\Permission;
+use Toby\Enums\UserHistoryType;
 use Toby\Models\User;
 use Toby\Notifications\UpcomingAndOverdueOhsTrainingNotification;
 
@@ -20,15 +21,20 @@ public function handle(): void
         $usersToNotify = Permission::findByName("receiveUpcomingAndOverdueOhsTrainingNotification")->users()->get();
 
         $usersForUpcomingOhsTraining = User::query()
-            ->whereRelation("profile", "next_ohs_training_date", ">", Carbon::now())
-            ->whereRelation("profile", "next_ohs_training_date", "<=", Carbon::now()->addMonths(2))
-            ->orderByProfileField("next_ohs_training_date", "desc")
-            ->get();
+            ->whereRelation("histories", function ($query): void {
+                $query->where("type", UserHistoryType::OhsTraining)
+                    ->where("to", ">", Carbon::now())
+                    ->where("to", "<=", Carbon::now()->addMonths(2));
+            })->get();
 
         $usersForOverdueOhsTraining = User::query()
-            ->whereRelation("profile", "next_ohs_training_date", "<=", Carbon::now())
-            ->orderByProfileField("next_ohs_training_date", "desc")
-            ->get();
+            ->whereDoesntHave("histories", function ($query): void {
+                $query->where("type", UserHistoryType::OhsTraining)
+                    ->where("to", ">", Carbon::now());
+            })->withWhereHas("histories", function ($query): void {
+                $query->where("type", UserHistoryType::OhsTraining)
+                    ->where("to", "<", Carbon::now());
+            })->get();
 
         if ($usersForUpcomingOhsTraining->isEmpty() && $usersForOverdueOhsTraining->isEmpty()) {
             return;

diff --git a/app/Http/Controllers/UserHistoryController.php b/app/Http/Controllers/UserHistoryController.php
@@ -20,7 +20,7 @@ public function index(User $user): Response
         $this->authorize("manageUsers");
 
         $history = $user->histories()
-            ->orderBy("from", "desc")
+            ->orderBy("to", "desc")
             ->get();
 
         return inertia("UserHistory/Index", [
@@ -56,7 +56,7 @@ public function edit(UserHistory $history): Response
         $this->authorize("manageUsers");
 
         return inertia("UserHistory/Edit", [
-            "history" => UserHistoryResource::make($history),
+            "history" => $history,
             "types" => UserHistoryType::casesToSelect(),
             "employmentForms" => EmploymentForm::casesToSelect(),
         ]);

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -90,15 +90,15 @@ public function lastMedicalExam(): ?UserHistory
     {
         return $this->histories()
             ->where("type", UserHistoryType::MedicalExam)
-            ->orderBy("from", "desc")
+            ->orderBy("to", "desc")
             ->first();
     }
 
     public function lastOhsTraining(): ?UserHistory
     {
         return $this->histories()
             ->where("type", UserHistoryType::OhsTraining)
-            ->orderBy("from", "desc")
+            ->orderBy("to", "desc")
             ->first();
     }
 

diff --git a/app/Models/UserHistory.php b/app/Models/UserHistory.php
@@ -16,7 +16,7 @@
  * @property int $user_id
  * @property string $comment
  * @property Carbon $from
- * @property Carbon $to
+ * @property ?Carbon $to
  * @property UserHistoryType $type
  * @property EmploymentForm $employment_form
  * @property User $user
@@ -27,8 +27,8 @@ class UserHistory extends Model
 
     protected $guarded = [];
     protected $casts = [
-        "from" => "date:Y-m-d",
-        "to" => "date:Y-m-d",
+        "from" => "date",
+        "to" => "date",
         "type" => UserHistoryType::class,
         "employment_form" => EmploymentForm::class,
     ];

diff --git a/app/Notifications/UpcomingAndOverdueMedicalExamsNotification.php b/app/Notifications/UpcomingAndOverdueMedicalExamsNotification.php
@@ -61,10 +61,11 @@ protected function buildMailMessage(Notifiable $notifiable, string $url): MailMe
                 ->line(__("Below is a list of employees with upcoming health examinations:"));
 
             foreach ($this->usersUpcomingMedicalExams as $user) {
+                $lastMedicalExamDate = $user->lastMedicalExam();
                 $message->line(__(":user - :date (in :difference days)", [
                     "user" => $user->profile->full_name,
-                    "date" => $user->profile->next_medical_exam_date->toDisplayString(),
-                    "difference" => (int)$user->profile->next_medical_exam_date->diffInDays(Carbon::today()),
+                    "date" => $lastMedicalExamDate->to->toDisplayString(),
+                    "difference" => (int)$lastMedicalExamDate->to->diffInDays(Carbon::today(), true),
                 ]));
             }
         }
@@ -74,10 +75,11 @@ protected function buildMailMessage(Notifiable $notifiable, string $url): MailMe
                 ->line(__("Below is a list of employees with overdue examinations:"));
 
             foreach ($this->usersOverdueMedicalExams as $user) {
+                $lastMedicalExamDate = $user->lastMedicalExam();
                 $message->line(__(":user - :date (overdue :difference days)", [
                     "user" => $user->profile->full_name,
-                    "date" => $user->profile->next_medical_exam_date->toDisplayString(),
-                    "difference" => (int)$user->profile->next_medical_exam_date->diffInDays(Carbon::today()),
+                    "date" => $lastMedicalExamDate->to->toDisplayString(),
+                    "difference" => (int)$lastMedicalExamDate->to->diffInDays(Carbon::today(), true),
                 ]));
             }
         }

diff --git a/app/Notifications/UpcomingAndOverdueOhsTrainingNotification.php b/app/Notifications/UpcomingAndOverdueOhsTrainingNotification.php
@@ -61,10 +61,11 @@ protected function buildMailMessage(Notifiable $notifiable, string $url): MailMe
                 ->line(__("Below is a list of employees with upcoming OHS training:"));
 
             foreach ($this->usersForUpcomingOhsTraining as $user) {
+                $lastOhsTraining = $user->lastOhsTraining();
                 $message->line(__(":user - :date (in :difference days)", [
                     "user" => $user->profile->full_name,
-                    "date" => $user->profile->next_ohs_training_date->toDisplayString(),
-                    "difference" => (int)$user->profile->next_ohs_training_date->diffInDays(Carbon::today()),
+                    "date" => $lastOhsTraining->to->toDisplayString(),
+                    "difference" => (int)$lastOhsTraining->to->diffInDays(Carbon::today(), true),
                 ]));
             }
         }
@@ -74,10 +75,11 @@ protected function buildMailMessage(Notifiable $notifiable, string $url): MailMe
                 ->line(__("Below is a list of employees with overdue OHS training:"));
 
             foreach ($this->usersForOverdueOhsTraining as $user) {
+                $lastOhsTraining = $user->lastOhsTraining();
                 $message->line(__(":user - :date (overdue :difference days)", [
                     "user" => $user->profile->full_name,
-                    "date" => $user->profile->next_ohs_training_date->toDisplayString(),
-                    "difference" => (int)$user->profile->next_ohs_training_date->diffInDays(Carbon::today()),
+                    "date" => $lastOhsTraining->to->toDisplayString(),
+                    "difference" => (int)$lastOhsTraining->to->diffInDays(Carbon::today(), true),
                 ]));
             }
         }

diff --git a/resources/js/Pages/UserHistory/Create.vue b/resources/js/Pages/UserHistory/Create.vue
@@ -5,7 +5,6 @@ import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions } f
 import { CheckIcon, ChevronUpDownIcon } from '@heroicons/vue/24/solid'
 
 const props = defineProps({
-  auth: Object,
   employmentForms: Array,
   types: Array,
   userId: Number,
@@ -255,7 +254,7 @@ function createForm() {
             <div class="space-x-3">
               <InertiaLink
                 class="py-2 px-4 text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 rounded-md border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
-                href="/vacation/requests"
+                :href="`/users/${props.userId}/history`"
               >
                 Anuluj
               </InertiaLink>

diff --git a/resources/js/Pages/UserHistory/Edit.vue b/resources/js/Pages/UserHistory/Edit.vue
@@ -5,7 +5,6 @@ import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions } f
 import { CheckIcon, ChevronUpDownIcon } from '@heroicons/vue/24/solid'
 
 const props = defineProps({
-  auth: Object,
   employmentForms: Array,
   types: Array,
   history: Object,
@@ -16,7 +15,7 @@ const form = useForm({
   to: props.history.to,
   comment: props.history.comment,
   type: props.types.find(type => type.value === props.history.type),
-  employmentForm: props.employmentForms.find(employmentForm => employmentForm.value === props.history.employmentForm) ?? '',
+  employmentForm: props.employmentForms.find(employmentForm => employmentForm.value === props.history.employment_form) ?? '',
 })
 
 function updateForm() {
@@ -255,7 +254,7 @@ function updateForm() {
             <div class="space-x-3">
               <InertiaLink
                 class="py-2 px-4 text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 rounded-md border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
-                href="/vacation/requests"
+                :href="`/users/${history.user_id}/history`"
               >
                 Anuluj
               </InertiaLink>

diff --git a/tests/Unit/UpcomingAndOverdueMedicalExamsNotificationTest.php b/tests/Unit/UpcomingAndOverdueMedicalExamsNotificationTest.php
@@ -9,6 +9,7 @@
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 use Toby\Console\Commands\SendNotificationAboutUpcomingAndOverdueMedicalExams;
+use Toby\Enums\UserHistoryType;
 use Toby\Models\User;
 use Toby\Notifications\UpcomingAndOverdueMedicalExamsNotification;
 
@@ -20,17 +21,26 @@ public function testSendingNotificationAboutUpcomingAndOverdueMedicalExams(): vo
     {
         Notification::fake();
 
-        $userWithUpcomingMedicalExam = User::factory()->employee()->hasProfile([
-            "next_medical_exam_date" => Carbon::now()->addMonth(),
-        ])->create();
-
-        $userWithDistantMedicalExamDate = User::factory()->employee()->hasProfile([
-            "next_medical_exam_date" => Carbon::now()->addYear(),
-        ])->create();
-
-        $userWithOverdueMedicalExam = User::factory()->employee()->hasProfile([
-            "next_medical_exam_date" => Carbon::now()->subMonth(),
-        ])->create();
+        $userWithUpcomingMedicalExam = User::factory()->employee()->hasProfile()->create();
+        $userWithUpcomingMedicalExam->histories()->create([
+            "type" => UserHistoryType::MedicalExam,
+            "from" => Carbon::now()->subMonth(),
+            "to" => Carbon::now()->addMonth(),
+        ]);
+
+        $userWithDistantMedicalExamDate = User::factory()->employee()->hasProfile()->create();
+        $userWithDistantMedicalExamDate->histories()->create([
+            "type" => UserHistoryType::MedicalExam,
+            "from" => Carbon::now()->subMonth(),
+            "to" => Carbon::now()->addYear(),
+        ]);
+
+        $userWithOverdueMedicalExam = User::factory()->employee()->hasProfile()->create();
+        $userWithOverdueMedicalExam->histories()->create([
+            "type" => UserHistoryType::MedicalExam,
+            "from" => Carbon::now()->subMonth(),
+            "to" => Carbon::now()->subMonth(),
+        ]);
 
         $administrativeApprover = User::factory()->administrativeApprover()->create();
 
@@ -43,22 +53,25 @@ public function testSendingNotificationAboutUpcomingAndOverdueMedicalExams(): vo
             function ($notification) use ($administrativeApprover, $userWithUpcomingMedicalExam, $userWithOverdueMedicalExam, $userWithDistantMedicalExamDate) {
                 $mailData = $notification->toMail($administrativeApprover)->toArray();
 
+                $lastMedicalExamDate = $userWithUpcomingMedicalExam->lastMedicalExam();
                 $this->assertContains(__(":user - :date (in :difference days)", [
                     "user" => $userWithUpcomingMedicalExam->profile->full_name,
-                    "date" => $userWithUpcomingMedicalExam->profile->next_medical_exam_date->toDisplayString(),
-                    "difference" => (int)$userWithUpcomingMedicalExam->profile->next_medical_exam_date->diffInDays(Carbon::today()),
+                    "date" => $lastMedicalExamDate->to->toDisplayString(),
+                    "difference" => (int)$lastMedicalExamDate->to->diffInDays(Carbon::today(), true),
                 ]), $mailData["introLines"]);
 
+                $lastMedicalExamDate = $userWithOverdueMedicalExam->lastMedicalExam();
                 $this->assertContains(__(":user - :date (overdue :difference days)", [
                     "user" => $userWithOverdueMedicalExam->profile->full_name,
-                    "date" => $userWithOverdueMedicalExam->profile->next_medical_exam_date->toDisplayString(),
-                    "difference" => (int)$userWithOverdueMedicalExam->profile->next_medical_exam_date->diffInDays(Carbon::today()),
+                    "date" => $lastMedicalExamDate->to->toDisplayString(),
+                    "difference" => (int)$lastMedicalExamDate->to->diffInDays(Carbon::today(), true),
                 ]), $mailData["introLines"]);
 
+                $lastMedicalExamDate = $userWithOverdueMedicalExam->lastMedicalExam();
                 $this->assertNotContains(__(":user - :date (in :difference days)", [
                     "user" => $userWithDistantMedicalExamDate->profile->full_name,
-                    "date" => $userWithDistantMedicalExamDate->profile->next_medical_exam_date->toDisplayString(),
-                    "difference" => (int)$userWithDistantMedicalExamDate->profile->next_medical_exam_date->diffInDays(Carbon::today()),
+                    "date" => $lastMedicalExamDate->to->toDisplayString(),
+                    "difference" => (int)$lastMedicalExamDate->to->diffInDays(Carbon::today(), true),
                 ]), $mailData["introLines"]);
 
                 return true;

diff --git a/tests/Unit/UpcomingAndOverdueOhsTrainingNotificationTest.php b/tests/Unit/UpcomingAndOverdueOhsTrainingNotificationTest.php
@@ -9,6 +9,7 @@
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 use Toby\Console\Commands\SendNotificationAboutUpcomingAndOverdueOhsTraining;
+use Toby\Enums\UserHistoryType;
 use Toby\Models\User;
 use Toby\Notifications\UpcomingAndOverdueMedicalExamsNotification;
 use Toby\Notifications\UpcomingAndOverdueOhsTrainingNotification;
@@ -21,17 +22,26 @@ public function testSendingNotificationAboutUpcomingAndOverdueOhsTraining(): voi
     {
         Notification::fake();
 
-        $userWithUpcomingOhsTraining = User::factory()->employee()->hasProfile([
-            "next_ohs_training_date" => Carbon::now()->addMonth(),
-        ])->create();
-
-        $userWithDistantOhsTrainingDate = User::factory()->employee()->hasProfile([
-            "next_ohs_training_date" => Carbon::now()->addYear(),
-        ])->create();
-
-        $userWithOverdueOhsTraining = User::factory()->employee()->hasProfile([
-            "next_ohs_training_date" => Carbon::now()->subMonth(),
-        ])->create();
+        $userWithUpcomingOhsTraining = User::factory()->employee()->hasProfile()->create();
+        $userWithUpcomingOhsTraining->histories()->create([
+            "type" => UserHistoryType::OhsTraining,
+            "from" => Carbon::now()->subMonth(),
+            "to" => Carbon::now()->addMonth(),
+        ]);
+
+        $userWithDistantOhsTrainingDate = User::factory()->employee()->hasProfile()->create();
+        $userWithDistantOhsTrainingDate->histories()->create([
+            "type" => UserHistoryType::OhsTraining,
+            "from" => Carbon::now()->subMonth(),
+            "to" => Carbon::now()->addYear(),
+        ]);
+
+        $userWithOverdueOhsTraining = User::factory()->employee()->hasProfile()->create();
+        $userWithOverdueOhsTraining->histories()->create([
+            "type" => UserHistoryType::OhsTraining,
+            "from" => Carbon::now()->subMonth(),
+            "to" => Carbon::now()->subMonth(),
+        ]);
 
         $administrativeApprover = User::factory()->administrativeApprover()->create();
 
@@ -44,22 +54,25 @@ public function testSendingNotificationAboutUpcomingAndOverdueOhsTraining(): voi
             function ($notification) use ($administrativeApprover, $userWithUpcomingOhsTraining, $userWithDistantOhsTrainingDate, $userWithOverdueOhsTraining) {
                 $mailData = $notification->toMail($administrativeApprover)->toArray();
 
+                $lastOhsTraining = $userWithUpcomingOhsTraining->lastOhsTraining();
                 $this->assertContains(__(":user - :date (in :difference days)", [
                     "user" => $userWithUpcomingOhsTraining->profile->full_name,
-                    "date" => $userWithUpcomingOhsTraining->profile->next_ohs_training_date->toDisplayString(),
-                    "difference" => (int)$userWithUpcomingOhsTraining->profile->next_ohs_training_date->diffInDays(Carbon::today()),
+                    "date" => $lastOhsTraining->to->toDisplayString(),
+                    "difference" => (int)$lastOhsTraining->to->diffInDays(Carbon::today(), true),
                 ]), $mailData["introLines"]);
 
+                $lastOhsTraining = $userWithOverdueOhsTraining->lastOhsTraining();
                 $this->assertContains(__(":user - :date (overdue :difference days)", [
                     "user" => $userWithOverdueOhsTraining->profile->full_name,
-                    "date" => $userWithOverdueOhsTraining->profile->next_ohs_training_date->toDisplayString(),
-                    "difference" => (int)$userWithOverdueOhsTraining->profile->next_ohs_training_date->diffInDays(Carbon::today()),
+                    "date" => $lastOhsTraining->to->toDisplayString(),
+                    "difference" => (int)$lastOhsTraining->to->diffInDays(Carbon::today(), true),
                 ]), $mailData["introLines"]);
 
+                $lastOhsTraining = $userWithDistantOhsTrainingDate->lastOhsTraining();
                 $this->assertNotContains(__(":user - :date (in :difference days)", [
                     "user" => $userWithDistantOhsTrainingDate->profile->full_name,
-                    "date" => $userWithDistantOhsTrainingDate->profile->next_ohs_training_date->toDisplayString(),
-                    "difference" => (int)$userWithDistantOhsTrainingDate->profile->next_ohs_training_date->diffInDays(Carbon::today()),
+                    "date" => $lastOhsTraining->to->toDisplayString(),
+                    "difference" => (int)$lastOhsTraining->to->diffInDays(Carbon::today(), true),
                 ]), $mailData["introLines"]);
 
                 return true;