From 851d2799857ca0268bf6f55654f9b51f828d6dff Mon Sep 17 00:00:00 2001
From: Dasha <daryna2003tk@gmail.com>
Date: Wed, 4 Mar 2026 07:47:26 +0100
Subject: [PATCH 1/3] feat: increase characters for description

---
 .../appointmentDescription.validation.ts      | 20 +++++---------
 server/src/constants/validation.constants.ts  |  1 +
 .../validation/requestValidation.util.ts      | 27 +++++++++++++++++++
 3 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 server/src/constants/validation.constants.ts
 create mode 100644 server/src/utils/validation/requestValidation.util.ts

diff --git a/client/src/utils/appointmentDescription.validation.ts b/client/src/utils/appointmentDescription.validation.ts
index 5e2266c1..d57406cb 100644
--- a/client/src/utils/appointmentDescription.validation.ts
+++ b/client/src/utils/appointmentDescription.validation.ts
@@ -1,24 +1,16 @@
-export const MAX_DESCRIPTION_WORDS = 50;
-
-export const countWords = (text: string): number => {
-  return text
-    .trim()
-    .split(/\s+/)
-    .filter((word) => word.length > 0).length;
-};
+export const MAX_DESCRIPTION_CHARACTERS = 500;
 
 export const isDescriptionValid = (description: string): boolean => {
-  const wordCount = countWords(description);
-  return wordCount <= MAX_DESCRIPTION_WORDS;
+  return description.trim().length <= MAX_DESCRIPTION_CHARACTERS;
 };
 
 export const getDescriptionValidation = (description: string) => {
-  const wordCount = countWords(description);
-  const isValid = wordCount <= MAX_DESCRIPTION_WORDS;
+  const characterCount = description.trim().length;
+  const isValid = characterCount <= MAX_DESCRIPTION_CHARACTERS;
 
   return {
-    wordCount,
+    characterCount,
     isValid,
-    maxWords: MAX_DESCRIPTION_WORDS,
+    maxCharacters: MAX_DESCRIPTION_CHARACTERS,
   };
 };
diff --git a/server/src/constants/validation.constants.ts b/server/src/constants/validation.constants.ts
new file mode 100644
index 00000000..f9567a86
--- /dev/null
+++ b/server/src/constants/validation.constants.ts
@@ -0,0 +1 @@
+export const MAX_DESCRIPTION_CHARACTERS = 500;
\ No newline at end of file
diff --git a/server/src/utils/validation/requestValidation.util.ts b/server/src/utils/validation/requestValidation.util.ts
new file mode 100644
index 00000000..c90562ef
--- /dev/null
+++ b/server/src/utils/validation/requestValidation.util.ts
@@ -0,0 +1,27 @@
+export const validatePaginationParams = (page?: string, limit?: string) => {
+  let validatedPage: number | undefined;
+  let validatedLimit: number | undefined;
+
+  if (page) {
+    validatedPage = parseInt(page, 10);
+    if (isNaN(validatedPage)) {
+      throw new Error("Invalid page parameter");
+    }
+  }
+
+  if (limit) {
+    validatedLimit = parseInt(limit, 10);
+    if (isNaN(validatedLimit)) {
+      throw new Error("Invalid limit parameter");
+    }
+  }
+
+  return { page: validatedPage, limit: validatedLimit };
+};
+
+export const validateAuthorization = (userId?: string) => {
+  if (!userId) {
+    throw new Error("Unauthorized");
+  }
+  return userId;
+};

From 46a8820fb1f7379b6231b9a2c5626bfdf5b558b0 Mon Sep 17 00:00:00 2001
From: Dasha <daryna2003tk@gmail.com>
Date: Wed, 4 Mar 2026 07:47:58 +0100
Subject: [PATCH 2/3] feat: improve validation

---
 .../teacherSchedule/TeacherSchedule.tsx       |  17 ++-
 server/src/constants/validation.constants.ts  |   2 +-
 .../src/controllers/appointment.controller.ts | 126 ++++--------------
 server/src/controllers/review.controller.ts   |  34 ++---
 server/src/controllers/student.controller.ts  |  13 +-
 server/src/controllers/teacher.controller.ts  |  23 +---
 server/src/controllers/upload.controller.ts   |  13 +-
 .../src/controllers/videoCall.controller.ts   |  37 ++---
 .../appointmentValidationMiddleware.ts        |  14 ++
 9 files changed, 94 insertions(+), 185 deletions(-)

diff --git a/client/src/components/teacherSection/teacherSchedule/TeacherSchedule.tsx b/client/src/components/teacherSection/teacherSchedule/TeacherSchedule.tsx
index 766fe76f..edc5b854 100644
--- a/client/src/components/teacherSection/teacherSchedule/TeacherSchedule.tsx
+++ b/client/src/components/teacherSection/teacherSchedule/TeacherSchedule.tsx
@@ -93,7 +93,7 @@ export default function TeacherSchedule({ teacher }: TeacherScheduleProps) {
     return getDescriptionValidation(description);
   }, [description]);
 
-  const { wordCount, isValid: isDescriptionValid } = descriptionValidation;
+  const { characterCount, isValid: isDescriptionValid } = descriptionValidation;
 
   const handleDateSelection = (date: Date): void => {
     setSelectedDate(date);
@@ -325,10 +325,14 @@ export default function TeacherSchedule({ teacher }: TeacherScheduleProps) {
 
                   {selectedSubject && selectedLevel && (
                     <div>
-                      <label className="block text-sm font-medium text-gray-300 mb-2">
+                      <label
+                        htmlFor="appointment-description"
+                        className="block text-sm font-medium text-gray-300 mb-2"
+                      >
                         Description (optional)
                       </label>
                       <textarea
+                        id="appointment-description"
                         value={description}
                         onChange={(e) => setDescription(e.target.value)}
                         placeholder="Tell the teacher about your goals, current level, or any specific topics you'd like to focus on..."
@@ -344,12 +348,13 @@ export default function TeacherSchedule({ teacher }: TeacherScheduleProps) {
                         <span
                           className={`text-xs ${isDescriptionValid ? "text-gray-400" : "text-red-400"}`}
                         >
-                          {wordCount}/{descriptionValidation.maxWords} words
+                          {characterCount}/{descriptionValidation.maxCharacters}{" "}
+                          characters
                         </span>
                         {!isDescriptionValid && (
                           <span className="text-xs text-red-400">
-                            Maximum {descriptionValidation.maxWords} words
-                            allowed
+                            Maximum {descriptionValidation.maxCharacters}{" "}
+                            characters allowed
                           </span>
                         )}
                       </div>
@@ -373,7 +378,7 @@ export default function TeacherSchedule({ teacher }: TeacherScheduleProps) {
                       : isTeacher
                         ? "Teachers cannot book lessons"
                         : !isDescriptionValid
-                          ? `Please limit description to ${descriptionValidation.maxWords} words`
+                          ? `Please limit description to ${descriptionValidation.maxCharacters} characters`
                           : "Book Now"}
                   </Button>
                 </div>
diff --git a/server/src/constants/validation.constants.ts b/server/src/constants/validation.constants.ts
index f9567a86..fac31110 100644
--- a/server/src/constants/validation.constants.ts
+++ b/server/src/constants/validation.constants.ts
@@ -1 +1 @@
-export const MAX_DESCRIPTION_CHARACTERS = 500;
\ No newline at end of file
+export const MAX_DESCRIPTION_CHARACTERS = 500;
diff --git a/server/src/controllers/appointment.controller.ts b/server/src/controllers/appointment.controller.ts
index 636838d1..98c0ea79 100644
--- a/server/src/controllers/appointment.controller.ts
+++ b/server/src/controllers/appointment.controller.ts
@@ -14,6 +14,10 @@ import {
   UpdateAppointmentStatusType,
   UpdateWeeklyScheduleType,
 } from "../types/appointment/appointment.types.js";
+import {
+  validatePaginationParams,
+  validateAuthorization,
+} from "../utils/validation/requestValidation.util.js";
 
 @injectable()
 export class AppointmentController {
@@ -64,23 +68,10 @@ export class AppointmentController {
     next: NextFunction,
   ) {
     try {
-      let page: number | undefined;
-      let limit: number | undefined;
-
-      if (req.query.page) {
-        page = parseInt(req.query.page, 10);
-        if (isNaN(page)) {
-          return res.status(400).json({ message: "Invalid page parameter" });
-        }
-      }
-
-      if (req.query.limit) {
-        limit = parseInt(req.query.limit, 10);
-        if (isNaN(limit)) {
-          return res.status(400).json({ message: "Invalid limit parameter" });
-        }
-      }
-
+      const { page, limit } = validatePaginationParams(
+        req.query.page,
+        req.query.limit,
+      );
       const result = await this.appointmentService.getAppointmentsByStudent(
         req.params.studentId,
         page,
@@ -99,23 +90,10 @@ export class AppointmentController {
     next: NextFunction,
   ) {
     try {
-      let page: number | undefined;
-      let limit: number | undefined;
-
-      if (req.query.page) {
-        page = parseInt(req.query.page, 10);
-        if (isNaN(page)) {
-          return res.status(400).json({ message: "Invalid page parameter" });
-        }
-      }
-
-      if (req.query.limit) {
-        limit = parseInt(req.query.limit, 10);
-        if (isNaN(limit)) {
-          return res.status(400).json({ message: "Invalid limit parameter" });
-        }
-      }
-
+      const { page, limit } = validatePaginationParams(
+        req.query.page,
+        req.query.limit,
+      );
       const result = await this.appointmentService.getAppointmentsByTeacher(
         req.params.teacherId,
         page,
@@ -171,11 +149,7 @@ export class AppointmentController {
     next: NextFunction,
   ) {
     try {
-      const userId = req.auth?.userId;
-      if (!userId) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-
+      const userId = validateAuthorization(req.auth?.userId);
       await this.appointmentService.deleteAppointment(req.params.id, userId);
       return res.status(204).send();
     } catch (error) {
@@ -189,11 +163,7 @@ export class AppointmentController {
     next: NextFunction,
   ) {
     try {
-      const teacherId = req.auth?.userId;
-      if (!teacherId) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-
+      const teacherId = validateAuthorization(req.auth?.userId);
       const appointment = await this.appointmentService.setRegularStudent(
         req.params.id,
         teacherId,
@@ -215,11 +185,7 @@ export class AppointmentController {
     next: NextFunction,
   ) {
     try {
-      const teacherId = req.auth?.userId;
-      if (!teacherId) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-
+      const teacherId = validateAuthorization(req.auth?.userId);
       const appointment = await this.appointmentService.removeRegularStudent(
         req.params.id,
         teacherId,
@@ -242,11 +208,7 @@ export class AppointmentController {
     next: NextFunction,
   ) {
     try {
-      const teacherId = req.auth?.userId;
-      if (!teacherId) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-
+      const teacherId = validateAuthorization(req.auth?.userId);
       const appointment = await this.appointmentService.updateWeeklySchedule(
         req.params.id,
         teacherId,
@@ -269,34 +231,16 @@ export class AppointmentController {
     next: NextFunction,
   ) {
     try {
-      const teacherId = req.auth?.userId;
-      if (!teacherId) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-
-      let page: number | undefined;
-      let limit: number | undefined;
-
-      if (req.query.page) {
-        page = parseInt(req.query.page, 10);
-        if (isNaN(page)) {
-          return res.status(400).json({ message: "Invalid page parameter" });
-        }
-      }
-
-      if (req.query.limit) {
-        limit = parseInt(req.query.limit, 10);
-        if (isNaN(limit)) {
-          return res.status(400).json({ message: "Invalid limit parameter" });
-        }
-      }
-
+      const teacherId = validateAuthorization(req.auth?.userId);
+      const { page, limit } = validatePaginationParams(
+        req.query.page,
+        req.query.limit,
+      );
       const result = await this.appointmentService.getRegularStudentsByTeacher(
         teacherId,
         page,
         limit,
       );
-
       res.json(result);
     } catch (error) {
       return next(error);
@@ -309,34 +253,16 @@ export class AppointmentController {
     next: NextFunction,
   ) {
     try {
-      const studentId = req.auth?.userId;
-      if (!studentId) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-
-      let page: number | undefined;
-      let limit: number | undefined;
-
-      if (req.query.page) {
-        page = parseInt(req.query.page, 10);
-        if (isNaN(page)) {
-          return res.status(400).json({ message: "Invalid page parameter" });
-        }
-      }
-
-      if (req.query.limit) {
-        limit = parseInt(req.query.limit, 10);
-        if (isNaN(limit)) {
-          return res.status(400).json({ message: "Invalid limit parameter" });
-        }
-      }
-
+      const studentId = validateAuthorization(req.auth?.userId);
+      const { page, limit } = validatePaginationParams(
+        req.query.page,
+        req.query.limit,
+      );
       const result = await this.appointmentService.getRegularTeachersByStudent(
         studentId,
         page,
         limit,
       );
-
       res.json(result);
     } catch (error) {
       return next(error);
diff --git a/server/src/controllers/review.controller.ts b/server/src/controllers/review.controller.ts
index c05cddb0..7535272a 100644
--- a/server/src/controllers/review.controller.ts
+++ b/server/src/controllers/review.controller.ts
@@ -4,6 +4,10 @@ import { TYPES } from "../composition/composition.types.js";
 import { ReviewService } from "../services/review/review.service.js";
 import { ReviewInputType } from "../types/review/review.types.js";
 import { ReviewQuery } from "../repositories/queryRepositories/review.query.js";
+import {
+  validateAuthorization,
+  validatePaginationParams,
+} from "../utils/validation/requestValidation.util.js";
 
 @injectable()
 export class ReviewController {
@@ -15,14 +19,7 @@ export class ReviewController {
   // POST - Review. Let Student to create a review
   async createReview(req: Request, res: Response, next: NextFunction) {
     try {
-      const studentId = req.auth?.userId;
-
-      if (!studentId) {
-        return res
-          .status(401)
-          .json({ message: " User not authenticated, please log in." });
-      }
-
+      const studentId = validateAuthorization(req.auth?.userId);
       const review = await this.reviewService.createReview(
         studentId,
         req.body as ReviewInputType,
@@ -37,24 +34,19 @@ export class ReviewController {
   async getReviewsForTeacher(req: Request, res: Response, next: NextFunction) {
     try {
       const teacherId = req.params.teacherId as string;
-      const { pageNumber, pageSize } = req.query;
+      const { page, limit } = validatePaginationParams(
+        req.query.pageNumber as string,
+        req.query.pageSize as string,
+      );
 
       const DEFAULT_PAGE_NUMBER = 1;
       const DEFAULT_PAGE_SIZE = 10;
       const MAX_PAGE_SIZE = 50;
 
-      const parsedPageNumber = pageNumber
-        ? Number(pageNumber)
-        : DEFAULT_PAGE_NUMBER;
-      const safePageNumber =
-        Number.isNaN(parsedPageNumber) || parsedPageNumber < 1
-          ? DEFAULT_PAGE_NUMBER
-          : parsedPageNumber;
-      const parsedPageSize = pageSize ? Number(pageSize) : DEFAULT_PAGE_SIZE;
-      const safePageSize =
-        Number.isNaN(parsedPageSize) || parsedPageSize < 1
-          ? DEFAULT_PAGE_SIZE
-          : Math.min(parsedPageSize, MAX_PAGE_SIZE);
+      const safePageNumber = page || DEFAULT_PAGE_NUMBER;
+      const safePageSize = limit
+        ? Math.min(limit, MAX_PAGE_SIZE)
+        : DEFAULT_PAGE_SIZE;
 
       const result = await this.reviewQuery.getReviewsByTeacherId({
         teacherId,
diff --git a/server/src/controllers/student.controller.ts b/server/src/controllers/student.controller.ts
index 1d209495..1271d59c 100644
--- a/server/src/controllers/student.controller.ts
+++ b/server/src/controllers/student.controller.ts
@@ -8,6 +8,7 @@ import { NextFunction, Response } from "express";
 import { TYPES } from "../composition/composition.types.js";
 import { StudentService } from "../services/student/student.service.js";
 import { UpdateStudentProfileType } from "../types/student/student.types.js";
+import { validateAuthorization } from "../utils/validation/requestValidation.util.js";
 
 @injectable()
 export class StudentController {
@@ -21,11 +22,7 @@ export class StudentController {
     next: NextFunction,
   ) {
     try {
-      const userId = req.auth?.userId;
-      if (!userId) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-
+      const userId = validateAuthorization(req.auth?.userId);
       const student = await this.studentService.getStudentById(userId);
       if (!student) {
         return res.status(404).json({ message: "Student not found" });
@@ -43,11 +40,7 @@ export class StudentController {
     next: NextFunction,
   ) {
     try {
-      const userId = req.auth?.userId;
-      if (!userId) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-
+      const userId = validateAuthorization(req.auth?.userId);
       const updated = await this.studentService.updateStudentProfile(
         userId,
         req.body,
diff --git a/server/src/controllers/teacher.controller.ts b/server/src/controllers/teacher.controller.ts
index c1a4dc00..1fc36139 100644
--- a/server/src/controllers/teacher.controller.ts
+++ b/server/src/controllers/teacher.controller.ts
@@ -16,6 +16,7 @@ import {
   TeacherOutputModel,
   UpdateTeacherProfileInput,
 } from "../types/teacher/teacher.types.js";
+import { validateAuthorization } from "../utils/validation/requestValidation.util.js";
 
 @injectable()
 export class TeacherController {
@@ -86,11 +87,7 @@ export class TeacherController {
     next: NextFunction,
   ) {
     try {
-      const teacherId = req.auth?.userId;
-      if (!teacherId) {
-        return res.status(401).send({ message: "Unauthorized" });
-      }
-
+      const teacherId = validateAuthorization(req.auth?.userId);
       const availability =
         await this.teacherQuery.findTeacherWeeklyAvailability(teacherId);
 
@@ -109,9 +106,7 @@ export class TeacherController {
     next: NextFunction,
   ) {
     try {
-      const teacherId = req.auth?.userId;
-      if (!teacherId) return res.status(401).send({ message: "Unauthorized" });
-
+      const teacherId = validateAuthorization(req.auth?.userId);
       const { availability, timezone } = req.body;
       const updated = await this.teacherQuery.replaceAvailabilityForWeek(
         teacherId,
@@ -128,11 +123,7 @@ export class TeacherController {
 
   async getMyProfile(req: Request, res: Response, next: NextFunction) {
     try {
-      const teacherId = req.auth?.userId;
-      if (!teacherId) {
-        return res.status(401).send({ message: "Unauthorized" });
-      }
-
+      const teacherId = validateAuthorization(req.auth?.userId);
       const teacher = await this.teacherQuery.getTeacherById(teacherId);
 
       if (!teacher) {
@@ -151,11 +142,7 @@ export class TeacherController {
     next: NextFunction,
   ) {
     try {
-      const teacherId = req.auth?.userId;
-      if (!teacherId) {
-        return res.status(401).send({ message: "Unauthorized" });
-      }
-
+      const teacherId = validateAuthorization(req.auth?.userId);
       const updatedTeacher = await this.teacherQuery.updateMyProfile(
         teacherId,
         req.body,
diff --git a/server/src/controllers/upload.controller.ts b/server/src/controllers/upload.controller.ts
index c7f84e25..eb37c619 100644
--- a/server/src/controllers/upload.controller.ts
+++ b/server/src/controllers/upload.controller.ts
@@ -3,6 +3,7 @@ import { TeacherModel } from "../db/schemes/teacherSchema.js";
 import { StudentModel } from "../db/schemes/studentSchema.js";
 import { v2 as cloudinary, UploadApiResponse } from "cloudinary";
 import { Readable } from "stream";
+import { validateAuthorization } from "../utils/validation/requestValidation.util.js";
 
 interface AuthRequest extends Request {
   auth?: {
@@ -15,11 +16,11 @@ export class UploadController {
   async uploadAvatar(req: Request, res: Response) {
     try {
       const authReq = req as AuthRequest;
-      const userId = authReq.auth?.userId;
+      const userId = validateAuthorization(authReq.auth?.userId);
       const role = authReq.auth?.role;
 
-      if (!userId || !role) {
-        return res.status(401).json({ message: "Unauthorized" });
+      if (!role) {
+        return res.status(401).json({ message: "Role not specified" });
       }
 
       if (!req.file) {
@@ -73,11 +74,11 @@ export class UploadController {
   async deleteAvatar(req: Request, res: Response) {
     try {
       const authReq = req as AuthRequest;
-      const userId = authReq.auth?.userId;
+      const userId = validateAuthorization(authReq.auth?.userId);
       const role = authReq.auth?.role;
 
-      if (!userId || !role) {
-        return res.status(401).json({ message: "Unauthorized" });
+      if (!role) {
+        return res.status(401).json({ message: "Role not specified" });
       }
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/server/src/controllers/videoCall.controller.ts b/server/src/controllers/videoCall.controller.ts
index 21e207fa..a67ff39f 100644
--- a/server/src/controllers/videoCall.controller.ts
+++ b/server/src/controllers/videoCall.controller.ts
@@ -4,6 +4,7 @@ import { VideoCallService } from "../services/video/videoCall.service.js";
 import { NextFunction, Request, Response } from "express";
 import { TYPES } from "../composition/composition.types.js";
 import { CreateVideoCallType } from "../types/video/video.types.js";
+import { validateAuthorization } from "../utils/validation/requestValidation.util.js";
 
 @injectable()
 export class VideoCallController {
@@ -40,15 +41,13 @@ export class VideoCallController {
     next: NextFunction,
   ) {
     try {
-      const userId = req.auth?.userId;
+      const userId = validateAuthorization(req.auth?.userId);
       const role = req.auth?.role;
 
-      if (!userId || !role) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-      if (role !== "student" && role !== "teacher") {
-        return res.sendStatus(403);
+      if (!role || (role !== "student" && role !== "teacher")) {
+        return res.status(403).json({ message: "Invalid role" });
       }
+
       const incoming = await this.videoCallService.incomingCall({
         authUserId: userId,
         authRole: role,
@@ -67,15 +66,13 @@ export class VideoCallController {
   ) {
     try {
       const callId = req.params.callId;
-      const userId = req.auth?.userId;
+      const userId = validateAuthorization(req.auth?.userId);
       const role = req.auth?.role;
 
-      if (!userId || !role) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-      if (role !== "student" && role !== "teacher") {
-        return res.sendStatus(403);
+      if (!role || (role !== "student" && role !== "teacher")) {
+        return res.status(403).json({ message: "Invalid role" });
       }
+
       const acceptedCall = await this.videoCallService.acceptCall({
         callId,
         authUserId: userId,
@@ -99,15 +96,13 @@ export class VideoCallController {
   ) {
     try {
       const callId = req.params.callId;
-      const userId = req.auth?.userId;
+      const userId = validateAuthorization(req.auth?.userId);
       const role = req.auth?.role;
 
-      if (!userId || !role) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
-      if (role !== "student" && role !== "teacher") {
-        return res.sendStatus(403);
+      if (!role || (role !== "student" && role !== "teacher")) {
+        return res.status(403).json({ message: "Invalid role" });
       }
+
       const declinedCall = await this.videoCallService.declineCall({
         callId,
         authUserId: userId,
@@ -131,11 +126,7 @@ export class VideoCallController {
   ) {
     try {
       const callId = req.params.callId;
-      const userId = req.auth?.userId;
-
-      if (!userId) {
-        return res.status(401).json({ message: "Unauthorized" });
-      }
+      const userId = validateAuthorization(req.auth?.userId);
 
       const endedCall = await this.videoCallService.endCall({
         callId,
diff --git a/server/src/validation/appointment/appointmentValidationMiddleware.ts b/server/src/validation/appointment/appointmentValidationMiddleware.ts
index bdbdca06..35b1592a 100644
--- a/server/src/validation/appointment/appointmentValidationMiddleware.ts
+++ b/server/src/validation/appointment/appointmentValidationMiddleware.ts
@@ -1,4 +1,5 @@
 import { body, param } from "express-validator";
+import { MAX_DESCRIPTION_CHARACTERS } from "../../constants/validation.constants.js";
 
 export const createAppointmentValidationMiddleware = () => [
   body("studentId").exists().withMessage("Student ID is needed"),
@@ -7,6 +8,19 @@ export const createAppointmentValidationMiddleware = () => [
   body("price").exists().withMessage("Price is needed"),
   body("date").exists().withMessage("Date is needed"),
   body("time").exists().withMessage("Time is needed"),
+  body("description")
+    .optional()
+    .custom((value) => {
+      if (value) {
+        const trimmedDescription = value.trim();
+        if (trimmedDescription.length > MAX_DESCRIPTION_CHARACTERS) {
+          throw new Error(
+            `Description must be no more than ${MAX_DESCRIPTION_CHARACTERS} characters`,
+          );
+        }
+      }
+      return true;
+    }),
 ];
 
 export const updateAppointmentStatusValidationMiddleware = () => [

From e72ff33cca2fab461a3df7ae659c4511b146bdcd Mon Sep 17 00:00:00 2001
From: Dasha <daryna2003tk@gmail.com>
Date: Wed, 4 Mar 2026 08:19:32 +0100
Subject: [PATCH 3/3] feat: toast notifications

---
 .../mutations/useRemoveRegularStudentMutation.ts             | 3 +++
 .../appointments/mutations/useSetRegularStudentMutation.ts   | 3 +++
 .../mutations/useUpdateWeeklyScheduleMutation.ts             | 3 +++
 .../students/mutations/useUpdateMyStudentProfileMutation.ts  | 3 +++
 .../teachers/mutations/useUpdateMyProfileMutation.ts         | 3 +++
 .../teacherAppointments/TeacherAppointments.tsx              | 5 -----
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/client/src/features/appointments/mutations/useRemoveRegularStudentMutation.ts b/client/src/features/appointments/mutations/useRemoveRegularStudentMutation.ts
index 9718035e..f8c35a85 100644
--- a/client/src/features/appointments/mutations/useRemoveRegularStudentMutation.ts
+++ b/client/src/features/appointments/mutations/useRemoveRegularStudentMutation.ts
@@ -1,9 +1,11 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { removeRegularStudentApi } from "../../../api/appointments/regularStudents.api";
 import { queryKeys } from "../../queryKeys";
+import { useNotificationStore } from "../../../store/notification.store";
 
 export const useRemoveRegularStudentMutation = () => {
   const queryClient = useQueryClient();
+  const success = useNotificationStore((s) => s.success);
 
   return useMutation({
     mutationFn: (appointmentId: string) =>
@@ -21,6 +23,7 @@ export const useRemoveRegularStudentMutation = () => {
       queryClient.invalidateQueries({
         queryKey: ["appointments", "teacher"],
       });
+      success("Student removed from regular list successfully!");
     },
     onError: (error: Error) => {
       console.error("Failed to remove regular student:", error);
diff --git a/client/src/features/appointments/mutations/useSetRegularStudentMutation.ts b/client/src/features/appointments/mutations/useSetRegularStudentMutation.ts
index b27eb41e..8cd8395c 100644
--- a/client/src/features/appointments/mutations/useSetRegularStudentMutation.ts
+++ b/client/src/features/appointments/mutations/useSetRegularStudentMutation.ts
@@ -1,9 +1,11 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { setRegularStudentApi } from "../../../api/appointments/regularStudents.api";
 import { queryKeys } from "../../queryKeys";
+import { useNotificationStore } from "../../../store/notification.store";
 
 export const useSetRegularStudentMutation = () => {
   const queryClient = useQueryClient();
+  const success = useNotificationStore((s) => s.success);
 
   return useMutation({
     mutationFn: (appointmentId: string) => setRegularStudentApi(appointmentId),
@@ -20,6 +22,7 @@ export const useSetRegularStudentMutation = () => {
       queryClient.invalidateQueries({
         queryKey: ["appointments", "teacher"],
       });
+      success("Student added to regular list successfully!");
     },
   });
 };
diff --git a/client/src/features/appointments/mutations/useUpdateWeeklyScheduleMutation.ts b/client/src/features/appointments/mutations/useUpdateWeeklyScheduleMutation.ts
index 7bd3b236..b695749c 100644
--- a/client/src/features/appointments/mutations/useUpdateWeeklyScheduleMutation.ts
+++ b/client/src/features/appointments/mutations/useUpdateWeeklyScheduleMutation.ts
@@ -2,9 +2,11 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { updateWeeklyScheduleApi } from "../../../api/appointments/regularStudents.api";
 import { queryKeys } from "../../queryKeys";
 import { WeeklyScheduleSlot } from "../../../types/appointments.types";
+import { useNotificationStore } from "../../../store/notification.store";
 
 export const useUpdateWeeklyScheduleMutation = () => {
   const queryClient = useQueryClient();
+  const success = useNotificationStore((s) => s.success);
 
   return useMutation({
     mutationFn: ({
@@ -27,6 +29,7 @@ export const useUpdateWeeklyScheduleMutation = () => {
       queryClient.invalidateQueries({
         queryKey: ["appointments", "teacher"],
       });
+      success("Weekly schedule updated successfully!");
     },
   });
 };
diff --git a/client/src/features/students/mutations/useUpdateMyStudentProfileMutation.ts b/client/src/features/students/mutations/useUpdateMyStudentProfileMutation.ts
index 7362d6f8..d036703b 100644
--- a/client/src/features/students/mutations/useUpdateMyStudentProfileMutation.ts
+++ b/client/src/features/students/mutations/useUpdateMyStudentProfileMutation.ts
@@ -2,9 +2,11 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { updateMyStudentProfile } from "../../../api/student/student.api";
 import { UpdateStudentProfile } from "../../../api/student/student.type";
 import { queryKeys } from "../../queryKeys";
+import { useNotificationStore } from "../../../store/notification.store";
 
 export const useUpdateMyStudentProfileMutation = () => {
   const queryClient = useQueryClient();
+  const success = useNotificationStore((s) => s.success);
 
   return useMutation({
     mutationFn: (data: UpdateStudentProfile) => updateMyStudentProfile(data),
@@ -12,6 +14,7 @@ export const useUpdateMyStudentProfileMutation = () => {
       queryClient.invalidateQueries({
         queryKey: queryKeys.students.myProfile(),
       });
+      success("Profile updated successfully!");
     },
   });
 };
diff --git a/client/src/features/teachers/mutations/useUpdateMyProfileMutation.ts b/client/src/features/teachers/mutations/useUpdateMyProfileMutation.ts
index ed1e0dfe..46dd7a7a 100644
--- a/client/src/features/teachers/mutations/useUpdateMyProfileMutation.ts
+++ b/client/src/features/teachers/mutations/useUpdateMyProfileMutation.ts
@@ -2,9 +2,11 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { updateMyProfileApi } from "../../../api/teacher/teacher.api";
 import { UpdateTeacherProfileInput } from "../../../api/teacher/teacher.type";
 import { queryKeys } from "../../queryKeys";
+import { useNotificationStore } from "../../../store/notification.store";
 
 export const useUpdateMyProfileMutation = () => {
   const queryClient = useQueryClient();
+  const success = useNotificationStore((s) => s.success);
 
   return useMutation({
     mutationFn: (data: UpdateTeacherProfileInput) => updateMyProfileApi(data),
@@ -16,6 +18,7 @@ export const useUpdateMyProfileMutation = () => {
       queryClient.invalidateQueries({
         queryKey: queryKeys.teacher(updatedTeacher.id),
       });
+      success("Profile updated successfully!");
     },
   });
 };
diff --git a/client/src/pages/privetTeachersPages/teacherAppointments/TeacherAppointments.tsx b/client/src/pages/privetTeachersPages/teacherAppointments/TeacherAppointments.tsx
index 9b7cf750..56bbfa37 100644
--- a/client/src/pages/privetTeachersPages/teacherAppointments/TeacherAppointments.tsx
+++ b/client/src/pages/privetTeachersPages/teacherAppointments/TeacherAppointments.tsx
@@ -103,11 +103,6 @@ export const TeacherAppointments = () => {
 
       setIsRegularStudentModalOpen(false);
       setSelectedStudent(null);
-
-      openModal("alert", {
-        title: "Success",
-        message: "Schedule updated successfully",
-      });
     } catch (error) {
       const axiosError = error as {
         response?: { data?: { errorsMessages?: Array<{ message: string }> } };