Revert changes to functionality, implement request header

FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuestionController.java

@@ -37,31 +37,22 @@ public class QuestionController {
    * @param questionDTO The question data to be saved.
    * @return The saved question DTO.
    */
-  @PostMapping("/newQuestion")
-  public QuestionDTO createNewQuestion(@RequestBody QuestionDTO questionDTO) {
-    if (questionDTO.getId() != null) {
-      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "ID should be null for new questions");
-    }
-    Question question = questionService.createQuestion(questionDTO);
-    return mapQuestionToQuestionDTO(question);
-  }
+  @PostMapping("/save")
+  public QuestionDTO saveQuestion(@RequestBody QuestionDTO questionDTO) {
+    Question question = questionService.createOrUpdateQuestion(questionDTO);
 
-  /**
-   * Endpoint for updating an existing question.
-   * @param questionDTO The question data to be updated
-   * @return The updated question DTO.
-   */
-  @PutMapping("/questions/{id}")
-  public QuestionDTO updateExistingQuestion(@PathVariable Integer id, @RequestBody QuestionDTO questionDTO) {
-    if (questionDTO.getId() == null || !questionDTO.getId().equals(id)) {
-      throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Question ID mismatch");
-    }
-    Question question = questionService.updateQuestion(questionDTO);
-    return mapQuestionToQuestionDTO(question);
+    // TODO: make a mapper class to do this
+    return new QuestionDTO(
+            question.getId(),
+            question.getQuestionText(),
+            question.getType(),
+            question.getAnswer(),
+            question.getOptionsList(),
+            question.getScore(),
+            question.getQuiz().getId()
+    );
   }
 
-
-
   /**
    * Endpoint for retrieving a question by ID.
    *
@@ -72,6 +63,7 @@ public class QuestionController {
   public QuestionDTO getQuestion(@PathVariable Integer questionId) {
     Question question = questionService.findQuestionById(questionId);
     return new QuestionDTO(
+            question.getId(),
             question.getQuestionText(),
             question.getType(),
             question.getAnswer(),
@@ -81,6 +73,7 @@ public class QuestionController {
     );
   }
 
+
   /**
    * Endpoint for deleting a question by ID.
    *
@@ -102,6 +95,7 @@ public class QuestionController {
     List<Question> questions = questionService.findAllQuestionsToAQuiz(quizId);
     return questions.stream()
             .map(question -> new QuestionDTO(
+                    question.getId(),
                     question.getQuestionText(),
                     question.getType(),
                     question.getAnswer(),
@@ -111,16 +105,4 @@ public class QuestionController {
             ))
             .collect(Collectors.toList());
   }
-
-  private QuestionDTO mapQuestionToQuestionDTO(Question question) {
-    return new QuestionDTO(
-            question.getQuestionText(),
-            question.getType(),
-            question.getAnswer(),
-            question.getOptionsList(),
-            question.getScore(),
-            question.getQuiz().getId()
-    );
-  }
-
 }

FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/QuestionDTO.java

@@ -29,6 +29,7 @@ public class QuestionDTO {
   /**
    * Constructor for QuestionDTO.
    *
+   * @param id           The ID of the question.
    * @param questionText The text of the question.
    * @param type         The type of the question.
    * @param answer       The correct answer to the question.
@@ -36,7 +37,8 @@ public class QuestionDTO {
    * @param score        The score assigned to the question.
    * @param quizId       The ID of the quiz the question belongs to.
    */
-  public QuestionDTO(String questionText, QuestionType type, String answer, List<String> options, int score, Integer quizId) {
+  public QuestionDTO(Integer id, String questionText, QuestionType type, String answer, List<String> options, int score, Integer quizId) {
+    this.id = id;
     this.questionText = questionText;
     this.type = type;
     this.answer = answer;
@@ -45,6 +47,7 @@ public class QuestionDTO {
     this.quizId = quizId;
   }
 
+
   /**
    * Get the ID of the question.
    *

FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/QuestionService.java

@@ -35,51 +35,43 @@ public class QuestionService {
     }
 
     /**
-     * Creates a question.
+     * Creates or updates a question.
      *
      * @param questionDTO The DTO containing the question details.
-     * @return The created question.
+     * @return The created or updated question.
      */
-    public Question createQuestion(QuestionDTO questionDTO) {
-        Question question = new Question();
-        question.setQuestionText(questionDTO.getQuestionText());
-        question.setType(questionDTO.getType());
-        if (questionDTO.getType() == QuestionType.TRUE_OR_FALSE) {
-            question.setOptions("TRUE*FALSE");
-        } else if (questionDTO.getOptions() != null) {
-            question.setOptions(questionDTO.getOptionsAsString());
+    @Transactional
+    public Question createOrUpdateQuestion(QuestionDTO questionDTO) {
+
+        Question question;
+        if (questionDTO.getId() != null) {
+            Optional<Question> optionalQuestion = questionRepository.findById(questionDTO.getId());
+            if (!optionalQuestion.isPresent()) {
+                return null;
             }
-        question.setAnswer(questionDTO.getAnswer());
-        question.setScore(questionDTO.getScore());
-        question.setQuiz(quizRepository.findById(questionDTO.getQuizId())
-                .orElseThrow(() -> new EntityNotFoundException("Quiz not found for ID: " + questionDTO.getQuizId())));
-
-        return questionRepository.save(question);
+            question = optionalQuestion.get();
+        } else {
+            question = new Question();
         }
 
-
-    /**
-     * Updates a question
-     *
-     * @param questionDTO The DTO containing the question details.
-     * @return The updated question.
-     */
-    public Question updateQuestion(QuestionDTO questionDTO) {
-        Question question = questionRepository.findById(questionDTO.getId())
-                .orElseThrow(() -> new EntityNotFoundException("Question not found for ID: " + questionDTO.getId()));
-
         question.setQuestionText(questionDTO.getQuestionText());
         question.setType(questionDTO.getType());
-        if (questionDTO.getOptions() != null) {
+
+        if (questionDTO.getType().equals(QuestionType.MULTIPLE_CHOICE)) {
             question.setOptions(questionDTO.getOptionsAsString());
+        } else if (questionDTO.getType().equals(QuestionType.TRUE_OR_FALSE)) {
+            question.setOptions("TRUE*FALSE");
+        } else {
+            question.setOptions(null);
         }
         question.setAnswer(questionDTO.getAnswer());
         question.setScore(questionDTO.getScore());
+        question.setQuiz(quizRepository.findById(questionDTO.getQuizId()).orElse(null));
+
 
         return questionRepository.save(question);
     }
 
-
     /**
      * Deletes a question by its ID.
      *

FullstackProsjekt/src/backend/test/java/edu/ntnu/idatt2105/service/QuestionServiceTest.java

-/*
 package edu.ntnu.idatt2105.service;
 
 import edu.ntnu.idatt2105.dto.QuestionDTO;
 import edu.ntnu.idatt2105.model.Question;
 import edu.ntnu.idatt2105.model.QuestionType;
-import edu.ntnu.idatt2105.model.Quiz;
 import edu.ntnu.idatt2105.repository.QuestionRepository;
 import edu.ntnu.idatt2105.repository.QuizRepository;
 import org.junit.jupiter.api.BeforeEach;
@@ -29,20 +27,15 @@ class QuestionServiceTest {
 
     private QuizRepository quizRepository;
 
-    private Quiz quiz;
-
     @BeforeEach
     void setUp() {
         questionRepository = mock(QuestionRepository.class);
         quizRepository = mock(QuizRepository.class);
         questionService = new QuestionService(questionRepository, quizRepository);
-        quiz = new Quiz();
-        quiz.setId(1);
-
     }
 
     @Test
-    void testCreateQuestion_NewMultipleChoice() {
+    void testCreateOrUpdateQuestion_NewMultipleChoice() {
         QuestionDTO questionDTO = new QuestionDTO();
         questionDTO.setType(QuestionType.MULTIPLE_CHOICE);
         questionDTO.setQuestionText("What is the largest planet?");
@@ -53,12 +46,11 @@ class QuestionServiceTest {
 
         when(questionRepository.save(any(Question.class))).thenAnswer(invocation -> invocation.getArgument(0));
 
-        Question result = questionService.createQuestion(questionDTO);
+        Question result = questionService.createOrUpdateQuestion(questionDTO);
 
         verify(questionRepository).save(any(Question.class));
 
         assertNotNull(result);
-        assertEquals(1,result.getId());
         assertEquals("Jupiter", result.getAnswer());
         assertEquals(2, result.getScore());
         assertEquals("What is the largest planet?", result.getQuestionText());
@@ -66,6 +58,7 @@ class QuestionServiceTest {
         assertEquals("Earth*Mars*Jupiter*Venus", result.getOptions());
     }
 
+
     @Test
     void testCreateOrUpdateQuestion_TrueOrFalse() {
         QuestionDTO questionDTO = new QuestionDTO();
@@ -77,7 +70,7 @@ class QuestionServiceTest {
 
         when(questionRepository.save(any(Question.class))).thenAnswer(invocation -> invocation.getArgument(0));
 
-        Question result = questionService.createQuestion(questionDTO);
+        Question result = questionService.createOrUpdateQuestion(questionDTO);
 
         verify(questionRepository).save(any(Question.class));
 
@@ -101,7 +94,7 @@ class QuestionServiceTest {
 
         when(questionRepository.save(any(Question.class))).thenAnswer(invocation -> invocation.getArgument(0));
 
-        Question result = questionService.createQuestion(questionDTO);
+        Question result = questionService.createOrUpdateQuestion(questionDTO);
 
         verify(questionRepository).save(any(Question.class));
 
@@ -124,7 +117,7 @@ class QuestionServiceTest {
 
         when(questionRepository.save(any(Question.class))).thenAnswer(invocation -> invocation.getArgument(0));
 
-        Question result = questionService.createQuestion(questionDTO);
+        Question result = questionService.createOrUpdateQuestion(questionDTO);
 
         verify(questionRepository).save(any(Question.class));
 
@@ -142,7 +135,7 @@ class QuestionServiceTest {
 
         when(questionRepository.save(any(Question.class))).thenAnswer(invocation -> invocation.getArgument(0));
 
-        Question updatedResult = questionService.updateQuestion(questionDTO);
+        Question updatedResult = questionService.createOrUpdateQuestion(questionDTO);
 
 
         assertEquals("Mercury", updatedResult.getAnswer());
@@ -185,5 +178,3 @@ class QuestionServiceTest {
 
 }
 
-
- */
\ No newline at end of file

FullstackProsjekt/src/frontend/src/api.js

 import axios from 'axios';
+import {getToken} from "@/tokenController.js";
 
 export const apiClient = axios.create({
     baseURL: 'http://localhost:8080/api',
     //TODO: set api URL
 });
+
+apiClient.interceptors.request.use(
+    (config) => {
+        const token = getToken();
+        if(token) {
+            config.headers['Authorization'] = `Bearer ${token}`;
+        }
+        return config;
+    },
+    (error) => {
+    return Promise.reject(error);
+});
\ No newline at end of file

FullstackProsjekt/src/frontend/src/assets/axios.js

 import axios from "axios";
 
 axios.defaults.baseURL= 'http://localhost:5173/';
+
+//axios.defaults.headers.common['Authorization'] = 'Bearer' + getToken();
+
+

FullstackProsjekt/src/frontend/src/components/shared/EditQuestionModel.vue

@@ -126,7 +126,7 @@ export default {
     },
     async handleSubmit() {
       try {
-        await apiClient.post('/questions/newQuestion', {
+        await apiClient.post('/questions/save', {
           //TODO: add questionID
           questionText: this.questionText,
           type: this.type,
@@ -147,9 +147,11 @@ export default {
     selectOption(option) {
       this.correctAnswer = option;
       console.log(this.correctAnswer);
+    },
   }
 }
-};
+
+
 
 </script>
 <template>

FullstackProsjekt/src/frontend/src/components/shared/NewQuestionModel.vue

@@ -24,7 +24,7 @@ export default {
       try {
         //this.findCorrectAnswer();
         //console.log(this.correctAnswer);
-        await apiClient.post('/questions/newQuestion', {
+        await apiClient.post('/questions/save', {
           questionText: this.questionText,
           type: this.type,
           answer: this.correctAnswer.text,

FullstackProsjekt/src/frontend/src/components/shared/QuestionCard.vue

@@ -17,7 +17,7 @@ export default {
     }
   },
   beforeMount() {
-    this.quizId = this.$route.params.quizId;
+    this.quizId = Number(this.$route.params.quizId);
   },
   data() {
     return {

FullstackProsjekt/src/frontend/src/components/shared/create-quiz/EditQuizView.vue

@@ -76,14 +76,18 @@ export default {
     },
     hideNewQuestion() {
       this.showNewQuestion = false;
-      //TODO: questions answers, +question count
     },
     deleteQuiz() {
-      //API req, quizId
+      try {
+        apiClient.post('/quiz/delete/' + this.questionId, )
+      } catch (error) {
+        this.errorMsg = 'Error deleting quiz';
+      }
     }
   },
 };
 
+
 /**
 function createQuestion() {
 	showNewQuestionModal.value = true;
@@ -183,7 +187,7 @@ async function submitQuestion() {
 
 			<div class="footer">
 				<button @click="newQuestion" class="add-Btn"> Add Question </button>
-        <button class="delete-btn"> DELETE QUIZ </button>
+        <button class="delete-btn" @click="deleteQuiz"> DELETE QUIZ </button>
 				<button class="save-Btn"> SAVE QUIZ </button>
 			</div>
 		</div>

FullstackProsjekt/src/frontend/src/views/OverviewQuizView.vue

@@ -4,7 +4,7 @@
     <div class="headerDiv">
 	    <router-link to="/dashboard" ><Svg name="go-back-icon" class="go-back-icon"/></router-link>
 	    <h1>Your quizzes</h1>
-	    <router-link to="/create-quiz" class="add-Btn">Create new quiz</router-link>
+	    <router-link to="/createQuiz" class="add-Btn">Create new quiz</router-link>
     </div>
 		<p>Play, edit or delete a quiz saved from your profile</p>