fix: copilot suggestions

Dmytro-Doronin · Dmytro-Doronin · commit 4154cd766293 · 2026-03-09T22:29:01.000+01:00
diff --git a/client/src/components/DropdownNotificationsMenu/DropdownNotificationsMenu.tsx b/client/src/components/DropdownNotificationsMenu/DropdownNotificationsMenu.tsx
@@ -154,14 +154,10 @@ export const DropdownNotificationsMenu = ({
                       )}
                     >
                       <div className="flex flex-col items-start gap-1">
-                        <span className="text-sm font-medium text-light-100">
-                          <div className="flex items-center justify-center gap-1">
-                            {option.sender.name}
-                            <span>
-                              <Badge title="Messages" />
-                            </span>
-                          </div>
-                        </span>
+                        <div className="flex items-center gap-1 text-sm font-medium text-light-100">
+                          <span>{option.sender.name}</span>
+                          <Badge title="Messages" />
+                        </div>
                         <span className="line-clamp-1 text-sm text-light-400">
                           {option.message.text}
                         </span>
@@ -184,14 +180,10 @@ export const DropdownNotificationsMenu = ({
                       )}
                     >
                       <div className="flex flex-col items-start gap-1">
-                        <span className="text-sm font-medium text-light-100">
-                          <div className="flex items-center justify-center gap-1">
-                            {option.actor.name}
-                            <span>
-                              <Badge title="Appointments" />
-                            </span>
-                          </div>
-                        </span>
+                        <div className="flex items-center gap-1 text-sm font-medium text-light-100">
+                          <span>{option.actor.name}</span>
+                          <Badge title="Messages" />
+                        </div>
                         <span className="text-sm text-light-400">
                           {option.status === "approved"
                             ? "Approved your appointment"
diff --git a/client/src/components/controlPanel/IndicatorTrigger.tsx b/client/src/components/controlPanel/IndicatorTrigger.tsx
@@ -8,7 +8,7 @@ import { getAvatarUrl } from "../../api/upload/upload.api";
 import type { LinkOption } from "../../types/linkOptionsType";
 import { useNotificationFeedStore } from "../../store/notificationFeed.store.ts";
 import { twMerge } from "tailwind-merge";
-import { lockScroll } from "../../util/modalScroll.util.ts";
+import { lockScroll, unlockScroll } from "../../util/modalScroll.util.ts";
 import { NotificationBar } from "../notificationBar/NotificationBar.tsx";
 
 type Props = {
@@ -27,8 +27,17 @@ export const IndicatorTrigger = ({ options, variant = "private" }: Props) => {
   );
 
   const onOpenNotificationsMenu = () => {
-    setOpenNotificationMenu(!openNotificationMenu);
-    lockScroll();
+    setOpenNotificationMenu((prev) => {
+      const next = !prev;
+
+      if (next) {
+        lockScroll();
+      } else {
+        unlockScroll();
+      }
+
+      return next;
+    });
   };
 
   const wrapperClass =
diff --git a/client/src/components/headerPrivate/TopBar.tsx b/client/src/components/headerPrivate/TopBar.tsx
@@ -4,7 +4,7 @@ import { ProfileIndicator } from "../profileIndicator/ProfileIndicator.tsx";
 import { Logo } from "../logo/Logo.tsx";
 import { NotificationBar } from "../notificationBar/NotificationBar.tsx";
 import { useNotificationFeedStore } from "../../store/notificationFeed.store.ts";
-import { lockScroll } from "../../util/modalScroll.util.ts";
+import { lockScroll, unlockScroll } from "../../util/modalScroll.util.ts";
 import { useAuthSessionStore } from "../../store/authSession.store.ts";
 
 export const TopBar = () => {
@@ -17,8 +17,17 @@ export const TopBar = () => {
   const user = useAuthSessionStore((s) => s.user);
 
   const onOpenNotificationsMenu = () => {
-    setOpenNotificationMenu(!openNotificationMenu);
-    lockScroll();
+    setOpenNotificationMenu((prev) => {
+      const next = !prev;
+
+      if (next) {
+        lockScroll();
+      } else {
+        unlockScroll();
+      }
+
+      return next;
+    });
   };
   return (
     <>
diff --git a/client/src/components/notificationBar/NotificationBar.tsx b/client/src/components/notificationBar/NotificationBar.tsx
@@ -27,10 +27,13 @@ export const NotificationBar = ({
         variant="link"
         className="relative"
         onClick={onOpenNotificationsMenu}
+        aria-label="Notifications"
+        aria-expanded={openMenu}
+        aria-haspopup="menu"
       >
         <div
           className="absolute right-2 top-1 flex items-center justify-center
-          text-[12px] min-w-4 min-h-4 bg-danger-100 rounded-full text-light-100"
+    text-[12px] min-w-4 min-h-4 bg-danger-100 rounded-full text-light-100"
         >
           {unreadNotifications}
         </div>
diff --git a/client/src/features/notifications/mutation/useDeleteAllReadNotifications.ts b/client/src/features/notifications/mutation/useDeleteAllReadNotifications.ts
@@ -7,13 +7,13 @@ import { notificationKeys } from "../../queryKeys.ts";
 
 export const useDeleteAllReadNotifications = () => {
   const queryClient = useQueryClient();
-  const items = useNotificationFeedStore((s) => s.items);
-  const setItems = useNotificationFeedStore((s) => s.setItems);
   const notifyError = useNotificationStore((s) => s.error);
 
   return useMutation({
     mutationFn: deleteAllReadNotifications,
     onSuccess: () => {
+      const { items, setItems } = useNotificationFeedStore.getState();
+
       const unreadOnly = items.filter((item) => !item.isRead);
 
       setItems(unreadOnly);
diff --git a/client/src/features/notifications/mutation/useMarkOneNotificationAsRead.tsx b/client/src/features/notifications/mutation/useMarkOneNotificationAsRead.tsx
@@ -8,18 +8,17 @@ import { getErrorMessage } from "../../../util/ErrorUtil.ts";
 export const useMarkOneNotificationAsRead = () => {
   const queryClient = useQueryClient();
   const notifyError = useNotificationStore((s) => s.error);
-  const setItems = useNotificationFeedStore((s) => s.setItems);
-  const items = useNotificationFeedStore((s) => s.items);
 
   return useMutation({
     mutationFn: markNotificationAsRead,
     onSuccess: (_, notificationId) => {
+      const { items, setItems } = useNotificationFeedStore.getState();
+
       const updated = items.map((item) =>
         item.id === notificationId ? { ...item, isRead: true } : item,
       );
 
       setItems(updated);
-
       queryClient.setQueryData(notificationKeys.root, updated);
     },
     onError: (error) => {
diff --git a/client/src/features/notifications/query/useQueryNotifications.ts b/client/src/features/notifications/query/useQueryNotifications.ts
@@ -23,7 +23,7 @@ export const useNotificationsQuery = () => {
       const msg = getErrorMessage(query.error);
       notifyError(msg ?? "Failed to load notifications");
     }
-  }, [query.isError, query.isSuccess, query.error, notifyError]);
+  }, [query.isError, query.error, notifyError]);
 
   return query;
 };
diff --git a/client/src/types/notificationFeed.types.ts b/client/src/types/notificationFeed.types.ts
diff --git a/server/src/controllers/appointment.controller.ts b/server/src/controllers/appointment.controller.ts
@@ -21,6 +21,7 @@ import {
 import { getIO } from "../socket/io.holder.js";
 import { TeacherQuery } from "../repositories/queryRepositories/teacher.query.js";
 import { NotificationService } from "../services/notifications/notifications.service.js";
+import { logError } from "../utils/logging.js";
 
 @injectable()
 export class AppointmentController {
@@ -134,6 +135,7 @@ export class AppointmentController {
     next: NextFunction,
   ) {
     const io = getIO();
+
     try {
       const appointment = await this.appointmentService.updateAppointmentStatus(
         req.params.id,
@@ -144,45 +146,40 @@ export class AppointmentController {
         return res.status(404).json({ message: "Appointment not found" });
       }
 
-      const teacher = await this.teacherQuery.getTeacherById(
-        appointment.teacherId,
-      );
-
-      if (!teacher) {
-        return res.status(404).json({ message: "Teacher not found" });
-      }
-
       if (
         appointment.status === "approved" ||
         appointment.status === "rejected"
       ) {
-        const teacher = await this.teacherQuery.getTeacherById(
-          appointment.teacherId,
-        );
-
-        if (!teacher) {
-          return res.status(404).json({ message: "Teacher not found" });
-        }
+        try {
+          const teacher = await this.teacherQuery.getTeacherById(
+            appointment.teacherId,
+          );
 
-        const notification = await this.notificationService.createNotification({
-          userId: appointment.studentId,
-          type: "appointmentStatus",
-          appointmentId: appointment.id,
-          status: appointment.status,
-          actor: {
-            id: teacher.id,
-            name: `${teacher.firstName} ${teacher.lastName}`.trim(),
-            imageUrl: teacher.profileImageUrl ?? null,
-          },
-          lesson: appointment.lesson,
-          date: appointment.date,
-          time: appointment.time,
-        });
+          if (teacher) {
+            const notification =
+              await this.notificationService.createNotification({
+                userId: appointment.studentId,
+                type: "appointmentStatus",
+                appointmentId: appointment.id,
+                status: appointment.status,
+                actor: {
+                  id: teacher.id,
+                  name: `${teacher.firstName} ${teacher.lastName}`.trim(),
+                  imageUrl: teacher.profileImageUrl ?? null,
+                },
+                lesson: appointment.lesson,
+                date: appointment.date,
+                time: appointment.time,
+              });
 
-        io?.to(`user:${appointment.studentId}`).emit(
-          "notification:new",
-          notification,
-        );
+            io?.to(`user:${appointment.studentId}`).emit(
+              "notification:new",
+              notification,
+            );
+          }
+        } catch (notificationError) {
+          logError(notificationError);
+        }
       }
 
       return res.status(200).json(appointment);
diff --git a/server/src/controllers/auth.controller.ts b/server/src/controllers/auth.controller.ts
@@ -93,7 +93,7 @@ export class AuthController {
 
       res.cookie("refreshToken", refreshToken, {
         httpOnly: true,
-        secure: false,
+        secure: process.env.NODE_ENV === "production",
         path: "/",
         maxAge: 2 * 60 * 60 * 1000,
         sameSite: "lax",
@@ -142,7 +142,7 @@ export class AuthController {
 
       res.cookie("refreshToken", newRefreshToken, {
         httpOnly: true,
-        secure: false,
+        secure: process.env.NODE_ENV === "production",
         path: "/",
         maxAge: 2 * 60 * 60 * 1000,
       });
@@ -278,7 +278,7 @@ export class AuthController {
 
       res.cookie("refreshToken", refreshToken, {
         httpOnly: true,
-        secure: false,
+        secure: process.env.NODE_ENV === "production",
         path: "/",
         maxAge: 2 * 60 * 60 * 1000,
         sameSite: "lax",
@@ -312,7 +312,7 @@ export class AuthController {
 
       res.cookie("refreshToken", refreshToken, {
         httpOnly: true,
-        secure: false,
+        secure: process.env.NODE_ENV === "production",
         path: "/",
         maxAge: 2 * 60 * 60 * 1000,
         sameSite: "lax",
diff --git a/server/src/repositories/commandRepositories/notifications.command.ts b/server/src/repositories/commandRepositories/notifications.command.ts
@@ -5,9 +5,7 @@ import { CreateNotificationInput } from "../../types/notifications/notifications
 
 @injectable()
 export class NotificationCommand {
-  async createNotification(
-    data: Omit<CreateNotificationInput, "id" | "createdAt" | "isRead">,
-  ) {
+  async createNotification(data: CreateNotificationInput) {
     const created = await NotificationModel.create({
       ...data,
       id: randomUUID(),
diff --git a/server/src/socket/socket.server.ts b/server/src/socket/socket.server.ts
@@ -16,6 +16,7 @@ import { ChatService } from "../services/chat/chat.service.js";
 import { validateChatText } from "./validators/chatText.validator.js";
 import { validateConversationId } from "./validators/conversationId.validator.js";
 import { NotificationService } from "../services/notifications/notifications.service.js";
+import { logError } from "../utils/logging.js";
 
 type SocketData = {
   userId: string;
@@ -179,6 +180,9 @@ function registerChatHandlers(_io: Server, socket: Socket) {
     "chat:sendMessage",
     async (payload: SendMessagePayload, cb?: (ack: SendAck) => void) => {
       const validation = validateChatText(payload?.text, { maxLen: 1000 });
+      const notificationService = container.get<NotificationService>(
+        TYPES.NotificationService,
+      );
       if (!validation.ok) {
         cb?.({ ok: false, error: validation.error });
         return;
@@ -202,40 +206,27 @@ function registerChatHandlers(_io: Server, socket: Socket) {
           conversationId: payload.conversationId,
           unreadCount: result.unreadCount,
         });
-        const notificationService = container.get<NotificationService>(
-          TYPES.NotificationService,
-        );
-        const notification = await notificationService.createNotification({
-          userId: result.recipientId,
-          type: "chatMessages",
-          conversationId: payload.conversationId,
-          sender: result.sender,
-          message: {
-            id: result.message.id,
-            text: result.message.text,
-            senderId: result.message.senderId,
-            createdAt: result.message.createdAt,
-          },
-        });
 
-        _io
-          .to(`user:${result.recipientId}`)
-          .emit("notification:new", notification);
-
-        // _io.to(`user:${result.recipientId}`).emit("notification:new", {
-        //   id: crypto.randomUUID(),
-        //   type: "chatMessages",
-        //   conversationId: payload.conversationId,
-        //   createdAt: new Date().toISOString(),
-        //   isRead: false,
-        //   message: {
-        //     id: result.message.id,
-        //     text: result.message.text,
-        //     senderId: result.message.senderId,
-        //     createdAt: result.message.createdAt,
-        //   },
-        //   sender: result.sender,
-        // });
+        try {
+          const notification = await notificationService.createNotification({
+            userId: result.recipientId,
+            type: "chatMessages",
+            conversationId: payload.conversationId,
+            sender: result.sender,
+            message: {
+              id: result.message.id,
+              text: result.message.text,
+              senderId: result.message.senderId,
+              createdAt: result.message.createdAt,
+            },
+          });
+
+          _io
+            .to(`user:${result.recipientId}`)
+            .emit("notification:new", notification);
+        } catch (notificationError) {
+          logError(notificationError);
+        }
 
         cb?.({ ok: true, message: result.message });
       } catch (e: unknown) {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export const useNotificationsQuery = () => {`
`23`	`23`	`const msg = getErrorMessage(query.error);`
`24`	`24`	`notifyError(msg ?? "Failed to load notifications");`
`25`	`25`	`}`
`26`		`- }, [query.isError, query.isSuccess, query.error, notifyError]);`
	`26`	`+ }, [query.isError, query.error, notifyError]);`
`27`	`27`
`28`	`28`	`return query;`
`29`	`29`	`};`