no message

be/app/Http/Controllers/SubTaskController.php

@@ -73,9 +73,13 @@ class SubTaskController extends Controller
 
             $userIdArray = [$parameters['user_id']];
         }
+        $blockers1 = Blocker::whereIn('user_id', $userIdArray)->where('start', '>', $start)->get();
 
-        $blockers = Blocker::whereIn('user_id', $userIdArray)->where('start', '>', $start)->where('end', '<',
+        // vacation can last more than 7 days what is the date range we use in filter. we need to check also for vacations that started before 7 days and end after 7 days
-            $end)->get();
+        $blockers2 = Blocker::whereIn('user_id', $userIdArray)->where('start', '<=', $start)->where('end', '>',
+            $start)->get();
+
+        $blockers = $blockers1->merge($blockers2);
 
         return response()->json([
             'subtasks' => SubTaskResource::collection($subtasks),