Feat: Properly render image questions

Arquisoft · Apr 21, 2024 · 3208c21 · 3208c21
1 parent 45517e1
commit 3208c21
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/api/src/main/java/lab/en2b/quizapi/questions/question/mappers/QuestionResponseDtoMapper.java b/api/src/main/java/lab/en2b/quizapi/questions/question/mappers/QuestionResponseDtoMapper.java
@@ -16,13 +16,13 @@ public QuestionResponseDto apply(Question question) {
         if(question.getType().equals(QuestionType.IMAGE))
             return QuestionResponseDto.builder()
                     .id(question.getId())
-                    .content(question.getContent().split("#\\* &%")[0])
+                    .content(question.getContent().split("%& #")[0])
                     .type(question.getType())
                     .answerCategory(question.getAnswerCategory())
                     .answers(question.getAnswers().stream().map(new AnswerResponseDtoMapper()).toList())
                     .language(question.getLanguage())
                     .questionCategory(question.getQuestionCategory())
-                    .image(question.getContent().split("#\\* &%")[1])
+                    .image(question.getContent().split("%& #")[1])
                     .build();
 
         return QuestionResponseDto.builder()

diff --git a/questiongenerator/src/main/java/templates/VideogamesCountryQuestion.java b/questiongenerator/src/main/java/templates/VideogamesCountryQuestion.java
@@ -29,7 +29,7 @@ public void setQuery() {
                 "  OPTIONAL {\n" +
                 "    ?game wdt:P495 ?countryItem. " +
                 "    ?countryItem rdfs:label ?countryLabel. " +
-                "    FILTER(LANG(?countryLabel) IN (\"en\", \"es\")) " +
+                "    FILTER(LANG(?countryLabel) IN (\"" + langCode + "\")) " +
                 "  } " +
                 "  SERVICE wikibase:label { bd:serviceParam wikibase:language \"" + langCode + "\". } " +
                 "} " +

diff --git a/questiongenerator/src/main/java/templates/WhosThatPokemonQuestion.java b/questiongenerator/src/main/java/templates/WhosThatPokemonQuestion.java
@@ -53,11 +53,11 @@ public void processResults() {
 
             if (langCode.equals("es")){
                 spanishString = spanishStrings[i%4] + QGHelper.LINKCONCAT + "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/" + pokedexNum + ".png";
-                questions.add(new Question(a, spanishString, QuestionCategory.VIDEOGAMES, QuestionType.TEXT));
+                questions.add(new Question(a, spanishString, QuestionCategory.VIDEOGAMES, QuestionType.IMAGE));
             }
             else{
                 englishString = englishStrings[i%4] + QGHelper.LINKCONCAT + "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/" + pokedexNum + ".png";
-                questions.add(new Question(a, englishString, QuestionCategory.VIDEOGAMES, QuestionType.TEXT));
+                questions.add(new Question(a, englishString, QuestionCategory.VIDEOGAMES, QuestionType.IMAGE));
             }
         }