From 00c5b1ca9fa97cb1345b05cfc11cc9fc52a38773 Mon Sep 17 00:00:00 2001 From: gf-rog Date: Tue, 2 Apr 2024 15:29:03 +0000 Subject: [PATCH] Apply formatting --- backend/src/routes/usersRoute.ts | 24 ++++++++++++--------- backend/src/users.ts | 11 ++++------ backend/test/userEndpoints.test.ts | 18 +++++++++++----- backend/test/userFriendsSuggestions.test.ts | 8 ++++--- backend/test/userSearch.test.ts | 4 +++- frontend/src/components/PaginatorV2.tsx | 4 ++-- frontend/src/components/Search.tsx | 6 +++--- frontend/src/pages/SearchPage.tsx | 2 +- 8 files changed, 45 insertions(+), 32 deletions(-) diff --git a/backend/src/routes/usersRoute.ts b/backend/src/routes/usersRoute.ts index 3340aac5..44e4d30d 100644 --- a/backend/src/routes/usersRoute.ts +++ b/backend/src/routes/usersRoute.ts @@ -1,10 +1,6 @@ import { Router, Request, Response } from "express"; import driver from "../driver/driver.js"; -import { - JWTRequest, - authenticateToken, - getToken, -} from "../misc/jwt.js"; +import { JWTRequest, authenticateToken, getToken } from "../misc/jwt.js"; import { AuthOkErrorResponse, OkErrorResponse, @@ -69,20 +65,28 @@ usersRouter.get( } const { page, maxUsers, q: searchTerm, country } = verify.verified; - const maxUsersBig = BigInt(maxUsers) + const maxUsersBig = BigInt(maxUsers); const session = driver.session(); try { - const userScores = await searchUsers(session, searchTerm, country, page - 1, maxUsers); + const userScores = await searchUsers( + session, + searchTerm, + country, + page - 1, + maxUsers, + ); if (userScores === null) { return res .status(400) .json({ status: "error", errors: { searchTerm: "incorrect" } }); } - const usersCount = await getUsersCount(session) - const pageCount = Number((usersCount.toBigInt() + maxUsersBig - 1n) / maxUsersBig) - const users = userScores.map((userScore) => userScore[0]) + const usersCount = await getUsersCount(session); + const pageCount = Number( + (usersCount.toBigInt() + maxUsersBig - 1n) / maxUsersBig, + ); + const users = userScores.map((userScore) => userScore[0]); return res.json({ status: "ok", pageCount, users }); } catch (err) { diff --git a/backend/src/users.ts b/backend/src/users.ts index a44c1ee9..6cfc6b9b 100644 --- a/backend/src/users.ts +++ b/backend/src/users.ts @@ -201,12 +201,12 @@ export async function searchUser( pageIndex: number, pageSize: number, ): Promise { - const queryElems = neo4j.int((pageIndex + 1) * pageSize) + const queryElems = neo4j.int((pageIndex + 1) * pageSize); const querySkip = neo4j.int(pageIndex * pageSize); const queryLimit = neo4j.int(pageSize); let userRequest: neo4j.QueryResult; - + if (!searchTerm) { userRequest = await session.run( `MATCH (u:User) @@ -245,11 +245,9 @@ export async function searchUser( } export async function getUsersCount(session: Session): Promise { - const usersCount = await session.run( - `MATCH (u:User) RETURN count(u)`, - ); + const usersCount = await session.run(`MATCH (u:User) RETURN count(u)`); - return usersCount.records[0].get(0) + return usersCount.records[0].get(0); } export async function updateUser( @@ -465,4 +463,3 @@ export async function getFriendSuggestions( ); return friends; } - diff --git a/backend/test/userEndpoints.test.ts b/backend/test/userEndpoints.test.ts index 8da28bcc..ddcbca99 100644 --- a/backend/test/userEndpoints.test.ts +++ b/backend/test/userEndpoints.test.ts @@ -109,9 +109,11 @@ test("Get user's friends", async () => { ); const zuckId = zuck.id; - const response = await fetch(`http://localhost:5000/users/${zuckId}/friends?page=1&maxUsers=2`); + const response = await fetch( + `http://localhost:5000/users/${zuckId}/friends?page=1&maxUsers=2`, + ); const responseData = await response.json(); - assert.containsAllKeys(responseData, ["status", "friends", "pageCount"]) + assert.containsAllKeys(responseData, ["status", "friends", "pageCount"]); const { status, friends } = responseData; expect(status).toBe("ok"); @@ -150,7 +152,9 @@ test("Search users", async () => { expect(usersNoPageErrors["page"]).toBe("not provided"); expect(usersNoPageErrors["maxUsers"]).toBe("not provided"); - const usersWrongPageResponseData = await searchUsers("?q=zuckerberg&page=🐈&maxUsers=🐕"); + const usersWrongPageResponseData = await searchUsers( + "?q=zuckerberg&page=🐈&maxUsers=🐕", + ); const usersWrongPageStatus = usersWrongPageResponseData.status; const usersWrongPageErrors = usersWrongPageResponseData.errors; @@ -158,7 +162,9 @@ test("Search users", async () => { expect(usersWrongPageErrors["page"]).toBe("not a number"); expect(usersWrongPageErrors["maxUsers"]).toBe("not a number"); - const usersMultiplePageResponseData = await searchUsers("?q=zuckerberg&page=1&page=1&maxUsers=1&maxUsers=1"); + const usersMultiplePageResponseData = await searchUsers( + "?q=zuckerberg&page=1&page=1&maxUsers=1&maxUsers=1", + ); const usersMultiplePageStatus = usersMultiplePageResponseData.status; const usersMultiplePageErrors = usersMultiplePageResponseData.errors; @@ -166,7 +172,9 @@ test("Search users", async () => { expect(usersMultiplePageErrors["page"]).toBe("incorrect"); expect(usersMultiplePageErrors["maxUsers"]).toBe("incorrect"); - const usersResponseData = await searchUsers("?q=zuckerberg&page=1&maxUsers=10"); + const usersResponseData = await searchUsers( + "?q=zuckerberg&page=1&maxUsers=10", + ); const usersStatus = usersResponseData.status; expect(usersStatus).toBe("ok"); diff --git a/backend/test/userFriendsSuggestions.test.ts b/backend/test/userFriendsSuggestions.test.ts index 02fb56fb..fc66d36b 100644 --- a/backend/test/userFriendsSuggestions.test.ts +++ b/backend/test/userFriendsSuggestions.test.ts @@ -5,7 +5,9 @@ let page: number = 3; let maxUsers: number = 5; test("Search user", async () => { - const response = await fetch("http://localhost:5000/users/search?q=a&page=1&maxUsers=10"); + const response = await fetch( + "http://localhost:5000/users/search?q=a&page=1&maxUsers=10", + ); const responseData = await response.json(); const users = responseData.users; @@ -41,7 +43,7 @@ test("Missing page", async () => { const errors = responseData.errors; expect(status).toBe("error"); - expect(errors["page"]).toBe("not provided") + expect(errors["page"]).toBe("not provided"); }); test("Missing maxUsers", async () => { @@ -54,7 +56,7 @@ test("Missing maxUsers", async () => { const errors = responseData.errors; expect(status).toBe("error"); - expect(errors["maxUsers"]).toBe("not provided") + expect(errors["maxUsers"]).toBe("not provided"); }); test("First user", async () => { diff --git a/backend/test/userSearch.test.ts b/backend/test/userSearch.test.ts index 3f34dd4c..b9a4c386 100644 --- a/backend/test/userSearch.test.ts +++ b/backend/test/userSearch.test.ts @@ -4,7 +4,9 @@ let page: number = 1; let maxUsers: number = 1; test("Search all users", async () => { - const response = await fetch("http://localhost:5000/users/search?q=a&page=1&maxUsers=100"); + const response = await fetch( + "http://localhost:5000/users/search?q=a&page=1&maxUsers=100", + ); const responseData = await response.json(); const users = responseData.users; diff --git a/frontend/src/components/PaginatorV2.tsx b/frontend/src/components/PaginatorV2.tsx index 990777a0..54a51d42 100644 --- a/frontend/src/components/PaginatorV2.tsx +++ b/frontend/src/components/PaginatorV2.tsx @@ -35,12 +35,12 @@ function PaginatorV2(props: PaginatorProps) { props.endpoint + `${queryChar}page=${currentPage}&maxUsers=${props.itemsPerPage}`; - console.log(url) + console.log(url); await dataService .fetchData(url, "GET") .then((response) => { - const users = props.getItems(response) + const users = props.getItems(response); if (users && response.pageCount) { setError(""); diff --git a/frontend/src/components/Search.tsx b/frontend/src/components/Search.tsx index 3770d613..fdd45353 100644 --- a/frontend/src/components/Search.tsx +++ b/frontend/src/components/Search.tsx @@ -47,12 +47,12 @@ const Search = (props: searchProps) => { if (userState.status === "anonymous") navigate("/login"); - const countryQuery = (country != "-") ? country : "" + const countryQuery = country != "-" ? country : ""; const urlSearchParams = new URLSearchParams({ q: searchQuery, - country: countryQuery - }) + country: countryQuery, + }); props.handler(`/users/search?${urlSearchParams}`); }; diff --git a/frontend/src/pages/SearchPage.tsx b/frontend/src/pages/SearchPage.tsx index 8752c032..9d071ba6 100644 --- a/frontend/src/pages/SearchPage.tsx +++ b/frontend/src/pages/SearchPage.tsx @@ -43,7 +43,7 @@ function SearchPage() { const friends = friendsResponse.friends as User[]; const friendsIds = friends.map((friend) => friend.id); - console.log(friendsIds) + console.log(friendsIds); setUsersFriends(friendsIds); }; fetchFriends();