Added the language and type to the questions

Arquisoft · Apr 1, 2024 · 52f85dc · 52f85dc
1 parent d73218e
commit 52f85dc
Show file tree

Hide file tree

Showing 7 changed files with 623 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/questionGenerator/src/main/java/questionGenerator/generator/AbstractGenerator.java b/questionGenerator/src/main/java/questionGenerator/generator/AbstractGenerator.java
@@ -26,10 +26,12 @@ public abstract class AbstractGenerator {
 	public static Map<String, ItemDocumentImpl> alreadyProcessedEntities = new HashMap<>();
 
 	private String propertyId = "";
+	private QuestionType type;
 
 	private static final String MESSAGES_PATH = "messages";
 	public AbstractGenerator(String propertyId) {
 		this.propertyId = propertyId;
+		this.type = type;
 	}
 
 	/**
@@ -71,7 +73,7 @@ public Question generate(String id)  {
 		answers.add(0, rightAnswer);
 		//create and return the question
 
-		return new Question(question, answers);
+		return new Question(question, answers, language, type);
 	}
 
 	protected String getName(Map<String, MonolingualTextValue> names) {

diff --git a/...erator/src/main/java/questionGenerator/generator/specificGenerators/CapitalGenerator.java b/...erator/src/main/java/questionGenerator/generator/specificGenerators/CapitalGenerator.java
@@ -7,7 +7,7 @@ public class CapitalGenerator extends RightAnswerIsEntity {
 	private final static String PROPERTY = "P36";
 
 	public CapitalGenerator(){
-		super(PROPERTY);
+		super(PROPERTY, QuestionType.CAPITAL);
 	}
 
 	@Override

diff --git a/...rator/src/main/java/questionGenerator/generator/specificGenerators/LanguageGenerator.java b/...rator/src/main/java/questionGenerator/generator/specificGenerators/LanguageGenerator.java
@@ -7,7 +7,7 @@ public class LanguageGenerator extends RightAnswerIsEntity {
 	private final static String PROPERTY = "P37";
 
 	public LanguageGenerator(){
-		super(PROPERTY);
+		super(PROPERTY, QuestionType.LANGUAGE);
 	}
 
 	@Override

diff --git a/...tor/src/main/java/questionGenerator/generator/specificGenerators/PopulationGenerator.java b/...tor/src/main/java/questionGenerator/generator/specificGenerators/PopulationGenerator.java
@@ -15,7 +15,7 @@ public class PopulationGenerator extends AbstractGenerator {
 	private final static String PROPERTY = "P1082";
 
 	public PopulationGenerator(){
-		super(PROPERTY);
+		super(PROPERTY, QuestionType.POPULATION);
 	}
 
 	@Override

diff --git a/...Generator/src/main/java/questionGenerator/generator/specificGenerators/SizeGenerator.java b/...Generator/src/main/java/questionGenerator/generator/specificGenerators/SizeGenerator.java
@@ -15,7 +15,7 @@ public class SizeGenerator extends AbstractGenerator {
 	private final static String PROPERTY = "P2046";
 
 	public SizeGenerator(){
-		super(PROPERTY);
+		super(PROPERTY, QuestionType.SIZE);
 	}
 
 	@Override

diff --git a/questionGenerator/src/main/java/questionGenerator/question/Question.java b/questionGenerator/src/main/java/questionGenerator/question/Question.java
@@ -10,10 +10,14 @@ public class Question {
 	private String question;
     private List<String> answers;
     private int number = -1;
+    private String language;
+    private QuestionType type;
 
-    public Question(String question, List<String> answers){
+    public Question(String question, List<String> answers, String language, QuestionType type){
         this.question = question;
         this.answers = new ArrayList<>(answers);
+        this.language = language;
+        this.type = type;
     }
 
     public Question() {
@@ -50,6 +54,8 @@ public JSONObject getJSON() {
 		for(String s : answers)
 			json.accumulate("answers", s);
         if(number != -1) json.accumulate("number", number); //Para que los tests pasen
+        json.accumulate("language", language);
+        json.accumulate("type", type);
 		return json;
 	}