fix: question generator bugs

api/src/main/java/lab/en2b/quizapi/commons/utils/InsertDataUtils.java

@@ -16,7 +16,7 @@
 import java.util.List;
 
 @RequiredArgsConstructor
-@Service
+//@Service
 public class InsertDataUtils {
 
     private final QuestionRepository questionRepository;

api/src/main/java/lab/en2b/quizapi/questions/question/Question.java

@@ -35,7 +35,9 @@ public class Question {
     @NotNull
     @JoinColumn(name = "correct_answer_id")
     private Answer correctAnswer;
+    @Column(name = "question_category")
     private QuestionCategory questionCategory;
+    @Column(name = "answer_category")
     private AnswerCategory answerCategory;
     private String language;
     private QuestionType type;

questiongenerator/src/main/java/model/Question.java

@@ -3,6 +3,7 @@
 import repositories.Storable;
 
 import javax.persistence.*;
+import java.util.ArrayList;
 import java.util.List;
 
 @Entity
@@ -23,7 +24,9 @@ public class Question implements Storable {
     @ManyToOne
     @JoinColumn(name = "correct_answer_id")
     private Answer correctAnswer;
+    @Column(name = "question_category")
     private QuestionCategory questionCategory;
+    @Column(name = "answer_category")
     private AnswerCategory answerCategory;
     private String language;
     private QuestionType type;
@@ -38,5 +41,11 @@ public Question(String content, Answer correctAnswer, QuestionCategory questionC
         this.answerCategory = answerCategory;
         this.language = language;
         this.type = type;
+        this.answers = new ArrayList<>();
+        this.answers.add(correctAnswer);
+    }
+
+    public List<Answer> getAnswers() {
+        return answers;
     }
 }

questiongenerator/src/main/java/repositories/GeneralRepositoryStorer.java

@@ -4,6 +4,7 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
+import java.util.List;
 
 /**
  * Class for storing entries in the Question and Answer DB.
@@ -21,6 +22,21 @@ public void save(Storable s){
         entityManager.getTransaction().commit();
         entityManager.close();
 
+        Jpa.close();
+    }
+    public void saveAll(List<Storable> storableList) {
+        EntityManagerFactory emf = Jpa.getEntityManagerFactory();
+
+        EntityManager entityManager = emf.createEntityManager();
+
+        for (Storable s : storableList) {
+            entityManager.getTransaction().begin();
+            entityManager.persist(s);
+            entityManager.getTransaction().commit();
+        }
+
+        entityManager.close();
+
         Jpa.close();
     }
 }

questiongenerator/src/main/java/templates/CountryCapitalQuestion.java

@@ -6,6 +6,10 @@
 import model.AnswerCategory;
 import model.Question;
 import org.json.JSONObject;
+import repositories.Storable;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Implementation for a question where the capital of a country is asked and all the capitals are returned.
@@ -38,6 +42,8 @@ protected void setQuery() {
      */
     @Override
     protected void processResults() {
+        List<Question> questions = new ArrayList<>();
+        List<Answer> answers = new ArrayList<>();
         for (int i = 0; i < results.length(); i++) {
             JSONObject result = results.getJSONObject(i);
             String countryLabel = result.getJSONObject("countryLabel").getString("value");
@@ -49,16 +55,24 @@ protected void processResults() {
 
             //Saving the answer
             Answer a = new Answer(capitalLabel, AnswerCategory.CITY);
-            repository.save(a);
+            answers.add(a);
 
             //Saving the question
             String content;
             if (langCode.equals("en"))
                 content = "What is the capital of " + countryLabel + "?";
             else
                 content = "¿Cuál es la capital de " + countryLabel + "?";
+            questions.add(new Question(content, a, QuestionCategory.GEOGRAPHY, AnswerCategory.CITY, langCode, QuestionType.TEXT));
+        }
+        addRandomAnswers(answers, questions);
+        repository.saveAll(new ArrayList<>(answers));
+        repository.saveAll(new ArrayList<>(questions));
+    }
 
-            repository.save(new Question(content, a, QuestionCategory.GEOGRAPHY, AnswerCategory.CITY, langCode, QuestionType.TEXT));
+    private void addRandomAnswers(List<Answer> answers, List<Question> questions) {
+        for(Question q : questions) {
+            q.getAnswers().add(answers.get((int) (Math.random() * (answers.size()-1))));
         }
     }