fb

Dobrunia · Nov 18, 2023 · ea4e838 · ea4e838
1 parent 8699b0b
commit ea4e838
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/controlers/user-controller.ts b/controlers/user-controller.ts
@@ -20,6 +20,7 @@ import {
   isInfoExist,
   createUserInfo,
   getMyInfo,
+  getnewMessagesNotifications,
 } from '../services/user-service.js';
 import { emailVerification } from '../services/mail-service.js';
 import { config } from '../config.js';
@@ -251,10 +252,13 @@ class UserController {
   }
   async getNotifications(request, response, next) {
     try {
-      const users_response = await getFriendsRequestNotifications(
+      const friends_requests = await getFriendsRequestNotifications(
         request.user.id,
       );
-      response.json(users_response);
+      const new_messages_requests = await getnewMessagesNotifications(
+        request.user.id,
+      );
+      response.json(friends_requests.concat(new_messages_requests));
     } catch (error) {
       next(error);
     }

diff --git a/services/sqlwrapper.ts b/services/sqlwrapper.ts
@@ -171,6 +171,23 @@ export async function FriendsRequestNotifications(
   }
 }
 
+export async function newMessagesNotifications(
+  myId: string,
+): Promise<mysql.RowDataPacket[]> {
+  try {
+    const results = await conn.query<mysql.RowDataPacket[]>(
+      `SELECT *
+      FROM new_massage_notifications
+      JOIN users ON users.id = new_massage_notifications.user_id_from
+      WHERE new_massage_notifications.user_id_to = ?`,
+      [myId],
+    );
+    return results[0];
+  } catch (ex) {
+    console.log(ex);
+  }
+}
+
 export async function findFriendStatusInfo(
   myId: string,
   userId: string,

diff --git a/services/user-service.ts b/services/user-service.ts
@@ -19,6 +19,7 @@ import {
   returnAllUserPost,
   findUserInfoById,
   createUserInfoTable,
+  newMessagesNotifications,
 } from './sqlwrapper.js';
 import { generateJwtTokens, validateRefreshToken } from './token-service.js';
 import bcrypt from 'bcryptjs';
@@ -320,6 +321,10 @@ export async function getFriendsRequestNotifications(myId: string) {
   return await FriendsRequestNotifications(myId);
 }
 
+export async function getnewMessagesNotifications(myId: string) {
+  return await newMessagesNotifications(myId);
+}
+
 export async function getFriendStatusInfo(myId: string, userId: string) {
   return await findFriendStatusInfo(myId, userId);
 }