From bfdba50e6b328202318191a004109f2e3b0ce0af Mon Sep 17 00:00:00 2001 From: Reptapog <18347043+Reptapog@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:20:02 -0700 Subject: [PATCH] addressing review --- server/feeds/routes.ts | 4 ---- server/feeds/tests/REST/REST-realm-feed.test.ts | 2 +- server/feeds/tests/queries.test.ts | 5 +++-- server/feeds/tests/user-feed.test.ts | 7 ++++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/server/feeds/routes.ts b/server/feeds/routes.ts index 4f5511f9..4cf814a5 100644 --- a/server/feeds/routes.ts +++ b/server/feeds/routes.ts @@ -69,10 +69,6 @@ router.get("/realms/:realm_id", ensureLoggedIn, async (req, res) => { }); info(`Found activity for realm ${realmExternalId}:`, result); - if (result === false) { - res.sendStatus(500); - return; - } if (!result) { throw new NotFound404Error( `Realm with id ${realmExternalId} was not found` diff --git a/server/feeds/tests/REST/REST-realm-feed.test.ts b/server/feeds/tests/REST/REST-realm-feed.test.ts index 79397a0e..d9dc528f 100644 --- a/server/feeds/tests/REST/REST-realm-feed.test.ts +++ b/server/feeds/tests/REST/REST-realm-feed.test.ts @@ -22,7 +22,7 @@ const log = debug("bobaserver:board:routes"); expect(res.body).toEqual(BOBATAN_REALM_FEED); }); - test("return realm activity results when user isn't logged in", async () => { + test("should return 401 when user isn't logged in", async () => { const res = await request(server.app).get(`/realms/${TWISTED_MINDS_REALM_EXTERNAL_ID}`); expect(res.status).toBe(401); diff --git a/server/feeds/tests/queries.test.ts b/server/feeds/tests/queries.test.ts index f69c2c79..970b0d4c 100644 --- a/server/feeds/tests/queries.test.ts +++ b/server/feeds/tests/queries.test.ts @@ -2,6 +2,7 @@ import { BOBATAN_USER_ID, ONCEST_USER_ID } from "test/data/auth"; import { FAVORITE_CHARACTER_THREAD_ID, FAVORITE_MURDER_THREAD_ID, + FUNNY_MEMES_THREAD_ID, } from "test/data/threads"; import { TWISTED_MINDS_REALM_EXTERNAL_ID } from "test/data/realms"; @@ -83,7 +84,7 @@ describe("feed activity queries", () => { new_posts_amount: 0, post_id: "b2c57275-512e-4821-8cf8-b3ac76e1e044", posts_amount: 136, - thread_id: "2765f36a-b4f9-4efe-96f2-cb34f055d032", // Meme Thread Id + thread_id: FUNNY_MEMES_THREAD_ID, thread_last_activity_at: "2020-08-22T03:36:55.00Z", thread_last_activity_at_micro: "2020-08-22T03:36:55.850000", threads_amount: 135, @@ -161,7 +162,7 @@ describe("feed activity queries", () => { new_posts_amount: 0, post_id: "b2c57275-512e-4821-8cf8-b3ac76e1e044", posts_amount: 136, - thread_id: "2765f36a-b4f9-4efe-96f2-cb34f055d032", // Meme Thread Id + thread_id: FUNNY_MEMES_THREAD_ID, thread_last_activity_at: "2020-08-22T03:36:55.00Z", thread_last_activity_at_micro: "2020-08-22T03:36:55.850000", threads_amount: 135, diff --git a/server/feeds/tests/user-feed.test.ts b/server/feeds/tests/user-feed.test.ts index 50f17bb4..45230f40 100644 --- a/server/feeds/tests/user-feed.test.ts +++ b/server/feeds/tests/user-feed.test.ts @@ -2,6 +2,7 @@ import { BOBATAN_USER_ID, ONCEST_USER_ID } from "test/data/auth"; import { FAVORITE_CHARACTER_THREAD_ID, FAVORITE_MURDER_THREAD_ID, + FUNNY_MEMES_THREAD_ID, } from "test/data/threads"; import { TWISTED_MINDS_REALM_EXTERNAL_ID } from "test/data/realms"; @@ -74,7 +75,7 @@ describe("feed activity queries", () => { new_posts_amount: 0, post_id: "b2c57275-512e-4821-8cf8-b3ac76e1e044", posts_amount: 136, - thread_id: "2765f36a-b4f9-4efe-96f2-cb34f055d032", // Meme Thread Id + thread_id: FUNNY_MEMES_THREAD_ID, thread_last_activity_at: "2020-08-22T03:36:55.00Z", thread_last_activity_at_micro: "2020-08-22T03:36:55.850000", threads_amount: 135, @@ -160,7 +161,7 @@ describe("feed activity queries", () => { new_posts_amount: 0, post_id: "b2c57275-512e-4821-8cf8-b3ac76e1e044", posts_amount: 136, - thread_id: "2765f36a-b4f9-4efe-96f2-cb34f055d032", // Meme Thread Id + thread_id: FUNNY_MEMES_THREAD_ID, thread_last_activity_at: "2020-08-22T03:36:55.00Z", thread_last_activity_at_micro: "2020-08-22T03:36:55.850000", threads_amount: 135, @@ -252,7 +253,7 @@ describe("feed activity queries", () => { new_posts_amount: 0, post_id: "b2c57275-512e-4821-8cf8-b3ac76e1e044", posts_amount: 136, - thread_id: "2765f36a-b4f9-4efe-96f2-cb34f055d032", // Meme Thread Id + thread_id: FUNNY_MEMES_THREAD_ID, thread_last_activity_at: "2020-08-22T03:36:55.00Z", thread_last_activity_at_micro: "2020-08-22T03:36:55.850000", threads_amount: 135,