From 636ff6a1d9f3dc6f2f0aaaff0995ac687b0bfc8d Mon Sep 17 00:00:00 2001
From: Robert-0410 <62630290+Robert-0410@users.noreply.github.com>
Date: Fri, 28 May 2021 14:53:52 -0700
Subject: [PATCH] Revert "Database update"

---
 .../360GroupProject/sql/QuestionManager.class | Bin 2266 -> 0 bytes
 questions.db                                  | Bin 24576 -> 24576 bytes
 src/controller/EnvironmentManager.java        |  24 +++++----------
 src/sql/QuestionManager.java                  |  28 ++++++++++--------
 4 files changed, 24 insertions(+), 28 deletions(-)
 delete mode 100644 out/production/360GroupProject/sql/QuestionManager.class

diff --git a/out/production/360GroupProject/sql/QuestionManager.class b/out/production/360GroupProject/sql/QuestionManager.class
deleted file mode 100644
index 4c723f7d5f94c8677167c5f63c26a840db049e74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2266
zcmZ`)TYD2#6kU^~nMpdO5PAzJ1Q19<FI16BO0{j8N;GL9sl|eblVm7Ul1Vx<f!4bZ
z`rse%QyzTs<5m2$Q2p=+_@BJ2Gnu5RUw!Cl_C9B?z4zMdocZ(b-~IrQ!k1zA;Fl3l
z(Sx9bgX`KuZKA4~YZFVQb-nCJ2wpWz!+Ar3Kb}|#K|x4HSVb>X35V^C>cowvZaYTZ
z%xk8$rdtxi<+^DymOcrCITunKOn2N<Vd5N6(JyiiS2RZ}X|}$*U(}suL%|^lBkPq?
zImKwh(Nh~<CVRY63ga*aWDKep!mxy)PL_Ggc&J;QV*1u}XBSvPBHk*<?Xl=shPgJC
z*tbR*QI_AqE#AmwHp_ZLv=zcpyd>jg6~}OV4{OCO+tF(zOSi~`*St}mxXwfl)9G4`
z&5z)Oijz1+u2^1Pw{0>fVIb~R(p_8_r*THcSru_4NV!|kUPK9UL*Q2h-~08qBIBF{
zwR>7&B;oJHI3{GAS22lK+t_<YC858}svW)PaH;7gB{9^lQylI1r+RS#ugkco;u0=P
zi0o3g8`^K{4h3UvEgLnx-XvHco=vPMNJ)?;6<p=N^9m@pYsE}1lU|M`V+)0)e5}^2
zI!2?a-!0#-8)ZFq^IE2mi5d26g&WhS?buRbK2wOzt;Pzoi}OqQcp{d|=CjMO$uMRx
zD`QSY8uNRH<&K{czgM?v8f&?-4|%t{^wPQ$ZM}3)N%X#;;w@Yw&-$ibZaTW#r-b-E
zpk0b9=r%i`;-?h6%}Lf>h0XRNhrEnM6-&6@O=jo3gb>BklCXp`|DUD1P6dTdjyVO(
z9V4w^rDMzsb-bry6}N<JDABE1(|)8|witdlBkdc+3BE5uY2Q#0|AC6TLa}{rJjrlh
z2?ZJn*IYEwV_8K7)P9h?WQDl)6>wGnuBo^$gmuUTOxG=ok4)CA=$lkgx?Uklf6g%V
z#b&LfTgzIhN>3zLFKg8m%`$}TIRnmpgRKnax^IN{WK2<kj2qs46S{9ccl)UL@`JqA
z@W76<@`7eo>b1P5(X=bkcE>C@ek-vj6;VR=?xh&$%GLIYM4r0aBaU<_(c@i$Pt2qX
zpd$|g$Ss<A;P5^(<Gz=G9g8`)hc~C04<sD;Z^hway=j&81w+s}(C*G-ZCqS-oZz$W
z<A+7!A3qRW{rt@@3s-~IJa@(3f#fqtN$FR}$!+vKrN@VLt`P*d4s#tu2vPLm2p-U*
zwxUo)%{|NShKIPpNRe?Q89DeI5h6Ze<v-)dxoyO@@yb&-GDL(C)*^BYu^!+!@z2tG
zk~z*WW8BR%M65o9VWRHFjd&RwjF92W$ruT9V*^$zz4SE;k-7QgcO+MzVKkro1@aEY
zBrJ{{Jhp?^d^q|Yl*pAQ=!s0F0%MWszzg_R{n0@2Io{ks#)njo`~ownU^M8D_C&Hf
zc*logG#H?9qiyuiD7K9tjdxqdXf(Kuo1=8xb{*TeBa9DsQ1W3L_ejPf$rx*qG5QnB
zR`4yp@366eLoELsz2jtmf_zVsmkXH2MLw68a2=O%2Uo~k3XgCVpK|9Lyg`f%QD*R%
zGyRdzo|saBC=q-G8xFZXiw2r_$XQO~7GpQbdm78w!bc?SvB$Dskms>1etnEj+!}vi
nrq4JH!TbpX{=z94Nf{UTkk9-h@MS0xUEt!*<Z~YM;fsF(JGduV

diff --git a/questions.db b/questions.db
index ad63841b5524539bca0044e2f6232e77e8701d32..f58b0e88a37de02efaed9bd1f36222f69e10318f 100644
GIT binary patch
delta 236
zcmZoTz}Rqrae}m<6$1kU8xS)AF$)k2P1G@FwAz@kL|%xUH-~|LEx#|{bH4d}xx7z!
zb2cjqgz;|9(Y0q{G}^pIKU6@LCyRldhn0bU9p5uPYd!(qDZJ7=tURpT`?;rZ^K6!L
zIKVw|f;v+&&*Zm$$t--03>zmlt`#Wf<Zw4v4^(I52+v3?Q7@icrJKRcT*bkWYN~6f
z&B!_Vy>1RiUS@hm36m!K<QhLMPBso-Nm*%WPL9bFbwnob)ze_%cV$SO*qF!_%fjKS
euBogE)CH2t^LJncc_njVV=7Ys^X3iy0RjL=a5}^Q

delta 1008
zcmc(d&rcIU6vw-T;%>L?qM>P!V5ezFQx)xo5KpEE<ws&#O8`OR!D0IBZo1vs%*+Z^
zlhT8C%^o~@(SwN^N&kV~{4Y3}c<_Mw7dUMpo;b+GWZukV-ka}x^FDLXQx1B{tEr1t
zC=?o#7M3<DZQ}LyImJ4B{4RZ2*T060PewWMJ@GctjDL$e@tN4mm^?o0e9+sAy80lM
zOeGCt+rk3b995a^65GQLx{vF&i*p=3u^AW0#Z4$KIkqcS!G$U?(kj`cVHWnIT1U%d
z%=C!}2dHsWqrg#_GSNcZqE7+&9<rqVt}g@<6xBf>?=F_Y#OH!Gf$?G)>KF~KuiDs^
zDSg3VXGbuM9L(x4^btyE--8NfXIj%bkey0r4I}tjnP>|OkO$Or0EzyCEG#o)R}Q-=
zpM*UR+!~fj121+Qy2s@nn*EXn!5sF{o-Hi2OXXCT;r+@sneR4+!fTYdHCmSohnj3a
ziMkDFdA>`m!kW3Ps_W_0Wa@82Hwb1ev<Zy0WG@L8#PTeLITTlX(m*Siz_vvhEZWk8
zsy^o})9gC4#js*_Ki=FLpO!>*{U~I7HmZpqiT8<T@!#?1@%h-B7}AfrR~CADd*Otm
zrk<ChFDXVcnYpy84J7`7BIe7d6whRMCdAIvDMB?kt|b36!P3SFKV{ej`C-q&FYI4X
zmu}_ObIJfmaII|XoyeF9^Rwn1MGKB+UyOwFk>FD0sxlhfu9Tu=M1^#2(p1#o*NunK
Ykw;;*oXcnPGPbf6t}5Lx_p0N601>=QM*si-

diff --git a/src/controller/EnvironmentManager.java b/src/controller/EnvironmentManager.java
index 64f8063..06ec70d 100644
--- 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
index 07d6380..2d26cff 100644
--- 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");