fix question generation query

Arquisoft · Apr 8, 2024 · 6acdf5e · 6acdf5e
1 parent cb2cdde
commit 6acdf5e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/game/qgservice/generatorLogic/queries.js b/game/qgservice/generatorLogic/queries.js
@@ -47,12 +47,14 @@ const chemicalElementQuery = `SELECT ?element ?elementLabel ?symbol WHERE {
 }
 `
 
-const monumentQuery = `SELECT ?monument ?monumentLabel ?country ?countryLabel WHERE {
-  ?monument wdt:P31 wd:Q4989906;       # Instance of historical monument
-         wdt:P17 ?country.             # Country of the monument
+const monumentQuery = `SELECT ?monument ?monumentLabel ?country ?countryLabel ?followers WHERE {
+  ?monument wdt:P31 wd:Q570116;       # Instance of historical monument
+            wdt:P8687 ?followers;     # Social media followers count
+            wdt:P17 ?country.         # Country of the monument
   SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
 }
-LIMIT 1000
+ORDER BY DESC(?followers)
+LIMIT 100
 `
 
 

diff --git a/game/qgservice/generatorLogic/questiongenerator.js b/game/qgservice/generatorLogic/questiongenerator.js
@@ -95,7 +95,7 @@ function generateQuestionCapital(countryCapitalMap) {
     // Create the question object
     const question = {
       uuid: uuid.v4(),
-      question: `What is the symbol of ${chemical}?`,
+      question: `What is the chemical symbol of ${chemical}?`,
       correctAnswer: symbol,
       incorrectAnswer1: incorrectAnswers[0],
       incorrectAnswer2: incorrectAnswers[1],
@@ -125,7 +125,7 @@ function generateQuestionMonument(monumentMap) {
   while (incorrectAnswers.length < 3) {
     const randomMonument = monumentArray[Math.floor(Math.random() * monumentArray.length)];
     const [randomMonumentLabel, randomCountry] = randomMonument;
-    if (randomMonumentLabel !== monumentLabel && !incorrectAnswers.includes(randomCountry)) {
+    if (randomMonumentLabel !== monumentLabel && !incorrectAnswers.includes(randomCountry) && randomCountry!= countryLabel) {
       incorrectAnswers.push(randomCountry);
     }
   }

diff --git a/webapp/src/components/game/singleplayer/PlayingGameSinglePlayer.tsx b/webapp/src/components/game/singleplayer/PlayingGameSinglePlayer.tsx
@@ -88,8 +88,13 @@ const PlayingGame: FC<PlayingGameProps> = ({questions, setCurrentStage, setPlaye
     }
 
     const getAnswers = () => {
-      console.log(answersShuffled[currentQuestion])
-      return answersShuffled[currentQuestion];
+      const answers = answersShuffled[currentQuestion];
+      if (answers.length > 4) {
+        console.log(answers)
+        const removeCount = answers.length - 4;
+        answers.splice(0, removeCount);
+      }
+      return answers;
     };
 
     return (