feat: restricted non excuse leaves not to be 0.25 day

Co-authored-by: Copilot <copilot@github.com>

Author: fatmaebrahim

client/src/components/requests/leaveRequest.vue

@@ -5,7 +5,7 @@
         The actual number of vacation days requested is zero. Please note that the selected days may include weekends or
         public holidays.
       </p>
-      <p v-else-if="leaveReason?.reason== 'excuse'">
+      <p v-else-if="leaveReason?.reason == 'excuse'">
         The vacation request submitted is for a total of 1 excuse. </p>
       <p v-else>
         The vacation request submitted is for a total of {{ vacationDays.state.value }}
@@ -49,15 +49,15 @@
 
     <div class="mt-3">
       <v-text-field ref="excuseStartField" item-color="info" base-color="info" color="info" variant="outlined"
-        label="Vacation Start Time" v-model="excuseStart" hide-details="auto" type="time" :rules="[validateTimes,validateExcuse]"
-        :readonly="startDate !== endDate">
+        label="Vacation Start Time" v-model="excuseStart" hide-details="auto" type="time"
+        :rules="[validateTimes, validateLeave,]" :readonly="startDate !== endDate">
       </v-text-field>
     </div>
 
     <div class="mt-3">
       <v-text-field ref="excuseEndField" item-color="info" base-color="info" color="info" variant="outlined"
-        label="Vacation End Time" v-model="excuseEnd" hide-details="auto" type="time" :rules="[validateTimes,validateExcuse]"
-        :readonly="startDate !== endDate">
+        label="Vacation End Time" v-model="excuseEnd" hide-details="auto" type="time"
+        :rules="[validateTimes, validateLeave,]" :readonly="startDate !== endDate">
       </v-text-field>
     </div>
     <v-row class="mt-3 pa-4 d-flex justify-end">
@@ -224,26 +224,28 @@ export default {
       return true
     }
 
-      watch(leaveReason, () => {
-    excuseStartField.value?.validate()
-    excuseEndField.value?.validate()
-  })
-    const validateExcuse = (): string | boolean => {
-      if (leaveReason.value && leaveReason.value.reason === 'excuse') {
-        let endHour = Number(excuseEnd.value.split(':')[0])
-        let startHour = Number(excuseStart.value.split(':')[0])
+    watch(leaveReason, () => {
+      excuseStartField.value?.validate()
+      excuseEndField.value?.validate()
+    })
+    const validateLeave = (): string | boolean => {
+      let endHour = Number(excuseEnd.value.split(':')[0])
+      let startHour = Number(excuseStart.value.split(':')[0])
 
-        let endMinute = Number(excuseEnd.value.split(':')[1])
-        let startMinute = Number(excuseStart.value.split(':')[1])
+      let endMinute = Number(excuseEnd.value.split(':')[1])
+      let startMinute = Number(excuseStart.value.split(':')[1])
 
-        let diff = (endHour - startHour) * 60 + (endMinute - startMinute)
+      let diff = (endHour - startHour) * 60 + (endMinute - startMinute)
+ 
+      if (leaveReason.value && leaveReason.value.reason === 'excuse') {
         if (diff > 120) return 'Excuse time cannot exceed 2 hours in a day.'
+      } else {
+        if (diff < 180) return 'Vacation duration cannot be less than 0.5 days.'
       }
       return true
     }
 
 
-
     onMounted(async () => {
       startDateField.value.validate()
       endDateField.value.validate()
@@ -322,7 +324,7 @@ export default {
       createLeave,
       validateDates,
       validateTimes,
-      validateExcuse,
+      validateLeave,
       useOldBalance,
       balance,
       couldApplyUsingOldBalance,

server/cshr/tests/test_vacation.py

@@ -92,8 +92,8 @@ def test_create_vacation(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -106,8 +106,8 @@ def test_create_vacation_with_invalid_reason(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "invalid",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -147,8 +147,8 @@ def test_get_certain_vacation_request(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -166,8 +166,8 @@ def test_get_invalid_vacation_request(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -184,8 +184,8 @@ def test_cancel_certain_vacation_request(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -221,8 +221,8 @@ def test_update_vacation_request_invalid_user_id(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -240,8 +240,8 @@ def test_user_updates_status(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -259,8 +259,8 @@ def test_get_vacations_for_user_with_data(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -285,8 +285,8 @@ def test_accept_vacation_for_unauthorized_user(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -303,8 +303,8 @@ def test_reject_vacation_for_unauthorized_user(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -321,8 +321,8 @@ def test_accept_vacation_for_supervisor_auth(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -341,8 +341,8 @@ def test_reject_vacation_for_supervisor_auth(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -361,8 +361,8 @@ def test_reject_invalid_vacation(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -379,8 +379,8 @@ def test_accept_invalid_vacation(self) -> Vacation:
         url = "/api/vacations/"
         data = {
             "reason": "annual",
-            "from_date": "2022-08-23",
-            "end_date": "2022-08-23",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -485,7 +485,7 @@ def test_update_annual_to_excuse_with_valid_duration(self) -> Vacation:
         data = {
             "reason": "annual",
             "from_date": "2022-08-23:08:00:00",
-            "end_date": "2022-08-23:10:00:00",
+            "end_date": "2022-08-23:17:00:00",
             "change_log": [],
         }
         self.headers = client.credentials(
@@ -529,3 +529,21 @@ def test_update_annual_to_excuse_with_invalid_duration(self) -> Vacation:
         }
         response = client.put(url, data, format="json")
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+    def test_invalid_annual_vacation_duration(self) -> Vacation:
+        url = "/api/vacations/"
+        data = {
+            "reason": "annual",
+            "from_date": "2022-08-23:08:00:00",
+            "end_date": "2022-08-23:10:00:00",
+            "change_log": [],
+        }
+        self.headers = client.credentials(
+            HTTP_AUTHORIZATION="Bearer " + self.access_token_user
+        )
+        response = client.post(url, data, format="json")
+        self.assertEqual(
+            response.data.get("message"),
+            "Vacation duration cannot be less than 0.5 days.",
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)

server/cshr/utils/balance_calculator.py

@@ -213,6 +213,18 @@ def check_locked_balance(self, is_update: bool = False):
 
         if total_days + locked_balance > reason_days:
             raise ValueError("Insufficient balance for the requested vacation days.")
+        
+
+    @validate_applying_user
+    @validate_vacation
+    @validate_user_balance
+    def check_vacation_validations(self):
+        """
+        Run all necessary validations for the vacation request.
+        """
+        total_days = self.get_vacation_days()
+        if self.vacation.reason != "excuse" and total_days < 0.5:
+            raise ValueError("Vacation duration cannot be less than 0.5 days.")
 
     @validate_applying_user
     @validate_vacation

server/cshr/views/vacations.py

@@ -75,6 +75,7 @@ def post(self, request: Request) -> Response:
             try:
                 balance_calculator.check_requests_in_selected_dates()
                 balance_calculator.check_locked_balance()
+                balance_calculator.check_vacation_validations()
             except Exception as e:
                 return CustomResponse.bad_request(message=str(e))
 
@@ -219,6 +220,7 @@ def put(self, request: Request, id: str, format=None) -> Response:
 
             try:
                 balance_calculator.check_user_balance()
+                balance_calculator.check_vacation_validations()
                 balance_calculator.check_requests_in_selected_dates(is_update=True)
                 balance_calculator.check_locked_balance(is_update=True)
             except Exception as e:
@@ -491,6 +493,7 @@ def post(self, request: Request, user_id: str) -> Response:
             try:
                 balance_calculator.check_requests_in_selected_dates()
                 balance_calculator.check_locked_balance()
+                balance_calculator.check_vacation_validations()
                 vacation_days = balance_calculator.get_vacation_days()
                 balance_calculator.adjust_balance()
             except ValueError as e: