tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

Merge remote-tracking branch 'origin/feat/question-routes' into feat/question-routes

Browse source
This commit is contained in:
Gabriellvl 2025-04-07 16:47:18 +02:00
commit 24105004fc
12 changed files with 104 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

47
backend/tests/controllers/answers.test.ts
View file

@ -1,10 +1,10 @@
import {Request, Response} from "express";
import {beforeAll, beforeEach, describe, expect, it, Mock, vi} from "vitest";
import {setupTestApp} from "../setup-tests";
import {Language} from "@dwengo-1/common/util/language";
import {getAllAnswersHandler, getAnswerHandler, updateAnswerHandler} from "../../src/controllers/answers";
import {BadRequestException} from "../../src/exceptions/bad-request-exception";
import {NotFoundException} from "../../src/exceptions/not-found-exception";
import { Request, Response } from 'express';
import { beforeAll, beforeEach, describe, expect, it, Mock, vi } from 'vitest';
import { setupTestApp } from '../setup-tests';
import { Language } from '@dwengo-1/common/util/language';
import { getAllAnswersHandler, getAnswerHandler, updateAnswerHandler } from '../../src/controllers/answers';
import { BadRequestException } from '../../src/exceptions/bad-request-exception';
import { NotFoundException } from '../../src/exceptions/not-found-exception';
describe('Questions controllers', () => {
let req: Partial<Request>;
@ -25,12 +25,12 @@ describe('Questions controllers', () => {
it('Get answers list', async () => {
req = {
params: {hruid: 'id05', version: '1', seq: '2'},
query: {lang: Language.English, full: 'true'},
params: { hruid: 'id05', version: '1', seq: '2' },
query: { lang: Language.English, full: 'true' },
};
await getAllAnswersHandler(req as Request, res as Response);
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answers: expect.anything()}));
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ answers: expect.anything() }));
const result = jsonMock.mock.lastCall?.[0];
// Console.log(result.answers);
@ -39,12 +39,12 @@ describe('Questions controllers', () => {
it('Get answer', async () => {
req = {
params: {hruid: 'id05', version: '1', seq: '2', seqAnswer: '2'},
query: {lang: Language.English, full: 'true'},
params: { hruid: 'id05', version: '1', seq: '2', seqAnswer: '2' },
query: { lang: Language.English, full: 'true' },
};
await getAnswerHandler(req as Request, res as Response);
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({answer: expect.anything()}));
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ answer: expect.anything() }));
// Const result = jsonMock.mock.lastCall?.[0];
// Console.log(result.answer);
@ -52,13 +52,12 @@ describe('Questions controllers', () => {
it('Get answer hruid does not exist', async () => {
req = {
params: { hruid: 'id_not_exist'},
params: { hruid: 'id_not_exist' },
query: { lang: Language.English, full: 'true' },
};
await expect( async () => getAnswerHandler(req as Request, res as Response))
.rejects.toThrow(NotFoundException);
})
await expect(async () => getAnswerHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException);
});
it('Get answer no hruid given', async () => {
req = {
@ -66,16 +65,15 @@ describe('Questions controllers', () => {
query: { lang: Language.English, full: 'true' },
};
await expect( async () => getAnswerHandler(req as Request, res as Response))
.rejects.toThrow(BadRequestException);
})
await expect(async () => getAnswerHandler(req as Request, res as Response)).rejects.toThrow(BadRequestException);
});
it('Update question', async() => {
const newContent = "updated question";
it('Update question', async () => {
const newContent = 'updated question';
req = {
params: { hruid: 'id05', version: '1', seq: '2', seqAnswer: '2'},
params: { hruid: 'id05', version: '1', seq: '2', seqAnswer: '2' },
query: { lang: Language.English },
body: { content: newContent }
body: { content: newContent },
};
await updateAnswerHandler(req as Request, res as Response);
@ -86,5 +84,4 @@ describe('Questions controllers', () => {
// Console.log(result.question);
expect(result.answer.content).to.eq(newContent);
});
});

46
backend/tests/controllers/questions.test.ts
View file

@ -1,14 +1,10 @@
import {beforeAll, beforeEach, describe, expect, it, Mock, vi} from "vitest";
import {Request, Response} from "express";
import {setupTestApp} from "../setup-tests";
import {
getAllQuestionsHandler,
getQuestionHandler, updateQuestionHandler
} from "../../src/controllers/questions";
import {Language} from "@dwengo-1/common/util/language";
import {NotFoundException} from "../../src/exceptions/not-found-exception";
import {BadRequestException} from "../../src/exceptions/bad-request-exception";
import { beforeAll, beforeEach, describe, expect, it, Mock, vi } from 'vitest';
import { Request, Response } from 'express';
import { setupTestApp } from '../setup-tests';
import { getAllQuestionsHandler, getQuestionHandler, updateQuestionHandler } from '../../src/controllers/questions';
import { Language } from '@dwengo-1/common/util/language';
import { NotFoundException } from '../../src/exceptions/not-found-exception';
import { BadRequestException } from '../../src/exceptions/bad-request-exception';
describe('Questions controllers', () => {
let req: Partial<Request>;
@ -43,7 +39,7 @@ describe('Questions controllers', () => {
it('Get question', async () => {
req = {
params: { hruid: 'id05', version: '1', seq: '1'},
params: { hruid: 'id05', version: '1', seq: '1' },
query: { lang: Language.English, full: 'true' },
};
@ -52,11 +48,11 @@ describe('Questions controllers', () => {
// Const result = jsonMock.mock.lastCall?.[0];
// Console.log(result.question);
})
});
it('Get question with fallback sequence number and version', async () => {
req = {
params: { hruid: 'id05'},
params: { hruid: 'id05' },
query: { lang: Language.English, full: 'true' },
};
@ -65,17 +61,16 @@ describe('Questions controllers', () => {
// Const result = jsonMock.mock.lastCall?.[0];
// Console.log(result.question);
})
});
it('Get question hruid does not exist', async () => {
req = {
params: { hruid: 'id_not_exist'},
params: { hruid: 'id_not_exist' },
query: { lang: Language.English, full: 'true' },
};
await expect( async () => getQuestionHandler(req as Request, res as Response))
.rejects.toThrow(NotFoundException);
})
await expect(async () => getQuestionHandler(req as Request, res as Response)).rejects.toThrow(NotFoundException);
});
it('Get question no hruid given', async () => {
req = {
@ -83,9 +78,8 @@ describe('Questions controllers', () => {
query: { lang: Language.English, full: 'true' },
};
await expect( async () => getQuestionHandler(req as Request, res as Response))
.rejects.toThrow(BadRequestException);
})
await expect(async () => getQuestionHandler(req as Request, res as Response)).rejects.toThrow(BadRequestException);
});
/*
It('Create and delete question', async() => {
@ -104,12 +98,12 @@ describe('Questions controllers', () => {
*/
it('Update question', async() => {
const newContent = "updated question";
it('Update question', async () => {
const newContent = 'updated question';
req = {
params: { hruid: 'id05', version: '1', seq: '1'},
params: { hruid: 'id05', version: '1', seq: '1' },
query: { lang: Language.English },
body: { content: newContent }
body: { content: newContent },
};
await updateQuestionHandler(req as Request, res as Response);