From 5e7d4b4295b364db0efb5db33a2e27457b574180 Mon Sep 17 00:00:00 2001 From: Dario Date: Fri, 26 Apr 2024 16:39:45 +0200 Subject: [PATCH] feat: readded music QuestionCategory --- .../en2b/quizapi/commons/utils/GameModeUtils.java | 12 ++++++------ .../quizapi/questions/question/QuestionCategory.java | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/api/src/main/java/lab/en2b/quizapi/commons/utils/GameModeUtils.java b/api/src/main/java/lab/en2b/quizapi/commons/utils/GameModeUtils.java index 80c294bc..91ae1e54 100644 --- a/api/src/main/java/lab/en2b/quizapi/commons/utils/GameModeUtils.java +++ b/api/src/main/java/lab/en2b/quizapi/commons/utils/GameModeUtils.java @@ -15,11 +15,11 @@ public static List getQuestionCategoriesForGamemode(GameMode g gamemode = KIWI_QUEST; } return switch (gamemode) { - case KIWI_QUEST -> List.of(QuestionCategory.ART,/* QuestionCategory.MUSIC, */ QuestionCategory.GEOGRAPHY); + case KIWI_QUEST -> List.of(QuestionCategory.ART,QuestionCategory.MUSIC,QuestionCategory.GEOGRAPHY); case FOOTBALL_SHOWDOWN -> List.of(QuestionCategory.SPORTS); case GEO_GENIUS -> List.of(QuestionCategory.GEOGRAPHY); case VIDEOGAME_ADVENTURE -> List.of(QuestionCategory.VIDEOGAMES); - case ANCIENT_ODYSSEY -> List.of(/*QuestionCategory.MUSIC,*/QuestionCategory.ART); + case ANCIENT_ODYSSEY -> List.of(QuestionCategory.MUSIC,QuestionCategory.ART); case RANDOM -> List.of(QuestionCategory.values()); case CUSTOM -> questionCategoriesForCustom; }; @@ -70,12 +70,12 @@ private static List getQuestionCategoriesEn(){ .description("Are you an art expert? Prove it!") .internalRepresentation(QuestionCategory.ART) .build(), - /* + QuestionCategoryDto.builder() .name("Music") .description("Are you a music lover? Prove it!") .internalRepresentation(QuestionCategory.MUSIC) - .build(),*/ + .build(), QuestionCategoryDto.builder() .name("Geography") .description("Are you a geography expert? Prove it!") @@ -101,12 +101,12 @@ private static List getQuestionCategoriesEs(){ .description("¿Eres un experto en arte? ¡Demuéstralo!") .internalRepresentation(QuestionCategory.ART) .build(), - /* + QuestionCategoryDto.builder() .name("Música") .description("¿Eres un melómano? ¡Demuéstralo!") .internalRepresentation(QuestionCategory.MUSIC) - .build(),*/ + .build(), QuestionCategoryDto.builder() .name("Geografía") .description("¿Eres un experto en geografía? ¡Demuéstralo!") diff --git a/api/src/main/java/lab/en2b/quizapi/questions/question/QuestionCategory.java b/api/src/main/java/lab/en2b/quizapi/questions/question/QuestionCategory.java index a6f0e741..d97db494 100644 --- a/api/src/main/java/lab/en2b/quizapi/questions/question/QuestionCategory.java +++ b/api/src/main/java/lab/en2b/quizapi/questions/question/QuestionCategory.java @@ -2,6 +2,5 @@ public enum QuestionCategory { //HISTORY, GEOGRAPHY, SCIENCE, MATH, LITERATURE, ART, SPORTS, MUSIC, MOVIES, TV, POLITICS, OTHER - GEOGRAPHY, SPORTS, //MUSIC, - ART, VIDEOGAMES + GEOGRAPHY, SPORTS, MUSIC, ART, VIDEOGAMES }