#454 - fix: code review fix

blumilksoftware · Jul 1, 2024 · 8ccdeb9 · 8ccdeb9
1 parent 3cb88dc
commit 8ccdeb9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/app/Console/Commands/SendNotificationAboutUpcomingAndOverdueMedicalExams.php b/app/Console/Commands/SendNotificationAboutUpcomingAndOverdueMedicalExams.php
@@ -28,7 +28,10 @@ public function handle(): void
             })->get();
 
         $usersOverdueMedicalExams = User::query()
-            ->whereRelation("histories", function ($query): void {
+            ->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();

diff --git a/app/Console/Commands/SendNotificationAboutUpcomingAndOverdueOhsTraining.php b/app/Console/Commands/SendNotificationAboutUpcomingAndOverdueOhsTraining.php
@@ -28,7 +28,10 @@ public function handle(): void
             })->get();
 
         $usersForOverdueOhsTraining = User::query()
-            ->whereRelation("histories", function ($query): void {
+            ->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();

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", [

diff --git a/resources/js/Pages/UserHistory/Edit.vue b/resources/js/Pages/UserHistory/Edit.vue
@@ -15,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() {