working

.idea/workspace.xml

@@ -4,7 +4,9 @@
     <list default="true" id="b71a0d05-772d-4338-8f47-61b6a36d5d57" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/src/main/java/AccountApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/AccountApp.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/AccountServ.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/AccountServ.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Console.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Console.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/test/java/AccountServTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/AccountServTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/MockDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/MockDao.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -45,12 +47,12 @@
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="2021" />
+          <entry key="java" value="3791" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="2021" />
+          <entry key="JAVA" value="3791" />
         </counts>
       </usages-collector>
     </session>
@@ -60,7 +62,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="55">
+            <state relative-caret-position="-288">
               <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
             </state>
           </provider>
@@ -69,8 +71,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="516">
-              <caret line="37" column="12" selection-start-line="37" selection-start-column="10" selection-end-line="37" selection-end-column="12" />
+            <state relative-caret-position="240">
+              <caret line="32" selection-start-line="32" selection-end-line="32" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#1718#1719#0" expanded="true" />
@@ -84,11 +86,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/java/AccountServTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
+            <state relative-caret-position="148">
+              <caret line="37" column="31" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -96,8 +98,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="248">
-              <caret line="47" column="49" selection-start-line="47" selection-start-column="49" selection-end-line="47" selection-end-column="49" />
+            <state relative-caret-position="293">
+              <caret line="54" column="57" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -105,11 +107,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/AccountServ.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="17" column="28" lean-forward="true" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
+            <state relative-caret-position="225">
+              <caret line="35" column="40" selection-start-line="35" selection-start-column="40" selection-end-line="35" selection-end-column="40" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#175#176#0" expanded="true" />
@@ -122,9 +124,11 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="435">
-              <caret line="29" column="30" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="30" />
+            <state relative-caret-position="307">
+              <caret line="47" column="1" lean-forward="true" selection-start-line="47" selection-start-column="1" selection-end-line="47" selection-end-column="1" />
               <folding>
+                <element signature="e#317#318#0" expanded="true" />
+                <element signature="e#345#346#0" expanded="true" />
                 <element signature="e#135#136#0" expanded="true" />
                 <element signature="e#169#170#0" expanded="true" />
                 <element signature="e#213#214#0" expanded="true" />
@@ -157,6 +161,8 @@
       <find>UPDATE</find>
       <find>upda</find>
       <find>id</find>
+      <find>updat</find>
+      <find>public</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -166,10 +172,10 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/test/java/MockDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Console.java" />
-        <option value="$PROJECT_DIR$/src/main/java/AccountServ.java" />
         <option value="$PROJECT_DIR$/src/test/java/AccountServTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/AccountApp.java" />
+        <option value="$PROJECT_DIR$/src/main/java/Console.java" />
+        <option value="$PROJECT_DIR$/src/main/java/AccountServ.java" />
       </list>
     </option>
   </component>
@@ -239,7 +245,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542566112760" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542570976587" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -260,7 +266,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.AccountServTest.createTest">
+  <component name="RunManager" selected="Application.AccountApp">
     <configuration name="AccountApp" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="AccountApp" />
       <module name="SimpleAccount" />
@@ -278,14 +284,26 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="AccountServTest.readTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="SimpleAccount" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="AccountServTest" />
+      <option name="METHOD_NAME" value="readTest" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <list>
       <item itemvalue="Application.AccountApp" />
       <item itemvalue="JUnit.AccountServTest.createTest" />
+      <item itemvalue="JUnit.AccountServTest.readTest" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.AccountServTest.createTest" />
         <item itemvalue="Application.AccountApp" />
+        <item itemvalue="JUnit.AccountServTest.readTest" />
+        <item itemvalue="JUnit.AccountServTest.createTest" />
       </list>
     </recent_temporary>
   </component>
@@ -302,18 +320,35 @@
       <workItem from="1542239571129" duration="6414000" />
       <workItem from="1542402275147" duration="2006000" />
       <workItem from="1542420139392" duration="4000" />
-      <workItem from="1542475891339" duration="7385000" />
+      <workItem from="1542475891339" duration="12147000" />
     </task>
     <servers />
   </component>
+  <component name="TestHistory">
+    <history-entry file="AccountServTest_createTest - 2018.11.18 at 13h 35m 17s.xml">
+      <configuration name="AccountServTest.createTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="AccountServTest_readTest - 2018.11.18 at 13h 55m 58s.xml">
+      <configuration name="AccountServTest.readTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="AccountServTest_readTest - 2018.11.18 at 13h 57m 03s.xml">
+      <configuration name="AccountServTest.readTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="AccountServTest_readTest - 2018.11.18 at 13h 57m 14s.xml">
+      <configuration name="AccountServTest.readTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="AccountServTest_readTest - 2018.11.18 at 13h 57m 20s.xml">
+      <configuration name="AccountServTest.readTest" configurationId="JUnit" />
+    </history-entry>
+  </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="15809000" />
+    <option name="totallyTimeSpent" value="20571000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="807" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26037195" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26037195" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
@@ -322,7 +357,7 @@
       <window_info id="Favorites" order="6" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32867134" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49928468" visible="true" weight="0.4797203" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -330,7 +365,7 @@
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5007153" side_tool="true" weight="0.32867134" />
       <window_info anchor="bottom" id="Messages" order="11" weight="0.32867134" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -382,46 +417,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="435">
-          <caret line="29" column="30" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="30" />
-          <folding>
-            <element signature="e#135#136#0" expanded="true" />
-            <element signature="e#169#170#0" expanded="true" />
-            <element signature="e#213#214#0" expanded="true" />
-            <element signature="e#241#242#0" expanded="true" />
-            <element signature="e#273#274#0" expanded="true" />
-            <element signature="e#286#287#0" expanded="true" />
-            <element signature="e#331#332#0" expanded="true" />
-            <element signature="e#353#354#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="55">
+        <state relative-caret-position="-288">
           <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/AccountServ.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="28" lean-forward="true" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#175#176#0" expanded="true" />
-            <element signature="e#203#204#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="516">
-          <caret line="37" column="12" selection-start-line="37" selection-start-column="10" selection-end-line="37" selection-end-column="12" />
+        <state relative-caret-position="240">
+          <caret line="32" selection-start-line="32" selection-end-line="32" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#1718#1719#0" expanded="true" />
@@ -434,20 +440,51 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/AccountServTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="148">
+          <caret line="37" column="31" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="47" column="49" selection-start-line="47" selection-start-column="49" selection-end-line="47" selection-end-column="49" />
+        <state relative-caret-position="293">
+          <caret line="54" column="57" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/AccountServTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
+        <state relative-caret-position="307">
+          <caret line="47" column="1" lean-forward="true" selection-start-line="47" selection-start-column="1" selection-end-line="47" selection-end-column="1" />
+          <folding>
+            <element signature="e#317#318#0" expanded="true" />
+            <element signature="e#345#346#0" expanded="true" />
+            <element signature="e#135#136#0" expanded="true" />
+            <element signature="e#169#170#0" expanded="true" />
+            <element signature="e#213#214#0" expanded="true" />
+            <element signature="e#241#242#0" expanded="true" />
+            <element signature="e#273#274#0" expanded="true" />
+            <element signature="e#286#287#0" expanded="true" />
+            <element signature="e#331#332#0" expanded="true" />
+            <element signature="e#353#354#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/AccountServ.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="35" column="40" selection-start-line="35" selection-start-column="40" selection-end-line="35" selection-end-column="40" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#175#176#0" expanded="true" />
+            <element signature="e#203#204#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

src/main/java/AccountApp.java

@@ -25,8 +25,7 @@ import com.j256.ormlite.support.ConnectionSource;
                 connectionSource = new JdbcConnectionSource(DATABASE_URL, YOURUSERNAME, YOURPASSWORD);
                 setupDao(connectionSource);
                 processData();
-
-                System.out.println("\n\nIt seems to have worked\n\n");
+                console.print("Have a nice day");
             } finally {
                 // destroy the data source which should close underlying connections
                 if (connectionSource != null) {
@@ -39,24 +38,28 @@ import com.j256.ormlite.support.ConnectionSource;
          * Read and write some example data.
          */
         private void processData() throws Exception {
-           AccountServ services = new AccountServ();
+           AccountServ services = new AccountServ(accountDao);
            boolean end = false;
             console.print("Welcome to your account manager");
                 while(!end){
+                    console.printMenu();
                    int input = console.prntTakeInt("Please enter your selection: ");
-                    if (input == 1) {
-                        services.createAccount();
-                    } else if(input == 2) {
-
-                    } else if(input == 3) {
+                   switch (input) {
+                       case 1 : services.createAccount();
+                       break;
+                       case 2 : int id = console.idCheck();
+                       services.accountString(id);
+                       break;
+                       case 3 : services.updateAccount();
+                       break;
+                       case 4 : services.deleteAccount();
+                           break;
+                       case 5 : end = true; break;
+                       default: console.invalid();
+                            console.printMenu();
+                   }
 
-                    } else if(input == 4) {
-
-                    } else {
-                        end = true;
-                    }
                 }
-
         }
 
         /**

src/main/java/AccountServ.java

@@ -7,7 +7,7 @@ public class AccountServ {
     private Dao<Account, Integer> dao;
     private Console console = new Console();
 
-    public AccountServ() {
+    public AccountServ(Dao<Account, Integer> dao) {
         this.dao = dao;
     }
 
@@ -18,7 +18,7 @@ public class AccountServ {
         dao.create(account);
     }
 
-    public int create(Account account) throws SQLException {
+    private int create(Account account) throws SQLException {
         return dao.create(account);
     }
 
@@ -26,18 +26,47 @@ public class AccountServ {
         return dao.queryForId(id);
     }
 
+    public void accountString(int id) throws SQLException{
+       Account account =  read(id);
+       console.print("\n" + account.getName() + " " + account.getPassword() + "\n");
+    }
+
+    private Account getAcccount()throws SQLException {
+        String input = console.prntTakeStr("Enter your account ID");
+        return read(Integer.parseInt(input));
+    }
 
-    public void setPassword(Account account, String password) throws SQLException {
+    public void updateAccount() throws SQLException {
+        Account account = getAcccount();
+        int input = console.prntTakeInt("Enter 1 to change account password or 2 to change account name");
+        if(input == 1) {setPassword(account);}
+            else if (input == 2){
+                setName(account);}
+            else {console.invalid();}
+    }
+
+    private void setPassword(Account account) throws SQLException {
+        String password =  console.prntTakeStr("Enter new password");
         account.setPassword(password);
         dao.update(account);
     }
 
-    public void setName(Account account, String name) throws SQLException {
+    private void setName(Account account) throws SQLException {
+        String name = console.prntTakeStr("Enter new name");
         account.setName(name);
         dao.update(account);
     }
 
-    public int delete(Account account) throws SQLException {
+    public void deleteAccount() throws SQLException{
+        Account account = getAcccount();
+        String input =  console.prntTakeStr("Are you sure you would like to delete your account?\nY / N");
+        if (input.equalsIgnoreCase("y")){
+            delete(account);
+            console.print("Account deleted");
+        } else {}
+    }
+
+    private int delete(Account account) throws SQLException {
         return dao.delete(account);
     }
 

src/main/java/Console.java

@@ -4,6 +4,15 @@ public class Console {
 
 private Scanner scanner = new Scanner(System.in);
 
+public void printMenu() {
+    System.out.println("Selection menu: \n 1. Create New Account\n 2. Check Account Info\n 3. Change Account Info\n" +
+            " 4. Delete Account\n 5. Quit");
+}
+
+public void invalid() {
+    System.out.println("Invalid Entry. Please try again");
+}
+
 public void print(String string) {
     System.out.println(string);
 }
@@ -27,6 +36,13 @@ public int prntTakeInt(String output) {
 
 public String prntTakeStr(String output) {
     System.out.println(output);
-    return scanner.nextLine();
+    return scanner.next();
 }
+
+public int idCheck() {
+    System.out.println("Enter your Account ID");
+    return scanner.nextInt();
+}
+
+
 }

src/test/java/AccountServTest.java

@@ -10,11 +10,13 @@ public class AccountServTest {
 
     Dao<Account, Integer> dao;
     Account account;
+    AccountServ test;
 
     @Before
     public void setup() {
         dao = new MockDao();
-        account = new Account();
+        test = new AccountServ(dao);
+        account = new Account("Bob", "password");
     }
 
     @Test
@@ -32,8 +34,11 @@ public class AccountServTest {
     }
 
     @Test
-    public void readTest(){
+    public void readTest() throws SQLException{
+        Account expected = test.read(0);
+        Account actual = dao.queryForId(0);
 
+        Assert.assertEquals(expected, actual);
     }
 
     @Test

src/test/java/MockDao.java

@@ -14,6 +14,7 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 
 public class MockDao implements Dao<Account, Integer> {
+    Account account = new Account("Bob", "password");
 
     @Override
     public int create(Account account) throws SQLException {
@@ -32,7 +33,7 @@ public class MockDao implements Dao<Account, Integer> {
 
     @Override
     public Account queryForId(Integer integer) throws SQLException {
-        return null;
+        return account;
     }
 
     @Override