Merge pull request nus-cs2113-AY2021S1#43 from manuelmanuntag96/manue…

…l-Feature1 Manuel feature1
yeapcl · Oct 13, 2020 · 4a94674 · 4a94674
2 parents 510a59b + d8ca128
commit 4a94674
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/src/main/java/seedu/duke/Duke.java b/src/main/java/seedu/duke/Duke.java
@@ -44,6 +44,7 @@ public void run() {
 
                 if (c.isLogIn() == true) {
                     nowUser = c.getCurrentUser();
+                    //System.out.println(nowUser.getName() + users.getTotalUserCount());
                 }
                 //System.out.println(nowUser.getName());
                 isExit = c.isExit();

diff --git a/src/main/java/seedu/duke/command/LogInCommand.java b/src/main/java/seedu/duke/command/LogInCommand.java
@@ -19,11 +19,28 @@ public LogInCommand(String input) {
 
     @Override
     public void execute(UserList users, Ui ui, User nowUser/*, Storage storage*/) throws DukeException {
+        boolean doesExist = false;
+
         String[] parsedInputs = input.split(" /", 2);
-        User newUser = new User(parsedInputs[0], parsedInputs[1]);
-        currentUser = newUser;
-        users.addUser(newUser);
-        ui.greetUser(newUser);
+        for (int i = 1; i < users.getTotalUserCount(); i++) {
+            if (parsedInputs[0].equals((users.getUser(i)).getName())) {
+                if (parsedInputs[1].equals((users.getUser(i)).getPassWord())) {
+                    currentUser = users.getUser(i);
+                    //System.out.println(parsedInputs[0] + " == " + (users.getUser(i)).getName());
+                    doesExist = true;
+                } else {
+                    throw new DukeException("Wrong Password");
+                }
+            }
+        } 
+
+        if (doesExist == false) {
+            //System.out.println("User: " + parsedInputs[0] + " does not exist!");
+            User newUser = new User(parsedInputs[0], parsedInputs[1]);
+            currentUser = newUser;
+            users.addUser(newUser);
+        }
+        ui.greetUser(currentUser);
         isLogIn = true;
 
 

diff --git a/src/main/java/seedu/duke/user/User.java b/src/main/java/seedu/duke/user/User.java
@@ -17,6 +17,10 @@ public String getName() {
         return name;
     }
 
+    public String getPassWord() {
+        return passWord;
+    }
+
     public Timetable getTimetable() {
         return timetable;
     }