add id field in question create

API/src/database/Database.ts

@@ -63,7 +63,7 @@ export class Database{
 
     }
 
-    static async createQuestion(question: string, possibleResponse: string[], correctResponse: string, category: string): Promise<number> {
+    static async createQuestion(question: string, possibleResponse: string[], correctResponse: number, category: string): Promise<number> {
         let result: number=-1;
         await Question.create({
             question: question,
@@ -72,7 +72,7 @@ export class Database{
             category: category
         }).then(question => {
             console.log(`Question "${question.id}" ajouté avec succès !`);
-            result= 0;
+            result= question.id;
         }).catch(err => {
             console.log(`Une erreur s'est produite lors de l'ajout de la question: ${err}`)
             result= -1;
@@ -126,7 +126,7 @@ export class Database{
 
     }
 
-    static async updateQuestion(id: number, question?: string, possibleResponse?: string[], correctResponse?: string, category? : string){
+    static async updateQuestion(id: number, question?: string, possibleResponse?: string[], correctResponse?: number, category? : string){
         let updatedData: Question=new Question();
         updatedData.id=id;
         if(question !== undefined) updatedData.question = question;

API/src/database/migrations/Question_init.ts

@@ -18,7 +18,7 @@ export function initQuestion(sequelize: Sequelize){
             allowNull: false
         },
         correctResponse: {
-            type: DataTypes.STRING,
+            type: DataTypes.INTEGER,
             allowNull: false
         },
         category: {

API/src/database/models/Question.ts

@@ -4,7 +4,7 @@ export class Question extends Model {
     public id!: number;
     public question!: string;
     public possibleResponse!: string;
-    public correctResponse!: string;
+    public correctResponse!: number;
     public category!: string;
 
     public readonly createdAt!: Date;

API/src/routes/router-admin.ts

@@ -38,7 +38,9 @@ router.get('/:admin/list-questions',  checkExistingUser, async (req: express.Req
         const questions = await Database.getAllQuestions();
         questions.forEach(q => {
             q.possibleResponse = JSON.parse(q.possibleResponse);
+            q.correctResponse=parseInt(String(q.correctResponse));
         });
+
         res.status(StatusCodes.OK).json({ questions: questions });
 
     } catch (error) {
@@ -51,14 +53,15 @@ router.post('/:admin/create-user-account', checkExistingUser, checkUserFields,
 });
 
 router.post('/:admin/create-question', checkExistingUser, checkQuestionFields,async (req: express.Request, res: express.Response) => {
-    const data = req.body
+    const data = req.body;
     const correctResponse: string = data.possibleResponse[data.correctResponse];
     if (correctResponse !== undefined) {
         try{
-            const result=await Database.createQuestion(data.question, data.possibleResponse, correctResponse, data.category);
-            if (result === 0) {
+            const result=await Database.createQuestion(data.question, data.possibleResponse, data.correctResponse, data.category);
+            if (result !== -1) {
                 res.status(StatusCodes.OK).json({
                     new_question: {
+                        id: result,
                         question: data.question,
                         possibleResponse: data.possibleResponse,
                         correctResponse: correctResponse,
@@ -113,8 +116,7 @@ router.put('/:admin/update-question', checkExistingUser,checkIdField,async (req:
         const question = await Question.findOne({where: {id}});
         if(question){
             try{
-                const correctResponse=data.possibleResponse!==undefined?data.possibleResponse[data.correctResponse]:JSON.parse(question.possibleResponse)[data.correctResponse];
-                const nbQuestionUpdated=await Database.updateQuestion(data.id, data.question, data.possibleResponse, correctResponse, data.category);
+                const nbQuestionUpdated=await Database.updateQuestion(data.id, data.question, data.possibleResponse, data.correctResponse, data.category);
                 if(nbQuestionUpdated){
                     res.status(StatusCodes.OK).json({
                         message: `Question ${data.id} updated`