Revert "Database update"

Robert-0410 · May 28, 2021 · 636ff6a · 636ff6a
1 parent 9a610bf
commit 636ff6a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/out/production/360GroupProject/sql/QuestionManager.class b/out/production/360GroupProject/sql/QuestionManager.class
diff --git a/questions.db b/questions.db
diff --git a/src/controller/EnvironmentManager.java b/src/controller/EnvironmentManager.java
@@ -180,16 +180,14 @@ public void movePlayerUp() {
 
             userIsMoving = Direction.NORTH;
             questionPanel.enableButtons();
-            // change 'true' to pull from is adult ui setting
-            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion(true));
+            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion());
 
         } else if(nextCell.getMyID() == CellType.DOOR.getID()) {
 
             isWinningCell = CellType.PORTAL;
             userIsMoving = Direction.NORTH;
             questionPanel.enableButtons();
-            // change 'true' to pull from is adult ui setting
-            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion(true));
+            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion());
 
         } else if(nextCell.getMyID() == CellType.FLOOR.getID()) {
             List<GameObject> currentRow = myMap.get(myUserRow);
@@ -224,15 +222,13 @@ public void movePlayerRight() {
             isWinningCell = CellType.PORTAL;
             userIsMoving = Direction.EAST;
             questionPanel.enableButtons();
-            // change 'true' to pull from is adult ui setting
-            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion(true));
+            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion());
 
         } else if(nextCell.getMyID() == CellType.DOOR.getID()) {
 
             userIsMoving = Direction.EAST;
             questionPanel.enableButtons();
-            // change 'true' to pull from is adult ui setting
-            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion(true));
+            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion());
 
         } else if(nextCell.getMyID() == CellType.FLOOR.getID()) {
 
@@ -264,15 +260,13 @@ public void movePlayerDown() {
             isWinningCell = CellType.PORTAL;
             userIsMoving = Direction.SOUTH;
             questionPanel.enableButtons();
-            // change 'true' to pull from is adult ui setting
-            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion(true));
+            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion());
 
         } else if(nextCell.getMyID() == CellType.DOOR.getID()) {
 
             userIsMoving = Direction.SOUTH;
             questionPanel.enableButtons();
-            // change 'true' to pull from is adult ui setting
-            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion(true));
+            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion());
 
         } else if (nextCell.getMyID() == CellType.FLOOR.getID()) {
             List<GameObject> currentRow = myMap.get(myUserRow);
@@ -306,15 +300,13 @@ public void movePlayerLeft() {
             isWinningCell = CellType.PORTAL;
             userIsMoving = Direction.WEST;
             questionPanel.enableButtons();
-            // change 'true' to pull from is adult ui setting
-            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion(true));
+            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion());
 
         } else if(nextCell.getMyID() == CellType.DOOR.getID()) {
 
             userIsMoving = Direction.WEST;
             questionPanel.enableButtons();
-            // change 'true' to pull from is adult ui setting
-            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion(true));
+            questionPanel.setMyQuestion(QUESTION_MANAGER.getRandomMultipleChoiceQuestion());
 
         } else if(nextCell.getMyID() == CellType.FLOOR.getID()) {
             final List<GameObject> currentRow = myMap.get(myUserRow);

diff --git a/src/sql/QuestionManager.java b/src/sql/QuestionManager.java
@@ -6,22 +6,28 @@
 
 /**
  *
- * @author sasha amador
- * @version 1.1.03
+ * @author tom capaul
  *
- * The QuestionManager class connects our database, and is where our getMultipleChoice method is located.
+ * Simple class to demonstrate SQLite connectivity
+ * 1) create connection
+ * 2) add a table
+ * 3) add entries to the table
+ * 4) query the table for its contents
+ * 5) display the results
  *
+ * NOTE: any interactions with a database should utilize a try/catch
+ * since things can go wrong
+ *
+ * @see <a href="https://shanemcd.org/2020/01/24/how-to-set-up-sqlite-with-jdbc-in-eclipse-on-windows/">
+https://shanemcd.org/2020/01/24/how-to-set-up-sqlite-with-jdbc-in-eclipse-on-windows/</a>
  *
- * the getMultipleChoice method first does a parameter test to see if the user is playing in adult mode or
- * child mode. From there the maze will be populated with random questions from the database which reflects
- * the mode they are playing in
  */
 public class QuestionManager {
 
     Connection connection = null;
 
     public QuestionManager() {
-        //super();
+        super();
         databaseConnectionSetup();
     }
 
@@ -39,17 +45,15 @@ private void databaseConnectionSetup(){
         }
     }
 
-    public Question getRandomMultipleChoiceQuestion(boolean isAdult) {
+    public Question getRandomMultipleChoiceQuestion() {
         Question questionBank = new Question();
 
         try {
             Statement statement = connection.createStatement();
             statement.setQueryTimeout(30);  // set timeout to 30 sec.
 
-            String isAdultString = (isAdult) ? "1" : "0";
-
-            // need to update to actually return a random question instead of just the first one
-            ResultSet rs = statement.executeQuery(String.format("SELECT * FROM multiple_choice WHERE isAdult=%s ORDER BY RANDOM() LIMIT 1", isAdultString));
+            // need to update to actually return a random question istead of just the first one
+            ResultSet rs = statement.executeQuery("SELECT * FROM multiple_choice ORDER BY RANDOM() LIMIT 1");
             // read the result set
             String[] answers = new String[4];
             answers[0] = rs.getString("optionA");