diff --git a/server/src/controllers/postController/index.ts b/server/src/controllers/postController/index.ts index 1e271373985ba0dc1c784e26f6ef125edd6690ef..ed5a95f2e7c0d5568a7b6d1854194d7fe8210f9c 100644 --- a/server/src/controllers/postController/index.ts +++ b/server/src/controllers/postController/index.ts @@ -41,13 +41,11 @@ router.route("/").post(async (request: Request, response: Response) => { // Get all posts `/api/post/?categoryid=` router.route("/").get(async (request: Request, response: Response) => { const { categoryid } = request.query as { [key: string]: string }; - console.log(categoryid); try { let input = `SELECT p.id, p.title, p.description, p.timestamp, p.owner, category.name, p.imageUrl FROM post as p INNER JOIN category ON category.categoryid = p.categoryid`; if (categoryid) input += ` WHERE p.categoryid=${categoryid}`; - console.log(input); response.status(200).json(await query(input, "")); } catch (error) { response.status(400).send("Bad Request"); diff --git a/server/src/controllers/postController/tests/postController.test.ts b/server/src/controllers/postController/tests/postController.test.ts index 536b27c0d6db6ebb4f51b2f7ae6b6422befce6ea..265b2c09cd89060d7e2d757a0ab57490e4438682 100644 --- a/server/src/controllers/postController/tests/postController.test.ts +++ b/server/src/controllers/postController/tests/postController.test.ts @@ -1,28 +1,35 @@ -import request from 'supertest'; -import app from '../../../app'; +import request from "supertest"; +import app from "../../../app"; -describe('Test postController', () => { - beforeAll(async () => { // kjører før testing - console.log("Post controller test starting..."); - }); +describe("Test postController", () => { + beforeAll(async () => { + // kjører før testing + console.log("Post controller test starting..."); + }); - afterAll(async () => { // kjører når all testing er gått gjennom - console.log("...Test ending"); - }); + afterAll(async () => { + // kjører når all testing er gått gjennom + console.log("...Test ending"); + }); - it('Request /api/post should return request of 200!', async () => { - const result = await request(app) - .get('/api/post') - .send() + it("Request /api/post should return request of 200!", async () => { + const result = await request(app).get("/api/post").send(); - expect(result.status).toBe(200); - }); + expect(result.status).toBe(200); + }); - it('Request /api/post/1 should return data with name "test"!', async () => { - const result = await request(app).get('/api/post/1').send(); + it('Request /api/post/1 should return data with name "test"!', async () => { + const result = await request(app).get("/api/post/1").send(); - expect(result.status).toBe(200); - expect(result.body.data[0]?.title).toBe('test'); - }); + expect(result.status).toBe(200); + expect(result.body.data[0]?.title).toBe("test"); + }); + + it('Request /api/post/?categoryid=1 should return datas with categoryname = "Antikviteter og Kunst"', async () => { + const result = await request(app).get("/api/post/1").send(); + + expect(result.status).toBe(200); + expect(result.body.data[0]?.name).toBe("Antikviteter og Kunst"); + }); +}); -}); \ No newline at end of file