Merge branch 'dev' into team-meetings

backend/package.json

@@ -27,7 +27,8 @@
     "nodemon": "^3.0.1",
     "socket.io": "^4.7.2",
     "ts-node": "^10.9.1",
-    "unidecode": "^0.1.8"
+    "unidecode": "^0.1.8",
+    "vite": "^5.2.6"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",

backend/src/misc/roundToInt.ts

@@ -0,0 +1,3 @@
+export default function roundToInt(value: number) {
+  return Math.ceil(value);
+}

backend/src/models/Response.ts

@@ -35,7 +35,9 @@ export interface FriendsResponse {
 
 export interface UsersSearchResponse {
   status: "ok";
-  users: [User, number][];
+  allUsersSize: number;
+  totalPage: number;
+  users: User[];
 }
 
 export interface JWTResponse extends OkResponse {

backend/src/routes/usersFriendsRoute.ts

@@ -2,12 +2,16 @@ import { Router, Request, Response } from "express";
 import { Session } from "neo4j-driver";
 import driver from "../driver/driver";
 import User from "../models/User";
+import removeKeys from "../misc/removeKeys";
+import roundToInt from "../misc/roundToInt";
 import {
   OkErrorResponse,
   FriendsErrorResponse,
   UsersErrorResponse,
 } from "../types/userResponse";
 
+const filterUser = (user: User) => removeKeys({ ...user }, ["name_embedding"]);
+
 const friendshipRouter = Router();
 
 async function userExists(
@@ -31,27 +35,72 @@ async function userExists(
 
 friendshipRouter.get(
   "/:userId/friends",
-  async (req: Request, res: FriendsErrorResponse) => {
+  async (req: Request, res: Response) => {
     try {
       const session = driver.session();
       const userId = req.params.userId;
+      const page: number = parseInt((req.query.page as string) || "");
+      const maxUsersOnPage: number = parseInt(
+        (req.query.maxUsers as string) || "",
+      );
 
       const user = await userExists(session, res, userId);
       if ("json" in user) {
         await session.close();
         return res;
       }
 
-      const friendQuery = await session.run(
+      const searchRequest = await session.run(
         `MATCH (u:User {id: $userId})-[:IS_FRIENDS_WITH]->(f:User)-[:IS_FRIENDS_WITH]->(u)
           WITH f ORDER BY f.last_name, f.first_name
           RETURN DISTINCT f`,
         { userId },
       );
       await session.close();
 
-      const friends = friendQuery.records.map((f) => f.get("f").properties);
-      return res.json({ status: "ok", friends });
+      const allFriends = searchRequest.records.map((f) => {
+        return filterUser(f.get("f").properties);
+      });
+
+      if (!page && !maxUsersOnPage) {
+        if (allFriends.length === 0) {
+          return res.status(404).json({
+            status: "error",
+            errors: { users: "No friends found" },
+          });
+        }
+        const totalPage: number = roundToInt(allFriends.length / 5);
+        return res.status(200).json({
+          status: "ok",
+          allUsersSize: allFriends.length,
+          totalPage: totalPage,
+          users: allFriends,
+        });
+      } else if (!page || !maxUsersOnPage) {
+        return res.status(400).json({
+          status: "error",
+          errors: { params: "Missing or incorrect query params" },
+        });
+      }
+
+      const friends = allFriends.slice(
+        (page - 1) * maxUsersOnPage,
+        page * maxUsersOnPage,
+      );
+
+      if (friends.length === 0) {
+        return res.status(404).json({
+          status: "error",
+          errors: { users: "No friends found with given queries" },
+        });
+      }
+      const totalPage: number = roundToInt(allFriends.length / maxUsersOnPage);
+      return res.status(200).json({
+        status: "ok",
+        allUsersSize: allFriends.length,
+        totalPage: totalPage,
+        users: friends,
+      });
     } catch (err) {
       console.log("Error:", err);
       return res.status(404).json({ status: "error", errors: err as object });
@@ -91,11 +140,14 @@ friendshipRouter.get(
 
 friendshipRouter.get(
   "/:userId/friend-suggestions",
-  async (req: Request, res: UsersErrorResponse) => {
+  async (req: Request, res: Response) => {
     try {
       const session: Session = driver.session();
       const userId: string = req.params.userId;
-
+      const page: number = parseInt((req.query.page as string) || "");
+      const maxUsersOnPage: number = parseInt(
+        (req.query.maxUsers as string) || "",
+      );
       const user = await userExists(session, res, userId);
       if ("json" in user) {
         await session.close();
@@ -108,15 +160,58 @@ friendshipRouter.get(
           RETURN DISTINCT suggested`,
         { userId },
       );
+
+      const allUsers: User[] = friendSuggestionsQuery.records.map((r) => {
+        return filterUser(r.get("suggested").properties);
+      });
+
       await session.close();
 
-      const users: User[] = friendSuggestionsQuery.records
-        .map((record) => record.get("suggested").properties)
-        .slice(0, 15);
-      return res.json({ status: "ok", users });
+      if (!page && !maxUsersOnPage) {
+        if (allUsers.length === 0) {
+          return res.status(404).json({
+            status: "not found",
+            message: "No users found",
+          });
+        }
+        const totalPage: number = roundToInt(allUsers.length / 5);
+        return res.status(200).json({
+          status: "ok",
+          allUsersSize: allUsers.length,
+          totalPage: totalPage,
+          users: allUsers,
+        });
+      } else if (!page || !maxUsersOnPage) {
+        return res.status(400).json({
+          status: "bad request",
+          message: "Missing or incorrect query params",
+        });
+      }
+
+      const users = allUsers.slice(
+        (page - 1) * maxUsersOnPage,
+        page * maxUsersOnPage,
+      );
+
+      if (users.length === 0) {
+        return res.status(404).json({
+          status: "not found",
+          message: "No users found with given queries",
+        });
+      }
+
+      const totalPage: number = roundToInt(allUsers.length / maxUsersOnPage);
+      return res.status(200).json({
+        status: "ok",
+        allUsersSize: allUsers.length,
+        totalPage: totalPage,
+        users: users,
+      });
     } catch (err) {
-      console.log("Error:", err);
-      return res.status(404).json({ status: "error", errors: err as object });
+      console.error("Error:", err);
+      return res
+        .status(500)
+        .json({ status: "error", message: "Internal server error" });
     }
   },
 );

backend/src/routes/usersRoute.ts

@@ -16,6 +16,7 @@ import {
 import usersFriendsRoute from "./usersFriendsRoute";
 
 import removeKeys from "../misc/removeKeys";
+import roundToInt from "../misc/roundToInt";
 import { ChangePasswordReq } from "../models/ChangePasswordReq";
 import { log } from "console";
 
@@ -78,45 +79,103 @@ usersRouter.post(
 usersRouter.get(
   "/search",
   async (req: Request, res: UsersSearchErrorResponse) => {
-    const searchTerm = req.query.q;
+    const searchTerm: string = req.query.q as string;
+    const country: string = req.query.country as string;
 
-    if (typeof searchTerm != "string") {
+    if (!searchTerm && !country) {
       return res.status(404).json({
         status: "error",
         errors: { searchTerm: "not provided" },
       });
     }
 
-    if (searchTerm.length == 0) {
-      return res
-        .status(404)
-        .json({ status: "error", errors: { searchTerm: "is empty" } });
-    }
-
     try {
+      const page: number = parseInt((req.query.page as string) || "");
+      const maxUsersOnPage: number = parseInt(
+        (req.query.maxUsers as string) || "",
+      );
       const session = driver.session();
-      const wordVec = wordToVec(searchTerm);
+      let allUsers: User[] = [];
+
+      if (country && searchTerm) {
+        const wordVec = wordToVec(searchTerm);
+        const searchRequest = await session.run(
+          `CALL db.index.vector.queryNodes('user-names', 100, $wordVec)
+          YIELD node AS similarUser, score
+          RETURN similarUser, score`,
+          { wordVec },
+        );
+
+        allUsers = searchRequest.records
+          .map((r) => {
+            return filterUser(r.get("similarUser").properties);
+          })
+          .filter((user) => user.country === country);
+      } else if (country) {
+        const searchRequest = await session.run(
+          `MATCH (similarUser:User {country: $country})
+          RETURN similarUser`,
+          { country },
+        );
+
+        allUsers = searchRequest.records.map((r) => {
+          return filterUser(r.get("similarUser").properties);
+        });
+      } else if (searchTerm) {
+        const wordVec = wordToVec(searchTerm);
+        const searchRequest = await session.run(
+          `CALL db.index.vector.queryNodes('user-names', 100, $wordVec)
+          YIELD node AS similarUser, score
+          RETURN similarUser, score`,
+          { wordVec },
+        );
+
+        allUsers = searchRequest.records.map((r) => {
+          return filterUser(r.get("similarUser").properties);
+        });
+      }
 
-      if (wordVec.length == 0) {
-        return res
-          .status(400)
-          .json({ status: "error", errors: { searchTerm: "incorrect" } });
+      await session.close();
+
+      if (!page && !maxUsersOnPage) {
+        if (allUsers.length === 0) {
+          return res.status(404).json({
+            status: "error",
+            errors: { users: "No users found" },
+          });
+        }
+        const totalPage: number = roundToInt(allUsers.length / 10);
+        return res.status(200).json({
+          status: "ok",
+          allUsersSize: allUsers.length,
+          totalPage: totalPage,
+          users: allUsers,
+        });
+      } else if (!page || !maxUsersOnPage) {
+        return res.status(400).json({
+          status: "error",
+          errors: { params: "Missing or incorrect query params" },
+        });
       }
 
-      const userRequest = await session.run(
-        `CALL db.index.vector.queryNodes('user-names', 10, $wordVec)
-      YIELD node AS similarUser, score
-      RETURN similarUser, score`,
-        { wordVec },
+      const users = allUsers.slice(
+        (page - 1) * maxUsersOnPage,
+        page * maxUsersOnPage,
       );
-      const users = userRequest.records.map((r) => {
-        return [
-          filterUser(r.get("similarUser").properties),
-          Number(r.get("score")),
-        ] as [User, number];
+
+      if (users.length === 0) {
+        return res.status(404).json({
+          status: "error",
+          errors: { users: "No users found with given queries" },
+        });
+      }
+      const totalPage: number = roundToInt(allUsers.length / maxUsersOnPage);
+      return res.status(200).json({
+        status: "ok",
+        allUsersSize: allUsers.length,
+        totalPage: totalPage,
+        users,
       });
-      await session.close();
-      return res.json({ status: "ok", users });
     } catch (err) {
       console.log("Error:", err);
       return res.status(404).json({ status: "error", errors: err as object });
@@ -143,36 +202,6 @@ usersRouter.get("/:userId", async (req: Request, res: UserErrorResponse) => {
   }
 });
 
-usersRouter.get(
-  "/:userId/friends",
-  async (req: Request, res: FriendsErrorResponse) => {
-    try {
-      const userId = req.params.userId;
-
-      const session = driver.session();
-      const user = await userExists(session, { id: userId });
-
-      if (!user) {
-        return userNotFoundRes(res);
-      }
-
-      const friendRequest = await session.run(
-        `MATCH (u:User {id: $userId})-[:IS_FRIENDS_WITH]-(f:User) RETURN f`,
-        { userId },
-      );
-      await session.close();
-
-      const friends = friendRequest.records.map((f) =>
-        filterUser(f.get("f").properties),
-      );
-      return res.json({ status: "ok", friends });
-    } catch (err) {
-      console.log("Error:", err);
-      return res.status(404).json({ status: "error", errors: err as object });
-    }
-  },
-);
-
 usersRouter.get("/meetings/:userId", async (req: Request, res) => {
   try {
     const session = driver.session();