From ac88b36766cbe158f90dac34cdeb33ef0773a027 Mon Sep 17 00:00:00 2001
From: "alec.schmidt" <alec.schmidt@etu.hesge.ch>
Date: Fri, 2 Jun 2023 20:02:56 +0200
Subject: [PATCH] fixed GET questions
---
API/db/app.db | Bin 32768 -> 32768 bytes
API/src/database/Database.ts | 18 ++++++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/API/db/app.db b/API/db/app.db
index 6dc4be37842cf08e9cb52092e424c45275a8d8d7..594906caf3268accd4b81baac28e62079b28baf2 100644
GIT binary patch
delta 288
zcmZo@U}|V!njp<6J5k1&RhB_7?bXJVx$?aH&l#Bc&oJ<R<v+uJd$XXzK7I#YCT4lY
z!qU{@lFa<PVkRzTW=Y1xyyEiIB4!2#20l)>6elCIIAdvXYEdySF9QPu6aQfb{(Jm~
zHw!9k=l7IkVqs91HA>A*Re)*m$Sf|&&n!w+U}Rx1l?^P-R7g}PDLuSW!7s5OKj-ku
z{5+TnF0gUe82GR8zt}9OaEf0`kXfA(#V{suW>ZdVW^4*zQQ%_czt6z`jsG?O{mp_3
o7x@*rm{}RbIXOcz6VvlKnOGS_IXQevlM^`@Ss8>mIeqgp0nnFIm;e9(
delta 97
zcmZo@U}|V!njp<6Hc`fzRg6I|?d8Ulx$>M03=E9?Um5tnZWau<!as3>xF9DZvp8dE
dacWU9FE0ZF1A_omMvaXNg}W($MS%$+3jq7-8U+9V
diff --git a/API/src/database/Database.ts b/API/src/database/Database.ts
index 4766c5b..79485dd 100644
--- a/API/src/database/Database.ts
+++ b/API/src/database/Database.ts
@@ -113,7 +113,7 @@ class DBHandler {
await asyncdb.all(insert_question);
- const id_json = await asyncdb.get(get_id)
+ const id_json = await asyncdb.get(get_id);
const id_obj = id_json as Question_t;
const insert_correct = "INSERT INTO answer (text_answer, id_question, correct) \
@@ -132,9 +132,19 @@ class DBHandler {
}
async getQuestions(req:express.Request, res:express.Response) {
- asyncdb.all("SELECT * FROM questions")
- .then( result => res.status(StatusCodes.OK).json(result).end())
- .catch(e => console.log(e))
+ const query = "SELECT * FROM questions";
+ const query_answers = "SELECT * FROM answer";
+
+
+ let questions = await asyncdb.all(query);
+ let ans = await asyncdb.all(query_answers);
+
+ let payload = {
+ QUESTIONS: questions,
+ ANSWERS: ans
+ }
+
+ res.status(StatusCodes.OK).json(payload)
}
async updateQuestion(req:express.Request, res:express.Response){
--
GitLab